- Devel - libvirt List Archives

[PATCH v4 00/11] qemu: Add <transient/> disk support
by Peter Krempa 26 Sep '20

26 Sep '20

This version: - is rebased on top of current refactors - has more strict rules in the validation - adds tests - fixes bug with disk-unplug Masayoshi Mizuma (5): qemu: Block blockjobs when transient disk option is enabled qemu: Block disk hotplug when transient disk option is enabled qemu: Block migration when transient disk option is enabled qemu: process: Handle transient disks on VM startup qemu: validate: Allow <transient/> disks Peter Krempa (6): virDomainSnapshotDiskDefFree: Export and register as autoptr func qemu: prepare cleanup for <transient/> disk overlays qemu: snapshot: Introduce helpers for creating overlays on <transient/> disks qemu: hotplug: Remove overlay of <transient> disk on disk unplug tests: qemuxml2argv: Fix and enable 'disk-transient' case TODO: Add news entry TODO | 0 docs/formatdomain.rst | 5 +- src/conf/snapshot_conf.h | 5 + src/conf/snapshot_conf_priv.h | 3 - src/qemu/qemu_domain.c | 9 ++ src/qemu/qemu_domain.h | 4 + src/qemu/qemu_hotplug.c | 15 +++ src/qemu/qemu_migration.c | 10 ++ src/qemu/qemu_process.c | 27 ++++++ src/qemu/qemu_snapshot.c | 91 ++++++++++++++++++- src/qemu/qemu_snapshot.h | 5 + src/qemu/qemu_validate.c | 56 ++++++++++-- .../disk-transient.x86_64-4.1.0.err | 1 + .../disk-transient.x86_64-latest.args | 42 +++++++++ tests/qemuxml2argvdata/disk-transient.xml | 4 +- tests/qemuxml2argvtest.c | 2 + 16 files changed, 265 insertions(+), 14 deletions(-) create mode 100644 TODO create mode 100644 tests/qemuxml2argvdata/disk-transient.x86_64-4.1.0.err create mode 100644 tests/qemuxml2argvdata/disk-transient.x86_64-latest.args -- 2.26.2

4 21

[PATCH] NEWS: Mention qcow2 cluster size being preserved accross snapshots and iSCSI hostdev fixes
by Peter Krempa 26 Sep '20

26 Sep '20

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- NEWS.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index e992fbe471..97417033f4 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -55,8 +55,20 @@ v6.8.0 (unreleased) the previous behavior with an improvement: it also reflects the auto-aligned value in the domain XML. + * qemu: Preserve qcow2 cluster size after external snapshots + + The new overlay image which is installed on top of the current chain when + taking an external snapshot now preserves the cluser size of the original + top image to preserve any performance tuning done on the original image. + * **Bug fixes** + * qemu: Various (i)SCSI backed hostdev fixes + + (i)SCSI backed hostdevs now work again with an arbitrarily long + user-specified device alias and also honor the 'readonly' property after a + recent rewrite. + * **Removed features** * node_device: Remove HAL node device backend -- 2.26.2

2 1

[PATCH] qemu: clear residual QMP caps processes during QEMU driver initialization
by Bihong Yu 26 Sep '20

26 Sep '20

