- Devel - libvirt List Archives

[PATCH] cpu: Remove pointless check
by Martin Kletzander 27 Apr '22

27 Apr '22

These two pointers can never be NULL since they are initialised to a reference of a struct. This became apparent when commit 210a19539447 added a VIR_DEBUG which used both pointers because due to the concise condition the compiler saw that if the "and" part of the condition did short-circuit (and it assumed that can happen) the second variable would not be initialised, but it is used in the debugging message, so the build failed with: In file included from ../src/cpu/cpu_x86.c:27: ../src/cpu/cpu_x86.c: In function ‘virCPUx86DataIsIdentical’: ../src/util/virlog.h:79:5: error: ‘bdata’ may be used uninitialized in this function [-Werror=maybe-uninitialized] Fix this by just assigning the helper pointers and remove the condition altogether. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed under the build-breaker rule, but feel free to review/object. src/cpu/cpu_x86.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 7e9d1cea47d1..a5eac7601cad 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -3314,10 +3314,8 @@ virCPUx86DataIsIdentical(const virCPUData *a, return VIR_CPU_COMPARE_INCOMPATIBLE; } - if (!((adata = &a->data.x86) && (bdata = &b->data.x86))) { - VIR_DEBUG("missing x86 data: a:%p b:%p", adata, bdata); - return VIR_CPU_COMPARE_ERROR; - } + adata = &a->data.x86; + bdata = &b->data.x86; if (adata->len != bdata->len) { VIR_DEBUG("unequal length a:%zu b:%zu", adata->len, bdata->len); -- 2.35.1

2 2

[libvirt PATCH] util: fix double destroy / missing unref of GSource
by Daniel P. Berrangé 27 Apr '22

27 Apr '22

A leak of the GSource was introduced in commit 87a43a907f0ad4897a28ad7c216bc70f37270b93 Author: Michal Prívozník <mprivozn(a)redhat.com> Date: Fri Jan 28 18:42:45 2022 +0100 lib: Use g_clear_pointer() more As it mistakenly replaced the g_vir_source_unref call with a second call to g_source_destroy. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/util/vireventglib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/vireventglib.c b/src/util/vireventglib.c index fc04d8f712..3cc42597fd 100644 --- a/src/util/vireventglib.c +++ b/src/util/vireventglib.c @@ -227,7 +227,7 @@ virEventGLibHandleUpdate(int watch, goto cleanup; VIR_DEBUG("Removed old handle source=%p", data->source); - g_source_destroy(data->source); + vir_g_source_unref(data->source, NULL); g_clear_pointer(&data->source, g_source_destroy); data->events = 0; } -- 2.35.1

2 1

[PATCH] qemu: do not use domain virt type to get default version
by Liang Yan 26 Apr '22

26 Apr '22

We do not need VIR_DOMAIN_VIRT_QEMU to get qemu default version. With the 'os_type' and 'arch'in capabilities, we could identify 'emulator' which is enough to get the version. Actually VIR_DOMAIN_VIRT_QEMU is not the only domain virt type for qemu driver, there are VIR_DOMAIN_VIRT_KVM and VIR_DOMAIN_VIRT_HVF. If TCG is disabled in qemu, it will cause the error that could not find suitable emulater when access version. Signed-off-by: Liang Yan <lyan(a)digtalocean.com> --- src/qemu/qemu_capabilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b91db851bb..9a0b7ebeb4 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1857,7 +1857,7 @@ int virQEMUCapsGetDefaultVersion(virCaps *caps, hostarch = virArchFromHost(); if (!(capsdata = virCapabilitiesDomainDataLookup(caps, - VIR_DOMAIN_OSTYPE_HVM, hostarch, VIR_DOMAIN_VIRT_QEMU, + VIR_DOMAIN_OSTYPE_HVM, hostarch, VIR_DOMAIN_VIRT_NONE, NULL, NULL))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Cannot find suitable emulator for %s"), -- 2.34.1

1 0

[PULL 0/3] Misc next patches
by Daniel P. Berrangé 26 Apr '22

26 Apr '22

The following changes since commit a1755db71e34df016ffc10aa0727360aae2c6036: Merge tag 'pull-block-2022-04-25' of https://gitlab.com/hreitz/qemu into staging (2022-04-25 13:35:41 -0700) are available in the Git repository at: https://gitlab.com/berrange/qemu tags/misc-next-pull-request for you to fetch changes up to 5cf434b5af386fadc3418df71d3738676cbb0549: github: fix config mistake preventing repo lockdown commenting (2022-04-26 16:12:26 +0100) ---------------------------------------------------------------- Misc patch queue * Removes depecated --enable-fips QEMU system emulator option * Fixes array bounds check in keycode conversion for ESCC device ---------------------------------------------------------------- Daniel P. Berrangé (3): softmmu: remove deprecated --enable-fips option hw/char: fix qcode array bounds check in ESCC impl github: fix config mistake preventing repo lockdown commenting .github/workflows/lockdown.yml | 6 +++--- docs/about/deprecated.rst | 12 ------------ docs/about/removed-features.rst | 11 +++++++++++ hw/char/escc.c | 2 +- include/qemu/osdep.h | 3 --- os-posix.c | 8 -------- qemu-options.hx | 10 ---------- ui/vnc.c | 7 ------- util/osdep.c | 28 ---------------------------- 9 files changed, 15 insertions(+), 72 deletions(-) -- 2.35.1

2 4

[PATCH] include: Move version information
by Andrea Bolognani 26 Apr '22

26 Apr '22

It belongs to the comment for VIR_DOMAIN_AFFECT_CONFIG, not to the unrelated one immediately after it. Fixes: 807cdbf75976f88e8a23b26951f263029cc9e5f4 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. include/libvirt/libvirt-domain.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 6fed42c47a..9386f5189c 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -323,8 +323,8 @@ typedef virDomainControlInfo *virDomainControlInfoPtr; typedef enum { VIR_DOMAIN_AFFECT_CURRENT = 0, /* Affect current domain state. (Since: v0.9.2) */ VIR_DOMAIN_AFFECT_LIVE = 1 << 0, /* Affect running domain state. (Since: v0.9.2) */ - VIR_DOMAIN_AFFECT_CONFIG = 1 << 1, /* Affect persistent domain state. */ - /* 1 << 2 is reserved for virTypedParameterFlags (Since: v0.9.2) */ + VIR_DOMAIN_AFFECT_CONFIG = 1 << 1, /* Affect persistent domain state. (Since: v0.9.2) */ + /* 1 << 2 is reserved for virTypedParameterFlags */ } virDomainModificationImpact; /** -- 2.35.1

1 0

[PATCH v2 0/8] Introduce network backed NVRAM
by Rohit Kumar 26 Apr '22

26 Apr '22

Libvirt domain XML currently allows only local filepaths that can be used to specify a NVRAM disk. Since, VMs can migrate across hypervisor hosts, it should be possible to allocate NVRAM disks on network storage for uninterrupted access. This series extends the NVRAM element to support hosting over network-backed disks, for high availability. It achieves this by embedding virStorageSource pointer for nvram into _virDomainLoaderDef. It introduces a 'type' attribute for NVRAM element to specify 'file' vs 'network' backed NVRAM. Changes v1->v2: - Split the patch into smaller patches - Added unit test - Updated the doc - Addressed Peter's comment on v1 (https://listman.redhat.com/archives/libvir-list/2022-March/229684.html) Rohit Kumar (8): Make NVRAM a virStorageSource type. Add support to parse/format virStorageSource type NVRAM Validate remote store NVRAM Cleanup diskSourceNetwork and diskSourceFile schema Update XML schema to support network backed NVRAM Update NVRAM documentation Add unit test for network backed NVRAM Add unit test to support new 'file' type NVRAM docs/formatdomain.rst | 43 +++++++-- src/conf/domain_conf.c | 88 ++++++++++++++++--- src/conf/domain_conf.h | 2 +- src/conf/schemas/domaincommon.rng | 80 +++++++++++------ src/qemu/qemu_cgroup.c | 3 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 14 +-- src/qemu/qemu_driver.c | 5 +- src/qemu/qemu_firmware.c | 23 +++-- src/qemu/qemu_namespace.c | 5 +- src/qemu/qemu_process.c | 5 +- src/qemu/qemu_validate.c | 22 +++++ src/security/security_dac.c | 6 +- src/security/security_selinux.c | 6 +- src/security/virt-aa-helper.c | 5 +- src/vbox/vbox_common.c | 2 +- .../bios-nvram-file.x86_64-latest.args | 37 ++++++++ tests/qemuxml2argvdata/bios-nvram-file.xml | 23 +++++ .../bios-nvram-network.x86_64-latest.args | 37 ++++++++ tests/qemuxml2argvdata/bios-nvram-network.xml | 25 ++++++ tests/qemuxml2argvtest.c | 2 + 21 files changed, 360 insertions(+), 75 deletions(-) create mode 100644 tests/qemuxml2argvdata/bios-nvram-file.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/bios-nvram-file.xml create mode 100644 tests/qemuxml2argvdata/bios-nvram-network.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/bios-nvram-network.xml -- 2.25.1

3 34

[libvirt PATCH] ci: print test suite logs on failure for Cirrus jobs
by Daniel P. Berrangé 26 Apr '22

26 Apr '22

We don't have access to the 'testlog.txt' file, so we need meson to print the failures for any broken tests directly. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- The CI pipeline for macOS started failing a few days ago. It was not triggered by any commit, as the pipeline immediately preceeding the first failure used the same commit hash on master. The logs show glib2 being updated from 2.72.0 to 2.72.1 With this patch applied I can see the test logs https://gitlab.com/berrange/libvirt/-/jobs/2376891003 and all the failing tests are hitting: (process:50961): GLib-WARNING **: 01:56:14.162: poll(2) failed due to: Bad file descriptor. so something todo with the QEMU monitor/event loop AFAIK, but not sure what. ci/cirrus/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml index 867d5f297b..f03ad58143 100644 --- a/ci/cirrus/build.yml +++ b/ci/cirrus/build.yml @@ -26,4 +26,4 @@ build_task: - meson setup build - meson dist -C build --no-tests - meson compile -C build - - meson test -C build --no-suite syntax-check + - meson test -C build --no-suite syntax-check --print-errorlogs -- 2.35.1

2 2

[PATCH] include: Remove more comments between enum values
by Andrea Bolognani 26 Apr '22

26 Apr '22

apibuild.py mistakes these as being a continuation of the previous comment. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial-ish and necessary to unblock Victor's work. include/libvirt/libvirt-domain-snapshot.h | 2 -- include/libvirt/libvirt-domain.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/include/libvirt/libvirt-domain-snapshot.h b/include/libvirt/libvirt-domain-snapshot.h index 35eeb21e27..9181cc1f38 100644 --- a/include/libvirt/libvirt-domain-snapshot.h +++ b/include/libvirt/libvirt-domain-snapshot.h @@ -123,8 +123,6 @@ typedef enum { not just children, when listing a snapshot */ - /* For historical reasons, groups do not use contiguous bits. */ - VIR_DOMAIN_SNAPSHOT_LIST_LEAVES = (1 << 2), /* Filter by snapshots with no children */ VIR_DOMAIN_SNAPSHOT_LIST_NO_LEAVES = (1 << 3), /* Filter by snapshots diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 3dfcd14b9c..f8f1ff2ce2 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2148,8 +2148,6 @@ typedef enum { VIR_DOMAIN_UNDEFINE_CHECKPOINTS_METADATA = (1 << 4), /* If last use of domain, then also remove any checkpoint metadata */ - - /* Future undefine control flags should come here. */ } virDomainUndefineFlagsValues; -- 2.35.1

1 0

[PATCH] include: Fix docstring indentation
by Andrea Bolognani 26 Apr '22

26 Apr '22

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial include/libvirt/libvirt-domain.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 0fa4509b73..3dfcd14b9c 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2793,15 +2793,15 @@ void virDomainStatsRecordListFree(virDomainStatsRecordPtr *stats); # define VIR_PERF_PARAM_TASK_CLOCK "task_clock" /** -* VIR_PERF_PARAM_PAGE_FAULTS: -* -* Macro for typed parameter name that represents page_faults -* perf event which can be used to measure the count of page -* faults by applications running on the platform. It corresponds -* to the "perf.page_faults" field in the *Stats APIs. -* -* Since: v3.2.0 -*/ + * VIR_PERF_PARAM_PAGE_FAULTS: + * + * Macro for typed parameter name that represents page_faults + * perf event which can be used to measure the count of page + * faults by applications running on the platform. It corresponds + * to the "perf.page_faults" field in the *Stats APIs. + * + * Since: v3.2.0 + */ # define VIR_PERF_PARAM_PAGE_FAULTS "page_faults" /** -- 2.35.1

1 0

[PATCH][RESEND] processMonitorEOFEvent:fix delet Domain object about the new VM in processMonitorEOFEvent()
by Yi Wang 26 Apr '22

26 Apr '22

From: 王鹏钧10288409 <10288409@zte.intra@LIN-184C297BAE7.zte.com.cn> Virsh shutdown is executed firstly, virsh destroy is executed later, and VM is recreated again. In this process, due to will delet Domain object about the new VM in processMonitorEOFEvent(), which virDomainObjListRemove is called to remove objlist, the new VM cannot be found through virsh list command and qemu process is still running. Therefore, add virDomainObjListFindByName function checks to avoid delet Domain object about the new VM in objlist. This process chart of problem is as follows shutdown | destroy | create ============================+==================+=================== qemuMonitorIO | | qemuProcessHandleMonitorEOF | | | virDomainDestroy | | qemuProcessStop | | | qemuDomainCreateXML | | qemuProcessInit processMonitorEOFEvent | | qemuDomainRemoveInactive | | | | qemuProcessLaunch Signed-off-by: Wang PengJun <wang.pengjun1(a)zte.com.cn> Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/qemu/qemu_driver.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ee0963c30d..a504f89724 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4024,6 +4024,7 @@ processMonitorEOFEvent(virQEMUDriver *driver, const char *auditReason = "shutdown"; unsigned int stopFlags = 0; virObjectEvent *event = NULL; + virDomainObj *obj; if (qemuProcessBeginStopJob(driver, vm, VIR_JOB_DESTROY, true) < 0) return; @@ -4055,7 +4056,12 @@ processMonitorEOFEvent(virQEMUDriver *driver, virObjectEventStateQueue(driver->domainEventState, event); endjob: - qemuDomainRemoveInactive(driver, vm); + virObjectUnlock(vm); + obj = virDomainObjListFindByName(driver->domains, vm->def->name); + if (vm == obj) + qemuDomainRemoveInactive(driver, vm); + virDomainObjEndAPI(&obj); + virObjectLock(vm); qemuDomainObjEndJob(vm); } -- 2.27.0

1 0

[PATCH] tests: qemucapabilities: Update qemu caps dump for the qemu-7.0.0 release on x86_64
by Peter Krempa 25 Apr '22

25 Apr '22

Few minor changes in qemu since the last update: - PIIX4_PM gained 'x-not-migrate-acpi-index' property - 'cocoa' display and corresponding props (not present in this build) Changes in build: - dbus display driver re-enabled - gtk display support re-disabled - xen support re-disabled Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- .../caps_7.0.0.x86_64.replies | 583 ++++++++---------- .../caps_7.0.0.x86_64.xml | 10 +- 2 files changed, 257 insertions(+), 336 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies index d1f453dcca..620442704a 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies @@ -17,11 +17,11 @@ { "return": { "qemu": { - "micro": 92, - "minor": 2, - "major": 6 + "micro": 0, + "minor": 0, + "major": 7 }, - "package": "v7.0.0-rc2" + "package": "v7.0.0" }, "id": "libvirt-2" } @@ -5119,10 +5119,6 @@ "name": "135", "tag": "type", "variants": [ - { - "case": "gtk", - "type": "358" - }, { "case": "curses", "type": "360" @@ -5131,6 +5127,10 @@ "case": "egl-headless", "type": "361" }, + { + "case": "dbus", + "type": "362" + }, { "case": "default", "type": "0" @@ -10498,6 +10498,10 @@ "case": "qemu-vdagent", "type": "518" }, + { + "case": "dbus", + "type": "519" + }, { "case": "vc", "type": "520" @@ -11756,9 +11760,6 @@ { "name": "none" }, - { - "name": "gtk" - }, { "name": "sdl" }, @@ -11770,17 +11771,20 @@ }, { "name": "spice-app" + }, + { + "name": "dbus" } ], "meta-type": "enum", "values": [ "default", "none", - "gtk", "sdl", "egl-headless", "curses", - "spice-app" + "spice-app", + "dbus" ] }, { @@ -16067,6 +16071,9 @@ { "name": "qemu-vdagent" }, + { + "name": "dbus" + }, { "name": "vc" }, @@ -16097,6 +16104,7 @@ "spicevmc", "spiceport", "qemu-vdagent", + "dbus", "vc", "ringbuf", "memory" @@ -16202,6 +16210,16 @@ ], "meta-type": "object" }, + { + "name": "519", + "members": [ + { + "name": "data", + "type": "618" + } + ], + "meta-type": "object" + }, { "name": "520", "members": [ @@ -18460,6 +18478,26 @@ ], "meta-type": "object" }, + { + "name": "618", + "members": [ + { + "name": "logfile", + "default": null, + "type": "str" + }, + { + "name": "logappend", + "default": null, + "type": "bool" + }, + { + "name": "name", + "type": "str" + } + ], + "meta-type": "object" + }, { "name": "619", "members": [ @@ -20363,10 +20401,6 @@ "name": "acpi-erst", "parent": "pci-device" }, - { - "name": "virtio-crypto-device", - "parent": "virtio-device" - }, { "name": "isa-applesmc", "parent": "isa-device" @@ -20379,49 +20413,53 @@ "name": "vhost-user-input-pci", "parent": "vhost-user-input-pci-base-type" }, + { + "name": "usb-redir", + "parent": "usb-device" + }, { "name": "floppy-bus", "parent": "bus" }, { - "name": "Denverton-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-crypto-device", + "parent": "virtio-device" }, { "name": "chardev-testdev", "parent": "chardev" }, { - "name": "usb-wacom-tablet", - "parent": "usb-device" + "name": "Denverton-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "Icelake-Server-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pci-ipmi-bt", + "parent": "pci-device" }, { "name": "chardev-stdio", "parent": "chardev-fd" }, { - "name": "pci-ipmi-bt", - "parent": "pci-device" + "name": "usb-wacom-tablet", + "parent": "usb-device" }, { "name": "filter-buffer", "parent": "netfilter" }, { - "name": "secondary-vga", - "parent": "pci-vga" + "name": "Icelake-Server-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "ich9-usb-uhci6", "parent": "pci-uhci-usb" }, { - "name": "usb-redir", - "parent": "usb-device" + "name": "secondary-vga", + "parent": "pci-vga" }, { "name": "kvm-pit", @@ -20451,14 +20489,14 @@ "name": "sev-guest", "parent": "confidential-guest-support" }, - { - "name": "core2duo-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "ich9-usb-uhci5", "parent": "pci-uhci-usb" }, + { + "name": "core2duo-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "pcm3680_pci", "parent": "pci-device" @@ -20619,10 +20657,6 @@ "name": "pxb-host", "parent": "pci-host-bridge" }, - { - "name": "virtio-scsi-pci", - "parent": "virtio-scsi-pci-base" - }, { "name": "virtio-input-host-pci", "parent": "virtio-input-host-pci-base-type" @@ -20744,8 +20778,8 @@ "parent": "virtio-device" }, { - "name": "xenfv-4.2-machine", - "parent": "generic-pc-machine" + "name": "virtio-scsi-pci", + "parent": "virtio-scsi-pci-base" }, { "name": "ipmi-bmc-extern", @@ -20855,10 +20889,6 @@ "name": "pr-manager-helper", "parent": "pr-manager" }, - { - "name": "virtio-scsi-device", - "parent": "virtio-scsi-common" - }, { "name": "pc-i440fx-2.10-machine", "parent": "generic-pc-machine" @@ -20872,20 +20902,16 @@ "parent": "pci-device" }, { - "name": "xen-pci-passthrough", - "parent": "pci-device" - }, - { - "name": "Haswell-IBRS-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-scsi-device", + "parent": "virtio-scsi-common" }, { "name": "pxb-pcie", "parent": "pci-device" }, { - "name": "cpu-cluster", - "parent": "device" + "name": "Haswell-IBRS-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "vhost-user-i2c-pci", @@ -20896,7 +20922,7 @@ "parent": "object" }, { - "name": "xen-backend", + "name": "cpu-cluster", "parent": "device" }, { @@ -20904,16 +20930,16 @@ "parent": "sys-bus-device" }, { - "name": "Haswell-v3-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "i82557a", + "parent": "pci-device" }, { "name": "vhost-user-scsi-pci-non-transitional", "parent": "vhost-user-scsi-pci-base" }, { - "name": "i82557a", - "parent": "pci-device" + "name": "vmmouse", + "parent": "isa-device" }, { "name": "chardev-udp", @@ -20932,8 +20958,8 @@ "parent": "virtio-scsi-pci-base" }, { - "name": "vmmouse", - "parent": "isa-device" + "name": "Haswell-v3-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "migration", @@ -20976,8 +21002,8 @@ "parent": "x86_64-cpu" }, { - "name": "vhost-vsock-device", - "parent": "vhost-vsock-common" + "name": "chardev-dbus", + "parent": "chardev-socket" }, { "name": "Broadwell-v2-x86_64-cpu", @@ -20995,10 +21021,6 @@ "name": "EPYC-IBPB-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "Skylake-Server-v5-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "ib700", "parent": "isa-device" @@ -21008,7 +21030,7 @@ "parent": "x86-iommu" }, { - "name": "Nehalem-v2-x86_64-cpu", + "name": "Skylake-Server-v5-x86_64-cpu", "parent": "x86_64-cpu" }, { @@ -21016,16 +21038,16 @@ "parent": "virtio-9p-pci-base" }, { - "name": "igd-passthrough-i440FX", - "parent": "i440FX" + "name": "Nehalem-v2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "memory-backend-file", "parent": "memory-backend" }, { - "name": "xen-disk", - "parent": "xen-block" + "name": "vhost-vsock-device", + "parent": "vhost-vsock-common" }, { "name": "isa-pcspk", @@ -21036,25 +21058,21 @@ "parent": "vhost-scsi-common" }, { - "name": "usb-tablet", - "parent": "usb-hid" + "name": "sd-card", + "parent": "device" }, { "name": "sysbus-ahci", "parent": "sys-bus-device" }, { - "name": "sd-card", - "parent": "device" + "name": "usb-tablet", + "parent": "usb-hid" }, { "name": "pc-q35-4.0.1-machine", "parent": "generic-pc-machine" }, - { - "name": "IvyBridge-v2-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "virtio-blk-pci-non-transitional", "parent": "virtio-blk-pci-base" @@ -21064,13 +21082,17 @@ "parent": "device" }, { - "name": "ne2k_pci", - "parent": "pci-device" + "name": "IvyBridge-v2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "isabus-bridge", "parent": "sys-bus-device" }, + { + "name": "ne2k_pci", + "parent": "pci-device" + }, { "name": "usb-bus", "parent": "bus" @@ -21087,18 +21109,10 @@ "name": "tcg-accel", "parent": "accel" }, - { - "name": "i82551", - "parent": "pci-device" - }, { "name": "virtio-balloon-pci", "parent": "virtio-balloon-pci-base" }, - { - "name": "Cascadelake-Server-v2-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "virtio-gpu-device", "parent": "virtio-gpu-base" @@ -21107,6 +21121,10 @@ "name": "e1000", "parent": "e1000-base" }, + { + "name": "Cascadelake-Server-v2-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "athlon-v1-x86_64-cpu", "parent": "x86_64-cpu" @@ -21124,8 +21142,8 @@ "parent": "generic-pc-machine" }, { - "name": "xen-apic", - "parent": "apic-common" + "name": "i82551", + "parent": "pci-device" }, { "name": "EPYC-v1-x86_64-cpu", @@ -21159,14 +21177,14 @@ "name": "pc-q35-6.0-machine", "parent": "generic-pc-machine" }, - { - "name": "mioe3680_pci", - "parent": "pci-device" - }, { "name": "vhost-user-backend", "parent": "object" }, + { + "name": "mioe3680_pci", + "parent": "pci-device" + }, { "name": "vmxnet3", "parent": "pci-device" @@ -21204,24 +21222,24 @@ "parent": "smbus-device" }, { - "name": "virtio-serial-device", - "parent": "virtio-device" + "name": "dbus-display", + "parent": "object" }, { - "name": "virtio-serial-pci", - "parent": "virtio-serial-pci-base" + "name": "vhost-user-gpu-pci", + "parent": "vhost-user-gpu-pci-base-type" }, { - "name": "Denverton-v2-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-serial-pci", + "parent": "virtio-serial-pci-base" }, { - "name": "xen-bridge", - "parent": "sys-bus-device" + "name": "virtio-serial-device", + "parent": "virtio-device" }, { - "name": "vhost-user-gpu-pci", - "parent": "vhost-user-gpu-pci-base-type" + "name": "Denverton-v2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "iothread", @@ -21243,14 +21261,14 @@ "name": "ati-vga", "parent": "pci-device" }, - { - "name": "pentium3-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "kvm-i8259", "parent": "pic-common" }, + { + "name": "pentium3-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "isa-serial", "parent": "isa-device" @@ -21311,18 +21329,10 @@ "name": "Opteron_G3-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "xen-cdrom", - "parent": "xen-block" - }, { "name": "Cooperlake-v2-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "EPYC-v3-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "isa-ide", "parent": "isa-device" @@ -21332,13 +21342,17 @@ "parent": "x86_64-cpu" }, { - "name": "sgx-epc", - "parent": "device" + "name": "EPYC-v3-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "scsi-cd", "parent": "scsi-disk-base" }, + { + "name": "sgx-epc", + "parent": "device" + }, { "name": "gpex-root", "parent": "pci-device" @@ -21407,17 +21421,13 @@ "name": "VGA", "parent": "pci-vga" }, - { - "name": "i440FX", - "parent": "pci-device" - }, { "name": "qio-channel-buffer", "parent": "qio-channel" }, { - "name": "xen-bus", - "parent": "bus" + "name": "i440FX", + "parent": "pci-device" }, { "name": "Penryn-v1-x86_64-cpu", @@ -21436,16 +21446,16 @@ "parent": "virtio-device" }, { - "name": "Icelake-Server-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pc-i440fx-3.1-machine", + "parent": "generic-pc-machine" }, { "name": "pci-serial-4x", "parent": "pci-device" }, { - "name": "pc-i440fx-3.1-machine", - "parent": "generic-pc-machine" + "name": "Icelake-Server-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "sga", @@ -21516,11 +21526,11 @@ "parent": "usb-device" }, { - "name": "IvyBridge-x86_64-cpu", + "name": "SandyBridge-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "SandyBridge-v1-x86_64-cpu", + "name": "IvyBridge-x86_64-cpu", "parent": "x86_64-cpu" }, { @@ -21583,10 +21593,6 @@ "name": "ccid-bus", "parent": "bus" }, - { - "name": "xen-pvdevice", - "parent": "pci-device" - }, { "name": "ide-hd", "parent": "ide-device" @@ -21619,14 +21625,14 @@ "name": "pc-i440fx-4.1-machine", "parent": "generic-pc-machine" }, - { - "name": "e1000-82544gc", - "parent": "e1000-base" - }, { "name": "chardev-spiceport", "parent": "chardev-spice" }, + { + "name": "e1000-82544gc", + "parent": "e1000-base" + }, { "name": "tls-creds-x509", "parent": "tls-creds" @@ -21659,10 +21665,6 @@ "name": "isa-cirrus-vga", "parent": "isa-device" }, - { - "name": "pvrdma", - "parent": "pci-device" - }, { "name": "qemu64-x86_64-cpu", "parent": "x86_64-cpu" @@ -21671,6 +21673,10 @@ "name": "Skylake-Server-v2-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "chardev-braille", + "parent": "chardev" + }, { "name": "pc-q35-4.1-machine", "parent": "generic-pc-machine" @@ -21703,14 +21709,14 @@ "name": "pc-testdev", "parent": "isa-device" }, - { - "name": "qio-channel-websock", - "parent": "qio-channel" - }, { "name": "megasas", "parent": "megasas-base" }, + { + "name": "qio-channel-websock", + "parent": "qio-channel" + }, { "name": "virtio-iommu-pci", "parent": "virtio-iommu-pci-base-type" @@ -21719,21 +21725,17 @@ "name": "pc-i440fx-6.1-machine", "parent": "generic-pc-machine" }, - { - "name": "vmcoreinfo", - "parent": "device" - }, { "name": "Icelake-Client-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "tpci200", - "parent": "pci-device" + "name": "vmcoreinfo", + "parent": "device" }, { - "name": "chardev-braille", - "parent": "chardev" + "name": "tpci200", + "parent": "pci-device" }, { "name": "rocker", @@ -21767,10 +21769,6 @@ "name": "qemu-console", "parent": "object" }, - { - "name": "chardev-socket", - "parent": "chardev" - }, { "name": "clock", "parent": "object" @@ -21808,20 +21806,20 @@ "parent": "device" }, { - "name": "Skylake-Server-IBRS-x86_64-cpu", + "name": "Cascadelake-Server-noTSX-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "virtio-pmem", - "parent": "virtio-device" + "name": "chardev-socket", + "parent": "chardev" }, { "name": "nvme-bus", "parent": "bus" }, { - "name": "xen-sysbus", - "parent": "bus" + "name": "virtconsole", + "parent": "virtserialport" }, { "name": "virtio-net-pci-non-transitional", @@ -21839,14 +21837,14 @@ "name": "scsi-hd", "parent": "scsi-disk-base" }, - { - "name": "Cascadelake-Server-noTSX-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "usb-kbd", "parent": "usb-hid" }, + { + "name": "lsi53c810", + "parent": "lsi53c895a" + }, { "name": "isa-fdc", "parent": "isa-device" @@ -21872,24 +21870,24 @@ "parent": "object" }, { - "name": "Westmere-v2-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "ccid-card-emulated", + "parent": "ccid-card" }, { "name": "pc-q35-2.9-machine", "parent": "generic-pc-machine" }, { - "name": "Skylake-Client-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-pmem", + "parent": "virtio-device" }, { "name": "tpm-tis", "parent": "isa-device" }, { - "name": "virtconsole", - "parent": "virtserialport" + "name": "Skylake-Server-IBRS-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "hyperv-testdev", @@ -21912,8 +21910,8 @@ "parent": "generic-pc-machine" }, { - "name": "ccid-card-emulated", - "parent": "ccid-card" + "name": "Westmere-v2-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "pc-q35-5.1-machine", @@ -21928,8 +21926,8 @@ "parent": "virtio-input-hid-device" }, { - "name": "lsi53c810", - "parent": "lsi53c895a" + "name": "Skylake-Client-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "ioh3420", @@ -22031,10 +22029,6 @@ "name": "phenom-v1-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "virtio-net-pci-transitional", - "parent": "virtio-net-pci-base" - }, { "name": "vhost-vsock-pci", "parent": "vhost-vsock-pci-base" @@ -22044,8 +22038,8 @@ "parent": "device" }, { - "name": "vhost-user-blk-pci-transitional", - "parent": "vhost-user-blk-pci-base" + "name": "virtio-net-pci-transitional", + "parent": "virtio-net-pci-base" }, { "name": "irq", @@ -22072,8 +22066,8 @@ "parent": "x86_64-cpu" }, { - "name": "xenfv-3.1-machine", - "parent": "generic-pc-machine" + "name": "vhost-user-blk-pci-transitional", + "parent": "vhost-user-blk-pci-base" }, { "name": "coreduo-x86_64-cpu", @@ -22159,21 +22153,17 @@ "name": "Skylake-Server-v4-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "kvmvapic", - "parent": "sys-bus-device" - }, { "name": "Nehalem-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "nvme-ns", - "parent": "device" + "name": "kvmvapic", + "parent": "sys-bus-device" }, { - "name": "authz-simple", - "parent": "authz" + "name": "nvme-ns", + "parent": "device" }, { "name": "Icelake-Server-v6-x86_64-cpu", @@ -22192,8 +22182,8 @@ "parent": "vhost-user-blk-pci-base" }, { - "name": "xen-accel", - "parent": "accel" + "name": "authz-simple", + "parent": "authz" }, { "name": "fw_cfg_io", @@ -22311,18 +22301,10 @@ "name": "qemu32-v1-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "xen-sysdev", - "parent": "sys-bus-device" - }, { "name": "Haswell-noTSX-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "chardev-null", - "parent": "chardev" - }, { "name": "pci-serial", "parent": "pci-device" @@ -22351,10 +22333,6 @@ "name": "Opteron_G4-v1-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "qio-channel-rdma", - "parent": "qio-channel" - }, { "name": "ne2k_isa", "parent": "isa-device" @@ -22375,14 +22353,14 @@ "name": "vhost-user-gpu", "parent": "virtio-gpu-base" }, - { - "name": "pentium-v1-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "hda-duplex", "parent": "hda-audio" }, + { + "name": "pentium-v1-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "amd-iommu-iommu-memory-region", "parent": "iommu-memory-region" @@ -22396,17 +22374,13 @@ "parent": "pci-device" }, { - "name": "Cooperlake-v1-x86_64-cpu", + "name": "Nehalem-IBRS-x86_64-cpu", "parent": "x86_64-cpu" }, { "name": "Cascadelake-Server-v3-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "vhost-user-rng-pci", - "parent": "vhost-user-rng-pci-base" - }, { "name": "cfi.pflash01", "parent": "sys-bus-device" @@ -22416,8 +22390,12 @@ "parent": "virtio-device" }, { - "name": "isa-parallel", - "parent": "isa-device" + "name": "chardev-null", + "parent": "chardev" + }, + { + "name": "Cooperlake-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "Skylake-Server-x86_64-cpu", @@ -22428,16 +22406,16 @@ "parent": "generic-pc-machine" }, { - "name": "Nehalem-IBRS-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "isa-parallel", + "parent": "isa-device" }, { "name": "pentium2-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "xen-platform", - "parent": "pci-device" + "name": "vhost-user-rng-pci", + "parent": "vhost-user-rng-pci-base" }, { "name": "isa-vga", @@ -22476,20 +22454,20 @@ "parent": "rng-backend" }, { - "name": "Cascadelake-Server-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "qxl-vga", + "parent": "pci-qxl" }, { "name": "i82558b", "parent": "pci-device" }, { - "name": "ivshmem-doorbell", - "parent": "ivshmem-common" + "name": "Cascadelake-Server-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "qxl-vga", - "parent": "pci-qxl" + "name": "ivshmem-doorbell", + "parent": "ivshmem-common" }, { "name": "PIIX3-xen", @@ -22672,8 +22650,8 @@ "parent": "x86_64-cpu" }, { - "name": "kvm64-v1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pcie-root-port", + "parent": "pcie-root-port-base" }, { "name": "IDE", @@ -22684,8 +22662,8 @@ "parent": "x86_64-cpu" }, { - "name": "pcie-root-port", - "parent": "pcie-root-port-base" + "name": "kvm64-v1-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "mptsas1068", @@ -22696,17 +22674,13 @@ "parent": "scsi-disk-base" }, { - "name": "xenpv-machine", - "parent": "machine" + "name": "chardev-spicevmc", + "parent": "chardev-spice" }, { "name": "Snowridge-v1-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "chardev-spicevmc", - "parent": "chardev-spice" - }, { "name": "q35-pcihost", "parent": "pcie-host-bridge" @@ -22771,6 +22745,10 @@ "name": "vhost-user-blk", "parent": "virtio-device" }, + { + "name": "SandyBridge-v2-x86_64-cpu", + "parent": "x86_64-cpu" + }, { "name": "nvme-subsys", "parent": "device" @@ -22779,10 +22757,6 @@ "name": "Haswell-noTSX-IBRS-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "SandyBridge-v2-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "pc-q35-5.2-machine", "parent": "generic-pc-machine" @@ -24538,6 +24512,11 @@ "name": "smm-compat", "type": "bool" }, + { + "default-value": false, + "name": "x-not-migrate-acpi-index", + "type": "bool" + }, { "default-value": 2, "name": "s4_val", @@ -29178,13 +29157,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": false, - "name": "xenpv", - "numa-mem-supported": false, - "cpu-max": 1, - "deprecated": false - }, { "hotpluggable-cpus": true, "name": "pc-i440fx-6.2", @@ -29283,16 +29255,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": true, - "name": "xenfv-3.1", - "numa-mem-supported": true, - "default-cpu-type": "qemu64-x86_64-cpu", - "cpu-max": 128, - "deprecated": false, - "default-ram-id": "pc.ram", - "alias": "xenfv" - }, { "hotpluggable-cpus": true, "name": "pc-q35-2.4", @@ -29582,15 +29544,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": true, - "name": "xenfv-4.2", - "numa-mem-supported": true, - "default-cpu-type": "qemu64-x86_64-cpu", - "cpu-max": 128, - "deprecated": false, - "default-ram-id": "pc.ram" - }, { "hotpluggable-cpus": false, "name": "microvm", @@ -32035,41 +31988,6 @@ ], "option": "machine" }, - { - "parameters": [ - { - "name": "timeout", - "help": "Request timeout in seconds (default 0 = no timeout)", - "type": "number" - }, - { - "name": "initiator-name", - "help": "Initiator iqn name to use when connecting", - "type": "string" - }, - { - "name": "header-digest", - "help": "HeaderDigest setting. {CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}", - "type": "string" - }, - { - "name": "password-secret", - "help": "ID of the secret providing password for CHAP authentication to target", - "type": "string" - }, - { - "name": "password", - "help": "password for CHAP authentication to target", - "type": "string" - }, - { - "name": "user", - "help": "username for CHAP authentication to target", - "type": "string" - } - ], - "option": "iscsi" - }, { "parameters": [ { @@ -32203,6 +32121,41 @@ ], "option": "spice" }, + { + "parameters": [ + { + "name": "timeout", + "help": "Request timeout in seconds (default 0 = no timeout)", + "type": "number" + }, + { + "name": "initiator-name", + "help": "Initiator iqn name to use when connecting", + "type": "string" + }, + { + "name": "header-digest", + "help": "HeaderDigest setting. {CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}", + "type": "string" + }, + { + "name": "password-secret", + "help": "ID of the secret providing password for CHAP authentication to target", + "type": "string" + }, + { + "name": "password", + "help": "password for CHAP authentication to target", + "type": "string" + }, + { + "name": "user", + "help": "username for CHAP authentication to target", + "type": "string" + } + ], + "option": "iscsi" + }, { "parameters": [ ], @@ -37593,13 +37546,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": false, - "name": "xenpv", - "numa-mem-supported": false, - "cpu-max": 1, - "deprecated": false - }, { "hotpluggable-cpus": true, "name": "pc-i440fx-6.2", @@ -37698,16 +37644,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": true, - "name": "xenfv-3.1", - "numa-mem-supported": true, - "default-cpu-type": "qemu64-x86_64-cpu", - "cpu-max": 128, - "deprecated": false, - "default-ram-id": "pc.ram", - "alias": "xenfv" - }, { "hotpluggable-cpus": true, "name": "pc-q35-2.4", @@ -37997,15 +37933,6 @@ "deprecated": false, "default-ram-id": "pc.ram" }, - { - "hotpluggable-cpus": true, - "name": "xenfv-4.2", - "numa-mem-supported": true, - "default-cpu-type": "qemu64-x86_64-cpu", - "cpu-max": 128, - "deprecated": false, - "default-ram-id": "pc.ram" - }, { "hotpluggable-cpus": false, "name": "microvm", diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 87f9b4068d..8074c97ecd 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -242,10 +242,10 @@ <flag name='virtio-iommu-pci'/> <flag name='virtio-iommu.boot-bypass'/> <flag name='virtio-net.rss'/> - <version>6002092</version> + <version>7000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> - <package>v7.0.0-rc2</package> + <package>v7.0.0</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/> @@ -1617,7 +1617,6 @@ <machine type='kvm' name='pc-q35-5.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> - <machine type='kvm' name='xenpv' maxCpus='1'/> <machine type='kvm' name='pc-i440fx-6.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> @@ -1628,7 +1627,6 @@ <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-6.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> - <machine type='kvm' name='xenfv-3.1' alias='xenfv' hotplugCpus='yes' maxCpus='128' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='x-remote' maxCpus='1'/> @@ -1660,7 +1658,6 @@ <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-6.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> - <machine type='kvm' name='xenfv-4.2' hotplugCpus='yes' maxCpus='128' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='microvm.ram'/> <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> @@ -3723,7 +3720,6 @@ <machine type='tcg' name='pc-q35-5.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> - <machine type='tcg' name='xenpv' maxCpus='1'/> <machine type='tcg' name='pc-i440fx-6.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> @@ -3734,7 +3730,6 @@ <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-6.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> - <machine type='tcg' name='xenfv-3.1' alias='xenfv' hotplugCpus='yes' maxCpus='128' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='x-remote' maxCpus='1'/> @@ -3766,7 +3761,6 @@ <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-6.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> - <machine type='tcg' name='xenfv-4.2' hotplugCpus='yes' maxCpus='128' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='microvm.ram'/> <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/> -- 2.35.1

5 13

[PATCH 0/7] qemu: Fix broken qemu caps cache invalidation
by Peter Krempa 25 Apr '22

25 Apr '22

Bugs in the code meant to invalidate the qemu capabilities cache resulted in us always re-probing capabilities on startup of libvirtd/virtqemud. This got extremely annoying with the modern deployments using --timeout. Apart from issues in inserting the detected features, it also turns out that AMD boxes report data which changes based on which CPU the instruction happened to execute, so we need to mask that out. Peter Krempa (7): virCPUx86DataIsIdentical: Add debug output virCPUx86DataGetHost: Fix construction of the returned data virHostCPUGetCPUID: Add comment on how KVM_GET_SUPPORTED_CPUID works util: virhostcpu: Extract filtering of the returned data from virHostCPUGetCPUID virHostCPUGetCPUID: Fix possible allocation of huge amount of memory virHostCPUGetCPUID: Limit the buffer size ranges virHostCPUGetCPUIDFilterVolatile: Filter out topology data on AMD src/cpu/cpu_x86.c | 31 ++++++++++--- src/util/virhostcpu.c | 104 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 116 insertions(+), 19 deletions(-) -- 2.35.1

3 9

[PATCH 0/2] tests: Turn testQemuPrepareHostBackendChardevOne() into proper mock
by Michal Privoznik 25 Apr '22

25 Apr '22

*** BLURB HERE *** Michal Prívozník (2): qemu_processpriv: Fix #error message tests: Turn testQemuPrepareHostBackendChardevOne() into proper mock src/qemu/qemu_process.c | 13 +---- src/qemu/qemu_processpriv.h | 20 ++++++- tests/qemuhotplugmock.c | 11 ---- tests/qemuhotplugtest.c | 1 + tests/qemumonitorjsontest.c | 7 ++- tests/qemuxml2argvmock.c | 94 +++++++++++++++++++++++++++++++ tests/qemuxml2argvtest.c | 10 ++-- tests/testutilsqemu.c | 107 +----------------------------------- tests/testutilsqemu.h | 4 -- 9 files changed, 127 insertions(+), 140 deletions(-) -- 2.35.1

3 5

[PATCH 0/2] virsh: Fix bug in XML generator of cmdBlockcopy
by Peter Krempa 25 Apr '22

25 Apr '22

Peter Krempa (2): virsh: cmdBlockcopy: Add '--print-xml' flag virsh: cmdBlockcopy: Fix generator of block copy disk XML docs/manpages/virsh.rst | 4 +++- tools/virsh-domain.c | 24 +++++++++++++++++------- 2 files changed, 20 insertions(+), 8 deletions(-) -- 2.35.1

2 3

[libvirt RFC] qemu_saveimage: only use wrapper when using --bypass-cache
by Claudio Fontana 24 Apr '22

24 Apr '22

align the "save" with the "restore" code, by only using the wrapper when using --bypass-cache. This avoids a copy, resulting in better performance. Signed-off-by: Claudio Fontana <cfontana(a)suse.de> --- src/qemu/qemu_saveimage.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index 4fd4c5cfcd..5ea1b2fbcc 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -289,8 +289,10 @@ qemuSaveImageCreate(virQEMUDriver *driver, if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, fd) < 0) goto cleanup; - if (!(wrapperFd = virFileWrapperFdNew(&fd, path, wrapperFlags))) - goto cleanup; + if ((flags & VIR_DOMAIN_SAVE_BYPASS_CACHE)) { + if (!(wrapperFd = virFileWrapperFdNew(&fd, path, wrapperFlags))) + goto cleanup; + } if (virQEMUSaveDataWrite(data, fd, path) < 0) goto cleanup; -- 2.34.1

3 15

[PATCH 00/11] qemu: Fix crash when attempting to use authentication for HTTP backed disks
by Peter Krempa 22 Apr '22

22 Apr '22

The crash is fixed by properly instantiating the auth object. Also this series cleans up some problems noticed along the way. Peter Krempa (11): conf: schema: Fix alignment in 'diskSourceNetworkProtocolHTTPS' schema definition qemuDomainValidateStorageSource: Reorganize encryption config validation qemuDomainValidateStorageSource: Add validation of 'encryption' support qemuBlockStorageSourceGetRBDProps: Simplify handling of encryption format virDomainDiskDefValidateSourceChainOne: Reject authentication for protocols which don't support it qemuDomainStorageSourceHasAuth: Don't decide based on protocol qemu: domain: Inline qemuDomainDiskHasEncryptionSecret qemu: domain: Inline qemuDomainStorageSourceHasAuth conf: schemas: Split out definition for 'ftp' protocol conf: schema: Allow authentication for FTP(S) and HTTP(S) disks tests: qemuxml2*: Add testing of authenticated http/ftp disks src/conf/domain_validate.c | 34 ++++++ src/conf/schemas/domaincommon.rng | 35 +++++- src/qemu/qemu_block.c | 10 +- src/qemu/qemu_domain.c | 103 ++++++------------ src/qemu/qemu_domain.h | 3 - .../disk-cdrom-network.x86_64-4.1.0.args | 6 +- .../disk-cdrom-network.x86_64-latest.args | 6 +- tests/qemuxml2argvdata/disk-cdrom-network.xml | 6 + .../disk-encryption-wrong.x86_64-latest.err | 1 + .../disk-encryption-wrong.xml | 37 +++++++ ...-network-rbd-encryption.x86_64-latest.args | 2 +- .../disk-network-rbd-encryption.xml | 2 +- tests/qemuxml2argvtest.c | 1 + .../disk-cdrom-network.x86_64-latest.xml | 72 ++++++++++++ ...k-network-rbd-encryption.x86_64-latest.xml | 2 +- tests/qemuxml2xmltest.c | 1 + 16 files changed, 233 insertions(+), 88 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-encryption-wrong.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/disk-encryption-wrong.xml create mode 100644 tests/qemuxml2xmloutdata/disk-cdrom-network.x86_64-latest.xml -- 2.35.1

2 13

[libvirt RFC v2 00/11] multifd save prototype
by Claudio Fontana 22 Apr '22

22 Apr '22

This is the multifd save prototype in its first semi-functional state, (save direction only), with surely a lot of rough edges as I am not very familiar with the libvirt code base yet or its rules. It seems to work for me, but take a look if this is something realistic to pursue further, whether this could be acceptable for libvirt. Claudio Fontana (11): libvirt: introduce virDomainSaveParametersFlags public API remote: Add RPC support for the virDomainSaveParametersFlags API qemu: add a stub for virDomainSaveParametersFlags API qemu: initial implementation for the virDomainSaveParametersFlags API iohelper: move runIO function to a separate module runio: add arguments to extend use beyond just stdin and stdout multifd-helper: new helper for parallel saves qemu: wire up saveimage code with the multifd helper qemu: implement qemuMigrationSrcToFilesMultiFd tools: add parallel parameter to virsh save command qemu: add migration parameter multifd-compression docs/manpages/virsh.rst | 23 ++- include/libvirt/libvirt-domain.h | 9 + src/driver-hypervisor.h | 7 + src/libvirt-domain.c | 51 ++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 5 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 66 +++++++- src/qemu/qemu_migration.c | 135 ++++++++++----- src/qemu/qemu_migration.h | 7 + src/qemu/qemu_migration_params.c | 71 +++++--- src/qemu/qemu_migration_params.h | 15 ++ src/qemu/qemu_saveimage.c | 281 ++++++++++++++++++++++++++----- src/qemu/qemu_saveimage.h | 9 + src/qemu/qemu_snapshot.c | 2 +- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 17 +- src/remote_protocol-structs | 9 + src/util/iohelper.c | 180 +------------------- src/util/meson.build | 15 ++ src/util/multifd-helper.c | 205 ++++++++++++++++++++++ src/util/runio.c | 214 +++++++++++++++++++++++ src/util/runio.h | 38 +++++ src/util/virthread.c | 5 + src/util/virthread.h | 1 + tools/virsh-domain.c | 49 +++++- 27 files changed, 1108 insertions(+), 312 deletions(-) create mode 100644 src/util/multifd-helper.c create mode 100644 src/util/runio.c create mode 100644 src/util/runio.h -- 2.34.1

1 11

[PATCH v3 00/30] Add 'version' to other exported types
by Victor Toso 22 Apr '22

22 Apr '22

Hi, Here it comes, version 3. v1: https://listman.redhat.com/archives/libvir-list/2022-April/229881.html v2: https://listman.redhat.com/archives/libvir-list/2022-April/230097.html In this version, I have: - dropped the changes to .sym files (Peter, Daniel) - improved commit log: 'doc' -> 'docstring' (and more) (Peter) - fixed all versions prior to v1.0.0 (Peter, Andrea) - created a validate script, to confirm all is good. Not expecting it to be merged, just added to help review that the outcome is acceptable. - lots of fixes found by the script above. - dropped the concept of generated/manual in git shortlog of the series. - added an allow list for functions where there is a mismatch between version in the sym file and the git tag they were introduced (Peter) I hope that it'll be useful to other generators, besides: https://gitlab.com/libvirt/libvirt-go-module/-/merge_requests/7 Gitlab run of this series (fails with codestyle of do-not-commit script). https://gitlab.com/victortoso/libvirt/-/pipelines/520901763 Have a wonderful day, Victor Victor Toso (30): syntax-check: sc_prohibit_nonreentrant: skip comments syntax-check: prohibit_virXXXFree: skip strings docstring: Fix generated documentation of virConnectListAllNodeDeviceFlags docstring: variable: Move docstring from source to header file docstring: enums: libvirt: Add 'Since version' metadata docstring: enums: qemu: Add 'Since version' metadata docstring: enums: admin: Add 'Since version' metadata docstring: macros: libvirt: Add 'Since version' metadata docstring: macros: admin: Add 'Since version' metadata docstring: typedef: libvirt:: Add 'Since version' metadata docstring: typedef: qemu:: Add 'Since version' metadata docstring: typedef: admin:: Add 'Since version' metadata docstring: function: libvirt: Add 'Since version' metadata docstring: function: qemu: Add 'Since version' metadata docstring: function: lxc: Add 'Since version' metadata docstring: function: admin: Add 'Since version' metadata docstring: libvirt-common: Add 'Since version' metadata docstring: Fix generated documentation of virStorageVolInfoFlags docstring: Fix and append Since to virConnectListAllStoragePoolsFlags docstring: Fix and append Since to virDomainDeviceModifyFlags docstring: Fix and append Since to virDomainMemoryModFlags docstring: Fix and append Since to virDomainVcpuFlags scripts: apibuild: parse 'Since' version for enums scripts: apibuild: fix parsing block comments from typedef enum scripts: apibuild: parse 'Since' for typedefs scripts: apibuild: parse 'Since' for macros scripts: apibuild: parse 'Since' for functions scripts: apibuild: factor out comment cleaning scripts: apibuild: add parsing variable's comments do-not-commit: script to validate output build-aux/syntax-check.mk | 4 +- include/libvirt/libvirt-admin.h | 95 +- include/libvirt/libvirt-common.h.in | 54 +- include/libvirt/libvirt-domain-checkpoint.h | 62 +- include/libvirt/libvirt-domain-snapshot.h | 100 +- include/libvirt/libvirt-domain.h | 2665 +++++++++++++++---- include/libvirt/libvirt-event.h | 35 +- include/libvirt/libvirt-host.h | 320 ++- include/libvirt/libvirt-interface.h | 33 +- include/libvirt/libvirt-network.h | 195 +- include/libvirt/libvirt-nodedev.h | 100 +- include/libvirt/libvirt-nwfilter.h | 29 +- include/libvirt/libvirt-qemu.h | 39 +- include/libvirt/libvirt-secret.h | 81 +- include/libvirt/libvirt-storage.h | 316 ++- include/libvirt/libvirt-stream.h | 48 +- include/libvirt/virterror.h | 428 +-- scripts/apibuild.py | 212 +- scripts/version-quest.py | 190 ++ src/admin/libvirt-admin.c | 93 + src/libvirt-domain-checkpoint.c | 36 + src/libvirt-domain-snapshot.c | 63 + src/libvirt-domain.c | 557 +++- src/libvirt-host.c | 102 + src/libvirt-interface.c | 63 + src/libvirt-lxc.c | 12 + src/libvirt-network.c | 135 + src/libvirt-nodedev.c | 81 + src/libvirt-nwfilter.c | 72 + src/libvirt-qemu.c | 18 + src/libvirt-secret.c | 60 + src/libvirt-storage.c | 171 ++ src/libvirt-stream.c | 51 + src/libvirt.c | 29 +- src/util/virerror.c | 45 + src/util/virevent.c | 27 + src/util/virtypedparam-public.c | 57 + 37 files changed, 5533 insertions(+), 1145 deletions(-) create mode 100644 scripts/version-quest.py -- 2.35.1

3 81

[PATCH] nwfilter_driver: Make reload fail if racing with stateCleanup()
by Michal Privoznik 22 Apr '22

22 Apr '22

When one thread is trying to reload NWFilter driver (by running nwfilterStateReload()) but there's another thread that's concurrently running nwfilterStateCleanup() a crash may occur. This is despite nwfilterStateReload() checking for driver != NULL, because is done so without @driverMutex held. A typical TOCTOU. Fortunately, the mutex is always initialized, so the mutex can be acquired at all times and @driver can be checked with the lock held. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2075837 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/nwfilter/nwfilter_driver.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index b66ba22737..d028efafbe 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -309,6 +309,8 @@ nwfilterStateInitialize(bool privileged, static int nwfilterStateReload(void) { + VIR_LOCK_GUARD lock = virLockGuardLock(&driverMutex); + if (!driver) return -1; @@ -319,15 +321,13 @@ nwfilterStateReload(void) /* shut down all threads -- they will be restarted if necessary */ virNWFilterLearnThreadsTerminate(true); - VIR_WITH_MUTEX_LOCK_GUARD(&driverMutex) { - VIR_WITH_MUTEX_LOCK_GUARD(&driver->updateLock) { - virNWFilterObjListLoadAllConfigs(driver->nwfilters, driver->configDir); - } - - - virNWFilterBuildAll(driver, false); + VIR_WITH_MUTEX_LOCK_GUARD(&driver->updateLock) { + virNWFilterObjListLoadAllConfigs(driver->nwfilters, driver->configDir); } + + virNWFilterBuildAll(driver, false); + return 0; } -- 2.35.1

2 1

[libvirt PATCH 0/2] include: Fix vertical spacing
by Andrea Bolognani 22 Apr '22

22 Apr '22

Andrea Bolognani (2): include: Fix vertical spacing inside comments include: Fix vertical spacing between comments and symbols include/libvirt/libvirt-common.h.in | 1 - include/libvirt/libvirt-domain-checkpoint.h | 6 - include/libvirt/libvirt-domain-snapshot.h | 7 - include/libvirt/libvirt-domain.h | 154 -------------------- include/libvirt/libvirt-event.h | 1 - include/libvirt/libvirt-host.h | 33 ----- include/libvirt/libvirt-interface.h | 5 - include/libvirt/libvirt-network.h | 17 --- include/libvirt/libvirt-nodedev.h | 7 - include/libvirt/libvirt-nwfilter.h | 6 - include/libvirt/libvirt-secret.h | 7 - include/libvirt/libvirt-storage.h | 25 ---- include/libvirt/libvirt-stream.h | 3 - include/libvirt/virterror.h | 6 - 14 files changed, 278 deletions(-) -- 2.35.1

2 3

[libvirt] [PATCH RESEND v2 0/4] re-introduce <acpi-hotplug-bridge>
by Ani Sinha 22 Apr '22

22 Apr '22

Change log: v2: rebased the patchset. Laine's response is appended at the end. I am re-introducing the patchset for <acpi-hotplug-bridge> which got reverted here few months back: https://www.spinics.net/linux/fedora/libvir/msg224089.html The reason for the reversal was that there seemed to be some instability/issues around the use of the qemu commandline which this patchset tries to support. In particular, some guest operating systems did not like the way QEMU was trying to disable native hotplug on pcie root ports. Subsequently, in QEMU 6.2, we have changed our mechanism using which we disable native hotplug. As I understand, we do not have any reported issues so far in 6.2 around this area. QEMU will enter a soft feature freeze in the first week of march in prep for 7.0 release. Libvirt is also entering a new release cycle phaze. Hence, I am introducing this patchset early enough in the release cycles so that if we do see any issues on the qemu side during the rc0, rc1 cycles and if reversal of this patchset is again required, it can be done in time before the next libvirt release end of March. All the patches in this series had been previously reviewed. Some subsequent fixes were made after my initial patches were pushed. I have squashed all those fixes and consolidated them into four patches. I have also updated the documentation to reflect the new changes from the QEMU side and rebased my changes fixing the tests in the process. What changed in QEMU post version 6.1 ? ========================================= We have made basically two major changes in QEMU. First is this change: (1) commit 211afe5c69b597acf85fdd577eb497f5be1ffbd8 Author: Julia Suvorova <jusual(a)redhat.com> Date: Fri Nov 12 06:08:56 2021 -0500 hw/i386/acpi-build: Deny control on PCIe Native Hot-plug in _OSC There are two ways to enable ACPI PCI Hot-plug: * Disable the Hot-plug Capable bit on PCIe slots. This was the first approach which led to regression [1-2], as I/O space for a port is allocated only when it is hot-pluggable, which is determined by HPC bit. * Leave the HPC bit on and disable PCIe Native Hot-plug in _OSC method. This removes the (future) ability of hot-plugging switches with PCIe Native hotplug since ACPI PCI Hot-plug only works with cold-plugged bridges. If the user wants to explicitely use this feature, they can disable ACPI PCI Hot-plug with: --global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off Change the bit in _OSC method so that the OS selects ACPI PCI Hot-plug instead of PCIe Native. [1] https://gitlab.com/qemu-project/qemu/-/issues/641 [2] https://bugzilla.redhat.com/show_bug.cgi?id=2006409 Signed-off-by: Julia Suvorova <jusual(a)redhat.com> Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> Message-Id: <20211112110857.3116853-5-imammedo(a)redhat.com> Reviewed-by: Ani Sinha <ani(a)anisinha.ca> Reviewed-by: Michael S. Tsirkin <mst(a)redhat.com> Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> The patch description says it all. Instead of masking out the HPC bit in pcie slots, we keep them turned on. Instead, we do not advertize native hotplug capability for PCIE using _OSC control method. See section 6.2.11 in ACPI spec 6.2. At the same time, we turn on ACPI hotplug for these slots so now the guest OS can select ACPI hotplug instead. The second change is introduction of a property with which we keep the existing behavior for pc-q35-6.1 machines. This means HPC bit is masked and ACPI hotplug is enabled by default for pcie root ports. The QEMU commit is: (2) commit c318bef76206c2ecb6016e8e68c4ac6ff9a4c8cb Author: Julia Suvorova <jusual(a)redhat.com> Date: Fri Nov 12 06:08:54 2021 -0500 hw/acpi/ich9: Add compat prop to keep HPC bit set for 6.1 machine type To solve issues [1-2] the Hot Plug Capable bit in PCIe Slots will be turned on, while the switch to ACPI Hot-plug will be done in the DSDT table. Introducing 'x-keep-native-hpc' property disables the HPC bit only in 6.1 and as a result keeps the forced 'reserve-io' on pcie-root-ports in 6.1 too. [1] https://gitlab.com/qemu-project/qemu/-/issues/641 [2] https://bugzilla.redhat.com/show_bug.cgi?id=2006409 Signed-off-by: Julia Suvorova <jusual(a)redhat.com> Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> Message-Id: <20211112110857.3116853-3-imammedo(a)redhat.com> Reviewed-by: Michael S. Tsirkin <mst(a)redhat.com> Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> Lastly, as a related side note, because from QEMU 6.2 onwards, we do not mask out HPC bit in PCIE, the work done by this patch is no longer needed: (3) commit e2a6290aab578b2170c1f5909fa556385dc0d820 Author: Marcel Apfelbaum <marcel.apfelbaum(a)gmail.com> Date: Mon Aug 2 12:00:57 2021 +0300 hw/pcie-root-port: Fix hotplug for PCI devices requiring IO Q35 has now ACPI hotplug enabled by default for PCI(e) devices. As opposed to native PCIe hotplug, guests like Fedora 34 will not assign IO range to pcie-root-ports not supporting native hotplug, resulting into a regression. Reproduce by: qemu-bin -M q35 -device pcie-root-port,id=p1 -monitor stdio device_add e1000,bus=p1 In the Guest OS the respective pcie-root-port will have the IO range disabled. Fix it by setting the "reserve-io" hint capability of the pcie-root-ports so the firmware will allocate the IO range instead. Acked-by: Igor Mammedov <imammedo(a)redhat.com> Signed-off-by: Marcel Apfelbaum <marcel(a)redhat.com> Message-Id: <20210802090057.1709775-1-marcel(a)redhat.com> Reviewed-by: Michael S. Tsirkin <mst(a)redhat.com> Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> This is what commit (2) alludes to. In pc-q35-6.1 machines we do need patch (3) since we mask out HPC bit from pcie ports. I know this is convoluted mess. In fairness I am trying all I can in my spare time to help from the QEMU side. I am determined to see this patchset through into libvirt. Thanks Laine's comments ... My memory isn't completely clear, but I think there was also the issue that the option claims to enable ACPI hotplug when set to on, but instead what it actually does (in the Q35 case at least) is to enable native PCI hotplug when set to off (without actually disabling ACPI hotplug) and disable native PCI hotplug when set to on, or something like that. This ends up leaving it up to the guest OS to decide which type of hotplug to use, meaning its decision could override what's in the libvirt config, thus confusing everyone. Again, I probably have the details mixed up, but it was something like this. I asked mst about this this morning, and he suggested something that you've already done - Cc'ing the series to qemu-devel and the relevant maintainers so we can have a discussion with all involved parties about their opinions on whether we really should expose this existing option in libvirt, or if we should instead have two new options that are more orthogonal about enabling/disabling the two types of hotplug, so that libvirt config can more accurately represent what is being presented to the guest rather than a "best guess" of what we think the guest is going to do with what is presented. (Michael did also say that, with the current flurry of bug reports for the QEMU rc's, this discusion may not happen until closer to release when the bug reports die down. I know this doesn't mesh with your desire to "push now to allow for testing" (which in general would be a good thing if we were certain that we wanted the option like this and were just expecting some minor bugs that could be fixed), but my opinion is that 1) it's possible for anyone interested to test the functionality using <qemu:commandline>, and 2) we should avoid turning libvirt git into a revolving door of experiments. The only practical difference between using <qemu:commandline> and having a dedicated option is that the use of <qemu:commandline> causes the domain to be tainted, and the XML is a bit more complicated. But since the people we're talking about here will already have built their own libvirt binaries, the tainted status of any guests is irrelevant and the extra complexity of using <qemu:commandline> is probably trivial to them :-). Ani Sinha (4): qemu: capablities: detect acpi-pci-hotplug-with-bridge-support conf: introduce support for acpi-bridge-hotplug feature qemu: command: add support for acpi-bridge-hotplug feature NEWS: document new acpi pci hotplug config option NEWS.rst | 8 ++ docs/formatdomain.rst | 32 +++++++ docs/schemas/domaincommon.rng | 15 ++++ src/conf/domain_conf.c | 89 ++++++++++++++++++- src/conf/domain_conf.h | 9 ++ src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 19 ++++ src/qemu/qemu_validate.c | 42 +++++++++ .../caps_6.1.0.x86_64.xml | 1 + .../caps_6.2.0.x86_64.xml | 1 + .../caps_7.0.0.x86_64.xml | 1 + ...-hotplug-bridge-disable.aarch64-latest.err | 1 + .../aarch64-acpi-hotplug-bridge-disable.xml | 13 +++ ...-hotplug-bridge-disable.x86_64-latest.args | 35 ++++++++ .../pc-i440fx-acpi-hotplug-bridge-disable.xml | 36 ++++++++ .../pc-i440fx-acpi-hotplug-bridge-enable.xml | 36 ++++++++ ...pi-hotplug-bridge-disable.x86_64-6.0.0.err | 1 + ...-hotplug-bridge-disable.x86_64-latest.args | 38 ++++++++ .../q35-acpi-hotplug-bridge-disable.xml | 53 +++++++++++ .../q35-acpi-hotplug-bridge-enable.xml | 53 +++++++++++ tests/qemuxml2argvtest.c | 7 ++ ...i-hotplug-bridge-disable.x86_64-latest.xml | 1 + ...pi-hotplug-bridge-enable.x86_64-latest.xml | 1 + ...i-hotplug-bridge-disable.x86_64-latest.xml | 1 + ...pi-hotplug-bridge-enable.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 4 + 27 files changed, 504 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.aarch64-latest.err create mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.xml create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.xml create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.xml create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.x86_64-6.0.0.err create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.xml create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.xml create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64-latest.xml create mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-latest.xml create mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.xml create mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.xml -- 2.25.1

2 12

[libvirt PATCH v3 0/2] iohelper refactoring of io copy function
by Claudio Fontana 21 Apr '22

21 Apr '22

changes v1 -> v2: * fix missing write changes v2 -> v3: * move error reporting back into the copy function * split into two patches, one introducing the IO parameters struct, and another introducing the new function. Claudio Fontana (2): iohelper: introduce new struct to carry copy operation parameters iohelper: refactor copy operation as a separate function src/util/iohelper.c | 170 ++++++++++++++++++++++++++------------------ 1 file changed, 100 insertions(+), 70 deletions(-) -- 2.34.1

1 2

[libvirt PATCH v2] iohelper: some refactoring
by Claudio Fontana 21 Apr '22

21 Apr '22

while doing research with alternative implementations of runIO, it seemed necessary to do some refactoring, in order to separate parameter setting from the actual copy, so that alternative copy methods can be researched and hopefully eventually implemented. No functional changes are expected. Signed-off-by: Claudio Fontana <cfontana(a)suse.de> --- src/util/iohelper.c | 197 +++++++++++++++++++++++++++----------------- 1 file changed, 122 insertions(+), 75 deletions(-) changes v1 -> v2: * fix missing write diff --git a/src/util/iohelper.c b/src/util/iohelper.c index 2c91bf4f93..ca569b5ae9 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -45,21 +45,38 @@ # define O_DIRECT 0 #endif -static int -runIO(const char *path, int fd, int oflags) +struct runIOParams { + bool isBlockDev; + bool isDirect; + bool isWrite; + int fdin; + const char *fdinname; + int fdout; + const char *fdoutname; +}; + +/* runIOCopy: execute the IO copy based on the passed parameters */ +/** + * runIOCopy: + * @p: the IO parameters + * + * Execute the copy based on the passed parameters. + * + * Returns: size transfered, or < 0 on error. + * Errors: -1 = read/write error + * -2 = read error + * -3 = write error + * -4 = truncate error + */ + +static off_t +runIOCopy(const struct runIOParams p) { g_autofree void *base = NULL; /* Location to be freed */ char *buf = NULL; /* Aligned location within base */ size_t buflen = 1024*1024; intptr_t alignMask = 64*1024 - 1; - int ret = -1; - int fdin, fdout; - const char *fdinname, *fdoutname; - unsigned long long total = 0; - bool direct = O_DIRECT && ((oflags & O_DIRECT) != 0); - off_t end = 0; - struct stat sb; - bool isBlockDev = false; + off_t total = 0; #if WITH_POSIX_MEMALIGN if (posix_memalign(&base, alignMask + 1, buflen)) @@ -71,50 +88,6 @@ runIO(const char *path, int fd, int oflags) buf = (char *) (((intptr_t) base + alignMask) & ~alignMask); #endif - if (fstat(fd, &sb) < 0) { - virReportSystemError(errno, - _("Unable to access file descriptor %d path %s"), - fd, path); - goto cleanup; - } - isBlockDev = S_ISBLK(sb.st_mode); - - switch (oflags & O_ACCMODE) { - case O_RDONLY: - fdin = fd; - fdinname = path; - fdout = STDOUT_FILENO; - fdoutname = "stdout"; - /* To make the implementation simpler, we give up on any - * attempt to use O_DIRECT in a non-trivial manner. */ - if (!isBlockDev && direct && ((end = lseek(fd, 0, SEEK_CUR)) != 0)) { - virReportSystemError(end < 0 ? errno : EINVAL, "%s", - _("O_DIRECT read needs entire seekable file")); - goto cleanup; - } - break; - case O_WRONLY: - fdin = STDIN_FILENO; - fdinname = "stdin"; - fdout = fd; - fdoutname = path; - /* To make the implementation simpler, we give up on any - * attempt to use O_DIRECT in a non-trivial manner. */ - if (!isBlockDev && direct && (end = lseek(fd, 0, SEEK_END)) != 0) { - virReportSystemError(end < 0 ? errno : EINVAL, "%s", - _("O_DIRECT write needs empty seekable file")); - goto cleanup; - } - break; - - case O_RDWR: - default: - virReportSystemError(EINVAL, - _("Unable to process file with flags %d"), - (oflags & O_ACCMODE)); - goto cleanup; - } - while (1) { ssize_t got; @@ -124,53 +97,127 @@ runIO(const char *path, int fd, int oflags) * writes will be aligned. * In other cases using saferead reduces number of syscalls. */ - if (fdin == fd && direct) { - if ((got = read(fdin, buf, buflen)) < 0 && + if (!p.isWrite && p.isDirect) { + if ((got = read(p.fdin, buf, buflen)) < 0 && errno == EINTR) continue; } else { - got = saferead(fdin, buf, buflen); - } - - if (got < 0) { - virReportSystemError(errno, _("Unable to read %s"), fdinname); - goto cleanup; + got = saferead(p.fdin, buf, buflen); } + if (got < 0) + return -2; if (got == 0) break; total += got; /* handle last write size align in direct case */ - if (got < buflen && direct && fdout == fd) { + if (got < buflen && p.isDirect && p.isWrite) { ssize_t aligned_got = (got + alignMask) & ~alignMask; memset(buf + got, 0, aligned_got - got); - if (safewrite(fdout, buf, aligned_got) < 0) { - virReportSystemError(errno, _("Unable to write %s"), fdoutname); - goto cleanup; + if (safewrite(p.fdout, buf, aligned_got) < 0) { + return -3; } - - if (!isBlockDev && ftruncate(fd, total) < 0) { - virReportSystemError(errno, _("Unable to truncate %s"), fdoutname); - goto cleanup; + if (!p.isBlockDev && ftruncate(p.fdout, total) < 0) { + return -4; } - break; } - if (safewrite(fdout, buf, got) < 0) { - virReportSystemError(errno, _("Unable to write %s"), fdoutname); + if (safewrite(p.fdout, buf, got) < 0) { + return -3; + } + } + return total; +} + +static int +runIO(const char *path, int fd, int oflags) +{ + int ret = -1; + off_t total = 0; + struct stat sb; + struct runIOParams p; + + if (fstat(fd, &sb) < 0) { + virReportSystemError(errno, + _("Unable to access file descriptor %d path %s"), + fd, path); + goto cleanup; + } + p.isBlockDev = S_ISBLK(sb.st_mode); + p.isDirect = O_DIRECT && (oflags & O_DIRECT); + + switch (oflags & O_ACCMODE) { + case O_RDONLY: + p.isWrite = false; + p.fdin = fd; + p.fdinname = path; + p.fdout = STDOUT_FILENO; + p.fdoutname = "stdout"; + break; + case O_WRONLY: + p.isWrite = true; + p.fdin = STDIN_FILENO; + p.fdinname = "stdin"; + p.fdout = fd; + p.fdoutname = path; + break; + case O_RDWR: + default: + virReportSystemError(EINVAL, + _("Unable to process file with flags %d"), + (oflags & O_ACCMODE)); + goto cleanup; + } + /* To make the implementation simpler, we give up on any + * attempt to use O_DIRECT in a non-trivial manner. */ + if (!p.isBlockDev && p.isDirect) { + off_t end; + if (p.isWrite) { + if ((end = lseek(fd, 0, SEEK_END)) != 0) { + virReportSystemError(end < 0 ? errno : EINVAL, "%s", + _("O_DIRECT write needs empty seekable file")); + goto cleanup; + } + } else if ((end = lseek(fd, 0, SEEK_CUR)) != 0) { + virReportSystemError(end < 0 ? errno : EINVAL, "%s", + _("O_DIRECT read needs entire seekable file")); goto cleanup; } } + total = runIOCopy(p); + + if (total < 0) { + switch (total) { + case -1: + virReportSystemError(errno, _("Unable to move data from %s to %s"), + p.fdinname, p.fdoutname); + break; + case -2: + virReportSystemError(errno, _("Unable to read %s"), p.fdinname); + break; + case -3: + virReportSystemError(errno, _("Unable to write %s"), p.fdoutname); + break; + case -4: + virReportSystemError(errno, _("Unable to truncate %s"), p.fdoutname); + break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown runIOCopy error %ld"), total); + break; + } + goto cleanup; + } + /* Ensure all data is written */ - if (virFileDataSync(fdout) < 0) { + if (virFileDataSync(p.fdout) < 0) { if (errno != EINVAL && errno != EROFS) { /* fdatasync() may fail on some special FDs, e.g. pipes */ - virReportSystemError(errno, _("unable to fsync %s"), fdoutname); + virReportSystemError(errno, _("unable to fsync %s"), p.fdoutname); goto cleanup; } } -- 2.35.1

2 3

[RFC PATCH v1 0/5] Add virDomainGetSevAttestationReport API
by Tyler Fanelli 21 Apr '22

21 Apr '22

This an RFC discussing a new API, virDomainGetSevAttestationReport (along with a virsh command "domgetsevreport"), with initial QEMU support via the "query-sev-attestation-report" QAPI mechanism. "query-sev-attestation-report" is supplied a base64-encoded 16 byte "mnonce" string as input, with a purpose of being embedded into the attestation report to provide protection. My main point of concern is the design/communication of the virTypedParameterPtr exchanged between the client and libvirtd and how they interact together, as I have seen no other API follow the method I used. Namely, the same virTypedParameterPtr is used for both input _AND_ output. The same virTypedParameterPtr containing the original mnonce string inputted to the API is also used to contain the attestation report upon being returned from the API. This contrasts with much of the APIs I've noticed, which use a virTypedParameterPtr for either input or output, but not both. This patch is not final, as I still would like some human-readable outputting and storage of the attestation report. Looking for thoughts on the design of this API, as well as suggested improvements. Tyler Fanelli (5): libvirt: Introduce virDomainGetSevAttestationReport public API remote: add RPC support for the virDomainGetSevAttestationReport API qemu_capabilities: Introduce QEMU_CAPS_SEV_GET_ATTESTATION_REPORT qemu: Implement the virDomainGetSevAttestationReport API tools: add domgetsevreport virsh command docs/manpages/virsh.rst | 18 ++++ include/libvirt/libvirt-domain.h | 22 +++++ src/driver-hypervisor.h | 7 ++ src/libvirt-domain.c | 63 ++++++++++++++ src/libvirt_public.syms | 4 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 86 +++++++++++++++++++ src/qemu/qemu_monitor.c | 11 +++ src/qemu/qemu_monitor.h | 5 ++ src/qemu/qemu_monitor_json.c | 40 +++++++++ src/qemu/qemu_monitor_json.h | 5 ++ src/remote/remote_daemon_dispatch.c | 44 ++++++++++ src/remote/remote_driver.c | 55 ++++++++++++ src/remote/remote_protocol.x | 21 ++++- src/remote_protocol-structs | 12 +++ .../caps_6.1.0.x86_64.xml | 1 + .../caps_6.2.0.x86_64.xml | 1 + .../caps_7.0.0.x86_64.xml | 1 + tools/virsh-domain.c | 68 +++++++++++++++ 20 files changed, 466 insertions(+), 1 deletion(-) -- 2.34.1

3 12

[PATCH RESEND] qemu: disarm fake reboot flag on reset
by Nikolay Shirokovskiy 21 Apr '22

21 Apr '22

From: Maxim Nestratov <mnestratov(a)virtuozzo.com> This is a quite an old (created at 2016) patch fixing an issue for at that time contemporary Fedora 23. virsh reboot returns success (yet after hanging for a while), VM is rebooted sucessfully too but then shutdown from inside guest causes reboot and not shutdown. VM has agent installed. So virsh reboot first tries to reboot VM thru the agent. The agent calls 'shutdown -r' command. Typically it returns instantly but on this distro for some reason it takes time. I did not investigate the cause but the command waits in dbus client code, probably waits for reply. The libvirt waits 60s for agent command to execute and then errors out. Next reboot API falls back to ACPI shutdown which returns successfully thus the reboot command return success too. Yet shutdown command in guest eventually successfull and guest is truly rebooted. So libvirt does not receive SHUTDOWN event and fake reboot flag which is armed on fallback path stays armed. Thus next shutdown from guest leads to reboot. The issue has 100% repro on Fedora 23. On modern distros I can't reproduce it at all. Shutdown command is asynchronous and returns immediately even if I start some service that ignores TERM signal and thus shutdown procedure waits for 90s (if I not mistaken) before sending KILL. Yet I guess it is nice to have this patch to be more robust. Signed-off-by: Nikolay Shirokovskiy <nikolay.shirokovskiy(a)openvz.org> --- src/qemu/qemu_process.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f63fc3389d..d81ed9391a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -435,6 +435,7 @@ qemuProcessHandleReset(qemuMonitor *mon G_GNUC_UNUSED, if (priv->agent) qemuAgentNotifyEvent(priv->agent, QEMU_AGENT_EVENT_RESET); + qemuDomainSetFakeReboot(vm, false); qemuDomainSaveStatus(vm); unlock: -- 2.35.1

2 1