From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494141043879256.97984849939405; Sun, 7 May 2017 00:10:43 -0700 (PDT) Received: from localhost ([::1]:53922 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GL4-0006XC-7i for importer@patchew.org; Sun, 07 May 2017 03:10:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54091) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GJj-0005jO-5C for qemu-devel@nongnu.org; Sun, 07 May 2017 03:09:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7GJg-0000Hq-6m for qemu-devel@nongnu.org; Sun, 07 May 2017 03:09:19 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:55301) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GJf-0000HO-Oh; Sun, 07 May 2017 03:09:16 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 20A2640483; Sun, 7 May 2017 10:02:31 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 86C6B42E; Sun, 7 May 2017 10:02:29 +0300 (MSK) Received: (nullmailer pid 26540 invoked by uid 1000); Sun, 07 May 2017 07:02:28 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:04 +0300 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 01/23] Remove reduntant qemu: from error functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Ishani Chugh , Michael Tokarev Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Ishani Chugh This patch removes redundant "qemu:" from error functions. The link to the = bitesized task is: http://wiki.qemu-project.org/Contribute/BiteSizedTasks#Error_checking Signed-off-by: Ishani Chugh Reviewed-by: Eduardo Habkost Reviewed-by: David Gibson Signed-off-by: Michael Tokarev --- hw/microblaze/boot.c | 2 +- hw/nios2/boot.c | 2 +- hw/ppc/pnv.c | 2 +- hw/s390x/sclp.c | 4 ++-- hw/tricore/tricore_testboard.c | 2 +- numa.c | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index 1834d22a61..457a08a2fe 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -189,7 +189,7 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr = ddr_base, ram_size - initrd_offset= ); } if (initrd_size < 0) { - error_report("qemu: could not load initrd '%s'", + error_report("could not load initrd '%s'", initrd_filename); exit(EXIT_FAILURE); } diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c index e0a9aff2f4..2b31f5b844 100644 --- a/hw/nios2/boot.c +++ b/hw/nios2/boot.c @@ -197,7 +197,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base, ram_size - initrd_offset= ); } if (initrd_size < 0) { - error_report("qemu: could not load initrd '%s'", + error_report("could not load initrd '%s'", initrd_filename); exit(EXIT_FAILURE); } diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index d4bcdb027f..6a498565c7 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -610,7 +610,7 @@ static void ppc_powernv_init(MachineState *machine) /* Create the processor chips */ chip_typename =3D g_strdup_printf(TYPE_PNV_CHIP "-%s", machine->cpu_mo= del); if (!object_class_by_name(chip_typename)) { - error_report("qemu: invalid CPU model '%s' for %s machine", + error_report("invalid CPU model '%s' for %s machine", machine->cpu_model, MACHINE_GET_CLASS(machine)->name); exit(1); } diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index e741da1141..6996088584 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -496,10 +496,10 @@ static void sclp_realize(DeviceState *dev, Error **er= rp) =20 ret =3D s390_set_memory_limit(machine->maxram_size, &hw_limit); if (ret =3D=3D -E2BIG) { - error_setg(&err, "qemu: host supports a maximum of %" PRIu64 " GB", + error_setg(&err, "host supports a maximum of %" PRIu64 " GB", hw_limit >> 30); } else if (ret) { - error_setg(&err, "qemu: setting the guest size failed"); + error_setg(&err, "setting the guest size failed"); } =20 out: diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c index 19dd587207..8910bf0f27 100644 --- a/hw/tricore/tricore_testboard.c +++ b/hw/tricore/tricore_testboard.c @@ -50,7 +50,7 @@ static void tricore_load_kernel(CPUTriCoreState *env) NULL, 0, EM_TRICORE, 1, 0); if (kernel_size <=3D 0) { - error_report("qemu: no kernel file '%s'", + error_report("no kernel file '%s'", tricoretb_binfo.kernel_filename); exit(1); } diff --git a/numa.c b/numa.c index 6fc2393ddd..39b743bd94 100644 --- a/numa.c +++ b/numa.c @@ -174,7 +174,7 @@ static void numa_node_parse(NumaNodeOptions *node, Qemu= Opts *opts, Error **errp) } =20 if (node->has_mem && node->has_memdev) { - error_setg(errp, "qemu: cannot specify both mem=3D and memdev=3D"); + error_setg(errp, "cannot specify both mem=3D and memdev=3D"); return; } =20 @@ -182,7 +182,7 @@ static void numa_node_parse(NumaNodeOptions *node, Qemu= Opts *opts, Error **errp) have_memdevs =3D node->has_memdev; } if (node->has_memdev !=3D have_memdevs) { - error_setg(errp, "qemu: memdev option must be specified for either= " + error_setg(errp, "memdev option must be specified for either " "all or no nodes"); return; } --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494141812731406.11198395360793; Sun, 7 May 2017 00:23:32 -0700 (PDT) Received: from localhost ([::1]:53988 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GXS-0006WB-7E for importer@patchew.org; Sun, 07 May 2017 03:23:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56011) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GUf-0004Jt-El for qemu-devel@nongnu.org; Sun, 07 May 2017 03:20:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7GUc-000355-AZ for qemu-devel@nongnu.org; Sun, 07 May 2017 03:20:37 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:46153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GUc-00034i-2p; Sun, 07 May 2017 03:20:34 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 23C2C40482; Sun, 7 May 2017 10:20:33 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 7BEA1434; Sun, 7 May 2017 10:02:30 +0300 (MSK) Received: (nullmailer pid 26542 invoked by uid 1000); Sun, 07 May 2017 07:02:28 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:05 +0300 Message-Id: <2d812d6dff5267d80c54125f15a090539573d29e.1494140528.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 02/23] ppc_booke: drop useless assignment X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Michael Tokarev , KONRAD Frederic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: KONRAD Frederic The tb_env variable is set two lines above. So just drop the double assignm= ent. Signed-off-by: KONRAD Frederic Reviewed-by: Laurent Vivier Signed-off-by: Michael Tokarev --- hw/ppc/ppc_booke.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/ppc/ppc_booke.c b/hw/ppc/ppc_booke.c index 60baffaf1d..23bcf1b138 100644 --- a/hw/ppc/ppc_booke.c +++ b/hw/ppc/ppc_booke.c @@ -282,7 +282,6 @@ void store_booke_tcr(CPUPPCState *env, target_ulong val) ppc_tb_t *tb_env =3D env->tb_env; booke_timer_t *booke_timer =3D tb_env->opaque; =20 - tb_env =3D env->tb_env; env->spr[SPR_BOOKE_TCR] =3D val; kvmppc_set_tcr(cpu); =20 --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 14941430946021000.3337790434264; Sun, 7 May 2017 00:44:54 -0700 (PDT) Received: from localhost ([::1]:54042 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7Gs9-000506-Cf for importer@patchew.org; Sun, 07 May 2017 03:44:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58099) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7Go1-0001Pi-GW for qemu-devel@nongnu.org; Sun, 07 May 2017 03:40:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7Gny-000726-DS for qemu-devel@nongnu.org; Sun, 07 May 2017 03:40:37 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:39897) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7Gny-00071h-5l; Sun, 07 May 2017 03:40:34 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 46DE14047F; Sun, 7 May 2017 10:40:32 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id C2FFB430; Sun, 7 May 2017 10:02:29 +0300 (MSK) Received: (nullmailer pid 26544 invoked by uid 1000); Sun, 07 May 2017 07:02:28 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:06 +0300 Message-Id: <61f7c6a0c200db3749f131ff023fa50e7f71814e.1494140528.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 03/23] doc: fix function spelling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Michael Tokarev Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Hajnoczi Signed-off-by: Michael Tokarev --- include/io/channel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/io/channel.h b/include/io/channel.h index 5d48906998..db9bb022a1 100644 --- a/include/io/channel.h +++ b/include/io/channel.h @@ -315,7 +315,7 @@ ssize_t qio_channel_read(QIOChannel *ioc, Error **errp); =20 /** - * qio_channel_writev: + * qio_channel_write: * @ioc: the channel object * @buf: the memory regions to send data from * @buflen: the length of @buf --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494141720819429.8907333731603; Sun, 7 May 2017 00:22:00 -0700 (PDT) Received: from localhost ([::1]:53983 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GVy-00058P-2m for importer@patchew.org; Sun, 07 May 2017 03:21:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56009) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GUf-0004Js-EU for qemu-devel@nongnu.org; Sun, 07 May 2017 03:20:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7GUc-00035B-Ap for qemu-devel@nongnu.org; Sun, 07 May 2017 03:20:37 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:57305) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GUc-00034e-2c; Sun, 07 May 2017 03:20:34 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 083AA40480; Sun, 7 May 2017 10:20:33 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 0E73C432; Sun, 7 May 2017 10:02:30 +0300 (MSK) Received: (nullmailer pid 26546 invoked by uid 1000); Sun, 07 May 2017 07:02:28 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:07 +0300 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 04/23] Add 'none' as type for drive's if option X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Craig Jellick , Michael Tokarev Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Craig Jellick Signed-off-by: Craig Jellick Reviewed-by: Stefan Hajnoczi Signed-off-by: Michael Tokarev --- qemu-options.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu-options.hx b/qemu-options.hx index f68829f3b0..a24fef2107 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -604,7 +604,7 @@ Special files such as iSCSI devices can be specified us= ing protocol specific URLs. See the section for "Device URL Syntax" for more informatio= n. @item if=3D@var{interface} This option defines on which type on interface the drive is connected. -Available types are: ide, scsi, sd, mtd, floppy, pflash, virtio. +Available types are: ide, scsi, sd, mtd, floppy, pflash, virtio, none. @item bus=3D@var{bus},unit=3D@var{unit} These options define where is connected the drive by defining the bus numb= er and the unit id. --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149414305509694.62537626895073; Sun, 7 May 2017 00:44:15 -0700 (PDT) Received: from localhost ([::1]:54040 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GrV-0004Yq-JE for importer@patchew.org; Sun, 07 May 2017 03:44:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58096) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7Go1-0001Ph-Fe for qemu-devel@nongnu.org; Sun, 07 May 2017 03:40:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7Gny-00071x-Cs for qemu-devel@nongnu.org; Sun, 07 May 2017 03:40:37 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:44281) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7Gny-00071c-54; Sun, 07 May 2017 03:40:34 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 9C92240482; Sun, 7 May 2017 10:40:32 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id E1343431; Sun, 7 May 2017 10:02:29 +0300 (MSK) Received: (nullmailer pid 26548 invoked by uid 1000); Sun, 07 May 2017 07:02:28 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:08 +0300 Message-Id: <46bbbec2d30c3d791a6d328e5ef861694ff3eafb.1494140528.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 05/23] tests: Ignore more test executables X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Michael Tokarev Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Eric Blake Ignore test executables when building in-tree: test-arm-mptimer introduced in commit 882fac3 test-crypto-hmac introduced in commit 4fd460b test-aio-multithread introduced in commit 0c330a7 Signed-off-by: Eric Blake Reviewed-by: Laurent Vivier Signed-off-by: Michael Tokarev --- tests/.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/.gitignore b/tests/.gitignore index a966740c2c..5ab00a9c95 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -11,6 +11,8 @@ check-qom-proplist qht-bench rcutorture test-aio +test-aio-multithread +test-arm-mptimer test-base64 test-bitops test-bitcnt @@ -24,6 +26,7 @@ test-crypto-afsplit test-crypto-block test-crypto-cipher test-crypto-hash +test-crypto-hmac test-crypto-ivgen test-crypto-pbkdf test-crypto-secret --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494141431549585.2570825735905; Sun, 7 May 2017 00:17:11 -0700 (PDT) Received: from localhost ([::1]:53952 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GRJ-0003Fh-Q1 for importer@patchew.org; Sun, 07 May 2017 03:17:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54390) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GKy-0006es-QD for qemu-devel@nongnu.org; Sun, 07 May 2017 03:10:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7GKw-0000ib-Ei for qemu-devel@nongnu.org; Sun, 07 May 2017 03:10:36 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:36645) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GKw-0000iJ-6V; Sun, 07 May 2017 03:10:34 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 15CAE40483; Sun, 7 May 2017 10:10:33 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id B04AA3F8; Sun, 7 May 2017 10:02:30 +0300 (MSK) Received: (nullmailer pid 26550 invoked by uid 1000); Sun, 07 May 2017 07:02:28 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:09 +0300 Message-Id: <6b1de1484ee2f80d5795358ea79e90c3ceb64167.1494140528.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 06/23] usb-ccid: make ccid_write_data_block() cope with null buffers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Philippe Mathieu-Daud=C3=A9 static code analyzer complain: hw/usb/dev-smartcard-reader.c:816:5: warning: Null pointer passed as an arg= ument to a 'nonnull' parameter memcpy(p->abData, data, len); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ Reported-by: Clang Static Analyzer Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Michael Tokarev --- hw/usb/dev-smartcard-reader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index 757b8b3f5a..49cb1829b5 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -813,7 +813,10 @@ static void ccid_write_data_block(USBCCIDState *s, uin= t8_t slot, uint8_t seq, if (p->b.bError) { DPRINTF(s, D_VERBOSE, "error %d\n", p->b.bError); } - memcpy(p->abData, data, len); + if (len) { + g_assert_nonnull(data); + memcpy(p->abData, data, len); + } ccid_reset_error_status(s); usb_wakeup(s->bulk, 0); } --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494141904994841.2222870812478; Sun, 7 May 2017 00:25:04 -0700 (PDT) Received: from localhost ([::1]:53993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GYx-0007Z0-C6 for importer@patchew.org; Sun, 07 May 2017 03:25:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56007) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GUf-0004Jq-EM for qemu-devel@nongnu.org; Sun, 07 May 2017 03:20:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7GUc-000351-AF for qemu-devel@nongnu.org; Sun, 07 May 2017 03:20:37 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:39367) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GUc-00034f-2h; Sun, 07 May 2017 03:20:34 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id D7C8C4047F; Sun, 7 May 2017 10:20:32 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 353A5433; Sun, 7 May 2017 10:02:30 +0300 (MSK) Received: (nullmailer pid 26552 invoked by uid 1000); Sun, 07 May 2017 07:02:29 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:10 +0300 Message-Id: <21a9ad2f159e4cafd090cc2b47ce322e024c7363.1494140528.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 07/23] device_tree: fix compiler warnings (clang 5) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Philippe Mathieu-Daud=C3=A9 static code analyzer complain: device_tree.c:155:18: warning: Null pointer passed as an argument to a 'non= null' parameter while ((de =3D readdir(d)) !=3D NULL) { ^~~~~~~~~~ Reported-by: Clang Static Analyzer Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Michael Tokarev --- device_tree.c | 1 + 1 file changed, 1 insertion(+) diff --git a/device_tree.c b/device_tree.c index 6e06320830..a24ddff02b 100644 --- a/device_tree.c +++ b/device_tree.c @@ -148,6 +148,7 @@ static void read_fstree(void *fdt, const char *dirname) d =3D opendir(dirname); if (!d) { error_setg(&error_fatal, "%s cannot open %s", __func__, dirname); + return; } =20 while ((de =3D readdir(d)) !=3D NULL) { --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149414065370421.715360432333455; Sun, 7 May 2017 00:04:13 -0700 (PDT) Received: from localhost ([::1]:53900 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GEk-0004Z3-Ct for importer@patchew.org; Sun, 07 May 2017 03:04:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53246) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GDN-0003sG-PE for qemu-devel@nongnu.org; Sun, 07 May 2017 03:02:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7GDK-00064R-Lh for qemu-devel@nongnu.org; Sun, 07 May 2017 03:02:45 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:38943) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GDK-0005uM-Cz; Sun, 07 May 2017 03:02:42 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 4444140480; Sun, 7 May 2017 10:02:30 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 2F0283F8; Sun, 7 May 2017 10:02:29 +0300 (MSK) Received: (nullmailer pid 26554 invoked by uid 1000); Sun, 07 May 2017 07:02:29 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:11 +0300 Message-Id: <9879f5ac62c1e0c92a5ff2f4a0ada1b66d43da90.1494140528.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 08/23] qga: fix compiler warnings (clang 5) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Philippe Mathieu-Daud=C3=A9 static code analyzer complain: qga/commands-posix.c:2127:9: warning: Null pointer passed as an argument to= a 'nonnull' parameter closedir(dp); ^~~~~~~~~~~~ Reported-by: Clang Static Analyzer Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Michael Roth Signed-off-by: Michael Tokarev --- qga/commands-posix.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index ba06be4c86..284ecc6d7e 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -2125,9 +2125,11 @@ static void transfer_memory_block(GuestMemoryBlock *= mem_blk, bool sys2memblk, * we think this VM does not support online/offline memory block, * any other solution? */ - if (!dp && errno =3D=3D ENOENT) { - result->response =3D - GUEST_MEMORY_BLOCK_RESPONSE_TYPE_OPERATION_NOT_SUPPORTED; + if (!dp) { + if (errno =3D=3D ENOENT) { + result->response =3D + GUEST_MEMORY_BLOCK_RESPONSE_TYPE_OPERATION_NOT_SUPPORT= ED; + } goto out1; } closedir(dp); --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494141176576745.7375983359275; Sun, 7 May 2017 00:12:56 -0700 (PDT) Received: from localhost ([::1]:53930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GND-00009j-7P for importer@patchew.org; Sun, 07 May 2017 03:12:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GJj-0005jM-54 for qemu-devel@nongnu.org; Sun, 07 May 2017 03:09:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7GJg-0000Hz-7u for qemu-devel@nongnu.org; Sun, 07 May 2017 03:09:19 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:54875) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GJf-0000HR-Ou; Sun, 07 May 2017 03:09:16 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id B5BE540482; Sun, 7 May 2017 10:02:30 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 6229942D; Sun, 7 May 2017 10:02:29 +0300 (MSK) Received: (nullmailer pid 26556 invoked by uid 1000); Sun, 07 May 2017 07:02:29 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:12 +0300 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 09/23] util: Use g_malloc/g_free in envlist.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Saurav Sachidanand , Michael Tokarev Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Saurav Sachidanand Change malloc/strdup/free to g_malloc/g_strdup/g_free in util/envlist.c. Remove NULL checks for pointers returned from g_malloc and g_strdup as they exit in case of failure. Also, update calls to envlist_create to reflect this. Free array and array contents returned by envlist_to_environ using g_free in bsd-user/main.c and linux-user/main.c. Update comments to reflect change in semantics. Signed-off-by: Saurav Sachidanand Reviewed-by: Stefan Hajnoczi Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Michael Tokarev --- bsd-user/main.c | 14 ++++---------- linux-user/main.c | 9 +++------ util/envlist.c | 47 +++++++++++++++++++---------------------------- 3 files changed, 26 insertions(+), 44 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index 714a692e6f..04f95ddd54 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -744,10 +744,7 @@ int main(int argc, char **argv) qemu_init_cpu_list(); module_call_init(MODULE_INIT_QOM); =20 - if ((envlist =3D envlist_create()) =3D=3D NULL) { - (void) fprintf(stderr, "Unable to allocate envlist\n"); - exit(1); - } + envlist =3D envlist_create(); =20 /* add current environment into the list */ for (wrk =3D environ; *wrk !=3D NULL; wrk++) { @@ -785,10 +782,7 @@ int main(int argc, char **argv) usage(); } else if (!strcmp(r, "ignore-environment")) { envlist_free(envlist); - if ((envlist =3D envlist_create()) =3D=3D NULL) { - (void) fprintf(stderr, "Unable to allocate envlist\n"); - exit(1); - } + envlist =3D envlist_create(); } else if (!strcmp(r, "U")) { r =3D argv[optind++]; if (envlist_unsetenv(envlist, r) !=3D 0) @@ -956,10 +950,10 @@ int main(int argc, char **argv) } =20 for (wrk =3D target_environ; *wrk; wrk++) { - free(*wrk); + g_free(*wrk); } =20 - free(target_environ); + g_free(target_environ); =20 if (qemu_loglevel_mask(CPU_LOG_PAGE)) { qemu_log("guest_base 0x%lx\n", guest_base); diff --git a/linux-user/main.c b/linux-user/main.c index 10a3bb3a12..5f20769cb9 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -4229,10 +4229,7 @@ int main(int argc, char **argv, char **envp) qemu_init_cpu_list(); module_call_init(MODULE_INIT_QOM); =20 - if ((envlist =3D envlist_create()) =3D=3D NULL) { - (void) fprintf(stderr, "Unable to allocate envlist\n"); - exit(EXIT_FAILURE); - } + envlist =3D envlist_create(); =20 /* add current environment into the list */ for (wrk =3D environ; *wrk !=3D NULL; wrk++) { @@ -4429,10 +4426,10 @@ int main(int argc, char **argv, char **envp) } =20 for (wrk =3D target_environ; *wrk; wrk++) { - free(*wrk); + g_free(*wrk); } =20 - free(target_environ); + g_free(target_environ); =20 if (qemu_loglevel_mask(CPU_LOG_PAGE)) { qemu_log("guest_base 0x%lx\n", guest_base); diff --git a/util/envlist.c b/util/envlist.c index e86857e70a..1eeb7fca87 100644 --- a/util/envlist.c +++ b/util/envlist.c @@ -17,16 +17,14 @@ static int envlist_parse(envlist_t *envlist, const char *env, int (*)(envlist_t *, const char *)); =20 /* - * Allocates new envlist and returns pointer to that or - * NULL in case of error. + * Allocates new envlist and returns pointer to it. */ envlist_t * envlist_create(void) { envlist_t *envlist; =20 - if ((envlist =3D malloc(sizeof (*envlist))) =3D=3D NULL) - return (NULL); + envlist =3D g_malloc(sizeof(*envlist)); =20 QLIST_INIT(&envlist->el_entries); envlist->el_count =3D 0; @@ -48,10 +46,10 @@ envlist_free(envlist_t *envlist) entry =3D envlist->el_entries.lh_first; QLIST_REMOVE(entry, ev_link); =20 - free((char *)entry->ev_var); - free(entry); + g_free((char *)entry->ev_var); + g_free(entry); } - free(envlist); + g_free(envlist); } =20 /* @@ -101,8 +99,7 @@ envlist_parse(envlist_t *envlist, const char *env, if ((envlist =3D=3D NULL) || (env =3D=3D NULL)) return (EINVAL); =20 - if ((tmpenv =3D strdup(env)) =3D=3D NULL) - return (errno); + tmpenv =3D g_strdup(env); envsave =3D tmpenv; =20 do { @@ -117,7 +114,7 @@ envlist_parse(envlist_t *envlist, const char *env, tmpenv =3D envvar + 1; } while (envvar !=3D NULL); =20 - free(envsave); + g_free(envsave); return ret; } =20 @@ -155,18 +152,14 @@ envlist_setenv(envlist_t *envlist, const char *env) =20 if (entry !=3D NULL) { QLIST_REMOVE(entry, ev_link); - free((char *)entry->ev_var); - free(entry); + g_free((char *)entry->ev_var); + g_free(entry); } else { envlist->el_count++; } =20 - if ((entry =3D malloc(sizeof (*entry))) =3D=3D NULL) - return (errno); - if ((entry->ev_var =3D strdup(env)) =3D=3D NULL) { - free(entry); - return (errno); - } + entry =3D g_malloc(sizeof(*entry)); + entry->ev_var =3D g_strdup(env); QLIST_INSERT_HEAD(&envlist->el_entries, entry, ev_link); =20 return (0); @@ -201,8 +194,8 @@ envlist_unsetenv(envlist_t *envlist, const char *env) } if (entry !=3D NULL) { QLIST_REMOVE(entry, ev_link); - free((char *)entry->ev_var); - free(entry); + g_free((char *)entry->ev_var); + g_free(entry); =20 envlist->el_count--; } @@ -212,12 +205,12 @@ envlist_unsetenv(envlist_t *envlist, const char *env) /* * Returns given envlist as array of strings (in same form that * global variable environ is). Caller must free returned memory - * by calling free(3) for each element and for the array. Returned - * array and given envlist are not related (no common references). + * by calling g_free for each element and the array. + * Returned array and given envlist are not related (no common + * references). * * If caller provides count pointer, number of items in array is - * stored there. In case of error, NULL is returned and no memory - * is allocated. + * stored there. */ char ** envlist_to_environ(const envlist_t *envlist, size_t *count) @@ -225,13 +218,11 @@ envlist_to_environ(const envlist_t *envlist, size_t *= count) struct envlist_entry *entry; char **env, **penv; =20 - penv =3D env =3D malloc((envlist->el_count + 1) * sizeof (char *)); - if (env =3D=3D NULL) - return (NULL); + penv =3D env =3D g_malloc((envlist->el_count + 1) * sizeof(char *)); =20 for (entry =3D envlist->el_entries.lh_first; entry !=3D NULL; entry =3D entry->ev_link.le_next) { - *(penv++) =3D strdup(entry->ev_var); + *(penv++) =3D g_strdup(entry->ev_var); } *penv =3D NULL; /* NULL terminate the list */ =20 --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494141813431396.4397962729847; Sun, 7 May 2017 00:23:33 -0700 (PDT) Received: from localhost ([::1]:53989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GXU-0006X8-5L for importer@patchew.org; Sun, 07 May 2017 03:23:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GUf-0004Jo-E7 for qemu-devel@nongnu.org; Sun, 07 May 2017 03:20:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7GUd-00035X-7w for qemu-devel@nongnu.org; Sun, 07 May 2017 03:20:37 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:60467) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GUc-00035L-Rz; Sun, 07 May 2017 03:20:35 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 3005240483; Sun, 7 May 2017 10:20:33 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 482E43BB; Sun, 7 May 2017 10:02:30 +0300 (MSK) Received: (nullmailer pid 26558 invoked by uid 1000); Sun, 07 May 2017 07:02:29 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:13 +0300 Message-Id: <3c76c606dab4d2298a9877628fe28bf9e6d99e22.1494140528.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 10/23] block: Make 'replication_state' an enum X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Michael Tokarev , Fam Zheng Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Fam Zheng BDRVReplicationState.replication_state is a name with a bit of duplication, plus it could be an enum like BDRVReplicationState.mode, which is more readable and also more straightforward in a debugger. Rename it, and improve the type while at it. Signed-off-by: Fam Zheng Reviewed-by: Eric Blake Signed-off-by: Michael Tokarev --- block/replication.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/block/replication.c b/block/replication.c index d300c15475..3885f04c31 100644 --- a/block/replication.c +++ b/block/replication.c @@ -22,9 +22,17 @@ #include "qapi/error.h" #include "replication.h" =20 +typedef enum { + BLOCK_REPLICATION_NONE, /* block replication is not starte= d */ + BLOCK_REPLICATION_RUNNING, /* block replication is running */ + BLOCK_REPLICATION_FAILOVER, /* failover is running in backgrou= nd */ + BLOCK_REPLICATION_FAILOVER_FAILED, /* failover failed */ + BLOCK_REPLICATION_DONE, /* block replication is done */ +} ReplicationStage; + typedef struct BDRVReplicationState { ReplicationMode mode; - int replication_state; + ReplicationStage stage; BdrvChild *active_disk; BdrvChild *hidden_disk; BdrvChild *secondary_disk; @@ -36,14 +44,6 @@ typedef struct BDRVReplicationState { int error; } BDRVReplicationState; =20 -enum { - BLOCK_REPLICATION_NONE, /* block replication is not starte= d */ - BLOCK_REPLICATION_RUNNING, /* block replication is running */ - BLOCK_REPLICATION_FAILOVER, /* failover is running in backgrou= nd */ - BLOCK_REPLICATION_FAILOVER_FAILED, /* failover failed */ - BLOCK_REPLICATION_DONE, /* block replication is done */ -}; - static void replication_start(ReplicationState *rs, ReplicationMode mode, Error **errp); static void replication_do_checkpoint(ReplicationState *rs, Error **errp); @@ -141,10 +141,10 @@ static void replication_close(BlockDriverState *bs) { BDRVReplicationState *s =3D bs->opaque; =20 - if (s->replication_state =3D=3D BLOCK_REPLICATION_RUNNING) { + if (s->stage =3D=3D BLOCK_REPLICATION_RUNNING) { replication_stop(s->rs, false, NULL); } - if (s->replication_state =3D=3D BLOCK_REPLICATION_FAILOVER) { + if (s->stage =3D=3D BLOCK_REPLICATION_FAILOVER) { block_job_cancel_sync(s->active_disk->bs->job); } =20 @@ -174,7 +174,7 @@ static int64_t replication_getlength(BlockDriverState *= bs) =20 static int replication_get_io_status(BDRVReplicationState *s) { - switch (s->replication_state) { + switch (s->stage) { case BLOCK_REPLICATION_NONE: return -EIO; case BLOCK_REPLICATION_RUNNING: @@ -403,7 +403,7 @@ static void backup_job_completed(void *opaque, int ret) BlockDriverState *bs =3D opaque; BDRVReplicationState *s =3D bs->opaque; =20 - if (s->replication_state !=3D BLOCK_REPLICATION_FAILOVER) { + if (s->stage !=3D BLOCK_REPLICATION_FAILOVER) { /* The backup job is cancelled unexpectedly */ s->error =3D -EIO; } @@ -445,7 +445,7 @@ static void replication_start(ReplicationState *rs, Rep= licationMode mode, aio_context_acquire(aio_context); s =3D bs->opaque; =20 - if (s->replication_state !=3D BLOCK_REPLICATION_NONE) { + if (s->stage !=3D BLOCK_REPLICATION_NONE) { error_setg(errp, "Block replication is running or done"); aio_context_release(aio_context); return; @@ -545,7 +545,7 @@ static void replication_start(ReplicationState *rs, Rep= licationMode mode, abort(); } =20 - s->replication_state =3D BLOCK_REPLICATION_RUNNING; + s->stage =3D BLOCK_REPLICATION_RUNNING; =20 if (s->mode =3D=3D REPLICATION_MODE_SECONDARY) { secondary_do_checkpoint(s, errp); @@ -581,7 +581,7 @@ static void replication_get_error(ReplicationState *rs,= Error **errp) aio_context_acquire(aio_context); s =3D bs->opaque; =20 - if (s->replication_state !=3D BLOCK_REPLICATION_RUNNING) { + if (s->stage !=3D BLOCK_REPLICATION_RUNNING) { error_setg(errp, "Block replication is not running"); aio_context_release(aio_context); return; @@ -601,7 +601,7 @@ static void replication_done(void *opaque, int ret) BDRVReplicationState *s =3D bs->opaque; =20 if (ret =3D=3D 0) { - s->replication_state =3D BLOCK_REPLICATION_DONE; + s->stage =3D BLOCK_REPLICATION_DONE; =20 /* refresh top bs's filename */ bdrv_refresh_filename(bs); @@ -610,7 +610,7 @@ static void replication_done(void *opaque, int ret) s->hidden_disk =3D NULL; s->error =3D 0; } else { - s->replication_state =3D BLOCK_REPLICATION_FAILOVER_FAILED; + s->stage =3D BLOCK_REPLICATION_FAILOVER_FAILED; s->error =3D -EIO; } } @@ -625,7 +625,7 @@ static void replication_stop(ReplicationState *rs, bool= failover, Error **errp) aio_context_acquire(aio_context); s =3D bs->opaque; =20 - if (s->replication_state !=3D BLOCK_REPLICATION_RUNNING) { + if (s->stage !=3D BLOCK_REPLICATION_RUNNING) { error_setg(errp, "Block replication is not running"); aio_context_release(aio_context); return; @@ -633,7 +633,7 @@ static void replication_stop(ReplicationState *rs, bool= failover, Error **errp) =20 switch (s->mode) { case REPLICATION_MODE_PRIMARY: - s->replication_state =3D BLOCK_REPLICATION_DONE; + s->stage =3D BLOCK_REPLICATION_DONE; s->error =3D 0; break; case REPLICATION_MODE_SECONDARY: @@ -648,12 +648,12 @@ static void replication_stop(ReplicationState *rs, bo= ol failover, Error **errp) =20 if (!failover) { secondary_do_checkpoint(s, errp); - s->replication_state =3D BLOCK_REPLICATION_DONE; + s->stage =3D BLOCK_REPLICATION_DONE; aio_context_release(aio_context); return; } =20 - s->replication_state =3D BLOCK_REPLICATION_FAILOVER; + s->stage =3D BLOCK_REPLICATION_FAILOVER; commit_active_start(NULL, s->active_disk->bs, s->secondary_disk->b= s, BLOCK_JOB_INTERNAL, 0, BLOCKDEV_ON_ERROR_REPOR= T, NULL, replication_done, bs, true, errp); --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494141042158263.21427090218435; Sun, 7 May 2017 00:10:42 -0700 (PDT) Received: from localhost ([::1]:53921 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GL2-0006WG-51 for importer@patchew.org; Sun, 07 May 2017 03:10:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54088) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GJj-0005jN-58 for qemu-devel@nongnu.org; Sun, 07 May 2017 03:09:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7GJg-0000Hc-0R for qemu-devel@nongnu.org; Sun, 07 May 2017 03:09:19 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:34269) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GJf-0000HQ-Or; Sun, 07 May 2017 03:09:15 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id B4A0F4047F; Sun, 7 May 2017 10:02:29 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 146D13F6; Sun, 7 May 2017 10:02:29 +0300 (MSK) Received: (nullmailer pid 26560 invoked by uid 1000); Sun, 07 May 2017 07:02:29 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:14 +0300 Message-Id: <046303d38caf2e9919588f87850ac884a48dd567.1494140528.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 11/23] channel-file: fix wrong parameter comments X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, "sochin.jiang fix wrong parameter comments in channel-file.h" , Michael Tokarev Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: "sochin.jiang fix wrong parameter comments in channel-file.h" Signed-off-by: sochin.jiang Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Michael Tokarev --- include/io/channel-file.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/io/channel-file.h b/include/io/channel-file.h index d2462c2ed7..79245f1183 100644 --- a/include/io/channel-file.h +++ b/include/io/channel-file.h @@ -71,7 +71,7 @@ qio_channel_file_new_fd(int fd); =20 /** * qio_channel_file_new_path: - * @fd: the file descriptor + * @path: the file path * @flags: the open flags (O_RDONLY|O_WRONLY|O_RDWR, etc) * @mode: the file creation mode if O_WRONLY is set in @flags * @errp: pointer to initialized error object --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494140654367332.879371558873; Sun, 7 May 2017 00:04:14 -0700 (PDT) Received: from localhost ([::1]:53901 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GEm-0004aP-0d for importer@patchew.org; Sun, 07 May 2017 03:04:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GDN-0003sH-Pr for qemu-devel@nongnu.org; Sun, 07 May 2017 03:02:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7GDK-00064o-QS for qemu-devel@nongnu.org; Sun, 07 May 2017 03:02:45 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:60355) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GDK-0005uO-D0; Sun, 07 May 2017 03:02:42 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id A721040481; Sun, 7 May 2017 10:02:30 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 49D6C3F9; Sun, 7 May 2017 10:02:29 +0300 (MSK) Received: (nullmailer pid 26562 invoked by uid 1000); Sun, 07 May 2017 07:02:29 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:15 +0300 Message-Id: <2022d842a1db314457a33d8969c25f82e68b1a6f.1494140528.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 12/23] use _Static_assert in QEMU_BUILD_BUG_ON X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Michael Tokarev , Andreas Grapentin Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Andreas Grapentin QEMU_BUILD_BUG_ON should use C11's _Static_assert, if the compiler supports= it, to provide more readable messages on failure. We check for _Static_assert in configure, and set CONFIG_STATIC_ASSERT accordingly. QEMU_BUILD_BUG_ON invokes _Static_assert if CONFIG_STATIC_ASSE= RT is defined, and reverts to the old way otherwise. That way, systems without C11 conforming compiler will still have the old messages, as verified by intentionally breaking the configure check. the following example output was generated by inverting the condition in QEMU_BUILD_BUG_ON: without _Static_assert: > In file included from /qemu/include/qemu/osdep.h:36:0, > from /qemu/qga/commands.c:13: > /qemu/qga/commands.c: In function =E2=80=98qmp_guest_exec_status=E2=80=99: > /qemu/include/qemu/compiler.h:89:12: error: negative width in bit-field = =E2=80=98=E2=80=99 > struct { \ > ^ > /qemu/include/qemu/compiler.h:96:38: note: in expansion of macro QEMU_BU= ILD_BUG_ON_STRUCT=E2=80=99 > #define QEMU_BUILD_BUG_ON(x) typedef QEMU_BUILD_BUG_ON_STRUCT(x) \ > ^~~~~~~~~~~~~~~~~~~~~~~~ > /qemu/include/qemu/atomic.h:146:5: note: in expansion of macro =E2=80=98Q= EMU_BUILD_BUG_ON=E2=80=99 > QEMU_BUILD_BUG_ON(sizeof(*ptr) > sizeof(void *)); \ > ^~~~~~~~~~~~~~~~~ > /qemu/include/qemu/atomic.h:417:5: note: in expansion of macro =E2=80=98a= tomic_load_acquire=E2=80=99 > atomic_load_acquire(ptr) > ^~~~~~~~~~~~~~~~~~~ > /qemu/qga/commands.c:160:21: note: in expansion of macro =E2=80=98atomic_= mb_read=E2=80=99 > bool finished =3D atomic_mb_read(&gei->finished); > ^~~~~~~~~~~~~~ with _Static_assert: > In file included from /qemu/include/qemu/osdep.h:36:0, > from /qemu/qga/commands.c:13: > /qemu/qga/commands.c: In function =E2=80=98qmp_guest_exec_status=E2=80=99: > /qemu/include/qemu/compiler.h:94:30: error: static assertion failed: "not= expecting: sizeof(*&gei->finished) > sizeof(void *)" > #define QEMU_BUILD_BUG_ON(x) _Static_assert(!(x), #x) > ^ > /qemu/include/qemu/atomic.h:146:5: note: in expansion of macro =E2=80=98Q= EMU_BUILD_BUG_ON=E2=80=99 > QEMU_BUILD_BUG_ON(sizeof(*ptr) > sizeof(void *)); \ > ^~~~~~~~~~~~~~~~~ > /qemu/include/qemu/atomic.h:417:5: note: in expansion of macro =E2=80=98a= tomic_load_acquire=E2=80=99 > atomic_load_acquire(ptr) > ^~~~~~~~~~~~~~~~~~~ > /qemu/qga/commands.c:160:21: note: in expansion of macro =E2=80=98atomic_= mb_read=E2=80=99 > bool finished =3D atomic_mb_read(&gei->finished); > ^~~~~~~~~~~~~~ Signed-off-by: Andreas Grapentin Reviewed-by: Eric Blake Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev --- configure | 18 ++++++++++++++++++ include/qemu/compiler.h | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 48a9370cc6..39aadba813 100755 --- a/configure +++ b/configure @@ -4853,6 +4853,20 @@ EOF fi =20 ########################################## +# check for _Static_assert() + +have_static_assert=3Dno +cat > $TMPC << EOF +_Static_assert(1, "success"); +int main(void) { + return 0; +} +EOF +if compile_prog "" "" ; then + have_static_assert=3Dyes +fi + +########################################## # End of CC checks # After here, no more $cc or $ld runs =20 @@ -5848,6 +5862,10 @@ if test "$have_sysmacros" =3D "yes" ; then echo "CONFIG_SYSMACROS=3Dy" >> $config_host_mak fi =20 +if test "$have_static_assert" =3D "yes" ; then + echo "CONFIG_STATIC_ASSERT=3Dy" >> $config_host_mak +fi + # Hold two types of flag: # CONFIG_THREAD_SETNAME_BYTHREAD - we've got a way of setting the name = on # a thread we have a handle to diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h index 18e610083a..340e5fdc09 100644 --- a/include/qemu/compiler.h +++ b/include/qemu/compiler.h @@ -82,7 +82,9 @@ int:(x) ? -1 : 1; \ } =20 -#ifdef __COUNTER__ +#if defined(CONFIG_STATIC_ASSERT) +#define QEMU_BUILD_BUG_ON(x) _Static_assert(!(x), "not expecting: " #x) +#elif defined(__COUNTER__) #define QEMU_BUILD_BUG_ON(x) typedef QEMU_BUILD_BUG_ON_STRUCT(x) \ glue(qemu_build_bug_on__, __COUNTER__) __attribute__((unused)) #else --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494141398195549.2479165715812; Sun, 7 May 2017 00:16:38 -0700 (PDT) Received: from localhost ([::1]:53951 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GQm-0002t9-67 for importer@patchew.org; Sun, 07 May 2017 03:16:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54397) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GKy-0006ex-R3 for qemu-devel@nongnu.org; Sun, 07 May 2017 03:10:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7GKv-0000ht-NL for qemu-devel@nongnu.org; Sun, 07 May 2017 03:10:36 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:54911) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GKv-0000hb-FR; Sun, 07 May 2017 03:10:33 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id AA5C740476; Sun, 7 May 2017 10:10:32 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id D1E403F6; Sun, 7 May 2017 10:02:30 +0300 (MSK) Received: (nullmailer pid 26565 invoked by uid 1000); Sun, 07 May 2017 07:02:29 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:16 +0300 Message-Id: <68935a65e66ead7fda58beb51191beaea3995ab4.1494140528.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 13/23] qemu-doc: Fix broken URLs of amnhltm.zip and dosidle210.zip X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Thomas Huth , Michael Tokarev Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth There are some broken URLs in the qemu-doc which reference tools that are not available at their original location anymore. Fortunately, they have been mirrored to archive.org, so point to that location instead. Signed-off-by: Thomas Huth Reviewed-by: Laurent Vivier Signed-off-by: Michael Tokarev --- qemu-doc.texi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qemu-doc.texi b/qemu-doc.texi index 794ab4a080..50411bc0ff 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -1878,8 +1878,8 @@ resolution modes which the Cirrus Logic BIOS does not= support (i.e. >=3D Windows 9x does not correctly use the CPU HLT instruction. The result is that it takes host CPU cycles even when idle. You can install the utility from -@url{http://www.user.cityline.ru/~maxamn/amnhltm.zip} to solve this -problem. Note that no such tool is needed for NT, 2000 or XP. +@url{http://web.archive.org/web/20060212132151/http://www.user.cityline.ru= /~maxamn/amnhltm.zip} +to solve this problem. Note that no such tool is needed for NT, 2000 or XP. =20 @subsubsection Windows 2000 disk full problem =20 @@ -1927,9 +1927,9 @@ vvfat block device ("-hdb fat:directory_which_holds_t= he_SP"). @subsubsection CPU usage reduction =20 DOS does not correctly use the CPU HLT instruction. The result is that -it takes host CPU cycles even when idle. You can install the utility -from @url{http://www.vmware.com/software/dosidle210.zip} to solve this -problem. +it takes host CPU cycles even when idle. You can install the utility from +@url{http://web.archive.org/web/20051222085335/http://www.vmware.com/softw= are/dosidle210.zip} +to solve this problem. =20 @node QEMU System emulator for non PC targets @chapter QEMU System emulator for non PC targets --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494141133232580.242485648132; Sun, 7 May 2017 00:12:13 -0700 (PDT) Received: from localhost ([::1]:53928 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GMV-0007gz-QR for importer@patchew.org; Sun, 07 May 2017 03:12:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GKy-0006ev-QV for qemu-devel@nongnu.org; Sun, 07 May 2017 03:10:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7GKv-0000i1-Pd for qemu-devel@nongnu.org; Sun, 07 May 2017 03:10:36 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:42251) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GKv-0000hd-Hn; Sun, 07 May 2017 03:10:33 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id DA27740480; Sun, 7 May 2017 10:10:32 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 57C33436; Sun, 7 May 2017 10:02:31 +0300 (MSK) Received: (nullmailer pid 26567 invoked by uid 1000); Sun, 07 May 2017 07:02:29 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:17 +0300 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 14/23] virtio-blk: Remove useless condition around g_free() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Michael Tokarev , Fam Zheng Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Fam Zheng Laszlo spotted and studied this wasteful "if". He pointed out: The original virtio_blk_free_request needed an "if" as it accesses one field, since 671ec3f05655 ("virtio-blk: Convert VirtIOBlockReq.elem to pointer", 2014-06-11); later on in f897bf751fbd ("virtio-blk: embed VirtQueueElement in VirtIOBlockReq", 2014-07-09) the field became embedded, so the "if" became unnecessary (at which point we were using g_slice_free(), but it is the same. Now drop it. Reported-by: Laszlo Ersek Signed-off-by: Fam Zheng Reviewed-by: Laszlo Ersek Reviewed-by: Stefan Hajnoczi Signed-off-by: Michael Tokarev --- hw/block/virtio-blk.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 98c16a7a9a..604d37dfc8 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -42,9 +42,7 @@ static void virtio_blk_init_request(VirtIOBlock *s, VirtQ= ueue *vq, =20 static void virtio_blk_free_request(VirtIOBlockReq *req) { - if (req) { - g_free(req); - } + g_free(req); } =20 static void virtio_blk_req_complete(VirtIOBlockReq *req, unsigned char sta= tus) --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494141258097689.97519599863; Sun, 7 May 2017 00:14:18 -0700 (PDT) Received: from localhost ([::1]:53935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GOW-00019i-Ru for importer@patchew.org; Sun, 07 May 2017 03:14:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GKy-0006er-Pl for qemu-devel@nongnu.org; Sun, 07 May 2017 03:10:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7GKv-0000iA-SB for qemu-devel@nongnu.org; Sun, 07 May 2017 03:10:36 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:39753) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GKv-0000hg-Kf; Sun, 07 May 2017 03:10:33 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id EA34B40481; Sun, 7 May 2017 10:10:32 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id A11DE43B; Sun, 7 May 2017 10:02:32 +0300 (MSK) Received: (nullmailer pid 26569 invoked by uid 1000); Sun, 07 May 2017 07:02:29 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:18 +0300 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 15/23] hw/core/generic-loader: Fix crash when running without CPU X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Thomas Huth , Michael Tokarev Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth When running QEMU with "-M none -device loader,file=3Dkernel.elf", it currently crashes with a segmentation fault, because the "none"-machine does not have any CPU by default and the generic loader code tries to dereference s->cpu. Fix it by adding an appropriate check for a NULL pointer. Reported-by: Laurent Vivier Signed-off-by: Thomas Huth Reviewed-by: Laurent Vivier Reviewed-by: Alistair Francis Signed-off-by: Michael Tokarev --- hw/core/generic-loader.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c index 58f1f02902..46012673c3 100644 --- a/hw/core/generic-loader.c +++ b/hw/core/generic-loader.c @@ -137,20 +137,21 @@ static void generic_loader_realize(DeviceState *dev, = Error **errp) #endif =20 if (s->file) { + AddressSpace *as =3D s->cpu ? s->cpu->as : NULL; + if (!s->force_raw) { size =3D load_elf_as(s->file, NULL, NULL, &entry, NULL, NULL, - big_endian, 0, 0, 0, s->cpu->as); + big_endian, 0, 0, 0, as); =20 if (size < 0) { size =3D load_uimage_as(s->file, &entry, NULL, NULL, NULL,= NULL, - s->cpu->as); + as); } } =20 if (size < 0 || s->force_raw) { /* Default to the maximum size being the machine's ram size */ - size =3D load_image_targphys_as(s->file, s->addr, ram_size, - s->cpu->as); + size =3D load_image_targphys_as(s->file, s->addr, ram_size, as= ); } else { s->addr =3D entry; } --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494143144311919.5799588427205; Sun, 7 May 2017 00:45:44 -0700 (PDT) Received: from localhost ([::1]:54050 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7Gsw-0005fq-6h for importer@patchew.org; Sun, 07 May 2017 03:45:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7Go1-0001Pe-FN for qemu-devel@nongnu.org; Sun, 07 May 2017 03:40:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7Gnz-00072Z-6n for qemu-devel@nongnu.org; Sun, 07 May 2017 03:40:37 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:52571) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7Gny-00072O-V4; Sun, 07 May 2017 03:40:35 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id AB56A40483; Sun, 7 May 2017 10:40:32 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 157A1435; Sun, 7 May 2017 10:02:31 +0300 (MSK) Received: (nullmailer pid 26571 invoked by uid 1000); Sun, 07 May 2017 07:02:29 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:19 +0300 Message-Id: <5e78979d471f1fd49217155d4c6481c585c51ff1.1494140528.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 16/23] virtfs: allow a device id to be specified in the -virtfs option X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Chris Webb , Michael Tokarev Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Chris Webb When using a virtfs root filesystem, the mount_tag needs to be set to /dev/root. This can be done long-hand as -fsdev local,id=3Droot,path=3D/path/to/rootfs,... -device virtio-9p-pci,fsdev=3Droot,mount_tag=3D/dev/root but the -virtfs shortcut cannot be used as it hard-codes the device identif= ier to match the mount_tag, and device identifiers may not contain '/': $ qemu-system-x86_64 -virtfs local,path=3D/foo,mount_tag=3D/dev/root,secu= rity_model=3Dpassthrough qemu-system-x86_64: -virtfs local,path=3D/foo,mount_tag=3D/dev/root,secur= ity_model=3Dpassthrough: duplicate fsdev id: /dev/root To support this case using -virtfs, we allow the device identifier to be specified explicitly when the mount_tag is not suitable: -virtfs local,id=3Droot,path=3D/path/to/rootfs,mount_tag=3D/dev/root,... Signed-off-by: Chris Webb Signed-off-by: Michael Tokarev --- qemu-options.hx | 2 +- vl.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index a24fef2107..a5b0589cb7 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -876,7 +876,7 @@ ETEXI =20 DEF("virtfs", HAS_ARG, QEMU_OPTION_virtfs, "-virtfs local,path=3Dpath,mount_tag=3Dtag,security_model=3D[mapped-xa= ttr|mapped-file|passthrough|none]\n" - " [,writeout=3Dimmediate][,readonly][,socket=3Dsocket|sock_fd= =3Dsock_fd]\n", + " [,id=3Did][,writeout=3Dimmediate][,readonly][,socket=3Dsocket= |sock_fd=3Dsock_fd]\n", QEMU_ARCH_ALL) =20 STEXI diff --git a/vl.c b/vl.c index 42d4bce439..10f3afd860 100644 --- a/vl.c +++ b/vl.c @@ -3524,10 +3524,11 @@ int main(int argc, char **argv, char **envp) exit(1); } fsdev =3D qemu_opts_create(qemu_find_opts("fsdev"), + qemu_opts_id(opts) ?: qemu_opt_get(opts, "mount_tag"), 1, NULL); if (!fsdev) { - error_report("duplicate fsdev id: %s", + error_report("duplicate or invalid fsdev id: %s", qemu_opt_get(opts, "mount_tag")); exit(1); } @@ -3565,7 +3566,7 @@ int main(int argc, char **argv, char **envp) &error_abort); qemu_opt_set(device, "driver", "virtio-9p-pci", &error_abo= rt); qemu_opt_set(device, "fsdev", - qemu_opt_get(opts, "mount_tag"), &error_abort= ); + qemu_opts_id(fsdev), &error_abort); qemu_opt_set(device, "mount_tag", qemu_opt_get(opts, "mount_tag"), &error_abort= ); break; --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494142941237962.442774728296; Sun, 7 May 2017 00:42:21 -0700 (PDT) Received: from localhost ([::1]:54031 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7Gpe-0002Ob-QE for importer@patchew.org; Sun, 07 May 2017 03:42:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58092) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7Go1-0001Pd-FG for qemu-devel@nongnu.org; Sun, 07 May 2017 03:40:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7Gny-000722-DK for qemu-devel@nongnu.org; Sun, 07 May 2017 03:40:37 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:45731) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7Gny-00071d-5R; Sun, 07 May 2017 03:40:34 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 7478140480; Sun, 7 May 2017 10:40:32 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id CAFF443D; Sun, 7 May 2017 10:02:32 +0300 (MSK) Received: (nullmailer pid 26573 invoked by uid 1000); Sun, 07 May 2017 07:02:29 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:20 +0300 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 17/23] scripts/qemu-binfmt-conf.sh: Fix shell portability issue X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Kamil Rytarowski , Michael Tokarev Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Kamil Rytarowski Appease pkgsrc and use portable shell variable comparison. This switches "=3D=3D" to "=3D". It should not be a functional change. Signed-off-by: Kamil Rytarowski Reviewed-by: Peter Maydell Reviewed-by: Laurent Vivier Signed-off-by: Michael Tokarev --- scripts/qemu-binfmt-conf.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index 0f1aa63872..8afc3eb5bb 100755 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -284,12 +284,12 @@ while true ; do shift # check given cpu is in the supported CPU list for cpu in ${qemu_target_list} ; do - if [ "$cpu" =3D=3D "$1" ] ; then + if [ "$cpu" =3D "$1" ] ; then break fi done =20 - if [ "$cpu" =3D=3D "$1" ] ; then + if [ "$cpu" =3D "$1" ] ; then qemu_target_list=3D"$1" else echo "ERROR: unknown CPU \"$1\"" 1>&2 --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494141906494860.3864558080904; Sun, 7 May 2017 00:25:06 -0700 (PDT) Received: from localhost ([::1]:53994 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GYz-0007aF-8O for importer@patchew.org; Sun, 07 May 2017 03:25:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GUf-0004Jp-Du for qemu-devel@nongnu.org; Sun, 07 May 2017 03:20:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7GUc-00035H-F8 for qemu-devel@nongnu.org; Sun, 07 May 2017 03:20:37 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:58749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GUc-00034g-2l; Sun, 07 May 2017 03:20:34 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id D62DF40476; Sun, 7 May 2017 10:20:32 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 31EA33F9; Sun, 7 May 2017 10:02:31 +0300 (MSK) Received: (nullmailer pid 26575 invoked by uid 1000); Sun, 07 May 2017 07:02:29 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:21 +0300 Message-Id: <66440e3b1578ebe891fa35a4c8d66722400a3b98.1494140528.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 18/23] scripts: Switch to more portable Perl shebang X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Kamil Rytarowski , Michael Tokarev Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Kamil Rytarowski The default NetBSD package manager is pkgsrc and it installs Perl along other third party programs under custom and configurable prefix. The default prefix for binary prebuilt packages is /usr/pkg, and the Perl executable lands in /usr/pkg/bin/perl. This change switches "/usr/bin/perl" to "/usr/bin/env perl" as it's the most portable solution that should work for almost everybody. Perl's executable is detected automatically. This change switches -w option passed to the executable with more modern "use warnings;" approach. There is no functional change to the default behavior. Signed-off-by: Kamil Rytarowski Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Michael Tokarev --- scripts/checkpatch.pl | 3 ++- scripts/clean-header-guards.pl | 3 ++- scripts/cleanup-trace-events.pl | 2 +- scripts/disas-objdump.pl | 4 +++- scripts/get_maintainer.pl | 3 ++- scripts/shaderinclude.pl | 2 +- scripts/switch-timer-api | 2 +- scripts/texi2pod.pl | 4 +++- 8 files changed, 15 insertions(+), 8 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index f084542934..3bb6fc95bd 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/env perl # (c) 2001, Dave Jones. (the file handling bit) # (c) 2005, Joel Schopp (the ugly bit) # (c) 2007,2008, Andy Whitcroft (new conditions, test sui= te) @@ -6,6 +6,7 @@ # Licensed under the terms of the GNU GPL License version 2 =20 use strict; +use warnings; =20 my $P =3D $0; $P =3D~ s@.*/@@g; diff --git a/scripts/clean-header-guards.pl b/scripts/clean-header-guards.pl index 54ab99ae29..5e67f1998c 100755 --- a/scripts/clean-header-guards.pl +++ b/scripts/clean-header-guards.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/env perl # # Clean up include guards in headers # @@ -28,6 +28,7 @@ # "cc -E -DGUARD_H -c -P -", and fed the test program on stdin. =20 use strict; +use warnings; use Getopt::Std; =20 # Stuff we don't want to clean because we import it into our tree: diff --git a/scripts/cleanup-trace-events.pl b/scripts/cleanup-trace-events= .pl index 7e808efb6a..e93abc00da 100755 --- a/scripts/cleanup-trace-events.pl +++ b/scripts/cleanup-trace-events.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl # Copyright (C) 2013 Red Hat, Inc. # # Authors: diff --git a/scripts/disas-objdump.pl b/scripts/disas-objdump.pl index 8f7e8182a1..bec905f04b 100755 --- a/scripts/disas-objdump.pl +++ b/scripts/disas-objdump.pl @@ -1,4 +1,6 @@ -#!/usr/bin/perl -w +#!/usr/bin/env perl + +use warnings; =20 use File::Temp qw/ tempfile /; use Getopt::Long; diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl index 8261bcb1ad..d7c2311123 100755 --- a/scripts/get_maintainer.pl +++ b/scripts/get_maintainer.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/env perl # (c) 2007, Joe Perches # created from checkpatch.pl # @@ -11,6 +11,7 @@ # Licensed under the terms of the GNU GPL License version 2 =20 use strict; +use warnings; =20 my $P =3D $0; my $V =3D '0.26'; diff --git a/scripts/shaderinclude.pl b/scripts/shaderinclude.pl index 81b5146332..cd3bb40b12 100644 --- a/scripts/shaderinclude.pl +++ b/scripts/shaderinclude.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl use strict; use warnings; =20 diff --git a/scripts/switch-timer-api b/scripts/switch-timer-api index b0e230b9f1..41736d11dd 100755 --- a/scripts/switch-timer-api +++ b/scripts/switch-timer-api @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl =20 use strict; use warnings; diff --git a/scripts/texi2pod.pl b/scripts/texi2pod.pl index 6e8fec41a1..39ce584a32 100755 --- a/scripts/texi2pod.pl +++ b/scripts/texi2pod.pl @@ -1,4 +1,4 @@ -#! /usr/bin/perl -w +#! /usr/bin/env perl =20 # Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc. =20 @@ -22,6 +22,8 @@ # markup to Perl POD format. It's intended to be used to extract # something suitable for a manpage from a Texinfo document. =20 +use warnings; + $output =3D 0; $skipping =3D 0; %sects =3D (); --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494141295536178.17102414206568; Sun, 7 May 2017 00:14:55 -0700 (PDT) Received: from localhost ([::1]:53941 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GP8-0001eD-6w for importer@patchew.org; Sun, 07 May 2017 03:14:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GKy-0006et-QE for qemu-devel@nongnu.org; Sun, 07 May 2017 03:10:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7GKv-0000hn-Kr for qemu-devel@nongnu.org; Sun, 07 May 2017 03:10:36 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:35631) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GKv-0000hZ-DA; Sun, 07 May 2017 03:10:33 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id AB8614047F; Sun, 7 May 2017 10:10:32 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 5D02C43A; Sun, 7 May 2017 10:02:32 +0300 (MSK) Received: (nullmailer pid 26577 invoked by uid 1000); Sun, 07 May 2017 07:02:29 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:22 +0300 Message-Id: <09f606f4f982b1914f1e54ac14c60cda566ff4d9.1494140528.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 19/23] tests: Ignore another built executable (test-hmp) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Michael Tokarev Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Eric Blake Commit 78f86a2b7 added a new test, but forgot to exclude the built binary from version control. Signed-off-by: Eric Blake Reviewed-by: Thomas Huth Signed-off-by: Michael Tokarev --- tests/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/.gitignore b/tests/.gitignore index 5ab00a9c95..40c2e3e757 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -40,6 +40,7 @@ test-crypto-tlssession-server/ test-crypto-xts test-cutils test-hbitmap +test-hmp test-int128 test-iov test-io-channel-buffer --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494142942806588.3837432252732; Sun, 7 May 2017 00:42:22 -0700 (PDT) Received: from localhost ([::1]:54032 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7Gph-0002Qh-7a for importer@patchew.org; Sun, 07 May 2017 03:42:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58095) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7Go1-0001Pf-FO for qemu-devel@nongnu.org; Sun, 07 May 2017 03:40:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7Gny-00072H-Dp for qemu-devel@nongnu.org; Sun, 07 May 2017 03:40:37 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:41363) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7Gny-00071f-5j; Sun, 07 May 2017 03:40:34 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 81A4740481; Sun, 7 May 2017 10:40:32 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 8ABDF437; Sun, 7 May 2017 10:02:31 +0300 (MSK) Received: (nullmailer pid 26579 invoked by uid 1000); Sun, 07 May 2017 07:02:29 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:23 +0300 Message-Id: <8d152b536ef6b40d51901ae650d72a4afb794e80.1494140528.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 20/23] jazz_led: fix bad snprintf X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Paolo Bonzini , Michael Tokarev Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini Detected by GCC 7's -Wformat-truncation. snprintf writes at most 2 bytes here including the terminating NUL, so the result is truncated. In addition, the newline at the end is pointless. Fix the buffer size and the format string. Signed-off-by: Paolo Bonzini Reviewed-by: Markus Armbruster Reviewed-by: Laurent Vivier Signed-off-by: Michael Tokarev --- hw/display/jazz_led.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/display/jazz_led.c b/hw/display/jazz_led.c index b72fdb1717..3c97d56434 100644 --- a/hw/display/jazz_led.c +++ b/hw/display/jazz_led.c @@ -227,13 +227,13 @@ static void jazz_led_invalidate_display(void *opaque) static void jazz_led_text_update(void *opaque, console_ch_t *chardata) { LedState *s =3D opaque; - char buf[2]; + char buf[3]; =20 dpy_text_cursor(s->con, -1, -1); qemu_console_resize(s->con, 2, 1); =20 /* TODO: draw the segments */ - snprintf(buf, 2, "%02hhx\n", s->segments); + snprintf(buf, 3, "%02hhx", s->segments); console_write_ch(chardata++, ATTR2CHTYPE(buf[0], QEMU_COLOR_BLUE, QEMU_COLOR_BLACK, 1)); console_write_ch(chardata++, ATTR2CHTYPE(buf[1], QEMU_COLOR_BLUE, --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494142946538974.8853094343885; Sun, 7 May 2017 00:42:26 -0700 (PDT) Received: from localhost ([::1]:54033 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7Gpl-0002W6-4V for importer@patchew.org; Sun, 07 May 2017 03:42:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7Go1-0001Pg-Fa for qemu-devel@nongnu.org; Sun, 07 May 2017 03:40:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7Gny-000727-DV for qemu-devel@nongnu.org; Sun, 07 May 2017 03:40:37 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:54401) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7Gny-00071e-5h; Sun, 07 May 2017 03:40:34 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 4548D40476; Sun, 7 May 2017 10:40:32 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id CF93642E; Sun, 7 May 2017 10:02:31 +0300 (MSK) Received: (nullmailer pid 26581 invoked by uid 1000); Sun, 07 May 2017 07:02:29 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:24 +0300 Message-Id: <7f8393c41831e21228cf10e40c581826c90db4f7.1494140528.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 21/23] MAINTAINERS: Update paths for main loop X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Paolo Bonzini , Michael Tokarev Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini Moved by c2b38b2 ("block: move AioContext, QEMUTimer, main-loop to libqemuutil"), let's update MAINTAINERS too. Reported-by: Laurent Vivier Signed-off-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Michael Tokarev --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a1d2b3a4d3..e6822b23bf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1305,8 +1305,8 @@ Main loop M: Paolo Bonzini S: Maintained F: cpus.c -F: main-loop.c -F: qemu-timer.c +F: util/main-loop.c +F: util/qemu-timer.c F: vl.c =20 Human Monitor (HMP) --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494141722370224.5583638160506; Sun, 7 May 2017 00:22:02 -0700 (PDT) Received: from localhost ([::1]:53984 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GVz-00058q-3m for importer@patchew.org; Sun, 07 May 2017 03:21:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GUf-0004Jr-EU for qemu-devel@nongnu.org; Sun, 07 May 2017 03:20:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7GUc-00034w-Ac for qemu-devel@nongnu.org; Sun, 07 May 2017 03:20:37 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:52129) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GUc-00034d-29; Sun, 07 May 2017 03:20:34 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 15A9440481; Sun, 7 May 2017 10:20:33 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 0F5D6439; Sun, 7 May 2017 10:02:32 +0300 (MSK) Received: (nullmailer pid 26583 invoked by uid 1000); Sun, 07 May 2017 07:02:29 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:25 +0300 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 22/23] MAINTAINERS: Update paths for AioContext implementation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Paolo Bonzini , Michael Tokarev Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini Moved by c2b38b2 ("block: move AioContext, QEMUTimer, main-loop to libqemuutil") Signed-off-by: Paolo Bonzini Reviewed-by: Laurent Vivier Signed-off-by: Michael Tokarev --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index e6822b23bf..e79ffb3f8a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1175,8 +1175,8 @@ M: Stefan Hajnoczi M: Fam Zheng L: qemu-block@nongnu.org S: Supported -F: async.c -F: aio-*.c +F: util/async.c +F: util/aio-*.c F: block/io.c F: migration/block* F: include/block/aio.h --=20 2.11.0 From nobody Mon Apr 29 04:14:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494141332227776.6449514439236; Sun, 7 May 2017 00:15:32 -0700 (PDT) Received: from localhost ([::1]:53948 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GPi-0002DU-VO for importer@patchew.org; Sun, 07 May 2017 03:15:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54393) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GKy-0006eu-QT for qemu-devel@nongnu.org; Sun, 07 May 2017 03:10:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7GKv-0000iD-S9 for qemu-devel@nongnu.org; Sun, 07 May 2017 03:10:36 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:47937) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7GKv-0000hf-KV; Sun, 07 May 2017 03:10:33 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 036A740482; Sun, 7 May 2017 10:10:33 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id AF8A4438; Sun, 7 May 2017 10:02:31 +0300 (MSK) Received: (nullmailer pid 26585 invoked by uid 1000); Sun, 07 May 2017 07:02:29 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 7 May 2017 10:02:26 +0300 Message-Id: <311875781e549af91a3216d34c6ef40420bab435.1494140528.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 23/23] tests: Remove redundant assignment X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Michael Tokarev , Fam Zheng Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Fam Zheng Signed-off-by: Fam Zheng Reviewed-by: Eric Blake Signed-off-by: Michael Tokarev --- tests/postcopy-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/postcopy-test.c b/tests/postcopy-test.c index de35a18903..e86f87656a 100644 --- a/tests/postcopy-test.c +++ b/tests/postcopy-test.c @@ -41,7 +41,7 @@ static bool ufd_version_check(void) struct uffdio_api api_struct; uint64_t ioctl_mask; =20 - int ufd =3D ufd =3D syscall(__NR_userfaultfd, O_CLOEXEC); + int ufd =3D syscall(__NR_userfaultfd, O_CLOEXEC); =20 if (ufd =3D=3D -1) { g_test_message("Skipping test: userfaultfd not available"); --=20 2.11.0