- Devel - libvirt List Archives

[PATCH] Make virConnectOpenInternal() report error in all cases
by Ani Sinha 06 Jan '22

06 Jan '22

virConnectOpenInternal() does not report error in all failure scenarios, except in some specific cases. This inconsistent behavior forces the caller of this function report a generic error for all failure modes which then hides specific error scenarios. This change makes virConnectOpenInternal() report failure in all cases so that it can generate specific errors based on the type of failure encountered. The reporiting of the errors can be made more fine grained in subsequent changes. Signed-off-by: Ani Sinha <ani(a)anisinha.ca> --- src/libvirt.c | 24 ++++++++++++++++-------- src/libxl/libxl_migration.c | 3 --- src/qemu/qemu_migration.c | 3 --- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 45315f484c..53ceee1359 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -893,8 +893,12 @@ virConnectOpenInternal(const char *name, bool embed = false; ret = virGetConnect(); - if (ret == NULL) + if (ret == NULL) { + virReportError(VIR_ERR_INVALID_CONN, + _("Failed to create connection object for URI %s"), + NULLSTR(name)); return NULL; + } if (virConfLoadConfig(&conf, "libvirt.conf") < 0) goto failed; @@ -974,7 +978,7 @@ virConnectOpenInternal(const char *name, virReportError(VIR_ERR_NO_CONNECT, _("URI '%s' does not include a driver name"), name); - goto failed; + goto failed_no_report; } if (virConnectCheckURIMissingSlash(uristr, @@ -992,7 +996,7 @@ virConnectOpenInternal(const char *name, virReportError(VIR_ERR_NO_CONNECT, _("URI scheme '%s' for embedded driver is not valid"), ret->uri->scheme); - goto failed; + goto failed_no_report; } root = virURIGetParam(ret->uri, "root"); @@ -1002,7 +1006,7 @@ virConnectOpenInternal(const char *name, if (!g_path_is_absolute(root)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("root path must be absolute")); - goto failed; + goto failed_no_report; } if (virEventRequireImpl() < 0) @@ -1062,7 +1066,7 @@ virConnectOpenInternal(const char *name, __FILE__, __FUNCTION__, __LINE__, _("libvirt was built without the '%s' driver"), ret->uri->scheme); - goto failed; + goto failed_no_report; } VIR_DEBUG("trying driver %zu (%s) ...", @@ -1112,13 +1116,13 @@ virConnectOpenInternal(const char *name, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Driver %s cannot be used in embedded mode"), virConnectDriverTab[i]->hypervisorDriver->name); - goto failed; + goto failed_no_report; } /* before starting the new connection, check if the driver only works * with a server, and so return an error if the server is missing */ if (virConnectDriverTab[i]->remoteOnly && ret->uri && !ret->uri->server) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("URI is missing the server part")); - goto failed; + goto failed_no_report; } ret->driver = virConnectDriverTab[i]->hypervisorDriver; @@ -1155,7 +1159,7 @@ virConnectOpenInternal(const char *name, if (!ret->driver) { /* If we reach here, then all drivers declined the connection. */ virReportError(VIR_ERR_NO_CONNECT, "%s", NULLSTR(name)); - goto failed; + goto failed_no_report; } VIR_FREE(uristr); @@ -1163,6 +1167,10 @@ virConnectOpenInternal(const char *name, return ret; failed: + virReportError(VIR_ERR_OPERATION_FAILED, + _("Failed to connect to remote libvirt URI %s"), + NULLSTR(uristr)); + failed_no_report: VIR_FREE(uristr); virObjectUnref(ret); diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 6d0ab4ee28..bc2b5401da 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -1134,9 +1134,6 @@ libxlDomainMigrationSrcPerformP2P(libxlDriverPrivate *driver, virObjectLock(vm); if (dconn == NULL) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("Failed to connect to remote libvirt URI %s: %s"), - dconnuri, virGetLastErrorMessage()); return ret; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b9d7d582f5..2635ef1162 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5145,9 +5145,6 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriver *driver, goto cleanup; if (dconn == NULL) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("Failed to connect to remote libvirt URI %s: %s"), - dconnuri, virGetLastErrorMessage()); return -1; } -- 2.25.1

4 4

[PATCH v2 0/2] qemu: Work around qemu not sending DEVICE_DELETED when device is configured via JSON
by Peter Krempa 06 Jan '22

06 Jan '22

QEMU fix was posted https://lists.gnu.org/archive/html/qemu-devel/2022-01/msg00542.html I'll hold off this version until just before the freeze. In case the qemu commit gets merged we can avoid some of the churn by adding in-progress qemu caps and updating to it. Note that I've trimmed patch 1 when sent to the list. See them in full at: https://gitlab.com/pipo.sk/libvirt/-/commits/device-add-json-revert-2 v2: - dropped patch 2, folded important bits from the commit message into commit message for patch 1 Peter Krempa (2): qemu: Revert to using non-JSON commandline for -device NEWS: Mention device hot-unplug regression with qemu-6.2 and workarounds for it NEWS.rst | 31 ++++++++++++++ src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- .../caps_6.2.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - .../caps_6.2.0.x86_64.xml | 1 - ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 6 +-- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 6 +-- .../aarch64-tpm.aarch64-latest.args | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 36 ++++++++-------- .../aarch64-virt-headless.aarch64-latest.args | 28 ++++++------- .../audio-alsa-best.x86_64-latest.args | 4 +- .../audio-alsa-full.x86_64-latest.args | 4 +- .../audio-alsa-minimal.x86_64-latest.args | 4 +- .../audio-coreaudio-best.x86_64-latest.args | 4 +- .../audio-coreaudio-full.x86_64-latest.args | 4 +- ...audio-coreaudio-minimal.x86_64-latest.args | 4 +- ...udio-default-nographics.x86_64-latest.args | 4 +- .../audio-default-sdl.x86_64-latest.args | 6 +-- .../audio-default-spice.x86_64-latest.args | 6 +-- .../audio-default-vnc.x86_64-latest.args | 6 +-- .../audio-file-best.x86_64-latest.args | 4 +- .../audio-file-full.x86_64-latest.args | 4 +- .../audio-file-minimal.x86_64-latest.args | 4 +- .../audio-jack-full.x86_64-latest.args | 4 +- .../audio-jack-minimal.x86_64-latest.args | 4 +- .../audio-many-backends.x86_64-latest.args | 14 +++---- .../audio-none-best.x86_64-latest.args | 4 +- .../audio-none-full.x86_64-latest.args | 4 +- .../audio-none-minimal.x86_64-latest.args | 4 +- .../audio-oss-best.x86_64-latest.args | 4 +- .../audio-oss-full.x86_64-latest.args | 4 +- .../audio-oss-minimal.x86_64-latest.args | 4 +- .../audio-pulseaudio-best.x86_64-latest.args | 4 +- .../audio-pulseaudio-full.x86_64-latest.args | 4 +- ...udio-pulseaudio-minimal.x86_64-latest.args | 4 +- .../audio-sdl-best.x86_64-latest.args | 4 +- .../audio-sdl-full.x86_64-latest.args | 4 +- .../audio-sdl-minimal.x86_64-latest.args | 4 +- .../audio-spice-best.x86_64-latest.args | 4 +- .../audio-spice-full.x86_64-latest.args | 4 +- .../audio-spice-minimal.x86_64-latest.args | 4 +- .../blkdeviotune-group-num.x86_64-latest.args | 8 ++-- ...blkdeviotune-max-length.x86_64-latest.args | 8 ++-- .../blkdeviotune-max.x86_64-latest.args | 8 ++-- .../channel-unix-guestfwd.x86_64-latest.args | 4 +- .../console-compat-auto.x86_64-latest.args | 8 ++-- .../console-compat-chardev.x86_64-latest.args | 8 ++-- .../console-compat.x86_64-latest.args | 6 +-- .../console-virtio-unix.x86_64-latest.args | 10 ++--- .../controller-virtio-scsi.x86_64-latest.args | 24 +++++------ ...-Icelake-Server-pconfig.x86_64-latest.args | 4 +- .../cpu-host-model.x86_64-latest.args | 10 ++--- .../cpu-translation.x86_64-latest.args | 4 +- .../cputune-cpuset-big-id.x86_64-latest.args | 6 +-- ...ult-video-type-aarch64.aarch64-latest.args | 6 +-- ...default-video-type-ppc64.ppc64-latest.args | 8 ++-- .../devices-acpi-index.x86_64-latest.args | 16 +++---- .../disk-aio-io_uring.x86_64-latest.args | 6 +-- .../disk-aio.x86_64-latest.args | 8 ++-- .../disk-arm-virtio-sd.aarch64-latest.args | 2 +- ...-backing-chains-noindex.x86_64-latest.args | 16 +++---- .../disk-blockio.x86_64-latest.args | 8 ++-- .../disk-boot-cdrom.x86_64-latest.args | 6 +-- .../disk-boot-disk.x86_64-latest.args | 6 +-- .../disk-cache.x86_64-latest.args | 14 +++---- .../disk-cdrom-bus-other.x86_64-latest.args | 6 +-- ...m-empty-network-invalid.x86_64-latest.args | 4 +- .../disk-cdrom-network.x86_64-latest.args | 10 ++--- .../disk-cdrom-tray.x86_64-latest.args | 10 ++--- .../disk-cdrom.x86_64-latest.args | 10 ++--- .../disk-copy_on_read.x86_64-latest.args | 12 +++--- .../disk-detect-zeroes.x86_64-latest.args | 8 ++-- .../disk-discard.x86_64-latest.args | 8 ++-- .../disk-error-policy.x86_64-latest.args | 8 ++-- .../disk-floppy-q35-2_11.x86_64-latest.args | 12 +++--- .../disk-floppy-q35-2_9.x86_64-latest.args | 12 +++--- .../disk-floppy-tray.x86_64-latest.args | 10 ++--- .../disk-floppy.x86_64-latest.args | 8 ++-- .../disk-fmt-qcow.x86_64-latest.args | 6 +-- .../disk-geometry.x86_64-latest.args | 6 +-- .../disk-ide-split.x86_64-latest.args | 8 ++-- .../disk-ide-wwn.x86_64-latest.args | 6 +-- .../disk-ioeventfd.x86_64-latest.args | 12 +++--- .../disk-metadata-cache.x86_64-latest.args | 8 ++-- .../disk-network-gluster.x86_64-latest.args | 8 ++-- .../disk-network-http.x86_64-latest.args | 10 ++--- .../disk-network-iscsi.x86_64-latest.args | 18 ++++---- .../disk-network-nbd.x86_64-latest.args | 12 +++--- .../disk-network-nfs.x86_64-latest.args | 6 +-- ...-network-rbd-encryption.x86_64-latest.args | 12 +++--- ...sk-network-rbd-no-colon.x86_64-latest.args | 8 ++-- .../disk-network-rbd.x86_64-latest.args | 14 +++---- ...isk-network-source-auth.x86_64-latest.args | 8 ++-- ...isk-network-tlsx509-nbd.x86_64-latest.args | 4 +- .../disk-no-boot.x86_64-latest.args | 8 ++-- .../disk-nvme.x86_64-latest.args | 12 +++--- .../disk-order.x86_64-latest.args | 12 +++--- .../disk-readonly-disk.x86_64-latest.args | 8 ++-- .../disk-rotation.x86_64-latest.args | 12 +++--- .../disk-sata-device.x86_64-latest.args | 8 ++-- .../disk-scsi-device-auto.x86_64-latest.args | 10 ++--- .../disk-scsi-disk-split.x86_64-latest.args | 20 ++++----- .../disk-scsi-disk-vpd.x86_64-latest.args | 12 +++--- .../disk-scsi-disk-wwn.x86_64-latest.args | 12 +++--- ...sk-scsi-lun-passthrough.x86_64-latest.args | 12 +++--- .../disk-scsi.x86_64-latest.args | 26 ++++++------ .../disk-serial.x86_64-latest.args | 8 ++-- .../disk-shared.x86_64-latest.args | 14 +++---- .../disk-slices.x86_64-latest.args | 14 +++---- .../disk-snapshot.x86_64-latest.args | 10 ++--- .../disk-source-pool-mode.x86_64-latest.args | 12 +++--- .../disk-source-pool.x86_64-latest.args | 14 +++---- .../disk-transient.x86_64-latest.args | 6 +-- ...sk-usb-device-removable.x86_64-latest.args | 8 ++-- .../disk-usb-device.x86_64-latest.args | 8 ++-- .../disk-vhostuser.x86_64-latest.args | 8 ++-- .../disk-virtio-queues.x86_64-latest.args | 8 ++-- ...irtio-scsi-reservations.x86_64-latest.args | 10 ++--- .../disk-virtio.x86_64-latest.args | 10 ++--- .../encrypted-disk-usage.x86_64-latest.args | 6 +-- .../encrypted-disk.x86_64-latest.args | 6 +-- .../eoi-disabled.x86_64-latest.args | 4 +- .../eoi-enabled.x86_64-latest.args | 4 +- .../event_idx.x86_64-latest.args | 12 +++--- ...d-memory-numa-topology4.x86_64-latest.args | 4 +- .../fips-enabled.x86_64-latest.args | 6 +-- .../floppy-drive-fat.x86_64-latest.args | 6 +-- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 6 +-- .../genid-auto.x86_64-latest.args | 4 +- .../qemuxml2argvdata/genid.x86_64-latest.args | 4 +- ...egl-headless-rendernode.x86_64-latest.args | 6 +-- .../graphics-egl-headless.x86_64-latest.args | 6 +-- ...s-spice-agent-file-xfer.x86_64-latest.args | 8 ++-- ...aphics-spice-agentmouse.x86_64-latest.args | 10 ++--- ...s-spice-auto-socket-cfg.x86_64-latest.args | 4 +- ...phics-spice-auto-socket.x86_64-latest.args | 4 +- ...phics-spice-compression.x86_64-latest.args | 8 ++-- ...hics-spice-egl-headless.x86_64-latest.args | 6 +-- ...pice-gl-auto-rendernode.x86_64-latest.args | 6 +-- .../graphics-spice-no-args.x86_64-latest.args | 6 +-- .../graphics-spice-qxl-vga.x86_64-latest.args | 8 ++-- .../graphics-spice-sasl.x86_64-latest.args | 6 +-- .../graphics-spice-socket.x86_64-latest.args | 4 +- .../graphics-spice-timeout.x86_64-latest.args | 14 +++---- ...raphics-spice-usb-redir.x86_64-latest.args | 16 +++---- .../graphics-spice.x86_64-latest.args | 8 ++-- ...ics-vnc-auto-socket-cfg.x86_64-latest.args | 6 +-- ...raphics-vnc-auto-socket.x86_64-latest.args | 4 +- ...aphics-vnc-egl-headless.x86_64-latest.args | 6 +-- ...hics-vnc-no-listen-attr.x86_64-latest.args | 6 +-- .../graphics-vnc-none.x86_64-latest.args | 4 +- .../graphics-vnc-policy.x86_64-latest.args | 6 +-- .../graphics-vnc-power.x86_64-latest.args | 6 +-- ...remove-generated-socket.x86_64-latest.args | 6 +-- .../graphics-vnc-sasl.x86_64-latest.args | 6 +-- ...-vnc-socket-new-cmdline.x86_64-latest.args | 4 +- .../graphics-vnc-socket.x86_64-latest.args | 4 +- ...graphics-vnc-tls-secret.x86_64-latest.args | 4 +- .../graphics-vnc-tls.x86_64-latest.args | 4 +- .../graphics-vnc-websocket.x86_64-latest.args | 4 +- .../graphics-vnc.x86_64-latest.args | 6 +-- ...tdev-mdev-display-ramfb.x86_64-latest.args | 8 ++-- ...play-spice-egl-headless.x86_64-latest.args | 6 +-- ...ev-display-spice-opengl.x86_64-latest.args | 6 +-- ...isplay-vnc-egl-headless.x86_64-latest.args | 6 +-- ...ostdev-mdev-display-vnc.x86_64-latest.args | 6 +-- .../hostdev-scsi-lsi.x86_64-latest.args | 20 ++++----- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 22 +++++----- .../hugepages-memaccess3.x86_64-latest.args | 2 +- .../hugepages-nvdimm.x86_64-latest.args | 4 +- .../hyperv-off.x86_64-latest.args | 4 +- .../hyperv-panic.x86_64-latest.args | 2 +- .../hyperv-passthrough.x86_64-latest.args | 2 +- .../hyperv-stimer-direct.x86_64-latest.args | 2 +- .../hyperv.x86_64-latest.args | 2 +- .../input-linux.x86_64-latest.args | 4 +- .../intel-iommu-aw-bits.x86_64-latest.args | 2 +- ...ntel-iommu-caching-mode.x86_64-latest.args | 2 +- ...ntel-iommu-device-iotlb.x86_64-latest.args | 2 +- .../intel-iommu-eim.x86_64-latest.args | 2 +- .../intel-iommu.x86_64-latest.args | 2 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 10 ++--- .../kvmclock+eoi-disabled.x86_64-latest.args | 4 +- ...nch-security-sev-direct.x86_64-latest.args | 4 +- ...luks-disks-source-qcow2.x86_64-latest.args | 16 +++---- .../luks-disks-source.x86_64-latest.args | 14 +++---- .../luks-disks.x86_64-latest.args | 8 ++-- ...memory-default-hugepage.x86_64-latest.args | 4 +- .../memfd-memory-numa.x86_64-latest.args | 6 +-- ...y-hotplug-nvdimm-access.x86_64-latest.args | 8 ++-- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 8 ++-- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 8 ++-- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 8 ++-- ...hotplug-nvdimm-readonly.x86_64-latest.args | 8 ++-- .../memory-hotplug-nvdimm.x86_64-latest.args | 8 ++-- ...mory-hotplug-virtio-mem.x86_64-latest.args | 10 ++--- ...ory-hotplug-virtio-pmem.x86_64-latest.args | 8 ++-- .../misc-no-reboot.x86_64-latest.args | 4 +- .../mlock-off.x86_64-latest.args | 2 +- .../mlock-on.x86_64-latest.args | 2 +- .../name-escape.x86_64-latest.args | 20 ++++----- .../net-vdpa.x86_64-latest.args | 4 +- .../net-vhostuser.x86_64-latest.args | 8 ++-- .../numatune-hmat.x86_64-latest.args | 4 +- ...emnode-restrictive-mode.x86_64-latest.args | 4 +- .../numatune-memnode.x86_64-latest.args | 4 +- .../numatune-system-memory.x86_64-latest.args | 2 +- .../os-firmware-bios.x86_64-latest.args | 16 +++---- ...re-efi-no-enrolled-keys.x86_64-latest.args | 6 +-- ...os-firmware-efi-secboot.x86_64-latest.args | 16 +++---- .../os-firmware-efi.x86_64-latest.args | 16 +++---- .../panic-double.x86_64-latest.args | 4 +- .../panic-no-address.x86_64-latest.args | 8 ++-- .../qemuxml2argvdata/panic.x86_64-latest.args | 8 ++-- ...arallel-parport-chardev.x86_64-latest.args | 8 ++-- .../parallel-tcp-chardev.x86_64-latest.args | 8 ++-- .../parallel-unix-chardev.x86_64-latest.args | 8 ++-- ...pi-root-hotplug-disable.x86_64-latest.args | 4 +- ...cpi-root-hotplug-enable.x86_64-latest.args | 4 +- .../pci-serial-dev-chardev.x86_64-latest.args | 8 ++-- ...e-expander-bus-aarch64.aarch64-latest.args | 2 +- ...cie-root-port-nohotplug.x86_64-latest.args | 18 ++++---- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 8 ++-- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 8 ++-- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 8 ++-- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 8 ++-- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 8 ++-- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 8 ++-- .../ppc64-pseries-graphics.ppc64-latest.args | 22 +++++----- .../ppc64-pseries-headless.ppc64-latest.args | 16 +++---- .../ppc64-tpmproxy-single.ppc64-latest.args | 6 +-- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 8 ++-- .../pv-spinlock-disabled.x86_64-latest.args | 4 +- .../pv-spinlock-enabled.x86_64-latest.args | 4 +- .../qemu-ns.x86_64-latest.args | 6 +-- ...rial-dev-chardev-iobase.x86_64-latest.args | 8 ++-- .../serial-dev-chardev.x86_64-latest.args | 8 ++-- .../serial-file-chardev.x86_64-latest.args | 8 ++-- .../serial-file-log.x86_64-latest.args | 6 +-- .../serial-many-chardev.x86_64-latest.args | 10 ++--- .../serial-pty-chardev.x86_64-latest.args | 8 ++-- ...erial-spiceport-nospice.x86_64-latest.args | 6 +-- .../serial-spiceport.x86_64-latest.args | 12 +++--- .../serial-tcp-chardev.x86_64-latest.args | 8 ++-- ...rial-tcp-telnet-chardev.x86_64-latest.args | 8 ++-- ...p-tlsx509-chardev-notls.x86_64-latest.args | 10 ++--- ...-tlsx509-chardev-verify.x86_64-latest.args | 10 ++--- ...ial-tcp-tlsx509-chardev.x86_64-latest.args | 10 ++--- ...-tlsx509-secret-chardev.x86_64-latest.args | 10 ++--- .../serial-udp-chardev.x86_64-latest.args | 10 ++--- .../serial-unix-chardev.x86_64-latest.args | 8 ++-- .../serial-vc-chardev.x86_64-latest.args | 8 ++-- ...rtcard-passthrough-unix.x86_64-latest.args | 8 ++-- .../tpm-emulator-spapr.ppc64-latest.args | 14 +++---- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 6 +-- ...pm-emulator-tpm2-pstate.x86_64-latest.args | 6 +-- .../tpm-emulator-tpm2.x86_64-latest.args | 6 +-- .../tpm-emulator.x86_64-latest.args | 6 +-- .../tpm-passthrough-crb.x86_64-latest.args | 6 +-- .../tpm-passthrough.x86_64-latest.args | 6 +-- .../tseg-explicit-size.x86_64-latest.args | 10 ++--- .../usb-redir-unix.x86_64-latest.args | 14 +++---- ...vhost-user-fs-fd-memory.x86_64-latest.args | 2 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 12 +++--- ...host-user-gpu-secondary.x86_64-latest.args | 10 ++--- .../vhost-user-vga.x86_64-latest.args | 8 ++-- .../vhost-vsock-auto.x86_64-latest.args | 6 +-- .../vhost-vsock.x86_64-latest.args | 6 +-- ...eo-bochs-display-device.x86_64-latest.args | 8 ++-- ...video-qxl-device-vram64.x86_64-latest.args | 6 +-- ...o-qxl-sec-device-vram64.x86_64-latest.args | 8 ++-- ...eo-ramfb-display-device.x86_64-latest.args | 8 ++-- ...video-virtio-vga-gpu-gl.x86_64-latest.args | 8 ++-- .../virtio-9p-createmode.x86_64-latest.args | 14 +++---- .../virtio-9p-multidevs.x86_64-latest.args | 12 +++--- .../virtio-lun.x86_64-latest.args | 12 +++--- ...virtio-non-transitional.x86_64-latest.args | 42 +++++++++---------- ...-options-controller-ats.x86_64-latest.args | 12 +++--- ...ptions-controller-iommu.x86_64-latest.args | 12 +++--- ...tions-controller-packed.x86_64-latest.args | 12 +++--- ...virtio-options-disk-ats.x86_64-latest.args | 8 ++-- ...rtio-options-disk-iommu.x86_64-latest.args | 8 ++-- ...tio-options-disk-packed.x86_64-latest.args | 8 ++-- .../virtio-options-fs-ats.x86_64-latest.args | 8 ++-- ...virtio-options-fs-iommu.x86_64-latest.args | 8 ++-- ...irtio-options-fs-packed.x86_64-latest.args | 8 ++-- ...irtio-options-input-ats.x86_64-latest.args | 8 ++-- ...tio-options-input-iommu.x86_64-latest.args | 8 ++-- ...io-options-input-packed.x86_64-latest.args | 8 ++-- ...-options-memballoon-ats.x86_64-latest.args | 4 +- ...loon-freepage-reporting.x86_64-latest.args | 4 +- ...ptions-memballoon-iommu.x86_64-latest.args | 4 +- ...tions-memballoon-packed.x86_64-latest.args | 4 +- .../virtio-options-net-ats.x86_64-latest.args | 8 ++-- ...irtio-options-net-iommu.x86_64-latest.args | 8 ++-- ...rtio-options-net-packed.x86_64-latest.args | 8 ++-- .../virtio-options-rng-ats.x86_64-latest.args | 8 ++-- ...irtio-options-rng-iommu.x86_64-latest.args | 8 ++-- ...rtio-options-rng-packed.x86_64-latest.args | 8 ++-- ...irtio-options-video-ats.x86_64-latest.args | 8 ++-- ...tio-options-video-iommu.x86_64-latest.args | 8 ++-- ...io-options-video-packed.x86_64-latest.args | 8 ++-- .../virtio-options.x86_64-latest.args | 28 ++++++------- .../virtio-rng-builtin.x86_64-latest.args | 6 +-- .../virtio-rng-egd-unix.x86_64-latest.args | 6 +-- .../virtio-transitional.x86_64-latest.args | 26 ++++++------ .../watchdog-device.x86_64-latest.args | 8 ++-- .../watchdog-dump.x86_64-latest.args | 8 ++-- .../watchdog-injectnmi.x86_64-latest.args | 8 ++-- .../watchdog.x86_64-latest.args | 6 +-- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 6 +-- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 14 +++---- ...efault-cpu-tcg-features.x86_64-latest.args | 10 ++--- ...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 6 +-- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 14 +++---- .../x86_64-pc-graphics.x86_64-latest.args | 20 ++++----- .../x86_64-pc-headless.x86_64-latest.args | 16 +++---- .../x86_64-q35-graphics.x86_64-latest.args | 34 +++++++-------- .../x86_64-q35-headless.x86_64-latest.args | 30 ++++++------- 320 files changed, 1332 insertions(+), 1305 deletions(-) -- 2.31.1

1 2

[libvirt PATCH 0/2] qemu: virtiofs: add killpriv_v2 support (virtiofs epopee)
by Ján Tomko 06 Jan '22

06 Jan '22

Ján Tomko (2): conf: add killpriv v2 attribute for virtiofs qemu: virtiofs: add (no_)killpriv_v2 support docs/formatdomain.rst | 4 ++++ docs/schemas/domaincommon.rng | 7 +++++++ src/conf/domain_conf.c | 15 +++++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_virtiofs.c | 5 +++++ .../qemuxml2argvdata/vhost-user-fs-fd-memory.xml | 1 + 6 files changed, 33 insertions(+) -- 2.31.1

2 4

[libvirt PATCH v3 00/13] cgroup and thread management in ch driver.
by Praveen K Paladugu 06 Jan '22

06 Jan '22

This patchset adds support for cgroup management of ch threads. This version correctly manages cgroups for vcpu and emulator threads created by ch. cgroup management for iothreads is not yet supported. Along with cgroup management, this patchset also enables support for pinning vcpu and emulator threads to selected host cpus. v3: * addrressed all the formatting comments in v2 patch set * dropped indentation patches are they do not adhere to libvirt coding style * fixed build issue in qemu driver that was introduced in v2 Praveen K Paladugu (5): util: Helper functions to get process info ch_driver,ch_domain: vcpu info getter callbacks qemu,hypervisor: refactor some cgroup mgmt methods ch_process: Setup emulator and iothread settings ch_driver: emulator threadinfo & pinning callbacks Vineeth Pillai (8): ch_domain: add virCHDomainGetMonitor helper method ch_domain: add methods to manage private vcpu data ch_driver: domainGetVcpuPinInfo and nodeGetCPUMap ch_monitor: Get nicindexes in prep for cgroup mgmt ch: methods for cgroup mgmt in ch driver ch_driver,ch_domain: vcpupin callback in ch driver ch_driver: enable typed param string for numatune ch_driver: add numatune callbacks for CH driver src/ch/ch_conf.c | 2 + src/ch/ch_conf.h | 6 +- src/ch/ch_domain.c | 172 ++++++- src/ch/ch_domain.h | 32 +- src/ch/ch_driver.c | 789 +++++++++++++++++++++++++++++++++ src/ch/ch_monitor.c | 341 +++++++++++--- src/ch/ch_monitor.h | 60 ++- src/ch/ch_process.c | 385 +++++++++++++++- src/ch/ch_process.h | 3 + src/ch/meson.build | 1 + src/hypervisor/domain_cgroup.c | 426 +++++++++++++++++- src/hypervisor/domain_cgroup.h | 52 +++ src/libvirt_private.syms | 15 + src/qemu/qemu_cgroup.c | 410 +---------------- src/qemu/qemu_cgroup.h | 11 - src/qemu/qemu_driver.c | 130 +----- src/qemu/qemu_hotplug.c | 7 +- src/qemu/qemu_process.c | 20 +- src/util/virprocess.c | 108 +++++ src/util/virprocess.h | 5 + 20 files changed, 2357 insertions(+), 618 deletions(-) -- 2.27.0

2 21

[PATCH] util: Improve log out parsing errors
by Martin Kletzander 06 Jan '22

06 Jan '22

Suggested-by: Erik Skultety <eskultet(a)redhat.com> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virlog.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index 139dce8d0220..b44ad0ef6c47 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -1487,21 +1487,21 @@ virLogParseOutput(const char *src) if (!(tokens = g_strsplit(src, ":", 0)) || (count = g_strv_length(tokens)) < 2) { virReportError(VIR_ERR_INVALID_ARG, - _("Malformed format for output '%s'"), src); + _("Malformed format for log output '%s'"), src); return NULL; } if (virStrToLong_uip(tokens[0], NULL, 10, &prio) < 0 || (prio < VIR_LOG_DEBUG) || (prio > VIR_LOG_ERROR)) { virReportError(VIR_ERR_INVALID_ARG, - _("Invalid priority '%s' for output '%s'"), + _("Invalid log priority '%s' for log output '%s'"), tokens[0], src); return NULL; } if ((dest = virLogDestinationTypeFromString(tokens[1])) < 0) { virReportError(VIR_ERR_INVALID_ARG, - _("Invalid destination '%s' for output '%s'"), + _("Invalid log destination '%s' for log output '%s'"), tokens[1], src); return NULL; } @@ -1511,7 +1511,7 @@ virLogParseOutput(const char *src) ((dest == VIR_LOG_TO_FILE || dest == VIR_LOG_TO_SYSLOG) && count != 3)) { virReportError(VIR_ERR_INVALID_ARG, - _("Output '%s' does not meet the format requirements " + _("Log output '%s' does not meet the format requirements " "for destination type '%s'"), src, tokens[1]); return NULL; } -- 2.34.1

2 2

[RFC] qemu_migration: Fix virConnectOpenAuth error code
by Raphael Norwitz 06 Jan '22

06 Jan '22

Today if virConnectOpenAuth fails, qemuMigrationSrcPerformPeer2Peer() returns VIR_ERR_OPERATION_FAILED. This change switches that error code to VIR_ERR_NO_CONNECT, which is more accurate. This should help libvirt consumers more intellegently retry migrations on intermittent connection failures. CC: Bhuvnesh Jain <bhuvnesh.jain(a)nutanix.com> Suggested-by: John Levon <john.levon(a)nutanix.com> Signed-off-by: Raphael Norwitz <raphael.norwitz(a)nutanix.com> --- src/qemu/qemu_migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b9d7d582f5..f7ced209a4 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5145,7 +5145,7 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriver *driver, goto cleanup; if (dconn == NULL) { - virReportError(VIR_ERR_OPERATION_FAILED, + virReportError(VIR_ERR_NO_CONNECT, _("Failed to connect to remote libvirt URI %s: %s"), dconnuri, virGetLastErrorMessage()); return -1; -- 2.20.1

3 5

[PATCH] qemu: agent: remove all code around disabled DEBUG_IO/DEBUG_RAW_IO definitions
by Ani Sinha 06 Jan '22

06 Jan '22

DEBUG_IO and DEBUG_RAW_IO are disabled and hence the code #defined under them are useless. Remove them. Also remove similar useless code from qemu_monitor_json. See also 4aae00bf1287f ("qemu: monitor: Remove disabled debug infrastructure") Signed-off-by: Ani Sinha <ani(a)anisinha.ca> --- src/qemu/qemu_agent.c | 51 ------------------------------------ src/qemu/qemu_monitor_json.c | 4 --- 2 files changed, 55 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index cb3bf97415..f33cd47078 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -48,9 +48,6 @@ VIR_LOG_INIT("qemu.qemu_agent"); #define LINE_ENDING "\n" -#define DEBUG_IO 0 -#define DEBUG_RAW_IO 0 - /* We read from QEMU until seeing a \r\n pair to indicate a * completed reply or event. To avoid memory denial-of-service * though, we must have a size limit on amount of data we @@ -137,25 +134,6 @@ static int qemuAgentOnceInit(void) VIR_ONCE_GLOBAL_INIT(qemuAgent); -#if DEBUG_RAW_IO -static char * -qemuAgentEscapeNonPrintable(const char *text) -{ - size_t i; - g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - for (i = 0; text[i] != '\0'; i++) { - if (text[i] == '\\') - virBufferAddLit(&buf, "\\\\"); - else if (g_ascii_isprint(text[i]) || text[i] == '\n' || - (text[i] == '\r' && text[i+1] == '\n')) - virBufferAddChar(&buf, text[i]); - else - virBufferAsprintf(&buf, "\\x%02x", text[i]); - } - return virBufferContentAndReset(&buf); -} -#endif - static void qemuAgentDispose(void *obj) { @@ -300,14 +278,6 @@ static int qemuAgentIOProcessData(qemuAgent *agent, { int used = 0; size_t i = 0; -#if DEBUG_IO -# if DEBUG_RAW_IO - g_autofree char *str1 = qemuAgentEscapeNonPrintable(data); - VIR_ERROR(_("[%s]"), str1); -# else - VIR_DEBUG("Data %zu bytes [%s]", len, data); -# endif -#endif while (used < len) { char *nl = strstr(data + used, LINE_ENDING); @@ -344,17 +314,6 @@ qemuAgentIOProcess(qemuAgent *agent) if (agent->msg && agent->msg->txOffset == agent->msg->txLength) msg = agent->msg; -#if DEBUG_IO -# if DEBUG_RAW_IO - g_autofree char *str1 = qemuAgentEscapeNonPrintable(msg ? msg->txBuffer : ""); - g_autofree char *str2 = qemuAgentEscapeNonPrintable(agent->buffer); - VIR_ERROR(_("Process %zu %p %p [[[%s]]][[[%s]]]"), - agent->bufferOffset, agent->msg, msg, str1, str2); -# else - VIR_DEBUG("Process %zu", agent->bufferOffset); -# endif -#endif - len = qemuAgentIOProcessData(agent, agent->buffer, agent->bufferOffset, msg); @@ -369,9 +328,6 @@ qemuAgentIOProcess(qemuAgent *agent) VIR_FREE(agent->buffer); agent->bufferOffset = agent->bufferLength = 0; } -#if DEBUG_IO - VIR_DEBUG("Process done %zu used %d", agent->bufferOffset, len); -#endif if (msg && msg->finished) virCondBroadcast(&agent->notify); return len; @@ -455,10 +411,6 @@ qemuAgentIORead(qemuAgent *agent) agent->buffer[agent->bufferOffset] = '\0'; } -#if DEBUG_IO - VIR_DEBUG("Now read %zu bytes of data", agent->bufferOffset); -#endif - return ret; } @@ -527,9 +479,6 @@ qemuAgentIO(GSocket *socket G_GNUC_UNUSED, virObjectRef(agent); /* lock access to the agent and protect fd */ virObjectLock(agent); -#if DEBUG_IO - VIR_DEBUG("Agent %p I/O on watch %d socket %p cond %d", agent, agent->socket, cond); -#endif if (agent->fd == -1 || !agent->watch) { virObjectUnlock(agent); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e45b43eb5a..0f1999f413 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -280,10 +280,6 @@ int qemuMonitorJSONIOProcess(qemuMonitor *mon, } } -#if DEBUG_IO - VIR_DEBUG("Total used %d bytes out of %zd available in buffer", used, len); -#endif - return used; } -- 2.25.1

2 2

[PATCH v3] Add VM info to improve error log message for qemu monitor
by Rohit Kumar 06 Jan '22

06 Jan '22

This change adds the domain name in the error and debug logs during monitor IO processing so that we may infer which VM experienced errors such as IO or socket hangup. This may help in debugging monitor IO errors. Signed-off-by: Rohit Kumar <rohit.kumar3(a)nutanix.com> --- src/qemu/qemu_monitor.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index dda6ae9796..2b4582578a 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -80,6 +80,7 @@ struct _qemuMonitor { GSource *watch; virDomainObj *vm; + char *domainName; qemuMonitorCallbacks *cb; void *callbackOpaque; @@ -243,6 +244,7 @@ qemuMonitorDispose(void *obj) virCondDestroy(&mon->notify); g_free(mon->buffer); g_free(mon->balloonpath); + g_free(mon->domainName); } @@ -583,8 +585,8 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, if (!error && !mon->goteof && cond & G_IO_ERR) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Invalid file descriptor while waiting for monitor")); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid file descriptor while waiting for monitor (vm='%s')"), mon->domainName); mon->goteof = true; } } @@ -609,13 +611,14 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, virResetLastError(); } else { if (virGetLastErrorCode() == VIR_ERR_OK && !mon->goteof) - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Error while processing monitor IO")); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Error while processing monitor IO (vm='%s')"), mon->domainName); virCopyLastError(&mon->lastError); virResetLastError(); } - VIR_DEBUG("Error on monitor %s", NULLSTR(mon->lastError.message)); + VIR_DEBUG("Error on monitor %s mon=%p vm=%p name=%s", + NULLSTR(mon->lastError.message), mon, mon->vm, mon->domainName); /* If IO process resulted in an error & we have a message, * then wakeup that waiter */ if (mon->msg && !mon->msg->finished) { @@ -636,7 +639,8 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, /* Make sure anyone waiting wakes up now */ virCondSignal(&mon->notify); virObjectUnlock(mon); - VIR_DEBUG("Triggering EOF callback"); + VIR_DEBUG("Triggering EOF callback mon=%p vm=%p name=%s", + mon, mon->vm, mon->domainName); (eofNotify)(mon, vm, mon->callbackOpaque); virObjectUnref(mon); } else if (error) { @@ -646,7 +650,8 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, /* Make sure anyone waiting wakes up now */ virCondSignal(&mon->notify); virObjectUnlock(mon); - VIR_DEBUG("Triggering error callback"); + VIR_DEBUG("Triggering error callback mon=%p vm=%p name=%s", + mon, mon->vm, mon->domainName); (errorNotify)(mon, vm, mon->callbackOpaque); virObjectUnref(mon); } else { @@ -694,6 +699,7 @@ qemuMonitorOpenInternal(virDomainObj *vm, mon->fd = fd; mon->context = g_main_context_ref(context); mon->vm = virObjectRef(vm); + mon->domainName = g_strdup(NULLSTR(vm->def->name)); mon->waitGreeting = true; mon->cb = cb; mon->callbackOpaque = opaque; @@ -935,14 +941,14 @@ qemuMonitorSend(qemuMonitor *mon, /* Check whether qemu quit unexpectedly */ if (mon->lastError.code != VIR_ERR_OK) { - VIR_DEBUG("Attempt to send command while error is set %s", - NULLSTR(mon->lastError.message)); + VIR_DEBUG("Attempt to send command while error is set %s mon=%p vm=%p name=%s", + NULLSTR(mon->lastError.message), mon, mon->vm, mon->domainName); virSetError(&mon->lastError); return -1; } if (mon->goteof) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("End of file from qemu monitor")); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("End of file from qemu monitor (vm='%s')"), mon->domainName); return -1; } @@ -955,15 +961,15 @@ qemuMonitorSend(qemuMonitor *mon, while (!mon->msg->finished) { if (virCondWait(&mon->notify, &mon->parent.lock) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to wait on monitor condition")); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to wait on monitor condition (vm='%s')"), mon->domainName); goto cleanup; } } if (mon->lastError.code != VIR_ERR_OK) { - VIR_DEBUG("Send command resulted in error %s", - NULLSTR(mon->lastError.message)); + VIR_DEBUG("Send command resulted in error %s mon=%p vm=%p name=%s", + NULLSTR(mon->lastError.message), mon, mon->vm, mon->domainName); virSetError(&mon->lastError); goto cleanup; } -- 2.25.1

3 3

[libvirt PATCH] util: fix prototype of virDaemonSetupLogging
by Ján Tomko 06 Jan '22

06 Jan '22

The commit that added error checking to this function forgot to adjust the WIN32 stub. Fixes: a873924e36b28c5b125621e35b32beb6b077bcc8 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as a build fix. src/util/virdaemon.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/util/virdaemon.c b/src/util/virdaemon.c index 5c0ca534cf..00bd7095f6 100644 --- a/src/util/virdaemon.c +++ b/src/util/virdaemon.c @@ -275,17 +275,17 @@ int virDaemonForkIntoBackground(const char *argv0 G_GNUC_UNUSED) return -1; } -void virDaemonSetupLogging(const char *daemon_name G_GNUC_UNUSED, - unsigned int log_level G_GNUC_UNUSED, - char *log_filters G_GNUC_UNUSED, - char *log_outputs G_GNUC_UNUSED, - bool privileged G_GNUC_UNUSED, - bool verbose G_GNUC_UNUSED, - bool godaemon G_GNUC_UNUSED) +int virDaemonSetupLogging(const char *daemon_name G_GNUC_UNUSED, + unsigned int log_level G_GNUC_UNUSED, + char *log_filters G_GNUC_UNUSED, + char *log_outputs G_GNUC_UNUSED, + bool privileged G_GNUC_UNUSED, + bool verbose G_GNUC_UNUSED, + bool godaemon G_GNUC_UNUSED) { /* NOOP */ errno = ENOTSUP; - return; + return -1; } int virDaemonUnixSocketPaths(const char *sock_prefix G_GNUC_UNUSED, -- 2.31.1

2 1

[PATCH] Account for fact that virDomainDeviceDefCopy() does an inactive copy
by Michal Privoznik 06 Jan '22

06 Jan '22

In a few places (e.g. device attach/detach/update) we are given a device XML, parse it but then need a copy of parsed data so that the original can be passed to function handling the request over inactive XML and the copy is then passed to function handling the operation over live XML. Note, both functions consume passed device on success, hence the need for copy. The problem is in combination of how the copy is obtained and where is passed. The copy is done by calling virDomainDeviceDefCopy() which does only inactive copy, i.e. no live information is copied over (e.g. no aliases). Then, this copy (inactive XML effectively) is passed to function handling live part of the operation (e.g. qemuDomainUpdateDeviceLive()) and the definition containing all the juicy, live bits is passed to function handling inactive part of the operation (e.g. qemuDomainUpdateDeviceConfig()). This is rather suboptimal, and XML copies should be passed to their respective functions. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2036895 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/lxc/lxc_driver.c | 10 +++++----- src/qemu/qemu_driver.c | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index fe583ccb76..7bc39120ee 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -4308,17 +4308,17 @@ static int lxcDomainAttachDeviceFlags(virDomainPtr dom, false) < 0) goto endjob; - if ((ret = lxcDomainAttachDeviceConfig(vmdef, dev)) < 0) + if ((ret = lxcDomainAttachDeviceConfig(vmdef, dev_copy)) < 0) goto endjob; } if (flags & VIR_DOMAIN_AFFECT_LIVE) { - if (virDomainDefCompatibleDevice(vm->def, dev_copy, NULL, + if (virDomainDefCompatibleDevice(vm->def, dev, NULL, VIR_DOMAIN_DEVICE_ACTION_ATTACH, true) < 0) goto endjob; - if ((ret = lxcDomainAttachDeviceLive(driver, vm, dev_copy)) < 0) + if ((ret = lxcDomainAttachDeviceLive(driver, vm, dev)) < 0) goto endjob; /* * update domain status forcibly because the domain status may be @@ -4475,12 +4475,12 @@ static int lxcDomainDetachDeviceFlags(virDomainPtr dom, if (!vmdef) goto endjob; - if ((ret = lxcDomainDetachDeviceConfig(vmdef, dev)) < 0) + if ((ret = lxcDomainDetachDeviceConfig(vmdef, dev_copy)) < 0) goto endjob; } if (flags & VIR_DOMAIN_AFFECT_LIVE) { - if ((ret = lxcDomainDetachDeviceLive(driver, vm, dev_copy)) < 0) + if ((ret = lxcDomainDetachDeviceLive(driver, vm, dev)) < 0) goto endjob; /* * update domain status forcibly because the domain status may be diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b8537a4260..b1255da9f2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8020,7 +8020,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, /* virDomainDefCompatibleDevice call is delayed until we know the * device we're going to update. */ - if ((ret = qemuDomainUpdateDeviceConfig(vmdef, dev, priv->qemuCaps, + if ((ret = qemuDomainUpdateDeviceConfig(vmdef, dev_copy, priv->qemuCaps, parse_flags, driver->xmlopt)) < 0) goto endjob; @@ -8029,7 +8029,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, if (flags & VIR_DOMAIN_AFFECT_LIVE) { /* virDomainDefCompatibleDevice call is delayed until we know the * device we're going to update. */ - if ((ret = qemuDomainUpdateDeviceLive(vm, dev_copy, dom, force)) < 0) + if ((ret = qemuDomainUpdateDeviceLive(vm, dev, dom, force)) < 0) goto endjob; qemuDomainSaveStatus(vm); @@ -8100,7 +8100,7 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriver *driver, if (!vmdef) goto cleanup; - if (qemuDomainDetachDeviceConfig(vmdef, dev, priv->qemuCaps, + if (qemuDomainDetachDeviceConfig(vmdef, dev_copy, priv->qemuCaps, parse_flags, driver->xmlopt) < 0) goto cleanup; @@ -8109,7 +8109,7 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriver *driver, if (flags & VIR_DOMAIN_AFFECT_LIVE) { int rc; - if ((rc = qemuDomainDetachDeviceLive(vm, dev_copy, driver, false)) < 0) + if ((rc = qemuDomainDetachDeviceLive(vm, dev, driver, false)) < 0) goto cleanup; if (rc == 0 && qemuDomainUpdateDeviceList(driver, vm, QEMU_ASYNC_JOB_NONE) < 0) -- 2.34.1

2 1