- Devel - libvirt List Archives

[PATCH RFC v4 00/15] Add riscv kvm accel support
by Yifei Jiang 06 Jan '21

06 Jan '21

This series adds both riscv32 and riscv64 kvm support, and implements migration based on riscv. It is based on temporarily unaccepted kvm: https://github.com/kvm-riscv/linux (lastest version v15). This series depends on above pending changes which haven't yet been accepted, so this QEMU patch series is treated as RFC patches until that dependency has been dealt with. Compared to RFC v3, the time scaling is supported in this series. The new feature also requires the following patches: [1] Bugfix in kvm v15 https://lkml.org/lkml/2020/11/30/245 [2] kvm patches: [PATCH RFC 0/3] Implement guest time scaling in RISC-V KVM Several steps to use this: 1. Build emulation $ ./configure --target-list=riscv64-softmmu $ make -j$(nproc) 2. Build kernel https://github.com/kvm-riscv/linux 3. Build QEMU VM Cross built in riscv toolchain. $ PKG_CONFIG_LIBDIR=<toolchain pkgconfig path> $ export PKG_CONFIG_SYSROOT_DIR=<toolchain sysroot path> $ ./configure --target-list=riscv64-softmmu --enable-kvm \ --cross-prefix=riscv64-linux-gnu- --disable-libiscsi --disable-glusterfs \ --disable-libusb --disable-usb-redir --audio-drv-list= --disable-opengl \ --disable-libxml2 $ make -j$(nproc) 4. Start emulation $ ./qemu-system-riscv64 -M virt -m 4096M -cpu rv64,x-h=true -nographic \ -name guest=riscv-hyp,debug-threads=on \ -smp 4 \ -bios ./fw_jump.bin \ -kernel ./Image \ -drive file=./hyp.img,format=raw,id=hd0 \ -device virtio-blk-device,drive=hd0 \ -append "root=/dev/vda rw console=ttyS0 earlycon=sbi" 5. Start kvm-acceled QEMU VM in emulation $ ./qemu-system-riscv64 -M virt,accel=kvm -m 1024M -cpu host -nographic \ -name guest=riscv-guset \ -smp 2 \ -bios none \ -kernel ./Image \ -drive file=./guest.img,format=raw,id=hd0 \ -device virtio-blk-device,drive=hd0 \ -append "root=/dev/vda rw console=ttyS0 earlycon=sbi" Changes since RFC v3 - Rebase on QEMU v5.2.0-rc2 and kvm-riscv linux v15. - Add time scaling support(New patches 13, 14 and 15). - Fix the bug that guest vm can't reboot. Changes since RFC v2 - Fix checkpatch error at target/riscv/sbi_ecall_interface.h. - Add riscv migration support. Changes since RFC v1 - Add separate SBI ecall interface header. - Add riscv32 kvm accel support. Yifei Jiang (15): linux-header: Update linux/kvm.h target/riscv: Add target/riscv/kvm.c to place the public kvm interface target/riscv: Implement function kvm_arch_init_vcpu target/riscv: Implement kvm_arch_get_registers target/riscv: Implement kvm_arch_put_registers target/riscv: Support start kernel directly by KVM hw/riscv: PLIC update external interrupt by KVM when kvm enabled target/riscv: Handle KVM_EXIT_RISCV_SBI exit target/riscv: Add host cpu type target/riscv: Add kvm_riscv_get/put_regs_timer target/riscv: Implement virtual time adjusting with vm state changing target/riscv: Support virtual time context synchronization target/riscv: Introduce dynamic time frequency for virt machine target/riscv: Synchronize vcpu's frequency with KVM target/riscv: Add time frequency migration support hw/intc/sifive_plic.c | 31 +- hw/riscv/virt.c | 26 +- linux-headers/linux/kvm.h | 8 + meson.build | 2 + target/riscv/cpu.c | 13 + target/riscv/cpu.h | 12 + target/riscv/kvm.c | 617 +++++++++++++++++++++++++++++ target/riscv/kvm_riscv.h | 25 ++ target/riscv/machine.c | 23 ++ target/riscv/meson.build | 1 + target/riscv/sbi_ecall_interface.h | 72 ++++ 11 files changed, 817 insertions(+), 13 deletions(-) create mode 100644 target/riscv/kvm.c create mode 100644 target/riscv/kvm_riscv.h create mode 100644 target/riscv/sbi_ecall_interface.h -- 2.19.1

3 25

[PATCH] qemu: backup: Properly delete temporary bitmap after push-mode incremental backup
by Peter Krempa 06 Jan '21

06 Jan '21

Refactor in 0316c28a453ac used incorrect source variable to initialize the variable which holds the name of the bitmap which needs to be deleted after the backup job finishes. This resulted into deleting the source bitmap of the backup rather than the temporary one. Use 'dd->incrementalBitmap' which holds the temporary bitmap name instead of 'dd->backupdisk->incremental' which holds the name of the source bitmap which is used by the backup. Fixes: 0316c28a453ac15f58c61f30359f66ab9a649884 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1908647 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_backup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index b2340eb1cf..c444f8aaba 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -235,7 +235,7 @@ qemuBackupDiskPrepareOneBitmaps(struct qemuBackupDiskData *dd, blockNamedNodeData) < 0) return -1; - dd->domdiskIncrementalBitmap = dd->backupdisk->incremental; + dd->domdiskIncrementalBitmap = dd->incrementalBitmap; } return 0; -- 2.29.2

2 1

[PATCH 1/3] virStorageBackendCopyToFD: remove unused return variable
by Yi Li 06 Jan '21

06 Jan '21

