From patchwork Thu Nov 3 16:17:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13030518 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 49667C4332F for ; Thu, 3 Nov 2022 16:19:43 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqcvy-000233-4j; Thu, 03 Nov 2022 12:19:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuN-0000fV-3g; Thu, 03 Nov 2022 12:17:35 -0400 Received: from mout.kundenserver.de ([212.227.126.135]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuL-00084W-8i; Thu, 03 Nov 2022 12:17:34 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N6bsM-1p6LkF018A-0180oq; Thu, 03 Nov 2022 17:17:29 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Han Han , Laurent Vivier Subject: [PULL 01/10] qapi: virtio: Fix the introduced version Date: Thu, 3 Nov 2022 17:17:18 +0100 Message-Id: <20221103161727.4116147-2-laurent@vivier.eu> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221103161727.4116147-1-laurent@vivier.eu> References: <20221103161727.4116147-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:JolXwqhIzXl6TgmlE66LPT08izVsetaqDmpUeYyQEmsCdw7SBtL UjYUQ6Mi9JtfdvBgiQq3QZL4Ov/Ncube25HGW7ugNLRn7MRTHYxBhANzDlaIU13/hEQtzpx Kbxdbhzlfvyfu59FTy4P+E8wKHEynQrJ0lLxGYpXTfxnuaXMi+X40sY+2ACdYzYjZArsqif jD5aDKwUNG1AYsw+QvxSQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:KofxmvFRXp4=:0L//+OUboVv2e7c3iX1M2B rK0jRYRkvF106VNOydRUXEi8YD/CFgoqWfdq7C4/pJ0J8kYvGHmGNm0EED4DJfOCbogbE5x5Q 2tNPklPU8Pq53GmJZO0NYVtkI01dMIf7psB07VHUAI+ozHg3bH8Wrppcvw8Lu4JwMjSGj8k63 3RihME8vYwk4l3jdIlSxnKC3HGr5jEstMU1yrfTwi3BRokbJXgV+AjZdNOxyEbYnFtFO3bgMA gKWLJq825NoCEzao7UwuMHZV+94qIko8D1LxE0Yd9Dpd084sfbiAUBdGnzFp1AJOHDWQrFA/2 EQeVbfpIOQGi6eC45o/a7MXqfZD7jXefguy9oj5AAbygU/aOitvzErAraSWUer7ubyQbtZEoQ j04Pys5qd4dNwAxEBAi3X5z5J1gRJRvAHRl4tqfG1E/0I+ccGik4A8TL3kvO20oZDD0Yu5enk jTW+JNcspHlmhAdpayRDSx6VMpzH47pmgaCSFancPkZJxQt1/WBUyh0zBAM8+/Nm/JidMEY6g ebJAoAdVgp+SdHKN6Nu5bRyFXoUtjUwuE9I7DV4ztnMEARaBwgusUXWJeo3zyI7KSQFlve7VZ b590+oXgsoUF+j41HZo4H5SiCZ0U1KKALGQiHPVhRa3ZFjEdkI/PTVI45T6VaLjKti7Ws4Ulr ztfs/c8JlUyHDZtDd0w9bU4mUdEADotTpCo08QcL+qdsRIU8lwMh+uMb8VlVeVxCOsVVTIwTJ msSHXjMBKql2JZ/AXJ/bWrNlvaU2liocEJbM2QE/U7lx8s3uyBvk+hJHhpD8yk8eHZcr/+ZQi oJUMf+2 Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Han Han The items of qapi/virtio.json are introduced at a5ebce38576. They will be in the version 7.2 not 7.1. Signed-off-by: Han Han Reviewed-by: Laurent Vivier Message-Id: <20221101014647.3000801-1-hhan@redhat.com> Signed-off-by: Laurent Vivier --- qapi/virtio.json | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/qapi/virtio.json b/qapi/virtio.json index e47a8fb2e0a9..872c7e36236c 100644 --- a/qapi/virtio.json +++ b/qapi/virtio.json @@ -15,7 +15,7 @@ # # @name: Name of the VirtIODevice # -# Since: 7.1 +# Since: 7.2 # ## { 'struct': 'VirtioInfo', @@ -32,7 +32,7 @@ # # Returns: List of gathered VirtIODevices # -# Since: 7.1 +# Since: 7.2 # # Example: # @@ -97,7 +97,7 @@ # # @log-size: vhost_dev log_size # -# Since: 7.1 +# Since: 7.2 # ## @@ -167,7 +167,7 @@ # Present if the given VirtIODevice has an active vhost # device. # -# Since: 7.1 +# Since: 7.2 # ## @@ -206,7 +206,7 @@ # # Returns: VirtioStatus of the virtio device # -# Since: 7.1 +# Since: 7.2 # # Examples: # @@ -452,7 +452,7 @@ # # @unknown-statuses: Virtio device statuses bitmap that have not been decoded # -# Since: 7.1 +# Since: 7.2 ## { 'struct': 'VirtioDeviceStatus', @@ -471,7 +471,7 @@ # @unknown-protocols: Vhost user device protocol features bitmap that # have not been decoded # -# Since: 7.1 +# Since: 7.2 ## { 'struct': 'VhostDeviceProtocols', @@ -492,7 +492,7 @@ # @unknown-dev-features: Virtio device features bitmap that have not # been decoded # -# Since: 7.1 +# Since: 7.2 ## { 'struct': 'VirtioDeviceFeatures', @@ -535,7 +535,7 @@ # # @signalled-used-valid: VirtQueue signalled_used_valid flag # -# Since: 7.1 +# Since: 7.2 # ## @@ -576,7 +576,7 @@ # shadow_avail_idx will not be displayed in the case where # the selected VirtIODevice has a running vhost device. # -# Since: 7.1 +# Since: 7.2 # # Examples: # @@ -666,7 +666,7 @@ # # @used-size: vhost_virtqueue used_size # -# Since: 7.1 +# Since: 7.2 # ## @@ -699,7 +699,7 @@ # # Returns: VirtVhostQueueStatus of the vhost_virtqueue # -# Since: 7.1 +# Since: 7.2 # # Examples: # @@ -767,7 +767,7 @@ # # @flags: List of descriptor flags # -# Since: 7.1 +# Since: 7.2 # ## @@ -787,7 +787,7 @@ # # @ring: VRingAvail ring[] entry at provided index # -# Since: 7.1 +# Since: 7.2 # ## @@ -805,7 +805,7 @@ # # @idx: VRingUsed index # -# Since: 7.1 +# Since: 7.2 # ## @@ -829,7 +829,7 @@ # # @used: VRingUsed info # -# Since: 7.1 +# Since: 7.2 # ## @@ -857,7 +857,7 @@ # # Returns: VirtioQueueElement information # -# Since: 7.1 +# Since: 7.2 # # Examples: # From patchwork Thu Nov 3 16:17:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13030528 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 503ABC4332F for ; Thu, 3 Nov 2022 16:21:38 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqcxH-0006RX-Cb; Thu, 03 Nov 2022 12:20:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuR-0000oQ-Il; Thu, 03 Nov 2022 12:18:00 -0400 Received: from mout.kundenserver.de ([212.227.126.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuO-00084u-Cu; Thu, 03 Nov 2022 12:17:38 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MuUvS-1p7TGl2vSc-00rW9M; Thu, 03 Nov 2022 17:17:29 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Stefan Weil , Peter Maydell , Thomas Huth , Stefan Hajnoczi , Laurent Vivier Subject: [PULL 02/10] Fix some typos in documentation and comments Date: Thu, 3 Nov 2022 17:17:19 +0100 Message-Id: <20221103161727.4116147-3-laurent@vivier.eu> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221103161727.4116147-1-laurent@vivier.eu> References: <20221103161727.4116147-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:D9b5ajF9M53aqjinA1+kWnc9BZtwqX6MrsYcM5xXvgSp8B36vvx OTBrZuxt/buJniEQFoi3Vw5c47dHlCLeXzNuaKovIzxDf59hQFg5usCwHkyJRsn28Cgz/Ux bzKUK0ltXLD6GKy6ANwI4dMcxPM/kWx13kd0Hc/an63MS5vTCgGeFgtNW02xwVV27bDvrVK Bqq7r+UZUIMsTGWDFbs+Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:OEvA07iugHA=:zRSAN1oCFkgRK0Q5OGyNH/ n4cRUyYAwARjyQ1U58bGizdaZOJDXHbjeEK1Cxh2/cLYtnnMwCgsWAdCes1qXx2KksHmO3Gn9 9fs8Hi5NCHdlObNxTuQjsqER0fi8T8P+MpuPQWP+CxwSbCBh5+jhk7qm6s6/o7gso7WqQc4zY cM3kO/aojYaZLAYK7a4fLhTZy37lpapwcBmkk0kW/ISuzEoLn27QSWHP75orjlkw4JPRHbfMj WL9/d0nVmLCNPQvnBF8nhcaCHdrRbVUM3caqqJfnH8kVx1SyBg0G2jp+Mh/9qjpI5E1pwWK1M wy7LplFE3vKvKB6m1mssOQUD9nGUMA1XVNSM1CIgAE1lHef9CFPzx/nyxp9y2gHgumKZwVcY2 mEMl/8YKOeeJ/egMcgIiIO2icG/TkqDDGbVA7eRPH16O7embvNsTl2c9BsBmB5YPAZ/Hlrrke 1AWDylWQOVMrfULt46Pk6dMWrCR1GgFANRrwbBZMt3bpYxwgDBa0PZ+1p6B4VZyOJSK0HbmZ1 YV2o0v1v+znHfhtaejqZfdcD+yS+qPxGaAENjRk+4dv1xftXPZUeeIPRLCEwthkuBQGnCqwav W27U93uGZpoR1Zi7AUZpEzVEnaevBcFCVqXMkXnotgwiUbt1IL9+7sKz3oJ3uUWkWGjVMJ0qA c356tS+VGQzmvwlii0qN88bQnP6Sr1RkH0fum9NPB0XLNwo4OeFoP710gJTWZdogHWKF+KQGA xFYylmkgeypzmprrMFrHJQ8d/tHQiE2EoGs8kYgldOF3HTqOL9nhVMBl/k8aFpUv01bZ+rnKF MkYNyRF Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Stefan Weil Most of them were found and fixed using codespell. Signed-off-by: Stefan Weil Reviewed-by: Peter Maydell Reviewed-by: Thomas Huth Reviewed-by: Stefan Hajnoczi Message-Id: <20221030105944.311940-1-sw@weilnetz.de> Signed-off-by: Laurent Vivier --- docs/devel/testing.rst | 2 +- docs/system/arm/cpu-features.rst | 2 +- docs/system/loongarch/loongson3.rst | 2 +- docs/tools/virtiofsd.rst | 2 +- include/exec/memory.h | 2 +- qapi/qom.json | 2 +- qemu-options.hx | 10 +++++----- qga/qapi-schema.json | 2 +- tests/qtest/libqtest.h | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index fbb98faabeed..e10c47b5a7ca 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -99,7 +99,7 @@ successfully on various hosts. The following list shows some best practices: * If your test cases uses the blkdebug feature, use relative path to pass the config and image file paths in the command line as Windows absolute path contains the delimiter ":" which will confuse the blkdebug parser. -* Use double quotes in your extra QEMU commmand line in your test cases +* Use double quotes in your extra QEMU command line in your test cases instead of single quotes, as Windows does not drop single quotes when passing the command line to QEMU. * Windows opens a file in text mode by default, while a POSIX compliant diff --git a/docs/system/arm/cpu-features.rst b/docs/system/arm/cpu-features.rst index c2c01ec7d265..00c444042ff5 100644 --- a/docs/system/arm/cpu-features.rst +++ b/docs/system/arm/cpu-features.rst @@ -433,7 +433,7 @@ additional constraints on the set of vector lengths supported by SME. SME User-mode Default Vector Length Property -------------------------------------------- -For qemu-aarch64, the cpu propery ``sme-default-vector-length=N`` is +For qemu-aarch64, the cpu property ``sme-default-vector-length=N`` is defined to mirror the Linux kernel parameter file ``/proc/sys/abi/sme_default_vector_length``. The default length, ``N``, is in units of bytes and must be between 16 and 8192. diff --git a/docs/system/loongarch/loongson3.rst b/docs/system/loongarch/loongson3.rst index 1bdab44e2728..489ea20f8ff7 100644 --- a/docs/system/loongarch/loongson3.rst +++ b/docs/system/loongarch/loongson3.rst @@ -41,7 +41,7 @@ can be accessed by following steps. $ qemu-system-loongarch64 -machine virt -m 4G -cpu la464-loongarch-cpu \ -smp 1 -bios QEMU_EFI.fd -kernel vmlinuz.efi -initrd initrd.img \ - -append "root=/dev/ram rdinit=/sbin/init consol e=ttyS0,115200" \ + -append "root=/dev/ram rdinit=/sbin/init console=ttyS0,115200" \ --nographic Note: The running speed may be a little slow, as the performance of our diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst index 5f5ac9dd56a3..995a754a7bf9 100644 --- a/docs/tools/virtiofsd.rst +++ b/docs/tools/virtiofsd.rst @@ -232,7 +232,7 @@ e.g.: ``:ok:server::security.:`` - will pass 'securty.' xattr's in listxattr from the server + will pass 'security.' xattr's in listxattr from the server and ignore following rules. ``:ok:all:::`` diff --git a/include/exec/memory.h b/include/exec/memory.h index bfb1de8eeae1..a751c111bd3d 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -1970,7 +1970,7 @@ void memory_region_clear_dirty_bitmap(MemoryRegion *mr, hwaddr start, * querying the same page multiple times, which is especially useful for * display updates where the scanlines often are not page aligned. * - * The dirty bitmap region which gets copyed into the snapshot (and + * The dirty bitmap region which gets copied into the snapshot (and * cleared afterwards) can be larger than requested. The boundaries * are rounded up/down so complete bitmap longs (covering 64 pages on * 64bit hosts) can be copied over into the bitmap snapshot. Which diff --git a/qapi/qom.json b/qapi/qom.json index 87fcad2423ae..4db956f07e6c 100644 --- a/qapi/qom.json +++ b/qapi/qom.json @@ -589,7 +589,7 @@ # # @size: size of the memory region in bytes # -# @x-use-canonical-path-for-ramblock-id: if true, the canoncial path is used +# @x-use-canonical-path-for-ramblock-id: if true, the canonical path is used # for ramblock-id. Disable this for 4.0 # machine types or older to allow # migration with newer QEMU versions. diff --git a/qemu-options.hx b/qemu-options.hx index ceee0ddc255d..525f9dc2f223 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1051,7 +1051,7 @@ SRST details on the external interface. ``-device isa-ipmi-kcs,bmc=id[,ioport=val][,irq=val]`` - Add a KCS IPMI interafce on the ISA bus. This also adds a + Add a KCS IPMI interface on the ISA bus. This also adds a corresponding ACPI and SMBIOS entries, if appropriate. ``bmc=id`` @@ -1071,7 +1071,7 @@ SRST is 0xe4 and the default interrupt is 5. ``-device pci-ipmi-kcs,bmc=id`` - Add a KCS IPMI interafce on the PCI bus. + Add a KCS IPMI interface on the PCI bus. ``bmc=id`` The BMC to connect to, one of ipmi-bmc-sim or ipmi-bmc-extern above. @@ -5264,8 +5264,8 @@ SRST read the colo-compare git log. ``-object cryptodev-backend-builtin,id=id[,queues=queues]`` - Creates a cryptodev backend which executes crypto opreation from - the QEMU cipher APIS. The id parameter is a unique ID that will + Creates a cryptodev backend which executes crypto operations from + the QEMU cipher APIs. The id parameter is a unique ID that will be used to reference this cryptodev backend from the ``virtio-crypto`` device. The queues parameter is optional, which specify the queue number of cryptodev backend, the default @@ -5532,7 +5532,7 @@ SRST file=/etc/qemu/vnc.allow Finally the ``/etc/qemu/vnc.allow`` file would contain the list - of x509 distingished names that are permitted access + of x509 distinguished names that are permitted access :: diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index 026a56f76caf..796434ed346f 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -392,7 +392,7 @@ ## # @guest-file-flush: # -# Write file changes bufferred in userspace to disk/kernel buffers +# Write file changes buffered in userspace to disk/kernel buffers # # @handle: filehandle returned by guest-file-open # diff --git a/tests/qtest/libqtest.h b/tests/qtest/libqtest.h index 91a5f7edd94d..fcf1c3c3b36f 100644 --- a/tests/qtest/libqtest.h +++ b/tests/qtest/libqtest.h @@ -736,7 +736,7 @@ bool qtest_has_device(const char *device); * qtest_qmp_device_add_qdict: * @qts: QTestState instance to operate on * @drv: Name of the device that should be added - * @arguments: QDict with properties for the device to intialize + * @arguments: QDict with properties for the device to initialize * * Generic hot-plugging test via the device_add QMP command with properties * supplied in form of QDict. Use NULL for empty properties list. From patchwork Thu Nov 3 16:17:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13030526 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 920E9C43219 for ; Thu, 3 Nov 2022 16:21:31 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqcwQ-0003Uq-Vu; Thu, 03 Nov 2022 12:19:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuU-0000pj-Kn; Thu, 03 Nov 2022 12:18:00 -0400 Received: from mout.kundenserver.de ([212.227.126.130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuN-00084r-8K; Thu, 03 Nov 2022 12:17:42 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1McH1Q-1pSyve1K9M-00ckiY; Thu, 03 Nov 2022 17:17:30 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Chuck Zmudzinski , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Subject: [PULL 03/10] xen/pt: fix syntax error that causes FTBFS in some configurations Date: Thu, 3 Nov 2022 17:17:20 +0100 Message-Id: <20221103161727.4116147-4-laurent@vivier.eu> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221103161727.4116147-1-laurent@vivier.eu> References: <20221103161727.4116147-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:+4xte6OzCu1rQ6F4WF0bkzIAf1P7wP99vVDnp2SD+eOXhegIoKr bMTu9SAFs4lhyD7SE1du2CYok5OjBHyvTukQPUtNAzRhDSHqaXOkwBe8f/AbHnpRm5QFoTp EQn5Wir6ou1zW0THZEfgBt7b1bk7mhx+azVwonyy77CNivgdO01mtay/z7KLSVHrOWz1qCt /zUe6RS5nmf3do3TkgW+A== X-UI-Out-Filterresults: notjunk:1;V03:K0:kTPqXAazHY0=:NZEg4PweZXHghoeW0MfKfj G4u+nurAy4/nWxWyttKtW0vRe0a0CwPiuVohm3PusEZkST8gdU4hm6Hx6r6PhnRYsmqJpvteD fjWVkMXSv0hO6exb/fTtaBmhrl9YlVmP4HtluFxIvXkmT45imM7XmBNvpbzwCOvDMRHMMNCZT 1Hz0ibEivvmCYxzBdwU4IWeZW9t+JSazU+DmY+J0lBExjeK/ZmfaAIhp/Gqe0NIbbqVSZa+zX oIbOXY7z+eGhInokR7XtuazvWFSC0oS3F8RzG4LCxXTbLMg+9vyp/7wVTPR3Tekkoe/V67d35 X1PS4Ooke9JRxiZjsJcMked5Q37dsXw3gDtJ1qHhtOizo/wYm/FT5F9YwgAVtM01zQc259q7h U1NdfaX211GFsrEoIdkJV4QfXFbH285CqSyZXb4IvRouNJQARothI3cWJWYhO1RcMSzkS8Bb2 xNk3UfNM+0gQVUVt49WHXl4DaiHIVRo6R3KytuYPnYiKvZVPsUYNnK3zoUxonG9TVDbC9/Jbp ApMIzHChUPf9HukfEnWzy/v8sYCtiCAdHS5Xe77jchdVJsia3OV7Rqm8RXEMYIGmRCml2NmmY OgSfKFscONdA2/P4hHr8giP+hPMFsTbFY1AuTaPWpom5KUe40UIjdUU0MpaDmxz/nVFjK10cc h9HUiYuaPS+mqxU8e8KwZ+0t6ucHo+bl3otj4Ph8oCfUhLvv9Ekz/o4EY93v2sNTrh+s0hOUN ZjIzVIuFL4dS2hm6m1V7RtVP8oYL4VFz28Y7dOuuTBSwQ3R2BR631J8y3w9NOvhie8tJfFF3y 2gNRdQe Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Chuck Zmudzinski When Qemu is built with --enable-xen and --disable-xen-pci-passthrough and the target os is linux, the build fails with: meson.build:3477:2: ERROR: File xen_pt_stub.c does not exist. Fixes: 582ea95f5f93 ("meson: convert hw/xen") Signed-off-by: Chuck Zmudzinski Reviewed-by: Philippe Mathieu-Daudé Message-Id: <5f1342a13c09af77b1a7b0aeaba5955bcea89731.1667242033.git.brchuckz@aol.com> Signed-off-by: Laurent Vivier --- hw/xen/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xen/meson.build b/hw/xen/meson.build index 08dc1f685738..ae0ace3046b8 100644 --- a/hw/xen/meson.build +++ b/hw/xen/meson.build @@ -18,7 +18,7 @@ if have_xen_pci_passthrough 'xen_pt_msi.c', )) else - xen_specific_ss.add('xen_pt_stub.c') + xen_specific_ss.add(files('xen_pt_stub.c')) endif specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss) From patchwork Thu Nov 3 16:17:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13030540 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2C396C4332F for ; Thu, 3 Nov 2022 16:22:04 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqcwf-0005An-M9; Thu, 03 Nov 2022 12:19:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuR-0000oR-Lu; Thu, 03 Nov 2022 12:18:00 -0400 Received: from mout.kundenserver.de ([212.227.126.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuO-00085X-QX; Thu, 03 Nov 2022 12:17:39 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mwfj0-1pE4y83nLO-00y8uq; Thu, 03 Nov 2022 17:17:31 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Stefan Weil , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , Laurent Vivier Subject: [PULL 04/10] libvhost-user: Fix wrong type of argument to formatting function (reported by LGTM) Date: Thu, 3 Nov 2022 17:17:21 +0100 Message-Id: <20221103161727.4116147-5-laurent@vivier.eu> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221103161727.4116147-1-laurent@vivier.eu> References: <20221103161727.4116147-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:DRx/k9FrF3CT7v/leTeBoqsMrLA3YzW11Mk/egNgsQZzlXaZl7/ GBQPo5f2uWN4kaaSDC0SavYb4BNqUStO4bddj1F1Tz4dm6cDM+x9A4yrBpCTJe4EBxpOxNN VxwcYq2L9BJvuxnHW+qiw+zBEMgYoGyvUEPn169twa/FfRrLULOeHV0/EHrM5qleSj4Y/Dn ilqp4AEbHFVhpoZqnorUA== X-UI-Out-Filterresults: notjunk:1;V03:K0:6QWw3QR2Hmg=:OfRFcUsb2VroKZGwJ69juo uRah2E7SOaudj4i/A+osJTTU5F8+ovsHm7rPtBLvDBUFmpNWavycqg/LLFmW52WMAC3sHBAhd HDfHnw/Ss96wYIAC+ecjKqQG7ct0oVLA+aZDxjjOCjEyBiVrENt7Cb1gyIp/4J4kqbwi62YA4 RsNIVpVAcBRFIIOBfGDnhMX6WBIB9hVQTBidFJxPegPIW7zVHfIJIE0gOxSBJ80clB69ZWm1F ivqCA84Ynf5WEmHAR/ZhDrzgGDT86QpjQjeA41Lq9V1LL/KLvGhUv4GTzpAghiWU7F/xCCAaU HG6fH9si7HZyKR4P4VPi3Tnm7sLUCXwOwHcWLugt1+VQ96UtnuzOBWpTgY4ZT21t5bsduIIR7 PLfgyKMsjLl3YkO/2q6vzn7iCCWwrxW+vrvz7IJIa7uIVosvVFxI2LSYKKb5gM0K1mhGF+WSl spdtO3A7Th/KLnvX+DjbZm3zToT6PcjCrbk9qtuG10Iu7kzuXtyXggOAh56yTiCCsIABF4Wjp VHM7FR3JPw7mNzhlHeQu820C6cMQU2PTvtURwokjNMTErEvKmPTGcEK/tLHMstyQKM6GDhq6c btrsp2/4viobF5S95lmjauhUD70xtjoM++nRxaiWTdLP9zVTTLM7pjn/y3wjmFfM6RohSl2ua lAY8LKl8TwSS/mVHh7go0ayCzl1ipY2swKi2wm6V2rH8bRUSj68+ingGl3/M+mDDsFcqtl3gq EAx6RMj5DIPZy8CeLT3Nd9Px41iNa0w7hO/x38j0pJQzpsUUo8CfvGbJvxE01hrTXn9a1cttD JqYdfBz Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Stefan Weil Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Stefan Weil Message-Id: <20220422070144.1043697-2-sw@weilnetz.de> Signed-off-by: Laurent Vivier --- subprojects/libvhost-user/libvhost-user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c index ffed4729a3dc..d9a6e3e5560f 100644 --- a/subprojects/libvhost-user/libvhost-user.c +++ b/subprojects/libvhost-user/libvhost-user.c @@ -651,7 +651,7 @@ generate_faults(VuDev *dev) { if (ioctl(dev->postcopy_ufd, UFFDIO_REGISTER, ®_struct)) { vu_panic(dev, "%s: Failed to userfault region %d " - "@%p + size:%zx offset: %zx: (ufd=%d)%s\n", + "@%" PRIx64 " + size:%zx offset: %zx: (ufd=%d)%s\n", __func__, i, dev_region->mmap_addr, dev_region->size, dev_region->mmap_offset, From patchwork Thu Nov 3 16:17:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13030548 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7C214C4332F for ; Thu, 3 Nov 2022 16:23:00 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqcwR-0003bA-PL; Thu, 03 Nov 2022 12:19:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuU-0000p2-K7; Thu, 03 Nov 2022 12:18:00 -0400 Received: from mout.kundenserver.de ([212.227.126.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuP-00085v-40; Thu, 03 Nov 2022 12:17:39 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N49Yn-1oyuQk1rXN-0100kB; Thu, 03 Nov 2022 17:17:31 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Stefan Weil , =?utf-8?q?Marc-An?= =?utf-8?q?dr=C3=A9_Lureau?= , Laurent Vivier Subject: [PULL 05/10] libvhost-user: Fix format strings Date: Thu, 3 Nov 2022 17:17:22 +0100 Message-Id: <20221103161727.4116147-6-laurent@vivier.eu> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221103161727.4116147-1-laurent@vivier.eu> References: <20221103161727.4116147-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:DaAzxpunnE4Trt5uAmlU5MSU3Szgv3nMuT8A+6hWxO2xE+/myHE 1AkAsavioJvVsBH8HijkdqFuBx68ZLXpxrjFgMhYUIVQ3Y5/OL7Yc81mUsKIj6ZXXbzwpps TPa4GkwOI5WG0NvgDqSuduFn7mgNABCY/f8AGDgCLvV2mOREkKjNjtZezN6zPEi0748y/xl hqbel2qfBJXEbAwtB5jVA== X-UI-Out-Filterresults: notjunk:1;V03:K0:X3oWzjLM9Fs=:DF3uP6tbNHT+f+HjTYmqcU aYBD3NXAo+GDAhb3yfkBIt0RcUMb80eP7kBwplOoQO4bSGcP5ck4przsZH0sE93TKX8DJxBIX 6QZIG6m73GnPDpE+yN88QPs3Lafd7jiDIHbyEsCJ4yItoUrM8hwez1IcmWecrDKcpH2M80lRA gaaDipje2I+ZNxQnxyF6GrEodjYh9NXr8bz03U1RpnrpUt+iwJBpp5dOWpRR2siNV0790XHOG E+fY3Wi0bodHo8zuLyK9pN4l4TgbuGGlkvy3CWSORsIulnFdkAxnUCP1ZPpIKYLpPWbxFXJuc BH6pbmMVM6c04oq43Sg2Re1P/D/zArXWL5lE7WechfI7Gdb9wUxkbg7JCUcv04C7V9RRwdFbK fFEeYyJKbucciW/lDYqyI/8bxrnPn55omS+Prlbq2XlAOMvbk18LzMs3Y4DPdGbYX1SWTdq1R zumstXa19CPA0rqGtySuZ51PbNfpx5KqcPrvDBFBlPm7FVxCbTDTIFXVZdi8SJS6njaqMqcCg 37gyKRYyLT+OnX4T3HcfSxijXBTLovw8Sc+UeI6hqzQ+TnAOiGFDnwww56OTeuqJBTmLYHUgW xWuVWGWSBNjT8xbPZ/yH62hhV8dJqtwcR32xgPiX9Vi9IuH1LiL0xUBLAL5aBWe9r9706v98+ A8Gm67IZI5P3vTRgCgnAJz0f3HmsndGrgTiMyHowNyfbyarBkPywR7XkAAbD6N+7h8nDmp4+k qmIvRAEcQBHZ2VqJitkNgBVBGXKK10SBT3RqyhICIdnqj+upBWCNKw0oKbpQsY8wilEhTLVnA zg9CaCT Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Stefan Weil Signed-off-by: Stefan Weil Reviewed-by: Marc-André Lureau Message-Id: <20220422070144.1043697-3-sw@weilnetz.de> Signed-off-by: Laurent Vivier --- subprojects/libvhost-user/libvhost-user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c index d9a6e3e5560f..d67953a1c39c 100644 --- a/subprojects/libvhost-user/libvhost-user.c +++ b/subprojects/libvhost-user/libvhost-user.c @@ -700,7 +700,7 @@ vu_add_mem_reg(VuDev *dev, VhostUserMsg *vmsg) { if (vmsg->size < VHOST_USER_MEM_REG_SIZE) { close(vmsg->fds[0]); vu_panic(dev, "VHOST_USER_ADD_MEM_REG requires a message size of at " - "least %d bytes and only %d bytes were received", + "least %zu bytes and only %d bytes were received", VHOST_USER_MEM_REG_SIZE, vmsg->size); return false; } @@ -826,7 +826,7 @@ vu_rem_mem_reg(VuDev *dev, VhostUserMsg *vmsg) { if (vmsg->size < VHOST_USER_MEM_REG_SIZE) { vmsg_close_fds(vmsg); vu_panic(dev, "VHOST_USER_REM_MEM_REG requires a message size of at " - "least %d bytes and only %d bytes were received", + "least %zu bytes and only %d bytes were received", VHOST_USER_MEM_REG_SIZE, vmsg->size); return false; } From patchwork Thu Nov 3 16:17:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13030524 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 310B6C433FE for ; Thu, 3 Nov 2022 16:20:54 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqcwg-0005Hr-KJ; Thu, 03 Nov 2022 12:19:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuT-0000p1-Jo; Thu, 03 Nov 2022 12:18:00 -0400 Received: from mout.kundenserver.de ([212.227.126.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuO-00085S-Rq; Thu, 03 Nov 2022 12:17:39 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MRCFw-1oeTpw0D4e-00N9ju; Thu, 03 Nov 2022 17:17:32 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Stefan Weil , =?utf-8?q?Marc-An?= =?utf-8?q?dr=C3=A9_Lureau?= , Laurent Vivier Subject: [PULL 06/10] libvhost-user: Add format attribute to local function vu_panic Date: Thu, 3 Nov 2022 17:17:23 +0100 Message-Id: <20221103161727.4116147-7-laurent@vivier.eu> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221103161727.4116147-1-laurent@vivier.eu> References: <20221103161727.4116147-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:mrZi9Ar49V9DYdY7q+vZdNvimd9kXbpNmAiL1FYMaMxqK4wnDxP f9Pa7XcepjHX/7ImXsEV3nFqJklNQJHc9HaUC0SSNOk74DKvtfprntO7caHnHUAoTfxL+No icFkLS3eBqLtATAfrlXOPl6OFnuFzNhZNR3vlX4YVuTN+QcsNyag//NjA8NCxhRcNol9hXk RUvIOzoUf7Am8jlvXR/6w== X-UI-Out-Filterresults: notjunk:1;V03:K0:4qpTGFmweS4=:nteVoG6tyJzcpQ4k4Zz4wZ fBXmFs48upxQE0JTZv9k3uPYuy2frg2LPamXUtt7k/zyH8dcxJUN/FT6B2p1Zt77x7PhM0qtU agmdX4Fqh7bjk6fZvwOWKkLJi4oZJ3/n6Nvsn+5yi6ohZ8JAysOlVnX9Bm6H7GtdhditcoUGl 6fn/0GLhe74J+4IlvcgWcES4wrAcoO05KK3ojsXxTbdOIHjhl4SDykvQLwGDCobIaPX0fzWgk pal9eBDGuf3S0eg/zVrQVdgFJVhoN+CAHExnBbMRXJ/cePROROMCMDOYZCR0Nk4LVYAVfD2Lf MpCUiH2TzfksxtsDspPZFFW1VOPNDizhvHfmzMbsKswG5g8JMvT6F48iZlh/E2YCWH2rRp1Ii zxVeJZqGFqGwnKtGV5YmbAq8LHYNcN6KyZPvGdaBGwzWNfsbMXV2LWoIX3ICRRTzUSEBEXy29 Xgz3XSRaMFxQ7iE5P9UUrQta0CmD3/yBv/mExAxYBzO3vj9g03lg4S3ikYCi4Ug5sXqaWpcu9 iaBpTkTQ3qDbuGduRerIm1K/ZpwLZIlSVVJu07SrP/fxCNfFK0U3Wwwmxw0kZBqKjEGXZYr/X GG9IbQJ8jbzxh1Zr1O4m/yDTnEU1hAfBz+lScmMUaf40SY7G8XNZM+8MkLrLhnr1bBzYqqaF7 PyC6zkn6yE3KUdP4L8UYpUOzPLUq/FvxAo8XS2zDPWWCaNOXWcTAZfcWk1jgDvjfcTPUbB4QP detxOh/d+wV6fvFnrkRByuqBLYh6hcohg2dC9neb3AvXuAD2QgMIDbvsmoz9cEqIeOVMS6/T8 ND3g2YU Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Stefan Weil Signed-off-by: Stefan Weil Reviewed-by: Marc-André Lureau Message-Id: <20220422070144.1043697-4-sw@weilnetz.de> Signed-off-by: Laurent Vivier --- subprojects/libvhost-user/libvhost-user.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c index d67953a1c39c..f7b45b3066c1 100644 --- a/subprojects/libvhost-user/libvhost-user.c +++ b/subprojects/libvhost-user/libvhost-user.c @@ -45,6 +45,17 @@ #include "libvhost-user.h" /* usually provided by GLib */ +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) +#if !defined(__clang__) && (__GNUC__ == 4 && __GNUC_MINOR__ == 4) +#define G_GNUC_PRINTF(format_idx, arg_idx) \ + __attribute__((__format__(gnu_printf, format_idx, arg_idx))) +#else +#define G_GNUC_PRINTF(format_idx, arg_idx) \ + __attribute__((__format__(__printf__, format_idx, arg_idx))) +#endif +#else /* !__GNUC__ */ +#define G_GNUC_PRINTF(format_idx, arg_idx) +#endif /* !__GNUC__ */ #ifndef MIN #define MIN(x, y) ({ \ typeof(x) _min1 = (x); \ @@ -151,7 +162,7 @@ vu_request_to_string(unsigned int req) } } -static void +static void G_GNUC_PRINTF(2, 3) vu_panic(VuDev *dev, const char *msg, ...) { char *buf = NULL; From patchwork Thu Nov 3 16:17:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13030525 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 617D0C4332F for ; Thu, 3 Nov 2022 16:21:31 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqcwY-0003vP-13; Thu, 03 Nov 2022 12:19:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuf-0000uM-3U; Thu, 03 Nov 2022 12:18:00 -0400 Received: from mout.kundenserver.de ([212.227.126.130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuN-00084o-8R; Thu, 03 Nov 2022 12:17:50 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M4s91-1oquHz2WN5-00227l; Thu, 03 Nov 2022 17:17:32 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PULL 07/10] target/m68k: Rename qregs.def -> qregs.h.inc Date: Thu, 3 Nov 2022 17:17:24 +0100 Message-Id: <20221103161727.4116147-8-laurent@vivier.eu> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221103161727.4116147-1-laurent@vivier.eu> References: <20221103161727.4116147-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:dvSvIvrw089J35lQcZ5ZNwsAyp6pHEQriT/6QC8+EUZR+X4Sysz 28+Jn1wuzMsEsT6wJPY5SkEhAgpIzyC1oSt0roITnQ1CxpTEHTiNk3qgWXtaeTEDXa33tqk eLqGUJaVKpwHGZdGgTlJverFgwGiv3ocM9TBFw/hv7sS1QMWsA5bQbhLTw7Ed9k/o/QvZKg OhtK7PqEcPBdthzHB31VQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:sAzmYMz7mPg=:ECIKIPHBSWip6pktqXpVrB +OoxHulp9tErouyS/IeFpTChZNP7G92dOMBDwIWr+U6/OWcSPYGbtq7qoczE0K/Fk0Ui+fizv tCcfI6mLb8Yzs2h1O4jqgJWeqoNCXagCCTT+WvGjZPv61QSVbnQ8Pzu8L1TDjm4ppB8JJQpuw Jc6vfEir2GRqU8pi231M2CDW5l+SsuH5QIALchzJQGEZvADk7NUhLDvsV+myMFYZu6dt03XOa JW/2huczSe+tniR89O5rziuuIhB5Qr47rwxFD/MQJwSn2ex3SrNHHunVpIIxM68pmjOIHamRr DZqTOmhZ4gQj8aWKQFBU5/a7HxvmlIhn23AV8UwS3b9cqlnxuEGv9t9bJ31Psi40QTtJnx/n/ AfnbZHaWAUb4TT58+6Wd/G+Dq+PlnApQIc0wRwt4J/inZHWJgji3qRYXI/nMz7sy7RC8lykKF XdoI8heTc15+bokNl0TAZjN7Cs9cVaHcLB7ug4/RlmlVuf4DcnKklIqETW11mqjHzAN6xt9Ae R9vAiVotWibOUtzoYXjkZKlVmFrASzz1jo0XGFHnjpg7Pbt5hO7lZeoJo3hQRRn+WpqXOkdkb eivO8yRe6syipZcErU1spehQGovNDwKT05tNQyVhkUtObx8HUtANZJi9qrgehuSAtYhMaPWm4 ZLDB4PXYsWGZ/pGZH65Hhu2Jy5ZUCoLg7rIKGq7aQa1CysklsMCSU4rGgmIHpaolncbvyV7NB 01lOTRgOhsfh26eylvKwECVVn8OsLhiTI5v9hOFfoSbA/H+e2bRInWvxI0rc/RM/O5byJJhq1 HTabcWH Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Philippe Mathieu-Daudé We use the .h.inc extension to include C headers. To be consistent with the rest of the codebase, rename the C headers using the .def extension. IDE/tools using our .editorconfig / .gitattributes will leverage this consistency. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Laurent Vivier Reviewed-by: Alex Bennée Message-Id: <20221025235006.7215-2-philmd@linaro.org> Signed-off-by: Laurent Vivier --- target/m68k/{qregs.def => qregs.h.inc} | 0 target/m68k/translate.c | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename target/m68k/{qregs.def => qregs.h.inc} (100%) diff --git a/target/m68k/qregs.def b/target/m68k/qregs.h.inc similarity index 100% rename from target/m68k/qregs.def rename to target/m68k/qregs.h.inc diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 5cbde4be3404..18418312b14b 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -39,7 +39,7 @@ #define DEFO32(name, offset) static TCGv QREG_##name; #define DEFO64(name, offset) static TCGv_i64 QREG_##name; -#include "qregs.def" +#include "qregs.h.inc" #undef DEFO32 #undef DEFO64 @@ -75,7 +75,7 @@ void m68k_tcg_init(void) #define DEFO64(name, offset) \ QREG_##name = tcg_global_mem_new_i64(cpu_env, \ offsetof(CPUM68KState, offset), #name); -#include "qregs.def" +#include "qregs.h.inc" #undef DEFO32 #undef DEFO64 From patchwork Thu Nov 3 16:17:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13030527 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B664CC4321E for ; Thu, 3 Nov 2022 16:21:31 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqcwe-0004zY-KD; Thu, 03 Nov 2022 12:19:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuU-0000pi-KM; Thu, 03 Nov 2022 12:18:00 -0400 Received: from mout.kundenserver.de ([212.227.126.130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuR-00087Q-04; Thu, 03 Nov 2022 12:17:40 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mwfj0-1pE4yF12aY-00y8uq; Thu, 03 Nov 2022 17:17:33 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Laurent Vivier Subject: [PULL 08/10] target/s390x: Rename insn-data/format.def -> insn-data/format.h.inc Date: Thu, 3 Nov 2022 17:17:25 +0100 Message-Id: <20221103161727.4116147-9-laurent@vivier.eu> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221103161727.4116147-1-laurent@vivier.eu> References: <20221103161727.4116147-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:INBG5XPnmLC0Yn23mMRjd3dakHhX1xQbSM9teoLHSmlfgw1awEK GVhQMlIv4ByZXzBGm7LGGVBp4hpGX2BysBNJ6uCq1/PAI0J49l+cXOni3DmoZPP42vmG8yb nwxFw0YlUsG8EySbvX70l7/sAr+bspdLokcwPrzqo1mNhUDCWasuIHvvtduXw3BEPorRPeR Ogbxb9GDsVwBlbvy2/TPw== X-UI-Out-Filterresults: notjunk:1;V03:K0:SSZtkizDVT0=:3ToH93LiwSNfrmwsTe+9LJ v4tPKRXdVTRLK2RYCAUx13LD6xnjLE43/buaQDURm4BVuBLrUEJdEgnSJXpuGxOrSF64NepmN PQrNy3+vHVmKx+b1fYdbiege83hOcZ3a4ojDQFpHZeJ8a0U/R7vbWNV9IORiKw7YFplk+CzKD cDCig+4EioWtDAwbjElVqbnIIamP0Bo3/fN9D0yUNbUiG4QH0w+qR0UrrLbfIEHuIOMuagTxA k6HbVBjJl/Sfb6ZXwXIdDL3mEn6nc/4z/Bl2Wq1Jdrs0OiGjpCEYezVsvH7SC0LMQFHCmZfQj I4KjbuGezRSnhOcUWEbYZLdebxMLyCLFCBR7XkUlHQr4vkCmkUPrBSSVufYWn3ftjPaTH9Gkx MpTzmHCv38nII6ZZsfR+uzuQ7IkbsCMaYoAshrcp0hVCk1SZ5UccE+tyRDKi5MmXUhP30U5nA rdFarpu0Zok4xE0ifd7OSPn6ld97nqpMoxNBOdwYRufZoq+MhwTQg6PvyVC3rSlardQjarUo/ ZJ2tMUMnq9kQM4U7yZI8ZdrQfDETex5uP/vDrJaC2qPRJ1Tw5dFcv2fddDi5NrSd7pXT77UkB A1s/VSlfKtsccGNwudXkxjo1txpyGMfkvieoEG7ZTAYkgN+WLzTxmuRXJGunlXV9zne72vKtT zNTves9KnB/tzE4agkCqHqmVW+xbSR27cPkuNFZ/LsMTRqLDEriuTacjJVqwwlJ9tqqnKmZEf udiHXJKxah34adQZ3sm3FiPmIcU1bfZ6Tiems21HMPC3Gbs9BnwGiePzErGP1mUGqLBPXYY60 /CPK+gl Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Philippe Mathieu-Daudé We use the .h.inc extension to include C headers. To be consistent with the rest of the codebase, rename the C headers using the .def extension. IDE/tools using our .editorconfig / .gitattributes will leverage this consistency. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Alex Bennée Message-Id: <20221025235006.7215-3-philmd@linaro.org> Signed-off-by: Laurent Vivier --- target/s390x/tcg/{insn-data.def => insn-data.h.inc} | 2 +- .../s390x/tcg/{insn-format.def => insn-format.h.inc} | 0 target/s390x/tcg/translate.c | 10 +++++----- 3 files changed, 6 insertions(+), 6 deletions(-) rename target/s390x/tcg/{insn-data.def => insn-data.h.inc} (99%) rename target/s390x/tcg/{insn-format.def => insn-format.h.inc} (100%) diff --git a/target/s390x/tcg/insn-data.def b/target/s390x/tcg/insn-data.h.inc similarity index 99% rename from target/s390x/tcg/insn-data.def rename to target/s390x/tcg/insn-data.h.inc index 6382ceabfcfa..7e952bdfc828 100644 --- a/target/s390x/tcg/insn-data.def +++ b/target/s390x/tcg/insn-data.h.inc @@ -8,7 +8,7 @@ * * OPC = (op << 8) | op2 where op is the major, op2 the minor opcode * NAME = name of the opcode, used internally - * FMT = format of the opcode (defined in insn-format.def) + * FMT = format of the opcode (defined in insn-format.h.inc) * FAC = facility the opcode is available in (defined in DisasFacility) * I1 = func in1_xx fills o->in1 * I2 = func in2_xx fills o->in2 diff --git a/target/s390x/tcg/insn-format.def b/target/s390x/tcg/insn-format.h.inc similarity index 100% rename from target/s390x/tcg/insn-format.def rename to target/s390x/tcg/insn-format.h.inc diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 03efccdf9f92..2fbdab72523e 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -1011,7 +1011,7 @@ static void free_compare(DisasCompare *c) #define F6(N, X1, X2, X3, X4, X5, X6) F0(N) typedef enum { -#include "insn-format.def" +#include "insn-format.h.inc" } DisasFormat; #undef F0 @@ -1076,7 +1076,7 @@ typedef struct DisasFormatInfo { #define F6(N, X1, X2, X3, X4, X5, X6) { { X1, X2, X3, X4, X5, X6 } }, static const DisasFormatInfo format_info[] = { -#include "insn-format.def" +#include "insn-format.h.inc" }; #undef F0 @@ -6143,7 +6143,7 @@ static void in2_insn(DisasContext *s, DisasOps *o) #define E(OPC, NM, FT, FC, I1, I2, P, W, OP, CC, D, FL) insn_ ## NM, enum DisasInsnEnum { -#include "insn-data.def" +#include "insn-data.h.inc" }; #undef E @@ -6223,7 +6223,7 @@ enum DisasInsnEnum { #define FAC_MIE3 S390_FEAT_MISC_INSTRUCTION_EXT3 /* miscellaneous-instruction-extensions facility 3 */ static const DisasInsn insn_info[] = { -#include "insn-data.def" +#include "insn-data.h.inc" }; #undef E @@ -6233,7 +6233,7 @@ static const DisasInsn insn_info[] = { static const DisasInsn *lookup_opc(uint16_t opc) { switch (opc) { -#include "insn-data.def" +#include "insn-data.h.inc" default: return NULL; } From patchwork Thu Nov 3 16:17:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13030550 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 28764C43217 for ; Thu, 3 Nov 2022 16:23:29 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqcwZ-0004Ir-Us; Thu, 03 Nov 2022 12:19:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuf-0000uN-4J; Thu, 03 Nov 2022 12:18:00 -0400 Received: from mout.kundenserver.de ([212.227.126.134]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuR-00087M-Jg; Thu, 03 Nov 2022 12:17:45 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MyseA-1pBt793ZYY-00vvzg; Thu, 03 Nov 2022 17:17:34 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Bastian Koppelmann , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Laurent Vivier Subject: [PULL 09/10] target/tricore: Rename csfr.def -> csfr.h.inc Date: Thu, 3 Nov 2022 17:17:26 +0100 Message-Id: <20221103161727.4116147-10-laurent@vivier.eu> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221103161727.4116147-1-laurent@vivier.eu> References: <20221103161727.4116147-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:8E4dBtgYRVoAC+EnsgpeE+/ot8vvhCoHU3BGrydozZryu+ic0iv WZZjWNa8FkQhtRKyUyrZqMFNZxXhCt/YneHlQRoPfLsN4GrekzAXqJv/oFne5I5Ea8EKwGF vEknyxaUD2FL9CMQ2TZnVqKCbXRd2GmOSmT5/bJo5gd2pvbBJsrmimJ6HMhPQbUZf7MSTFJ PAsOT6DxANB4K+vURDnsA== X-UI-Out-Filterresults: notjunk:1;V03:K0:6Z5eQ/yeXMs=:8fSExvAy4KMEnQrxN0gOqt Xxuuellsnm9W42jJMm0vJ/ffDNYdP9GTAGN5joPLFYhI/muJHdhHlM5NXYaTAqsObRFZKxPTh wbSWaVENaRtz1968b6iigKP460kO5QapB2Bp3cCV4xwxrkw5Xqo/bWXAve1+Kq33/y4jnuJEa u7wkSdMgmqgHm/kZL8ZiNPRweWNY54Cv2gh1pxNPmTdAqYx3Xgf03c8AZXaQgh6RtFIOZomOW ASB7bVCH7uAC3pCxC31PAxf21Fy4Ftz6Pl3r5Sf6BM3YaGubD7/FJ2CYM/7bF4iMg7lY5VmpG SV05gVs+fAULH8pY0iB8gjsrvaBhCj8ACqGDwZtUHioMv3QOMzOtJQPR1hbsmHpWA7b9MdpLJ hTNBBAlp4ekCeHroe2WFsqzWVZQ5uG2sYnYqO1dh8zBHoPOrVA8cA4vz7EmB3YqzWgpqT2WY1 TEcAHBXsLM+zQx9Q5gl2euEfcciEKtKC0nBzCmwkakUE9sNQPaB6Tzp+J4m9APvxeWYn2krTH DLSBC/21cRJ2Nov5Bq5JoGUBpDzT4pq6HDAbLLC1CwqyQQEevUYEsmbeVsWJPUDYbaMLVBaFI cgSfbapu+d3OcVWdm7UYcuQmByQy0iOTwpATBT72I1YccyVBApYTV5LZra/eMD7IAlJ2SFvkj 3X6u9R9sYkS8dkVJycUXOAhd5LL6CxrgRTKZIBt+zTdIHLpB8EyBZgny7nK/xDsBavkCPJVcD YM+zO5127dJxsWu13JyGa7PPTai87U/khmEQXmd9bp0ILsBrAKtPmd/iEM4r14fxlsjvUrIiN gIQzbrv Received-SPF: none client-ip=212.227.126.134; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_NONE=0.001, T_SPF_HELO_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Philippe Mathieu-Daudé We use the .h.inc extension to include C headers. To be consistent with the rest of the codebase, rename the C headers using the .def extension. IDE/tools using our .editorconfig / .gitattributes will leverage this consistency. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Bastian Koppelmann Reviewed-by: Alex Bennée Message-Id: <20221025235006.7215-4-philmd@linaro.org> Signed-off-by: Laurent Vivier --- target/tricore/{csfr.def => csfr.h.inc} | 0 target/tricore/translate.c | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename target/tricore/{csfr.def => csfr.h.inc} (100%) diff --git a/target/tricore/csfr.def b/target/tricore/csfr.h.inc similarity index 100% rename from target/tricore/csfr.def rename to target/tricore/csfr.h.inc diff --git a/target/tricore/translate.c b/target/tricore/translate.c index c5b7bfbf2013..df9e46c6495e 100644 --- a/target/tricore/translate.c +++ b/target/tricore/translate.c @@ -388,7 +388,7 @@ static inline void gen_mfcr(DisasContext *ctx, TCGv ret, int32_t offset) gen_helper_psw_read(ret, cpu_env); } else { switch (offset) { -#include "csfr.def" +#include "csfr.h.inc" } } } @@ -418,7 +418,7 @@ static inline void gen_mtcr(DisasContext *ctx, TCGv r1, gen_helper_psw_write(cpu_env, r1); } else { switch (offset) { -#include "csfr.def" +#include "csfr.h.inc" } } } else { From patchwork Thu Nov 3 16:17:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 13030521 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D7091C4332F for ; Thu, 3 Nov 2022 16:20:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqcwB-0002up-Jy; Thu, 03 Nov 2022 12:19:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuQ-0000m2-Qu; Thu, 03 Nov 2022 12:17:39 -0400 Received: from mout.kundenserver.de ([212.227.126.133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuO-00085V-QS; Thu, 03 Nov 2022 12:17:38 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MqJuN-1pKRgb1fL1-00nRhV; Thu, 03 Nov 2022 17:17:34 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Laurent Vivier Subject: [PULL 10/10] tests/unit: simpler variable sequence for test-io-channel Date: Thu, 3 Nov 2022 17:17:27 +0100 Message-Id: <20221103161727.4116147-11-laurent@vivier.eu> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221103161727.4116147-1-laurent@vivier.eu> References: <20221103161727.4116147-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:c/GXiQlgCQTRKFlS7hWkhPX2gAqA09KgnpcFLaMdH187e47V6oD ZGgXEuGej375hBe7kZ/yI309c1Ja/Y/RYCJY/u+Tujg+uRIhCdnwYOmJ5H2S87aE+Xn5prz hVx8a6TVtCbnElour7K0zd+el+Y0Fnl5IpNF9OjZ4H9m0C6f+qbitMf3F9iHdIDceJtYcEw ITeatCIQzuVOxf22Mtegg== X-UI-Out-Filterresults: notjunk:1;V03:K0:T4mLWOp+/RY=:qTX80NiRnnUdDHGm9srG3B J03kqOKIRKfQwXOM1YLO4STSS8O8OdveKoOmGwxNwMtdLpetBASX2NMPKUg9bmpbj0XI6erkC OVYwNadwV1R4N5kGC7yHFAqQs/xVgYCJB0TygROECijucE55pwvgpfY38Bxb9IebR2vRZj85Z 6IjtXHmwIgvoq9oN79W0XnK8KHjKkJTRINlCN8fi9GvzwikyBrBNpWt9VF2tFo79FTcrcTX9+ bQsQZX5kRiSLKfcPdMDy1vJAuEw5KZBSgePSUdtYgKIUSMTJpFNksZdYlyJWwBMd/3laHsjjG 70z9bCK52ZlIfFIZsD/TbJNjMNoCYf8Z329IyO6yYgG4j3SLuYO8n4rOWXx6SAFKEijPO26L8 NNY8LSKzv6MThA3Cfj8WfioPJQHfztaIUfFC7XOfMtqXwKEBp4El0ZfbURUL65BpQ+cHHEpnH dsm62+aqjrphpsh4neVOFTTtQkAp6jZ6/ZRiu/4nRCg2EfDla4XFxMhIWf1YvKbOJl7BP1447 a3ZKXzhQ6SbT7yJ7cf/3N/z0FZLgMTcQdYBKX3Lkg+jsB0URDz/Q6LPsr98OZ9W3tUdHGzUhM 1Ob/KplVvBOWHPtwxMKznfajRruIR3/SRFKyKJY6+ymTg6Mj0TRIUoB3pr9EzpzX1MbE0Wyau FUzJpPqoDW0yGW2npDZrEAy5cHAceZNmxunJxDVv/j7d5vh9FGzze9TUmhne19wvI5O7p3ndi yBc/SBK8EW/gZgOcpfrQWqKTfLWoZelfzbC+H4fSd1DTlQ0eyllgN7NY646Qxkcv3QAS6ghB6 FS7fQbQ Received-SPF: none client-ip=212.227.126.133; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Alex Bennée This avoids some compilers complaining about a potentially un-initialised [src|dst]argv. In retrospect using GString was overkill for what we are constructing. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Laurent Vivier Message-Id: <20221103102329.2581508-1-alex.bennee@linaro.org> Signed-off-by: Laurent Vivier --- tests/unit/test-io-channel-command.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/tests/unit/test-io-channel-command.c b/tests/unit/test-io-channel-command.c index 43e29c8cfbf4..19f72eab961d 100644 --- a/tests/unit/test-io-channel-command.c +++ b/tests/unit/test-io-channel-command.c @@ -33,19 +33,13 @@ static void test_io_channel_command_fifo(bool async) { g_autofree gchar *tmpdir = g_dir_make_tmp("qemu-test-io-channel.XXXXXX", NULL); g_autofree gchar *fifo = g_strdup_printf("%s/%s", tmpdir, TEST_FIFO); - g_autoptr(GString) srcargs = g_string_new(socat); - g_autoptr(GString) dstargs = g_string_new(socat); - g_auto(GStrv) srcargv; - g_auto(GStrv) dstargv; + g_autofree gchar *srcargs = g_strdup_printf("%s - PIPE:%s,wronly", socat, fifo); + g_autofree gchar *dstargs = g_strdup_printf("%s PIPE:%s,rdonly -", socat, fifo); + g_auto(GStrv) srcargv = g_strsplit(srcargs, " ", -1); + g_auto(GStrv) dstargv = g_strsplit(dstargs, " ", -1); QIOChannel *src, *dst; QIOChannelTest *test; - g_string_append_printf(srcargs, " - PIPE:%s,wronly", fifo); - g_string_append_printf(dstargs, " PIPE:%s,rdonly -", fifo); - - srcargv = g_strsplit(srcargs->str, " ", -1); - dstargv = g_strsplit(dstargs->str, " ", -1); - src = QIO_CHANNEL(qio_channel_command_new_spawn((const char **) srcargv, O_WRONLY, &error_abort));