From fac87d4d9dc1debf122f5e9b14910e4c7b9f57b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?= Date: Fri, 19 Mar 2021 16:07:57 +0800 Subject: [PATCH 01/13] MAINTAINERS: Fix tests/migration maintainers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit when executing the following scripts, it throw error message: $ ./scripts/get_maintainer.pl -f tests/migration/guestperf.py get_maintainer.pl: No maintainers found, printing recent contributors. get_maintainer.pl: Do not blindly cc: them on patches! Use common sense. add the tests/migration to the "Migration" section of MAINTAINERS Signed-off-by: Hyman Huang(黄勇) Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <91d5978357fb8709ef61d2030984f7142847037d.1616141556.git.huangy81@chinatelecom.cn> Signed-off-by: Thomas Huth --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 554be84b32..670132f7fe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2727,6 +2727,7 @@ F: tests/vmstate-static-checker-data/ F: tests/qtest/migration-test.c F: docs/devel/migration.rst F: qapi/migration.json +F: tests/migration/ D-Bus M: Marc-André Lureau From 074c84b9b3b19272a9c1a192ebda47f9f040580c Mon Sep 17 00:00:00 2001 From: Matthew Rosato Date: Thu, 25 Mar 2021 09:55:09 -0400 Subject: [PATCH 02/13] MAINTAINERS: add/replace backups for some s390 areas S390 PCI currently has no backup, add one. Add an additional backup for vfio-ccw and refresh the backup for vfio-ap. Signed-off-by: Matthew Rosato Acked-by: Jason J. Herne Acked-by: Eric Farman Acked-by: Pierre Morel Acked-by: Christian Borntraeger Acked-by: Halil Pasic Message-Id: <1616680509-8339-1-git-send-email-mjrosato@linux.ibm.com> Signed-off-by: Thomas Huth --- MAINTAINERS | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 670132f7fe..fcd8da53ae 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1516,6 +1516,7 @@ L: qemu-s390x@nongnu.org S390 PCI M: Matthew Rosato +M: Eric Farman S: Supported F: hw/s390x/s390-pci* F: include/hw/s390x/s390-pci* @@ -1830,6 +1831,7 @@ F: docs/igd-assign.txt vfio-ccw M: Cornelia Huck M: Eric Farman +M: Matthew Rosato S: Supported F: hw/vfio/ccw.c F: hw/s390x/s390-ccw.c @@ -1839,10 +1841,9 @@ T: git https://gitlab.com/cohuck/qemu.git s390-next L: qemu-s390x@nongnu.org vfio-ap -M: Christian Borntraeger M: Tony Krowiak M: Halil Pasic -M: Pierre Morel +M: Jason Herne S: Supported F: hw/s390x/ap-device.c F: hw/s390x/ap-bridge.c From bead6a96bb7bcc5709b6f9f189cd900c006206b4 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Thu, 1 Apr 2021 08:24:26 +0200 Subject: [PATCH 03/13] MAINTAINERS: Drop the lines with Sarah Harris In a mail to the qemu-devel mailing list, Sarah wrote: "I was added as a reviewer (in MAINTAINERS) for the AVR target for the duration of my research work using it. The funding for my project expires in the middle of April, so I will not be able to provide time for reviewing patches from that point." Thus let's remove the corresponding lines in the MAINTAINERS file. Message-Id: <20210401062426.3192118-1-thuth@redhat.com> Reviewed-by: Sarah Harris Signed-off-by: Thomas Huth --- MAINTAINERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index fcd8da53ae..0abe6182e5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -174,7 +174,6 @@ F: include/hw/arm/smmu* AVR TCG CPUs M: Michael Rolnik -R: Sarah Harris S: Maintained F: docs/system/target-avr.rst F: gdb-xml/avr-cpu.xml @@ -1045,7 +1044,6 @@ AVR Machines AVR MCUs M: Michael Rolnik -R: Sarah Harris S: Maintained F: default-configs/*/avr-softmmu.mak F: hw/avr/ @@ -1058,7 +1056,6 @@ F: hw/misc/avr_power.c Arduino M: Philippe Mathieu-Daudé -R: Sarah Harris S: Maintained F: hw/avr/arduino.c From d6eed465484692c5d1b2c7f5c553e6dcb033db7a Mon Sep 17 00:00:00 2001 From: Dongjiu Geng Date: Thu, 11 Mar 2021 19:29:04 +0800 Subject: [PATCH 04/13] MAINTAINERS: replace Huawei's email to personal one In order to conveniently receive email, replace the Huawei email address with my personal one. Signed-off-by: Dongjiu Geng Message-Id: <1615462144-10864-1-git-send-email-gengdongjiu1@gmail.com> Signed-off-by: Thomas Huth --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 0abe6182e5..4dab272320 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1725,7 +1725,7 @@ F: tests/qtest/acpi-utils.[hc] F: tests/data/acpi/ ACPI/HEST/GHES -R: Dongjiu Geng +R: Dongjiu Geng R: Xiang Zheng L: qemu-arm@nongnu.org S: Maintained From e4145cd735a1fdc4d1fa4f75cb05da7a4ffa757c Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Thu, 1 Apr 2021 08:48:37 +0200 Subject: [PATCH 05/13] MAINTAINERS: Drop the line with Xiang Zheng When sending a mail with CC: to zhengxiang9@huawei.com I got a mail back saying: Your message couldn't be delivered The message you sent to zhengxiang9@huawei.com couldn't be delivered due to: Recipient email address is possibly incorrect. Further information 5.1.1 : Recipient address rejected: Failed recipient validation check.: host 127.0.0.1[127.0.0.1] said: 554 5.7.1 recipient verify from ldap failed (in reply to RCPT TO command) Looks like this address does not exist anymore, thus drop it from the MAINTAINERS file. Message-Id: <20210401065343.3197791-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 4dab272320..f237ea313d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1726,7 +1726,6 @@ F: tests/data/acpi/ ACPI/HEST/GHES R: Dongjiu Geng -R: Xiang Zheng L: qemu-arm@nongnu.org S: Maintained F: hw/acpi/ghes.c From 09c8d9e867148b4605205db378bda9af3695b2dd Mon Sep 17 00:00:00 2001 From: Connor Kuehl Date: Thu, 18 Mar 2021 10:41:57 -0500 Subject: [PATCH 06/13] MAINTAINERS: add virtio-fs mailing list General discussion and patch reviews take place on this list for both virtiofsd (tools/virtiofsd/*) and the guest kernel module. Signed-off-by: Connor Kuehl Reviewed-by: Stefan Hajnoczi Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Vivek Goyal Message-Id: <20210318154157.1357224-1-ckuehl@redhat.com> Signed-off-by: Thomas Huth --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index f237ea313d..155c7995d4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1916,6 +1916,7 @@ F: tools/virtiofsd/* F: hw/virtio/vhost-user-fs* F: include/hw/virtio/vhost-user-fs.h F: docs/tools/virtiofsd.rst +L: virtio-fs@redhat.com virtio-input M: Gerd Hoffmann From b2744da97563e077d24d1400e0b8d8ffd4164e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Fri, 12 Mar 2021 16:55:12 +0100 Subject: [PATCH 07/13] MAINTAINERS: Mark RX hardware emulation orphan MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Yoshinori Sato doesn't have time to manage QEMU reviews. The code is in good shape and hasn't started to bitrot, so mark the RX target and hardware as orphan to give the possibility to any contributor to step in and fill the gap. Signed-off-by: Philippe Mathieu-Daudé Cc: Yoshinori Sato Message-Id: <20210312155513.1849109-2-f4bug@amsat.org> Acked-by: Richard Henderson Signed-off-by: Thomas Huth --- MAINTAINERS | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 155c7995d4..0a857f6b18 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -307,8 +307,8 @@ F: linux-user/host/riscv32/ F: linux-user/host/riscv64/ RENESAS RX CPUs -M: Yoshinori Sato -S: Odd Fixes +R: Yoshinori Sato +S: Orphan F: target/rx/ S390 TCG CPUs @@ -1405,8 +1405,8 @@ F: include/hw/*/*sifive*.h RX Machines ----------- rx-gdbsim -M: Yoshinori Sato -S: Odd Fixes +R: Yoshinori Sato +S: Orphan F: docs/system/target-rx.rst F: hw/rx/rx-gdbsim.c F: tests/acceptance/machine_rx_gdbsim.py @@ -2193,8 +2193,8 @@ F: include/hw/sh4/sh.h F: include/hw/timer/renesas_*.h Renesas RX peripherals -M: Yoshinori Sato -S: Odd Fixes +R: Yoshinori Sato +S: Orphan F: hw/intc/rx_icu.c F: hw/rx/ F: include/hw/intc/rx_icu.h From 2d53d0c77f95433a70f89f837f7ee768d79ac3cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Fri, 12 Mar 2021 16:55:13 +0100 Subject: [PATCH 08/13] MAINTAINERS: Mark SH-4 hardware emulation orphan MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Yoshinori Sato doesn't have time to manage QEMU reviews. The code is in good shape and hasn't started to bitrot, so mark the SH-4 hardware as orphan to give the possibility to any contributor to step in and fill the gap. Signed-off-by: Philippe Mathieu-Daudé CC: Magnus Damm Cc: Aurelien Jarno Cc: Yoshinori Sato Message-Id: <20210312155513.1849109-3-f4bug@amsat.org> Acked-by: Richard Henderson Signed-off-by: Thomas Huth --- MAINTAINERS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 0a857f6b18..d73a92c992 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -322,8 +322,8 @@ F: tests/tcg/s390x/ L: qemu-s390x@nongnu.org SH4 TCG CPUs -M: Yoshinori Sato -S: Odd Fixes +R: Yoshinori Sato +S: Orphan F: target/sh4/ F: hw/sh4/ F: disas/sh4.c @@ -1414,7 +1414,7 @@ F: tests/acceptance/machine_rx_gdbsim.py SH4 Machines ------------ R2D -M: Yoshinori Sato +R: Yoshinori Sato R: Magnus Damm S: Odd Fixes F: hw/char/sh_serial.c @@ -1425,7 +1425,7 @@ F: hw/timer/sh_timer.c F: include/hw/sh4/sh_intc.h Shix -M: Yoshinori Sato +R: Yoshinori Sato R: Magnus Damm S: Odd Fixes F: hw/block/tc58128.c @@ -2181,7 +2181,7 @@ F: include/hw/*/*xive* F: docs/*/*xive* Renesas peripherals -M: Yoshinori Sato +R: Yoshinori Sato R: Magnus Damm S: Odd Fixes F: hw/char/renesas_sci.c From bd74ecd1c39ca7699819ca5cf39c07f50c5f8d5d Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 24 Mar 2021 09:41:30 +0100 Subject: [PATCH 09/13] qom: Fix default values in help MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Output of default values in device help is broken: $ ./qemu-system-x86_64 -S -display none -monitor stdio QEMU 5.2.50 monitor - type 'help' for more information (qemu) device_add pvpanic,help pvpanic options: events= - (default: (null)) ioport= - (default: (null)) pvpanic[0]=> The "(null)" is glibc printing a null pointer. Other systems crash instead. Having a help request crash a running VM can really spoil your day. Root cause is a botched replacement of qstring_free() by g_string_free(): to get the string back, we need to pass true to the former, but false to the latter. Fix the argument. Fixes: eab3a4678b07267c39e7290a6e9e7690b1d2a521 Reported-by: Thomas Huth Signed-off-by: Markus Armbruster Reviewed-by: Marc-André Lureau Reviewed-by: Thomas Huth Message-Id: <20210324084130.3986072-1-armbru@redhat.com> Signed-off-by: Thomas Huth --- qom/object_interfaces.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index c3324b0f86..bd8a947a63 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -159,7 +159,7 @@ char *object_property_help(const char *name, const char *type, } if (defval) { g_autofree char *def_json = g_string_free(qobject_to_json(defval), - true); + false); g_string_append_printf(str, " (default: %s)", def_json); } From 7e3a61ce621b48d4cabc181bcb979ee876e940d0 Mon Sep 17 00:00:00 2001 From: Mahmoud Mandour Date: Mon, 15 Mar 2021 12:58:13 +0200 Subject: [PATCH 10/13] util/compatfd.c: Fixed style issues Fixed two styling issues that caused checkpatch.pl errors. Signed-off-by: Mahmoud Mandour Reviewed-by: Thomas Huth Message-Id: <20210315105814.5188-2-ma.mandourr@gmail.com> Signed-off-by: Thomas Huth --- util/compatfd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/util/compatfd.c b/util/compatfd.c index ee47dd8089..174f394533 100644 --- a/util/compatfd.c +++ b/util/compatfd.c @@ -20,8 +20,7 @@ #include #endif -struct sigfd_compat_info -{ +struct sigfd_compat_info { sigset_t mask; int fd; }; @@ -53,8 +52,9 @@ static void *sigwait_compat(void *opaque) len = write(info->fd, (char *)&buffer + offset, sizeof(buffer) - offset); - if (len == -1 && errno == EINTR) + if (len == -1 && errno == EINTR) { continue; + } if (len <= 0) { return NULL; From 4fb98ae62dfe4ad764bc6da1ae08b3bf47ce6f8f Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Tue, 16 Mar 2021 13:42:08 +0100 Subject: [PATCH 11/13] docs: Remove obsolete paragraph about config-target.mak $TARGET-NAME/config-target.mak has been removed a while ago. Remove it now from the documentation, too. Fixes: fdb75aeff7 ("configure: remove target configuration") Message-Id: <20210316124208.455456-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- docs/devel/build-system.rst | 8 -------- 1 file changed, 8 deletions(-) diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst index 69ce3087e3..7ef36f42d0 100644 --- a/docs/devel/build-system.rst +++ b/docs/devel/build-system.rst @@ -426,14 +426,6 @@ Built by configure: build outputs. Variables which are potentially different for each emulator target are defined by the next file... -`$TARGET-NAME/config-target.mak` - TARGET-NAME is the name of a system or userspace emulator, for example, - x86_64-softmmu denotes the system emulator for the x86_64 architecture. - This file contains the variables which need to vary on a per-target - basis. For example, it will indicate whether KVM or Xen are enabled for - the target and any other potential custom libraries needed for linking - the target. - Built by Meson: From 69c5d14dc87cc41819cbba01c7eab71d9be2b052 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Thu, 1 Apr 2021 07:18:29 +0200 Subject: [PATCH 12/13] docs: Fix typo in the default name of the qemu-system-x86_64 binary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's a '-' between 'qemu' and 'system', not a '_'. Fixes: 324b2298fe ("docs/system: convert Texinfo documentation to rST") Message-Id: <20210401051829.3169438-1-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- docs/defs.rst.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/defs.rst.inc b/docs/defs.rst.inc index 48d05aaf33..52d6454b93 100644 --- a/docs/defs.rst.inc +++ b/docs/defs.rst.inc @@ -10,6 +10,6 @@ incorrectly in boldface. .. |qemu_system| replace:: qemu-system-x86_64 -.. |qemu_system_x86| replace:: qemu_system-x86_64 +.. |qemu_system_x86| replace:: qemu-system-x86_64 .. |I2C| replace:: I\ :sup:`2`\ C .. |I2S| replace:: I\ :sup:`2`\ S From ca89d15f8e42f2e5eac5bd200af38fdbfb32e875 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Tue, 23 Mar 2021 17:47:18 +0100 Subject: [PATCH 13/13] device-crash-test: Ignore errors about a bus not being available Recent QEMU versions now sometimes exit cleanly with an error message that a bus is not available for a specified device. Don't flag those as an error in the device-crash-test script. Message-Id: <20210323164718.1393792-1-thuth@redhat.com> Acked-by: John Snow Signed-off-by: Thomas Huth --- scripts/device-crash-test | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/device-crash-test b/scripts/device-crash-test index 6d809ac711..8331c057b8 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -175,6 +175,7 @@ ERROR_RULE_LIST = [ {'log':r"Multiple VT220 operator consoles are not supported"}, {'log':r"core 0 already populated"}, {'log':r"could not find stage1 bootloader"}, + {'log':r"No '.*' bus found for device"}, # other exitcode=1 failures not listed above will just generate INFO messages: {'exitcode':1, 'loglevel':logging.INFO},