remove unused return variable, The errno will throw by virReportSystemError Signed-off-by: Yi Li <yili(a)winhong.com> --- src/storage/storage_util.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index cf1f33f177..6fc8597733 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -128,7 +128,6 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, bool reflink_copy) { int amtread = -1; - int ret = 0; size_t rbytes = READ_BLOCK_SIZE_DEFAULT; int wbytes = 0; int interval; @@ -138,11 +137,10 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, VIR_AUTOCLOSE inputfd = -1; if ((inputfd = open(inputvol->target.path, O_RDONLY)) < 0) { - ret = -errno; virReportSystemError(errno, _("could not open input path '%s'"), inputvol->target.path); - return ret; + return -1; } #ifdef __linux__ @@ -160,11 +158,10 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, if (reflink_copy) { if (reflinkCloneFile(fd, inputfd) < 0) { - ret = -errno; virReportSystemError(errno, _("failed to clone files from '%s'"), inputvol->target.path); - return ret; + return -1; } else { VIR_DEBUG("btrfs clone finished."); return 0; @@ -178,11 +175,10 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, rbytes = *total; if ((amtread = saferead(inputfd, buf, rbytes)) < 0) { - ret = -errno; virReportSystemError(errno, _("failed reading from file '%s'"), inputvol->target.path); - return ret; + return -1; } *total -= amtread; @@ -195,36 +191,32 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, if (want_sparse && memcmp(buf+offset, zerobuf, interval) == 0) { if (lseek(fd, interval, SEEK_CUR) < 0) { - ret = -errno; virReportSystemError(errno, _("cannot extend file '%s'"), vol->target.path); - return ret; + return -1; } } else if (safewrite(fd, buf+offset, interval) < 0) { - ret = -errno; virReportSystemError(errno, _("failed writing to file '%s'"), vol->target.path); - return ret; + return -1; } } while ((amtleft -= interval) > 0); } if (virFileDataSync(fd) < 0) { - ret = -errno; virReportSystemError(errno, _("cannot sync data to file '%s'"), vol->target.path); - return ret; + return -1; } if (VIR_CLOSE(inputfd) < 0) { - ret = -errno; virReportSystemError(errno, _("cannot close file '%s'"), inputvol->target.path); - return ret; + return -1; } return 0; -- 2.25.3

2 10

[PATCH v2] docs: support qcow2 format in luks encryption volume
by Meina Li 05 Jan '21

05 Jan '21

Signed-off-by: Meina Li <meili(a)redhat.com> --- docs/formatstorageencryption.html.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/formatstorageencryption.html.in b/docs/formatstorageencryption.html.in index ea80a87cfb..7215c307d7 100644 --- a/docs/formatstorageencryption.html.in +++ b/docs/formatstorageencryption.html.in @@ -128,7 +128,9 @@ <p> Here is an example specifying use of the <code>luks</code> format for - a specific cipher algorithm for volume creation: + a specific cipher algorithm for volume creation. + <span class="since">Since 6.10.0,</span> the <code>target</code> format + can also support <code>qcow2</code> type with <code>luks</code> encryption. </p> <pre> <volume> -- 2.27.0

3 2

[PATCH] virsh-domain: Add quotes around '%s' formatting domain name
by Peter Krempa 05 Jan '21

05 Jan '21

Domain name can contain spaces in which case it's not immediately clear from virsh messages where the boundary of the name is. Enclose all %s formatters in apostrophes as delimiters. Done via the following vim regex: %s/omain %s/omain '%s'/g This patch changes: $ virsh undefine --snapshots-metadata 'OWASP Broken Web Apps VM v1.2' Domain OWASP Broken Web Apps VM v1.2 has been undefined to: $ virsh undefine --snapshots-metadata 'OWASP Broken Web Apps VM v1.2' Domain 'OWASP Broken Web Apps VM v1.2' has been undefined Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/virsh-define-dev-segfault | 2 +- tests/virsh-read-bufsiz | 2 +- tests/virsh-undefine | 8 +- tools/virsh-domain.c | 136 ++++++++++++++++---------------- 4 files changed, 74 insertions(+), 74 deletions(-) diff --git a/tests/virsh-define-dev-segfault b/tests/virsh-define-dev-segfault index a7533ba9b0..cc5b461932 100755 --- a/tests/virsh-define-dev-segfault +++ b/tests/virsh-define-dev-segfault @@ -65,7 +65,7 @@ url=test:///default $abs_top_builddir/tools/virsh --connect "$url" 'define D.xml; dumpxml D' > out 2>&1 || fail=1 cat > exp <<EOF || fail=1 -Domain D defined from D.xml +Domain 'D' defined from D.xml $(cat D.xml) diff --git a/tests/virsh-read-bufsiz b/tests/virsh-read-bufsiz index 116eff1c4c..a61816c25b 100755 --- a/tests/virsh-read-bufsiz +++ b/tests/virsh-read-bufsiz @@ -42,7 +42,7 @@ for i in before after; do ( test $i = before && cat sp xml || cat xml sp ) > $in || fail=1 $abs_top_builddir/tools/virsh --connect test:///default define $in > out || fail=1 - printf "Domain newtest defined from $in\n\n" > exp || fail=1 + printf "Domain 'newtest' defined from $in\n\n" > exp || fail=1 compare exp out || fail=1 done diff --git a/tests/virsh-undefine b/tests/virsh-undefine index 998d4d3268..dbbb367391 100755 --- a/tests/virsh-undefine +++ b/tests/virsh-undefine @@ -37,7 +37,7 @@ sed '/^Persistent/n; /:/d' < out1 > out cat <<\EOF > exp || fail=1 Persistent: yes -Domain test has been undefined +Domain 'test' has been undefined Persistent: no @@ -52,7 +52,7 @@ sed '/^Persistent/n; /:/d' < out1 > out cat <<\EOF > exp || fail=1 Persistent: yes -Domain 1 has been undefined +Domain '1' has been undefined Persistent: no @@ -64,9 +64,9 @@ $abs_top_builddir/tools/virsh -c test:///default \ 'shutdown test; undefine test; dominfo test' > out 2>&1 test $? = 1 || fail=1 cat <<\EOF > expout || fail=1 -Domain test is being shutdown +Domain 'test' is being shutdown -Domain test has been undefined +Domain 'test' has been undefined error: failed to get domain 'test' diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 1ef9b8d606..2bb136333f 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1117,17 +1117,17 @@ cmdAutostart(vshControl *ctl, const vshCmd *cmd) if (virDomainSetAutostart(dom, autostart) < 0) { if (autostart) - vshError(ctl, _("Failed to mark domain %s as autostarted"), name); + vshError(ctl, _("Failed to mark domain '%s' as autostarted"), name); else - vshError(ctl, _("Failed to unmark domain %s as autostarted"), name); + vshError(ctl, _("Failed to unmark domain '%s' as autostarted"), name); virshDomainFree(dom); return false; } if (autostart) - vshPrintExtra(ctl, _("Domain %s marked as autostarted\n"), name); + vshPrintExtra(ctl, _("Domain '%s' marked as autostarted\n"), name); else - vshPrintExtra(ctl, _("Domain %s unmarked as autostarted\n"), name); + vshPrintExtra(ctl, _("Domain '%s' unmarked as autostarted\n"), name); virshDomainFree(dom); return true; @@ -2987,7 +2987,7 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom, return false; } - vshPrintExtra(ctl, _("Connected to domain %s\n"), virDomainGetName(dom)); + vshPrintExtra(ctl, _("Connected to domain '%s'\n"), virDomainGetName(dom)); vshPrintExtra(ctl, _("Escape character is %s"), priv->escapeChar); if (priv->escapeChar[0] == '^') vshPrintExtra(ctl, " (Ctrl + %c)", priv->escapeChar[1]); @@ -3427,9 +3427,9 @@ cmdSuspend(vshControl *ctl, const vshCmd *cmd) return false; if (virDomainSuspend(dom) == 0) { - vshPrintExtra(ctl, _("Domain %s suspended\n"), name); + vshPrintExtra(ctl, _("Domain '%s' suspended\n"), name); } else { - vshError(ctl, _("Failed to suspend domain %s"), name); + vshError(ctl, _("Failed to suspend domain '%s'"), name); ret = false; } @@ -3501,12 +3501,12 @@ cmdDomPMSuspend(vshControl *ctl, const vshCmd *cmd) } if (virDomainPMSuspendForDuration(dom, suspendTarget, duration, 0) < 0) { - vshError(ctl, _("Domain %s could not be suspended"), + vshError(ctl, _("Domain '%s' could not be suspended"), virDomainGetName(dom)); goto cleanup; } - vshPrintExtra(ctl, _("Domain %s successfully suspended"), + vshPrintExtra(ctl, _("Domain '%s' successfully suspended"), virDomainGetName(dom)); ret = true; @@ -3548,12 +3548,12 @@ cmdDomPMWakeup(vshControl *ctl, const vshCmd *cmd) return false; if (virDomainPMWakeup(dom, flags) < 0) { - vshError(ctl, _("Domain %s could not be woken up"), + vshError(ctl, _("Domain '%s' could not be woken up"), virDomainGetName(dom)); goto cleanup; } - vshPrintExtra(ctl, _("Domain %s successfully woken up"), + vshPrintExtra(ctl, _("Domain '%s' successfully woken up"), virDomainGetName(dom)); ret = true; @@ -3930,10 +3930,10 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) out: if (rc == 0) { - vshPrintExtra(ctl, _("Domain %s has been undefined\n"), name); + vshPrintExtra(ctl, _("Domain '%s' has been undefined\n"), name); ret = true; } else { - vshError(ctl, _("Failed to undefine domain %s"), name); + vshError(ctl, _("Failed to undefine domain '%s'"), name); goto cleanup; } @@ -4150,12 +4150,12 @@ cmdStart(vshControl *ctl, const vshCmd *cmd) if ((nfds ? virDomainCreateWithFiles(dom, nfds, fds, flags) : (flags ? virDomainCreateWithFlags(dom, flags) : virDomainCreate(dom))) < 0) { - vshError(ctl, _("Failed to start domain %s"), virDomainGetName(dom)); + vshError(ctl, _("Failed to start domain '%s'"), virDomainGetName(dom)); goto cleanup; } started: - vshPrintExtra(ctl, _("Domain %s started\n"), + vshPrintExtra(ctl, _("Domain '%s' started\n"), virDomainGetName(dom)); #ifndef WIN32 if (console && !cmdRunConsole(ctl, dom, NULL, 0)) @@ -4255,7 +4255,7 @@ doSave(void *opaque) if (((flags || xml) ? virDomainSaveFlags(dom, to, xml, flags) : virDomainSave(dom, to)) < 0) { - vshError(ctl, _("Failed to save domain %s to %s"), name, to); + vshError(ctl, _("Failed to save domain '%s' to %s"), name, to); goto out; } @@ -4512,7 +4512,7 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) virThreadJoin(&workerThread); if (!data.ret) - vshPrintExtra(ctl, _("\nDomain %s saved to %s\n"), name, to); + vshPrintExtra(ctl, _("\nDomain '%s' saved to %s\n"), name, to); cleanup: virshDomainFree(dom); @@ -4771,7 +4771,7 @@ doManagedsave(void *opaque) goto out; if (virDomainManagedSave(dom, flags) < 0) { - vshError(ctl, _("Failed to save domain %s state"), name); + vshError(ctl, _("Failed to save domain '%s' state"), name); goto out; } @@ -4819,7 +4819,7 @@ cmdManagedSave(vshControl *ctl, const vshCmd *cmd) virThreadJoin(&workerThread); if (!data.ret) - vshPrintExtra(ctl, _("\nDomain %s state saved by libvirt\n"), name); + vshPrintExtra(ctl, _("\nDomain '%s' state saved by libvirt\n"), name); cleanup: virshDomainFree(dom); @@ -4863,15 +4863,15 @@ cmdManagedSaveRemove(vshControl *ctl, const vshCmd *cmd) if (hassave) { if (virDomainManagedSaveRemove(dom, 0) < 0) { - vshError(ctl, _("Failed to remove managed save image for domain %s"), + vshError(ctl, _("Failed to remove managed save image for domain '%s'"), name); goto cleanup; } else - vshPrintExtra(ctl, _("Removed managedsave image for domain %s"), name); + vshPrintExtra(ctl, _("Removed managedsave image for domain '%s'"), name); } else - vshPrintExtra(ctl, _("Domain %s has no manage save image; removal skipped"), + vshPrintExtra(ctl, _("Domain '%s' has no manage save image; removal skipped"), name); ret = true; @@ -4929,7 +4929,7 @@ cmdManagedSaveEdit(vshControl *ctl, const vshCmd *cmd) #define EDIT_GET_XML virDomainManagedSaveGetXMLDesc(dom, getxml_flags) #define EDIT_NOT_CHANGED \ do { \ - vshPrintExtra(ctl, _("Managed save image of domain %s XML configuration " \ + vshPrintExtra(ctl, _("Managed save image of domain '%s' XML configuration " \ "not changed.\n"), virDomainGetName(dom)); \ ret = true; \ goto edit_cleanup; \ @@ -4938,7 +4938,7 @@ cmdManagedSaveEdit(vshControl *ctl, const vshCmd *cmd) (virDomainManagedSaveDefineXML(dom, doc_edited, define_flags) == 0) #include "virsh-edit.c" - vshPrintExtra(ctl, _("Managed save image of Domain %s XML configuration edited.\n"), + vshPrintExtra(ctl, _("Managed save image of Domain '%s' XML configuration edited.\n"), virDomainGetName(dom)); ret = true; @@ -5057,7 +5057,7 @@ cmdManagedSaveDefine(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - vshPrintExtra(ctl, _("Managed save state file of domain %s updated.\n"), + vshPrintExtra(ctl, _("Managed save state file of domain '%s' updated.\n"), virDomainGetName(dom)); ret = true; @@ -5485,12 +5485,12 @@ doDump(void *opaque) if (dumpformat != VIR_DOMAIN_CORE_DUMP_FORMAT_RAW) { if (virDomainCoreDumpWithFormat(dom, to, dumpformat, flags) < 0) { - vshError(ctl, _("Failed to core dump domain %s to %s"), name, to); + vshError(ctl, _("Failed to core dump domain '%s' to %s"), name, to); goto out; } } else { if (virDomainCoreDump(dom, to, flags) < 0) { - vshError(ctl, _("Failed to core dump domain %s to %s"), name, to); + vshError(ctl, _("Failed to core dump domain '%s' to %s"), name, to); goto out; } } @@ -5543,7 +5543,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) virThreadJoin(&workerThread); if (!data.ret) - vshPrintExtra(ctl, _("\nDomain %s dumped to %s\n"), name, to); + vshPrintExtra(ctl, _("\nDomain '%s' dumped to %s\n"), name, to); cleanup: virshDomainFree(dom); @@ -5659,7 +5659,7 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) cbdata.fd = fd; if (virStreamRecvAll(st, virshStreamSink, &cbdata) < 0) { - vshError(ctl, _("could not receive data from domain %s"), name); + vshError(ctl, _("could not receive data from domain '%s'"), name); goto cleanup; } @@ -5669,7 +5669,7 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) } if (virStreamFinish(st) < 0) { - vshError(ctl, _("cannot close stream on domain %s"), name); + vshError(ctl, _("cannot close stream on domain '%s'"), name); goto cleanup; } @@ -5882,9 +5882,9 @@ cmdResume(vshControl *ctl, const vshCmd *cmd) return false; if (virDomainResume(dom) == 0) { - vshPrintExtra(ctl, _("Domain %s resumed\n"), name); + vshPrintExtra(ctl, _("Domain '%s' resumed\n"), name); } else { - vshError(ctl, _("Failed to resume domain %s"), name); + vshError(ctl, _("Failed to resume domain '%s'"), name); ret = false; } @@ -5964,9 +5964,9 @@ cmdShutdown(vshControl *ctl, const vshCmd *cmd) else rv = virDomainShutdown(dom); if (rv == 0) { - vshPrintExtra(ctl, _("Domain %s is being shutdown\n"), name); + vshPrintExtra(ctl, _("Domain '%s' is being shutdown\n"), name); } else { - vshError(ctl, _("Failed to shutdown domain %s"), name); + vshError(ctl, _("Failed to shutdown domain '%s'"), name); goto cleanup; } @@ -6044,9 +6044,9 @@ cmdReboot(vshControl *ctl, const vshCmd *cmd) goto cleanup; if (virDomainReboot(dom, flags) == 0) { - vshPrintExtra(ctl, _("Domain %s is being rebooted\n"), name); + vshPrintExtra(ctl, _("Domain '%s' is being rebooted\n"), name); } else { - vshError(ctl, _("Failed to reboot domain %s"), name); + vshError(ctl, _("Failed to reboot domain '%s'"), name); goto cleanup; } @@ -6086,9 +6086,9 @@ cmdReset(vshControl *ctl, const vshCmd *cmd) return false; if (virDomainReset(dom, 0) == 0) { - vshPrintExtra(ctl, _("Domain %s was reset\n"), name); + vshPrintExtra(ctl, _("Domain '%s' was reset\n"), name); } else { - vshError(ctl, _("Failed to reset domain %s"), name); + vshError(ctl, _("Failed to reset domain '%s'"), name); ret = false; } @@ -8311,7 +8311,7 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - vshPrintExtra(ctl, _("Domain %s created from %s\n"), + vshPrintExtra(ctl, _("Domain '%s' created from %s\n"), virDomainGetName(dom), from); #ifndef WIN32 if (console) @@ -8374,7 +8374,7 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) VIR_FREE(buffer); if (dom != NULL) { - vshPrintExtra(ctl, _("Domain %s defined from %s\n"), + vshPrintExtra(ctl, _("Domain '%s' defined from %s\n"), virDomainGetName(dom), from); virshDomainFree(dom); } else { @@ -8427,9 +8427,9 @@ cmdDestroy(vshControl *ctl, const vshCmd *cmd) result = virDomainDestroy(dom); if (result == 0) { - vshPrintExtra(ctl, _("Domain %s destroyed\n"), name); + vshPrintExtra(ctl, _("Domain '%s' destroyed\n"), name); } else { - vshError(ctl, _("Failed to destroy domain %s"), name); + vshError(ctl, _("Failed to destroy domain '%s'"), name); ret = false; } @@ -9724,10 +9724,10 @@ virshEventQemuPrint(virConnectPtr conn G_GNUC_UNUSED, if (virTimeStringNowRaw(timestamp) < 0) timestamp[0] = '\0'; - vshPrint(data->ctl, "%s: event %s for domain %s: %s\n", + vshPrint(data->ctl, "%s: event %s for domain '%s': %s\n", timestamp, event, virDomainGetName(dom), NULLSTR(details)); } else { - vshPrint(data->ctl, "event %s at %lld.%06u for domain %s: %s\n", + vshPrint(data->ctl, "event %s at %lld.%06u for domain '%s': %s\n", event, seconds, micros, virDomainGetName(dom), NULLSTR(details)); } @@ -9886,7 +9886,7 @@ cmdQemuAttach(vshControl *ctl, const vshCmd *cmd) return false; } - vshPrintExtra(ctl, _("Domain %s attached to pid %u\n"), + vshPrintExtra(ctl, _("Domain '%s' attached to pid %u\n"), virDomainGetName(dom), pid_value); virshDomainFree(dom); return true; @@ -12766,7 +12766,7 @@ cmdEdit(vshControl *ctl, const vshCmd *cmd) #define EDIT_GET_XML virDomainGetXMLDesc(dom, query_flags) #define EDIT_NOT_CHANGED \ do { \ - vshPrintExtra(ctl, _("Domain %s XML configuration not changed.\n"), \ + vshPrintExtra(ctl, _("Domain '%s' XML configuration not changed.\n"), \ virDomainGetName(dom)); \ ret = true; \ goto edit_cleanup; \ @@ -12781,7 +12781,7 @@ cmdEdit(vshControl *ctl, const vshCmd *cmd) #include "virsh-edit.c" #undef EDIT_RELAX - vshPrintExtra(ctl, _("Domain %s XML configuration edited.\n"), + vshPrintExtra(ctl, _("Domain '%s' XML configuration edited.\n"), virDomainGetName(dom_edited)); ret = true; @@ -13088,7 +13088,7 @@ virshEventGenericPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event '%s' for domain %s\n"), + virBufferAsprintf(&buf, _("event '%s' for domain '%s'\n"), ((virshDomEventData *) opaque)->cb->name, virDomainGetName(dom)); virshEventPrint(opaque, &buf); @@ -13103,7 +13103,7 @@ virshEventLifecyclePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'lifecycle' for domain %s: %s %s\n"), + virBufferAsprintf(&buf, _("event 'lifecycle' for domain '%s': %s %s\n"), virDomainGetName(dom), virshDomainEventToString(event), virshDomainEventDetailToString(event, detail)); @@ -13118,7 +13118,7 @@ virshEventRTCChangePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'rtc-change' for domain %s: %lld\n"), + virBufferAsprintf(&buf, _("event 'rtc-change' for domain '%s': %lld\n"), virDomainGetName(dom), utcoffset); virshEventPrint(opaque, &buf); @@ -13132,7 +13132,7 @@ virshEventWatchdogPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'watchdog' for domain %s: %s\n"), + virBufferAsprintf(&buf, _("event 'watchdog' for domain '%s': %s\n"), virDomainGetName(dom), virshDomainEventWatchdogToString(action)); virshEventPrint(opaque, &buf); @@ -13148,7 +13148,7 @@ virshEventIOErrorPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'io-error' for domain %s: %s (%s) %s\n"), + virBufferAsprintf(&buf, _("event 'io-error' for domain '%s': %s (%s) %s\n"), virDomainGetName(dom), srcPath, devAlias, @@ -13169,7 +13169,7 @@ virshEventGraphicsPrint(virConnectPtr conn G_GNUC_UNUSED, g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; size_t i; - virBufferAsprintf(&buf, _("event 'graphics' for domain %s: " + virBufferAsprintf(&buf, _("event 'graphics' for domain '%s': " "%s local[%s %s %s] remote[%s %s %s] %s\n"), virDomainGetName(dom), virshGraphicsPhaseToString(phase), @@ -13199,7 +13199,7 @@ virshEventIOErrorReasonPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'io-error-reason' for domain %s: " + virBufferAsprintf(&buf, _("event 'io-error-reason' for domain '%s': " "%s (%s) %s due to %s\n"), virDomainGetName(dom), srcPath, @@ -13219,7 +13219,7 @@ virshEventBlockJobPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event '%s' for domain %s: %s for %s %s\n"), + virBufferAsprintf(&buf, _("event '%s' for domain '%s': %s for %s %s\n"), ((virshDomEventData *) opaque)->cb->name, virDomainGetName(dom), virshDomainBlockJobToString(type), @@ -13239,7 +13239,7 @@ virshEventDiskChangePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'disk-change' for domain %s disk %s: " + virBufferAsprintf(&buf, _("event 'disk-change' for domain '%s' disk %s: " "%s -> %s: %s\n"), virDomainGetName(dom), alias, @@ -13258,7 +13258,7 @@ virshEventTrayChangePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'tray-change' for domain %s disk %s: %s\n"), + virBufferAsprintf(&buf, _("event 'tray-change' for domain '%s' disk %s: %s\n"), virDomainGetName(dom), alias, virshDomainEventTrayChangeToString(reason)); @@ -13284,7 +13284,7 @@ virshEventBalloonChangePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'balloon-change' for domain %s: %lluKiB\n"), + virBufferAsprintf(&buf, _("event 'balloon-change' for domain '%s': %lluKiB\n"), virDomainGetName(dom), actual); virshEventPrint(opaque, &buf); @@ -13298,7 +13298,7 @@ virshEventDeviceRemovedPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'device-removed' for domain %s: %s\n"), + virBufferAsprintf(&buf, _("event 'device-removed' for domain '%s': %s\n"), virDomainGetName(dom), alias); virshEventPrint(opaque, &buf); @@ -13312,7 +13312,7 @@ virshEventDeviceAddedPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'device-added' for domain %s: %s\n"), + virBufferAsprintf(&buf, _("event 'device-added' for domain '%s': %s\n"), virDomainGetName(dom), alias); virshEventPrint(opaque, &buf); @@ -13329,7 +13329,7 @@ virshEventTunablePrint(virConnectPtr conn G_GNUC_UNUSED, size_t i; char *value; - virBufferAsprintf(&buf, _("event 'tunable' for domain %s:\n"), + virBufferAsprintf(&buf, _("event 'tunable' for domain '%s':\n"), virDomainGetName(dom)); for (i = 0; i < nparams; i++) { value = virTypedParameterToString(&params[i]); @@ -13365,7 +13365,7 @@ virshEventAgentLifecyclePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'agent-lifecycle' for domain %s: state: " + virBufferAsprintf(&buf, _("event 'agent-lifecycle' for domain '%s': state: " "'%s' reason: '%s'\n"), virDomainGetName(dom), UNKNOWNSTR(virshEventAgentLifecycleStateTypeToString(state)), @@ -13381,7 +13381,7 @@ virshEventMigrationIterationPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'migration-iteration' for domain %s: " + virBufferAsprintf(&buf, _("event 'migration-iteration' for domain '%s': " "iteration: '%d'\n"), virDomainGetName(dom), iteration); @@ -13400,7 +13400,7 @@ virshEventJobCompletedPrint(virConnectPtr conn G_GNUC_UNUSED, size_t i; char *value; - virBufferAsprintf(&buf, _("event 'job-completed' for domain %s:\n"), + virBufferAsprintf(&buf, _("event 'job-completed' for domain '%s':\n"), virDomainGetName(dom)); for (i = 0; i < nparams; i++) { value = virTypedParameterToString(&params[i]); @@ -13421,7 +13421,7 @@ virshEventDeviceRemovalFailedPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'device-removal-failed' for domain %s: %s\n"), + virBufferAsprintf(&buf, _("event 'device-removal-failed' for domain '%s': %s\n"), virDomainGetName(dom), alias); virshEventPrint(opaque, &buf); @@ -13443,7 +13443,7 @@ virshEventMetadataChangePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'metadata-change' for domain %s: %s %s\n"), + virBufferAsprintf(&buf, _("event 'metadata-change' for domain '%s': %s %s\n"), virDomainGetName(dom), UNKNOWNSTR(virshEventMetadataChangeTypeTypeToString(type)), NULLSTR(nsuri)); @@ -13462,7 +13462,7 @@ virshEventBlockThresholdPrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'block-threshold' for domain %s: " + virBufferAsprintf(&buf, _("event 'block-threshold' for domain '%s': " "dev: %s(%s) %llu %llu\n"), virDomainGetName(dom), dev, NULLSTR(path), threshold, excess); @@ -13494,7 +13494,7 @@ virshEventMemoryFailurePrint(virConnectPtr conn G_GNUC_UNUSED, { g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - virBufferAsprintf(&buf, _("event 'memory-failure' for domain %s:\n" + virBufferAsprintf(&buf, _("event 'memory-failure' for domain '%s':\n" "recipient: %s\naction: %s\n"), virDomainGetName(dom), UNKNOWNSTR(virshEventMemoryFailureRecipientTypeTypeToString(recipient)), -- 2.29.2

2 1

[PATCH v1] docs: migration: remove xenmigr
by Olaf Hering 05 Jan '21

05 Jan '21

xenmigr was for xend Fixes commit 1dac5fbbbb06a0341e8087dc33af75c8352d77a4 Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- docs/migration.html.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/migration.html.in b/docs/migration.html.in index ac38c6e13d..627200f96a 100644 --- a/docs/migration.html.in +++ b/docs/migration.html.in @@ -491,7 +491,6 @@ virsh migrate web1 xen+tls://desthost/system eg using secondary network interface virsh migrate web1 qemu://desthost/system tcp://10.0.0.1/ -virsh migrate web1 xen+tcp://desthost/system xenmigr:10.0.0.1/ </pre> <p> @@ -562,13 +561,8 @@ syntax: virsh migrate GUESTNAME HV-URI eg using same libvirt URI for all connections -virsh migrate --direct web1 xenmigr://desthost/ </pre> - <p> - Supported by Xen driver - </p> - <h3><a id="nativepeer2peer">Native migration, peer2peer between two libvirtd servers</a></h3> <p>

2 1

[PATCH v2] qemu: Don't prealloc mem for real NVDIMMs
by Michal Privoznik 05 Jan '21

05 Jan '21

Currently, we configure QEMU to prealloc memory almost by default. Well, by default for NVDIMMs, hugepages and if user asked us to (via memoryBacking <allocation mode="immediate"/>). However, when guest's NVDIMM is backed by real life NVDIMM this approach is not the best. In this case users should put <pmem/> into the <memory/> device <source/>, like this: <memory model='nvdimm' access='shared'> <source> <path>/dev/pmem0</path> <pmem/> </source> </memory> Instructing QEMU to do prealloc in this case means that each page of the NVDIMM is "touched" (the first byte is read and written back - see QEMU commit v2.9.0-rc1~26^2) which cripples device wear. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1894053 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- v2 of: https://www.redhat.com/archives/libvir-list/2020-November/msg01568.html diff to v1: - I've dropped the first hunk of v1 which forbade prealloc even if user requested it explicitly. src/qemu/qemu_command.c | 5 ++++- .../memory-hotplug-nvdimm-pmem.x86_64-latest.args | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b06a086e18..f572ed64c1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3085,7 +3085,10 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps, if (mem->nvdimmPath) { memPath = g_strdup(mem->nvdimmPath); - prealloc = true; + /* If the NVDIMM is a real device then there's nothing to prealloc. + * If anyhing, we would be only wearing off the device. */ + if (!mem->nvdimmPmem) + prealloc = true; } else if (useHugepage) { if (qemuGetDomainHupageMemPath(priv->driver, def, pagesize, &memPath) < 0) return -1; diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args index cac02a6f6d..fb4ae4b518 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -20,7 +20,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -object memory-backend-ram,id=ram-node0,size=224395264 \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,share=no,\ -prealloc=yes,size=536870912,pmem=yes \ +size=536870912,pmem=yes \ -device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -- 2.26.2

3 2

[PATCH] qemu: Properly handle setting of <iotune> for empty cdrom
by Peter Krempa 05 Jan '21

05 Jan '21

When starting a VM with an empty cdrom which has <iotune> configured the startup fails as qemu is not happy about setting tuning for an empty drive: error: internal error: unable to execute 'block_set_io_throttle', unexpected error: 'Device has no medium' Resolve this by skipping the setting of throttling for empty drives and updating the throttling when new medium is inserted into the drive. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/111 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_hotplug.c | 10 ++++++++++ src/qemu/qemu_process.c | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9b93f256e8..57635cd419 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -558,6 +558,16 @@ qemuDomainChangeMediaBlockdev(virQEMUDriverPtr driver, nodename); } + /* set throttling for the new image */ + if (rc == 0 && + !virStorageSourceIsEmpty(newsrc) && + qemuDiskConfigBlkdeviotuneEnabled(disk)) { + rc = qemuMonitorSetBlockIoThrottle(priv->mon, NULL, + diskPriv->qomName, + &disk->blkdeviotune, + true, true, true); + } + if (rc == 0) rc = qemuMonitorBlockdevTrayClose(priv->mon, diskPriv->qomName); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e7421b415f..414e9327d2 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6838,6 +6838,10 @@ qemuProcessSetupDiskThrottlingBlockdev(virQEMUDriverPtr driver, if (qemuDiskBusIsSD(disk->bus)) continue; + /* Setting throttling for empty drives fails */ + if (virStorageSourceIsEmpty(disk->src)) + continue; + if (!qemuDiskConfigBlkdeviotuneEnabled(disk)) continue; -- 2.29.2

2 1

[PATCH] networkGetDHCPLeases: Don't assign @ipdef_tmp twice
by Michal Privoznik 05 Jan '21

05 Jan '21

When rewriting the function, I've mistakenly declared a variable and assigned it to itself. Let's initialize the variable properly. Fixes: 5fb6d98c881c42ab41ca72060217b846949a438f Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as trivial. src/network/bridge_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 22d7d330a3..a7c5aade14 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -4155,7 +4155,7 @@ networkGetDHCPLeases(virNetworkPtr net, /* Obtain prefix */ for (j = 0; j < def->nips; j++) { - virNetworkIPDefPtr ipdef_tmp = ipdef_tmp = &def->ips[j]; + virNetworkIPDefPtr ipdef_tmp = &def->ips[j]; if (ipv6 && VIR_SOCKET_ADDR_IS_FAMILY(&ipdef_tmp->address, AF_INET6)) { -- 2.26.2

1 0

[PATCH 00/10] Fix NSS plugin and net-dhcp-get-leases wrt to infinite leases
by Michal Privoznik 05 Jan '21

05 Jan '21

Some things are broken when using leases that don't expire. We don't store "expiry-time" in corresponding $brname.status file which sets off a spiral and we get errors from other places which expect it to be there always. These patches make sure that the attribute is always there. I've also implemented another approach, which puts "expiry-time" into the file only if not infinite and fixed the other places which expect it: https://gitlab.com/MichalPrivoznik/libvirt/-/commits/leases_docs/ but I like this version more. Michal Prívozník (10): docs: Document ability to configure lease time leaseshelper: Report errors on failure virlease: Rework virLeaseReadCustomLeaseFile() virlease: Use virTrimSpaces() instead of open coded alternative virlease: Allow infinite lease expiry time network: Drop @custom_lease_file_len variable from networkGetDHCPLeases() networkGetDHCPLeases: Use VIR_APPEND_ELEMENT() instead of VIR_INSERT_ELEMENT() network: Rework networkGetDHCPLeases() networkGetDHCPLeases: Handle leases with infinite expiry time nss: handle leases with infinite expiry time docs/formatnetwork.html.in | 21 ++++++++- src/network/bridge_driver.c | 79 +++++++++++++++++----------------- src/network/leaseshelper.c | 2 + src/util/virlease.c | 33 +++++++------- tests/nssdata/virbr0.status | 7 +++ tests/nsstest.c | 2 +- tools/nss/libvirt_nss_leases.c | 4 +- 7 files changed, 87 insertions(+), 61 deletions(-) -- 2.26.2

3 13

[libvirt PATCH v2 0/5] vmx: Don't error out on missing filename for cdrom
by Martin Kletzander 05 Jan '21

05 Jan '21

This is perfectly valid in VMWare and the VM just boots with an empty drive. We used to just skip the whole drive before, but since we changed how we parse empty cdrom drives this now results in an error and the user not being able to even dump the XML. Instead of erroring out, just keep the drive empty. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1903953 v2: - Do not report and reset an error, but handle it more nicely. v1: - https://www.redhat.com/archives/libvir-list/2020-December/msg00840.html Martin Kletzander (5): esx: Unindent unnecessary conditional branch tests: Use g_autofree in testParseVMXFileName vmx: Make virVMXParseFileName return an integer vmx: Allow missing cdrom image file in virVMXParseFileName vmx: Treat missing cdrom-image as empty drive src/esx/esx_driver.c | 160 ++++++++++-------- src/vmware/vmware_conf.c | 10 +- src/vmx/vmx.c | 25 +-- src/vmx/vmx.h | 5 +- .../vmx2xmldata/vmx2xml-cdrom-ide-missing.vmx | 6 + tests/vmx2xmltest.c | 36 ++-- 6 files changed, 136 insertions(+), 106 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-missing.vmx -- 2.29.2

3 8

[libvirt PATCH] docs: Fix dead link
by Tim Wiederhake 05 Jan '21

05 Jan '21

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- docs/coding-style.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/coding-style.rst b/docs/coding-style.rst index b3ac070fac..55dfa196a2 100644 --- a/docs/coding-style.rst +++ b/docs/coding-style.rst @@ -939,7 +939,7 @@ ok: Although libvirt does not encourage the Linux kernel wind/unwind style of multiple labels, there's a good general discussion of the issue archived at -`KernelTrap <http://kerneltrap.org/node/553/2131>`__ +`KernelTrap <https://web.archive.org/web/20130521051957/http://kerneltrap.org/node/553/2…>`__ When using goto, please use one of these standard labels if it makes sense: -- 2.26.2

3 2

[PATCH] update ci dockerfile from Leap 15.1 to 15.2
by Cho, Yu-Chen 05 Jan '21

05 Jan '21

Signed-off-by: Cho, Yu-Chen <acho(a)suse.com> --- .gitlab-ci.yml | 14 +++++++------- ...e-151.Dockerfile => ci-opensuse-152.Dockerfile} | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) rename ci/containers/{ci-opensuse-151.Dockerfile => ci-opensuse-152.Dockerfile} (98%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2d5545f0f..30a0b23381 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -160,10 +160,10 @@ x64-fedora-rawhide-container: variables: NAME: fedora-rawhide -x64-opensuse-151-container: +x64-opensuse-152-container: <<: *container_job_definition variables: - NAME: opensuse-151 + NAME: opensuse-152 x64-ubuntu-1804-container: <<: *container_job_definition @@ -365,12 +365,12 @@ x64-fedora-rawhide-clang: CC: clang RPM: skip -x64-opensuse-151: +x64-opensuse-152: <<: *native_build_job_definition needs: - - x64-opensuse-151-container + - x64-opensuse-152-container variables: - NAME: opensuse-151 + NAME: opensuse-152 RPM: skip x64-ubuntu-1804: @@ -533,9 +533,9 @@ website: codestyle: stage: builds - image: $CI_REGISTRY_IMAGE/ci-opensuse-151:latest + image: $CI_REGISTRY_IMAGE/ci-opensuse-152:latest needs: - - x64-opensuse-151-container + - x64-opensuse-152-container before_script: - *script_variables script: diff --git a/ci/containers/ci-opensuse-151.Dockerfile b/ci/containers/ci-opensuse-152.Dockerfile similarity index 98% rename from ci/containers/ci-opensuse-151.Dockerfile rename to ci/containers/ci-opensuse-152.Dockerfile index 9458d2de0c..def45cbe3f 100644 --- a/ci/containers/ci-opensuse-151.Dockerfile +++ b/ci/containers/ci-opensuse-152.Dockerfile @@ -3,7 +3,7 @@ # $ lcitool dockerfile opensuse-151 libvirt # # https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c4… -FROM registry.opensuse.org/opensuse/leap:15.1 +FROM registry.opensuse.org/opensuse/leap:15.2 RUN zypper update -y && \ zypper install -y \ -- 2.29.2

2 1

[libvirt PATCH 0/2] rpm: minor swtpm fixes
by Daniel P. Berrangé 05 Jan '21

05 Jan '21

Originally reported at https://src.fedoraproject.org/rpms/libvirt/pull-request/9 Daniel P. Berrangé (2): rpm: ensure swtpm tools are installed with QEMU rpm: fix ownership of the swtpm log directory libvirt.spec.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.29.2

2 4

[PATCH] Enable VMware driver by default
by Michal Privoznik 05 Jan '21

05 Jan '21

During rewrite to meson it was mistakenly disabled. Originally, we had: LIBVIRT_ARG_WITH_FEATURE([VMWARE], [VMware], [yes]) which enabled the driver by default. But in meson we are checking whether the 'driver_vmware' option is enabled without anything enabling it automagically. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 3f3412975b..b5164f68ed 100644 --- a/meson.build +++ b/meson.build @@ -1790,7 +1790,7 @@ if not get_option('driver_vbox').disabled() and conf.has('WITH_LIBVIRTD') conf.set_quoted('VBOX_XPCOMC_DIR', get_option('vbox_xpcomc_dir')) endif -if get_option('driver_vmware').enabled() +if not get_option('driver_vmware').disabled() conf.set('WITH_VMWARE', 1) conf.set('WITH_VMX', 1) endif -- 2.26.2

2 1

[PATCH] Fix wrong use of path variable
by liyalei 05 Jan '21

05 Jan '21

From: liyalei <liyl43(a)chinatelecom.cn> --- src/util/virnetdevopenvswitch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index d380b0cf22..7eabaa763d 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -494,7 +494,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path, if (server) { virCommandAddArgList(cmd, "--no-headings", "--columns=name", "find", "Interface", NULL); - virCommandAddArgPair(cmd, "options:vhost-server-path", "path"); + virCommandAddArgPair(cmd, "options:vhost-server-path", path); } else { const char *tmpIfname = NULL; -- 2.27.0

3 2

[PATCH 0/5] Fix qemuNodeGetSecurityModel() and some related cleanups
by Michal Privoznik 05 Jan '21

05 Jan '21

While I'd love to give more context, I can't - I've found these on a stale branch. However, they are still valid and worth of merging. Michal Prívozník (5): qemu: Use virStrcpy in qemuNodeGetSecurityModel() qemu: Obtain @caps only after ACL check in qemuNodeGetSecurityModel qemu: Fix retval if ACL check fails in qemuNodeGetSecurityModel domain_conf: Parse full length of some <seclabel/> attributes use more virStrcpy() and virStrcpyStatic() src/conf/domain_conf.c | 6 ++---- src/libvirt-lxc.c | 5 ++--- src/qemu/qemu_driver.c | 23 +++++++++-------------- src/remote/remote_driver.c | 12 ++++-------- src/security/security_selinux.c | 3 +-- 5 files changed, 18 insertions(+), 31 deletions(-) -- 2.26.2

2 6

Release of libvirt-6.5.0
by Daniel Veillard 04 Jan '21

04 Jan '21

Half a day late, but I pushed the 6.5.0 release out, it is as usual available as a signed tarball and source rpms from the server: https://libvirt.org/sources/ I also tagged and pushed the 6.5.0 python bindings that one can find at https://libvirt.org/sources/python/ This release includes a number of new features and some improvement, as well as a crash which had made its way in 6.4.0. It will also be my last release of libvirt after close to 15 years, so expect new releases to be signed by Jiri Denemark from now on. * New Features: - Allow firmware blobs configuration QEMU offers a way to tweak how firmware configures itself and/or provide new configuration blobs. New ``<sysinfo/>`` type is introduced that will hold these new blobs. It's possible to either specify new value as a string or provide a filename which contents then serve as the value. - nodedev: Add ability to create mediated devices Mediated devices can now be created with ``virNodeDeviceCreateXML()``. This functionality requires the ``mdevctl`` utility to be installed. The XML schema for node devices was expanded to support attributes for mediated devices. - QEMU: add TPM Proxy device support libvirt can now create guests using a new device type called "TPM Proxy". The TPM Proxy connects to a TPM Resource Manager present in the host, enabling the guest to run in secure virtual machine mode with the help of an Ultravisor. Adding a TPM Proxy to a pSeries guest brings no security benefits unless the guest is running on a PPC64 host that has Ultravisor and TPM Resource Manager support. Only one TPM Proxy is allowed per guest. A guest using a TPM Proxy device can instantiate another TPM device at the same time. This device is supported only for pSeries guests via the new 'spapr-tpm-proxy' model of the TPM 'passthrough' backend. - virhook: Support hooks placed in several files Running all scripts from directory /etc/libvirt/hooks/<driver>.d in alphabetical order. Hook script in old place will be executed as first for backward compatibility. - qemu: Add support for migratable host-passthrough CPU QEMU 2.12 made it possible for guests to use a migration-friendly version of the host-passthrough CPU. This feature is now exposed by libvirt. * Improvements: - network: Support NAT with IPv6 It's now possible to use ``<nat ipv6="yes"/>`` in a libvirt network. - qemu: Auto-fill NUMA information for incomplete topologies If the NUMA topology is not fully described in the guest XML, libvirt will complete it by putting all unspecified CPUs in the first NUMA node. This is only done in the QEMU binary itself supports disjointed CPU ranges for NUMA nodes. - qemu: Assign hostdev-backed interfaces to PCIe slots All SR-IOV capable devices are PCIe, so when their VFs are assigned to guests they should end up in PCIe slots rather than conventional PCI ones. * Bug fixes: - qemu: fixed crash in ``qemuDomainBlockCommit`` This release fixes a regression which was introduced in libvirt v6.4.0 where libvirtd always crashes when a block commit of a disk is requested. - qemu: fixed zPCI address auto generation on s390 Removes the correlation between the zPCI address attributes uid and fid. Fixes the validation and autogeneration of zPCI address attributes. - qemu: Skip pre-creation of NVMe disks during migration libvirt has no way to create NVMe devices on the target host, so it now just makes sure they exist and let the migration proceed in that case. Thanks everybody for the help on putting this release out, and the gazillion ones before :-) Enjoy and stay safe ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

5 6

[PATCH] kbase: debuglogs: Fix typo in unprivileged libvirtd config path
by Tomáš Janoušek 04 Jan '21

04 Jan '21

Signed-off-by: Tomáš Janoušek <tomi(a)nomi.cz> --- docs/kbase/debuglogs.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/kbase/debuglogs.rst b/docs/kbase/debuglogs.rst index f3937bc337..3fb06bedc3 100644 --- a/docs/kbase/debuglogs.rst +++ b/docs/kbase/debuglogs.rst @@ -68,7 +68,7 @@ variable: However, when you are using the session mode ``qemu:///session`` or you run the ``libvirtd`` as unprivileged user you will find configuration file under -``$XDG_CONFIG_HOME/libvirt/libvirt.conf``. +``$XDG_CONFIG_HOME/libvirt/libvirtd.conf``. Runtime setting ^^^^^^^^^^^^^^^ -- Tomáš Janoušek, a.k.a. Pivník, a.k.a. Liskni_si, https://work.lisk.in/

2 1

[PATCH] qemu: Drop has_ccw_address from _qemuAgentDiskAddress
by Michal Privoznik 04 Jan '21

04 Jan '21

In recent patches new mambers to _qemuAgentDiskAddress struct were introduced to keep optional CCW address sent by the guest agent. These two members are a struct to store CCW address into and a boolean to keep track whether the CCW address is valid. Well, we can hold the same information with a pointer - instead of storing the CCW address structure let's keep just a pointer to it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_agent.c | 18 ++++++++++++------ src/qemu/qemu_agent.h | 3 +-- src/qemu/qemu_driver.c | 9 +++------ 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index b155896e78..af0397e6e2 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1824,6 +1824,7 @@ qemuAgentDiskAddressFree(qemuAgentDiskAddressPtr info) g_free(info->serial); g_free(info->bus_type); g_free(info->devnode); + g_free(info->ccw_addr); g_free(info); } @@ -1899,12 +1900,17 @@ qemuAgentGetDiskAddress(virJSONValuePtr json) GET_DISK_ADDR(pci, &addr->pci_controller.function, "function"); if ((ccw = virJSONValueObjectGet(json, "ccw-address"))) { - addr->has_ccw_address = true; - GET_DISK_ADDR(ccw, &addr->ccw_addr.cssid, "cssid"); - if (addr->ccw_addr.cssid == 0) /* Guest CSSID 0 is 0xfe on host */ - addr->ccw_addr.cssid = 0xfe; - GET_DISK_ADDR(ccw, &addr->ccw_addr.ssid, "ssid"); - GET_DISK_ADDR(ccw, &addr->ccw_addr.devno, "devno"); + g_autofree virDomainDeviceCCWAddressPtr ccw_addr = NULL; + + ccw_addr = g_new0(virDomainDeviceCCWAddress, 1); + + GET_DISK_ADDR(ccw, &ccw_addr->cssid, "cssid"); + if (ccw_addr->cssid == 0) /* Guest CSSID 0 is 0xfe on host */ + ccw_addr->cssid = 0xfe; + GET_DISK_ADDR(ccw, &ccw_addr->ssid, "ssid"); + GET_DISK_ADDR(ccw, &ccw_addr->devno, "devno"); + + addr->ccw_addr = g_steal_pointer(&ccw_addr); } #undef GET_DISK_ADDR diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index 4ea9b9dc1e..0d47230161 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -77,8 +77,7 @@ struct _qemuAgentDiskAddress { unsigned int target; unsigned int unit; char *devnode; - bool has_ccw_address; - virDomainDeviceCCWAddress ccw_addr; + virDomainDeviceCCWAddressPtr ccw_addr; }; void qemuAgentDiskAddressFree(qemuAgentDiskAddressPtr addr); G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuAgentDiskAddress, qemuAgentDiskAddressFree); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 62b0852c33..a376824854 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18887,8 +18887,7 @@ qemuAgentFSInfoToPublic(qemuAgentFSInfoPtr agent, diskDef = virDomainDiskByAddress(vmdef, &agentdisk->pci_controller, - agentdisk->has_ccw_address ? - &agentdisk->ccw_addr : NULL, + agentdisk->ccw_addr, agentdisk->bus, agentdisk->target, agentdisk->unit); @@ -19931,8 +19930,7 @@ qemuAgentDiskInfoFormatParams(qemuAgentDiskInfoPtr *info, /* match the disk to the target in the vm definition */ diskdef = virDomainDiskByAddress(vmdef, &info[i]->address->pci_controller, - info[i]->address->has_ccw_address ? - &info[i]->address->ccw_addr : NULL, + info[i]->address->ccw_addr, info[i]->address->bus, info[i]->address->target, info[i]->address->unit); @@ -20017,8 +20015,7 @@ qemuAgentFSInfoFormatParams(qemuAgentFSInfoPtr *fsinfo, /* match the disk to the target in the vm definition */ diskdef = virDomainDiskByAddress(vmdef, &d->pci_controller, - d->has_ccw_address ? - &d->ccw_addr : NULL, + d->ccw_addr, d->bus, d->target, d->unit); -- 2.26.2

2 1

live migration is not using secondary interface
by Olaf Hering 04 Jan '21

04 Jan '21

A naive 'virsh migrate --live domU xen+tcp://cross-over-ip' uses the ordinary uplink instead of the requested IP address. According to the documentation an additional option has to be specified to really use the other network interface. However, neither 'tcp://cross-over-ip' nor 'xenmigr:cross-over-ip/' works, the migration does not start. 'xenmigr' was removed with 1dac5fbbbb06a0341e8087dc33af75c8352d77a4 and 7ed598438687feaddaf0a653d7cbb8a1c1ad4933, but the docs were not updated. This leaves 'tcp://ip'. What change needs to be done in the driver to support a secondary interface? Olaf

3 4

[RFC PATCH 0/3] Fix "virsh domfsinfo" on s390x (again)
by Thomas Huth 04 Jan '21

04 Jan '21

My previous attempts to fix "virsh domfsinfo" on s390x were unfortunately wrong due to some misunderstandings on my side. To correctly list the "Target" device in the output of "virsh domfsinfo", we need to search through the available devices using their CCW address on s390x. For this the QEMU guest agent will be enhanced to also send the CCW address of devices in the guest (see the following URL for details: https://lore.kernel.org/qemu-devel/20201125105417.380317-1-thuth@redhat.com/ ... but it has just been posted and will take some time to get merged, since QEMU is still in hard freeze, that's why I've labed this libvirt series here as RFC only). Using this CCW address, we then can look up the correct target devices on the libvirt side, too. See also https://bugzilla.redhat.com/show_bug.cgi?id=1858771 for some more information. Thomas Huth (3): qemu: agent: Store CCW address in qemuAgentDiskInfo if provided by the guest domain_conf: Allow to look up virtio-block devices by their CCW address domain_conf: Allow to look up scsi disks when controller uses a CCW address src/conf/domain_conf.c | 33 ++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 4 ++++ src/qemu/qemu_agent.c | 11 +++++++++++ src/qemu/qemu_agent.h | 2 ++ src/qemu/qemu_driver.c | 8 +++++--- 5 files changed, 54 insertions(+), 4 deletions(-) -- 2.18.4

3 12

[PATCH] virt-aa-helper: disallow graphics socket read permissions
by Simon Arlott 02 Jan '21

02 Jan '21

The VM does not need read permission for its own sockets to create(), bind(), accept() connections or to recv(), send(), etc. on connections. This was fixed in ab9569e5460d1e4737fe8b625c67687dc2204665 (virt-aa-helper: disallow VNC socket read permissions), but then b6465e1aa49397367a9cd0f27110b9c2280a7385 (graphics: introduce new listen type 'socket') and acc83afe333bfadd3f7f79091d38ca3d7da1eeb2 (acc83afe333bfadd3f7f79091d38ca3d7da1eeb2) reverted it. Unless the read permission is omitted, VMs can connect to each other's VNC/graphics sockets. Signed-off-by: Simon Arlott <libvirt(a)octiron.net> --- src/security/virt-aa-helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 6e6dd1b1db..fddbdafc41 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1053,7 +1053,7 @@ get_files(vahControl * ctl) if (listenObj.type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET && listenObj.socket && - vah_add_file(&buf, listenObj.socket, "rw")) + vah_add_file(&buf, listenObj.socket, "w")) goto cleanup; } } -- 2.17.1 -- Simon Arlott

3 6

[PATCH] Deprecate pmem=on with non-DAX capable backend file
by Igor Mammedov 30 Dec '20

30 Dec '20

It is not safe to pretend that emulated NVDIMM supports persistence while backend actually failed to enable it and used non-persistent mapping as fall back. Instead of falling-back, QEMU should be more strict and error out with clear message that it's not supported. So if user asks for persistence (pmem=on), they should store backing file on NVDIMM. Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> --- docs/system/deprecated.rst | 14 ++++++++++++++ util/mmap-alloc.c | 3 +++ 2 files changed, 17 insertions(+) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index bacd76d7a5..ba4f6ed2fe 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -327,6 +327,20 @@ The Raspberry Pi machines come in various models (A, A+, B, B+). To be able to distinguish which model QEMU is implementing, the ``raspi2`` and ``raspi3`` machines have been renamed ``raspi2b`` and ``raspi3b``. +Backend options +--------------- + +Using non-persistent backing file with pmem=on (since 6.0) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +This option is used when ``memory-backend-file`` is consumed by emulated NVDIMM +device. However enabling ``memory-backend-file.pmem`` option, when backing file +is not DAX capable or not on a filesystem that support direct mapping of persistent +memory, is not safe and may lead to data loss or corruption in case of host crash. +Using pmem=on option with such file will return error, instead of a warning. +Options are to move backing file to NVDIMM storage or modify VM configuration +to set ``pmem=off`` to continue using fake NVDIMM without persistence guaranties. + Device options -------------- diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c index 27dcccd8ec..d226273a98 100644 --- a/util/mmap-alloc.c +++ b/util/mmap-alloc.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qemu/mmap-alloc.h" #include "qemu/host-utils.h" +#include "qemu/error-report.h" #define HUGETLBFS_MAGIC 0x958458f6 @@ -166,6 +167,8 @@ void *qemu_ram_mmap(int fd, "crash.\n", file_name); g_free(proc_link); g_free(file_name); + warn_report("Deprecated using non DAX backing file with" + " pmem=on option"); } /* * if map failed with MAP_SHARED_VALIDATE | MAP_SYNC, -- 2.27.0

2 2

RFC PATCH: Issue 90 (Test Clarification)
by Ryan Gahagan 30 Dec '20

30 Dec '20

We addressed the feedback from our previous RFC patch for the most part. Under src/util/virstoragefile.c, we left a cast to an integer pointer that Peter mentioned because we were unable to provide a better solution. We've written some tests for our code but our testing environment is not working locally (meson doesn't even recognize the project as a meson build project) and so we can't regenerate output or test our tests. It's probably bad practice but the only solution we could think of that would allow us to check our tests was just to email you what we've got. Sorry if it's not up to standard, but please let us know if there's a better way to do it or if you spot any problems in these tests. Under tests/qemuxml2xmltest.c: DO_TEST_CAPS_LATEST("disk-network-nfs"); The same line would be in tests/qemuxml2argvtest.c We created the file tests/qemuxml2argvdata/disk-network-nfs.xml: <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219136</memory> <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-x86_64</emulator> <disk type='network' device='disk'> <driver name='qemu' type='raw' cache='none'/> <source protocol='nfs' name='/foo/bar/baz'> <host name='example.com' port='2049'/> <nfs user='nfs-user' group='nfs-group'/> </source> <target dev='vda' bus='virtio'/> <serial>eb90327c-8302-4725-9e1b-4e85ed4dc251</serial> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> <controller type='usb' index='0'/> <controller type='pci' index='0' model='pci-root'/> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <memballoon model='none'/> </devices> </domain> We have under tests/qemublocktest.c: TEST_JSON_FORMAT_NET(“<source protocol=’nfs’ name=’/foo/bar/baz’>\n” “ <host name=’example.com’ port=’2049’/>\n” “ <nfs user=’USER’ group=’GROUP’/>\n” "</source>\n”); and TEST_IMAGE_CREATE(“network-nfs-qcow2”, NULL); And finally under tests/virstoragetest.c: TEST_BACKING_PARSE(“json:{\”file\”:{\”driver\”:\”nfs\”,” “\”user\”:\”USER\”,” “\”group\”:\”GROUP\”,” “\”server\”: { \”host\”:\”example.com\”,” “\”port\”:\”2049\”” ”}” “}” “}”, “<source protocol=’nfs’ name=’/foo/bar/baz’>\n” “ <host name=’example.com’ port=’2049’/>\n” “ <nfs user=’USER’ group=’GROUP’/>\n” “</source>\n”); Again, sorry if this looks awful. Please let us know if there's a more practical way to do this because submitting a commit with these tests would guarantee that the tests fail and the commit wouldn't be mergeable due to our environment issues, or if you see anything wrong with these tests.

3 18