>From c328ff62b11d58553fd2032a85fd3295e009b3d3 Mon Sep 17 00:00:00 2001 From: Bihong Yu <yubihong(a)huawei.com> Date: Fri, 17 Jul 2020 16:55:12 +0800 Subject: [PATCH] qemu: clear residual QMP caps processes during QEMU driver initialization In some cases, the QMP capabilities processes possible residue. So we need to clear the residual QMP caps processes during starting libvirt. Signed-off-by:Bihong Yu <yubihong(a)huawei.com> --- src/qemu/qemu_driver.c | 2 ++ src/qemu/qemu_process.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_process.h | 2 ++ 3 files changed, 44 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d185666..d627fd7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -889,6 +889,8 @@ qemuStateInitialize(bool privileged, run_gid = cfg->group; } + qemuProcessQMPClear(cfg->libDir); + qemu_driver->qemuCapsCache = virQEMUCapsCacheNew(cfg->libDir, cfg->cacheDir, run_uid, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 70fc24b..d545e3e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8312,6 +8312,46 @@ static qemuMonitorCallbacks callbacks = { }; +/** + * qemuProcessQMPClear + * + * Try to kill residual QMP caps processes + */ +void +qemuProcessQMPClear(const char *libDir) +{ + virErrorPtr orig_err; + DIR *dirp = NULL; + struct dirent *dp; + + if (!virFileExists(libDir)) + return; + + if (virDirOpen(&dirp, libDir) < 0) + return; + + virErrorPreserveLast(&orig_err); + while (virDirRead(dirp, &dp, libDir) > 0) { + g_autofree char *qmp_uniqDir = NULL; + g_autofree char *qmp_pidfile = NULL; + + if (!STRPREFIX(dp->d_name, "qmp-")) + continue; + + qmp_uniqDir = g_strdup_printf("%s/%s", libDir, dp->d_name); + qmp_pidfile = g_strdup_printf("%s/%s", qmp_uniqDir, "qmp.pid"); + + ignore_value(virPidFileForceCleanupPath(qmp_pidfile)); + + if (qmp_uniqDir) + rmdir(qmp_uniqDir); + } + virErrorRestore(&orig_err); + + VIR_DIR_CLOSE(dirp); +} + + static void qemuProcessQMPStop(qemuProcessQMPPtr proc) { diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 15e67b9..b039e6c 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -233,6 +233,8 @@ qemuProcessQMPPtr qemuProcessQMPNew(const char *binary, gid_t runGid, bool forceTCG); +void qemuProcessQMPClear(const char *libDir); + void qemuProcessQMPFree(qemuProcessQMPPtr proc); int qemuProcessQMPStart(qemuProcessQMPPtr proc); -- 1.8.3.1

3 7

Help on Meson build Error
by Wei Wang 25 Sep '20

25 Sep '20

Seems it didn't appear on the mailing list, resent it. Hi folks, I'm trying to build libvirt using meson with the latest upstream libvirt, but the compilation fails: (followed on https://libvirt.org/compiling.html, not sure if any dependencies are missed. I checked, src/util/libvirt_util.a.p does not exist.) FAILED: src/util/libvirt_util.a.p/glibcompat.c.o .... In file included from ../src/util/glibcompat.c:19: ./config.h:1026:10: fatal error: config-post.h: No such file or directory FAILED: src/util/libvirt_util.a.p/virfirmware.c.o In file included from ../src/util/virarch.c:22: ./config.h:1026:10: fatal error: config-post.h: No such file or directory FAILED: src/util/libvirt_util.a.p/viraudit.c.o In file included from ../src/util/viraudit.c:22: ./config.h:1026:10: fatal error: config-post.h: No such file or directory Any help is appreciated. Thanks, Wei

4 20

[libvirt PATCH] gitdm: add more individual contributors
by Pino Toscano 25 Sep '20

25 Sep '20

Signed-off-by: Pino Toscano <ptoscano(a)redhat.com> --- docs/gitdm/groups/unaffiliated | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/gitdm/groups/unaffiliated b/docs/gitdm/groups/unaffiliated index 5f867fc5e4..1ca7eee81f 100644 --- a/docs/gitdm/groups/unaffiliated +++ b/docs/gitdm/groups/unaffiliated @@ -14,6 +14,7 @@ gmx.de googlemail.com hotmail.com mail.ru +mailbox.org outlook.com pobox.com protonmail.com @@ -43,11 +44,14 @@ cky(a)cky.nz contact(a)puzio.waw.pl d.herrendoerfer(a)herrendoerfer.name dan(a)danny.cz +davem(a)davemloft.net debfx(a)fobos.de eike(a)sf-mail.de exo(a)tty.sk +fedora(a)borsoi.fr fritz(a)fritz-elfert.de gene(a)czarc.net +git(a)ryandesign.com gordon(a)dragonsdawn.net gregor(a)kopka.net heathpetersen(a)kandre.com @@ -59,9 +63,11 @@ jaak(a)ristioja.ee james410(a)cowgill.org.uk james(a)shubin.ca jasper(a)humppa.nl +jean-baptiste(a)holcroft.fr jeremy(a)goop.org jk(a)ozlabs.org jwm(a)horde.net +kevin(a)kevinlocke.name klaus(a)ethgen.de lacos(a)caesar.elte.hu lenaic(a)lhuard.fr.eu.org @@ -71,6 +77,7 @@ marti(a)juffo.org max(a)rfc2324.org michael(a)ellerman.id.au mike(a)very.puzzling.org +milo(a)milo.name n0ano(a)n0ano.com neil(a)aldur.co.uk nobody(a)nowhere.ws @@ -81,11 +88,14 @@ richard(a)nod.at rmy(a)tigress.co.uk ruben(a)rubenkerkhof.com rufo(a)rufoa.com +scott-libvirt(a)shambarger.net +shemminger(a)vyatta.com slawek(a)kaplonski.pl soulxu(a)soulxu-thinkpad-t410.(none) stybla(a)turnovfree.net tai(a)rakugaki.org thomas(a)scripty.at +toscano.pino(a)tiscali.it v.tolstov(a)selfip.ru ville.skytta(a)iki.fi vincent(a)bernat.im -- 2.26.2

2 1

[libvirt PATCH] meson: drop HTML4 variants of rst2html
by Daniel P. Berrangé 25 Sep '20

25 Sep '20

We stopped supportin Ubuntu 16.04 earlier in the year, so there is no reason to keep the HTML4 variants of rst2html around. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meson.build b/meson.build index bc52079809..2e57a435df 100644 --- a/meson.build +++ b/meson.build @@ -898,8 +898,7 @@ required_programs = [ required_programs_groups = [ {'name':'rpcgen', 'prog':['rpcgen', 'portable-rpcgen']}, - # Drop the rst2html (aka HTML4) variants once we stop supporting Ubuntu 16.04 (Xenial) - {'name':'rst2html', 'prog':['rst2html5', 'rst2html5.py', 'rst2html5-3', 'rst2html', 'rst2html.py', 'rst2html-3']}, + {'name':'rst2html', 'prog':['rst2html5', 'rst2html5.py', 'rst2html5-3']}, {'name':'rst2man', 'prog':['rst2man', 'rst2man.py', 'rst2man-3']}, ] -- 2.26.2

3 2

[PATCH] meson: don't check for libutil.h except on FreeBSD
by Daniel P. Berrangé 25 Sep '20

25 Sep '20

The libutil.h we are after is explicitly only something we want on FreeBSD, we don't want to accidentally pick up this header on other platforms as it can lead to build failures. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 4d42468a51..bc52079809 100644 --- a/meson.build +++ b/meson.build @@ -685,7 +685,6 @@ headers = [ 'asm/hwcap.h', 'ifaddrs.h', 'libtasn1.h', - 'libutil.h', 'linux/kvm.h', 'linux/magic.h', 'mntent.h', @@ -711,6 +710,10 @@ if host_machine.system() == 'linux' headers += 'linux/devlink.h' endif +if host_machine.system() == 'freebsd' + headers += 'libutil.h' +endif + foreach name : headers if cc.has_header(name) conf.set('WITH_@0@'.format(name.underscorify().to_upper()), 1) -- 2.26.2

3 2

[libvirt PATCH 0/5] Use g_new0 more (glib chronicles)
by Ján Tomko 25 Sep '20

25 Sep '20

Remove VIR_ALLOC* from tools/ (with the exception of vsh*alloc, which will be cleaned up later) and some random subdirs from src/ Ján Tomko (5): node_device: use g_new0 instead of VIR_ALLOC* openvz: use g_new0 instead of VIR_ALLOC* secret: use g_new0 instead of VIR_ALLOC* security: use g_new0 instead of VIR_ALLOC* tools: use g_new0 instead of VIR_ALLOC* src/node_device/node_device_udev.c | 27 +++++++++------------------ src/openvz/openvz_conf.c | 12 ++++-------- src/openvz/openvz_driver.c | 3 +-- src/secret/secret_driver.c | 3 +-- src/security/security_apparmor.c | 3 +-- src/security/security_dac.c | 9 +++------ src/security/security_manager.c | 14 +++++--------- src/security/security_selinux.c | 9 +++------ src/security/security_stack.c | 6 ++---- tools/virsh-domain-monitor.c | 11 +++-------- tools/virsh-domain.c | 26 ++++++++------------------ tools/virt-admin-completer.c | 12 +----------- tools/virt-login-shell-helper.c | 13 ++++--------- tools/vsh-table.c | 21 +++++++-------------- tools/vsh.c | 5 +---- 15 files changed, 53 insertions(+), 121 deletions(-) -- 2.26.2

2 10

[PATCH FOR 6.8.0] libxl: Don't free def member of virDomainObj
by Jim Fehlig 25 Sep '20

25 Sep '20

The refactoring in commit de49d5bad3 accidentally dropped the statement setting def to NULL after successfully adding it to the virDomainObjList, causing it to be freed while still in use. The resulting memory corruption caused unpredictable behavior, often resulting in a libvirtd crash. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Unpredictable is an understatement! When running monolithic libvirtd with both qemu and xen drviers enabled, qemu crashed while initializing. Recall it is initialized after xen. Thread 17 "daemon-init" received signal SIGSEGV, Segmentation fault. #0 0x00007f32e5fbe9e3 in _int_malloc () at /lib64/libc.so.6 #1 0x00007f32e5fbf6e0 in _int_realloc () at /lib64/libc.so.6 #2 0x00007f32e5fc0729 in realloc () at /lib64/libc.so.6 #3 0x00007f32e6dc21b8 in g_realloc () at /usr/lib64/libglib-2.0.so.0 #4 0x00007f32e7532090 in virReallocN (ptrptr=0x7f329affcad8, size=1, count=1403) at ../src/util/viralloc.c:91 #5 0x00007f32e75530c7 in virCommandProcessIO (cmd=0x7f328807ff40) at ../src/util/vircommand.c:2271 #6 0x00007f32e7553a6a in virCommandRun (cmd=0x7f328807ff40, exitstatus=0x0) at ../src/util/vircommand.c:2451 #7 0x00007f32e75dde73 in virSysinfoReadDMI () at ../src/util/virsysinfo.c:1237 #8 0x00007f32e75de0cb in virSysinfoRead () at ../src/util/virsysinfo.c:1294 #9 0x00007f32a240b69d in qemuStateInitialize (privileged=true, root=0x0, callback=0x56453a0b3e97 <daemonInhibitCallback>, opaque=0x56453b000030) at ../src/qemu/qemu_driver.c:658 #10 0x00007f32e7832350 in virStateInitialize (privileged=true, mandatory=false, root=0x0, callback=0x56453a0b3e97 <daemonInhibitCallback>, opaque=0x56453b000030) at ../src/libvirt.c:656 #11 0x000056453a0b4175 in daemonRunStateInit (opaque=0x56453b000030) at ../src/remote/remote_daemon.c:596 src/libxl/libxl_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 083738871d..571b70f982 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -627,6 +627,7 @@ libxlAddDom0(libxlDriverPrivatePtr driver) NULL))) goto cleanup; + def = NULL; vm->persistent = 1; virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_BOOTED); } -- 2.28.0

3 2

[RFC DOCUMENT 00/12] kubevirt-and-kvm: Add documents
by Andrea Bolognani 25 Sep '20

25 Sep '20

Hello there! Several weeks ago, a group of Red Hatters working on the virtualization stack (primarily QEMU and libvirt) started a conversation with developers from the KubeVirt project with the goal of better understanding and documenting the interactions between the two. Specifically, we were interested in integration pain points, with the underlying ideas being that only once those issues are understood it becomes possible to look for solutions, and that better communication would naturally lead to improvements on both sides. This series of documents was born out of that conversation. We're sharing them with the QEMU and libvirt communities in the hope that they can be a valuable resource for understanding how the projects they're working on are consumed by higher-level tools, and what challenges are encountered in the process. Note that, while the documents describe a number of potential directions for things like development of new components, that's all just brainstorming that naturally occurred as we were learning new things: the actual design process should, and will, happen on the upstream lists. Right now the documents live in their own little git repository[1], but the expectation is that eventually they will find a suitable long-term home. The most likely candidate right now is the main KubeVirt repository, but if you have other locations in mind please do speak up! I'm also aware of the fact that this delivery mechanism is fairly unconventional, but I thought it would be the best way to spark a discussion around these topics with the QEMU and libvirt developers. Last but not least, please keep in mind that the documents are a work in progress, and polish has been applied to them unevenly: while the information presented is, to the best of our knowledge, all accurate, some parts are in a rougher state than others. Improvements will hopefully come over time - and if you feel like helping out in making that happen, it would certainly be appreciated! Looking forward to your feedback :) [1] https://gitlab.com/abologna/kubevirt-and-kvm -- Andrea Bolognani / Red Hat / Virtualization

2 14

[libvirt PATCH] news: document recent esx API implementations
by Pino Toscano 25 Sep '20

25 Sep '20

Signed-off-by: Pino Toscano <ptoscano(a)redhat.com> --- NEWS.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index e992fbe471..7c723e6610 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -32,6 +32,13 @@ v6.8.0 (unreleased) can now be passed using the ``passwd`` attribute on the ``<graphics>`` element. + * esx: implement few APIs + + The ``virConnectListAllNetworks()``, ``virDomainGetHostname()``, and + ``virDomainInterfaceAddresses()`` (only for + ``VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT`` source) APIs were implemented + in the esx driver. + * **Improvements** * qemu: Allow migration over UNIX sockets -- 2.26.2

2 1

[libvirt PATCH] news: add note about new virt-ssh-helper binary
by Daniel P. Berrangé 24 Sep '20

24 Sep '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- NEWS.rst | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index e992fbe471..13d2ff1d2f 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -32,6 +32,19 @@ v6.8.0 (unreleased) can now be passed using the ``passwd`` attribute on the ``<graphics>`` element. + * remote: ``virt-ssh-helper`` replaces ``nc`` for SSH tunnelling + + Libvirt now provides a ``virt-ssh-helper`` binary on the server + side. The libvirt remote client will use this binary for setting + up an SSH tunnelled connection to hosts. If not present, it will + transparently fallback to the traditional ``nc`` tunnel. The new + binary makes it possible for libvirt to transparently connect + across hosts even if libvirt is built with a different installation + prefix on the client vs server. It also enables remote access to + the unprivileged per-user libvirt daemons(eg using a URI such as + ``qemu+ssh://hostname/session``. The only requirement is that + ``virt-ssh-helper`` is present in $PATH of the remote host. + * **Improvements** * qemu: Allow migration over UNIX sockets -- 2.26.2

2 1

[libvirt PATCH v4 00/11] remote: introduce a custom netcat impl for ssh tunnelling
by Daniel P. Berrangé 24 Sep '20

24 Sep '20

We have long had a problem with use of netcat for ssh tunnelling because there's no guarantee the UNIX socket path the client builds will match the UNIX socket path the remote host uses. We don't even allow session mode SSH tunnelling for this reason. We also can't easily auto-spawn libvirtd in session mode. With the introduction of modular daemons we also have potential for two completely different UNIX socket paths even for system mode, and the client can't know which to use. The solution to all these problems is to introduce a custom netcat impl. Instead passing the UNIX socket path, we pass the libvirt driver URI. The custom netcat then decides which socket path to use based on the remote build host environment. We still have to support netcat for interoperability with legacy libvirt versions, but we can default to the new virt-nc. v4: Now with many fixed bugs to make it actually work v3: Now with more meson and less autotools ! Daniel P. Berrangé (11): rpc: merge logic for generating remote SSH shell script remote: push logic for default netcat binary into common helper remote: split off enums into separate source file remote: split out function for parsing URI scheme remote: parse the remote transport string earlier remote: split out function for constructing socket path remote: extract logic for determining daemon to connect to remote: introduce virt-ssh-helper binary rpc: switch order of args in virNetClientNewSSH rpc: use new virt-ssh-helper binary for remote tunnelling remote: fix error reporting for invalid daemon mode build-aux/syntax-check.mk | 2 +- docs/uri.html.in | 24 +- libvirt.spec.in | 2 + po/POTFILES.in | 2 + src/libvirt_remote.syms | 1 + src/remote/meson.build | 18 ++ src/remote/remote_driver.c | 331 +++++-------------------- src/remote/remote_sockets.c | 277 +++++++++++++++++++++ src/remote/remote_sockets.h | 70 ++++++ src/remote/remote_ssh_helper.c | 425 +++++++++++++++++++++++++++++++++ src/rpc/virnetclient.c | 167 +++++++++---- src/rpc/virnetclient.h | 29 ++- src/rpc/virnetsocket.c | 37 +-- src/rpc/virnetsocket.h | 4 +- tests/virnetsockettest.c | 12 +- 15 files changed, 1030 insertions(+), 371 deletions(-) create mode 100644 src/remote/remote_sockets.c create mode 100644 src/remote/remote_sockets.h create mode 100644 src/remote/remote_ssh_helper.c -- 2.26.2

3 14

[PATCH V3] Modify virCPUarmCompare to perform compare actions
by Zhenyu Zheng 24 Sep '20

24 Sep '20

Modify virCPUarmCompare in cpu_arm.c to perform compare action. This patch only adds host to host CPU compare, the rest cases remains the same. This is useful for source and destination host compare during migrations to avoid migration between different CPU models that have different CPU freatures. Signed-off-by: Zhenyu Zheng <zheng.zhenyu(a)outlook.com> --- src/cpu/cpu_arm.c | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index 939a3b8390..b420b14e86 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -463,11 +463,46 @@ virCPUarmBaseline(virCPUDefPtr *cpus, } static virCPUCompareResult -virCPUarmCompare(virCPUDefPtr host G_GNUC_UNUSED, - virCPUDefPtr cpu G_GNUC_UNUSED, - bool failMessages G_GNUC_UNUSED) +virCPUarmCompare(virCPUDefPtr host, + virCPUDefPtr cpu, + bool failIncompatible +) { - return VIR_CPU_COMPARE_IDENTICAL; + virCPUCompareResult ret = VIR_CPU_COMPARE_IDENTICAL; + + /* Only support host to host CPU compare for ARM*/ + if (cpu->type != VIR_CPU_TYPE_HOST) + return ret; + + if (!host || !host->model) { + if (failIncompatible) { + virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", + _("unknown host CPU")); + ret = VIR_CPU_COMPARE_ERROR; + } else { + VIR_WARN("unknown host CPU"); + ret = VIR_CPU_COMPARE_INCOMPATIBLE; + } + return ret; + } + + /* Compare vendor and model to check if CPUs are identical */ + if (STRNEQ(host->vendor, cpu->vendor) || + STRNEQ(host->model, cpu->model)) { + VIR_DEBUG("Host CPU model does not match required CPU model %s", + cpu->model); + + if (failIncompatible) { + ret = VIR_CPU_COMPARE_ERROR; + virReportError(VIR_ERR_CPU_INCOMPATIBLE, + _("Host CPU model does not match required CPU model %s"), + cpu->model); + } else { + ret = VIR_CPU_COMPARE_INCOMPATIBLE; + } + } + + return ret; } static int -- 2.20.1

3 3

[PATCH v1 1/2] qemu: driver: use model name "host" for mode "host-passthrough"
by Collin Walling 24 Sep '20

24 Sep '20

When executing the hypervisor-cpu-compare/baseline commands and the XML file contains a CPU definition using host-passthrough and no model name, the commands will fail and return an error message from the QMP response. Let's fix this by checking for host-passthrough and a missing model name after the CPU definition has been converted from XML. If these conditions are matched, then the CPU definition's model name will be set to "host". Signed-off-by: Collin Walling <walling(a)linux.ibm.com> --- src/qemu/qemu_driver.c | 41 +++++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1cecef01f7..427d2419f3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12281,6 +12281,26 @@ qemuConnectCPUModelComparison(virQEMUCapsPtr qemuCaps, } +static int +qemuConnectCheckCPUModel(virCPUDefPtr cpu) +{ + if (!cpu->model) { + /* + * On some architectures a model name is never present + * for the host-passthrough mode, so default it to "host" + */ + if (cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) { + cpu->model = g_strdup("host"); + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("cpu parameter is missing a model name")); + return -1; + } + } + return 0; +} + + static int qemuConnectCompareHypervisorCPU(virConnectPtr conn, const char *emulator, @@ -12336,15 +12356,9 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, if (virCPUDefParseXMLString(xmlCPU, VIR_CPU_TYPE_AUTO, &cpu) < 0) goto cleanup; - if (!cpu->model) { - if (cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) { - cpu->model = g_strdup("host"); - } else { - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("cpu parameter is missing a model name")); - goto cleanup; - } - } + if (qemuConnectCheckCPUModel(cpu) < 0) + goto cleanup; + ret = qemuConnectCPUModelComparison(qemuCaps, cfg->libDir, cfg->user, cfg->group, hvCPU, cpu, failIncompatible); @@ -12470,10 +12484,17 @@ qemuConnectCPUModelBaseline(virQEMUCapsPtr qemuCaps, if (VIR_ALLOC(baseline) < 0) return NULL; - if (virCPUDefCopyModel(baseline, cpus[0], false)) + if (qemuConnectCheckCPUModel(cpus[0]) < 0) + return NULL; + + if (virCPUDefCopyModel(baseline, cpus[0], false) < 0) return NULL; for (i = 1; i < ncpus; i++) { + + if (qemuConnectCheckCPUModel(cpus[i]) < 0) + return NULL; + if (qemuMonitorGetCPUModelBaseline(proc->mon, baseline, cpus[i], &result) < 0) return NULL; -- 2.26.2

2 4

[PATCH] virDomainNetFindIdx: add support for CCW addresses
by Cornelia Huck 24 Sep '20

24 Sep '20

Allow to match with CCW addresses in addition to PCI addresses (and MAC addresses). Signed-off-by: Cornelia Huck <cohuck(a)redhat.com> --- src/conf/device_conf.c | 12 ++++++++++++ src/conf/device_conf.h | 3 +++ src/conf/domain_conf.c | 23 ++++++++++++++++++++++- src/libvirt_private.syms | 1 + 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 9398191dfd84..87bf32bbc685 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -341,6 +341,18 @@ virDomainDeviceCCWAddressParseXML(xmlNodePtr node, return 0; } +bool +virDomainDeviceCCWAddressEqual(virDomainDeviceCCWAddressPtr addr1, + virDomainDeviceCCWAddressPtr addr2) +{ + if (addr1->cssid == addr2->cssid && + addr1->ssid == addr2->ssid && + addr1->devno == addr2->devno) { + return true; + } + return false; +} + int virDomainDeviceDriveAddressParseXML(xmlNodePtr node, virDomainDeviceDriveAddressPtr addr) diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index d7395f220174..a51bdf10ee6e 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -207,6 +207,9 @@ void virPCIDeviceAddressFormat(virBufferPtr buf, bool virDomainDeviceCCWAddressIsValid(virDomainDeviceCCWAddressPtr addr); int virDomainDeviceCCWAddressParseXML(xmlNodePtr node, virDomainDeviceCCWAddressPtr addr); +bool virDomainDeviceCCWAddressEqual(virDomainDeviceCCWAddressPtr addr1, + virDomainDeviceCCWAddressPtr addr2); +#define VIR_CCW_DEVICE_ADDRESS_FMT "%x.%x.%04x" int virDomainDeviceDriveAddressParseXML(xmlNodePtr node, virDomainDeviceDriveAddressPtr addr); diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8d30557bdcbe..a91dbd4aa95b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17816,6 +17816,8 @@ virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net) bool MACAddrSpecified = !net->mac_generated; bool PCIAddrSpecified = virDomainDeviceAddressIsValid(&net->info, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI); + bool CCWAddrSpecified = virDomainDeviceAddressIsValid(&net->info, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW); for (i = 0; i < def->nnets; i++) { if (MACAddrSpecified && @@ -17827,9 +17829,14 @@ virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net) &net->info.addr.pci)) continue; + if (CCWAddrSpecified && + !virDomainDeviceCCWAddressEqual(&def->nets[i]->info.addr.ccw, + &net->info.addr.ccw)) + continue; + if (matchidx >= 0) { /* there were multiple matches on mac address, and no - * qualifying guest-side PCI address was given, so we must + * qualifying guest-side PCI/CCW address was given, so we must * fail (NB: a USB address isn't adequate, since it may * specify only vendor and product ID, and there may be * multiples of those. @@ -17859,6 +17866,14 @@ virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net) net->info.addr.pci.bus, net->info.addr.pci.slot, net->info.addr.pci.function); + } else if (MACAddrSpecified && CCWAddrSpecified) { + virReportError(VIR_ERR_DEVICE_MISSING, + _("no device matching MAC address %s found on " + VIR_CCW_DEVICE_ADDRESS_FMT), + virMacAddrFormat(&net->mac, mac), + net->info.addr.ccw.cssid, + net->info.addr.ccw.ssid, + net->info.addr.ccw.devno); } else if (PCIAddrSpecified) { virReportError(VIR_ERR_DEVICE_MISSING, _("no device found on " VIR_PCI_DEVICE_ADDRESS_FMT), @@ -17866,6 +17881,12 @@ virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net) net->info.addr.pci.bus, net->info.addr.pci.slot, net->info.addr.pci.function); + } else if (CCWAddrSpecified) { + virReportError(VIR_ERR_DEVICE_MISSING, + _("no device found on " VIR_CCW_DEVICE_ADDRESS_FMT), + net->info.addr.ccw.cssid, + net->info.addr.ccw.ssid, + net->info.addr.ccw.devno); } else if (MACAddrSpecified) { virReportError(VIR_ERR_DEVICE_MISSING, _("no device matching MAC address %s found"), diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1db9970cca08..6bcbfa667d0e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -128,6 +128,7 @@ virDeviceInfoPCIAddressIsWanted; virDomainDeviceAddressIsValid; virDomainDeviceAddressTypeToString; virDomainDeviceCcidAddressParseXML; +virDomainDeviceCCWAddressEqual; virDomainDeviceCCWAddressIsValid; virDomainDeviceCCWAddressParseXML; virDomainDeviceDriveAddressParseXML; -- 2.25.4

2 1

[PATCH] qemuxml2argvtest: Append newline to tested error messages
by Peter Krempa 24 Sep '20

24 Sep '20

'virTestCompareToFile' automatically fixes newline if it is not present in the input string but is present in the file. In this case we need to append the erorr messages with a newline so that VIR_TEST_REGENERATE_OUTPUT produces files which will pass syntax-check. Fixes: 9ec77eef2df Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/qemuxml2argvtest.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a3c91fd5de..2b97eb80a4 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -621,9 +621,11 @@ testCompareXMLToArgv(const void *data) VIR_TEST_DEBUG("no error was reported for expected parse error"); goto cleanup; } - if (flags & FLAG_EXPECT_PARSE_ERROR && - virTestCompareToFile(err->message, info->errfile) >= 0) - goto ok; + if (flags & FLAG_EXPECT_PARSE_ERROR) { + g_autofree char *tmperr = g_strdup_printf("%s\n", NULLSTR(err->message)); + if (virTestCompareToFile(tmperr, info->errfile) >= 0) + goto ok; + } goto cleanup; } if (flags & FLAG_EXPECT_PARSE_ERROR) { @@ -663,9 +665,11 @@ testCompareXMLToArgv(const void *data) VIR_TEST_DEBUG("no error was reported for expected failure"); goto cleanup; } - if (flags & FLAG_EXPECT_FAILURE && - virTestCompareToFile(err->message, info->errfile) >= 0) - goto ok; + if (flags & FLAG_EXPECT_FAILURE) { + g_autofree char *tmperr = g_strdup_printf("%s\n", NULLSTR(err->message)); + if (virTestCompareToFile(tmperr, info->errfile) >= 0) + goto ok; + } goto cleanup; } if (flags & FLAG_EXPECT_FAILURE) { -- 2.26.2

2 1

[PATCH] cpu_map: Add EPYC-Rome model
by Markus Schade 24 Sep '20

24 Sep '20

Hi everyone, I'd like to add support for the EPYC-Rome CPU model from qemu. The following patch adds the model to cpu_map. While this allows to use the model, I am aware that some tests are required as well. However I am not certain what exactly is needed. I am happy to provide CPU flags or any required information from an EPYC 7502 system Signed-off-by: Markus Schade <markus.schade(a)hetzner.com> diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 1486a29c65..fec01f324c 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -66,6 +66,7 @@ <include filename="x86_Opteron_G5.xml"/> <include filename="x86_EPYC.xml"/> <include filename="x86_EPYC-IBPB.xml"/> + <include filename="x86_EPYC-Rome.xml"/>  <include filename="x86_Dhyana.xml"/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 19daa7157b..b86612b6e0 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -32,6 +32,7 @@ cpumap_data = [ 'x86_Dhyana.xml', 'x86_EPYC-IBPB.xml', 'x86_EPYC.xml', + 'x86_EPYC-Rome.xml', 'x86_features.xml', 'x86_Haswell-IBRS.xml', 'x86_Haswell-noTSX-IBRS.xml', diff --git a/src/cpu_map/x86_EPYC-Rome.xml b/src/cpu_map/x86_EPYC-Rome.xml new file mode 100644 index 0000000000..41d4123917 --- /dev/null +++ b/src/cpu_map/x86_EPYC-Rome.xml @@ -0,0 +1,81 @@ +<cpus> + <model name='EPYC-Rome'> + <decode host='on' guest='on'/> + <signature family='23' model='49'/> + <vendor name='AMD'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='amd-stibp'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='avx'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='clwb'/> + <feature name='clzero'/> + <feature name='cmov'/> + <feature name='cr8legacy'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='fxsr_opt'/> + <feature name='ibpb'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='misalignsse'/> + <feature name='mmx'/> + <feature name='mmxext'/> + <feature name='monitor'/> + <feature name='movbe'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='osvw'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='perfctr_core'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdpid'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='sha-ni'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='sse4a'/> + <feature name='ssse3'/> + <feature name='svm'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='vme'/> + <feature name='wbnoinvd'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveerptr'/> + <feature name='xsaveopt'/> + </model> +</cpus>

2 1

[PATCH] util: stop probing for IFF_VNET_HDR
by Daniel P. Berrangé 24 Sep '20

24 Sep '20

This flag was added by Linux with: commit f43798c27684ab925adde7d8acc34c78c6e50df8 Author: Rusty Russell <rusty(a)rustcorp.com.au> Date: Thu Jul 3 03:48:02 2008 -0700 tun: Allow GSO using virtio_net_hdr so we can assume all Linux distros we support have this flag available and thus the compile time check is sufficient. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/util/virnetdevtap.c | 63 +---------------------------------------- 1 file changed, 1 insertion(+), 62 deletions(-) diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index cbce5c71b7..77c4d1c52c 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -183,66 +183,6 @@ virNetDevTapGetRealDeviceName(char *ifname G_GNUC_UNUSED) } -/** - * virNetDevProbeVnetHdr: - * @tapfd: a tun/tap file descriptor - * - * Check whether it is safe to enable the IFF_VNET_HDR flag on the - * tap interface. - * - * Setting IFF_VNET_HDR enables QEMU's virtio_net driver to allow - * guests to pass larger (GSO) packets, with partial checksums, to - * the host. This greatly increases the achievable throughput. - * - * It is only useful to enable this when we're setting up a virtio - * interface. And it is only *safe* to enable it when we know for - * sure that a) qemu has support for IFF_VNET_HDR and b) the running - * kernel implements the TUNGETIFF ioctl(), which qemu needs to query - * the supplied tapfd. - * - * Returns 1 if VnetHdr is supported, 0 if not supported - */ -#ifdef IFF_VNET_HDR -static int -virNetDevProbeVnetHdr(int tapfd) -{ -# if defined(IFF_VNET_HDR) && defined(TUNGETFEATURES) && defined(TUNGETIFF) - unsigned int features; - struct ifreq dummy; - - if (ioctl(tapfd, TUNGETFEATURES, &features) != 0) { - VIR_INFO("Not enabling IFF_VNET_HDR; " - "TUNGETFEATURES ioctl() not implemented"); - return 0; - } - - if (!(features & IFF_VNET_HDR)) { - VIR_INFO("Not enabling IFF_VNET_HDR; " - "TUNGETFEATURES ioctl() reports no IFF_VNET_HDR"); - return 0; - } - - /* The kernel will always return -1 at this point. - * If TUNGETIFF is not implemented then errno == EBADFD. - */ - if (ioctl(tapfd, TUNGETIFF, &dummy) != -1 || errno != EBADFD) { - VIR_INFO("Not enabling IFF_VNET_HDR; " - "TUNGETIFF ioctl() not implemented"); - return 0; - } - - VIR_INFO("Enabling IFF_VNET_HDR"); - - return 1; -# else - (void) tapfd; - VIR_INFO("Not enabling IFF_VNET_HDR; disabled at build time"); - return 0; -# endif -} -#endif - - #ifdef TUNSETIFF /** * virNetDevTapGenerateName: @@ -363,8 +303,7 @@ int virNetDevTapCreate(char **ifname, } # ifdef IFF_VNET_HDR - if ((flags & VIR_NETDEV_TAP_CREATE_VNET_HDR) && - virNetDevProbeVnetHdr(fd)) + if (flags & VIR_NETDEV_TAP_CREATE_VNET_HDR) ifr.ifr_flags |= IFF_VNET_HDR; # endif -- 2.26.2

2 2

[PATCH 0/2] qemuSnapshotDiskContext(Cleanup|New): fix few bugs
by Peter Krempa 24 Sep '20

24 Sep '20

Oops. Peter Krempa (2): qemuSnapshotDiskContextCleanup: Don't leak snapctxt qemuSnapshotDiskContextNew: Don't set 'ndd' src/qemu/qemu_snapshot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.26.2

2 3

[PATCH 0/6] qemu: snapshot: Refactors prior to introduction of <transient> disk support
by Peter Krempa 24 Sep '20

24 Sep '20

We'll be installing overlays on top of <transient> disks via the snapshot code. Prepare some aspects. Peter Krempa (6): qemu: snapshot: Rename 'qemuSnapshotCreateDiskActive' to 'qemuSnapshotCreateActiveExternalDisks' qemuSnapshotDiskUpdateSource: Extract 'driver' and 'blockdev' from 'vm' qemuSnapshotDiskPrepare/Cleanup: simplify passing of 'driver' and 'blockdev' qemu: snapshot: Introduce qemuSnapshotDiskContext qemuSnapshotCreateActiveExternalDisks: Extract actual snapshot creation to 'qemuSnapshotDiskCreate' qemuSnapshotDiskPrepare: rename to qemuSnapshotDiskPrepareActiveExternal src/qemu/qemu_snapshot.c | 215 ++++++++++++++++++++++----------------- 1 file changed, 124 insertions(+), 91 deletions(-) -- 2.26.2

2 8

[libvirt PATCH 00/14] Various cleanups
by Ján Tomko 24 Sep '20

24 Sep '20

Some reported by cppcheck, maybe even Coverity, the rest I noticed while looking at the code. Ján Tomko (14): tools: virshCheckpointListCollect: remove unused names vbox: remove VBoxCGlueTerm vbox: StartMachine: overwrite ret less often Remove pointless assignments Remove pointless initializations virsh: virshStreamSourceSkip: remove unused 'off' Do not check whether unsigned variables are negative libxl: remove unused 'bits' from struct guest_arch api: virDomainMemoryStats: use 'ret' variable storage: createFileDir: remove useless 'err' variable storage: createFileDir: use less ternary operators vbox: reduce variable scope in vboxDumpStorageControllers storage: storageBackendWipeLocal: reduce variable scope Reduce scope of some variables examples/c/admin/logging.c | 2 +- src/libvirt-domain.c | 8 ++--- src/libvirt-host.c | 4 +-- src/libxl/libxl_capabilities.c | 1 - src/libxl/libxl_driver.c | 2 +- src/node_device/node_device_driver.c | 3 +- src/openvz/openvz_driver.c | 2 +- src/storage/storage_backend_mpath.c | 3 +- src/storage/storage_util.c | 33 ++++++++++---------- src/test/test_driver.c | 2 +- src/vbox/vbox_XPCOMCGlue.c | 19 ------------ src/vbox/vbox_XPCOMCGlue.h | 1 - src/vbox/vbox_common.c | 46 +++++++++++++--------------- tests/virnumamock.c | 2 +- tests/virrandommock.c | 2 +- tools/virsh-checkpoint.c | 5 --- tools/virsh-pool.c | 3 +- tools/virsh-util.c | 3 +- 18 files changed, 53 insertions(+), 88 deletions(-) -- 2.26.2

3 30

[PATCH] tests: Adjust libxlxml2domconfigtest to work with Xen < 4.10
by Jim Fehlig 24 Sep '20

24 Sep '20

Commit f253dc90f5 introduced a test regression in environments with Xen < 4.10. The logic in libxl_conf.c correctly maps ACPI and APIC from virDomainObj to libxl_domain_conf based on LIBXL_HAVE_BUILDINFO_APIC, but the tests did not account for the different libxl_domain_conf JSON representations. One approach to fixing the test regression is to duplicate JSON test data files, having one set for Xen <= 4.9 and another for Xen 4.10 and greater. To avoid duplicate data files, this patch takes the approach of modifying the libxl_domain_conf object based on LIBXL_HAVE_BUILDINFO_APIC, before retrieving the JSON representation. It allows using the same test data files for all supported versions of Xen by adjusting the intermediate form of libxl_domain_conf object as needed. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- tests/libxlxml2domconfigtest.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index c4d5db9a7b..d58be1211b 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -97,6 +97,20 @@ testCompareXMLToDomConfig(const char *xmlfile, "Failed to create libxl_domain_config from JSON doc"); goto cleanup; } + + /* + * In order to have common test files between Xen 4.9 and newer Xen versions, + * tweak the expected libxl_domain_config object before getting a json + * representation. + */ +# ifndef LIBXL_HAVE_BUILDINFO_APIC + if (expectconfig.c_info.type == LIBXL_DOMAIN_TYPE_HVM) { + libxl_defbool_unset(&expectconfig.b_info.acpi); + libxl_defbool_set(&expectconfig.b_info.u.hvm.apic, true); + libxl_defbool_set(&expectconfig.b_info.u.hvm.acpi, true); + } +# endif + if (!(expectjson = libxl_domain_config_to_json(cfg->ctx, &expectconfig))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "Failed to retrieve JSON doc for libxl_domain_config"); -- 2.28.0

2 1

[libvirt PATCH v2] qemu: substitute missing model name for host-passthrough
by Tim Wiederhake 24 Sep '20

24 Sep '20

From: Collin Walling <walling(a)linux.ibm.com> Before: $ uname -m s390x $ cat passthrough-cpu.xml <cpu check="none" mode="host-passthrough" /> $ virsh hypervisor-cpu-compare passthrough-cpu.xml error: Failed to compare hypervisor CPU with passthrough-cpu.xml error: internal error: unable to execute QEMU command 'query-cpu-model-comp arison': Invalid parameter type for 'modelb.name', expected: string After: $ virsh hypervisor-cpu-compare passthrough-cpu.xml CPU described in passthrough-cpu.xml is identical to the CPU provided by hy pervisor on the host Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- src/qemu/qemu_driver.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ae715c01d7..1cecef01f7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12336,6 +12336,15 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, if (virCPUDefParseXMLString(xmlCPU, VIR_CPU_TYPE_AUTO, &cpu) < 0) goto cleanup; + if (!cpu->model) { + if (cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) { + cpu->model = g_strdup("host"); + } else { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("cpu parameter is missing a model name")); + goto cleanup; + } + } ret = qemuConnectCPUModelComparison(qemuCaps, cfg->libDir, cfg->user, cfg->group, hvCPU, cpu, failIncompatible); -- 2.26.2

3 6

[PATCH] apparmor: Allow /usr/libexec for libxl-save-helper and pygrub
by Jim Fehlig 24 Sep '20

24 Sep '20

Like other distros, openSUSE Tumbleweed recently changed libexecdir from /usr/lib to /usr/libexec. Add it as an allowed path for libxl-save-helper and pygrub. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- I considered including /usr/lib64, but I don't think any distros are installing xen libexecdir targets to /usr/lib64. Happy to include it if I'm wrong :-). src/security/apparmor/usr.sbin.libvirtd.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/security/apparmor/usr.sbin.libvirtd.in b/src/security/apparmor/usr.sbin.libvirtd.in index f2030764cd..bf4563e1e8 100644 --- a/src/security/apparmor/usr.sbin.libvirtd.in +++ b/src/security/apparmor/usr.sbin.libvirtd.in @@ -86,8 +86,8 @@ profile libvirtd @sbindir@/libvirtd flags=(attach_disconnected) { /{usr/,}lib/udev/scsi_id PUx, /usr/{lib,lib64}/xen-common/bin/xen-toolstack PUx, /usr/{lib,lib64}/xen/bin/* Ux, - /usr/lib/xen-*/bin/libxl-save-helper PUx, - /usr/lib/xen-*/bin/pygrub PUx, + /usr/{lib,libexec}/xen-*/bin/libxl-save-helper PUx, + /usr/{lib,libexec}/xen-*/bin/pygrub PUx, /usr/{lib,lib64,lib/qemu,libexec}/vhost-user-gpu PUx, /usr/{lib,lib64,lib/qemu,libexec}/virtiofsd PUx, -- 2.28.0

3 6