From patchwork Mon Sep 2 10:21:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 172725 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp4129260ily; Mon, 2 Sep 2019 03:21:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqwii95o5ffWZ0cE73pBd01E4kqWW9rN4ymnSEMZHQpLn2B58nKCubkkZ/9xg0oNkdEJ84FN X-Received: by 2002:a0c:f6ce:: with SMTP id d14mr17718184qvo.56.1567419707511; Mon, 02 Sep 2019 03:21:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567419707; cv=none; d=google.com; s=arc-20160816; b=JiMRyZ9UO1nx9sqowXOBM2+fjFjLgobcZeQt97aC2q2f+++QQZxkLZazJikCAY+TZb 7a6ezBhQ4w/da6X2p9GGxU4vs2sEUUTMuOBVuRXoEc9qKF1K3dJuyN+EUBQ70fpoYZD8 pzXsc5q64m7Mz78r3v0Aix8ntObAbAKsZi1FvzAxS6UE8jeaoobHnanV+VegVgbpphh5 NTPpL/9IxDL6bltXk7slPCB8w+DbCePiHnYSJmashuEeLNMy/XkA5dzpyCa4uZyapCfA Nue3C8lpnN9WTd/CcE72IrfR2HDoAv8OYhpU2qwbhDbEzI9zdhvYO+FuirTEv/h2uFCT XB9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=LerAiTk+RHTNAwomwqqVsvMK0Yfd9IxxuCZGECaCdYo=; b=rtMIFHFp9G39mxCGOmZNVDgZr+69YHdAjdfTZtMuWQDsIY3yLNXSTycWGZllejpb/0 pzdlGK708mW9UiL0vgQ6Z023S8y/2M940mUSwjn/77F9bV7/vIHga5iwHzl+ABsU4X2D 0r6fxfCePe6kfzYme56DojgYhk3b6OzID9SX1ENY0eSV1qut7/y6F5ewZo59PqY9qqRb LgzDKnBh1Ap/aDtuQ9Eev1wQv1LWUWfnMguFtfKjs4/P6Uzhbv4vED8pjNTbKkrk9vMS M6GW6t8WPzDjZok6XY9IJtStMN8cZo7EJaUHxy4CL2eT05ny60Xd2f1nWclG2HB2wcR2 gwJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZhsEyGI5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a69si660747qkc.264.2019.09.02.03.21.47 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Sep 2019 03:21:47 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZhsEyGI5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jT0-0004dr-VT for patch@linaro.org; Mon, 02 Sep 2019 06:21:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54786) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jSh-0004dE-2M for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4jSf-0004FN-U3 for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:26 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:54519) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4jSf-0004EW-MG for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:25 -0400 Received: by mail-wm1-x335.google.com with SMTP id k2so12496633wmj.4 for ; Mon, 02 Sep 2019 03:21:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LerAiTk+RHTNAwomwqqVsvMK0Yfd9IxxuCZGECaCdYo=; b=ZhsEyGI5NhReaA1qVILVR1iil7nhfx2NSzpzTnimcgJbrMQ3dBEYnv4wvbwZPzLEXk zywro4zM2eDoYUpJiVMAoKFEMKrUoebOeVdMBPwQKfZqfFtpWkPD+Ktqb21bUO2sbbR6 /i2EXF87BjwuEMqHUognfBb8dhBRTs1tdUC9dseQqPxc9GWzVHLb39gyVJQzOdFNP5SU 6Q7gWf+M743d521hiQdRzbkY6oL+6zvNvJDxGQaQtUDGVr29szniDqU9d5ZwDa3B7TCi 1jJFUZIihX8xKR1V3SYR2vlAIM1cKSrQv9Qzcp859/FZife1MECgHy7bTs1TtZgKhD17 jZSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LerAiTk+RHTNAwomwqqVsvMK0Yfd9IxxuCZGECaCdYo=; b=g9D01JYIeoME3O2p5fQRA9czDN4JFQb5nO+043TMYPUaGDKhgwIfx04DOa30Eo8keM ud2BErHV+e1TjN7Lx1Rr9kFK5CC/Un2unM5C2jdE3F+CM5fIYSM7XOZXpadIvVXB0VZX zhWTV6P3+g/FCdVKRWhOYlEqmCq6fZEY2LvaLrKOdQpe0oZVSVCFL3JiRwaDFHo2rLPk 3o9M4Mbl3MJ9kmftYVp1SEghbng/ld4qWRORYhHn1Utzfnkdxq7/gjrysyPXWuVnOTMZ luWEUUj4g2KkkrQaArv0/ePLo9rmE5hNOwzEGPIGQIa+ggt6Id/0Xjw2npEYLpcvRH/k WgMA== X-Gm-Message-State: APjAAAXkrwycsB5SqrQEMVD6q/S64spCxLmRRHpAPFkk6+FUtukyeEQ7 o81CcOwA3Td8BNafNUVfNS6z/CBVkyw= X-Received: by 2002:a1c:6a0b:: with SMTP id f11mr32436446wmc.87.1567419683475; Mon, 02 Sep 2019 03:21:23 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g26sm11849821wmh.32.2019.09.02.03.21.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 03:21:22 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 51E271FF8C; Mon, 2 Sep 2019 11:21:22 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 2 Sep 2019 11:21:11 +0100 Message-Id: <20190902102122.1128-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190902102122.1128-1-alex.bennee@linaro.org> References: <20190902102122.1128-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::335 Subject: [Qemu-devel] [PULL 01/12] gdbstub: Fix handling of '!' packet with new infra X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Ramiro Polla , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Ramiro Polla Since the '!' packet is not handled by the new infrastructure, gdb_handle_packet() would call run_cmd_parser() with a NULL cmd_parser value, which would lead to an unsupported packet ("$#00") being sent, which could confuse the gdb client. This also has a side-effect of speeding up the initial connection with gdb. Fixes: 3e2c12615b52 ("gdbstub: Implement deatch (D pkt) with new infra") Signed-off-by: Ramiro Polla Message-Id: <20190805190901.14072-1-ramiro.polla@gmail.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/gdbstub.c b/gdbstub.c index b92ba59e4df..5c067594bae 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -2588,7 +2588,9 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) break; } - run_cmd_parser(s, line_buf, cmd_parser); + if (cmd_parser) { + run_cmd_parser(s, line_buf, cmd_parser); + } return RS_IDLE; } From patchwork Mon Sep 2 10:21:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 172727 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp4130370ily; Mon, 2 Sep 2019 03:22:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqytQEqUMgHijQh9XGrHCW2xRXhygGBDXUQ8PVxtvaeRBh9X71axsERl7IA+JZu/zmXtBv3t X-Received: by 2002:a17:906:30d8:: with SMTP id b24mr22536999ejb.33.1567419770391; Mon, 02 Sep 2019 03:22:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567419770; cv=none; d=google.com; s=arc-20160816; b=DX8AD/C8HwvUvWi7UQudu2dB9XKWt7LH5DZTp4N9gWMOtbmooadJLn6V3A8V8BGV8l nWwn7ApnmB1Au7byK9kQQorPCObenxsKufxvZvEFT3UWaHzt6FX3lFSzPOaSjoFsMQvr 1InFIx47W3tE8t7Lq5wzSJATPAHFdqCaACkD3R5J+Lms9G8NiS8R4uEl2IaXBlLej0Oj ClegBOg/UK4jKaFMB9JJwY9WZFqveoIUxndviQ0zGT34B0y5NlEWxVx5ogansZniorg3 vr4Q+Z3hC1rc57bU529kpBiKBbHEVF6k3OAUFJeT7kwkv0RMX1CrJYyt6JstH3uLyrKS UmWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=MTI8Bx3uRmLWHyobHqk9B5nXds/7H3re7AzqawWMgtk=; b=e0rVYS6IAjLserEH+LSR4U0K3Ym0G1t/qGk72rqjtWDWHR92oLKVibN8TeJ0jThR/y S28TELk008qe/WqUwf53PRNITAreZabZsbAOHwqRzhPOzOsj5ycPZZ1jC1Oyktzg8D/K UguOLnwJR82nVZuKJ8pjpiEWScwl+CJwhrVSU3jfsSYbOjNtRfyE7j1hCL2Inv4lh1uX KZj+2YpGtSgZLctqMfWVm0VeDdDorZA9V/Tm6ohn1cislNJbul8ArUGTThC/yPQ9UFl+ aRrYfv7cRUuTiDzcb/L79rCloXqCXlMi4nm8uecos0vCzuZ1F61nQY8VYCm7Q9NjmFoI FCtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Fz2DcAiF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t57si8117889edd.26.2019.09.02.03.22.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Sep 2019 03:22:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Fz2DcAiF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34680 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jU1-0004fw-6P for patch@linaro.org; Mon, 02 Sep 2019 06:22:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54806) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jSi-0004dU-8X for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4jSh-0004Fr-51 for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:28 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:34950) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4jSf-0004F3-UY for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:27 -0400 Received: by mail-wm1-x336.google.com with SMTP id n10so3316146wmj.0 for ; Mon, 02 Sep 2019 03:21:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MTI8Bx3uRmLWHyobHqk9B5nXds/7H3re7AzqawWMgtk=; b=Fz2DcAiFgvIltoAjBL2x+X8ivimKCUKHAneMcLXoHGkE6MmY+VUgOV33swNVS+2yZP +/0+FA0J2hjMFRds46BYo8sk9C396bUsm0xV55utesyH+DOXLoq+rgX5lgGYBd7ehYsP o+NNiN1gR5JkeDGqfplAPlw6nrp5j/NIIthMS9Yd5FvhzH4+lx/w4arx680SatPK0JWe UddQjlCsww7KqBOV9rYNxrrfXKE7Jo5ayYBvP3V/hPW8y3FopR9wDK5jg5cg0oviHmlE eDRfcNuLEkR6NLIzOPc5opFBIsXkSTcZZrOyeP0f9PhMUzrTzql9VadPN+t3pLqgeTUe PJQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MTI8Bx3uRmLWHyobHqk9B5nXds/7H3re7AzqawWMgtk=; b=phbhnsLhRtoCz8T1C3BKXElZFrYD6Yjya4RhlleJAyAfRrvhEk8tDxxbOTgCxzOz53 7AzM6wfNRXRrhPejrzai+6u6Z1deS4yJ1DTSjFTOVrzpZbQEeCjfJk3UUkpeBJ5/+qFk XWzDdRVXChkCIDTqUqSTVakwrw7XvVNxss0TaNMHerm7R6Rs3HwVjJViXldYrVAPBDoi LTucapMhBF/5pFqBpThcLM6llUKB0vz5gHPNwAYOlA6kmJrWjXm4d3HXvUo0wthPMnlJ VEb3yivUHpCy8mOsX7xoSV+6lb1tAqgVBHYkLyacsNyb3xCyegQ0sqQkJ2MRdYHLFJDg tlBQ== X-Gm-Message-State: APjAAAWF9j8i107fpaR+waI/GvSlh1u615RFd84BYKgytiH/aTu7ICGd /y8en+gmvg6yv6cK8W7TViMKSw== X-Received: by 2002:a1c:c706:: with SMTP id x6mr35668865wmf.104.1567419684782; Mon, 02 Sep 2019 03:21:24 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f143sm2050011wme.40.2019.09.02.03.21.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 03:21:22 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6532D1FF8F; Mon, 2 Sep 2019 11:21:22 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 2 Sep 2019 11:21:12 +0100 Message-Id: <20190902102122.1128-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190902102122.1128-1-alex.bennee@linaro.org> References: <20190902102122.1128-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::336 Subject: [Qemu-devel] [PULL 02/12] gdbstub: Fix handler for 'F' packet X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Sandra Loosemore , Richard Henderson , qemu-devel@nongnu.org, =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Sandra Loosemore Handling of the 'F' packet has been broken since commit 4b20fab101b9e2d0fb47454209637a17fc7a13d5, which converted it to use the new packet parsing infrastructure. Per the GDB RSP specification https://sourceware.org/gdb/current/onlinedocs/gdb/The-F-Reply-Packet.html the second parameter may be omitted, but the rewritten implementation was failing to recognize this case. The result was that QEMU was repeatedly resending the fileio request and ignoring GDB's replies of successful completion. This patch restores the behavior of the previous code in allowing the errno parameter to be omitted and passing 0 to the callback in that case. Signed-off-by: Sandra Loosemore Reviewed-by: Richard Henderson Message-Id: <20190827223317.8614-1-sandra@codesourcery.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/gdbstub.c b/gdbstub.c index 5c067594bae..4cf8af365e2 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1820,11 +1820,15 @@ static void handle_read_all_regs(GdbCmdContext *gdb_ctx, void *user_ctx) static void handle_file_io(GdbCmdContext *gdb_ctx, void *user_ctx) { - if (gdb_ctx->num_params >= 2 && gdb_ctx->s->current_syscall_cb) { + if (gdb_ctx->num_params >= 1 && gdb_ctx->s->current_syscall_cb) { target_ulong ret, err; ret = (target_ulong)gdb_ctx->params[0].val_ull; - err = (target_ulong)gdb_ctx->params[1].val_ull; + if (gdb_ctx->num_params >= 2) { + err = (target_ulong)gdb_ctx->params[1].val_ull; + } else { + err = 0; + } gdb_ctx->s->current_syscall_cb(gdb_ctx->s->c_cpu, ret, err); gdb_ctx->s->current_syscall_cb = NULL; } From patchwork Mon Sep 2 10:21:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 172732 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp4136895ily; Mon, 2 Sep 2019 03:29:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqx4xApVlrk5f1+uSqqmycBJBdAzxv7R76c+DJCLYsXfHfoj5TZ62uGuvPbCGLslcjuQ800z X-Received: by 2002:a50:9ac3:: with SMTP id p61mr29721307edb.2.1567420175649; Mon, 02 Sep 2019 03:29:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567420175; cv=none; d=google.com; s=arc-20160816; b=WSd6Fbbv97Opxc8s47UJ8010Ti0zeuozaKxdhTNOgF6a81Z0SneNZOZv1PRepc3hAd 3gl0efmwf4U4Inl1jhw8JJRyHsaFIYHcBPa9NS+nYzkGsJbxTDMsTxR7pVo3DqGrq+87 hEY9I680NaZ4jPbwpPZIncWi7lcTyt1WaUZWvJXtNz1EqXVZrUub2oEwUjTVWy3m7Ih1 WKw5wpr9XKo5msJQ1eN56TH0guyI/D8doSXCI4JV8SY5p2ZCBOXU584REYN9M1y8mxAn rU1WShIs19K+X4FlI6AIxnX4/TW0qPecmXTeKHq8Y7BZOYOFzKz3j9PjBelfCJC8QKxh jqrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=tNqvSEr8X3/3ZjLjpEcLT+HicpFHjS0C2AZqviXv1Lk=; b=yIScbFZQ9GpEg6Ke0VNT9ZmmzMgAmKmXcQu3xqIa9AO4a8yuAoMQH2hIgC5ecQiqmQ lmmwnL3gd7ktsFcGynhcbOS6SQYJxfCGf2eDNMBcuM4Hhs4v8N2JeB2u4dM7kOucRgtE 3LAiQTvVF1T1EdvV3rWFTCxLvJI+CIogXkM0ev2/pb7Z0SL81J/RIISwN6EKwhCcvoNp nQqYnELaRyMcq/fQPq6GhOnpCqr287Y2U9Dg31jSA1RlB8+jUjcx36fatLV2WzSftPy/ jQu0bdp/lIgRG1k6Ow4mQJwXEXMpK00A5uE2HVb7zoPit9jekWxs2KyaUZGEEPufwVEf Qhtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aVjQdNQr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s30si4101224edb.377.2019.09.02.03.29.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Sep 2019 03:29:35 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aVjQdNQr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jaY-0002iR-49 for patch@linaro.org; Mon, 02 Sep 2019 06:29:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54809) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jSi-0004dZ-HP for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4jSh-0004G4-Bi for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:28 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:39493) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4jSh-0004Fb-52 for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:27 -0400 Received: by mail-wr1-x42d.google.com with SMTP id t16so13431945wra.6 for ; Mon, 02 Sep 2019 03:21:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tNqvSEr8X3/3ZjLjpEcLT+HicpFHjS0C2AZqviXv1Lk=; b=aVjQdNQrXVYlEoYz4P78aj6Anzy5Ula3pl994TiKGCJnTUMhxVIJgGjRPtTUmPmmdD SXsLEP/uNefj9FbNxb6MrJCo0AsZvKyBp0SQoakyoNQcLpXjM/Tw9Kr6WQj3Z3cJsNFY upqy0tXsHqorwJsmOwLS818Me72lr9UugC2YhdQ6TkUapB5sAgDUxajPacWOuLtn/upl TX2Tdf68OdtDd3Ln00wZRLcqZ6LcR+7wpuSWxgLVlsIoewzmQRicN71mhRarA6KSdvzj JnH2V5uGXvcAb4pDf0GUwmFDm7OBKM+LJyIEd+YEsisDD+P0+d85eedoC9/h7gN40ZAP aNNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tNqvSEr8X3/3ZjLjpEcLT+HicpFHjS0C2AZqviXv1Lk=; b=f2kxH3aICa6eseVvZGipxbcJ9KzxpwNS6/9qqSc/GSKE0a+u9cQRvaZAHPrBVzA0bU 48v7GrH6aiz9EBT9oD7roZJQjneAbMA0i65fPj4QPZX+pHLjWO7wVi2HeRI4yMUBLbW8 xWHpZzyLBAtbEw0HKABsyL/ymDB8HRq2GE6OJsltLBH3kJJGJKzfEq7e5sVhDR5+RgWm OD2Qy8xMdWjzRerNgssWk6nKsYbyCdoUJAK8ovZbRtTFjlQ7kF9GJ4iN0XKGZ4QlngAh oBGdKZ0bDQMRtkOx1U/GZROH6v6pdr8R4v1Ox9i/0RVQe+7JY7S5k53GNBpkheHA12Bt 0ZzQ== X-Gm-Message-State: APjAAAWApLRd9KngSIlS02gXWE7GccBLxPgAZ/Hhk3Q/zErNhrmosI+0 tQZ3OH3DgZK5C2VGmXxoZR3SXA== X-Received: by 2002:adf:9043:: with SMTP id h61mr34850359wrh.247.1567419686069; Mon, 02 Sep 2019 03:21:26 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x15sm9011265wmc.16.2019.09.02.03.21.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 03:21:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 78AC31FF90; Mon, 2 Sep 2019 11:21:22 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 2 Sep 2019 11:21:13 +0100 Message-Id: <20190902102122.1128-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190902102122.1128-1-alex.bennee@linaro.org> References: <20190902102122.1128-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d Subject: [Qemu-devel] [PULL 03/12] contrib/gitdm: filetype interface is not in order, fix X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Aleksandar Markovic , Markus Armbruster Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Markus Armbruster gitm prints the rather cryptic message "interface not found, appended to the last order". This is because filetypes.txt has filetype interface, but neglects to mention it in order. Fix that. Fixes: 2f28271d807edfcdc47a280c06999dd866dcae10 Signed-off-by: Markus Armbruster Reviewed-by: Aleksandar Markovic Message-Id: <20190822122350.29852-2-armbru@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/contrib/gitdm/filetypes.txt b/contrib/gitdm/filetypes.txt index 165b71b3f9a..2d5002fea0c 100644 --- a/contrib/gitdm/filetypes.txt +++ b/contrib/gitdm/filetypes.txt @@ -34,7 +34,7 @@ # If there is an filetype which is not in order but has values, it will # be added at the end. # -order build,tests,code,documentation,devel-doc,blobs +order build,interface,tests,code,documentation,devel-doc,blobs # # From patchwork Mon Sep 2 10:21:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 172734 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp4141561ily; Mon, 2 Sep 2019 03:33:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqxebVcwimqxpdd3AkvKhcFSdXHQT5tDj0bEGkKmLoLRISFuxaJdyPNBRFBGOdnRW7NHNrqu X-Received: by 2002:a17:906:a98f:: with SMTP id jr15mr23509459ejb.26.1567420403019; Mon, 02 Sep 2019 03:33:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567420403; cv=none; d=google.com; s=arc-20160816; b=cd+sbu9gW+wk5wuXJpk2eaRtxHb/dRVFF22qAnw67IHpYOUhjPSeGPF/IOVEBZWh7a IxXLKOBViYih62kp2mq+63swCkqBkoQGwm7+EFXmLT++g/lreSJ5yoUQhp77ucQM6uxg trr9yZ9EEl1RNEdTO0j5nVhMrJmU4sOxYPn2EJxkGaPnoAY6D54Bihbwo984B7xRB7Id PFprlIq21hY8DAGazFi/42cLZt/MPrV8SR965ssxL9DJgcxXegu0VyqKVIRPjjCTDRWP Qd87im8FJh7DQApnDx1YCZML9Ywa1QaaFnYph5m1Uic2+oaaeeKpiDJG1Ii8Pca35XEz Z1/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=U0PDzau2To6K5mMDa/4SEuZ2KSdwKoDziD6MI+XI7jk=; b=vb4ZLIV/OGlIbaE5gKNJusYrtDPAstZ32bx8WDBEgfm9itkuMusHfm/iyQGtzm+bKV aUcg65Hs/sWlxPlEHWEZ5YElQnAeXINIzrvQ7O3BRHMZYADJ2Ps5RHU/bFXzPTnd3Pfp 7LhFx3a4u5JT16ixanaSqBlFoZztPGiPY/64MVvwp9Uj/Oa3kwVd2cHO05Gb12oapjOD isovqFqcX5CrIqUu+9rq0y2JnmUAzM5An8m/bbDo9OiZ2fGZLGPlDieI3D6+37Ythqa+ M4yeefHSb2ZNuofCEimgE+zb97YHjl6AP6SybyS3SUeLUp2f+DeqqVPT32qZvHDQQlO2 k13g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VLgwAIkN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k22si6502285eja.66.2019.09.02.03.33.22 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Sep 2019 03:33:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VLgwAIkN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jeD-0005g2-Hx for patch@linaro.org; Mon, 02 Sep 2019 06:33:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54848) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jSk-0004fC-Lr for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4jSj-0004HN-KL for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:30 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:44136) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4jSj-0004GC-Eh for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:29 -0400 Received: by mail-wr1-x436.google.com with SMTP id 30so2485655wrk.11 for ; Mon, 02 Sep 2019 03:21:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U0PDzau2To6K5mMDa/4SEuZ2KSdwKoDziD6MI+XI7jk=; b=VLgwAIkNdshVSfsKZdAiqHQOZuT/Bl8zfW8S9/IYsuSFD0JlwDFHj4R/8oO718yDig PQNgbTMjRR5lnlp40zv9FsRNXGzWenAp8dW0Npu6aKmqYbu97Tj+nmQmtoeJCFhjrlt6 VTz0MH699tpuT0PUIQaqjYyuX0aligK7dbsQhIZ0+WUneFAK6al76zZq781tG45L8Trg eGFeyT5/sJcEL7XhRylQjOfC2SYcGGM4ixKJnaQ8TUu5BlN0zx3ZichQqLCu9a/lrAOW 0QgU6g8Hqbp70KCxL4DXuKKysCGv4y3xOZuU+Ln/qrHsiuQx6ntDJiRElPQbsMYBJzuc j45Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U0PDzau2To6K5mMDa/4SEuZ2KSdwKoDziD6MI+XI7jk=; b=PaOYNlcwsJfh1YvAeEf6IgAAAWXoB1d1asNntR+vxxjXhxRk3jjoIObCAQx3LbWxpQ EIgnIErtcA7n3oH/gijETWgNmOh/lqojNt9xaZadM8C6IsNs35lSTyJgXR6v9LJhqnW8 vAyIZQy+R7VoeJe5yPgGymMzud1gUX7Bpk1E8p4x/dCUQollWcNIRMLK81zRlez8NpXD 7jZ8ifydTficepLIs65Pgn2RvUcqw3jdK/4psV3yly9ayheDUqEsM6T2NfqE/ojnV4Fv /BqbseGjEPxsOVZ9t1C6EBRT46IpXukvYyeIEO/Plui34zVPCbKlOuEom0YrE409agpX SUZQ== X-Gm-Message-State: APjAAAW13YwxJKZlU1mqDB04P8og/SuuYl19XVUQdyFFXRjEHLlt1yWE /eqehhmzc5W1xhRyGhpjdYqTsQ== X-Received: by 2002:adf:ecc3:: with SMTP id s3mr35931239wro.302.1567419686789; Mon, 02 Sep 2019 03:21:26 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f23sm11840197wmf.1.2019.09.02.03.21.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 03:21:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8BEB61FF91; Mon, 2 Sep 2019 11:21:22 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 2 Sep 2019 11:21:14 +0100 Message-Id: <20190902102122.1128-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190902102122.1128-1-alex.bennee@linaro.org> References: <20190902102122.1128-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::436 Subject: [Qemu-devel] [PULL 04/12] contrib/gitdm: Add armbru@pond.sub.org to group-map-redhat X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Markus Armbruster Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Markus Armbruster Just to get the (few) accidental uses of my private e-mail address attributed correctly. Signed-off-by: Markus Armbruster Message-Id: <20190822122350.29852-3-armbru@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/contrib/gitdm/group-map-redhat b/contrib/gitdm/group-map-redhat index 6d05c6b54fd..d15db2d35e1 100644 --- a/contrib/gitdm/group-map-redhat +++ b/contrib/gitdm/group-map-redhat @@ -5,3 +5,4 @@ david@gibson.dropbear.id.au laurent@vivier.eu pjp@fedoraproject.org +armbru@pond.sub.org From patchwork Mon Sep 2 10:21:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 172733 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp4140182ily; Mon, 2 Sep 2019 03:32:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqxOYGk/rjFbxJB7yCqfpAu/b7L3O2mtygoHKzelUzkOXPa0RzO8rVQwxP04ztatHu8g4t3e X-Received: by 2002:a05:620a:1181:: with SMTP id b1mr25335815qkk.390.1567420329190; Mon, 02 Sep 2019 03:32:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567420329; cv=none; d=google.com; s=arc-20160816; b=shPu02qS+8PwNM1G/q6p0E2MXWjn2NgJx6XmROq+O8rUOAPAnyMQ9MkZ4xDp6D/ZB1 KupqBirScbH7JUF4fP9N7/aRYmJSCk82KLzVRX8Pd9IOYJ8w4sGpHAgK5/4DCVFM2RmB UCToezWoMf/QB/0VdueHdY8XUsZWCc77ixm3xkVr4OYVhLFNWsqv/iK/HHAu+qVKRBta nnzrmNhi/lC3l6Ya1zK5kGinJMb9pXur+icI2Magmy7hhC46k3OJQ7hGbK9Ie01WR/Ky iG/lW0jwWJh0DJUQviwt4ztuHJG4t6/evHYHrusqmq7N0nMptCIYIgvG3cd11zcixg8F RHiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=knzT63YqZl15yKh6HlQ2XhiL5UJTCYbkBsdMVBgQUuM=; b=zxKnE1l+Dlbng6Il5cYffiM92nP4yJ+TTxg4nNMwPs1oUby/nD2DfNWiSZ0WTnJ5bj Zb6l2L4QY8m6dQPb4MguzA6v4nI9aUYhkg/4jTUB+wBHTYqHkMkNjZYIxTs3mM6U9vqH KhYYFDXavH68CNOPm4maS3q4xxpJfIuW9RZJrs5IibPftpLw8F79FGUd/ghvUvHLEgYQ 1s33/H7ZfEOLiyh9/EkgLUKMnuOnytP0/Ax6f80y0rnso5gOgx6dw+8epQl0wR5avADw +PHQZ0UvfvPqgd1okMBoU001/8ah7Otp85vDhq/1EwostZaWVLoE6vEkSHseoWM1lBMS tGFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JLLtnE1K; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v10si9583747qvf.70.2019.09.02.03.32.09 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Sep 2019 03:32:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JLLtnE1K; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jd1-0004eY-Vt for patch@linaro.org; Mon, 02 Sep 2019 06:32:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54854) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jSl-0004fv-4P for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4jSi-0004Gt-Kt for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:31 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:51935) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4jSi-0004GD-Ew for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:28 -0400 Received: by mail-wm1-x32f.google.com with SMTP id k1so13942984wmi.1 for ; Mon, 02 Sep 2019 03:21:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=knzT63YqZl15yKh6HlQ2XhiL5UJTCYbkBsdMVBgQUuM=; b=JLLtnE1K6j/6hQayw3+HZYqiwtCef5eyo/e2z2LQ51gMCPhp173LH2SAT2nayhZlQ6 FlCzI4tHaS6v3DJYNC8JSO4xkMC+BoB+7ZPL7d8FSvxrfX6GUxXDHaAy16pNvSWO3K39 u37HM8S76JbQz100c8Uy/+JTrZDM408o5F/HYniyQplK7XdxzKO7kwjL5m1pFCW/Uvyy SxImWvYq+3FHEYcsH/UI+IyHwXqYjVDs5kU8gZqe14sJTv6jnrQSGgnNP1oOgKlGunS/ z6VCTQAuh393sxqviviuPpw/gKHYZPVu35NdQ1mMTFH24wCFtQGYNIuQ0a96LzAJBvaH UBTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=knzT63YqZl15yKh6HlQ2XhiL5UJTCYbkBsdMVBgQUuM=; b=S5P0jbuAewcMEunYQZrdfDfIAibhhBAUNOMeS4mWj+3VeF4wbBQRc9FLjB9W8DD0qX zlkdnons5IxmGN0YDTtiwUD0TErVx2ur4zP1Dk+erMDZ0dW0ru/oph4sLHiOMdhpWdye p63kWWpl5PWb4DNKfxrANlM+h8TpjwGp4cqCrVStk7tIK2rT3lJg1ScQTXNSLQl6mLKI MSSI+QBEy61M0DHqeCfLcm8UodtPnu/UcF5VdWklCPAsvzrVmVW62xupZ7No4b82/grX 6kTdO0RpbUVaOiHC5fvgN5Jl1k3dK8EbkBIBF2IXb4j3Xz22t8SUFRAL3qDeFBL65eho oTkA== X-Gm-Message-State: APjAAAUGh4IvBSQ43dgBQGT66+lQ/jrW75W08+gKKZ4ocRFirS8cUzMi UiDg0BLLWQmF9TuHKYi5UoRT0A== X-Received: by 2002:a05:600c:2056:: with SMTP id p22mr34545032wmg.155.1567419687343; Mon, 02 Sep 2019 03:21:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d18sm16506357wra.91.2019.09.02.03.21.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 03:21:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A16EA1FF92; Mon, 2 Sep 2019 11:21:22 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 2 Sep 2019 11:21:15 +0100 Message-Id: <20190902102122.1128-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190902102122.1128-1-alex.bennee@linaro.org> References: <20190902102122.1128-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32f Subject: [Qemu-devel] [PULL 05/12] mailmap: Reorder by sections X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Aleksandar Markovic Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Our mailmap currently has 4 sections somehow documented. Reorder few entries not related to "addresses from the original git import" into the 3rd section, and add a comment to describe it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Aleksandar Markovic Message-Id: <20190822230916.576-2-philmd@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.mailmap b/.mailmap index b8e08297c90..e1fdc88d25d 100644 --- a/.mailmap +++ b/.mailmap @@ -4,20 +4,12 @@ # into proper addresses so that they are counted properly by git shortlog. Andrzej Zaborowski balrog Anthony Liguori aliguori -Anthony Liguori Anthony Liguori Aurelien Jarno aurel32 Blue Swirl blueswir1 Edgar E. Iglesias edgar_igl Fabrice Bellard bellard -James Hogan Jocelyn Mayer j_mayer Paul Brook pbrook -Yongbok Kim -Aleksandar Markovic -Aleksandar Markovic -Paul Burton -Paul Burton -Paul Burton Thiemo Seufer ths malc malc @@ -32,6 +24,15 @@ Ian McKellar Ian McKellar via Qemu-devel Julia Suvorova via Qemu-devel Justin Terry (VM) Justin Terry (VM) via Qemu-devel +# Next, replace old addresses by a more recent one. +Anthony Liguori Anthony Liguori +James Hogan +Aleksandar Markovic +Aleksandar Markovic +Paul Burton +Paul Burton +Paul Burton +Yongbok Kim # Also list preferred name forms where people have changed their # git author config, or had utf8/latin1 encoding issues. From patchwork Mon Sep 2 10:21:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 172731 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp4135470ily; Mon, 2 Sep 2019 03:28:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqx9o650GWoAksY+T5fghhFHmoPC3J5veQ93a8sAL0GRuhGdYF1iBOETTDADlNj9SlQMwXwU X-Received: by 2002:aed:2da3:: with SMTP id i32mr27381712qtd.299.1567420097370; Mon, 02 Sep 2019 03:28:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567420097; cv=none; d=google.com; s=arc-20160816; b=BPuay1YPuvuketU+xRwL+Ufnk+gttj/N1qQtJ57avk5zxVdFhC95TiXOFzVbz27Kec EdtN0WFXaRAglobpZopbUjaD+r/DKUNi3oiRSwutggXHTu2L6v6pW3ldNKNs/hY3MbZI flpfExPXhcUHcwar8PTdEvYqTkjHgeyIq4rK8IaGUSgw23yALnLRim/f8J/yOywSO4PJ 6eTH8112UKIFvjYCoKtvPMMGODBERFWE1spcpG7cHxQdiLInbpfTMYpS2iWd1dBQuU/c OMNmP+QF7J2kpzHv/FNJPXNXV4F7FfYIuu3x7eoJ/GKw13FfAF4RR5nSd6A4aqDH8lIE 0fOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=/C/Ddn3mzT9qM5IiqGCuDyOeIZFrxvHB/E14ISaKzjU=; b=FKAiNTH0Q+Sn1Tv35R9ruoA4RHM5Er1PH6ts8o9fQeDrBIVMJA8Fg2//STbajGljqV TjohcvuFfU50rL87yMbqdqDSXGHEVLm4SwVB6FohmAw+mjLjKXZnlinpB54ar0a13bRR u+lOvxbHjYoIRMB700GveTIcsQ/vvEcSbMmZXzPv1+E1SR02N2hh6SceXAZepgcbQTt4 7PlrWdXwmgHeUNmTdMWEzKFNvXBes99lLkkJE11KbpcRDEPXekY2/CiM1Qopx3J2DQ0i szMJ3x7ZUgOkpQ2enH1WyThYgNalut4Bf+HvjKO68rMrLLm60JqJFrOYIITTIhElV7gS gD8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vwPTnu9B; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o12si5745639qkj.337.2019.09.02.03.28.17 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Sep 2019 03:28:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vwPTnu9B; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jZH-0001UB-VA for patch@linaro.org; Mon, 02 Sep 2019 06:28:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54837) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jSk-0004ee-4f for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4jSj-0004H8-54 for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:30 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:43182) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4jSi-0004GX-VY for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:29 -0400 Received: by mail-wr1-x42a.google.com with SMTP id y8so13402030wrn.10 for ; Mon, 02 Sep 2019 03:21:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/C/Ddn3mzT9qM5IiqGCuDyOeIZFrxvHB/E14ISaKzjU=; b=vwPTnu9BizIjGlbw0n4zUppDhI11vtld+pCm4A1iH7TfhT/xTLj8gZTBkBsIYJ+55/ 5pa4h2M6W5D9JJJyFqzcC/7AVubADNg1HpDSNYeTq16x5RWvdjBEex2bhnmGK9Fc1icG D9o8gJzMjHBiXiCa1ON1nzGLPkLvwdz8KJqvJHN7bVZp58uMZMNKMOD8bmMS+h9n4khg CH0TOl7whO3k5tIi4NcXaLBxAuV+AHcKLN6p5IhJaHeQb3fRaUz7u6H4xqfpH4z+/oJa QukA1L3faVJdqPaXYOqrNYsmT+DsCFhgI6sN01mPq3S5eKxzF9YLRrW8kUoDJrqbsZPM RypQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/C/Ddn3mzT9qM5IiqGCuDyOeIZFrxvHB/E14ISaKzjU=; b=lPhY5HOlNZV5QAovR2B2gdnnV8UVsoE9jYTqC0p3RYNJaF0ZaYNhDBv5ZEKfm4ZVes JxXi6ka6x0M11fHx4re8Kc+Hlya9TOvuyYJES+SoxtXTWHKoBhENfJvb7TXq0cSjOnfl J0P//SzSzztIJxLEpQ1YkUpquUXOOdxhdDABz1ME8agSgdLBQYnSLXrL88G00MOgPaFP MdtNNapyqE/irj8yQGK7w/+QV24FIs1Jt8pBgAqPaUUziDbJiN+IqefvkFwMAmSFM3TG bedUiRz/2tw2fRCWimMZrwNzoVLKWRmiPdBbM3LCAdzyLzY2f6mfOVKyrzO6/pX4V+Ii D4rg== X-Gm-Message-State: APjAAAWEKLZcDK+TcwtYNkVA853b1TQUJemUenyLdOOM6eWv54SxcssD ahz1O5bU6KZx+hjcyvD+j4UopA== X-Received: by 2002:a5d:4448:: with SMTP id x8mr30583454wrr.119.1567419687831; Mon, 02 Sep 2019 03:21:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o3sm16292947wrv.90.2019.09.02.03.21.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 03:21:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B6C961FF93; Mon, 2 Sep 2019 11:21:22 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 2 Sep 2019 11:21:16 +0100 Message-Id: <20190902102122.1128-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190902102122.1128-1-alex.bennee@linaro.org> References: <20190902102122.1128-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a Subject: [Qemu-devel] [PULL 06/12] mailmap: Update philmd email address X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Aleksandar Markovic Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Use the email address where I spend most of my time. Suggested-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Aleksandar Markovic Message-Id: <20190822230916.576-3-philmd@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.mailmap b/.mailmap index e1fdc88d25d..e68ddd26e67 100644 --- a/.mailmap +++ b/.mailmap @@ -32,6 +32,7 @@ Aleksandar Markovic Paul Burton Paul Burton Paul Burton +Philippe Mathieu-Daudé Yongbok Kim # Also list preferred name forms where people have changed their From patchwork Mon Sep 2 10:21:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 172726 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp4129545ily; Mon, 2 Sep 2019 03:22:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqy+vJb1/0HdU398GGiGukNFFbJrlI+cvY00eMqjo8sPiViGlfh5PJ4nnAWdoQxeFGWhA2Ww X-Received: by 2002:a37:4995:: with SMTP id w143mr28163008qka.224.1567419723153; Mon, 02 Sep 2019 03:22:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567419723; cv=none; d=google.com; s=arc-20160816; b=dTi4BNGABd2U6GOH/TWzyatprI2voIuDujs5uSQKs0kmrd+ihx191KvuvNqj4N7yXR FLBO9A9PuoCaEV9znapVSp6ny42QVF/xU1CbGbntQqKZidqdEBBRiqOgDSQAsB2mDm2R ASqxeomYiU19LfrbZ2sDben0DyhJs5M/huQvgkdCA17cJDKA/UOXzdaDuEYC2UeEBNf4 URyJOles30YNxBycoJpBieZ1zCokgJDuVUE+WZhJylmFbVwET8e6NXkGkegNxTKDdAcG ipU0Omj/TUuGJxxq1+c/a3gsa4bHc+AyAGL379DfA7KjGwg5dQ046ReAKWA2g1GkMsYk iRVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=KLXzyJFC5lUK5mYZENe3rJOMpLSLZyH9F+bD6FR7ECk=; b=BlIt3mDI6Ha2nsamjyztBHOS54GV6qHdJLVaBDluKJmMDnD0PKZh3J0IdHYrM5gnpP 3nplj+Jkd33pdAIDZuum3bgoS8wWbGitWlM5wApEYjcbGQnpziFgY0qdrv5S4kZDOZ6z ux2ek6kV9pZJthFqLo90Y8suvjM39zqp9g4OYG63tkbRvq41sKp2OCV1P3jMxBYBkENJ RL7I2S7ha+pKsxcqdaf/g+W9EDovkG552RMZKfNeE7qoyTQXPtmBts5/ectrv3GUrEAQ 8liyzkdrOQdBJpMWWnkdOJhnXDydStJEYuLRtcD0lnCwzVQi0Nz5MxD14OqwuVBTw+JD u8jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=acxx0XST; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s126si9709791qkf.336.2019.09.02.03.22.03 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Sep 2019 03:22:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=acxx0XST; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34723 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jTG-0004pk-35 for patch@linaro.org; Mon, 02 Sep 2019 06:22:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54894) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jSo-0004lS-0a for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4jSk-0004Hq-Jn for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:33 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:54010) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4jSk-0004HT-DK for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:30 -0400 Received: by mail-wm1-x332.google.com with SMTP id q19so5132547wmc.3 for ; Mon, 02 Sep 2019 03:21:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KLXzyJFC5lUK5mYZENe3rJOMpLSLZyH9F+bD6FR7ECk=; b=acxx0XSTbWUBOP46pwFuKAEhPqDkuK0B5utiGh6xZnLC8rzFxhDHTABaPbJOEwq8jY 6gwJL4riqny7MCvHvY1EoYRSN2ZmUhbnn51LGqoPDv84WmuKde7lcBaoVHmty7BT4qJj zkXBNfHM8+SuKqBgLxsElL1xIARvy787E+zYbi3wcEFhOyuZZZDfFcodTn6/GmZkYVan tcMTF1dTq6bwMQ2KVzW25WKx3v47cc/KWo/1JQ8Z+kuCXn7/CNe6Lt59mbRBW83Syauq 267RUMYbBX7YmvQJ+Q3qaBuKEDe69QN2sBDgSH/WVv+P0BI1gi0b0mRBxoI5rxZFbZop /vNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KLXzyJFC5lUK5mYZENe3rJOMpLSLZyH9F+bD6FR7ECk=; b=Ds2YABQiZ+bcinDT+cU7hNM4kJhJRFjs11hHL52HNN0bhQ15y2JTQekwHky1cE8K8S fj/7CaTeAw7acm3u78uGv/3PfSt0OtFUD3z9PVP0p3nxRLyutt+XkUSHXD7n1Nn5+zoa IO1G5SMvF07mUmUbmbNWrTsZ3BrD2UgaGgdi/CBghKcWfxwP+3udU3qwBL6U0+42RvU3 pEemvJCe1MgkysYMovn+YBwk14WRqM0s5RKe+Crf5zPj1q2wRbMYjt6SYs8PIBUwE59v PIvBFETccmsusC0bf3TIGBtq9OLXXm/CCWCZrubx8Adrt8KoY8yNXLCCq98S7fqnNHzh pekQ== X-Gm-Message-State: APjAAAVSMNC2CiBkl3wXVB3Vo/UtFVNsBeh7wGfm4qCFYuyM5pU9clTI WRyLY0Er0bHTaIYQ1ZAbNlSH+A== X-Received: by 2002:a1c:1acc:: with SMTP id a195mr1279564wma.106.1567419689283; Mon, 02 Sep 2019 03:21:29 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c132sm18635854wme.27.2019.09.02.03.21.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 03:21:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CC7851FF96; Mon, 2 Sep 2019 11:21:22 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 2 Sep 2019 11:21:17 +0100 Message-Id: <20190902102122.1128-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190902102122.1128-1-alex.bennee@linaro.org> References: <20190902102122.1128-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::332 Subject: [Qemu-devel] [PULL 07/12] mailmap: Add many entries to improve 'git shortlog' statistics X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Aleksandar Markovic Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé All of these emails have a least 1 commit with utf8/latin1 encoding issue, or one with no author name. When there are multiple commits, keep the author name the most used. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Aleksandar Markovic Message-Id: <20190822230916.576-4-philmd@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/.mailmap b/.mailmap index e68ddd26e67..d0fc1d793c6 100644 --- a/.mailmap +++ b/.mailmap @@ -37,5 +37,110 @@ Yongbok Kim # Also list preferred name forms where people have changed their # git author config, or had utf8/latin1 encoding issues. +Aaron Lindsay +Alexey Gerasimenko +Alex Ivanov +Andreas Färber +Bandan Das +Benjamin MARSILI +Benoît Canet +Benoît Canet +Benoît Canet +Boqun Feng +Boqun Feng +Brad Smith +Brijesh Singh +Brilly Wu +Cédric Vincent +CheneyLin +Chen Gang +Chen Gang +Chen Gang +Chen Wei-Ren +Christophe Lyon +Collin L. Walling Daniel P. Berrangé +Eduardo Otubo +Fabrice Desclaux +Fernando Luis Vázquez Cao +Fernando Luis Vázquez Cao +Gautham R. Shenoy +Gautham R. Shenoy +Gonglei (Arei) +Guang Wang +Hailiang Zhang +Hervé Poussineau +Jakub Jermář +Jakub Jermář +Jean-Christophe Dubois +Jindřich Makovička +John Arbuckle +Juha Riihimäki +Juha Riihimäki +Jun Li +Laurent Vivier +Leandro Lupori +Li Guang +Liming Wang +linzhecheng +Liran Schour +Liu Yu +Liu Yu +Li Zhang +Li Zhang +Lluís Vilanova +Lluís Vilanova +Longpeng (Mike) +Luc Michel +Luc Michel +Marc Marí +Marc Marí +Michael Avdienko +Michael S. Tsirkin +Munkyu Im +Nicholas Bellinger +Nicholas Thomas +Nikunj A Dadhania +Orit Wasserman +Paolo Bonzini +Pavel Dovgaluk +Pavel Dovgaluk +Pavel Dovgaluk +Peter Crosthwaite +Peter Crosthwaite +Peter Crosthwaite +Prasad J Pandit +Prasad J Pandit +Qiao Nuohan Reimar Döffinger +Remy Noel +Roger Pau Monné +Shin'ichiro Kawasaki +Shin'ichiro Kawasaki +Sochin Jiang +Takashi Yoshii +Thomas Huth +Thomas Knych +Timothy Baldwin +Tony Nguyen +Venkateswararao Jujjuri +Vibi Sreenivasan +Vijaya Kumar K +Vijaya Kumar K +Vijay Kumar +Vijay Kumar +Wang Guang +Wenchao Xia +Wenshuang Ma +Xiaoqiang Zhao +Xinhua Cao +Xiong Zhang +Yin Yin +yuchenlin +YunQiang Su +YunQiang Su +Yuri Pudgorodskiy +Zhengui Li +Zhenwei Pi +Zhenwei Pi +Zhuang Yanying From patchwork Mon Sep 2 10:21:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 172730 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp4134811ily; Mon, 2 Sep 2019 03:27:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqxWHm9g+FTePl0jkHFY+si0sEVKFb7iWvXADu1DI/6R21iu336njQUE21PE99DT4dXvie3n X-Received: by 2002:a05:620a:1367:: with SMTP id d7mr6649669qkl.20.1567420049232; Mon, 02 Sep 2019 03:27:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567420049; cv=none; d=google.com; s=arc-20160816; b=0eHJ2VQ18gMayht+PuZSrtsclMlmLNbf1eaUjDlIpnQ2v04YPVOTbvv9PElof89g1L OJ3prftdn1VGkui2x5+u6YqlioHg/SxfYr4M8EAG8h3NrAehfvV7mvzTJnB1123uzrLa k28q1z25NFB0v2ITHytyCroCEj3YnnC46smswqJwN9B3jN1mQJzjENIOXMZtpt1RLsfw OOUp+DGY9Sv5Xf2klyif6FarCVos9hl65QlorJyj4WBwA0Tg+lusGmNnJO0sqOEa1opY HkaCXoilwtkMcl3XL7ACFllGOl0rj3IIjm3xxQqr6/3mb1khNcuLP4tMEyEVed6o6Otj YUhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=FqjuG3RUHS3JckYSNiYZ0vObZ8wV+Y4/XOCXHmnveCo=; b=IqySBd/G/DK/lkOJRQ4cKc/1i5NOPj3U4RpgSbxweSc1lB8vNLK/BMYawa9pPhCBMs 1sqq3W9QZ4/HqO5nqMmhPsjt08PywFNJev2SR01BOREIc++E/gEVKyX6M+Sy1Z+AcqNe jGbjg4pQmSXOBAk4cHPB6KTxTFhERPpka7IQk+dlubzXVZ5QlVX4wdJgvyXdVFi1Ays3 /PE2I05YBEsZD++wKzTz8qUx7E4T3tsQRBeunSGTGU0PmVepDoUctdp4bhYhF2KdMeZG zin6CDE30wXs8ixk0pzJhsV5yEXs2ol0eG4tpFIJQGCgdjROnNNBOya5cghiwXZ1s2tt 8KIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TqOHHbvC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o15si9306473qtg.26.2019.09.02.03.27.29 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Sep 2019 03:27:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TqOHHbvC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jYV-0007zL-Tf for patch@linaro.org; Mon, 02 Sep 2019 06:27:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54883) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jSn-0004kG-Di for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4jSl-0004IF-6i for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:33 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:52761) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4jSk-0004HC-W3 for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:31 -0400 Received: by mail-wm1-x32e.google.com with SMTP id t17so13943141wmi.2 for ; Mon, 02 Sep 2019 03:21:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FqjuG3RUHS3JckYSNiYZ0vObZ8wV+Y4/XOCXHmnveCo=; b=TqOHHbvCClDHl6VSYqE9nNZYFWu83QoHEE7rROcNBoZPJKgVhutaG3ZUPtulCpCBoD 83polwalRvyvN+L/i6CDyhTldnFxbmtIh3W/4ABJNDniXAbUS7DNqyCN89tmofYRewt1 lxJcKJK/8AXyYZo9ocuyE6w16m5LGg5Bv2LEehVfO4d9g9wFy1tmEzifPji2Kip24Mag yzC2LO9A/Hrt3Zkroz2bXoXSSVceVmVlzuNo0l4R/mWOHDNLOn+9r6orP3s+7khJv3PT dhVCGfWj/cp5HPWpWqxf+fQhdUCySdIKZtJNsNReP5BnzMnz7cTIlLYvmsGbqVVEpQo8 K0Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FqjuG3RUHS3JckYSNiYZ0vObZ8wV+Y4/XOCXHmnveCo=; b=arucEsqu5OfUysWgohtJmh1cJWtiZ90XJ2DHph84lh0HFCSLTCXSK17seXzMbZ3rtD 66HeIpj1y22jArBFSpKAkH6RH9n/E/XGbTGUjJlj+9QCR4qd3I5IPE26WegdyTOzVPHY 6MHgVVY5LyHQOlbWPN/wNBPS9jRyuQtOG7qmk+LVfv/73WYjSJiKpKY50ujtKqVBp1py Cw6eCl0ndvphim+USerzsfFDuqGfK9Osf8ehdPtTbif7TBfCUigH3TmZweKfHxzYRsL3 lo0DtA6A551aL/TGWlAExY++Z9RM3DOTGGLumTeDlabdrJlCIe5V+6YvU0wn83jztB2o aK0Q== X-Gm-Message-State: APjAAAVvunD5OnadcANbbHRegT+5JE6HUX3t7ytLLbFyGFe34RUYXLMI xH1O3lsY0aursn1JrmvXjuQuQg== X-Received: by 2002:a1c:eb06:: with SMTP id j6mr36437267wmh.76.1567419688772; Mon, 02 Sep 2019 03:21:28 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f66sm729106wmg.2.2019.09.02.03.21.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 03:21:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E46641FF98; Mon, 2 Sep 2019 11:21:22 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 2 Sep 2019 11:21:18 +0100 Message-Id: <20190902102122.1128-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190902102122.1128-1-alex.bennee@linaro.org> References: <20190902102122.1128-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e Subject: [Qemu-devel] [PULL 08/12] .mailmap/aliases: add some further commentary X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Aleksandar Markovic Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The two files are not interchangeable but a change to one *might* require a change to the other so lets flag that up with an explanation of what both files are trying to achieve. While we are at it document the many forms .mailmap can take in the header. Signed-off-by: Alex Bennée Reviewed-by: Aleksandar Markovic -- 2.20.1 diff --git a/.mailmap b/.mailmap index d0fc1d793c6..0756a0bf66d 100644 --- a/.mailmap +++ b/.mailmap @@ -1,4 +1,18 @@ # This mailmap fixes up author names/addresses. +# +# If you are adding to this file consider if a similar change needs to +# be made to contrib/gitdm/aliases. They are not however completely +# analogous. .mailmap is concerned with fixing up damaged author +# fields where as the gitdm equivalent is more concerned with making +# sure multiple email addresses get mapped onto the same author. +# +# From man git-shortlog the forms are: +# +# Proper Name +# +# Proper Name +# Proper Name Commit Name +# # The first section translates weird addresses from the original git import # into proper addresses so that they are counted properly by git shortlog. diff --git a/contrib/gitdm/aliases b/contrib/gitdm/aliases index 07fd3391a56..c1e744312f5 100644 --- a/contrib/gitdm/aliases +++ b/contrib/gitdm/aliases @@ -1,6 +1,22 @@ # -# This is the email aliases file, mapping secondary addresses -# onto a single, canonical address. Duplicates some info from .mailmap +# This is the email aliases file, mapping secondary addresses onto a +# single, canonical address. It duplicates some info from .mailmap so +# if you are adding something here also consider if the .mailmap needs +# updating. +# +# If you just want to avoid gitdm complaining about author fields +# which are actually email addresses with the message: +# +# "...is an author name, probably not what you want" +# +# you can just apply --use-mailmap to you git-log command, e.g: +# +# git log --use-mailmap --numstat --since "last 2 years" | $GITDM +# +# however that will have the effect of squashing multiple addresses to +# a canonical address which will distort the stats of those who +# contribute in both personal and professional capacities from +# different addresses. # # weird commits diff --git a/contrib/gitdm/group-map-individuals b/contrib/gitdm/group-map-individuals index 05e355d30ec..1c847174380 100644 --- a/contrib/gitdm/group-map-individuals +++ b/contrib/gitdm/group-map-individuals @@ -2,7 +2,8 @@ # Individual and personal contributors # # This is simply to allow prolific developers with no company -# affiliations to be grouped together in the summary stats. +# affiliations (or non-company related personal work) to be grouped +# together in the summary stats. # f4bug@amsat.org From patchwork Mon Sep 2 10:21:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 172729 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp4132663ily; Mon, 2 Sep 2019 03:25:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqySumkI++2zidmtkFJAbmC0xNJcpi+luXELfjMdWZGxcNfnGrnJBjAz/ipv4Dpbj8VawmQ9 X-Received: by 2002:a05:620a:1386:: with SMTP id k6mr4680617qki.409.1567419916281; Mon, 02 Sep 2019 03:25:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567419916; cv=none; d=google.com; s=arc-20160816; b=oEtfrdids26VRsb9JbyzmfFW9fCupxW2s/F+ncdxp4EgMKRZkKaQwnD4f9ejFNMU9I uTsz4l3NlTqzWj1ExvbfWc8cNX5tyo3VyYFKR6OYaML++Ne21zvpmvNkragvHinZXWBK Do1nKramImntZa9339ugzwAwr4ae6aXE7QzUfbFgc2tIMj7nBjSO9cR+mD3qNhBoMtqo 81+PHjUW0qMSo6090dDXq4sxyggHYAyKtiMxEgcMB1SqyEMB+PZQ9RtQQZ1H9+0KnQSm +Hfx3hSqNu9VqJ5Q2bxf4oQm4KM3lAdZb7HfZw4YotSYPe3fzbrfAszbd+M/3PUNeNM9 vP5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=qUZSmFGjrzoPrErHsikW1HoBierWwmyBbkhOk/UFsHU=; b=QooKTAuzIkQSL8c4RX9+G4CbAqh+RBDWe3Wnjm0SrpJu8LYruuM3iAbgRXmxyW7eff PsUNRoaoSD4CqizoRHsACYGAVUOUWDGnQy8jLCJLnCbL6hQhggmHpc5UhFkUuaTRy+YT hRDxO5pNQAANWTTUFeCOHj3KYgx0hmgEW/oO/W94MLqFiGyFcMgxOtKewPayPOrGhMrq 6a8AbdIyts0gv4HYMZFwBnYk4wnbK2GxM0v+A2BdSg/JYIJQ4lhcQl7MBnStSLfaJA+R R26oUQTPi9jpgnoJsEYZ/fOOmVDzJf+/5k9m9xeNpuhJ4Ob1d8FgDeCxluvqBRIZuKhQ Ft8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fCbf34P+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z206si9758262qka.72.2019.09.02.03.25.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Sep 2019 03:25:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fCbf34P+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jWN-0007id-J6 for patch@linaro.org; Mon, 02 Sep 2019 06:25:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54885) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jSn-0004kr-Hx for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4jSl-0004IS-Ie for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:33 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:34951) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4jSl-0004I1-CF for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:31 -0400 Received: by mail-wm1-x336.google.com with SMTP id n10so3316518wmj.0 for ; Mon, 02 Sep 2019 03:21:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qUZSmFGjrzoPrErHsikW1HoBierWwmyBbkhOk/UFsHU=; b=fCbf34P+lEa7r/KOHdkc23nRJEW7qr1pUdXXAyckepyOTwE4filZn2AyFOevxZ+GlP 9+Iv1WF6MwHuiT7FmfuwPkszHWPMuPwm/6ShHom263UPl+DhGqGBCVdgJm8br/FOWAJt zxOU9k5f6I2Zj4wRpel/1ZPXjbqfo3yHNtccZyLrg35BVsoRgsNTo/yTgk03QorIJ5/y KaQRhrbYCFKxlp1aPrfyXRAk71byScVw/0eoNkoMa5R4ZJP+kICBtcuEh9SmrrgSLgXd 3N27foZoqt9UESh3LX66PnOd9guSqTBpsWPGSY95MAQfGI5VysO3xhzj+UEyZAghWLfc 2LFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qUZSmFGjrzoPrErHsikW1HoBierWwmyBbkhOk/UFsHU=; b=FKspCZt1Ed0UcDu5S9k0puafNG4aFZw4W2YZ6RL0sulWYae5DW+jYI0Quody4VgfGv HPpckKs7ye+GB2aFPGEdzs2O5N9Ve6C8JMsKKG+WYJCcsX85Ir5qyr+Yy1bkNKkmLFIX twDmwwp8MkOE+nWHN1bxbcnxYH8q06zUCuQ/2e9Xx01hJE8sLg+JkGwfAbjrN0S0Mzzh lzRvqkuRUbbn01igfxRI0net/hfOIKOsthTcpUSM3Dmkshv9yRhV4XdU7aJebsLmwMaA mllxYicQPafSnIZM9yBLGnUnMMtu36qiySdzdG2PtvaeXmjcmaW4F0Nvv3xMAkgMipf+ nngw== X-Gm-Message-State: APjAAAXY6D/HMKJS96Cs/8CbpIAAw+rEH1LmdRzv1jwQRX5DNmP4U/sF ZcEYaGRPM4sMeUDsneIEmfsI0w== X-Received: by 2002:a1c:be19:: with SMTP id o25mr33625516wmf.54.1567419690347; Mon, 02 Sep 2019 03:21:30 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v11sm21370826wrv.54.2019.09.02.03.21.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 03:21:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 044561FF99; Mon, 2 Sep 2019 11:21:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 2 Sep 2019 11:21:19 +0100 Message-Id: <20190902102122.1128-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190902102122.1128-1-alex.bennee@linaro.org> References: <20190902102122.1128-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::336 Subject: [Qemu-devel] [PULL 09/12] contrib/gitdm: Add RT-RK to the domain-map X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Aleksandar Markovic Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé This company has at least 7 contributors, add a domain-map entry. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190822231231.1306-1-philmd@redhat.com> Reviewed-by: Aleksandar Markovic Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map index fa9d454473d..9efe066ec9c 100644 --- a/contrib/gitdm/domain-map +++ b/contrib/gitdm/domain-map @@ -18,6 +18,7 @@ nokia.com Nokia oracle.com Oracle proxmox.com Proxmox redhat.com Red Hat +rt-rk.com RT-RK siemens.com Siemens sifive.com SiFive suse.de SUSE From patchwork Mon Sep 2 10:21:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 172735 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp4143612ily; Mon, 2 Sep 2019 03:35:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqxMtcjgI52iz0/DNgY9F1FT+fBKDwLsjhOrjfsaF6zgEJCvYPVeJo63jkqe3dr8dNplQZPI X-Received: by 2002:a50:a5dd:: with SMTP id b29mr29934024edc.34.1567420524356; Mon, 02 Sep 2019 03:35:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567420524; cv=none; d=google.com; s=arc-20160816; b=0q+ibGKQnkkXftFRGH8CvQO1zalp3hogG2tiCwZPbvtVGcGCIwqH7S5NhZdWE8sefz fTVVf4NG8sgjr/CwoIa4ppWrjeo4oHuKKqlaeVB/+8npXUu/tzERF2FRz90l3Vep51bG 2BITNxU5g3cCyBhtFba3Srw+t5pll4mvSa8mNJ74yNy06+6evV0RreIt6omHxsjg0hDY nNN/q9f2aPRns8hBv1oBetGyxdtFVGvQ8Pa0zKwB3aS0lh7S6baUUyU01mYvs5aX1vDi S0eb0sgIBSqA6H/0X40XH8eRuL5Ryhu6eT6UI7Gdi1JmP/GIMWvQwiHTVfCGDXjvfHNz 7gYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=aUxDkopVA0y1J5jcpRqMAlfZEeffukwY49gYt/BqlVw=; b=fz3gqZhSvYpmIqZAxwlZOJof/kYcwu5c3/KDW6yiNDL0KeUoDULcASepHtE9tSmJrU 1ZgGCOp4/5oOXrbbF/C3GbtX8llbw/imy0b7coCF7xR8vjZWekJaGRC/ITpwGwXgRac4 zrXqh/boCwh4EG/18xVjN0i/B7r2hPz4gFtCca45ldrjH69mpj3EVX8EBdGQU1f0Olz2 cmNwgeaoxgxeBAKx2Q5iGbS1duAQ1FxklEG1GylUKiQixgkGi8MZmjVWNFYlzaa1bkAH 1ctuSIKWA/S+0izCVwfG5jCBjZNXaIXBeBQ9xtJ9+/SsH/5YiXXVYRzq/4CTmQtNW+oi 3cQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=APUR2qkS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z15si4427675edd.431.2019.09.02.03.35.24 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Sep 2019 03:35:24 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=APUR2qkS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jgB-0007dp-8R for patch@linaro.org; Mon, 02 Sep 2019 06:35:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54899) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jSp-0004ln-5y for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4jSm-0004Ik-2j for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:34 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:33452) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4jSl-0004IL-TI for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:32 -0400 Received: by mail-wr1-x434.google.com with SMTP id u16so13459746wrr.0 for ; Mon, 02 Sep 2019 03:21:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aUxDkopVA0y1J5jcpRqMAlfZEeffukwY49gYt/BqlVw=; b=APUR2qkSjavQY9LrtTN+X9EBcWbCADcwA7dDu684VLIm8KOHB0o0CszT2e3igJg2H5 KCtkmU1QHFbt+mCNBqjXeSIyKJk+Qpa7cz5yPuXZel0Ii7JMVqcG04p1X6I4TnJZorSu RYSw/9CZoxN19PoH1coug++kQATONXp7LsFXzkDow0ziK8A3kxl+Q4KjfdXldd5oAg7J tNT4Mby2GjHWygB7QNHIpWwxk4JkasqpOQJ5P6TZ/c/LEPPOKmsIpL1DpefpnJOoYKnX E5Garwl7Hq8YV8FuWvxZJTvJgpOG2mgdOr+Wk/eDK4nrrmmWGW+9R5+vW/GY1k5zOAah sQzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aUxDkopVA0y1J5jcpRqMAlfZEeffukwY49gYt/BqlVw=; b=Kcl1CDaKnAdC/9bTqj5d3gZyVhDVfQusVXNE/c+HkyTy3i6VheQckM5gaGFqDc5U0H FO89iG1cJfQK+cQnIMVw67iCZAsw+pn4sAmL50Rl+ipBx9A2dmJkf2PPpce07DT3N3En UMnY03DvqIpNa7Mi/ZT7bWmUFDtTdEtoN4Lqd0slC/DigJ9sm0DlmJcb4LDufqtVTK7q HE8PfSvK/ME8OkOc3X7Zc8qYVW+0QMN1aHh74Zvb9jzNJRD+AZOr0N2qREkYWJZrh8Wm dm74hgZBgWcUOLhzGkdx8NxCEue2FVR5QdRyQsq5cTNrc6zJerygJ0ck4bMVxF8+cvJo 3tPQ== X-Gm-Message-State: APjAAAVEMpHqjYrOFbR8+Y1i2CkasOWu+CarMAMSzsOKDVQLwFCHALbo bhXCUCbl5YDRosM7BEkxh9ZaFw== X-Received: by 2002:adf:dd0c:: with SMTP id a12mr2875304wrm.289.1567419690813; Mon, 02 Sep 2019 03:21:30 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u68sm21051837wmu.12.2019.09.02.03.21.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 03:21:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1C5191FF9A; Mon, 2 Sep 2019 11:21:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 2 Sep 2019 11:21:20 +0100 Message-Id: <20190902102122.1128-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190902102122.1128-1-alex.bennee@linaro.org> References: <20190902102122.1128-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PULL 10/12] build-sys: build ui-spice-app as a module X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , qemu-devel@nongnu.org, Gerd Hoffmann , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau This reverts commit 45db1ac157 ("modules-test: ui-spice-app is not built as module") and fixes commit d8aec9d9f1 ("display: add -display spice-app launching a Spice client"). Signed-off-by: Marc-André Lureau Reviewed-by: Thomas Huth Message-Id: <20190827140241.20818-1-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/modules-test.c b/tests/modules-test.c index f9de3afdb77..a8118e90427 100644 --- a/tests/modules-test.c +++ b/tests/modules-test.c @@ -52,6 +52,9 @@ int main(int argc, char *argv[]) #endif #ifdef CONFIG_SDL "ui-", "sdl", +#endif +#if defined(CONFIG_SPICE) && defined(CONFIG_GIO) + "ui-", "spice-app", #endif }; int i; diff --git a/ui/Makefile.objs b/ui/Makefile.objs index cc2bf5b180f..ba39080edb2 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -49,7 +49,9 @@ curses.mo-objs := curses.o curses.mo-cflags := $(CURSES_CFLAGS) $(ICONV_CFLAGS) curses.mo-libs := $(CURSES_LIBS) $(ICONV_LIBS) -common-obj-$(call land,$(CONFIG_SPICE),$(CONFIG_GIO)) += spice-app.mo +ifeq ($(CONFIG_GIO)$(CONFIG_SPICE),yy) +common-obj-$(if $(CONFIG_MODULES),m,y) += spice-app.mo +endif spice-app.mo-objs := spice-app.o spice-app.mo-cflags := $(GIO_CFLAGS) spice-app.mo-libs := $(GIO_LIBS) From patchwork Mon Sep 2 10:21:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 172737 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp4145951ily; Mon, 2 Sep 2019 03:37:33 -0700 (PDT) X-Google-Smtp-Source: APXvYqyXbahxLMomCUU4VMM9V3v6mvFfA/X1ewSr3taL3dijAbim/HF5bZ/miY4uvyW+5K8k1FOz X-Received: by 2002:a17:906:b6cb:: with SMTP id ec11mr24099657ejb.27.1567420653369; Mon, 02 Sep 2019 03:37:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567420653; cv=none; d=google.com; s=arc-20160816; b=nP/mHnawhdLGZzpWFKQA7j+rX/TpPbf6Z7cVAQ94o23+w0KdjmEgpxJ4G3s0l5jNG1 mnNudQ/C6OaL+dcmYkbP0Li85PPjia+iaL8HQHviTgu9hA4Fv3GmKtORcxWPoKvEkih2 ajjJ3EZAukgMAJfl2werCLhwRX4JBZO6D+lAX6sRICN8N4WCPI9raQWw6TlK/xr7A8Jz cHEupm/yUA+dI/EA/blQ0NBizM+VSFMPM1ea6YDHk5udIeOxS9KG7Joxd2gtVSkoh0ti eQL6QBYlxaOsxjDGpF1DTzn5krFa3l98aU1rhcve+UaEVYylk4eRoVIFJOnVfrUZyxgk W3dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=oPHGA4epXrz3sRBaImYzLMH9SUMVM871U98ActdGL7I=; b=N/p9CCT38/KyAH4R+UouhNKkNBpdspgOQeDkvzZnmC8NVwPPVdqz2f108M5UtnyLfV 1HNHcKc3w157zkfdxHH3Iytq26n3pR4plLSFoXqCRwbVotK34AcW1Qhx7j4S1VY2xOjW uvbzqOaZOIP4GLitauTDxcU7MIAaDZ3UTM4TF0EmzehjV3Imr6ANKvF5+VEUJSGgeexk Smd7av+8zTt+mG0NStZL5DLMRWkp3XDSCNHTM2YxDjnGehsnMnyrdc8hsm/SsR3UPx+a VHUUb4za3HRuIEJD3LNByu2KA8SWE604cvq7QKWZ0gV95qusSM1qxEGyKvwv5ZzVTVun aYww== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=c5yaFzXn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e49si5900224edb.87.2019.09.02.03.37.33 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Sep 2019 03:37:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=c5yaFzXn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jiG-00013e-C0 for patch@linaro.org; Mon, 02 Sep 2019 06:37:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54920) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jSp-0004n3-Pj for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4jSn-0004JH-Po for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:35 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:33442) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4jSn-0004Ig-K5 for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:21:33 -0400 Received: by mail-wr1-x429.google.com with SMTP id u16so13459788wrr.0 for ; Mon, 02 Sep 2019 03:21:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oPHGA4epXrz3sRBaImYzLMH9SUMVM871U98ActdGL7I=; b=c5yaFzXnNK+06rXJ44PKu9mbQ2TS4OONs6hkX2z7ANU6cVuzgyq1J/gKl59NJb2wKd 7VjEcGFVjKYWqzTaw8HsY7fPT1FuXo5muL3l4lnIr9Wt8Hw7o/AkrTqmbfiQZo4pRSbK XfP+b/Rtib4Xev2ThdvNOU8KCA513S7TxknGwimJxLefB30C7PhGJq6j8do6/v/4B73h UstXAHC5au/wvxdOrokoi9UTacq5TeCH6Q8RSoGODu3UucetVLMVnoujC1JX1gXLm4H6 laduExguTVg/G4uCfYfYhxgGPsNpAE+3bLGRt1G/oX7ZKOG86wYO+NwtSQXT19Jjeqm3 +7kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oPHGA4epXrz3sRBaImYzLMH9SUMVM871U98ActdGL7I=; b=uK6Lu1++MoGC+EIH5OrBAiZJ8AR+3a2QuB4qqYmyKpS6+bia3ze3PbD7Y+LW3mBrPN ukvhYGUqphjwDYKvj5eoYtlLZfHHdalxF7fOuIHNoPx3RpWTkgjaV1H3AoBeWIlYx3cs WoGLfOl6AuAa0gQT+IvjtLAGOuo2sUETLPpmHVjelhHQAjlZJr6w0W9F6vyA+PvLlEAU +BLWi2VMdBKB7SAsttWnXArF0RBPIwmFgGzsq5x0RGQwSV18jOsoJJYVeu0JW+Urbi/i +nGcwhIHm1y69F9VX9yIkbx0rUpZlsRtWBosSsV9BtfyFpM3m6w3g7pE/rjk9Lfs02A9 w2ag== X-Gm-Message-State: APjAAAXelnKdItW0Xgr2UP6oPgrKkiZwfJwnKrnB+Y5x2Ow3ROo77NN/ iA3Es3WE/JhfLlm5QZopTJL5o9TKTQA= X-Received: by 2002:a5d:460e:: with SMTP id t14mr37069670wrq.171.1567419691561; Mon, 02 Sep 2019 03:21:31 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b26sm15848046wmj.14.2019.09.02.03.21.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 03:21:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 319451FF9B; Mon, 2 Sep 2019 11:21:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 2 Sep 2019 11:21:21 +0100 Message-Id: <20190902102122.1128-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190902102122.1128-1-alex.bennee@linaro.org> References: <20190902102122.1128-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 Subject: [Qemu-devel] [PULL 11/12] tests: fix modules-test with no default machine X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , qemu-devel@nongnu.org, Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Fixes: eb062cfa733 ("tests: add module loading test") Signed-off-by: Marc-André Lureau Reviewed-by: Thomas Huth Message-Id: <20190827140241.20818-2-marcandre.lureau@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/modules-test.c b/tests/modules-test.c index a8118e90427..d1a6ace218c 100644 --- a/tests/modules-test.c +++ b/tests/modules-test.c @@ -1,12 +1,14 @@ #include "qemu/osdep.h" #include "libqtest.h" +const char common_args[] = "-nodefaults -machine none"; + static void test_modules_load(const void *data) { QTestState *qts; const char **args = (const char **)data; - qts = qtest_init(NULL); + qts = qtest_init(common_args); qtest_module_load(qts, args[0], args[1]); qtest_quit(qts); } From patchwork Mon Sep 2 10:21:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 172736 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp4144208ily; Mon, 2 Sep 2019 03:35:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqzbWQMGexSJ308aYKl6A724/FBPjatSC7TnEwYVscc0mc0Tm8SlU1rXmcJbH4ZjgDCLOy5N X-Received: by 2002:a17:906:3b8a:: with SMTP id u10mr8563174ejf.167.1567420556402; Mon, 02 Sep 2019 03:35:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567420556; cv=none; d=google.com; s=arc-20160816; b=0Fvp+wgpOuAFB5k/CXTCirZC7dMkvnQ8J583C2DJg81xVYgy9yh7ui83hO5T42figl jb4GBtR62QIJPcGoTrEvABsGEWb7IETT2xw3j0gRR2suzkKvYMshOvblD0y6XzMoXy19 t93ZmJJj4l8jXps8rFuIzHl69lRzxbmNMLYJ8a1fSUm7LF/8PAITH/xqnuGl8M0oY14n ynNLF3CVUrsNoKBThPQgmyeK4dJDAHvKiUjpkIe6KZ+QgNaQoPJUBninLQ9ly8r4RXbk Z9qQ/3YM9BwhyuuTv3xBgwQ4Wravt/vYMB59ajT+irGIXMdSTAHRUTXnJ5dJxArmRKse 3pxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=BwBZji+5Tt15dNYdrMynPgEvZVN3UGmmOt0ukLNN0s4=; b=rbnYa5aDPeHGwg7b3ospAqReXDXdm5lhx+yhcEif19o7TUNasWIj1R1F4zMJbV30Zr M/sMrjgZisWJszsZljBWZofTMiDCiWGytKTFkgKmDkwTuNqwE06a2ZEpdSm4NZRXIGu0 9PARbtVfncS61xkhYyMXc2IeOM+GxGWm7mN/Z46OOHUNc9yMpyD5/FIMnAbvDmFf9/MS PtCqUjNRwKTdzGlu4qTN0fqXRz2PUITZ1FhR0ZqJnCWTjP1JPR2IyTXLR6Jsjc3NVkoz 0DChoz56AQTTT3fyHlerFS+GcS3ILYS2XfAxX9N7qSMEdQkZudXHKVgjc5c0heFXpRE6 1m5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hNhkz+Ur; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a5si3813923edd.448.2019.09.02.03.35.56 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Sep 2019 03:35:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hNhkz+Ur; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4jgh-0008Mq-9C for patch@linaro.org; Mon, 02 Sep 2019 06:35:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55838) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4ja6-0002jc-SA for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:29:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4ja5-0000Lb-C2 for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:29:06 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:45507) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4ja5-0000L9-5b for qemu-devel@nongnu.org; Mon, 02 Sep 2019 06:29:05 -0400 Received: by mail-wr1-x444.google.com with SMTP id q12so13413205wrj.12 for ; Mon, 02 Sep 2019 03:29:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BwBZji+5Tt15dNYdrMynPgEvZVN3UGmmOt0ukLNN0s4=; b=hNhkz+UrkyVCEgoaNtzioElv610aS3SDbzuMRXLHncK9BDg8nxYWupssBI7cm7oaMS zc3Mj9rCWDK02wm72MbmmExpW5SeCR64vAVHaE7521xin1g7vvZ5pMAxSkFHUzrZmwaI D7FCrZ36Wvv7iABsD0hm1QOB/0pRKGu0KkArkArD6ipuld75z8lK0FJaDG/506oRwY/U +Cn1gKwpWLEYggRpoLLfacuGm/Tn4+S23ooTYN79ktflXm4NmuXiEKMxGKY87Q5w4n9X 7SSEJQss32wBY9c+tqOiybltnxLnrsCO3ZhnPmPRnFrLy7hTjzEI9rxPp/XvCGGZTBP8 ubiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BwBZji+5Tt15dNYdrMynPgEvZVN3UGmmOt0ukLNN0s4=; b=uJ6mDoNaaZ/gS35Wj89H996YnWCkb5IEyO4bXY3DzTI/6mlD9q0uDq8NZEpWikucJy DDQlCJRlfAuMfLCZFeUIn2FfIM8G0hIJl8WhD0Gqkf3G4TAMrSVp7Iuo46WXewBlMPYD JozQwoQsvtm3fQ/7tVsINh9ZJK6Mw0vecCeX2j+kDU9VeEaUqkju2I2g2FDSuZ3ImP6V BiJPm59GxS/m8GgvS4mLd76gwEv+m35gs1Ub2pQ9Os36bHEBBTpLsUDkZwIQgZmymHu7 do73ORmAY1mvXxw/JfOfCh7gnmCeiSjk2nh1z3lllkPjIHCkLVZbptmfhU9yMlpLNq8t o0QQ== X-Gm-Message-State: APjAAAW61eFMXHRYxUEA5yYCnXFH+807KnU+/H9i9oAuzHqnR4W+JCJm gjzXW2AmLH0+NPCnsKl9mvpKAA== X-Received: by 2002:adf:f482:: with SMTP id l2mr15786055wro.103.1567420143530; Mon, 02 Sep 2019 03:29:03 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d18sm16556973wra.91.2019.09.02.03.29.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 03:29:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 481001FF9C; Mon, 2 Sep 2019 11:21:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 2 Sep 2019 11:21:22 +0100 Message-Id: <20190902102122.1128-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190902102122.1128-1-alex.bennee@linaro.org> References: <20190902102122.1128-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PULL 12/12] tests/docker: upgrade docker.py to python3 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The recent podman changes (9459f754134bb) imported enum which is part of the python3 standard library but only available as an external library for python2. This causes problems on the fairly restricted environment such as shippable. Lets bite the bullet and make the script a fully python3 one. To that end: - drop the from __future__ import (we are there now ;-) - avoid the StringIO import hack - be consistent with the mode we read/write dockerfiles - s/iteritems/items/ - ensure check_output returns strings for processing Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Cc: Marc-André Lureau -- 2.20.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index ac5baab4cad..4bba29e104e 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # # Docker controlling module # @@ -11,7 +11,6 @@ # or (at your option) any later version. See the COPYING file in # the top-level directory. -from __future__ import print_function import os import sys import subprocess @@ -25,10 +24,7 @@ import tempfile import re import signal from tarfile import TarFile, TarInfo -try: - from StringIO import StringIO -except ImportError: - from io import StringIO +from io import StringIO from shutil import copy, rmtree from pwd import getpwuid from datetime import datetime, timedelta @@ -62,11 +58,13 @@ USE_ENGINE = EngineEnum.AUTO def _text_checksum(text): """Calculate a digest string unique to the text content""" - return hashlib.sha1(text).hexdigest() + return hashlib.sha1(text.encode('utf-8')).hexdigest() +def _read_dockerfile(path): + return open(path, 'rt', encoding='utf-8').read() def _file_checksum(filename): - return _text_checksum(open(filename, 'rb').read()) + return _text_checksum(_read_dockerfile(filename)) def _guess_engine_command(): @@ -192,7 +190,7 @@ def _read_qemu_dockerfile(img_name): df = os.path.join(os.path.dirname(__file__), "dockerfiles", img_name + ".docker") - return open(df, "r").read() + return _read_dockerfile(df) def _dockerfile_preprocess(df): @@ -262,6 +260,7 @@ class Docker(object): def _output(self, cmd, **kwargs): return subprocess.check_output(self._command + cmd, stderr=subprocess.STDOUT, + encoding='utf-8', **kwargs) def inspect_tag(self, tag): @@ -283,7 +282,9 @@ class Docker(object): if argv is None: argv = [] - tmp_df = tempfile.NamedTemporaryFile(dir=docker_dir, suffix=".docker") + tmp_df = tempfile.NamedTemporaryFile(mode="w+t", + encoding='utf-8', + dir=docker_dir, suffix=".docker") tmp_df.write(dockerfile) if user: @@ -396,7 +397,7 @@ class BuildCommand(SubCommand): help="Dockerfile name") def run(self, args, argv): - dockerfile = open(args.dockerfile, "rb").read() + dockerfile = _read_dockerfile(args.dockerfile) tag = args.tag dkr = Docker() @@ -442,7 +443,7 @@ class BuildCommand(SubCommand): cksum += [(filename, _file_checksum(filename))] argv += ["--build-arg=" + k.lower() + "=" + v - for k, v in os.environ.iteritems() + for k, v in os.environ.items() if k.lower() in FILTERED_ENV_NAMES] dkr.build_image(tag, docker_dir, dockerfile, quiet=args.quiet, user=args.user, argv=argv, @@ -611,7 +612,7 @@ class CheckCommand(SubCommand): print("Need a dockerfile for tag:%s" % (tag)) return 1 - dockerfile = open(args.dockerfile, "rb").read() + dockerfile = _read_dockerfile(args.dockerfile) if dkr.image_matches_dockerfile(tag, dockerfile): if not args.quiet: