- Devel - libvirt List Archives

[PATCH] virprocess: Drop workaround for setns() wrt old glibc
by Michal Privoznik 24 May '22

24 May '22

We have our own implementation of setns() which was introduced in v1.2.9-rc1~190 and extended afterwards. The reason was that back in 2014 we were dealing with glibc that in some of its older versions did not provide the function. Mostly for non-intel arches. Nevertheless, glibc now offers the function for all architectures we care about (aarch64 being the freshest architecture where the function was introduced, in glibc-2.17). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virprocess.c | 55 +++++++++---------------------------------- 1 file changed, 11 insertions(+), 44 deletions(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 36d7df050a..f0a79396e7 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -27,7 +27,6 @@ #ifndef WIN32 # include <sys/wait.h> #endif -#include <unistd.h> #if WITH_SYS_MOUNT_H # include <sys/mount.h> #endif @@ -70,49 +69,6 @@ VIR_LOG_INIT("util.process"); -#ifdef __linux__ -/* - * Workaround older glibc. While kernel may support the setns - * syscall, the glibc wrapper might not exist. If that's the - * case, use our own. - */ -# ifndef __NR_setns -# if defined(__x86_64__) -# define __NR_setns 308 -# elif defined(__i386__) -# define __NR_setns 346 -# elif defined(__arm__) -# define __NR_setns 375 -# elif defined(__aarch64__) -# define __NR_setns 375 -# elif defined(__powerpc__) -# define __NR_setns 350 -# elif defined(__s390__) -# define __NR_setns 339 -# endif -# endif - -# ifndef WITH_SETNS -# if defined(__NR_setns) -# include <sys/syscall.h> - -static inline int setns(int fd, int nstype) -{ - return syscall(__NR_setns, fd, nstype); -} -# else /* !__NR_setns */ -# error Please determine the syscall number for setns on your architecture -# endif -# endif -#else /* !__linux__ */ -static inline int setns(int fd G_GNUC_UNUSED, int nstype G_GNUC_UNUSED) -{ - virReportSystemError(ENOSYS, "%s", - _("Namespaces are not supported on this platform.")); - return -1; -} -#endif - VIR_ENUM_IMPL(virProcessSchedPolicy, VIR_PROC_POLICY_LAST, "none", @@ -714,6 +670,7 @@ int virProcessGetNamespaces(pid_t pid, } +#if WITH_SETNS int virProcessSetNamespaces(size_t nfdlist, int *fdlist) { @@ -742,6 +699,16 @@ int virProcessSetNamespaces(size_t nfdlist, } return 0; } +#else +int virProcessSetNamespaces(size_t nfdlist G_GNUC_UNUSED, + int *fdlist G_GNUC_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Namespaces are not supported on this platform.")); + return -1; +} +#endif + #if WITH_PRLIMIT static int -- 2.35.1

2 1

[libvirt RFC 0/5] introduce virFileDirect API for block-friendly read/write
by Claudio Fontana 24 May '22

24 May '22

As a spin-off from the previous multifd series, this series offers a basic API for virfile.c to deal with reading and writing files opened with O_DIRECT. It applies this new API in the virFileDiskCopy code currently used for iohelper, and reworks the saveimage code and on-disk lengths to be O_DIRECT friendly. This series is also available at: https://gitlab.com/hw-claudio/libvirt.git "directio" Gitlab successful pipeline is at: https://gitlab.com/hw-claudio/libvirt/-/pipelines/546635704 Thank you for your feedback, Claudio Claudio Fontana (5): virfile: introduce virFileDirect APIs virfile: use virFileDirect API in runIOCopy qemu: saveimage: rework image read/write to be O_DIRECT friendly qemu: saveimage: assume future formats will also support compression virfile: virFileDiskCopy: prepare for O_DIRECT files without wrapper src/libvirt_private.syms | 8 + src/qemu/qemu_saveimage.c | 269 ++++++++++++++++++++------------ src/qemu/qemu_saveimage.h | 20 ++- src/util/virfile.c | 316 +++++++++++++++++++++++++++++++++----- src/util/virfile.h | 11 ++ 5 files changed, 476 insertions(+), 148 deletions(-) -- 2.26.2

1 5

[libvirt PATCH 00/11] syntax-check: Minimize http_sites
by Andrea Bolognani 24 May '22

24 May '22

Reduce the number of exceptions we keep around by various means. Andrea Bolognani (11): syntax-check: Drop unused http_sites docs: apps: Drop Tivoli Provisioning Manager docs: apps: Drop Cracow Cloud One docs: apps: Drop Snooze util: Drop references to netlink.pdf docs: Use more generic URL for netcat docs: Update URL for libxml2 docs: Update URL for MinGW docs: Update various URLs docs: Use HTTPS where possible src: Use archive.org for dead URLs build-aux/syntax-check.mk | 18 +----------------- ci/README.rst | 6 +++--- docs/apps.rst | 22 +++------------------- docs/drvhyperv.rst | 2 +- docs/drvlxc.rst | 2 +- docs/remote.rst | 2 +- docs/uri.rst | 2 +- docs/windows.rst | 4 ++-- src/conf/nwfilter_conf.c | 4 ++-- src/conf/schemas/basictypes.rng | 2 +- src/util/virnetdevmacvlan.c | 5 +---- src/util/virnetlink.c | 4 +--- tests/openvzutilstest.conf | 2 +- 13 files changed, 19 insertions(+), 56 deletions(-) -- 2.35.3

2 12

[PATCH v2 0/2] ppc64: POWER10 support
by Daniel Henrique Barboza 24 May '22

24 May '22

Changes in v2: - dropped former patch 01 since qemu ppc64 caps are up to date for 7.0.0 - v1 link: https://listman.redhat.com/archives/libvir-list/2022-May/230686.html Daniel Henrique Barboza (2): cpu_map: add POWER10 cpu model cpu_ppc64: add support for host-model on POWER10 src/cpu/cpu_ppc64.c | 8 ++--- src/cpu_map/index.xml | 1 + src/cpu_map/meson.build | 1 + src/cpu_map/ppc64_POWER10.xml | 6 ++++ tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 4 +-- .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 4 +-- .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 4 +-- .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 4 +-- .../pseries-cpu-compat-power10.args | 32 +++++++++++++++++++ .../pseries-cpu-compat-power10.err | 1 + .../pseries-cpu-compat-power10.xml | 21 ++++++++++++ tests/qemuxml2argvtest.c | 11 +++++++ tests/testutilshostcpus.h | 11 +++++++ tests/testutilsqemu.c | 4 ++- tests/testutilsqemu.h | 1 + 19 files changed, 104 insertions(+), 13 deletions(-) create mode 100644 src/cpu_map/ppc64_POWER10.xml create mode 100644 tests/qemuxml2argvdata/pseries-cpu-compat-power10.args create mode 100644 tests/qemuxml2argvdata/pseries-cpu-compat-power10.err create mode 100644 tests/qemuxml2argvdata/pseries-cpu-compat-power10.xml -- 2.32.0

2 9

[libvirt PATCH 00/13] syntax-check: Cleanups and improvements
by Andrea Bolognani 24 May '22

24 May '22

$ meson test --suite blurb Andrea Bolognani (13): syntax-check: Drop sc_bindtextdomain check syntax-check: Remove sc_gettext_init exception syntax-check: Remove sc_copyright_usage exception syntax-check: Improve sc_prohibit_config_h_in_headers check syntax-check: Use VC_LIST_EXCEPT in sc_prohibit_backup_files syntax-check: Simplify VC_LIST_ALWAYS_EXCLUDE_REGEX syntax-check: Drop unused machinery syntax-check: Drop ME variable syntax-check: Detect awk the same as all other programs syntax-check: Reorganize file syntax-check: Add all target syntax-check: Drop sc_ prefix when adding checks to meson syntax-check: Enforce sc_prohibit_backslash_alignment everywhere build-aux/Makefile.in | 1 + build-aux/meson.build | 7 +- build-aux/syntax-check.mk | 773 ++++++++++++++++++-------------------- ci/Makefile | 2 +- 4 files changed, 365 insertions(+), 418 deletions(-) -- 2.35.3

2 14

[PATCH] qemu_hotplug: Deny changing @rss and @rss_hash_report attributes of virtio vNICs
by Michal Privoznik 24 May '22

24 May '22

We have virDomainUpdateDeviceFlags() API that allows changing of some attributes of a device whilst domain is still running (e.g. setting different QoS, link state change on vNICs). But only very limited set of attributes can be changed and we have to check whether user isn't trying to sneak in a change that's not allowed. Well, in case of a virtio vNIC we forgot to check for @rss and @rss_hash_report attributes of <driver/>. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2082540 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_hotplug.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 24df66cc9f..f795568299 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3662,7 +3662,9 @@ qemuDomainChangeNet(virQEMUDriver *driver, olddev->driver.virtio.guest.tso4 != newdev->driver.virtio.guest.tso4 || olddev->driver.virtio.guest.tso6 != newdev->driver.virtio.guest.tso6 || olddev->driver.virtio.guest.ecn != newdev->driver.virtio.guest.ecn || - olddev->driver.virtio.guest.ufo != newdev->driver.virtio.guest.ufo)) { + olddev->driver.virtio.guest.ufo != newdev->driver.virtio.guest.ufo || + olddev->driver.virtio.rss != newdev->driver.virtio.rss || + olddev->driver.virtio.rss_hash_report != newdev->driver.virtio.rss_hash_report)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify virtio network device driver attributes")); goto cleanup; -- 2.35.1

