diff options
| -rw-r--r-- | MAINTAINERS | 35 | ||||
| -rw-r--r-- | docs/defs.rst.inc | 2 | ||||
| -rw-r--r-- | docs/devel/build-system.rst | 8 | ||||
| -rw-r--r-- | qom/object_interfaces.c | 2 | ||||
| -rwxr-xr-x | scripts/device-crash-test | 1 | ||||
| -rw-r--r-- | util/compatfd.c | 6 |
6 files changed, 23 insertions, 31 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index aa894767dc..69003cdc3c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -174,7 +174,6 @@ F: include/hw/arm/smmu* AVR TCG CPUs M: Michael Rolnik <mrolnik@gmail.com> -R: Sarah Harris <S.E.Harris@kent.ac.uk> S: Maintained F: docs/system/target-avr.rst F: gdb-xml/avr-cpu.xml @@ -308,8 +307,8 @@ F: linux-user/host/riscv32/ F: linux-user/host/riscv64/ RENESAS RX CPUs -M: Yoshinori Sato <ysato@users.sourceforge.jp> -S: Odd Fixes +R: Yoshinori Sato <ysato@users.sourceforge.jp> +S: Orphan F: target/rx/ S390 TCG CPUs @@ -323,8 +322,8 @@ F: tests/tcg/s390x/ L: qemu-s390x@nongnu.org SH4 TCG CPUs -M: Yoshinori Sato <ysato@users.sourceforge.jp> -S: Odd Fixes +R: Yoshinori Sato <ysato@users.sourceforge.jp> +S: Orphan F: target/sh4/ F: hw/sh4/ F: disas/sh4.c @@ -1045,7 +1044,6 @@ AVR Machines AVR MCUs M: Michael Rolnik <mrolnik@gmail.com> -R: Sarah Harris <S.E.Harris@kent.ac.uk> 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é <f4bug@amsat.org> -R: Sarah Harris <S.E.Harris@kent.ac.uk> S: Maintained F: hw/avr/arduino.c @@ -1408,8 +1405,8 @@ F: include/hw/*/*sifive*.h RX Machines ----------- rx-gdbsim -M: Yoshinori Sato <ysato@users.sourceforge.jp> -S: Odd Fixes +R: Yoshinori Sato <ysato@users.sourceforge.jp> +S: Orphan F: docs/system/target-rx.rst F: hw/rx/rx-gdbsim.c F: tests/acceptance/machine_rx_gdbsim.py @@ -1417,7 +1414,7 @@ F: tests/acceptance/machine_rx_gdbsim.py SH4 Machines ------------ R2D -M: Yoshinori Sato <ysato@users.sourceforge.jp> +R: Yoshinori Sato <ysato@users.sourceforge.jp> R: Magnus Damm <magnus.damm@gmail.com> S: Odd Fixes F: hw/char/sh_serial.c @@ -1428,7 +1425,7 @@ F: hw/timer/sh_timer.c F: include/hw/sh4/sh_intc.h Shix -M: Yoshinori Sato <ysato@users.sourceforge.jp> +R: Yoshinori Sato <ysato@users.sourceforge.jp> R: Magnus Damm <magnus.damm@gmail.com> S: Odd Fixes F: hw/block/tc58128.c @@ -1516,6 +1513,7 @@ L: qemu-s390x@nongnu.org S390 PCI M: Matthew Rosato <mjrosato@linux.ibm.com> +M: Eric Farman <farman@linux.ibm.com> S: Supported F: hw/s390x/s390-pci* F: include/hw/s390x/s390-pci* @@ -1727,8 +1725,7 @@ F: tests/qtest/acpi-utils.[hc] F: tests/data/acpi/ ACPI/HEST/GHES -R: Dongjiu Geng <gengdongjiu@huawei.com> -R: Xiang Zheng <zhengxiang9@huawei.com> +R: Dongjiu Geng <gengdongjiu1@gmail.com> L: qemu-arm@nongnu.org S: Maintained F: hw/acpi/ghes.c @@ -1830,6 +1827,7 @@ F: docs/igd-assign.txt vfio-ccw M: Cornelia Huck <cohuck@redhat.com> M: Eric Farman <farman@linux.ibm.com> +M: Matthew Rosato <mjrosato@linux.ibm.com> S: Supported F: hw/vfio/ccw.c F: hw/s390x/s390-ccw.c @@ -1839,10 +1837,9 @@ T: git https://gitlab.com/cohuck/qemu.git s390-next L: qemu-s390x@nongnu.org vfio-ap -M: Christian Borntraeger <borntraeger@de.ibm.com> M: Tony Krowiak <akrowiak@linux.ibm.com> M: Halil Pasic <pasic@linux.ibm.com> -M: Pierre Morel <pmorel@linux.ibm.com> +M: Jason Herne <jjherne@linux.ibm.com> S: Supported F: hw/s390x/ap-device.c F: hw/s390x/ap-bridge.c @@ -1919,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 <kraxel@redhat.com> @@ -2183,7 +2181,7 @@ F: include/hw/*/*xive* F: docs/*/*xive* Renesas peripherals -M: Yoshinori Sato <ysato@users.sourceforge.jp> +R: Yoshinori Sato <ysato@users.sourceforge.jp> R: Magnus Damm <magnus.damm@gmail.com> S: Odd Fixes F: hw/char/renesas_sci.c @@ -2195,8 +2193,8 @@ F: include/hw/sh4/sh.h F: include/hw/timer/renesas_*.h Renesas RX peripherals -M: Yoshinori Sato <ysato@users.sourceforge.jp> -S: Odd Fixes +R: Yoshinori Sato <ysato@users.sourceforge.jp> +S: Orphan F: hw/intc/rx_icu.c F: hw/rx/ F: include/hw/intc/rx_icu.h @@ -2727,6 +2725,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 <marcandre.lureau@redhat.com> 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 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: diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index b17aa57de1..4479ee693a 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -158,7 +158,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); } 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}, 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 <sys/syscall.h> #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; |