From 2c1730f780b2baf37acd7c466d6111061370d117 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 7 Jun 2021 19:23:11 +0200 Subject: [PATCH 1/7] docs/interop/live-block-operations: Do not hard-code the QEMU binary name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In downstream, we want to use a different name for the QEMU binary, and some people might also use the docs for non-x86 binaries, that's why we already created the |qemu_system| placeholder in the past. Use it now in the live-block-operations doc, too. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210607172311.915385-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- docs/interop/live-block-operations.rst | 30 +++++++++++++++----------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/docs/interop/live-block-operations.rst b/docs/interop/live-block-operations.rst index 1073b930dc..477d085f54 100644 --- a/docs/interop/live-block-operations.rst +++ b/docs/interop/live-block-operations.rst @@ -127,13 +127,15 @@ Interacting with a QEMU instance To show some example invocations of command-line, we will use the following invocation of QEMU, with a QMP server running over UNIX -socket:: +socket: - $ ./qemu-system-x86_64 -display none -no-user-config \ - -M q35 -nodefaults -m 512 \ - -blockdev node-name=node-A,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./a.qcow2 \ - -device virtio-blk,drive=node-A,id=virtio0 \ - -monitor stdio -qmp unix:/tmp/qmp-sock,server=on,wait=off +.. parsed-literal:: + + $ |qemu_system| -display none -no-user-config -nodefaults \\ + -m 512 -blockdev \\ + node-name=node-A,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./a.qcow2 \\ + -device virtio-blk,drive=node-A,id=virtio0 \\ + -monitor stdio -qmp unix:/tmp/qmp-sock,server=on,wait=off The ``-blockdev`` command-line option, used above, is available from QEMU 2.9 onwards. In the above invocation, notice the ``node-name`` @@ -692,14 +694,16 @@ And start the destination QEMU (we already have the source QEMU running -- discussed in the section: `Interacting with a QEMU instance`_) instance, with the following invocation. (As noted earlier, for simplicity's sake, the destination QEMU is started on the same host, but -it could be located elsewhere):: +it could be located elsewhere): - $ ./qemu-system-x86_64 -display none -no-user-config \ - -M q35 -nodefaults -m 512 \ - -blockdev node-name=node-TargetDisk,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./target-disk.qcow2 \ - -device virtio-blk,drive=node-TargetDisk,id=virtio0 \ - -S -monitor stdio -qmp unix:./qmp-sock2,server=on,wait=off \ - -incoming tcp:localhost:6666 +.. parsed-literal:: + + $ |qemu_system| -display none -no-user-config -nodefaults \\ + -m 512 -blockdev \\ + node-name=node-TargetDisk,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./target-disk.qcow2 \\ + -device virtio-blk,drive=node-TargetDisk,id=virtio0 \\ + -S -monitor stdio -qmp unix:./qmp-sock2,server=on,wait=off \\ + -incoming tcp:localhost:6666 Given the disk image chain on source QEMU:: From 771f3be1b5d6c540c427bc7274ab36e2cccba694 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 7 Jun 2021 19:42:50 +0200 Subject: [PATCH 2/7] docs/tools/virtiofsd.rst: Do not hard-code the QEMU binary name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In downstream, we want to use a different name for the QEMU binary, and some people might also use the docs for non-x86 binaries, that's why we already created the |qemu_system| placeholder in the past. Use it now in the virtiofsd doc, too. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Hajnoczi Reviewed-by: Dr. David Alan Gilbert Message-Id: <20210607174250.920226-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- docs/tools/virtiofsd.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst index 00554c75bd..265a39b0cf 100644 --- a/docs/tools/virtiofsd.rst +++ b/docs/tools/virtiofsd.rst @@ -298,13 +298,13 @@ Examples Export ``/var/lib/fs/vm001/`` on vhost-user UNIX domain socket ``/var/run/vm001-vhost-fs.sock``: -:: +.. parsed-literal:: host# virtiofsd --socket-path=/var/run/vm001-vhost-fs.sock -o source=/var/lib/fs/vm001 - host# qemu-system-x86_64 \ - -chardev socket,id=char0,path=/var/run/vm001-vhost-fs.sock \ - -device vhost-user-fs-pci,chardev=char0,tag=myfs \ - -object memory-backend-memfd,id=mem,size=4G,share=on \ - -numa node,memdev=mem \ - ... + host# |qemu_system| \\ + -chardev socket,id=char0,path=/var/run/vm001-vhost-fs.sock \\ + -device vhost-user-fs-pci,chardev=char0,tag=myfs \\ + -object memory-backend-memfd,id=mem,size=4G,share=on \\ + -numa node,memdev=mem \\ + ... guest# mount -t virtiofs myfs /mnt From af94f14046e29e667edb6f802a108162b4890972 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 7 Jun 2021 20:00:15 +0200 Subject: [PATCH 3/7] docs/tools/virtiofsd: Fix bad rst syntax For literal blocks, there has to be an empty line after the two colons, and the block itself should be indented. Signed-off-by: Thomas Huth Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Stefan Hajnoczi Message-Id: <20210607180015.924571-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- docs/tools/virtiofsd.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst index 265a39b0cf..4911e797cb 100644 --- a/docs/tools/virtiofsd.rst +++ b/docs/tools/virtiofsd.rst @@ -239,7 +239,7 @@ xattr-mapping Examples :: --o xattrmap=":prefix:all::user.virtiofs.::bad:all:::" + -o xattrmap=":prefix:all::user.virtiofs.::bad:all:::" This uses two rules, using : as the field separator; @@ -250,7 +250,8 @@ the host set. This is equivalent to the 'map' rule: :: --o xattrmap=":map::user.virtiofs.:" + + -o xattrmap=":map::user.virtiofs.:" 2) Prefix 'trusted.' attributes, allow others through @@ -277,7 +278,8 @@ through. This is equivalent to the 'map' rule: :: --o xattrmap="/map/trusted./user.virtiofs./" + + -o xattrmap="/map/trusted./user.virtiofs./" 3) Hide 'security.' attributes, and allow everything else From e2abbeac7a0c19e7757370da4c5164c862016d31 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 19 Jun 2021 17:42:53 +0200 Subject: [PATCH 4/7] Update documentation to refer to new location for issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Weil Reviewed-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210619154253.553446-1-sw@weilnetz.de> Signed-off-by: Thomas Huth --- .github/lockdown.yml | 6 +++--- README.rst | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/lockdown.yml b/.github/lockdown.yml index 07fc2f31ee..d3546bd2bc 100644 --- a/.github/lockdown.yml +++ b/.github/lockdown.yml @@ -14,11 +14,11 @@ issues: at https://gitlab.com/qemu-project/qemu.git. The project does not process issues filed on GitHub. - The project issues are tracked on Launchpad: - https://bugs.launchpad.net/qemu + The project issues are tracked on GitLab: + https://gitlab.com/qemu-project/qemu/-/issues QEMU welcomes bug report contributions. You can file new ones on: - https://bugs.launchpad.net/qemu/+filebug + https://gitlab.com/qemu-project/qemu/-/issues/new pulls: comment: | diff --git a/README.rst b/README.rst index a92c7394b7..79b19f1481 100644 --- a/README.rst +++ b/README.rst @@ -131,16 +131,16 @@ will be tagged as my-feature-v2. Bug reporting ============= -The QEMU project uses Launchpad as its primary upstream bug tracker. Bugs +The QEMU project uses GitLab issues to track bugs. Bugs found when running code built from QEMU git or upstream released sources should be reported via: -* ``_ +* ``_ If using QEMU via an operating system vendor pre-built binary package, it is preferable to report bugs to the vendor's own bug tracker first. If the bug is also known to affect latest upstream code, it can also be -reported via launchpad. +reported via GitLab. For additional information on bug reporting consult: From e52ee00dab8678b26a5b7312275daa6ac4899046 Mon Sep 17 00:00:00 2001 From: Ahmed Abouzied Date: Sat, 5 Jun 2021 19:49:38 +0200 Subject: [PATCH 5/7] Remove leading underscores from QEMU defines Leading underscores followed by a capital letter or underscore are reserved by the C standard. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/369 Signed-off-by: Ahmed Abouzied Message-Id: <20210605174938.13782-1-email@aabouzied.com> Signed-off-by: Thomas Huth --- include/fpu/softfloat-helpers.h | 4 ++-- include/hw/usb/dwc2-regs.h | 4 ++-- include/hw/usb/xlnx-usb-subsystem.h | 4 ++-- include/hw/usb/xlnx-versal-usb2-ctrl-regs.h | 4 ++-- include/qemu/plugin-memory.h | 4 ++-- include/qemu/selfmap.h | 4 ++-- include/user/syscall-trace.h | 4 ++-- plugins/plugin.h | 4 ++-- tests/qtest/fuzz/qos_fuzz.h | 4 ++-- tests/tcg/minilib/minilib.h | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/fpu/softfloat-helpers.h b/include/fpu/softfloat-helpers.h index 34f4cf92ae..a98d759cd3 100644 --- a/include/fpu/softfloat-helpers.h +++ b/include/fpu/softfloat-helpers.h @@ -48,8 +48,8 @@ this code that are retained. =============================================================================== */ -#ifndef _SOFTFLOAT_HELPERS_H_ -#define _SOFTFLOAT_HELPERS_H_ +#ifndef SOFTFLOAT_HELPERS_H +#define SOFTFLOAT_HELPERS_H #include "fpu/softfloat-types.h" diff --git a/include/hw/usb/dwc2-regs.h b/include/hw/usb/dwc2-regs.h index 40af23a0ba..a7eb531485 100644 --- a/include/hw/usb/dwc2-regs.h +++ b/include/hw/usb/dwc2-regs.h @@ -39,8 +39,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DWC2_HW_H__ -#define __DWC2_HW_H__ +#ifndef DWC2_HW_H +#define DWC2_HW_H #define HSOTG_REG(x) (x) diff --git a/include/hw/usb/xlnx-usb-subsystem.h b/include/hw/usb/xlnx-usb-subsystem.h index 739bef7f45..999e423951 100644 --- a/include/hw/usb/xlnx-usb-subsystem.h +++ b/include/hw/usb/xlnx-usb-subsystem.h @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#ifndef _XLNX_VERSAL_USB_SUBSYSTEM_H_ -#define _XLNX_VERSAL_USB_SUBSYSTEM_H_ +#ifndef XLNX_VERSAL_USB_SUBSYSTEM_H +#define XLNX_VERSAL_USB_SUBSYSTEM_H #include "hw/usb/xlnx-versal-usb2-ctrl-regs.h" #include "hw/usb/hcd-dwc3.h" diff --git a/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h b/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h index 975a717627..b76dce0419 100644 --- a/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h +++ b/include/hw/usb/xlnx-versal-usb2-ctrl-regs.h @@ -23,8 +23,8 @@ * THE SOFTWARE. */ -#ifndef _XLNX_USB2_REGS_H_ -#define _XLNX_USB2_REGS_H_ +#ifndef XLNX_USB2_REGS_H +#define XLNX_USB2_REGS_H #define TYPE_XILINX_VERSAL_USB2_CTRL_REGS "xlnx.versal-usb2-ctrl-regs" diff --git a/include/qemu/plugin-memory.h b/include/qemu/plugin-memory.h index fbbe99474b..b36def27d7 100644 --- a/include/qemu/plugin-memory.h +++ b/include/qemu/plugin-memory.h @@ -6,8 +6,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef _PLUGIN_MEMORY_H_ -#define _PLUGIN_MEMORY_H_ +#ifndef PLUGIN_MEMORY_H +#define PLUGIN_MEMORY_H struct qemu_plugin_hwaddr { bool is_io; diff --git a/include/qemu/selfmap.h b/include/qemu/selfmap.h index 8382c4c779..80cf920fba 100644 --- a/include/qemu/selfmap.h +++ b/include/qemu/selfmap.h @@ -6,8 +6,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef _SELFMAP_H_ -#define _SELFMAP_H_ +#ifndef SELFMAP_H +#define SELFMAP_H typedef struct { unsigned long start; diff --git a/include/user/syscall-trace.h b/include/user/syscall-trace.h index 42e3b48b03..614cfacfa5 100644 --- a/include/user/syscall-trace.h +++ b/include/user/syscall-trace.h @@ -7,8 +7,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef _SYSCALL_TRACE_H_ -#define _SYSCALL_TRACE_H_ +#ifndef SYSCALL_TRACE_H +#define SYSCALL_TRACE_H #include "trace/trace-root.h" diff --git a/plugins/plugin.h b/plugins/plugin.h index 55017e3581..b13677d0dc 100644 --- a/plugins/plugin.h +++ b/plugins/plugin.h @@ -9,8 +9,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef _PLUGIN_INTERNAL_H_ -#define _PLUGIN_INTERNAL_H_ +#ifndef PLUGIN_INTERNAL_H +#define PLUGIN_INTERNAL_H #include #include "qemu/qht.h" diff --git a/tests/qtest/fuzz/qos_fuzz.h b/tests/qtest/fuzz/qos_fuzz.h index 477f11b02b..63d8459b71 100644 --- a/tests/qtest/fuzz/qos_fuzz.h +++ b/tests/qtest/fuzz/qos_fuzz.h @@ -10,8 +10,8 @@ * See the COPYING file in the top-level directory. */ -#ifndef _QOS_FUZZ_H_ -#define _QOS_FUZZ_H_ +#ifndef QOS_FUZZ_H +#define QOS_FUZZ_H #include "tests/qtest/fuzz/fuzz.h" #include "tests/qtest/libqos/qgraph.h" diff --git a/tests/tcg/minilib/minilib.h b/tests/tcg/minilib/minilib.h index e23361380a..17d0f2f314 100644 --- a/tests/tcg/minilib/minilib.h +++ b/tests/tcg/minilib/minilib.h @@ -9,8 +9,8 @@ * SPDX-License-Identifier: GPL-2.0-only */ -#ifndef _MINILIB_H_ -#define _MINILIB_H_ +#ifndef MINILIB_H +#define MINILIB_H /* * Provided by the individual arch From a8fbec7ed80f4cc7ffec87144a03d990ff8002ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Sat, 12 Jun 2021 21:58:42 +0200 Subject: [PATCH 6/7] fuzz: Display hexadecimal value with '0x' prefix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use memory_region_size() to get the MemoryRegion size, and display it with the '0x' prefix. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Alexander Bulekov Reviewed-by: Laurent Vivier Reviewed-by: Thomas Huth Message-Id: <20210612195842.1595999-1-f4bug@amsat.org> Signed-off-by: Thomas Huth --- tests/qtest/fuzz/generic_fuzz.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c index cea7d4058e..6c67522717 100644 --- a/tests/qtest/fuzz/generic_fuzz.c +++ b/tests/qtest/fuzz/generic_fuzz.c @@ -841,9 +841,9 @@ static void generic_pre_fuzz(QTestState *s) g_hash_table_iter_init(&iter, fuzzable_memoryregions); while (g_hash_table_iter_next(&iter, (gpointer)&mr, NULL)) { - printf(" * %s (size %lx)\n", + printf(" * %s (size 0x%" PRIx64 ")\n", object_get_canonical_path_component(&(mr->parent_obj)), - (uint64_t)mr->size); + memory_region_size(mr)); } if (!g_hash_table_size(fuzzable_memoryregions)) { From c32c3d68ed0629910d5a1cd72bfb57d7f89b553b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Wed, 26 May 2021 19:04:21 +0200 Subject: [PATCH 7/7] MAINTAINERS: Add qtest/arm-cpu-features.c to ARM TCG CPUs section MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We want the ARM maintainers and the qemu-arm@ list to be notified when this file is modified. Add an entry to the 'ARM TCG CPUs' section in the MAINTAINERS file. Acked-by: Andrew Jones Reviewed-by: Thomas Huth Reviewed-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20210526170432.343588-2-philmd@redhat.com> Signed-off-by: Thomas Huth --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index f7e12ea248..1ced8cf07f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -155,6 +155,7 @@ S: Maintained F: target/arm/ F: tests/tcg/arm/ F: tests/tcg/aarch64/ +F: tests/qtest/arm-cpu-features.c F: hw/arm/ F: hw/cpu/a*mpcore.c F: include/hw/cpu/a*mpcore.h