3 2

[PATCH] nodedev: prevent internal error on dev_busid parse
by Boris Fiuczynski 24 May '22

24 May '22

As "none" is a legal value represented in the sysfs attribute dev_busid this patch prevents libvirt from incorrectly reporting an internal error. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> Suggested-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/node_device/node_device_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 656130e98a..44ec22cf75 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1140,7 +1140,7 @@ udevProcessCSS(struct udev_device *device, /* process optional channel devices information */ udevGetStringSysfsAttr(device, "dev_busid", &dev_busid); - if (dev_busid != NULL) + if (dev_busid != NULL && STRNEQ(dev_busid, "none")) def->caps->data.ccw_dev.channel_dev_addr = virCCWDeviceAddressFromString(dev_busid); if (virNodeDeviceGetCSSDynamicCaps(def->sysfs_path, &def->caps->data.ccw_dev) < 0) -- 2.36.1

2 1

[PATCH] qemuxml2xmltests.c: convert pseries tests to DO_TEST_CAPS_ARCH_LATEST
by Daniel Henrique Barboza 23 May '22

23 May '22

qemuxml2xmltests that have "pseries" in the name now use the DO_TEST_CAPS_LATEST_ARCH() macro. Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- ...ies.xml => panic-pseries.ppc64-latest.xml} | 5 +- .../pseries-console-native.ppc64-latest.xml | 1 + .../pseries-console-native.xml | 1 - ...> pseries-console-virtio.ppc64-latest.xml} | 3 + ...series-cpu-compat-power9.ppc64-latest.xml} | 2 +- ...ml => pseries-cpu-compat.ppc64-latest.xml} | 2 +- ...xml => pseries-cpu-exact.ppc64-latest.xml} | 2 +- ....xml => pseries-features.ppc64-latest.xml} | 3 + ...ml => pseries-hostdevs-1.ppc64-latest.xml} | 3 + ...ml => pseries-hostdevs-2.ppc64-latest.xml} | 3 + ...ml => pseries-hostdevs-3.ppc64-latest.xml} | 3 + ... => pseries-many-buses-1.ppc64-latest.xml} | 3 + ... => pseries-many-buses-2.ppc64-latest.xml} | 3 + ... => pseries-many-devices.ppc64-latest.xml} | 3 + ...ram.xml => pseries-nvram.ppc64-latest.xml} | 5 +- ...=> pseries-panic-missing.ppc64-latest.xml} | 5 +- ...pseries-panic-no-address.ppc64-latest.xml} | 5 +- ...ries-phb-default-missing.ppc64-latest.xml} | 11 +- ...=> pseries-phb-numa-node.ppc64-latest.xml} | 3 +- ...ml => pseries-phb-simple.ppc64-latest.xml} | 11 +- ...ies-serial+console-native.ppc64-latest.xml | 1 + .../pseries-serial+console-native.xml | 1 - .../pseries-serial-compat.ppc64-latest.xml | 1 + .../pseries-serial-compat.xml | 1 - ...=> pseries-serial-native.ppc64-latest.xml} | 3 + ...ml => pseries-serial-pci.ppc64-latest.xml} | 3 + ...ml => pseries-serial-usb.ppc64-latest.xml} | 3 + tests/qemuxml2xmltest.c | 107 +++++------------- 28 files changed, 99 insertions(+), 98 deletions(-) rename tests/qemuxml2xmloutdata/{panic-pseries.xml => panic-pseries.ppc64-latest.xml} (88%) create mode 120000 tests/qemuxml2xmloutdata/pseries-console-native.ppc64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/pseries-console-native.xml rename tests/qemuxml2xmloutdata/{pseries-console-virtio.xml => pseries-console-virtio.ppc64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{pseries-cpu-compat-power9.xml => pseries-cpu-compat-power9.ppc64-latest.xml} (95%) rename tests/qemuxml2xmloutdata/{pseries-cpu-compat.xml => pseries-cpu-compat.ppc64-latest.xml} (95%) rename tests/qemuxml2xmloutdata/{pseries-cpu-exact.xml => pseries-cpu-exact.ppc64-latest.xml} (95%) rename tests/qemuxml2xmloutdata/{pseries-features.xml => pseries-features.ppc64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{pseries-hostdevs-1.xml => pseries-hostdevs-1.ppc64-latest.xml} (95%) rename tests/qemuxml2xmloutdata/{pseries-hostdevs-2.xml => pseries-hostdevs-2.ppc64-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{pseries-hostdevs-3.xml => pseries-hostdevs-3.ppc64-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{pseries-many-buses-1.xml => pseries-many-buses-1.ppc64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{pseries-many-buses-2.xml => pseries-many-buses-2.ppc64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{pseries-many-devices.xml => pseries-many-devices.ppc64-latest.xml} (98%) rename tests/qemuxml2xmloutdata/{pseries-nvram.xml => pseries-nvram.ppc64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{pseries-panic-missing.xml => pseries-panic-missing.ppc64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{pseries-panic-no-address.xml => pseries-panic-no-address.ppc64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{pseries-phb-simple.xml => pseries-phb-default-missing.ppc64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{pseries-phb-numa-node.xml => pseries-phb-numa-node.ppc64-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{pseries-phb-default-missing.xml => pseries-phb-simple.ppc64-latest.xml} (91%) create mode 120000 tests/qemuxml2xmloutdata/pseries-serial+console-native.ppc64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/pseries-serial+console-native.xml create mode 120000 tests/qemuxml2xmloutdata/pseries-serial-compat.ppc64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/pseries-serial-compat.xml rename tests/qemuxml2xmloutdata/{pseries-serial-native.xml => pseries-serial-native.ppc64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{pseries-serial-pci.xml => pseries-serial-pci.ppc64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{pseries-serial-usb.xml => pseries-serial-usb.ppc64-latest.xml} (91%) diff --git a/tests/qemuxml2xmloutdata/panic-pseries.xml b/tests/qemuxml2xmloutdata/panic-pseries.ppc64-latest.xml similarity index 88% rename from tests/qemuxml2xmloutdata/panic-pseries.xml rename to tests/qemuxml2xmloutdata/panic-pseries.ppc64-latest.xml index cebb977d5a..f22634994c 100644 --- a/tests/qemuxml2xmloutdata/panic-pseries.xml +++ b/tests/qemuxml2xmloutdata/panic-pseries.ppc64-latest.xml @@ -8,13 +8,16 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-ppc64</emulator> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='pci-ohci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> </controller> <controller type='pci' index='0' model='pci-root'> diff --git a/tests/qemuxml2xmloutdata/pseries-console-native.ppc64-latest.xml b/tests/qemuxml2xmloutdata/pseries-console-native.ppc64-latest.xml new file mode 120000 index 0000000000..78d6d489ee --- /dev/null +++ b/tests/qemuxml2xmloutdata/pseries-console-native.ppc64-latest.xml @@ -0,0 +1 @@ +pseries-serial-native.ppc64-latest.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/pseries-console-native.xml b/tests/qemuxml2xmloutdata/pseries-console-native.xml deleted file mode 120000 index 0d45a892c8..0000000000 --- a/tests/qemuxml2xmloutdata/pseries-console-native.xml +++ /dev/null @@ -1 +0,0 @@ -pseries-serial-native.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/pseries-console-virtio.xml b/tests/qemuxml2xmloutdata/pseries-console-virtio.ppc64-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/pseries-console-virtio.xml rename to tests/qemuxml2xmloutdata/pseries-console-virtio.ppc64-latest.xml index 0a44ea36bc..02e3d0136e 100644 --- a/tests/qemuxml2xmloutdata/pseries-console-virtio.xml +++ b/tests/qemuxml2xmloutdata/pseries-console-virtio.ppc64-latest.xml @@ -8,6 +8,9 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.xml b/tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.ppc64-latest.xml similarity index 95% rename from tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.xml rename to tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.ppc64-latest.xml index 93d692be0c..20843f8989 100644 --- a/tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.xml +++ b/tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.ppc64-latest.xml @@ -17,7 +17,7 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-ppc64</emulator> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='pci-ohci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> </controller> <controller type='pci' index='0' model='pci-root'> diff --git a/tests/qemuxml2xmloutdata/pseries-cpu-compat.xml b/tests/qemuxml2xmloutdata/pseries-cpu-compat.ppc64-latest.xml similarity index 95% rename from tests/qemuxml2xmloutdata/pseries-cpu-compat.xml rename to tests/qemuxml2xmloutdata/pseries-cpu-compat.ppc64-latest.xml index 4b880df610..066708990c 100644 --- a/tests/qemuxml2xmloutdata/pseries-cpu-compat.xml +++ b/tests/qemuxml2xmloutdata/pseries-cpu-compat.ppc64-latest.xml @@ -17,7 +17,7 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-ppc64</emulator> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='pci-ohci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> </controller> <controller type='pci' index='0' model='pci-root'> diff --git a/tests/qemuxml2xmloutdata/pseries-cpu-exact.xml b/tests/qemuxml2xmloutdata/pseries-cpu-exact.ppc64-latest.xml similarity index 95% rename from tests/qemuxml2xmloutdata/pseries-cpu-exact.xml rename to tests/qemuxml2xmloutdata/pseries-cpu-exact.ppc64-latest.xml index a8e88d012f..307d434051 100644 --- a/tests/qemuxml2xmloutdata/pseries-cpu-exact.xml +++ b/tests/qemuxml2xmloutdata/pseries-cpu-exact.ppc64-latest.xml @@ -18,7 +18,7 @@ <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-ppc64</emulator> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='pci-ohci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> </controller> <controller type='pci' index='0' model='pci-root'> diff --git a/tests/qemuxml2xmloutdata/pseries-features.xml b/tests/qemuxml2xmloutdata/pseries-features.ppc64-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/pseries-features.xml rename to tests/qemuxml2xmloutdata/pseries-features.ppc64-latest.xml index 94a8f6a66f..c211da4fb7 100644 --- a/tests/qemuxml2xmloutdata/pseries-features.xml +++ b/tests/qemuxml2xmloutdata/pseries-features.ppc64-latest.xml @@ -19,6 +19,9 @@ <sbbc value='broken'/> <ibs value='fixed-ccd'/> </features> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/pseries-hostdevs-1.xml b/tests/qemuxml2xmloutdata/pseries-hostdevs-1.ppc64-latest.xml similarity index 95% rename from tests/qemuxml2xmloutdata/pseries-hostdevs-1.xml rename to tests/qemuxml2xmloutdata/pseries-hostdevs-1.ppc64-latest.xml index cff29a97c2..db369a1fc7 100644 --- a/tests/qemuxml2xmloutdata/pseries-hostdevs-1.xml +++ b/tests/qemuxml2xmloutdata/pseries-hostdevs-1.ppc64-latest.xml @@ -8,6 +8,9 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/pseries-hostdevs-2.xml b/tests/qemuxml2xmloutdata/pseries-hostdevs-2.ppc64-latest.xml similarity index 94% rename from tests/qemuxml2xmloutdata/pseries-hostdevs-2.xml rename to tests/qemuxml2xmloutdata/pseries-hostdevs-2.ppc64-latest.xml index 598513d784..09b657698d 100644 --- a/tests/qemuxml2xmloutdata/pseries-hostdevs-2.xml +++ b/tests/qemuxml2xmloutdata/pseries-hostdevs-2.ppc64-latest.xml @@ -8,6 +8,9 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/pseries-hostdevs-3.xml b/tests/qemuxml2xmloutdata/pseries-hostdevs-3.ppc64-latest.xml similarity index 94% rename from tests/qemuxml2xmloutdata/pseries-hostdevs-3.xml rename to tests/qemuxml2xmloutdata/pseries-hostdevs-3.ppc64-latest.xml index a1f00ddc7f..58ffb09c3b 100644 --- a/tests/qemuxml2xmloutdata/pseries-hostdevs-3.xml +++ b/tests/qemuxml2xmloutdata/pseries-hostdevs-3.ppc64-latest.xml @@ -8,6 +8,9 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/pseries-many-buses-1.xml b/tests/qemuxml2xmloutdata/pseries-many-buses-1.ppc64-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/pseries-many-buses-1.xml rename to tests/qemuxml2xmloutdata/pseries-many-buses-1.ppc64-latest.xml index 45521c907a..dbc5d0a94c 100644 --- a/tests/qemuxml2xmloutdata/pseries-many-buses-1.xml +++ b/tests/qemuxml2xmloutdata/pseries-many-buses-1.ppc64-latest.xml @@ -8,6 +8,9 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/pseries-many-buses-2.xml b/tests/qemuxml2xmloutdata/pseries-many-buses-2.ppc64-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/pseries-many-buses-2.xml rename to tests/qemuxml2xmloutdata/pseries-many-buses-2.ppc64-latest.xml index 0b1f670b3f..f9c5a78edd 100644 --- a/tests/qemuxml2xmloutdata/pseries-many-buses-2.xml +++ b/tests/qemuxml2xmloutdata/pseries-many-buses-2.ppc64-latest.xml @@ -8,6 +8,9 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/pseries-many-devices.xml b/tests/qemuxml2xmloutdata/pseries-many-devices.ppc64-latest.xml similarity index 98% rename from tests/qemuxml2xmloutdata/pseries-many-devices.xml rename to tests/qemuxml2xmloutdata/pseries-many-devices.ppc64-latest.xml index 3c23523c60..5abf023b48 100644 --- a/tests/qemuxml2xmloutdata/pseries-many-devices.xml +++ b/tests/qemuxml2xmloutdata/pseries-many-devices.ppc64-latest.xml @@ -8,6 +8,9 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/pseries-nvram.xml b/tests/qemuxml2xmloutdata/pseries-nvram.ppc64-latest.xml similarity index 85% rename from tests/qemuxml2xmloutdata/pseries-nvram.xml rename to tests/qemuxml2xmloutdata/pseries-nvram.ppc64-latest.xml index 278222ddea..c7a36df4e2 100644 --- a/tests/qemuxml2xmloutdata/pseries-nvram.xml +++ b/tests/qemuxml2xmloutdata/pseries-nvram.ppc64-latest.xml @@ -8,13 +8,16 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-ppc64</emulator> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='pci-ohci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> </controller> <controller type='pci' index='0' model='pci-root'> diff --git a/tests/qemuxml2xmloutdata/pseries-panic-missing.xml b/tests/qemuxml2xmloutdata/pseries-panic-missing.ppc64-latest.xml similarity index 88% rename from tests/qemuxml2xmloutdata/pseries-panic-missing.xml rename to tests/qemuxml2xmloutdata/pseries-panic-missing.ppc64-latest.xml index cebb977d5a..f22634994c 100644 --- a/tests/qemuxml2xmloutdata/pseries-panic-missing.xml +++ b/tests/qemuxml2xmloutdata/pseries-panic-missing.ppc64-latest.xml @@ -8,13 +8,16 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-ppc64</emulator> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='pci-ohci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> </controller> <controller type='pci' index='0' model='pci-root'> diff --git a/tests/qemuxml2xmloutdata/pseries-panic-no-address.xml b/tests/qemuxml2xmloutdata/pseries-panic-no-address.ppc64-latest.xml similarity index 88% rename from tests/qemuxml2xmloutdata/pseries-panic-no-address.xml rename to tests/qemuxml2xmloutdata/pseries-panic-no-address.ppc64-latest.xml index cebb977d5a..f22634994c 100644 --- a/tests/qemuxml2xmloutdata/pseries-panic-no-address.xml +++ b/tests/qemuxml2xmloutdata/pseries-panic-no-address.ppc64-latest.xml @@ -8,13 +8,16 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-ppc64</emulator> - <controller type='usb' index='0'> + <controller type='usb' index='0' model='pci-ohci'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> </controller> <controller type='pci' index='0' model='pci-root'> diff --git a/tests/qemuxml2xmloutdata/pseries-phb-simple.xml b/tests/qemuxml2xmloutdata/pseries-phb-default-missing.ppc64-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/pseries-phb-simple.xml rename to tests/qemuxml2xmloutdata/pseries-phb-default-missing.ppc64-latest.xml index 9fa36ca3df..db513febad 100644 --- a/tests/qemuxml2xmloutdata/pseries-phb-simple.xml +++ b/tests/qemuxml2xmloutdata/pseries-phb-default-missing.ppc64-latest.xml @@ -8,16 +8,15 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-ppc64</emulator> - <controller type='pci' index='0' model='pci-root'> - <model name='spapr-pci-host-bridge'/> - <target index='0'/> - </controller> <controller type='pci' index='1' model='pci-root'> <model name='spapr-pci-host-bridge'/> <target index='1'/> @@ -27,6 +26,10 @@ <target index='2'/> </controller> <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pci-root'> + <model name='spapr-pci-host-bridge'/> + <target index='0'/> + </controller> <audio id='1' type='none'/> <memballoon model='none'/> <panic model='pseries'/> diff --git a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml similarity index 94% rename from tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml rename to tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml index 56d8ee9f86..59015846fb 100644 --- a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml +++ b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml @@ -12,7 +12,8 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='hd'/> </os> - <cpu> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> <topology sockets='2' dies='1' cores='1' threads='4'/> <numa> <cell id='0' cpus='0-3' memory='1048576' unit='KiB'/> diff --git a/tests/qemuxml2xmloutdata/pseries-phb-default-missing.xml b/tests/qemuxml2xmloutdata/pseries-phb-simple.ppc64-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/pseries-phb-default-missing.xml rename to tests/qemuxml2xmloutdata/pseries-phb-simple.ppc64-latest.xml index 9966c89167..80231e3dd7 100644 --- a/tests/qemuxml2xmloutdata/pseries-phb-default-missing.xml +++ b/tests/qemuxml2xmloutdata/pseries-phb-simple.ppc64-latest.xml @@ -8,12 +8,19 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-ppc64</emulator> + <controller type='pci' index='0' model='pci-root'> + <model name='spapr-pci-host-bridge'/> + <target index='0'/> + </controller> <controller type='pci' index='1' model='pci-root'> <model name='spapr-pci-host-bridge'/> <target index='1'/> @@ -23,10 +30,6 @@ <target index='2'/> </controller> <controller type='usb' index='0' model='none'/> - <controller type='pci' index='0' model='pci-root'> - <model name='spapr-pci-host-bridge'/> - <target index='0'/> - </controller> <audio id='1' type='none'/> <memballoon model='none'/> <panic model='pseries'/> diff --git a/tests/qemuxml2xmloutdata/pseries-serial+console-native.ppc64-latest.xml b/tests/qemuxml2xmloutdata/pseries-serial+console-native.ppc64-latest.xml new file mode 120000 index 0000000000..78d6d489ee --- /dev/null +++ b/tests/qemuxml2xmloutdata/pseries-serial+console-native.ppc64-latest.xml @@ -0,0 +1 @@ +pseries-serial-native.ppc64-latest.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/pseries-serial+console-native.xml b/tests/qemuxml2xmloutdata/pseries-serial+console-native.xml deleted file mode 120000 index 0d45a892c8..0000000000 --- a/tests/qemuxml2xmloutdata/pseries-serial+console-native.xml +++ /dev/null @@ -1 +0,0 @@ -pseries-serial-native.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/pseries-serial-compat.ppc64-latest.xml b/tests/qemuxml2xmloutdata/pseries-serial-compat.ppc64-latest.xml new file mode 120000 index 0000000000..78d6d489ee --- /dev/null +++ b/tests/qemuxml2xmloutdata/pseries-serial-compat.ppc64-latest.xml @@ -0,0 +1 @@ +pseries-serial-native.ppc64-latest.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/pseries-serial-compat.xml b/tests/qemuxml2xmloutdata/pseries-serial-compat.xml deleted file mode 120000 index 0d45a892c8..0000000000 --- a/tests/qemuxml2xmloutdata/pseries-serial-compat.xml +++ /dev/null @@ -1 +0,0 @@ -pseries-serial-native.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/pseries-serial-native.xml b/tests/qemuxml2xmloutdata/pseries-serial-native.ppc64-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/pseries-serial-native.xml rename to tests/qemuxml2xmloutdata/pseries-serial-native.ppc64-latest.xml index 299ae61081..ebe7b5738b 100644 --- a/tests/qemuxml2xmloutdata/pseries-serial-native.xml +++ b/tests/qemuxml2xmloutdata/pseries-serial-native.ppc64-latest.xml @@ -8,6 +8,9 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/pseries-serial-pci.xml b/tests/qemuxml2xmloutdata/pseries-serial-pci.ppc64-latest.xml similarity index 90% rename from tests/qemuxml2xmloutdata/pseries-serial-pci.xml rename to tests/qemuxml2xmloutdata/pseries-serial-pci.ppc64-latest.xml index e7517008ca..803bc55010 100644 --- a/tests/qemuxml2xmloutdata/pseries-serial-pci.xml +++ b/tests/qemuxml2xmloutdata/pseries-serial-pci.ppc64-latest.xml @@ -8,6 +8,9 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/pseries-serial-usb.xml b/tests/qemuxml2xmloutdata/pseries-serial-usb.ppc64-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/pseries-serial-usb.xml rename to tests/qemuxml2xmloutdata/pseries-serial-usb.ppc64-latest.xml index 4d5989ef4f..3a69273d39 100644 --- a/tests/qemuxml2xmloutdata/pseries-serial-usb.xml +++ b/tests/qemuxml2xmloutdata/pseries-serial-usb.ppc64-latest.xml @@ -8,6 +8,9 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index bef8c4e010..9ac43d3294 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -691,77 +691,30 @@ mymain(void) QEMU_CAPS_OBJECT_RNG_EGD); DO_TEST_CAPS_LATEST("virtio-rng-builtin"); - DO_TEST("pseries-nvram", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_NVRAM); - DO_TEST("pseries-panic-missing", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); - DO_TEST("pseries-panic-no-address", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); - - DO_TEST("pseries-phb-simple", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); - DO_TEST("pseries-phb-default-missing", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); - DO_TEST("pseries-phb-numa-node", - QEMU_CAPS_NUMA, - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE, - QEMU_CAPS_OBJECT_MEMORY_FILE); - - DO_TEST("pseries-many-devices", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_VIRTIO_SCSI); - DO_TEST("pseries-many-buses-1", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_VIRTIO_SCSI); - DO_TEST("pseries-many-buses-2", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_VIRTIO_SCSI); - DO_TEST("pseries-hostdevs-1", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST("pseries-hostdevs-2", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST("pseries-hostdevs-3", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_VFIO_PCI); - - DO_TEST("pseries-features", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE, - QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, - QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, - QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST, - QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC, - QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC, - QEMU_CAPS_MACHINE_PSERIES_CAP_IBS); - - DO_TEST("pseries-serial-native", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY); - DO_TEST("pseries-serial+console-native", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY); - DO_TEST("pseries-serial-compat", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY); - DO_TEST("pseries-serial-pci", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_PCI_SERIAL); - DO_TEST("pseries-serial-usb", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_QEMU_XHCI, - QEMU_CAPS_DEVICE_USB_SERIAL); - DO_TEST("pseries-console-native", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY); - DO_TEST("pseries-console-virtio", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); + DO_TEST_CAPS_ARCH_LATEST("pseries-nvram", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("pseries-panic-missing", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("pseries-panic-no-address", "ppc64"); + + DO_TEST_CAPS_ARCH_LATEST("pseries-phb-simple", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("pseries-phb-default-missing", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("pseries-phb-numa-node", "ppc64"); + + DO_TEST_CAPS_ARCH_LATEST("pseries-many-devices", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("pseries-many-buses-1", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("pseries-many-buses-2", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("pseries-hostdevs-1", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("pseries-hostdevs-2", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("pseries-hostdevs-3", "ppc64"); + + DO_TEST_CAPS_ARCH_LATEST("pseries-features", "ppc64"); + + DO_TEST_CAPS_ARCH_LATEST("pseries-serial-native", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("pseries-serial+console-native", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("pseries-serial-compat", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("pseries-serial-pci", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("pseries-serial-usb", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("pseries-console-native", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("pseries-console-virtio", "ppc64"); DO_TEST_NOCAPS("mach-virt-serial-native"); DO_TEST_NOCAPS("mach-virt-serial+console-native"); @@ -1087,10 +1040,9 @@ mymain(void) QEMU_CAPS_Q35_PCI_HOLE64_SIZE); DO_TEST("panic", QEMU_CAPS_DEVICE_PANIC); - DO_TEST("panic-pseries", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); DO_TEST("panic-double", QEMU_CAPS_DEVICE_PANIC); DO_TEST("panic-no-address", QEMU_CAPS_DEVICE_PANIC); + DO_TEST_CAPS_ARCH_LATEST("panic-pseries", "ppc64"); DO_TEST_NOCAPS("disk-backing-chains"); DO_TEST_NOCAPS("disk-backing-chains-index"); @@ -1333,12 +1285,9 @@ mymain(void) QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("smartcard-controller", QEMU_CAPS_CCID_EMULATED); - DO_TEST("pseries-cpu-compat-power9", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); - DO_TEST("pseries-cpu-compat", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); - DO_TEST("pseries-cpu-exact", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); + DO_TEST_CAPS_ARCH_LATEST("pseries-cpu-compat-power9", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("pseries-cpu-compat", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("pseries-cpu-exact", "ppc64"); DO_TEST("user-aliases", QEMU_CAPS_DEVICE_CIRRUS_VGA, -- 2.32.0

2 2

[PATCH 0/3] qemuxml2argvtest: add ARG_CAPS_HOST_CPU_MODEL
by Daniel Henrique Barboza 23 May '22

23 May '22

Hi, This series attempts to fix a problem I found when converting the "pseries-cpu-compat-power9" to use DO_TEST_CAPS_ARCH_LATEST* macros. More information about the problem per se can be found in patch 02. Patch 03 is where I was able to convert the said test. Patch 01 is a trivial fix I found out when reading code. Daniel Henrique Barboza (3): qemu_capspriv.h: fix identation testutilsqemu: introduce ARG_CAPS_HOST_CPU_MODEL qemuxml2argvtest.c: use CAPS_ARCH_LATEST() with pseries-cpu-compat-power9 src/qemu/qemu_capspriv.h | 4 +- ...eries-cpu-compat-power9.ppc64-latest.args} | 12 +++--- ...series-cpu-compat-power9.ppc64-latest.err} | 0 tests/qemuxml2argvtest.c | 41 ++++++++++++------- tests/testutilsqemu.c | 4 ++ tests/testutilsqemu.h | 18 ++++---- 6 files changed, 49 insertions(+), 30 deletions(-) rename tests/qemuxml2argvdata/{pseries-cpu-compat-power9.args => pseries-cpu-compat-power9.ppc64-latest.args} (60%) rename tests/qemuxml2argvdata/{pseries-cpu-compat-power9.err => pseries-cpu-compat-power9.ppc64-latest.err} (100%) -- 2.32.0

2 7

[PATCH 00/17] nodedev: add optional device address of channel device to css device
by Boris Fiuczynski 23 May '22

23 May '22

While this series started with the intend to add the optional device address of a subchannel device to the nodedev css device the outcome now also includes a small fix in the error reporting of css cap XML parsing as well as a refactoring of generic ccw code into virccw in utils. Boris Fiuczynski (17): nodedev: fix reported error msg in css cap XML parsing util: refactor virDomainDeviceCCWAddress into virccw.h util: refactor virDomainCCWAddressAsString into virccw util: make reuse of ccw device address format constant util: refactor ccw address constants into virccw util: refactor virDomainCCWAddressIncrement into virccw util: refactor virDomainDeviceCCWAddressIsValid into virccw util: refactor virDomainDeviceCCWAddressEqual into virccw conf: adjust method name virDomainDeviceCCWAddressParseXML util: add ccw device address parsing into virccw util: add virCCWDeviceAddressFromString to virccw nodedev: refactor css format from ccw format method nodedev: refactor ccw device address parsing from XML nodedev: refactor css XML parsing from ccw XML parsing schemas: refactor out nodedev ccw address schema nodedev: add optional device address of channel device to css device nodedev: add tests for optional device address to css device po/POTFILES.in | 1 + src/conf/device_conf.c | 28 +-- src/conf/device_conf.h | 23 +-- src/conf/domain_addr.c | 28 +-- src/conf/domain_addr.h | 5 +- src/conf/domain_conf.c | 19 +- src/conf/domain_conf.h | 6 +- src/conf/node_device_conf.c | 171 +++++++++++++----- src/conf/node_device_conf.h | 2 + src/conf/schemas/nodedev.rng | 27 +-- src/libvirt_private.syms | 14 +- src/node_device/node_device_driver.c | 4 +- src/node_device/node_device_udev.c | 16 +- src/qemu/qemu_agent.c | 4 +- src/qemu/qemu_agent.h | 2 +- src/qemu/qemu_command.c | 2 +- src/util/meson.build | 1 + src/util/virccw.c | 103 +++++++++++ src/util/virccw.h | 52 ++++++ .../css_0_0_10000-invalid.xml | 10 + ...s_0_0_fffe_mdev_types_channel_dev_addr.xml | 22 +++ .../css_0_0_ffff_channel_dev_addr-invalid.xml | 15 ++ .../css_0_0_ffff_channel_dev_addr.xml | 15 ++ ...s_0_0_fffe_mdev_types_channel_dev_addr.xml | 1 + .../css_0_0_ffff_channel_dev_addr.xml | 1 + tests/nodedevxml2xmltest.c | 2 + 26 files changed, 418 insertions(+), 156 deletions(-) create mode 100644 src/util/virccw.c create mode 100644 src/util/virccw.h create mode 100644 tests/nodedevschemadata/css_0_0_10000-invalid.xml create mode 100644 tests/nodedevschemadata/css_0_0_fffe_mdev_types_channel_dev_addr.xml create mode 100644 tests/nodedevschemadata/css_0_0_ffff_channel_dev_addr-invalid.xml create mode 100644 tests/nodedevschemadata/css_0_0_ffff_channel_dev_addr.xml create mode 120000 tests/nodedevxml2xmlout/css_0_0_fffe_mdev_types_channel_dev_addr.xml create mode 120000 tests/nodedevxml2xmlout/css_0_0_ffff_channel_dev_addr.xml -- 2.33.1

2 21

[libvirt PATCH] qemu: Do not return NULL when qemuMigrationSrcBegin succeeds
by Jiri Denemark 23 May '22

23 May '22

My recent commit v8.3.0-201-gc500955e95 tried to fix a regression which would cause the function to return success even if virCloseCallbacksSet failed. But due to a strange code flow in the function introduced an opposite regression. The function would return NULL on success when called without VIR_MIGRATE_CHANGE_PROTECTION flag. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 38596fa4de..6cc68a567a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2534,23 +2534,23 @@ qemuMigrationSrcBegin(virConnectPtr conn, if (virCloseCallbacksSet(driver->closeCallbacks, vm, conn, qemuMigrationSrcCleanup) < 0) goto endjob; - qemuMigrationJobContinue(vm); - } else { - goto endjob; } ret = g_steal_pointer(&xml); + endjob: + if (flags & VIR_MIGRATE_CHANGE_PROTECTION) { + if (ret) + qemuMigrationJobContinue(vm); + else + qemuMigrationJobFinish(vm); + } else { + qemuDomainObjEndJob(vm); + } + cleanup: virDomainObjEndAPI(&vm); return ret; - - endjob: - if (flags & VIR_MIGRATE_CHANGE_PROTECTION) - qemuMigrationJobFinish(vm); - else - qemuDomainObjEndJob(vm); - goto cleanup; } -- 2.35.1

2 1

[PATCH 0/2] Fix missing 'manual' mode for default snapshot disk definition and clean up docs
by Peter Krempa 23 May '22

23 May '22

Peter Krempa (2): docs: domain: Remove extraneous quotes schemas: Allow 'manual' snapshot mode in domain definition docs/formatdomain.rst | 20 ++++++++++---------- src/conf/schemas/domaincommon.rng | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) -- 2.35.3

2 3

[libvirt PATCH v2 0/7] po: Various fixes and cleanups
by Andrea Bolognani 23 May '22

23 May '22

Changes from [v1] * instead of checking that the potfile doesn't contain unwanted comments at syntax-check time, prevent them from being added by passing all xgettext options explicitly ourselves. [v1] https://listman.redhat.com/archives/libvir-list/2022-May/231526.html Andrea Bolognani (7): po: Drop unwanted comments from potfile po: Stop using 'glib' preset for i18n.gettext() po: Drop prefixes from POTFILES.in po: Don't generate POTFILES syntax-check: Don't exclude src/false.c from sc_po_check po: Sort LINGUAS syntax-check: Introduce sc_linguas_sorting build-aux/syntax-check.mk | 21 ++- po/LINGUAS | 8 +- po/POTFILES | 384 ++++++++++++++++++++++++++++++++++++++ po/POTFILES.in | 384 -------------------------------------- po/libvirt.pot | 216 --------------------- po/meson.build | 17 +- 6 files changed, 406 insertions(+), 624 deletions(-) create mode 100644 po/POTFILES delete mode 100644 po/POTFILES.in -- 2.35.3

2 8

[PATCH v2] remote_daemon: Don't run virStateCleanup() if virStateReload() is still running
by Michal Privoznik 23 May '22

23 May '22

When a SIGHUP is received a thread is spawned that runs virStateReload(). However, if SIGINT is received while the former thread is still running then we may get into problematic situation: the cleanup code in main() sees drivers initialized and thus calls virStateCleanup(). So now we have two threads, one running virStateReload() the other virStateCleanup(). In this situation it's very likely that a race condition occurs and either of threads causes SIGSEGV. To fix this, unmark drivers as initialized in the virStateReload() thread for the time the function runs. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2075837 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- v2 of: https://listman.redhat.com/archives/libvir-list/2022-April/230415.html diff to v1: - reworked how int is set (instead of inc/dec I'm using set(0)/set(1)) so that reload can be attempted again and again if previous attempt failed. src/remote/remote_daemon.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 26469e0d9f..b8ecc51758 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -77,7 +77,7 @@ virNetSASLContext *saslCtxt = NULL; virNetServerProgram *remoteProgram = NULL; virNetServerProgram *qemuProgram = NULL; -volatile bool driversInitialized = false; +volatile gint driversInitialized = 0; static void daemonErrorHandler(void *opaque G_GNUC_UNUSED, virErrorPtr err G_GNUC_UNUSED) @@ -453,8 +453,13 @@ static void daemonReloadHandlerThread(void *opaque G_GNUC_UNUSED) VIR_INFO("Reloading configuration on SIGHUP"); virHookCall(VIR_HOOK_DRIVER_DAEMON, "-", VIR_HOOK_DAEMON_OP_RELOAD, SIGHUP, "SIGHUP", NULL, NULL); - if (virStateReload() < 0) + + if (virStateReload() < 0) { VIR_WARN("Error while reloading drivers"); + } + + /* Drivers are initialized again. */ + g_atomic_int_set(&driversInitialized, 1); } static void daemonReloadHandler(virNetDaemon *dmn G_GNUC_UNUSED, @@ -463,7 +468,7 @@ static void daemonReloadHandler(virNetDaemon *dmn G_GNUC_UNUSED, { virThread thr; - if (!driversInitialized) { + if (!g_atomic_int_compare_and_exchange(&driversInitialized, 1, 0)) { VIR_WARN("Drivers are not initialized, reload ignored"); return; } @@ -474,6 +479,10 @@ static void daemonReloadHandler(virNetDaemon *dmn G_GNUC_UNUSED, * Not much we can do on error here except log it. */ VIR_ERROR(_("Failed to create thread to handle daemon restart")); + + /* Drivers were initialized at the beginning, otherwise we wouldn't + * even get here. */ + g_atomic_int_set(&driversInitialized, 1); } } @@ -607,7 +616,7 @@ static void daemonRunStateInit(void *opaque) goto cleanup; } - driversInitialized = true; + g_atomic_int_set(&driversInitialized, 1); virNetDaemonSetShutdownCallbacks(dmn, virStateShutdownPrepare, @@ -1212,10 +1221,9 @@ int main(int argc, char **argv) { cleanup: virNetlinkEventServiceStopAll(); - if (driversInitialized) { + if (g_atomic_int_compare_and_exchange(&driversInitialized, 1, 0)) { /* NB: Possible issue with timing window between driversInitialized * setting if virNetlinkEventServerStart fails */ - driversInitialized = false; virStateCleanup(); } -- 2.35.1

2 1

[libvirt PATCH] qemu: Fix error propagation in qemuMigrationBegin
by Jiri Denemark 23 May '22

23 May '22

Commit v8.3.0-152-g49ef0f95c6 removed explicit VIR_FREE from qemuMigrationBegin, effectively reverting v1.2.14-57-g77ddd0bba2 The xml variable was used to hold the return value and thus had to be unset when an error happened after xml was already non-NULL. Such code may be quite confusing though and we usually avoid it by not storing anything to a return variable until everything succeeded. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 438f2bc999..38596fa4de 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2487,6 +2487,7 @@ qemuMigrationSrcBegin(virConnectPtr conn, virQEMUDriver *driver = conn->privateData; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); g_autofree char *xml = NULL; + char *ret = NULL; virDomainAsyncJob asyncJob; if (cfg->migrateTLSForce && @@ -2538,9 +2539,11 @@ qemuMigrationSrcBegin(virConnectPtr conn, goto endjob; } + ret = g_steal_pointer(&xml); + cleanup: virDomainObjEndAPI(&vm); - return g_steal_pointer(&xml); + return ret; endjob: if (flags & VIR_MIGRATE_CHANGE_PROTECTION) -- 2.35.1

2 1

[libvirt PATCH] apparmor: Enable locking AAVMF firmware
by Andrea Bolognani 23 May '22

23 May '22

We already allow this for OVMF. Closes: https://gitlab.com/libvirt/libvirt/-/issues/312 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/security/apparmor/libvirt-qemu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu index c29168da27..02ee273e7e 100644 --- a/src/security/apparmor/libvirt-qemu +++ b/src/security/apparmor/libvirt-qemu @@ -78,7 +78,7 @@ /var/lib/dbus/machine-id r, # access to firmware's etc - /usr/share/AAVMF/** r, + /usr/share/AAVMF/** rk, /usr/share/bochs/** r, /usr/share/edk2-ovmf/** rk, /usr/share/kvm/** r, -- 2.35.3

2 1

[PATCH] Allow VM to read sysfs PCI config, revision files
by Max Goodhart 20 May '22

20 May '22

From: Max Goodhart <gitlab(a)chromakode.com> This fixes a blank screen when viewing a VM with virtio graphics and gl-accelerated Spice display on Ubuntu 22.04 / libvirt 8.0.0 / qemu 6.2. Without these AppArmor permissions, the libvirt error log contains repetitions of: qemu_spice_gl_scanout_texture: failed to get fd for texture This appears to be similar to this GNOME Boxes issue: https://gitlab.gnome.org/GNOME/gnome-boxes/-/issues/586 Signed-off-by: Max Goodhart <c(a)chromakode.com> --- src/security/virt-aa-helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 1f1cce8b3d..b314d2a059 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1316,7 +1316,7 @@ get_files(vahControl * ctl) virBufferAddLit(&buf, " \"/dev/nvidiactl\" rw,\n"); virBufferAddLit(&buf, " # Probe DRI device attributes\n"); virBufferAddLit(&buf, " \"/dev/dri/\" r,\n"); - virBufferAddLit(&buf, " \"/sys/devices/**/{uevent,vendor,device,subsystem_vendor,subsystem_device}\" r,\n"); + virBufferAddLit(&buf, " \"/sys/devices/**/{uevent,vendor,device,subsystem_vendor,subsystem_device,config,revision}\" r,\n"); virBufferAddLit(&buf, " # dri libs will trigger that, but t is not requited and DAC would deny it anyway\n"); virBufferAddLit(&buf, " deny \"/var/lib/libvirt/.cache/\" w,\n"); } -- 2.34.1

3 5

[libvirt PATCH 00/80] Add support for post-copy recovery
by Jiri Denemark 19 May '22

19 May '22

This series implements a new VIR_MIGRATE_POSTCOPY_RESUME flag (virsh migrate --resume) for recovering from a failed post-copy migration. You can also fetch the series from my gitlab fork: git fetch https://gitlab.com/jirkade/libvirt.git post-copy-recovery Jiri Denemark (80): qemu: Add debug messages to job recovery code qemumonitorjsontest: Test more migration capabilities qemu: Return state from qemuMonitorGetMigrationCapabilities qemu: Enable migration events only when disabled Introduce VIR_DOMAIN_RUNNING_POSTCOPY_FAILED qemu: Keep domain running on dst on failed post-copy migration qemu: Explicitly emit events on post-copy failure qemu: Make qemuDomainCleanupAdd return void conf: Introduce virDomainObjIsFailedPostcopy helper conf: Introduce virDomainObjIsPostcopy helper qemu: Introduce qemuProcessCleanupMigrationJob qemu: Rename qemuDomainObjRestoreJob as qemuDomainObjPreserveJob qemu: Add qemuDomainObjRestoreAsyncJob qemu: Keep migration job active after failed post-copy qemu: Abort failed post-copy when we haven't called Finish yet qemu: Restore failed migration job on reconnect qemu: Restore async job start timestamp on reconnect qemu: Drop forward declarations in migration code qemu: Don't wait for migration job when migration is running qemu: Use switch in qemuDomainGetJobInfoMigrationStats qemu: Fetch paused migration stats qemu: Handle 'postcopy-paused' migration state qemu: Add support for postcopy-recover QEMU migration state qemu: Create domain object at the end of qemuMigrationDstFinish qemu: Move success-only code out of endjob in qemuMigrationDstFinish qemu: Separate success and failure path in qemuMigrationDstFinish qemu: Rename "endjob" label in qemuMigrationDstFinish qemu: Generate migration cookie in Finish phase earlier qemu: Make final part of migration Finish phase reusable qemu: Drop obsolete comment in qemuMigrationDstFinish qemu: Preserve error in qemuMigrationDstFinish qemu: Introduce qemuMigrationDstFinishFresh qemu: Introduce qemuMigrationDstFinishOffline qemu: Separate cookie parsing for qemuMigrationDstFinishOffline qemu: Introduce qemuMigrationDstFinishActive qemu: Handle migration job in qemuMigrationDstFinish qemu: Make final part of migration Confirm phase reusable qemu: Make sure migrationPort is released even in callbacks qemu: Pass qemuDomainJobObj to qemuMigrationDstComplete qemu: Finish completed unattended migration qemu: Ignore missing memory statistics in query-migrate qemu: Improve post-copy migration handling on reconnect qemu: Check flags incompatible with offline migration earlier qemu: Introduce qemuMigrationSrcBeginXML helper qemu: Add new migration phases for post-copy recovery qemu: Separate protocol checks from qemuMigrationJobSetPhase qemu: Make qemuMigrationCheckPhase failure fatal qemu: Refactor qemuDomainObjSetJobPhase qemu: Do not set job owner in qemuMigrationJobSetPhase qemu: Use QEMU_MIGRATION_PHASE_POSTCOPY_FAILED Introduce VIR_MIGRATE_POSTCOPY_RESUME flag virsh: Add --postcopy-resume option for migrate command qemu: Don't set VIR_MIGRATE_PAUSED for post-copy resume qemu: Implement VIR_MIGRATE_POSTCOPY_RESUME for Begin phase qmeu: Refactor qemuMigrationSrcPerformPhase qemu: Separate starting migration from qemuMigrationSrcRun qemu: Add support for 'resume' parameter of migrate QMP command qemu: Implement VIR_MIGRATE_POSTCOPY_RESUME for Perform phase qemu: Implement VIR_MIGRATE_POSTCOPY_RESUME for Confirm phase qemu: Introduce qemuMigrationDstPrepareFresh qemu: Refactor qemuMigrationDstPrepareFresh qemu: Simplify cleanup in qemuMigrationDstPrepareFresh qemu: Add support for migrate-recover QMP command qemu: Rename qemuMigrationSrcCleanup qemu: Refactor qemuMigrationAnyConnectionClosed qemu: Handle incoming migration in qemuMigrationAnyConnectionClosed qemu: Start a migration phase in qemuMigrationAnyConnectionClosed qemu: Implement VIR_MIGRATE_POSTCOPY_RESUME for Prepare phase qemu: Implement VIR_MIGRATE_POSTCOPY_RESUME for Finish phase qemu: Create completed jobData in qemuMigrationSrcComplete qemu: Register qemuProcessCleanupMigrationJob after Begin phase qemu: Call qemuDomainCleanupAdd from qemuMigrationJobContinue qemu: Implement VIR_MIGRATE_POSTCOPY_RESUME for peer-to-peer migration qemu: Enable support for VIR_MIGRATE_POSTCOPY_RESUME Add virDomainAbortJobFlags public API qemu: Implement virDomainAbortJobFlags Add VIR_DOMAIN_ABORT_JOB_POSTCOPY flag for virDomainAbortJobFlags qemu: Implement VIR_DOMAIN_ABORT_JOB_POSTCOPY flag virsh: Add --postcopy option for domjobabort command NEWS: Add support for post-copy recovery NEWS.rst | 5 + docs/manpages/virsh.rst | 17 +- examples/c/misc/event-test.c | 3 + include/libvirt/libvirt-domain.h | 26 + src/conf/domain_conf.c | 33 + src/conf/domain_conf.h | 8 + src/driver-hypervisor.h | 5 + src/hypervisor/domain_job.c | 1 + src/hypervisor/domain_job.h | 1 + src/libvirt-domain.c | 72 +- src/libvirt_private.syms | 2 + src/libvirt_public.syms | 1 + src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_domain.c | 9 +- src/qemu/qemu_domain.h | 5 +- src/qemu/qemu_domainjob.c | 103 +- src/qemu/qemu_domainjob.h | 16 +- src/qemu/qemu_driver.c | 83 +- src/qemu/qemu_migration.c | 2383 +++++++++++------ src/qemu/qemu_migration.h | 37 +- src/qemu/qemu_migration_params.c | 19 +- src/qemu/qemu_monitor.c | 27 +- src/qemu/qemu_monitor.h | 13 +- src/qemu/qemu_monitor_json.c | 151 +- src/qemu/qemu_monitor_json.h | 10 +- src/qemu/qemu_process.c | 355 ++- src/qemu/qemu_process.h | 3 + src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 14 +- src/remote_protocol-structs | 5 + tests/qemumonitorjsontest.c | 42 +- .../migration-in-params-in.xml | 2 +- .../migration-out-nbd-bitmaps-in.xml | 2 +- .../migration-out-nbd-out.xml | 2 +- .../migration-out-nbd-tls-out.xml | 2 +- .../migration-out-params-in.xml | 2 +- tools/virsh-domain-event.c | 3 +- tools/virsh-domain-monitor.c | 1 + tools/virsh-domain.c | 24 +- 39 files changed, 2556 insertions(+), 934 deletions(-) -- 2.35.1

5 195

[PATCH] remote_daemon: Don't run virStateCleanup() if virStateReload() is still running
by Michal Privoznik 19 May '22

19 May '22

When a SIGHUP is received a thread is spawned that runs virStateReload(). However, if SIGINT is received while the former thread is still running then we may get into problematic situation: the cleanup code in main() sees drivers initialized and thus calls virStateCleanup(). So now we have two threads, one running virStateReload() the other virStateCleanup(). In this situation it's very likely that a race condition occurs and either of threads causes SIGSEGV. To fix this, unmark drivers as initialized in the virStateReload() thread for the time the function runs. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2075837 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/remote/remote_daemon.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 26469e0d9f..37d27f93f4 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -77,7 +77,7 @@ virNetSASLContext *saslCtxt = NULL; virNetServerProgram *remoteProgram = NULL; virNetServerProgram *qemuProgram = NULL; -volatile bool driversInitialized = false; +volatile gint driversInitialized = 0; static void daemonErrorHandler(void *opaque G_GNUC_UNUSED, virErrorPtr err G_GNUC_UNUSED) @@ -453,8 +453,13 @@ static void daemonReloadHandlerThread(void *opaque G_GNUC_UNUSED) VIR_INFO("Reloading configuration on SIGHUP"); virHookCall(VIR_HOOK_DRIVER_DAEMON, "-", VIR_HOOK_DAEMON_OP_RELOAD, SIGHUP, "SIGHUP", NULL, NULL); - if (virStateReload() < 0) + + g_atomic_int_set(&driversInitialized, 0); + if (virStateReload() < 0) { VIR_WARN("Error while reloading drivers"); + } else { + g_atomic_int_inc(&driversInitialized); + } } static void daemonReloadHandler(virNetDaemon *dmn G_GNUC_UNUSED, @@ -463,7 +468,7 @@ static void daemonReloadHandler(virNetDaemon *dmn G_GNUC_UNUSED, { virThread thr; - if (!driversInitialized) { + if (g_atomic_int_get(&driversInitialized) == 0) { VIR_WARN("Drivers are not initialized, reload ignored"); return; } @@ -607,7 +612,7 @@ static void daemonRunStateInit(void *opaque) goto cleanup; } - driversInitialized = true; + g_atomic_int_inc(&driversInitialized); virNetDaemonSetShutdownCallbacks(dmn, virStateShutdownPrepare, @@ -1212,10 +1217,10 @@ int main(int argc, char **argv) { cleanup: virNetlinkEventServiceStopAll(); - if (driversInitialized) { + if (g_atomic_int_get(&driversInitialized) != 0) { /* NB: Possible issue with timing window between driversInitialized * setting if virNetlinkEventServerStart fails */ - driversInitialized = false; + g_atomic_int_set(&driversInitialized, 0); virStateCleanup(); } -- 2.35.1

3 4

[libvirt PATCH 0/5] Description Here
by Ján Tomko 19 May '22

19 May '22

Ján Tomko (5): Do not check if unsigned vars are less than zero src: QemuMonitorCommandWithFiles: report error when fd passing is unsupported apparmor: report error when removing profile failed vbox: SnapshotConfAllChildren: reduce scope of tempSize storagefile: set size field of ploop to 8 src/esx/esx_stream.c | 2 +- src/libvirt-qemu.c | 4 ++-- src/security/virt-aa-helper.c | 2 +- src/storage_file/storage_file_probe.c | 2 +- src/vbox/vbox_snapshot_conf.c | 3 +-- 5 files changed, 6 insertions(+), 7 deletions(-) -- 2.34.1

3 7

[PATCH] apparmor: Add support for dbus chardev
by Martin Kletzander 19 May '22

19 May '22

Commit 7648e40da50e added support for dbus chardev but forgot to handle it in AppArmor code. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed under the build-breaker rule. src/security/security_apparmor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 55c019394050..008384dee8c2 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -1022,6 +1022,7 @@ AppArmorSetChardevLabel(virSecurityManager *mgr, case VIR_DOMAIN_CHR_TYPE_SPICEVMC: case VIR_DOMAIN_CHR_TYPE_NMDM: case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: + case VIR_DOMAIN_CHR_TYPE_DBUS: case VIR_DOMAIN_CHR_TYPE_LAST: ret = 0; break; @@ -1085,6 +1086,7 @@ AppArmorSetNetdevLabel(virSecurityManager *mgr, case VIR_DOMAIN_CHR_TYPE_SPICEVMC: case VIR_DOMAIN_CHR_TYPE_NMDM: case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: + case VIR_DOMAIN_CHR_TYPE_DBUS: case VIR_DOMAIN_CHR_TYPE_LAST: ret = 0; break; -- 2.35.1

1 0

[PATCH v2 0/3] ui: Remove deprecated sdl parameters and switch to QAPI parser
by Thomas Huth 19 May '22

19 May '22

The "-display sdl" option still uses a hand-crafted parser for its parameters since some of them used underscores which is forbidden in QAPI. Now that they've been deprecated and the deprecation period is over, we can remove the problematic parameters and switch to use the QAPI parser instead. While we're at it, also remove the deprecated "-sdl" and "-curses" options. v2: - Rebase to current master branch to resolve conflicts in docs/about/*.rst - Use an enum for the grab-mod parameter instead of a unconstrained string Thomas Huth (3): ui: Remove deprecated parameters of the "-display sdl" option ui: Switch "-display sdl" to use the QAPI parser ui: Remove deprecated options "-sdl" and "-curses" docs/about/deprecated.rst | 26 ------- docs/about/removed-features.rst | 27 +++++++ qapi/ui.json | 27 ++++++- include/sysemu/sysemu.h | 2 - softmmu/globals.c | 2 - softmmu/vl.c | 128 +------------------------------- ui/sdl2.c | 10 +++ qemu-options.hx | 56 +------------- 8 files changed, 68 insertions(+), 210 deletions(-) -- 2.27.0

5 18

[libvirt PATCH v4 00/11] Add QEMU "-display dbus" support
by marcandre.lureau＠redhat.com 19 May '22

19 May '22

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, This series implements supports for the QEMU "-display dbus" support, available since 7.0. By default, libvirt will start a private VM bus (sharing and reusing the existing "vmstate" VM bus & code). The feature set should cover the needs to replace Spice as local client of choice, including 3daccel/dmabuf, audio, clipboard sharing, usb redirection, and arbitrary chardev/channels (for serial etc). The test Gtk4 client is also in progress, currently in development at https://gitlab.com/marcandre.lureau/qemu-display/. virt-viewer & boxes will need a port to Gtk4 to make use of the shared widget. thanks v4: - rebased, dropped some patches, updated versions in docs, code adjustments etc - dropped clipboard option, as standalone qemu-vdagent support landed v3: after QEMU 7.0 dev cycle opening and merge - rebased - add 7.0 x86-64 capabilities (instead of tweaking 6.2) - fix version annotations Marc-André Lureau (11): qemu: add -display dbus capability check conf: add <graphics type='dbus'> qemu: start the D-Bus daemon for the display qemu: add -display dbus support virsh: report the D-Bus bus URI for domdisplay conf: add <audio type='dbus'> support qemu: add audio type 'dbus' conf: add <serial type='dbus'> qemu: add -chardev dbus support qemu: add usbredir type 'dbus' docs: document <graphics> type dbus NEWS.rst | 5 + docs/formatdomain.rst | 43 +++++- src/bhyve/bhyve_command.c | 1 + src/conf/domain_conf.c | 129 +++++++++++++++++- src/conf/domain_conf.h | 14 ++ src/conf/domain_validate.c | 41 ++++-- src/conf/schemas/basictypes.rng | 7 + src/conf/schemas/domaincommon.rng | 63 +++++++++ src/libxl/libxl_conf.c | 1 + src/libxl/libxl_domain.c | 1 + src/libxl/libxl_driver.c | 1 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 65 ++++++++- src/qemu/qemu_domain.c | 1 + src/qemu/qemu_driver.c | 10 +- src/qemu/qemu_extdevice.c | 13 ++ src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_monitor_json.c | 10 ++ src/qemu/qemu_process.c | 41 +++++- src/qemu/qemu_validate.c | 33 +++++ src/security/security_dac.c | 2 + src/vmx/vmx.c | 1 + .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 1 + .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 1 + .../caps_7.0.0.x86_64.xml | 1 + .../caps_7.1.0.x86_64.xml | 1 + .../graphics-dbus-address.args | 30 ++++ .../graphics-dbus-address.xml | 35 +++++ .../qemuxml2argvdata/graphics-dbus-audio.args | 33 +++++ .../qemuxml2argvdata/graphics-dbus-audio.xml | 45 ++++++ .../graphics-dbus-chardev.args | 32 +++++ .../graphics-dbus-chardev.xml | 43 ++++++ tests/qemuxml2argvdata/graphics-dbus-p2p.args | 30 ++++ tests/qemuxml2argvdata/graphics-dbus-p2p.xml | 33 +++++ .../graphics-dbus-usbredir.args | 34 +++++ .../graphics-dbus-usbredir.xml | 30 ++++ tests/qemuxml2argvdata/graphics-dbus.args | 30 ++++ tests/qemuxml2argvdata/graphics-dbus.xml | 33 +++++ tests/qemuxml2argvtest.c | 17 +++ .../graphics-dbus-address.xml | 1 + .../graphics-dbus-audio.xml | 1 + .../graphics-dbus-chardev.xml | 1 + .../qemuxml2xmloutdata/graphics-dbus-p2p.xml | 1 + tests/qemuxml2xmloutdata/graphics-dbus.xml | 1 + tests/qemuxml2xmltest.c | 17 +++ tests/testutilsqemu.c | 1 + tools/virsh-domain.c | 24 +++- 52 files changed, 948 insertions(+), 20 deletions(-) create mode 100644 tests/qemuxml2argvdata/graphics-dbus-address.args create mode 100644 tests/qemuxml2argvdata/graphics-dbus-address.xml create mode 100644 tests/qemuxml2argvdata/graphics-dbus-audio.args create mode 100644 tests/qemuxml2argvdata/graphics-dbus-audio.xml create mode 100644 tests/qemuxml2argvdata/graphics-dbus-chardev.args create mode 100644 tests/qemuxml2argvdata/graphics-dbus-chardev.xml create mode 100644 tests/qemuxml2argvdata/graphics-dbus-p2p.args create mode 100644 tests/qemuxml2argvdata/graphics-dbus-p2p.xml create mode 100644 tests/qemuxml2argvdata/graphics-dbus-usbredir.args create mode 100644 tests/qemuxml2argvdata/graphics-dbus-usbredir.xml create mode 100644 tests/qemuxml2argvdata/graphics-dbus.args create mode 100644 tests/qemuxml2argvdata/graphics-dbus.xml create mode 120000 tests/qemuxml2xmloutdata/graphics-dbus-address.xml create mode 120000 tests/qemuxml2xmloutdata/graphics-dbus-audio.xml create mode 120000 tests/qemuxml2xmloutdata/graphics-dbus-chardev.xml create mode 120000 tests/qemuxml2xmloutdata/graphics-dbus-p2p.xml create mode 120000 tests/qemuxml2xmloutdata/graphics-dbus.xml -- 2.36.1

2 12

Plans for the next release
by Jiri Denemark 19 May '22

19 May '22

We are getting close to the next release of libvirt. To aim for the release on June 01 I suggest entering the freeze on Wednesday May 25 in the evening and tagging RC2 on Monday May 30. I hope this works for everyone. Jirka

1 0

[PATCH 0/5] Some docs updates
by Han Han 19 May '22

19 May '22

Han Han (5): docs: apps: Add desktop app gnome-boxes docs: formatdomain: Add the introduced versions of net rss attrs news: Add news for rss and rss_hash_report attributes docs: drivers: Mention KVM/HVF in the link of qemu driver docs: drvqemu: Fix the syntax typo of Hypervisor.framework link NEWS.rst | 5 +++++ docs/apps.rst | 3 +++ docs/drivers.rst | 2 +- docs/drvqemu.rst | 2 +- docs/formatdomain.rst | 3 ++- 5 files changed, 12 insertions(+), 3 deletions(-) -- 2.35.1

2 7