- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Fix indentation in qemuBuildControllerDevStr()
by Andrea Bolognani 12 Feb '18

12 Feb '18

Add braces around the multi-line body as well, in compliance with our coding style. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. src/qemu/qemu_command.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f7925c93a..6c73cd7bf 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2743,9 +2743,10 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef, virBufferAsprintf(&buf, "%s,bus_nr=%d,id=%s", modelName, pciopts->busNr, def->info.alias); - if (pciopts->numaNode != -1) - virBufferAsprintf(&buf, ",numa_node=%d", - pciopts->numaNode); + if (pciopts->numaNode != -1) { + virBufferAsprintf(&buf, ",numa_node=%d", + pciopts->numaNode); + } break; case VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_UPSTREAM_PORT: -- 2.14.3

1 0

[libvirt] Google Summer of Code 2018
by Michal Privoznik 12 Feb '18

12 Feb '18

Dear list, Libvirt has been accepted to this year's GSoC. Yay! For those interested in mentoring let me know (if you haven't already). For those interested in participating as students now it's the best time to view our ideas page [1] and contact corresponding mentors. If you have your own idea that's even better! Let me know and we will find you a mentor. Also, it might be worth reading page dedicated to this year's run [2]. Michal 1: https://wiki.libvirt.org/page/Google_Summer_of_Code_Ideas 2: https://wiki.libvirt.org/page/Google_Summer_of_Code_2018

1 0

[libvirt] [PATCH 00/14] Basic implementation of persistent reservations
by Michal Privoznik 12 Feb '18

12 Feb '18

QEMU added support for SCSI persistent reservations. The way QEMU implemented that makes it slightly harder for libvirt to adapt to - it's a small binary that needs to start before qemu so that it can connect to it. Basically, what libvirt does is: 1) start qemu-pr-helper (the small binary from above), 2) records its PID for tracking purposes 3) start qemu and when shutting down a domain the process is reversed: 1) shut down qemu process, 2) kill qemu-pr-helper (PID was saved earlier). Now, here also lies the last missing piece to he puzzle - what if qemu-pr-helper dies while qemu is running? After some discussion with Paolo it was agreed that qemu will emit an event for libvirt so that we can respawn the process. Anyway, that shouldn't be a show stopper for these patches (if it was the patch set might get too big). Please test, review and comment. As usual, you can find the patches on my github too: https://github.com/zippy2/libvirt/tree/pr Michal Privoznik (14): virstoragefile: Introduce virStoragePRDef qemuDomainDiskChangeSupported: Deny changing reservations qemu: Introduce pr-manager-helper capability qemu_domain: Introduce qemuDomainDiskPRObject qemu: Generate alias for pr-helper qemu: Store prAlias and prPath in status XML qemu: Generate cmd line at startup qemu: Introduce pr_helper to qemu.conf qemu: Start PR daemons on domain startup qemu: Track PR daemons PIDs in status XML qemu_domain: Introduce qemuDomainGetPRUsageCount qemu_process.c: Introduce qemuProcessSetupPRDaemon qemu_hotplug: Hotplug of reservations qemu_hotplug: Hotunplug of reservations docs/formatdomain.html.in | 25 +- docs/schemas/domaincommon.rng | 19 +- docs/schemas/storagecommon.rng | 34 ++ m4/virt-driver-qemu.m4 | 5 + src/conf/domain_conf.c | 36 ++ src/libvirt_private.syms | 4 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 4 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 59 +++ src/qemu/qemu_conf.c | 7 +- src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 435 ++++++++++++++++++++- src/qemu/qemu_domain.h | 29 ++ src/qemu/qemu_hotplug.c | 110 ++++++ src/qemu/qemu_process.c | 160 ++++++++ src/qemu/qemu_process.h | 4 + src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/virstoragefile.c | 166 ++++++++ src/util/virstoragefile.h | 17 + .../disk-virtio-scsi-reservations-not-managed.args | 28 ++ .../disk-virtio-scsi-reservations-not-managed.xml | 40 ++ .../disk-virtio-scsi-reservations.args | 29 ++ .../disk-virtio-scsi-reservations.xml | 38 ++ tests/qemuxml2argvtest.c | 8 + .../disk-virtio-scsi-reservations-not-managed.xml | 1 + .../disk-virtio-scsi-reservations.xml | 1 + tests/qemuxml2xmltest.c | 4 + 29 files changed, 1250 insertions(+), 19 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations-not-managed.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations-not-managed.xml create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml create mode 120000 tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations-not-managed.xml create mode 120000 tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.xml -- 2.13.6

6 34

[libvirt] [PATCH] Revert "qemu: Expose rx/tx_queue_size in qemu.conf too"
by Daniel P. Berrangé 12 Feb '18

12 Feb '18

This reverts commit 038eb472a0d970a17ccf4343ead0666df5c92f9d. On reflection adding defaults for arbitrary guest XML device config settings to the qemu.conf is not a sustainable path. Removing the support for rx/tx queue size so that it doesn't set a bad precedent. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/formatdomain.html.in | 14 ++-------- src/qemu/libvirtd_qemu.aug | 4 --- src/qemu/qemu.conf | 6 ----- src/qemu/qemu_command.c | 55 +++++++++++--------------------------- src/qemu/qemu_command.h | 3 +-- src/qemu/qemu_conf.c | 4 --- src/qemu/qemu_conf.h | 3 --- src/qemu/qemu_hotplug.c | 2 +- src/qemu/test_libvirtd_qemu.aug.in | 2 -- 9 files changed, 19 insertions(+), 74 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 6707744bda..3ec1173c6f 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5456,12 +5456,7 @@ qemu-kvm -net nic,model=? /dev/null some restrictions on actual value. For instance, latest QEMU (as of 2016-09-01) requires value to be a power of two from [256, 1024] range. - Since 2.3.0 (QEMU and KVM only) - Additionally, since 4.1.0 the - value can be set in the <code>qemu.conf</code> file in order - to override the hypervisor default value. Note that XML has - higher precedence because it's more specific. - + Since 2.3.0 (QEMU and KVM only) In general you should leave this option alone, unless you are very certain you know what you are doing. @@ -5477,12 +5472,7 @@ qemu-kvm -net nic,model=? /dev/null range. In addition to that, this may work only for a subset of interface types, e.g. aforementioned QEMU enables this option only for <code>vhostuser</code> type. - Since 3.7.0 (QEMU and KVM only) - Additionally, since 4.1.0 the - value can be set in the <code>qemu.conf</code> file in order - to override the hypervisor default value. Note that XML has - higher precedence because it's more specific. - + Since 3.7.0 (QEMU and KVM only) In general you should leave this option alone, unless you are very certain you know what you are doing. diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index 084290296a..c19bf3a43a 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -118,9 +118,6 @@ module Libvirtd_qemu = let vxhs_entry = bool_entry "vxhs_tls" | str_entry "vxhs_tls_x509_cert_dir" - let virtio_entry = int_entry "rx_queue_size" - | int_entry "tx_queue_size" - (* Each entry in the config is one of the following ... *) let entry = default_tls_entry | vnc_entry @@ -140,7 +137,6 @@ module Libvirtd_qemu = | gluster_debug_level_entry | memory_entry | vxhs_entry - | virtio_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 62c4265ea9..43dd561cca 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -775,9 +775,3 @@ # This directory is used for memoryBacking source if configured as file. # NOTE: big files will be stored here #memory_backing_dir = "/var/lib/libvirt/qemu/ram" - -# The following two values set the default RX/TX ring buffer size for virtio -# interfaces. These values are taken unless overridden in domain XML. For more -# info consult docs to corresponding attributes from domain XML. -#rx_queue_size = 1024 -#tx_queue_size = 1024 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2bcaa5fc22..f7925c93a8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3351,8 +3351,7 @@ qemuBuildNicStr(virDomainNetDefPtr net, char * -qemuBuildNicDevStr(virQEMUDriverConfigPtr cfg, - virDomainDefPtr def, +qemuBuildNicDevStr(virDomainDefPtr def, virDomainNetDefPtr net, int vlan, unsigned int bootindex, @@ -3472,41 +3471,21 @@ qemuBuildNicDevStr(virQEMUDriverConfigPtr cfg, virBufferAsprintf(&buf, ",mq=on,vectors=%zu", 2 * vhostfdSize + 2); } } - if (usingVirtio) { - unsigned int rx_queue_size = net->driver.virtio.rx_queue_size; - - if (rx_queue_size == 0) - rx_queue_size = cfg->rx_queue_size; - - if (rx_queue_size) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio rx_queue_size option is " - "not supported with this QEMU binary")); - goto error; - } - - net->driver.virtio.rx_queue_size = rx_queue_size; - virBufferAsprintf(&buf, ",rx_queue_size=%u", rx_queue_size); + if (usingVirtio && net->driver.virtio.rx_queue_size) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("virtio rx_queue_size option is not supported with this QEMU binary")); + goto error; } + virBufferAsprintf(&buf, ",rx_queue_size=%u", net->driver.virtio.rx_queue_size); } - if (usingVirtio) { - unsigned int tx_queue_size = net->driver.virtio.tx_queue_size; - - if (tx_queue_size == 0) - tx_queue_size = cfg->tx_queue_size; - - if (tx_queue_size) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio tx_queue_size option is " - "not supported with this QEMU binary")); - goto error; - } - - net->driver.virtio.tx_queue_size = tx_queue_size; - virBufferAsprintf(&buf, ",tx_queue_size=%u", tx_queue_size); + if (usingVirtio && net->driver.virtio.tx_queue_size) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("virtio tx_queue_size option is not supported with this QEMU binary")); + goto error; } + virBufferAsprintf(&buf, ",tx_queue_size=%u", net->driver.virtio.tx_queue_size); } if (usingVirtio && net->mtu) { @@ -8192,7 +8171,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, virCommandAddArg(cmd, netdev); VIR_FREE(netdev); - if (!(nic = qemuBuildNicDevStr(cfg, def, net, -1, bootindex, + if (!(nic = qemuBuildNicDevStr(def, net, -1, bootindex, queues, qemuCaps))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Error generating NIC -device string")); @@ -8229,7 +8208,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, int **nicindexes, bool chardevStdioLogd) { - virQEMUDriverConfigPtr cfg = NULL; int ret = -1; char *nic = NULL, *host = NULL; int *tapfd = NULL; @@ -8291,8 +8269,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, return -1; } - cfg = virQEMUDriverGetConfig(driver); - switch (actualType) { case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_BRIDGE: @@ -8488,7 +8464,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, virCommandAddArgList(cmd, "-netdev", host, NULL); } if (qemuDomainSupportsNicdev(def, net)) { - if (!(nic = qemuBuildNicDevStr(cfg, def, net, vlan, bootindex, + if (!(nic = qemuBuildNicDevStr(def, net, vlan, bootindex, vhostfdSize, qemuCaps))) goto cleanup; virCommandAddArgList(cmd, "-device", nic, NULL); @@ -8532,7 +8508,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, VIR_FREE(host); VIR_FREE(tapfdName); VIR_FREE(vhostfdName); - virObjectUnref(cfg); return ret; } diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 6449883291..31c9da673c 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -90,8 +90,7 @@ char *qemuBuildNicStr(virDomainNetDefPtr net, int vlan); /* Current, best practice */ -char *qemuBuildNicDevStr(virQEMUDriverConfigPtr cfg, - virDomainDefPtr def, +char *qemuBuildNicDevStr(virDomainDefPtr def, virDomainNetDefPtr net, int vlan, unsigned int bootindex, diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 2fa96431fa..af503d31cb 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -912,10 +912,6 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (virConfGetValueString(conf, "memory_backing_dir", &cfg->memoryBackingDir) < 0) goto cleanup; - if (virConfGetValueUInt(conf, "rx_queue_size", &cfg->rx_queue_size) < 0 || - virConfGetValueUInt(conf, "tx_queue_size", &cfg->tx_queue_size) < 0) - goto cleanup; - ret = 0; cleanup: diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 3f38a76c26..a553e30e2e 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -206,9 +206,6 @@ struct _virQEMUDriverConfig { bool vxhsTLS; char *vxhsTLSx509certdir; - - unsigned int rx_queue_size; - unsigned int tx_queue_size; }; /* Main driver state */ diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 3291ce6130..c9868de778 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1118,7 +1118,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, for (i = 0; i < vhostfdSize; i++) VIR_FORCE_CLOSE(vhostfd[i]); - if (!(nicstr = qemuBuildNicDevStr(cfg, vm->def, net, vlan, 0, + if (!(nicstr = qemuBuildNicDevStr(vm->def, net, vlan, 0, queueSize, priv->qemuCaps))) goto try_remove; diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 4fc4e2f4ec..688e5b9fda 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -100,5 +100,3 @@ module Test_libvirtd_qemu = { "1" = "mount" } } { "memory_backing_dir" = "/var/lib/libvirt/qemu/ram" } -{ "rx_queue_size" = "1024" } -{ "tx_queue_size" = "1024" } -- 2.14.3

2 1

[libvirt] [PATCH v2] vcpupin: add clear feature
by Yi Wang 12 Feb '18

12 Feb '18

We can't clear vcpupin settings of XML once we did vcpupin command, this is not convenient under some condition such as migration to a host with less CPUs. This patch introduces clear feature, which can clear vcpuin setting of XML using a 'c' option. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> Signed-off-by: Xi Xu <xu.xi8(a)zte.com.cn> --- include/libvirt/libvirt-domain.h | 11 +++++++++++ src/qemu/qemu_driver.c | 32 ++++++++++++++++++++++++-------- tools/virsh-domain.c | 5 ++++- tools/virsh.pod | 1 + 4 files changed, 40 insertions(+), 9 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 4048acf..46f4e77 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -1847,6 +1847,17 @@ int virDomainSetVcpusFlags (virDomainPtr domain, int virDomainGetVcpusFlags (virDomainPtr domain, unsigned int flags); +/* Flags for controlling virtual CPU pinning. */ +typedef enum { + /* See virDomainModificationImpact for these flags. */ + VIR_DOMAIN_VCPU_PIN_CURRENT = VIR_DOMAIN_AFFECT_CURRENT, + VIR_DOMAIN_VCPU_PIN_LIVE = VIR_DOMAIN_AFFECT_LIVE, + VIR_DOMAIN_VCPU_PIN_CONFIG = VIR_DOMAIN_AFFECT_CONFIG, + + /* Additionally, these flags may be bitwise-OR'd in. */ + VIR_DOMAIN_VCPU_PIN_CLEAR = (1 << 2), /* Clear vcpus pin info */ +} virDomainVcpuPinFlags; + int virDomainPinVcpu (virDomainPtr domain, unsigned int vcpu, unsigned char *cpumap, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bbce5bd..fe1f62f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5056,7 +5056,8 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, int vcpu, virQEMUDriverPtr driver, virQEMUDriverConfigPtr cfg, - virBitmapPtr cpumap) + virBitmapPtr cpumap, + bool clear) { virBitmapPtr tmpmap = NULL; virDomainVcpuDefPtr vcpuinfo; @@ -5069,6 +5070,7 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, int eventNparams = 0; int eventMaxparams = 0; int ret = -1; + virBitmapPtr targetMap = NULL; if (!qemuDomainHasVcpuPids(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -5083,10 +5085,15 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, goto cleanup; } - if (!(tmpmap = virBitmapNewCopy(cpumap))) - goto cleanup; + if (clear) { + targetMap = virHostCPUGetOnlineBitmap(); + } else { + targetMap = cpumap; + if (!(tmpmap = virBitmapNewCopy(cpumap))) + goto cleanup; + } - if (!(str = virBitmapFormat(cpumap))) + if (!(str = virBitmapFormat(targetMap))) goto cleanup; if (vcpuinfo->online) { @@ -5095,11 +5102,11 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, if (virCgroupNewThread(priv->cgroup, VIR_CGROUP_THREAD_VCPU, vcpu, false, &cgroup_vcpu) < 0) goto cleanup; - if (qemuSetupCgroupCpusetCpus(cgroup_vcpu, cpumap) < 0) + if (qemuSetupCgroupCpusetCpus(cgroup_vcpu, targetMap) < 0) goto cleanup; } - if (virProcessSetAffinity(qemuDomainGetVcpuPid(vm, vcpu), cpumap) < 0) + if (virProcessSetAffinity(qemuDomainGetVcpuPid(vm, vcpu), targetMap) < 0) goto cleanup; } @@ -5128,6 +5135,8 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, virCgroupFree(&cgroup_vcpu); VIR_FREE(str); qemuDomainEventQueue(driver, event); + if (clear) + virBitmapFree(targetMap); return ret; } @@ -5148,9 +5157,11 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, virBitmapPtr pcpumap = NULL; virDomainVcpuDefPtr vcpuinfo = NULL; virQEMUDriverConfigPtr cfg = NULL; + bool clear = false; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | - VIR_DOMAIN_AFFECT_CONFIG, -1); + VIR_DOMAIN_AFFECT_CONFIG | + VIR_DOMAIN_VCPU_PIN_CLEAR, -1); cfg = virQEMUDriverGetConfig(driver); @@ -5166,6 +5177,8 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0) goto endjob; + clear = !!(flags & VIR_DOMAIN_VCPU_PIN_CLEAR); + if ((def && def->virtType == VIR_DOMAIN_VIRT_QEMU) || (persistentDef && persistentDef->virtType == VIR_DOMAIN_VIRT_QEMU)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", @@ -5191,7 +5204,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, } if (def && - qemuDomainPinVcpuLive(vm, def, vcpu, driver, cfg, pcpumap) < 0) + qemuDomainPinVcpuLive(vm, def, vcpu, driver, cfg, pcpumap, clear) < 0) goto endjob; if (persistentDef) { @@ -5199,6 +5212,9 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, vcpuinfo->cpumask = pcpumap; pcpumap = NULL; + if (clear) + virBitmapFree(vcpuinfo->cpumask); + ret = virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef); goto endjob; } diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 5a0e0c1..4981ecc 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6863,7 +6863,7 @@ virshParseCPUList(vshControl *ctl, int *cpumaplen, unsigned char *cpumap = NULL; virBitmapPtr map = NULL; - if (cpulist[0] == 'r') { + if (cpulist[0] == 'r' || cpulist[0] == 'c') { if (!(map = virBitmapNew(maxcpu))) return NULL; virBitmapSetAll(map); @@ -6941,6 +6941,9 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) goto cleanup; } + if (STREQ(cpulist, "c")) + flags |= VIR_DOMAIN_VCPU_PIN_CLEAR; + /* Pin mode: pinning specified vcpu to specified physical cpus*/ if (!(cpumap = virshParseCPUList(ctl, &cpumaplen, cpulist, maxcpu))) goto cleanup; diff --git a/tools/virsh.pod b/tools/virsh.pod index 69cc423..d5a1779 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2857,6 +2857,7 @@ I<cpulist> is a list of physical CPU numbers. Its syntax is a comma separated list and a special markup using '-' and '^' (ex. '0-4', '0-3,^2') can also be allowed. The '-' denotes the range and the '^' denotes exclusive. For pinning the I<vcpu> to all physical cpus specify 'r' as a I<cpulist>. +For clearing pinning info, specify 'c' as a I<cpulist>. If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. If I<--current> is specified, affect the current guest state. -- 1.8.3.1

3 4

[libvirt] [PATCH] log: fix deadlock obtaining hostname (related CVE-2018-6764)
by Daniel P. Berrangé 12 Feb '18

12 Feb '18

The fix for CVE-2018-6764 introduced a potential deadlock scenario that gets triggered by the NSS module when virGetHostname() calls getaddrinfo to resolve the hostname: #0 0x00007f6e714b57e7 in futex_wait #1 futex_wait_simple #2 __pthread_once_slow #3 0x00007f6e71d16e7d in virOnce #4 0x00007f6e71d0997c in virLogInitialize #5 0x00007f6e71d0a09a in virLogVMessage #6 0x00007f6e71d09ffd in virLogMessage #7 0x00007f6e71d0db22 in virObjectNew #8 0x00007f6e71d0dbf1 in virObjectLockableNew #9 0x00007f6e71d0d3e5 in virMacMapNew #10 0x00007f6e71cdc50a in findLease #11 0x00007f6e71cdcc56 in _nss_libvirt_gethostbyname4_r #12 0x00007f6e724631fc in gaih_inet #13 0x00007f6e72464697 in __GI_getaddrinfo #14 0x00007f6e71d19e81 in virGetHostnameImpl #15 0x00007f6e71d1a057 in virGetHostnameQuiet #16 0x00007f6e71d09936 in virLogOnceInit #17 0x00007f6e71d09952 in virLogOnce #18 0x00007f6e714b5829 in __pthread_once_slow #19 0x00007f6e71d16e7d in virOnce #20 0x00007f6e71d0997c in virLogInitialize #21 0x00007f6e71d0a09a in virLogVMessage #22 0x00007f6e71d09ffd in virLogMessage #23 0x00007f6e71d0db22 in virObjectNew #24 0x00007f6e71d0dbf1 in virObjectLockableNew #25 0x00007f6e71d0d3e5 in virMacMapNew #26 0x00007f6e71cdc50a in findLease #27 0x00007f6e71cdc839 in _nss_libvirt_gethostbyname3_r #28 0x00007f6e71cdc724 in _nss_libvirt_gethostbyname2_r #29 0x00007f6e7248f72f in __gethostbyname2_r #30 0x00007f6e7248f494 in gethostbyname2 #31 0x000056348c30c36d in hosts_keys #32 0x000056348c30b7d2 in main Fortunately the extra stuff virGetHostname does is totally irrelevant to the needs of the logging code, so we can just inline a call to the native hostname() syscall directly. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/util/virlog.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index 8f1e4800dd..4f66cc5e5c 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -64,7 +64,7 @@ VIR_LOG_INIT("util.log"); static regex_t *virLogRegex; -static char *virLogHostname; +static char virLogHostname[HOST_NAME_MAX+1]; #define VIR_LOG_DATE_REGEX "[0-9]{4}-[0-9]{2}-[0-9]{2}" @@ -261,6 +261,8 @@ virLogPriorityString(virLogPriority lvl) static int virLogOnceInit(void) { + int r; + if (virMutexInit(&virLogMutex) < 0) return -1; @@ -275,8 +277,17 @@ virLogOnceInit(void) /* We get and remember the hostname early, because at later time * it might not be possible to load NSS modules via getaddrinfo() * (e.g. at container startup the host filesystem will not be - * accessible anymore. */ - virLogHostname = virGetHostnameQuiet(); + * accessible anymore. + * Must not use virGetHostname though as that causes re-entrancy + * problems if it triggers logging codepaths + */ + r = gethostname(virLogHostname, sizeof(virLogHostname)); + if (r == -1) { + ignore_value(virStrcpy(virLogHostname, + "(unknown)", sizeof(virLogHostname))); + } else { + NUL_TERMINATE(virLogHostname); + } virLogUnlock(); return 0; @@ -475,9 +486,6 @@ virLogHostnameString(char **rawmsg, { char *hoststr; - if (!virLogHostname) - return -1; - if (virAsprintfQuiet(&hoststr, "hostname: %s", virLogHostname) < 0) return -1; -- 2.14.3

2 2

[libvirt] [PATCH v2] qemu: Expose rx/tx_queue_size in qemu.conf too
by Michal Privoznik 12 Feb '18

12 Feb '18

In 2074ef6cd4a2 and c56cdf259 (and friends) we've added two attributes to virtio NICs: rx_queue_size and tx_queue_size. However, sysadmins might want to set these on per-host basis but don't necessarily have an access to domain XML (e.g. because they are generated by some other app). So let's expose them under qemu.conf (the settings from domain XML still take precedence as they are more specific ones). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: - Reworded docs and config file comment - Simplified logic in qemuBuildNicDevStr a bit - Make the values require qemu with corresponding capabilities docs/formatdomain.html.in | 14 ++++++++-- src/qemu/libvirtd_qemu.aug | 4 +++ src/qemu/qemu.conf | 6 +++++ src/qemu/qemu_command.c | 55 +++++++++++++++++++++++++++----------- src/qemu/qemu_command.h | 3 ++- src/qemu/qemu_conf.c | 4 +++ src/qemu/qemu_conf.h | 3 +++ src/qemu/qemu_hotplug.c | 2 +- src/qemu/test_libvirtd_qemu.aug.in | 2 ++ 9 files changed, 74 insertions(+), 19 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3ec1173c6..6707744bd 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5456,7 +5456,12 @@ qemu-kvm -net nic,model=? /dev/null some restrictions on actual value. For instance, latest QEMU (as of 2016-09-01) requires value to be a power of two from [256, 1024] range. - Since 2.3.0 (QEMU and KVM only) + Since 2.3.0 (QEMU and KVM only) + Additionally, since 4.1.0 the + value can be set in the <code>qemu.conf</code> file in order + to override the hypervisor default value. Note that XML has + higher precedence because it's more specific. + In general you should leave this option alone, unless you are very certain you know what you are doing. @@ -5472,7 +5477,12 @@ qemu-kvm -net nic,model=? /dev/null range. In addition to that, this may work only for a subset of interface types, e.g. aforementioned QEMU enables this option only for <code>vhostuser</code> type. - Since 3.7.0 (QEMU and KVM only) + Since 3.7.0 (QEMU and KVM only) + Additionally, since 4.1.0 the + value can be set in the <code>qemu.conf</code> file in order + to override the hypervisor default value. Note that XML has + higher precedence because it's more specific. + In general you should leave this option alone, unless you are very certain you know what you are doing. diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index c19bf3a43..084290296 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -118,6 +118,9 @@ module Libvirtd_qemu = let vxhs_entry = bool_entry "vxhs_tls" | str_entry "vxhs_tls_x509_cert_dir" + let virtio_entry = int_entry "rx_queue_size" + | int_entry "tx_queue_size" + (* Each entry in the config is one of the following ... *) let entry = default_tls_entry | vnc_entry @@ -137,6 +140,7 @@ module Libvirtd_qemu = | gluster_debug_level_entry | memory_entry | vxhs_entry + | virtio_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 43dd561cc..62c4265ea 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -775,3 +775,9 @@ # This directory is used for memoryBacking source if configured as file. # NOTE: big files will be stored here #memory_backing_dir = "/var/lib/libvirt/qemu/ram" + +# The following two values set the default RX/TX ring buffer size for virtio +# interfaces. These values are taken unless overridden in domain XML. For more +# info consult docs to corresponding attributes from domain XML. +#rx_queue_size = 1024 +#tx_queue_size = 1024 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 899f0cbbb..543270028 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3751,7 +3751,8 @@ qemuBuildNicStr(virDomainNetDefPtr net, char * -qemuBuildNicDevStr(virDomainDefPtr def, +qemuBuildNicDevStr(virQEMUDriverConfigPtr cfg, + virDomainDefPtr def, virDomainNetDefPtr net, int vlan, unsigned int bootindex, @@ -3871,21 +3872,41 @@ qemuBuildNicDevStr(virDomainDefPtr def, virBufferAsprintf(&buf, ",mq=on,vectors=%zu", 2 * vhostfdSize + 2); } } - if (usingVirtio && net->driver.virtio.rx_queue_size) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio rx_queue_size option is not supported with this QEMU binary")); - goto error; + if (usingVirtio) { + unsigned int rx_queue_size = net->driver.virtio.rx_queue_size; + + if (rx_queue_size == 0) + rx_queue_size = cfg->rx_queue_size; + + if (rx_queue_size) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("virtio rx_queue_size option is " + "not supported with this QEMU binary")); + goto error; + } + + net->driver.virtio.rx_queue_size = rx_queue_size; + virBufferAsprintf(&buf, ",rx_queue_size=%u", rx_queue_size); } - virBufferAsprintf(&buf, ",rx_queue_size=%u", net->driver.virtio.rx_queue_size); } - if (usingVirtio && net->driver.virtio.tx_queue_size) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio tx_queue_size option is not supported with this QEMU binary")); - goto error; + if (usingVirtio) { + unsigned int tx_queue_size = net->driver.virtio.tx_queue_size; + + if (tx_queue_size == 0) + tx_queue_size = cfg->tx_queue_size; + + if (tx_queue_size) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("virtio tx_queue_size option is " + "not supported with this QEMU binary")); + goto error; + } + + net->driver.virtio.tx_queue_size = tx_queue_size; + virBufferAsprintf(&buf, ",tx_queue_size=%u", tx_queue_size); } - virBufferAsprintf(&buf, ",tx_queue_size=%u", net->driver.virtio.tx_queue_size); } if (usingVirtio && net->mtu) { @@ -8571,7 +8592,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, virCommandAddArg(cmd, netdev); VIR_FREE(netdev); - if (!(nic = qemuBuildNicDevStr(def, net, -1, bootindex, + if (!(nic = qemuBuildNicDevStr(cfg, def, net, -1, bootindex, queues, qemuCaps))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Error generating NIC -device string")); @@ -8608,6 +8629,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, int **nicindexes, bool chardevStdioLogd) { + virQEMUDriverConfigPtr cfg = NULL; int ret = -1; char *nic = NULL, *host = NULL; int *tapfd = NULL; @@ -8669,6 +8691,8 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, return -1; } + cfg = virQEMUDriverGetConfig(driver); + switch (actualType) { case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_BRIDGE: @@ -8864,7 +8888,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, virCommandAddArgList(cmd, "-netdev", host, NULL); } if (qemuDomainSupportsNicdev(def, net)) { - if (!(nic = qemuBuildNicDevStr(def, net, vlan, bootindex, + if (!(nic = qemuBuildNicDevStr(cfg, def, net, vlan, bootindex, vhostfdSize, qemuCaps))) goto cleanup; virCommandAddArgList(cmd, "-device", nic, NULL); @@ -8908,6 +8932,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, VIR_FREE(host); VIR_FREE(tapfdName); VIR_FREE(vhostfdName); + virObjectUnref(cfg); return ret; } diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 31c9da673..644988329 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -90,7 +90,8 @@ char *qemuBuildNicStr(virDomainNetDefPtr net, int vlan); /* Current, best practice */ -char *qemuBuildNicDevStr(virDomainDefPtr def, +char *qemuBuildNicDevStr(virQEMUDriverConfigPtr cfg, + virDomainDefPtr def, virDomainNetDefPtr net, int vlan, unsigned int bootindex, diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index af503d31c..2fa96431f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -912,6 +912,10 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (virConfGetValueString(conf, "memory_backing_dir", &cfg->memoryBackingDir) < 0) goto cleanup; + if (virConfGetValueUInt(conf, "rx_queue_size", &cfg->rx_queue_size) < 0 || + virConfGetValueUInt(conf, "tx_queue_size", &cfg->tx_queue_size) < 0) + goto cleanup; + ret = 0; cleanup: diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index a553e30e2..3f38a76c2 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -206,6 +206,9 @@ struct _virQEMUDriverConfig { bool vxhsTLS; char *vxhsTLSx509certdir; + + unsigned int rx_queue_size; + unsigned int tx_queue_size; }; /* Main driver state */ diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 2aa927e62..0672ed130 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1120,7 +1120,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, for (i = 0; i < vhostfdSize; i++) VIR_FORCE_CLOSE(vhostfd[i]); - if (!(nicstr = qemuBuildNicDevStr(vm->def, net, vlan, 0, + if (!(nicstr = qemuBuildNicDevStr(cfg, vm->def, net, vlan, 0, queueSize, priv->qemuCaps))) goto try_remove; diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 688e5b9fd..4fc4e2f4e 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -100,3 +100,5 @@ module Test_libvirtd_qemu = { "1" = "mount" } } { "memory_backing_dir" = "/var/lib/libvirt/qemu/ram" } +{ "rx_queue_size" = "1024" } +{ "tx_queue_size" = "1024" } -- 2.13.6

4 4

[libvirt] [PATCH] tests: fix running of qemuxml2argvtest program
by Daniel P. Berrangé 12 Feb '18

12 Feb '18

The previous commit: commit a455d41e3e1c1af3a36ccdbb2e3f2356cc58993e Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Thu Jan 25 09:35:50 2018 +0000 conf: expand network device callbacks to cover resolving NIC type mistakenly dropped qemuxml2argvtest from the tests due to a typo. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index d013aed5eb..4ff3fa742a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -291,7 +291,7 @@ test_programs += qemuxml2xmltest \ if WITH_NETWORK # Dep on the network driver callback for resolving NIC # actual type. XXX remove this dep. -test_programs += qemuxml2xmltest +test_programs += qemuxml2argvtest endif WITH_NETWORK test_helpers += qemucapsprobe test_libraries += libqemumonitortestutils.la \ -- 2.14.3

2 1

[libvirt] [PATCH] virutil: Introduce virGetHostnameSimple()
by Michal Privoznik 12 Feb '18

12 Feb '18

After 759b4d1b0fe5f we are getting hostname in virLogOnceInit(). Problem with this approach is in the NSS module because the module calls some internal APIs which occasionally want to log something. This results in virLogInitialize() to be called which in turn ends up calling virGetHostnameQuiet() and effectively the control gets to NSS plugin again which calls some internal APIs which occasionally want to log something. You can see the deadlock now. One way out of this is to call only gethostname() and not whole virGetHostnameQuiet() machinery. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt_private.syms | 1 + src/util/virlog.c | 2 +- src/util/virutil.c | 46 ++++++++++++++++++++++++++++++++++------------ src/util/virutil.h | 1 + 4 files changed, 37 insertions(+), 13 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3b14d7d15..3ef55f809 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3016,6 +3016,7 @@ virGetGroupList; virGetGroupName; virGetHostname; virGetHostnameQuiet; +virGetHostnameSimple; virGetListenFDs; virGetSelfLastChanged; virGetSystemPageSize; diff --git a/src/util/virlog.c b/src/util/virlog.c index 8f1e4800d..fc854ffeb 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -276,7 +276,7 @@ virLogOnceInit(void) * it might not be possible to load NSS modules via getaddrinfo() * (e.g. at container startup the host filesystem will not be * accessible anymore. */ - virLogHostname = virGetHostnameQuiet(); + virLogHostname = virGetHostnameSimple(); virLogUnlock(); return 0; diff --git a/src/util/virutil.c b/src/util/virutil.c index cd6fbf2f3..22adecd53 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -684,26 +684,23 @@ static char * virGetHostnameImpl(bool quiet) { int r; - char hostname[HOST_NAME_MAX+1], *result = NULL; + char *result; struct addrinfo hints, *info; - r = gethostname(hostname, sizeof(hostname)); - if (r == -1) { + if (!(result = virGetHostnameSimple())) { if (!quiet) virReportSystemError(errno, "%s", _("failed to determine host name")); return NULL; } - NUL_TERMINATE(hostname); - if (STRPREFIX(hostname, "localhost") || strchr(hostname, '.')) { + if (STRPREFIX(result, "localhost") || strchr(result, '.')) { /* in this case, gethostname returned localhost (meaning we can't * do any further canonicalization), or it returned an FQDN (and * we don't need to do any further canonicalization). Return the * string as-is; it's up to callers to check whether "localhost" * is allowed. */ - ignore_value(VIR_STRDUP_QUIET(result, hostname)); goto cleanup; } @@ -714,12 +711,11 @@ virGetHostnameImpl(bool quiet) memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_CANONNAME|AI_CANONIDN; hints.ai_family = AF_UNSPEC; - r = getaddrinfo(hostname, NULL, &hints, &info); + r = getaddrinfo(result, NULL, &hints, &info); if (r != 0) { if (!quiet) VIR_WARN("getaddrinfo failed for '%s': %s", - hostname, gai_strerror(r)); - ignore_value(VIR_STRDUP_QUIET(result, hostname)); + result, gai_strerror(r)); goto cleanup; } @@ -727,15 +723,16 @@ virGetHostnameImpl(bool quiet) sa_assert(info); if (info->ai_canonname == NULL || - STRPREFIX(info->ai_canonname, "localhost")) + STRPREFIX(info->ai_canonname, "localhost")) { /* in this case, we tried to canonicalize and we ended up back with * localhost. Ignore the canonicalized name and just return the * original hostname */ - ignore_value(VIR_STRDUP_QUIET(result, hostname)); - else + } else { /* Caller frees this string. */ + VIR_FREE(result); ignore_value(VIR_STRDUP_QUIET(result, info->ai_canonname)); + } freeaddrinfo(info); @@ -760,6 +757,31 @@ virGetHostnameQuiet(void) } +/** + * virGetHostnameSimple: + * + * Plain wrapper over gethostname(). The difference to + * virGetHostname() is that this function doesn't try to + * canonicalize the hostname. + * + * Returns: hostname string (caller must free), + * NULL on error. + */ +char * +virGetHostnameSimple(void) +{ + char hostname[HOST_NAME_MAX+1]; + char *ret; + + if (gethostname(hostname, sizeof(hostname)) == -1) + return NULL; + + NUL_TERMINATE(hostname); + ignore_value(VIR_STRDUP_QUIET(ret, hostname)); + return ret; +} + + char * virGetUserDirectory(void) { diff --git a/src/util/virutil.h b/src/util/virutil.h index be0f6b0ea..57148374b 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -136,6 +136,7 @@ static inline int pthread_sigmask(int how, char *virGetHostname(void); char *virGetHostnameQuiet(void); +char *virGetHostnameSimple(void); char *virGetUserDirectory(void); char *virGetUserDirectoryByUID(uid_t uid); -- 2.13.6

2 2

[libvirt] [PATCH v3 00/15] Misc build refactoring / isolation work
by Daniel P. Berrangé 12 Feb '18

12 Feb '18

This was triggered by the recent Fedora change to add '-z defs' to RPM builds by default which breaks libvirt. Various make rule changes can fix much of the problem, but it also requires source refactoring to get rid of places where virt drivers directly call into the storage/network drivers. Co-incidentally this work will also be useful in allowing us to separate out drivers to distinct daemons. In v3: - Fixed a few build problems identified by travis In v2: - Fixed header file name comment - Resolve conflicts - Fix unit tests - Fix bisectable build by moving libvirt_lxc build patch earlier - Update syntax check header include rule Daniel P. Berrangé (15): storage: extract storage file backend from main storage driver backend storage: move storage file backend framework into util directory rpc: don't link in second copy of RPC code to libvirtd & lockd plugin build: link libvirt_lxc against libvirt.so conf: introduce callback registration for domain net device allocation conf: expand network device callbacks to cover bandwidth updates qemu: replace networkGetNetworkAddress with public API calls conf: expand network device callbacks to cover resolving NIC type network: remove conditional declarations conf: move virStorageTranslateDiskSourcePool into domain conf storage: export virStoragePoolLookupByTargetPath as a public API build: explicitly link all modules with libvirt.so build: provide a AM_FLAGS_MOD for loadable modules build: passing the "-z defs" linker flag to prevent undefined symbols cfg: forbid includes of headers in network and storage drivers again cfg.mk | 2 +- configure.ac | 1 + daemon/Makefile.am | 3 +- include/libvirt/libvirt-storage.h | 2 + m4/virt-linker-no-undefined.m4 | 32 ++ po/POTFILES.in | 2 +- src/Makefile.am | 150 ++++---- src/bhyve/bhyve_command.c | 7 +- src/conf/domain_conf.c | 355 +++++++++++++++++++ src/conf/domain_conf.h | 71 ++++ src/driver-storage.h | 5 + src/libvirt-storage.c | 40 +++ src/libvirt_private.syms | 29 ++ src/libvirt_public.syms | 6 + src/libvirt_remote.syms | 11 +- src/libxl/libxl_domain.c | 5 +- src/libxl/libxl_driver.c | 7 +- src/lxc/lxc_driver.c | 5 +- src/lxc/lxc_process.c | 7 +- src/network/bridge_driver.c | 124 +------ src/network/bridge_driver.h | 72 ---- src/qemu/qemu_alias.c | 3 +- src/qemu/qemu_command.c | 1 - src/qemu/qemu_domain.c | 3 - src/qemu/qemu_domain_address.c | 3 +- src/qemu/qemu_driver.c | 15 +- src/qemu/qemu_hotplug.c | 18 +- src/qemu/qemu_migration.c | 3 +- src/qemu/qemu_process.c | 115 +++++- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 17 +- src/remote_protocol-structs | 7 + src/security/virt-aa-helper.c | 2 - src/storage/storage_backend.c | 66 ---- src/storage/storage_backend.h | 75 ---- src/storage/storage_backend_fs.c | 8 +- src/storage/storage_backend_gluster.c | 4 +- src/storage/storage_driver.c | 256 +------------- src/storage/storage_driver.h | 3 - src/storage/storage_source.c | 645 ---------------------------------- src/storage/storage_source.h | 59 ---- src/util/virstoragefile.c | 609 +++++++++++++++++++++++++++++++- src/util/virstoragefile.h | 32 ++ src/util/virstoragefilebackend.c | 108 ++++++ src/util/virstoragefilebackend.h | 104 ++++++ src/vz/vz_sdk.c | 1 - tests/Makefile.am | 11 +- tests/qemuxml2argvtest.c | 4 + tests/virstoragetest.c | 1 - tools/Makefile.am | 1 + 50 files changed, 1679 insertions(+), 1432 deletions(-) create mode 100644 m4/virt-linker-no-undefined.m4 delete mode 100644 src/storage/storage_source.c delete mode 100644 src/storage/storage_source.h create mode 100644 src/util/virstoragefilebackend.c create mode 100644 src/util/virstoragefilebackend.h -- 2.14.3

3 19

[libvirt] [PATCH] virlog: Allow opting out from logging
by Michal Privoznik 12 Feb '18

12 Feb '18

After 759b4d1b0fe5f we are getting hostname in virLogOnceInit(). Problem with this approach is in the NSS module because the module calls some internal APIs which occasionally want to log something. This results in virLogInitialize() to be called which in turn ends up calling virGetHostnameQuiet() and effectively the control gets to NSS plugin again which calls some internal APIs which occasionally want to log something. You can see the deadlock now. One way out from this is to turn logging into no-op. Which kind of makes sense - the NSS module shouldn't log anything. To achieve this, the virLogVMessage() function is provided with separate no-op implementation if DISABLE_LOGGING_FOR_NSS macro is set. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- config-post.h | 1 + src/util/virlog.c | 119 ++++++++++++++++++++++++++++++++---------------------- 2 files changed, 71 insertions(+), 49 deletions(-) diff --git a/config-post.h b/config-post.h index f7eba0d7c..95e834f8e 100644 --- a/config-post.h +++ b/config-post.h @@ -72,6 +72,7 @@ # undef WITH_SECDRIVER_SELINUX # undef WITH_SECDRIVER_APPARMOR # undef WITH_CAPNG +# define DISABLE_LOGGING_FOR_NSS #endif /* LIBVIRT_NSS */ #ifndef __GNUC__ diff --git a/src/util/virlog.c b/src/util/virlog.c index 8f1e4800d..3284bdc03 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -241,23 +241,6 @@ virLogGetDefaultOutput(void) } -static const char * -virLogPriorityString(virLogPriority lvl) -{ - switch (lvl) { - case VIR_LOG_DEBUG: - return "debug"; - case VIR_LOG_INFO: - return "info"; - case VIR_LOG_WARN: - return "warning"; - case VIR_LOG_ERROR: - return "error"; - } - return "unknown"; -} - - static int virLogOnceInit(void) { @@ -429,6 +412,60 @@ virLogOutputListFree(virLogOutputPtr *list, int count) } +/** + * virLogMessage: + * @source: where is that message coming from + * @priority: the priority level + * @filename: file where the message was emitted + * @linenr: line where the message was emitted + * @funcname: the function emitting the (debug) message + * @metadata: NULL or metadata array, terminated by an item with NULL key + * @fmt: the string format + * @...: the arguments + * + * Call the libvirt logger with some information. Based on the configuration + * the message may be stored, sent to output or just discarded + */ +void +virLogMessage(virLogSourcePtr source, + virLogPriority priority, + const char *filename, + int linenr, + const char *funcname, + virLogMetadataPtr metadata, + const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + virLogVMessage(source, priority, + filename, linenr, funcname, + metadata, fmt, ap); + va_end(ap); +} + + +/* For the library we compile in logging code and then turn it + * on/off depending on user settings. However, for the NSS plugin + * we might get into deadlock and logging there is not really + * needed. */ +#ifndef DISABLE_LOGGING_FOR_NSS +static const char * +virLogPriorityString(virLogPriority lvl) +{ + switch (lvl) { + case VIR_LOG_DEBUG: + return "debug"; + case VIR_LOG_INFO: + return "info"; + case VIR_LOG_WARN: + return "warning"; + case VIR_LOG_ERROR: + return "error"; + } + return "unknown"; +} + + static int virLogFormatString(char **msg, int linenr, @@ -514,38 +551,6 @@ virLogSourceUpdate(virLogSourcePtr source) virLogUnlock(); } -/** - * virLogMessage: - * @source: where is that message coming from - * @priority: the priority level - * @filename: file where the message was emitted - * @linenr: line where the message was emitted - * @funcname: the function emitting the (debug) message - * @metadata: NULL or metadata array, terminated by an item with NULL key - * @fmt: the string format - * @...: the arguments - * - * Call the libvirt logger with some information. Based on the configuration - * the message may be stored, sent to output or just discarded - */ -void -virLogMessage(virLogSourcePtr source, - virLogPriority priority, - const char *filename, - int linenr, - const char *funcname, - virLogMetadataPtr metadata, - const char *fmt, ...) -{ - va_list ap; - va_start(ap, fmt); - virLogVMessage(source, priority, - filename, linenr, funcname, - metadata, fmt, ap); - va_end(ap); -} - - /** * virLogVMessage: * @source: where is that message coming from @@ -678,6 +683,22 @@ virLogVMessage(virLogSourcePtr source, errno = saved_errno; } +#else /* DISABLE_LOGGING_FOR_NSS */ + +void +virLogVMessage(virLogSourcePtr source ATTRIBUTE_UNUSED, + virLogPriority priority ATTRIBUTE_UNUSED, + const char *filename ATTRIBUTE_UNUSED, + int linenr ATTRIBUTE_UNUSED, + const char *funcname ATTRIBUTE_UNUSED, + virLogMetadataPtr metadata ATTRIBUTE_UNUSED, + const char *fmt ATTRIBUTE_UNUSED, + va_list vargs ATTRIBUTE_UNUSED) +{ + return; +} + +#endif /* DISABLE_LOGGING_FOR_NSS */ static void virLogStackTraceToFd(int fd) -- 2.13.6

2 1

[libvirt] [PATCH] virlog: determine the hostname on startup CVE-2018-XXX
by Daniel P. Berrangé 12 Feb '18

12 Feb '18

From: Lubomir Rintel <lkundrak(a)v3.sk> At later point it might not be possible or even safe to use getaddrinfo(). It can in turn result in a load of NSS module. Notably, on a LXC container startup we may find ourselves with the guest filesystem already having replaced the host one. Loading a NSS module from the guest tree could allow a malicous guest to escape the confinement of its container environment because libvirt will not yet have locked it down. --- NB, we're still awaiting CVE allocation before pushing to git src/util/virlog.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index 68439b9194..9105337ce6 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -64,6 +64,7 @@ VIR_LOG_INIT("util.log"); static regex_t *virLogRegex; +static char *virLogHostname; #define VIR_LOG_DATE_REGEX "[0-9]{4}-[0-9]{2}-[0-9]{2}" @@ -271,6 +272,12 @@ virLogOnceInit(void) VIR_FREE(virLogRegex); } + /* We get and remember the hostname early, because at later time + * it might not be possible to load NSS modules via getaddrinfo() + * (e.g. at container startup the host filesystem will not be + * accessible anymore. */ + virLogHostname = virGetHostnameQuiet(); + virLogUnlock(); return 0; } @@ -466,17 +473,14 @@ static int virLogHostnameString(char **rawmsg, char **msg) { - char *hostname = virGetHostnameQuiet(); char *hoststr; - if (!hostname) + if (!virLogHostname) return -1; - if (virAsprintfQuiet(&hoststr, "hostname: %s", hostname) < 0) { - VIR_FREE(hostname); + if (virAsprintfQuiet(&hoststr, "hostname: %s", virLogHostname) < 0) { return -1; } - VIR_FREE(hostname); if (virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, hoststr) < 0) { VIR_FREE(hoststr); -- 2.14.3

3 4

[libvirt] [PATCH] qemu: Alter condition to avoid possible NULL deref
by John Ferlan 12 Feb '18

12 Feb '18

Commit 'f0f2a5ec2' neglected to adjust the if condition to split out the possibility that the @watchdog is NULL when altering the message to add detail about the model. Just split out the condition and use previous/original message, but with the new message code. Found by Coverity Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/qemu/qemu_hotplug.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index c7bf25eee..3291ce613 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5159,11 +5159,16 @@ qemuDomainDetachWatchdog(virQEMUDriverPtr driver, virDomainWatchdogDefPtr watchdog = vm->def->watchdog; qemuDomainObjPrivatePtr priv = vm->privateData; + if (!watchdog) { + virReportError(VIR_ERR_DEVICE_MISSING, "%s", + _("watchdog device not present in domain configuration")); + return -1; + } + /* While domains can have up to one watchdog, the one supplied by the user * doesn't necessarily match the one domain has. Refuse to detach in such * case. */ - if (!(watchdog && - watchdog->model == dev->model && + if (!(watchdog->model == dev->model && watchdog->action == dev->action && virDomainDeviceInfoAddressIsEqual(&dev->info, &watchdog->info))) { virReportError(VIR_ERR_DEVICE_MISSING, -- 2.13.6

3 2

[libvirt] [PATCH] qemu: don't leak in qemuGetDHCPInterfaces when failing to alloc
by Chen Hanxiao 12 Feb '18

12 Feb '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We forgot to free alloced mem when failed to dup ifname or macaddr. Also use VIR_STEAL_PTR to simplify codes. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/qemu/qemu_agent.c | 3 +-- src/qemu/qemu_driver.c | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 5d125c413..0f36054a6 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -2190,8 +2190,7 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, iface->naddrs = addrs_count; } - *ifaces = ifaces_ret; - ifaces_ret = NULL; + VIR_STEAL_PTR(*ifaces, ifaces_ret); ret = ifaces_count; cleanup: diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 978ecd4e0..60cdd237a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20569,10 +20569,10 @@ qemuGetDHCPInterfaces(virDomainPtr dom, goto error; if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0) - goto cleanup; + goto error; if (VIR_STRDUP(iface->hwaddr, macaddr) < 0) - goto cleanup; + goto error; } for (j = 0; j < n_leases; j++) { @@ -20592,8 +20592,7 @@ qemuGetDHCPInterfaces(virDomainPtr dom, VIR_FREE(leases); } - *ifaces = ifaces_ret; - ifaces_ret = NULL; + VIR_STEAL_PTR(*ifaces, ifaces_ret); rv = ifaces_count; cleanup: -- 2.14.3

2 1

[libvirt] [PATCH] util: netlink: fix the mismatch parameter description of functions
by Chen Hanxiao 09 Feb '18

09 Feb '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Some of netlink functions don't have the right @parameters description according to the declaration of function. This patch fix them. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/util/virnetlink.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index d732fe8cf..6a6508fa4 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -278,14 +278,14 @@ virNetlinkSendRequest(struct nl_msg *nl_msg, uint32_t src_pid, /** * virNetlinkCommand: - * @nlmsg: pointer to netlink message - * @respbuf: pointer to pointer where response buffer will be allocated + * @nl_msg: pointer to netlink message + * @resp: pointer to pointer where response buffer will be allocated * @respbuflen: pointer to integer holding the size of the response buffer - * on return of the function. - * @src_pid: the pid of the process to send a message - * @dst_pid: the pid of the process to talk to, i.e., pid = 0 for kernel - * @protocol: netlink protocol - * @groups: the group identifier + * on return of the function. + * @src_pid: the pid of the process to send a message + * @dst_pid: the pid of the process to talk to, i.e., pid = 0 for kernel + * @protocol: netlink protocol + * @groups: the group identifier * * Send the given message to the netlink layer and receive response. * Returns 0 on success, -1 on error. In case of error, no response @@ -387,9 +387,9 @@ virNetlinkDumpCommand(struct nl_msg *nl_msg, * * @ifname: The name of the interface; only use if ifindex <= 0 * @ifindex: The interface index; may be <= 0 if ifname is given - * @data: Gets a pointer to the raw data from netlink. + * @nlData: Gets a pointer to the raw data from netlink. MUST BE FREED BY CALLER! - * @nlattr: Pointer to a pointer of netlink attributes that will contain + * @tb: Pointer to a pointer of netlink attributes that will contain * the results * @src_pid: pid used for nl_pid of the local end of the netlink message * (0 == "use getpid()") @@ -505,7 +505,7 @@ virNetlinkDumpLink(const char *ifname, int ifindex, /** * virNetlinkDelLink: * - * @ifname: Name of the link + * @ifname: Name of the link * @fallback: pointer to an alternate function that will * be called to perform the delete if RTM_DELLINK fails * with EOPNOTSUPP (any other error will simply be treated @@ -648,7 +648,7 @@ virNetlinkEventServerUnlock(virNetlinkEventSrvPrivatePtr driver) /** * virNetlinkEventRemoveClientPrimitive: * - * @i: index of the client to remove from the table + * @i: index of the client to remove from the table * @protocol: netlink protocol * * This static function does the low level removal of a client from @@ -837,7 +837,8 @@ int virNetlinkEventServiceLocalPid(unsigned int protocol) * This registers a netlink socket with the event interface. * * @protocol: netlink protocol - * @groups: broadcast groups to join in + * @groups: broadcast groups to join in + * * Returns -1 if the monitor cannot be registered, 0 upon success */ int @@ -925,9 +926,9 @@ virNetlinkEventServiceStart(unsigned int protocol, unsigned int groups) * * @handleCB: callback to invoke when an event occurs * @removeCB: callback to invoke when removing a client - * @opaque: user data to pass to callback - * @macaddr: macaddr to store with the data. Used to identify callers. - * May be null. + * @opaque: user data to pass to callback + * @macaddr: macaddr to store with the data. Used to identify callers. + * May be null. * @protocol: netlink protocol * * register a callback for handling of netlink messages. The @@ -1003,8 +1004,8 @@ virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB, /** * virNetlinkEventRemoveClient: * - * @watch: watch whose handle to remove - * @macaddr: macaddr whose handle to remove + * @watch: watch whose handle to remove + * @macaddr: macaddr whose handle to remove * @protocol: netlink protocol * * Unregister a callback from a netlink monitor. -- 2.14.3

2 1

[libvirt] [PATCH] qemu: Remove redundancy from qemuBuildControllerDevStr()
by Andrea Bolognani 09 Feb '18

09 Feb '18

Several PCI controllers are handled the same and can thus be squashed together. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/qemu/qemu_command.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ee4e0b20d..040ea65b6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2722,6 +2722,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef, def->info.alias); break; case VIR_DOMAIN_CONTROLLER_MODEL_PCI_EXPANDER_BUS: + case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_EXPANDER_BUS: virBufferAsprintf(&buf, "%s,bus_nr=%d,id=%s", modelName, pciopts->busNr, def->info.alias); @@ -2730,29 +2731,15 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef, pciopts->numaNode); break; case VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE: - virBufferAsprintf(&buf, "%s,id=%s", modelName, def->info.alias); - break; - case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT: - virBufferAsprintf(&buf, "%s,port=0x%x,chassis=%d,id=%s", - modelName, pciopts->port, - pciopts->chassis, def->info.alias); - break; case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_UPSTREAM_PORT: virBufferAsprintf(&buf, "%s,id=%s", modelName, def->info.alias); break; + case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_DOWNSTREAM_PORT: virBufferAsprintf(&buf, "%s,port=0x%x,chassis=%d,id=%s", modelName, pciopts->port, pciopts->chassis, def->info.alias); break; - case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_EXPANDER_BUS: - virBufferAsprintf(&buf, "%s,bus_nr=%d,id=%s", - modelName, pciopts->busNr, - def->info.alias); - if (pciopts->numaNode != -1) - virBufferAsprintf(&buf, ",numa_node=%d", - pciopts->numaNode); - break; case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT: /* Skip the implicit one */ if (pciopts->targetIndex == 0) -- 2.14.3

2 1

[libvirt] [PATCH] qemu: Error out on invalid pci-root controller model name
by Andrea Bolognani 09 Feb '18

09 Feb '18

This is a hard error, and should be handled as such. Introduced in 24614760228b. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 16833474a..178ec24ae 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4446,7 +4446,7 @@ qemuDomainDeviceDefValidateControllerPCI(const virDomainControllerDef *controlle _("PCI controller model name '%s' is not valid " "for a pci-root"), modelName); - return 0; + return -1; } if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE)) { -- 2.14.3

2 1

[libvirt] ANNOUNCE: libguestfs 1.38 released
by Richard W.M. Jones 09 Feb '18

09 Feb '18

I'm pleased to announce libguestfs 1.38, a library and a set of tools for accessing and modifying virtual machine disk images. This release represents about a year of work by many contributors. I'd like to call out in particular substantial contributions from: Cédric Bosdonnat, Pavel Butsykin, Matteo Cafasso, Tomáš Golembiovský, Nikos Skalkotos, and Pino Toscano. Virt-builder-repository is a new tool for creating virt-builder repositories. Virt-rescue has been rewritten, implementing implementing job control, -m and -i options, escape keys. Virt-v2v has several new methods to pull VMs out of VMware faster. The inspection code was rewritten and placed inside the daemon making it much faster and more robust. Of course dozens of other features have been added, and many bugs fixed. See the release notes below for full details. You can get libguestfs 1.38 from here: Main website: http://libguestfs.org/ [not updated yet] Source: http://libguestfs.org/download/1.38-stable/ Fedora: https://koji.fedoraproject.org/koji/packageinfo?packageID=8391 Debian/experimental: https://packages.debian.org/libguestfs0 Note for distro packagers: ocaml >= 4.01, ocaml-hivex are now mandatory build dependencies. If using glibc >= 2.27 which dropped support for SunRPC and crypt(3), you will need rpcgen, libtirpc and libxcrypt. Rich. ---------------------------------------------------------------------- Release notes for libguestfs 1.38 These are also available online at: http://libguestfs.org/guestfs-release-notes.1.html New features New tools Virt-builder-repository is a new tool allowing end users to create and update virt-builder repositories (Cédric Bosdonnat). Virt-rescue (while not a new tool) has been substantially rewritten, implementing job control, -m and -i options, escape keys, etc. New features in existing tools Virt-builder planner has been improved so that faster and more efficient build plans are chosen for complex cases, especially when either the tmpdir or output is on networked storage. New virt-builder Fedora templates (starting with Fedora 26) will have plain partition layout and use GPT for partitions. Virt-customize "firstboot" scripts in guests using systemd are now installed under the "multi-user.target" instead of "default.target" so they will only run when the system is booted normally. Virt-customize now sets a random /etc/machine-id for Linux guests, if one is not already set. Virt-df now works correctly on filesystems with block sizes smaller than 1K (Nikolay Ivanets). Virt-dib has further compatibility enhancements with diskimage-builder (Pino Toscano). Virt-sysprep removes "DHCP_HOSTNAME" from ifcfg-* files. Virt-sysprep now works on Oracle Linux (Jamie Iles). Virt-resize now correctly copies GPT partition attributes from the source to the destination (Cédric Bosdonnat). Bash tab completion implemented or enhanced for: virt-win-reg, virt-v2v-copy-to-local. virt-v2v and virt-p2v Virt-v2v can now read VMware VMX files directly, either from local disk, NFS storage, or over SSH from an ESXi hypervisor. Virt-v2v can now use VDDK as an input source. Both virt-v2v and virt-p2v are now able to pass through the source CPU vendor, model and topology. However unfortunately not all source and target hypervisors are able to provide or consume this data at present (Tomáš Golembiovský). Virt-v2v now supports encrypted guests (Pino Toscano). Virt-v2v can now handle VMware snapshots. Note that the snapshots are collapsed — it does not convert the chain of snapshots into a chain of snapshots. Virt-v2v now installs Windows 10 / Windows Server 2016 virtio block drivers correctly (Pavel Butsykin, Kun Wei). Virt-v2v now installs virtio-rng, balloon and pvpanic drivers, and correctly sets this in the target hypervisor metadata for hypervisors which support that (Tomáš Golembiovský). Virt-v2v now installs both legacy and modern virtio keys in the Windows registry (Ladi Prosek). Virt-p2v can now preserve (in some cases) the offset of the Real Time Clock from UTC. Virt-p2v now combines several scp commands to the conversion server into a single command, improving conversion times. Virt-v2v now detects the special Linux Xen PV-only kernels correctly (Laszlo Ersek). Virt-v2v -o glance now generates the right properties for UEFI guests (Pino Toscano). Virt-v2v -o null now avoids spooling the guest to a temporary file, instead it writes to the qemu "null block device". This makes it faster and use almost no disk space. Virt-v2v -o rhv now supports Windows 2016 Server guest type. Virt-v2v -i libvirtxml can now open network disks over http or https. Virt-v2v will now give a warning about host passthrough devices (Pino Toscano). The virt-v2v --machine-readable output has been enhanced so it includes "vcenter-https", "xen-ssh" and "in-place" facts (Pino Toscano). Language bindings Fix multiple memory leaks and other data corruption problems in the Java bindings (Pino Toscano). Perl %guestfs_introspection has been dropped. Inspection Inspection support was rewritten in OCaml and included inside the daemon. This makes inspection considerably faster, more robust and more easily extensible in future. Better icon support for ALT Linux guests (Pino Toscano). Better support for NeoKylin (Qingzheng Zhang). Can handle OSes like Void Linux which do not include "VERSION_ID" in /etc/os-release (Pino Toscano). Add support for Microsoft MS-DOS (Daniel Berrangé). Architectures and platforms Multiple fixes for S/390 architecture. Libguestfs and all the tools should now compile and run on this architecture. Other The libguestfs API is now thread-safe (although not parallel). You can call APIs on the same handle from multiple threads without needing to take a lock. Security There were multiple vulnerabilities in the icoutils "wrestool" program which is run by libguestfs to create icons for Windows guests. Using the latest "wrestool" is recommended. API New APIs "hivex_value_string" This replaces the deprecated "hivex_value_utf8" API, but does the same thing. "part_get_gpt_attributes" "part_set_gpt_attributes" Read and write GPT partition attribute flags (Cédric Bosdonnat). "part_resize" Enlarge or shrink an existing partition (Nikos Skalkotos). "yara_destroy" "yara_load" "yara_scan" Support for the Yara malware scanning engine (Matteo Cafasso). Other API changes APIs implemented in the daemon can now be written in either C or OCaml. Several APIs were rewritten in OCaml, although we are not planning to rewrite all of them. You will now get a clear error message if you try to add too many disks to the appliance, instead of getting a peculiar failure from qemu. Certain APIs accidentally allowed you to use "/dev/urandom" as an input "device", eg. "g.copy_device_to_device("/dev/urandom", "/dev/sda")". The code has been modified to forbid this usage. All APIs for inspecting installer CDs have been deprecated. Use libosinfo for this task. Build changes A working OCaml compiler ≥ 4.01 is now required for building libguestfs. The "./configure --disable-ocaml" option remains but is only used to disable the OCaml language bindings. Add "RELEASES" file which lists release dates for each version of libguestfs. You must update this file when making a new release. Documentation generated by "gtk-doc" has been removed. "./configure --enable-gtk-doc" now does nothing. Libtirpc is now used for XDR functions and rpcgen. Note that glibc has deprecated and in most Linux distros dropped these, so for most people this will be an extra dependency (Martin Kletzander). Libxcrypt is now used for crypt(3). This is required if using glibc ≥ 2.27. "ocaml-hivex" is now required. Libvirt ≥ 1.2.20 is now required. There is now a "make check-root" target for tests which need to be run as root (analogous to "make check-slow"). "./configure"-time check for "__attribute__((cleanup))" now works in the cross-compilation case (Yann E. Morin). The "AUTHORS" and "p2v/about-authors.c" files are now generated from a single place. Either GnuPG v1 or v2 can be used. "./configure --with-guestfs-path" may be used to set the default "LIBGUESTFS_PATH". In addition the way that the path is searched has changed slightly so that all types of appliances are searched in each path element separately (Pavel Butsykin). "GUESTFSD_EXT_CMD" which was used to mark external commands in the daemon has been removed. It was originally used by SUSE builds, but they have not been using it for a while. The output from "./configure" is now visually grouped under headings related to what it is doing, making it much easier to scan (Pino Toscano). OCaml dependencies are now generated from a single script instead of multiple not-quite-the-same Makefile fragments. "./configure --with-distro=ID" can be used to override automatic Linux distro detection at build time (Pino Toscano). qemu ≥ 2.10 is supported (but not required). This adds mandatory locking to disks and libguestfs turns this off in certain circumstances when it is known to be safe (Lars Seipel, Peter Krempa, Daniel Berrangé, Pino Toscano, Fam Zheng, Yongkui Guo, Václav Kadlčík). Internals Most common code has been moved to the common/ subdirectory, with OCaml common code being in common/ml* directories (eg. common/visit and common/mlvisit contain the visitor library in C and OCaml respectively). The mllib directory has been deleted and replaced by common/mltools. There is now a lightweight OCaml binding for PCRE, see common/mlpcre. Use of OCaml "Str" library has been mostly replaced with PCRE. Add more calls to "udev_settle" to improve stability of partition code (Dawid Zamirski). Run "udev_settle" with --exit-if-exists option, which improves the speed of this command (Pavel Butsykin). Detect new locations of major(3), minor(3), makedev(3). Actions can now be deprecated with no suggested replacement, for APIs such as "guestfs_wait_ready" that should simply be removed from client code. Use gnulib "set_nonblocking_flag" wrapper instead of calling fcntl(2) with "O_NONBLOCK" (Eric Blake). Similarly "set_cloexec_flag". Fix memory leak in XFS version of "guestfs_vfs_minimum_size" (Pino Toscano). Valgrind checks now run on the virt-p2v binary. Unicode single quotes ("‘’") and now used in place of '' or `' throughout the code and documentation. Similarly for "’s" instead of "'s". The "is_zero" function has been reimplemented for greater speed (Eric Blake). In the direct backend, virtio-blk support has been removed. Virtio- scsi is now the only supported way to add disks. Generator string parameter and return types have been rationalised so there are only two types ("String", "StringList") with many subtypes eg. "FileIn" becomes "String (FileIn, ...)". The appliance disk image can now be in formats other than raw (Pavel Butsykin). Multiple improvements to how we automatically build Debian templates for virt-builder (Pino Toscano). Enable serial console for these templates (Florian Klink). In the daemon, instead of making a private copy of lvm.conf and modifying it (eg for filters), start with an empty file since LVM understands that to mean "all defaults" (Alasdair Kergon, Zdenek Kabelac). The "direct" backend can now run QMP queries against the QEMU binary, enhancing the kinds of information we can detect. In addition the code to query QEMU has been made more robust for handling multiple parallel queries of different versions of QEMU. OCaml Augeas bindings are bundled under common/mlaugeas. The long term plan is to remove this and use system ocaml-augeas when it is more widely available in distros (Pino Toscano). All OCaml modules ("*.ml" files) are now required to have an interface file ("*.mli"). If they don't export anything then the interface will be empty except for comments. Certain OCaml features in OCaml ≥ 4.01 are used throughout the code, including replacing ‘{ field = field }’ with ‘{ field }’. Virt-builder "make-template" utility now uses the "virt-install --transient" option so that we should never need to clean up left over domains after a crash. It also saves kickstarts and virt-install commands, which are committed to git for future reference. /dev/shm is now created in the appliance (Nicolas Hicher). In verbose mode on Fedora guests, virt-customize will now use "dnf --verbose" enabling better debugging output. Virt-v2v input and output classes now contain a "#precheck" method which is used to perform environmental checks before conversion starts. Virt-p2v enables miniexpect debugging. It is written to stderr (of virt-p2v). Virt-v2v free space checks are more liberal especially for smaller guests (Pino Toscano). Bugs fixed https://bugzilla.redhat.com/1540535 Example URI of "Convert from ESXi hypervisor over SSH to local libvirt" is incorrect in v2v man page https://bugzilla.redhat.com/1539395 virt-customize segfaults after upgrading to 1.37.35-3 https://bugzilla.redhat.com/1536765 Libguestfs Perl bindings can leak a small amount of memory on error https://bugzilla.redhat.com/1536763 libguestfs Lua bindings use strerror(), which isn’t thread safe https://bugzilla.redhat.com/1536603 man page makes no mention of using '--' when trying to change exit on error behavior https://bugzilla.redhat.com/1525241 virt-df displays zeros for filesystems with block size =512 https://bugzilla.redhat.com/1519204 v2v should improve the result when convert a rhel7.4 guest with no available kernels found in the bootloader https://bugzilla.redhat.com/1518517 virt-v2v fails with "unsupported configuration: shared access for disk 'sdb' requires use of supported storage format" https://bugzilla.redhat.com/1516094 Mere presence of QEMU file locking options breaks NBD (Block protocol 'nbd' doesn't support the option 'locking') https://bugzilla.redhat.com/1514756 ./configure --disable-ocaml breaks building common/mlpcre which breaks building daemon https://bugzilla.redhat.com/1513884 [RFE]Should update some vddk info in v2v man page https://bugzilla.redhat.com/1508874 virt-v2v: warning: ova disk has an unknown VMware controller type (20) https://bugzilla.redhat.com/1506572 virt-v2v '-i ova' is not parsing the MAC address from the source OVF https://bugzilla.redhat.com/1506511 virt-builder fails to parse repo file if it has blank space after the repository identifier https://bugzilla.redhat.com/1503958 Failed to convert the rhel5 guest with kmod-xenpv installed from xen server by virt-v2v https://bugzilla.redhat.com/1503497 qemu-kvm fails to open qcow2 files in read-only mode with qemu-kvm 1.5.3 https://bugzilla.redhat.com/1500673 Error info shows wrong sometimes when ssh to conversion server using non-root user with sudo on p2v client https://bugzilla.redhat.com/1500537 /dev/shm does not exist in the appliance environment https://bugzilla.redhat.com/1497475 guestfish cannot list commands from interactive mode https://bugzilla.redhat.com/1493048 Unbound constructor Hivex.OPEN_UNSAFE https://bugzilla.redhat.com/1484957 bump debian images to use single-partition layout https://bugzilla.redhat.com/1482737 virt-resize failed to expand swap partition for RHEL5.11 guest image with "parsing UUID failed" https://bugzilla.redhat.com/1477623 Running file API on a special chardev may hang forever https://bugzilla.redhat.com/1476081 inspect-os report error: could not parse integer in version number: V7Update2 https://bugzilla.redhat.com/1472719 [RFE]Add warning in process of v2v converting guest which has pci passthrough device https://bugzilla.redhat.com/1472208 virt-v2v fails on opensuse 13.2 guest with error: statns: statns_stub: path must start with a / character https://bugzilla.redhat.com/1469655 firstboot scripts are not correctly installed in Fedora 26 https://bugzilla.redhat.com/1466563 Libguestfs should pass copyonread flag through to the libvirt XML https://bugzilla.redhat.com/1465665 1.36.x build failure: gtkdocize fails using newer autotools due to missing GTK_DOC_CHECK in configure.ac https://bugzilla.redhat.com/1460338 guestfs_shutdown hangs if main process sets signal handlers https://bugzilla.redhat.com/1459979 guestfs_add_domain_argv fails with readonly option when vdi/vhd disk is attached to libvirt domain https://bugzilla.redhat.com/1451665 RFE: Virt-v2v can't convert the guest which has encrypted partition https://bugzilla.redhat.com/1450325 document URI format for -a parameters of tools https://bugzilla.redhat.com/1448739 RFE: Support multicore decompression for OVA files using pigz and pxz https://bugzilla.redhat.com/1447202 Win 2016 guest is described as Win 10 after imported to RHEVM https://bugzilla.redhat.com/1441197 RFE: ability to convert VMware virtual machines via vmx https://bugzilla.redhat.com/1438939 Please drop or update GnuPG (1.4.x) dependency https://bugzilla.redhat.com/1438794 [RFE] Install Windows virtio-rng drivers on VMs imported https://bugzilla.redhat.com/1433937 virt-inspector can't get icon info from altlinux-centaurus https://bugzilla.redhat.com/1433577 policycoreutils setfiles >= 2.6 does .. nothing https://bugzilla.redhat.com/1431579 Windows 8 UEFI from VMware to KVM fails to boot after conversion https://bugzilla.redhat.com/1430680 There is error info about "No such file or directory" when convert a guest from ova file by v2v https://bugzilla.redhat.com/1430184 virt-dib should generate sha256 checksum instead of sha512 https://bugzilla.redhat.com/1429506 RFE: OVMF should be detected on conversion server to prevent failed conversion https://bugzilla.redhat.com/1429491 Should rename network name of rhv in virt-v2v man page https://bugzilla.redhat.com/1427529 virt-sysprep should remove DHCP_HOSTNAME https://bugzilla.redhat.com/1417306 QEMU image file locking (libguestfs) https://bugzilla.redhat.com/1409024 [Debian] Missing db_dump abort inspection https://bugzilla.redhat.com/1406906 Segmentation fault when reading corrupted path with Python 3 bindings https://bugzilla.redhat.com/1379289 RFE: virt-p2v should support mnemonic operations https://bugzilla.redhat.com/1378022 There is virt-v2v warning about <listen type='none'> during converting a guest which has listen type='none' in XML https://bugzilla.redhat.com/1376547 qemu-system-s390x: -device isa-serial,chardev=charserial0,id=serial0: 'isa-serial' is not a valid device model name https://bugzilla.redhat.com/1374232 selinux relabel fails on RHEL 6.2 guests with "libguestfs error: selinux_relabel: : Success" https://bugzilla.redhat.com/1367738 Missing bash completion scripts for: virt-diff guestunmount virt- copy-in virt-copy-out virt-customize virt-get-kernel virt-p2v-make-disk virt-p2v-make-kickstart virt-tar-in virt-tar-out virt-v2v-copy-to-local virt-win-reg https://bugzilla.redhat.com/1362649 RFE: virt-sysprep does not utilize libguestfs encryption support https://bugzilla.redhat.com/1172425 [RFE]virt-v2v failed to convert VMware ESX VM with snapshot https://bugzilla.redhat.com/1171654 Modify a file in virt-rescue with vi on some linux terminal such as yakuake, can lead to abnormal display in virt-rescue shell https://bugzilla.redhat.com/1167623 Remove "If reporting bugs, run virt-v2v with debugging enabled .." message when running virt-p2v https://bugzilla.redhat.com/1152819 Can not end a running command in virt-rescue by press ^C or other keys, the only way is to exit virt-rescue -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top

1 0

[libvirt] [PATCH] qemu: Fix indentation in qemuDomainDeviceDefValidateControllerPCI()
by Andrea Bolognani 09 Feb '18

09 Feb '18

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. src/qemu/qemu_domain.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 84207db16..16833474a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4458,10 +4458,10 @@ qemuDomainDeviceDefValidateControllerPCI(const virDomainControllerDef *controlle if (pciopts->numaNode != -1 && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("the spapr-pci-host-bridge controller doesn't " - "support numa_node in this QEMU binary")); - return -1; + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("the spapr-pci-host-bridge controller doesn't " + "support numa_node in this QEMU binary")); + return -1; } break; -- 2.14.3

1 0

[libvirt] [PATCH] qemu: fix migration with local and VIR_STORAGE_TYPE_NETWORK disks
by Chris Friesen 09 Feb '18

09 Feb '18

In the current implementation of qemuMigrateDisk() the value of the "nmigrate_disks" parameter wrongly impacts the decision whether or not to migrate a disk that is not a member of "migrate_disks": 1) If "nmigrate_disks" is zero, "disk" is migrated if it's non-shared non-readonly with source. 2) If "nmigrate_disks" is non-zero and "disk" is not a member of "migrate_disks" then "disk" is not migrated. This should instead proceed with checking conditions as per 1) and allow migration of non-shared non-readonly disks with source. Fixing 2) breaks migration of VMs with a mix of rbd and local disks because now libvirt tries to migrate the rbd root disk and it fails. This new problem is solved by updating 1) to factor in disk source type and migrate only 'local' non-shared non-readonly disks with source. The end result is that disks not in "migrate_disks" are treated uniformly regardless of the value of "nmigrate_disks". Signed-off-by: Chris Friesen <chris.friesen(a)windriver.com> --- src/qemu/qemu_migration.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 5ee9e5c..77fafc6 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -409,12 +409,12 @@ qemuMigrateDisk(virDomainDiskDef const *disk, if (STREQ(disk->dst, migrate_disks[i])) return true; } - return false; } - /* Default is to migrate only non-shared non-readonly disks + /* Default is to migrate only non-shared non-readonly local disks * with source */ return !disk->src->shared && !disk->src->readonly && + (disk->src->type != VIR_STORAGE_TYPE_NETWORK) && !virStorageSourceIsEmpty(disk->src); } -- 1.8.3.1

3 8

[libvirt] [PATCH] qemu: command: Extract formatting of floppy related stuff into a helper
by Peter Krempa 09 Feb '18

09 Feb '18

The floppy command formatting is special-cased since it does not directly translate to a single '-device' argument. Move the code from qemuBuildDiskDriveCommandLine to a new helper function so that all the related code is together. --- src/qemu/qemu_command.c | 91 +++++++++++++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 37 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 24b434a458..3857a5ef5b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2211,6 +2211,58 @@ qemuBuildDriveDevStr(const virDomainDef *def, } +static int +qemuBulildFloppyCommandLineOptions(virCommandPtr cmd, + const virDomainDef *def, + virDomainDiskDefPtr disk, + unsigned int bootindex) + +{ + virBuffer fdc_opts = VIR_BUFFER_INITIALIZER; + char *fdc_opts_str = NULL; + char *optstr; + + if (virAsprintf(&optstr, "drive%c=drive-%s", + disk->info.addr.drive.unit ? 'B' : 'A', + disk->info.alias) < 0) + return -1; + + if (!qemuDomainNeedsFDC(def)) { + virCommandAddArg(cmd, "-global"); + virCommandAddArgFormat(cmd, "isa-fdc.%s", optstr); + } else { + virBufferAsprintf(&fdc_opts, "%s,", optstr); + } + VIR_FREE(optstr); + + if (bootindex) { + if (virAsprintf(&optstr, "bootindex%c=%u", + disk->info.addr.drive.unit + ? 'B' : 'A', + bootindex) < 0) + return -1; + + if (!qemuDomainNeedsFDC(def)) { + virCommandAddArg(cmd, "-global"); + virCommandAddArgFormat(cmd, "isa-fdc.%s", optstr); + } else { + virBufferAsprintf(&fdc_opts, "%s,", optstr); + } + VIR_FREE(optstr); + } + + /* Newer Q35 machine types require an explicit FDC controller */ + virBufferTrim(&fdc_opts, ",", -1); + if ((fdc_opts_str = virBufferContentAndReset(&fdc_opts))) { + virCommandAddArg(cmd, "-device"); + virCommandAddArgFormat(cmd, "isa-fdc,%s", fdc_opts_str); + VIR_FREE(fdc_opts_str); + } + + return 0; +} + + static int qemuBuildDiskDriveCommandLine(virCommandPtr cmd, const virDomainDef *def, @@ -2220,8 +2272,6 @@ qemuBuildDiskDriveCommandLine(virCommandPtr cmd, unsigned int bootCD = 0; unsigned int bootFloppy = 0; unsigned int bootDisk = 0; - virBuffer fdc_opts = VIR_BUFFER_INITIALIZER; - char *fdc_opts_str = NULL; if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_BOOT) || virQEMUCapsGet(qemuCaps, QEMU_CAPS_BOOTINDEX)) { @@ -2300,34 +2350,9 @@ qemuBuildDiskDriveCommandLine(virCommandPtr cmd, if (qemuDiskBusNeedsDeviceArg(disk->bus)) { if (disk->bus == VIR_DOMAIN_DISK_BUS_FDC) { - if (virAsprintf(&optstr, "drive%c=drive-%s", - disk->info.addr.drive.unit ? 'B' : 'A', - disk->info.alias) < 0) + if (qemuBulildFloppyCommandLineOptions(cmd, def, disk, + bootindex) < 0) return -1; - - if (!qemuDomainNeedsFDC(def)) { - virCommandAddArg(cmd, "-global"); - virCommandAddArgFormat(cmd, "isa-fdc.%s", optstr); - } else { - virBufferAsprintf(&fdc_opts, "%s,", optstr); - } - VIR_FREE(optstr); - - if (bootindex) { - if (virAsprintf(&optstr, "bootindex%c=%u", - disk->info.addr.drive.unit - ? 'B' : 'A', - bootindex) < 0) - return -1; - - if (!qemuDomainNeedsFDC(def)) { - virCommandAddArg(cmd, "-global"); - virCommandAddArgFormat(cmd, "isa-fdc.%s", optstr); - } else { - virBufferAsprintf(&fdc_opts, "%s,", optstr); - } - VIR_FREE(optstr); - } } else { virCommandAddArg(cmd, "-device"); @@ -2339,14 +2364,6 @@ qemuBuildDiskDriveCommandLine(virCommandPtr cmd, } } } - /* Newer Q35 machine types require an explicit FDC controller */ - virBufferTrim(&fdc_opts, ",", -1); - if ((fdc_opts_str = virBufferContentAndReset(&fdc_opts))) { - virCommandAddArg(cmd, "-device"); - virCommandAddArgFormat(cmd, "isa-fdc,%s", fdc_opts_str); - VIR_FREE(fdc_opts_str); - } - return 0; } -- 2.15.0

2 1

[libvirt] [tck PATCH v2 0/5] Fix libvirt-tck nwfilter tests
by Laine Stump 09 Feb '18

09 Feb '18

I've pushed the patches that passed review. These patches split a single patch from V1 into 2 patches, repost one patch that had no response, calls out a single line that had sneaked into one of the ACKed patches, and remove all tabs from perl and sh scripts. Laine Stump (5): parameterize filterref in generic_domain default to no nwfilter in test domains filter for proper IP address in tcpdump looking for broadcast packet kill dhclient before attempting to change guest IP in no-ip-spoofing test untabify all perl and sh files lib/Sys/Virt/TCK.pm | 549 ++++++++++++----------- lib/Sys/Virt/TCK/Capabilities.pm | 84 ++-- lib/Sys/Virt/TCK/DomainBuilder.pm | 312 ++++++------- lib/Sys/Virt/TCK/NetworkBuilder.pm | 44 +- lib/Sys/Virt/TCK/NetworkHelpers.pm | 6 +- lib/Sys/Virt/TCK/SELinux.pm | 6 +- lib/Sys/Virt/TCK/StoragePoolBuilder.pm | 40 +- lib/Sys/Virt/TCK/StorageVolBuilder.pm | 48 +- lib/Sys/Virt/TCK/TAP/XMLFormatter.pm | 18 +- lib/Sys/Virt/TCK/TAP/XMLFormatterSession.pm | 66 +-- scripts/nwfilter/100-ping-still-working.t | 3 +- scripts/nwfilter/210-no-mac-spoofing.t | 3 +- scripts/nwfilter/220-no-ip-spoofing.t | 4 +- scripts/nwfilter/230-no-mac-broadcast.t | 5 +- scripts/nwfilter/240-no-arp-spoofing.t | 3 +- scripts/nwfilter/300-vsitype.t | 2 +- scripts/nwfilter/concurrency/chg-vm-filter.sh | 18 +- scripts/nwfilter/concurrency/start-destroy-vm.sh | 20 +- scripts/nwfilter/nwfilter2vmtest.sh | 42 +- 19 files changed, 641 insertions(+), 632 deletions(-) -- 2.14.3

4 19

[libvirt] [PATCH] rpc: export xdr_virNetMessageError for virnetmessagetest on Win32
by Daniel P. Berrangé 09 Feb '18

09 Feb '18

The Win32 symbol export file format can't do wildcards, so none of the 'xdr_*' symbols are exported from the libvirt DLL. This doesn't matter generally since the RPC client is built into the DLL and we don't build libvirtd on Win32. The virnetmessagetest, however, does require xdr_virNetMessageError to be exported, so just do a hack for that. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as win32 CI build fix src/libvirt_remote.syms | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms index 736848273a..97e22275b9 100644 --- a/src/libvirt_remote.syms +++ b/src/libvirt_remote.syms @@ -7,6 +7,12 @@ # Generated files xdr_*; +# Hack only required for Win32 to make tests link properly, +# as the wildcard above doesn't work there. Fortunately +# Win32 builds don't require the other xdr_* syms exported. +# since there's no libvirtd built. +xdr_virNetMessageError; + # rpc/virnetclient.h virNetClientAddProgram; -- 2.14.3

1 0

[libvirt] [PATCH 0/2] Support network stats for hostdev(SR-IOV) in Switchdev mode
by Jai Singh Rana 09 Feb '18

09 Feb '18

With availability of switchdev model in linux, it is possible to capture stats for hostdev SR-IOV VFs using its VF representor interface name on host for nics supporting switchdev model. These stats are supported by adding helper APIs for getting VF Representor name based on BDF info in 'hostdev' and querying required net sysfs entries on host. These helper APIs are then used in qemu_driver to get the hostdev interface stats for pci SR-IOV device. [1] https://www.kernel.org/doc/Documentation/networking/switchdev.txt Jai Singh Rana (2): util: Add helper APIs to get/verify VF Representor name qemu: conf: Network stats support for hostdev VF Representor po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/domain_conf.c | 7 ++ src/libvirt_private.syms | 5 + src/qemu/qemu_driver.c | 34 +++++- src/util/virhostdev.c | 10 ++ src/util/virhostdev.h | 6 + src/util/virnetdevhostdev.c | 284 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetdevhostdev.h | 33 +++++ 9 files changed, 377 insertions(+), 4 deletions(-) create mode 100644 src/util/virnetdevhostdev.c create mode 100644 src/util/virnetdevhostdev.h -- 2.13.6

1 2

[libvirt] [PATCH python] tests: add special case for virStoragePoolLookupByTargetPath
by Daniel P. Berrangé 09 Feb '18

09 Feb '18

This new API trips up the sanity test for checking mapping of all C APIs into Python. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as build fix. sanitytest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sanitytest.py b/sanitytest.py index 1d65e8d..190d32b 100644 --- a/sanitytest.py +++ b/sanitytest.py @@ -258,7 +258,8 @@ for name in sorted(basicklassmap): "LookupByUUIDString", "LookupByVolume" "LookupByName", "LookupByID", "LookupByName", "LookupByKey", "LookupByPath", "LookupByMACString", "LookupByUsage", "LookupByVolume", - "LookupSCSIHostByWWN", "Restore", "RestoreFlags", + "LookupByTargetPath","LookupSCSIHostByWWN", + "Restore", "RestoreFlags", "SaveImageDefineXML", "SaveImageGetXMLDesc", "DefineXMLFlags"]: if klass != "virDomain": func = klass[3:] + func -- 2.14.3

1 0

[libvirt] [PATCH 0/3] lock manager plugin dlm-corosync implementation
by river 09 Feb '18

09 Feb '18

This is the implementation of the RFC from https://www.redhat.com/archives/libvir-list/2017-December/msg00689.html The following is the design of this iplementation. Environmental requirements: DLM is a symmetric general-purpose distributed lock manager, consisting of a kernel modules named 'dlm.ko', userspace application named 'libdlm', and cluster infrastructure environment which could be 'corosync' responsible for communication. For more usage about libdlm and corosync, `man corosync.conf` and `man dlm_controld` Implementation details: In order to use dlm in cluster, daemons, 'dlm_controld' and 'corosync', must have been runned before. Because dlm is asynchronous, there is something receiving notification from kernel. 'libdlm' provides `dlm_pthread_init` and `dlm_ls_pthread_init` for this purpose. Here is lockspace concept in dlm. Lockspace is different from sanlock, it's just to provide a private namespaceit's one namespace for locks that are part of a single application. One lock must belong to one lockspace, and is associated with one lock resource, owned by one process in one node. Lock/unlock need specific flag. Lock flags `LKF_PERSISTENT` specifies a lock that wouldn't be unlocked if the process was dead or lockspace was closed (`dlm_close_lockspace`). lockspace is cluster-wide, lock with `LKF_PERSISTENT` flag won't be automatically released except that the owner node reboot, but it will become an orphan lock once process disappears. New process in the same node want to adopt orphan lock, just specific `LKF_ORPHAN` when re-lock using the right lock-name and lock-mode, new lock id would be assigned for adopted lock. lkid(lock id) is a mark uniquely identifing a lock in a process, which is returned after locking sucessfully or adopting sucessfully. Lock could be only released by self-process applied using lkid. The following means: locks won't be automatically released when the process(libvirt) that acquired them dies, daemon likes virtlockd isn't necessary. In order to adopt orphan locks, there must be some lock information left after the process died. A file would store the lock information in this design. However, I find that the existence of "leaked" fd in vm instance process inherited from libvirt would tell lock daemon to release their locks instead of libvirt. So destroy or shutdown qemu instance won't make dlm release locks. I refer to the action of libxl(`libxlDomainCleanup` function in 'src/libxl/libxl_domain.c'), add some code after unlink pid and xml files in `qemuProcessStop` ('src/qemu/qemu_process.c') to proactively tell lock manager release locks. Adhere to the simple, enough principle, lock information using by running libvirt process is stored in list instead of hash table. I have tested in some cases: start, migrate, destroy... It works well. *** BLURB HERE *** river (3): Add a plugin dlm for lock manager Fix release of locks with dlm plugin Add configuration files for dlm plugin .gitignore | 2 + configure.ac | 6 + m4/virt-cpg.m4 | 37 ++ m4/virt-dlm.m4 | 36 ++ src/Makefile.am | 53 ++ src/libxl/libxl.conf | 8 +- src/locking/dlm.conf | 52 ++ src/locking/libvirt_dlm.aug | 35 ++ src/locking/lock_driver_dlm.c | 1056 +++++++++++++++++++++++++++++++++++ src/locking/test_libvirt_dlm.aug.in | 9 + src/qemu/qemu.conf | 8 +- src/qemu/qemu_process.c | 5 + src/util/virlist.h | 110 ++++ 13 files changed, 1410 insertions(+), 7 deletions(-) create mode 100644 m4/virt-cpg.m4 create mode 100644 m4/virt-dlm.m4 create mode 100644 src/locking/dlm.conf create mode 100644 src/locking/libvirt_dlm.aug create mode 100644 src/locking/lock_driver_dlm.c create mode 100644 src/locking/test_libvirt_dlm.aug.in create mode 100644 src/util/virlist.h -- 2.15.1

3 6

[libvirt] [PATCH] fix regex to check CN from server certificate
by Tiago M. Vieira 08 Feb '18

08 Feb '18

Currently when the script validates the PKI files and the certificate 'Subject:' field contains RDNs after the Common Name (CN), these values are also included, creating a false result that the CN is not correct. A small change to the sed regex fixes this issue, by extracting only the value for CN and nothing else. The regex is replaced with the exact same regex used to extract the CN value from the client certificate. --- tools/virt-pki-validate.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virt-pki-validate.in b/tools/virt-pki-validate.in index 206637abf..b04680dde 100755 --- a/tools/virt-pki-validate.in +++ b/tools/virt-pki-validate.in @@ -255,7 +255,7 @@ then echo CA organization: $ORG echo Server organization: $S_ORG fi - S_HOST=`"$CERTOOL" -i --infile "$LIBVIRT/servercert.pem" | grep Subject: | sed 's+.*CN=$[a-zA-Z\. _-]*$+\1+'` + S_HOST=`"$CERTOOL" -i --infile "$LIBVIRT/servercert.pem" | grep Subject: | sed 's+.*CN=$.[a-zA-Z \._-]*$.*+\1+'` if test "$S_HOST" != "`hostname -s`" && test "$S_HOST" != "`hostname`" then echo The server certificate does not seem to match the host name -- 2.14.3

2 1

[libvirt] [tck PATCH 0/9] Fix libvirt-tck nwfilter tests
by Laine Stump 08 Feb '18

08 Feb '18

libvirt-tck happens to have the most thorough set of nwfilter tests around. Unfortunately they haven't been run in quite awhile, and have suffered from some bit rot. This patch series (along with Dan's patch to force virt-builder to redo selinux labels after installing extra packages) gets the nwfilter tests all completing successfully again *on a Fedora 26 host* with libvirt 3.2.1 and libvirt 4.0.0+. The concurrency tests (at least) still fail on an F27 host - in that case they are actually revealing a bug due to something in libvirt, libpcap, or maybe the kernel (and since the kernels in F26 and F27 are nearly the same, and I tried both of the above libvirt versions on F27 with the same failure (two threads hung in a polling loop in libpcap) Once I got this all running, I noticed that there are several domain and network tests that are failing, and at least the ones I looked into were due to bugs in the tests (e.g. the netdev hotplug test uses multicast MAC addresses, and assumes that device detaches are synchronous), so there's more work to do, but the nwfilter tests are what's most important right now. Laine Stump (9): create vms that use virt-builder images with no graphics and virtio-net Use $net->get_dhcp_leases() when available Use Net::OpenSSH instead of Net::SSH::Perl Fix no-ip-spoofing test script generation Fix no-arp-spoof test script generation parameterize filterref in generic_domain Fix ebtables check in no-mac-broadcast test filter for proper IP address in tcpdump looking for broadcast packet Eliminate unnecessary path specifications in binary names lib/Sys/Virt/TCK.pm | 22 +++++------- lib/Sys/Virt/TCK/NetworkHelpers.pm | 9 +++++ perl-Sys-Virt-TCK.spec.PL | 3 +- scripts/nwfilter/100-ping-still-working.t | 6 ++-- scripts/nwfilter/210-no-mac-spoofing.t | 52 ++++++++++++++------------- scripts/nwfilter/220-no-ip-spoofing.t | 59 ++++++++++++++++--------------- scripts/nwfilter/230-no-mac-broadcast.t | 39 ++++++++++---------- scripts/nwfilter/240-no-arp-spoofing.t | 36 ++++++++++--------- scripts/nwfilter/300-vsitype.t | 1 - scripts/nwfilter/nwfilter_concurrent.sh | 4 +-- 10 files changed, 121 insertions(+), 110 deletions(-) -- 2.13.6

2 20

[libvirt] [PATCH] qemu: report a nicer error when USB is disabled
by Ján Tomko 08 Feb '18

08 Feb '18

If the user tries to define a domain that has <controller type='usb' model='none'/> and also some USB devices, we report an error: error: internal error: No free USB ports Which is technically still correct for a domain with no USB ports. Change it to: USB is disabled for this domain, but USB devices are present in the domain XML https://bugzilla.redhat.com/show_bug.cgi?id=1347550 --- src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 2 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_domain_address.c | 7 +++++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f3b4dd33d..028fcb5be 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5116,7 +5116,7 @@ virDomainDiskDefValidate(const virDomainDiskDef *disk) return 0; } -static bool +bool virDomainDefHasUSB(const virDomainDef *def) { size_t i; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index bb3b6f0c3..32e191e0a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2656,6 +2656,8 @@ int virDomainDefPostParse(virDomainDefPtr def, unsigned int parseFlags, virDomainXMLOptionPtr xmlopt, void *parseOpaque); +bool +virDomainDefHasUSB(const virDomainDef *def); int virDomainDefValidate(virDomainDefPtr def, virCapsPtr caps, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5b1bc5e4f..21f226258 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -267,6 +267,7 @@ virDomainDefGetVcpusTopology; virDomainDefHasDeviceAddress; virDomainDefHasMemballoon; virDomainDefHasMemoryHotplug; +virDomainDefHasUSB; virDomainDefHasVcpusOffline; virDomainDefMaybeAddController; virDomainDefMaybeAddInput; diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 69c0c8bf2..0d565b3ea 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2644,6 +2644,13 @@ qemuDomainUSBAddressAddHubs(virDomainDefPtr def) &data, false)); + if (data.count && !virDomainDefHasUSB(def)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("USB is disabled for this domain, but USB devices " + "are present in the domain XML")); + return -1; + } + if (data.count > available_ports) hubs_needed = VIR_DIV_UP(data.count - available_ports + 1, VIR_DOMAIN_USB_HUB_PORTS - 1); -- 2.13.0

2 1

[libvirt] [PATCH] Migration: Preserve the failed job in case migration job is terminated beyond the perform phase.
by Prerna Saxena 08 Feb '18

08 Feb '18

In case of non-p2p migration, in case libvirt client gets disconnected from source libvirt after PERFORM phase is over, the daemon just resets the current migration job. However, the VM could be left paused on both source and destination in such case. In case the client reconnects and queries migration status, the job has been blanked out from source libvirt, and this reconnected client has no clear way of figuring out if an unclean migration had previously been aborted. This patch calls out a "potentially" incomplete migration as a failed job, so that a client may be able to watch previously failed jobs for this VM and take corrective actions as needed. Signed-off-by: Prerna Saxena <saxenap.ltc(a)gmail.com> --- src/qemu/qemu_domain.c | 16 ++++++++++++++++ src/qemu/qemu_domain.h | 2 ++ src/qemu/qemu_migration.c | 4 ++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e8e0313..7c60d17 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4564,6 +4564,22 @@ qemuDomainObjDiscardAsyncJob(virQEMUDriverPtr driver, virDomainObjPtr obj) qemuDomainObjSaveJob(driver, obj); } + +void +qemuDomainObjFailAsyncJob(virQEMUDriverPtr driver, virDomainObjPtr obj) +{ + qemuDomainObjPrivatePtr priv = obj->privateData; + VIR_FREE(priv->job.completed); + if (VIR_ALLOC(priv->job.completed) == 0) { + priv->job.current->type = VIR_DOMAIN_JOB_FAILED; + priv->job.completed = priv->job.current; + } else { + VIR_WARN("Unable to allocate job.completed for VM %s", obj->def->name); + } + qemuDomainObjResetAsyncJob(priv); + qemuDomainObjEndJob(driver, obj); +} + void qemuDomainObjReleaseAsyncJob(virDomainObjPtr obj) { diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index c33af36..6465603 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -497,6 +497,8 @@ void qemuDomainObjRestoreJob(virDomainObjPtr obj, struct qemuDomainJobObj *job); void qemuDomainObjDiscardAsyncJob(virQEMUDriverPtr driver, virDomainObjPtr obj); +void qemuDomainObjFailAsyncJob(virQEMUDriverPtr driver, + virDomainObjPtr obj); void qemuDomainObjReleaseAsyncJob(virDomainObjPtr obj); qemuMonitorPtr qemuDomainGetMonitor(virDomainObjPtr vm) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 69eb231..fd8950e 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1911,8 +1911,8 @@ qemuMigrationCleanup(virDomainObjPtr vm, VIR_WARN("Migration of domain %s finished but we don't know if the" " domain was successfully started on destination or not", vm->def->name); - /* clear the job and let higher levels decide what to do */ - qemuDomainObjDiscardAsyncJob(driver, vm); + /* clearly "fail" the job and let higher levels decide what to do */ + qemuDomainObjFailAsyncJob(driver, vm); break; case QEMU_MIGRATION_PHASE_PERFORM3: -- 1.7.1

3 3

[libvirt] Ask question
by 李杰 08 Feb '18

08 Feb '18

Dear Recently,I am interested in libvirt,but I found the libvirt does't support revert and delete the external snapshot which the raw disk based guest.My libvirt and qemu release are both 3.2.0.So I have a question,the community how to solve it,if have any plans about it.Can you tell me more about it?Thank you very much. Best Regards Rambo

1 0

[libvirt] [PATCH 0/7] Keep non-persistent changes alive in snapshot
by Kothapally Madhu Pavan 08 Feb '18

08 Feb '18

Restoring to a snapshot should not overwrite the persistent XML configuration of a snapshot as a side effect. This patchset fixes the same. Currently, virDomainSnapshotDef only saves active domain definition of the guest. And on restore the active domain definition is used as both active and inactive domain definitions. This will make the non-persistent changes persistent in snapshot image. This patchset allows to save inactive domain definition as well and on snapshot-revert non-persistent configuration is restored as is. Currently, snapshot-revert is making non-presistent changes as persistent. Here are the steps to reproduce. Step1: virsh define $dom Step2: virsh attach-device $dom $memory-device.xml --live Step3: virsh snapshot-create $dom Step4: virsh destroy $dom Step5: virsh snapshot-revert $dom $snapshot-name Step6: virsh destroy $dom Step7: virsh start $dom Here we still have $memory-device attached in Step2. This patchset is attempting to solve this issue. This patchset will also allow user to dump and edit inactive XML configuration of a snapshot. Dumping inactive domain definition of a snapshot is important as --redefine uses snapshot-dumpxml output to redefine a snapshot. Kothapally Madhu Pavan (7): qemu: Store inactive domain configuration in snapshot qemu: Use active and inactive snapshot configuration on restore conf: Allow editing inactive snapshot configuration virsh: Dump inactive XML configuration of snapshot using snapshot-dumpxml virsh: Edit inactive XML configuration of snapshot using snapshot-edit virsh: Allow restoring snapshot with non-persistent configuration tests: docs: Add schema and testcase for domainsnapshot docs/schemas/domainsnapshot.rng | 19 +++++ include/libvirt/libvirt-domain-snapshot.h | 10 ++- include/libvirt/libvirt-domain.h | 1 + src/conf/domain_conf.c | 6 +- src/conf/domain_conf.h | 2 + src/conf/snapshot_conf.c | 48 ++++++++++++- src/conf/snapshot_conf.h | 1 + src/qemu/qemu_driver.c | 33 ++++++++- .../full_domain_withinactive.xml | 83 ++++++++++++++++++++++ tests/domainsnapshotxml2xmltest.c | 1 + tools/virsh-snapshot.c | 20 ++++++ tools/virsh.pod | 37 +++++++++- 12 files changed, 251 insertions(+), 10 deletions(-) create mode 100644 tests/domainsnapshotxml2xmlout/full_domain_withinactive.xml -- 1.8.3.1

4 16

[libvirt] [PATCH 0/2] Add {lockd|logd} admin sockets to install
by John Ferlan 08 Feb '18

08 Feb '18

Hopefully I covered what's necessary... Essentially a bunch of copying of existing examples... I haven't been able to actually build an RPM locally for a long time, but this does work with make install at least (or at least it worked in the environment I tried it on). John Ferlan (2): logd: Install the admin sockets lockd: Install the admin sockets libvirt.spec.in | 20 ++++++++++++++++---- src/Makefile.am | 39 +++++++++++++++++++++++++++++++-------- 2 files changed, 47 insertions(+), 12 deletions(-) -- 2.13.6

2 8

[libvirt] [jenkins-ci PATCH v2 0/4] Fix virt-manager build failure
by Andrea Bolognani 08 Feb '18

08 Feb '18

Changes from [v1]: * expand coverage instead of reducing it, which makes for a far more acceptable solution. [v1] https://www.redhat.com/archives/libvir-list/2018-February/msg00354.html Andrea Bolognani (4): jobs: Make Python version configurable projects: Build libvirt-python for Python 3 too projects: Build virt-manager using Python 3 guests: Fix Python installation guests/host_vars/libvirt-centos-7/main.yml | 1 - guests/host_vars/libvirt-debian-8/main.yml | 1 - guests/host_vars/libvirt-ubuntu-14/main.yml | 1 - guests/host_vars/libvirt-ubuntu-16/main.yml | 1 - guests/vars/mappings.yml | 50 +++++++++++++++++------------ guests/vars/projects/libvirt-python.yml | 2 ++ guests/vars/projects/virt-manager.yml | 8 ++--- jobs/python-distutils.yaml | 22 ++++++------- projects/libvirt-python.yaml | 29 +++++++++++++++-- projects/virt-manager.yaml | 14 ++++---- 10 files changed, 80 insertions(+), 49 deletions(-) -- 2.14.3

2 5

[libvirt] [PATCH python 1/1] Fix type extracting from PyDict
by Edgar Kaziakhmedov 08 Feb '18

08 Feb '18

PyInt_Check returns value whether or not an input object is the integer type. The existing implementation of extracting leads to the wrong type interpretation in the following code: params = {libvirt.VIR_MIGRATE_PARAM_DISKS_PORT : 50123} ... dom.migrate3(%option1, params, %option3) where libvirt reports: libvirt.libvirtError: invalid argument: invalid type 'ullong' for parameter 'disks_port', expected 'int' So, this patch fixes that bug and allows casting to the VIR_TYPED_PARAM_INT type. Signed-off-by: Edgar Kaziakhmedov <edgar.kaziakhmedov(a)virtuozzo.com> --- libvirt-utils.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libvirt-utils.c b/libvirt-utils.c index f7b4478..3a00e9f 100644 --- a/libvirt-utils.c +++ b/libvirt-utils.c @@ -434,10 +434,7 @@ virPyDictToTypedParamOne(virTypedParameterPtr *params, type = VIR_TYPED_PARAM_ULLONG; #if PY_MAJOR_VERSION < 3 } else if (PyInt_Check(value)) { - if (PyInt_AS_LONG(value) < 0) - type = VIR_TYPED_PARAM_LLONG; - else - type = VIR_TYPED_PARAM_ULLONG; + type = VIR_TYPED_PARAM_INT; #endif } else if (PyFloat_Check(value)) { type = VIR_TYPED_PARAM_DOUBLE; -- 2.11.0

2 6

[libvirt] [PATCH] apparmor: allow libvirt to send term signal to unconfined
by Guido Günther 08 Feb '18

08 Feb '18

Otherwise stopping domains with qemu://session fails like [164012.338157] audit: type=1400 audit(1516202208.784:99): apparmor="DENIED" operation="signal" profile="/usr/sbin/libvirtd" pid=18835 comm="libvirtd" requested_mask="send" denied_mask="send" signal=term peer="unconfined" --- examples/apparmor/usr.sbin.libvirtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd index 0ddec3f6e2..be4fabf905 100644 --- a/examples/apparmor/usr.sbin.libvirtd +++ b/examples/apparmor/usr.sbin.libvirtd @@ -63,7 +63,7 @@ signal (send) peer=/usr/sbin/dnsmasq, signal (read, send) peer=libvirt-*, - signal (send) set=("kill") peer=unconfined, + signal (send) set=("kill", "term") peer=unconfined, # Very lenient profile for libvirtd since we want to first focus on confining # the guests. Guests will have a very restricted profile. -- 2.15.1

8 8

[libvirt] [PATCH v1 01/51] util: conf: separate virDomainDefParseXML into serial parts
by xinhua.Cao 08 Feb '18

08 Feb '18

beacause virDomainDefParseXML is too long, and all domain xml parse in this function, it's difficulty to maintain this function so separate virDomainDefParseXML into serial parts use virDomainPreaseInfoFunc. then it will easy to maintain --- src/conf/domain_conf.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 34aae82..e36783b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18527,6 +18527,28 @@ virDomainCachetuneDefParse(virDomainDefPtr def, } +typedef struct _virDomainParseTotalParam virDomainParseTotalParam; +typedef virDomainParseTotalParam *virDomainParseTotalParamPtr; + +struct _virDomainParseTotalParam{ + //input parameters + virDomainDefPtr def; + xmlDocPtr xml; + xmlNodePtr root; + xmlXPathContextPtr ctxt; + virCapsPtr caps; + virDomainXMLOptionPtr xmlopt; + void *parseOpaque; + unsigned int flags; + + //internal parameters + bool usb_none; + bool usb_other; + bool usb_master; + bool uuid_generated; +}; + + static virDomainDefPtr virDomainDefParseXML(xmlDocPtr xml, xmlNodePtr root, @@ -18536,11 +18558,14 @@ virDomainDefParseXML(xmlDocPtr xml, void *parseOpaque, unsigned int flags) { + typedef int (*virDomainPreaseInfoFunc)(virDomainParseTotalParamPtr params); + xmlNodePtr *nodes = NULL, node = NULL; char *tmp = NULL; size_t i, j; int n, virtType, gic_version; long id = -1; + size_t fun_index = 0; virDomainDefPtr def; bool uuid_generated = false; virHashTablePtr bootHash = NULL; @@ -18548,6 +18573,25 @@ virDomainDefParseXML(xmlDocPtr xml, bool usb_other = false; bool usb_master = false; char *netprefix = NULL; + virDomainParseTotalParam param = { + NULL, + xml, + root, + ctxt, + caps, + xmlopt, + parseOpaque, + flags, + false, + false, + false, + false + + }; + + virDomainPreaseInfoFunc parse_funs[] = { + NULL + }; if (flags & VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA) { char *schema = virFileFindResource("domain.rng", @@ -18565,6 +18609,14 @@ virDomainDefParseXML(xmlDocPtr xml, if (!(def = virDomainDefNew())) return NULL; + param.def = def; + + while (parse_funs[fun_index]) { + if (parse_funs[fun_index](&param) < 0) + goto error; + fun_index++; + } + if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)) if (virXPathLong("string(./@id)", ctxt, &id) < 0) id = -1; -- 2.8.3

3 52

[libvirt] [PATCH v1 01/35] util: conf: add bootHash to virDomainParseTotalParam
by xinhua.Cao 08 Feb '18

08 Feb '18

add bootHash to virDomainParseTotalParam --- src/conf/domain_conf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1e949ea..1a8248d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18516,6 +18516,7 @@ struct _virDomainParseTotalParam{ virCapsPtr caps; virDomainXMLOptionPtr xmlopt; void *parseOpaque; + virHashTablePtr bootHash; unsigned int flags; //internal parameters @@ -19816,6 +19817,7 @@ virDomainDefParseXML(xmlDocPtr xml, caps, xmlopt, parseOpaque, + NULL, flags, false, false, @@ -19861,7 +19863,11 @@ virDomainDefParseXML(xmlDocPtr xml, if (!(def = virDomainDefNew())) return NULL; + if (!(bootHash = virHashCreate(5, NULL))) + goto error; + param.def = def; + param.bootHash = bootHash; while (parse_funs[fun_index]) { if (parse_funs[fun_index](&param) < 0) -- 2.8.3

1 9

[libvirt] Support interface network stats for SR-IOV in Switchdev mode(VF representors)
by Jai Singh Rana 08 Feb '18

08 Feb '18

Hi All, Currently libvirt does not support networks interface stats for <interface type='hostdev'>. With availability of switchdev model in linux, it is possible to capture stats for SR-IOV VFs on host using its VF representor interface on host for nics supporting switchdev model. https://github.com/torvalds/linux/blob/master/Documentation/networking/swit… I want to preapre a patch supporting this feature for hostdev and write some function like 'virHostdevSwitchdevVfRepresentorInterfaceStats' for returning stats. Should I include this function and supporting methods in src/util/virhostdev.c or should i include it in new file something like src/util/virswitchdev.c . Thanks, Jai

2 3

[libvirt] [RFC v2 REPOST] arm64: KVM: KVM API extensions for SVE
by Dave Martin 07 Feb '18

07 Feb '18

Hi all, Reposting this to give people another chance to comment before I move ahead... ---8<--- Here's a second, slightly more complete stab at the KVM API extensions for SVE. I haven't started implementing in earnest yet, so any comments at this stage would be very helpful. [libvir-list readers: this is a proposal for extending the KVM API on AArch64 systems to support the Scalable Vector Extension [1], [2]. This has some interesting configuration and migration quirks -- see "Vector length control" in particular, and feel free to throw questions my way...] Cheers ---Dave [1] Overview https://community.arm.com/processors/b/blog/posts/technology-update-the-sca… [2] Architecture spec https://developer.arm.com/products/architecture/a-profile/docs/ddi0584/late… ---8<--- New feature KVM_ARM_VCPU_SVE: * enables exposure of SVE to the guest * enables visibility of / access to KVM_REG_ARM_SVE_*() via KVM reg ioctls. The main purposes of this are a) is to allow userspace to hide weird-sized registers that it doesn't understand how to deal with, and b) allow SVE to be hidden from the VM so that it can migrate to nodes that don't support SVE. ZCR_EL1 is not specifically hidden, since it is "just a system register" and does not have a weird size or semantics etc. Registers: * A new register size is defined KVM_REG_SIZE_U2048 (which can be encoded sensibly using the next unused value for the reg size field in the reg ID) (grep KVM_REG_SIZE_). * Reg IDs for the SVE regs will be defined as "coproc" 0x14 (i.e., 0x14 << KVM_REG_ARM_COPROC_SHIFT) KVM_REG_ARM_SVE_Z(n, i) is slice i of Zn (each slice is 2048 bits) KVM_REG_ARM_SVE_P(n, i) is slice i of Pn (each slice is 256 bits) KVM_REG_ARM_FFR(i) is slice i of FFR (each slice is 256 bits) The slice sizes allow each register to be read/written in exactly one slice for SVE. Surplus bits (beyond the maximum VL supported by the vcpu) will be read-as-zero write-ignore. Reading/writing surplus slices will probably be forbidden, and the surplus slices would not be reported via KVM_GET_REG_LIST. (We could make these RAZ/WI too, but I'm not sure if it's worth it, or why it would be useful.) Future extensions to the architecture might grow the registers up to 32 slices: this may or may not actually happen, but SVE keeps the possibilty open. I've tried to design for it. * KVM_REG_ARM_SVE_Z(n, 0) bits [127:0] alias Vn in KVM_REG_ARM_CORE(fp_regs.v[n]) .. KVM_REG_ARM_CORE(fp_regs.v[n])+3. It's simplest for userspace if the two views always appear to be in sync, but it's unclear whether this is really useful. Perhaps this can be relaxed if it's a big deal for the KVM implementation; I don't know yet. Vector length control: Some means is needed to determine the set of vector lengths visible to guest software running on a vcpu. When a vcpu is created, the set would be defaulted to the maximal set that can be supported while permitting each vcpu to run on any host CPU. SVE has some virtualisation quirks which mean that this set may exclude some vector lengths that are available for host userspace applications. The common case should be that the sets are the same however. * New ioctl KVM_ARM_VCPU_{SET,GET}_SVE_VLS to set or retrieve the set of vector lengths available to the guest. Adding random vcpu ioctls To configure a non-default set of vector lengths, KVM_ARM_VCPU_SET_SVE_VLS can be called: this would only be permitted before the vcpu is first run. This is primarily intended for supporting migration, by providing a robust check that the destination node will run the vcpu correctly. In a cluster with non-uniform SVE implementation across nodes, this also allows a specific set of VLs to be requested that the caller knows is usable across the whole cluster. For migration purposes, userspace would need to do KVM_ARM_VCPU_GET_SVE_VLS at the origin node and store the returned set as VM metadata: on the destination node, KVM_ARM_VCPU_SET_SVE_VLS should be used to request that exact set of VLs: if the destination node can't support that set of VLs, the call will fail. The interface would look something like: ioctl(vcpu_fd, KVM_ARM_SVE_SET_VLS, __u64 vqs[SVE_VQ_MAX / 64]); How to expose this to the user in an intelligible way would be a problem for userspace to solve. At present, other than initialising each vcpu to the maximum supportable set of VLs, I don't propose having a way to probe for what sets of VLs are supportable: the above call either succeeds or fails. Cheers ---Dave _______________________________________________ kvmarm mailing list kvmarm(a)lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

2 8

[libvirt] [jenkins-ci PATCH 0/2] Fix virt-manager build failure
by Andrea Bolognani 07 Feb '18

07 Feb '18

By making a lot of compromises. Not a perfect solution, but still better than not building virt-manager at all until we've come up with a proper one I reckon. ¯\_(ツ)_/¯ Andrea Bolognani (2): guests: Install Python 3 dependencies for virt-manager jobs: Switch all Python builds to Python 3 guests/host_vars/libvirt-centos-6/main.yml | 1 - guests/host_vars/libvirt-centos-7/main.yml | 2 -- guests/host_vars/libvirt-debian-8/main.yml | 1 - guests/host_vars/libvirt-ubuntu-14/main.yml | 1 - guests/host_vars/libvirt-ubuntu-16/main.yml | 1 - guests/vars/mappings.yml | 41 ++++++++++++++++------------- guests/vars/projects/virt-manager.yml | 8 +++--- jobs/python-distutils.yaml | 8 +++--- projects/virt-manager.yaml | 2 +- 9 files changed, 31 insertions(+), 34 deletions(-) -- 2.14.3

1 2

[libvirt] [jenkins-ci] lcitool: Use default python for creating salty passwords
by Martin Kletzander 07 Feb '18

07 Feb '18

On my system the crypt module in python2 doesn't have mksalt() function. However python3 does and the code is perfectly fine python3 code as well. So let's make it run in the default python version as that has the highest chance to work. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- guests/lcitool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guests/lcitool b/guests/lcitool index ccd0a597785a..24274d800742 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -18,7 +18,7 @@ die() { hash_file() { PASS_FILE="$1" - python2 -c " + python -c " import crypt password = open('$PASS_FILE', 'r').read().strip() print(crypt.crypt(password, -- 2.16.1

3 3

[libvirt] [PATCH] util: Fix syntax-check
by Andrea Bolognani 07 Feb '18

07 Feb '18

Broken by 759b4d1b0fe5f4d84d98b99153dfa7ac289dd167. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as a CI build fix. src/util/virlog.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index 9105337ce..8f1e4800d 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -478,9 +478,8 @@ virLogHostnameString(char **rawmsg, if (!virLogHostname) return -1; - if (virAsprintfQuiet(&hoststr, "hostname: %s", virLogHostname) < 0) { + if (virAsprintfQuiet(&hoststr, "hostname: %s", virLogHostname) < 0) return -1; - } if (virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, hoststr) < 0) { VIR_FREE(hoststr); -- 2.14.3

1 0

[libvirt] [PATCH] conf: Check for NUMA distances in validity check
by Michal Privoznik 07 Feb '18

07 Feb '18

NUMA distances are part of guest ABI (guests can read it directly!) and therefore as such shouldn't change throughout the lifetime of domain. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/numa_conf.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index c906a53de..7d3f9e661 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -1073,7 +1073,7 @@ bool virDomainNumaCheckABIStability(virDomainNumaPtr src, virDomainNumaPtr tgt) { - size_t i; + size_t i, j; if (virDomainNumaGetNodeCount(src) != virDomainNumaGetNodeCount(tgt)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -1102,6 +1102,17 @@ virDomainNumaCheckABIStability(virDomainNumaPtr src, "match source"), i); return false; } + + for (j = 0; j < virDomainNumaGetNodeCount(src); j++) { + if (virDomainNumaGetNodeDistance(src, i, j) != + virDomainNumaGetNodeDistance(tgt, i, j)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target NUMA distance from %zu to %zu " + "doesn't match source"), i, j); + + return false; + } + } } return true; -- 2.13.6

2 4

[libvirt] [PATCH 0/4] qemu: Don't refresh 'halted' state for domain stats
by Peter Krempa 07 Feb '18

07 Feb '18

The halted state information is useless on most platforms and calling 'query-cpus' is very expensive. Don't report the info on platforms where it does not make sense. Peter Krempa (3): qemu: driver: Extract vcpu halted state directly qemu: Remove unused 'cpuhalted' argument from qemuDomainHelperGetVcpus qemu: domain: Store vcpu halted state as a tristate Viktor Mihajlovski (1): qemu: Limit refresh of CPU halted state to s390 src/qemu/qemu_domain.c | 8 +++++++- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_driver.c | 36 +++++++++++++++--------------------- 3 files changed, 23 insertions(+), 23 deletions(-) -- 2.15.0

3 6

[libvirt] [PATCH RFCv2 0/4] Add optional pSeries features
by Andrea Bolognani 07 Feb '18

07 Feb '18

Applies on top of [req]. RFC because we still don't have a way of probing QEMU to figure out whether the relevant toggles are available. Plus, there's no documentation yet :) Changes from [RFCv1]: * don't nest features inside a <pseries/> element; * implement all optional features. [req] https://www.redhat.com/archives/libvir-list/2018-February/msg00298.html [RFCv1] https://www.redhat.com/archives/libvir-list/2018-January/msg00779.html Andrea Bolognani (4): qemu: Implement the HTM pSeries feature qemu: Implement the SBBC pSeries feature qemu: Implement the CFPC pSeries feature qemu: Implement the IBS pSeries feature docs/schemas/domaincommon.rng | 30 ++++ src/conf/domain_conf.c | 74 +++++++++ src/conf/domain_conf.h | 15 ++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 17 +++ src/qemu/qemu_capabilities.h | 6 + src/qemu/qemu_command.c | 165 +++++++++++++++++++++ src/qemu/qemu_domain.c | 22 +++ tests/qemuxml2argvdata/pseries-features-cfpc.args | 19 +++ tests/qemuxml2argvdata/pseries-features-cfpc.xml | 28 ++++ tests/qemuxml2argvdata/pseries-features-htm.args | 19 +++ tests/qemuxml2argvdata/pseries-features-htm.xml | 28 ++++ tests/qemuxml2argvdata/pseries-features-ibs.args | 19 +++ tests/qemuxml2argvdata/pseries-features-ibs.xml | 28 ++++ .../pseries-features-invalid-machine.xml | 1 + tests/qemuxml2argvdata/pseries-features-sbbc.args | 19 +++ tests/qemuxml2argvdata/pseries-features-sbbc.xml | 28 ++++ tests/qemuxml2argvtest.c | 20 +++ tests/qemuxml2xmloutdata/pseries-features-cfpc.xml | 1 + tests/qemuxml2xmloutdata/pseries-features-htm.xml | 1 + tests/qemuxml2xmloutdata/pseries-features-ibs.xml | 1 + tests/qemuxml2xmloutdata/pseries-features-sbbc.xml | 1 + tests/qemuxml2xmltest.c | 12 ++ 23 files changed, 556 insertions(+) create mode 100644 tests/qemuxml2argvdata/pseries-features-cfpc.args create mode 100644 tests/qemuxml2argvdata/pseries-features-cfpc.xml create mode 100644 tests/qemuxml2argvdata/pseries-features-htm.args create mode 100644 tests/qemuxml2argvdata/pseries-features-htm.xml create mode 100644 tests/qemuxml2argvdata/pseries-features-ibs.args create mode 100644 tests/qemuxml2argvdata/pseries-features-ibs.xml create mode 100644 tests/qemuxml2argvdata/pseries-features-sbbc.args create mode 100644 tests/qemuxml2argvdata/pseries-features-sbbc.xml create mode 120000 tests/qemuxml2xmloutdata/pseries-features-cfpc.xml create mode 120000 tests/qemuxml2xmloutdata/pseries-features-htm.xml create mode 120000 tests/qemuxml2xmloutdata/pseries-features-ibs.xml create mode 120000 tests/qemuxml2xmloutdata/pseries-features-sbbc.xml -- 2.14.3

2 6

[libvirt] [PATCH v3 0/4] qemu: use arp table of host to get the
by Chen Hanxiao 07 Feb '18

07 Feb '18

introduce VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP to get ip address of VM from the output of /proc/net/arp Chen Hanxiao (4): util: introduce helper to parse /proc/net/arp qemu: introduce qemuARPGetInterfaces to get IP from host's arp table virsh: add --source arp to domifaddr news: qemu: use arp table of host to get the IP address of guests docs/news.xml | 9 ++++ include/libvirt/libvirt-domain.h | 1 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/libvirt-domain.c | 7 +++ src/libvirt_private.syms | 5 ++ src/qemu/qemu_driver.c | 96 +++++++++++++++++++++++++++++++++ src/util/virarptable.c | 114 +++++++++++++++++++++++++++++++++++++++ src/util/virarptable.h | 48 +++++++++++++++++ tools/virsh-domain-monitor.c | 2 + tools/virsh.pod | 7 +-- 11 files changed, 288 insertions(+), 3 deletions(-) create mode 100644 src/util/virarptable.c create mode 100644 src/util/virarptable.h -- 2.14.3

2 7

[libvirt] ANNOUNCE: virt-manager 1.5.0 released
by Cole Robinson 07 Feb '18

07 Feb '18

I'm happy to announce the release of virt-manager 1.5.0! virt-manager is a desktop application for managing KVM, Xen, and LXC virtualization via libvirt. The release can be downloaded from: http://virt-manager.org/download/ This release includes: - python3 prep work (Radostin Stoyanov, Cole Robinson, Cédric Bosdonnat) - Switch --location ISO to use isoinfo (Andrew Wong) - virt-install: add --cpu numa distance handling (Menno Lageman) - virt-install: fix --disk for rbd volumes with auth (Rauno Väli) - virt-install: add --cputune vcpupin handling (Wim ten Have) - details ui: Showing attached scsi devices per controller (Lin Ma) - network ui: Show details about SR-IOV VF pool (Lin Ma) - Greatly expand UI test suite coverage Note, the next major release will be within the next 2-3 months and will be a port to python3. There may be additional bugfix releases in the 1.5 series if needed. Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 0

[libvirt] [PATCH perl v2] Remove use of Data::Dumper from example programs
by Daniel P. Berrangé 06 Feb '18

06 Feb '18

Using Data::Dumper in examples does not help devs understand the data structures that the Perl APIs are returning. Change to explicit field accesses to illustrate it better Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- examples/dhcp-leases.pl | 7 +++++-- examples/dom-fsinfo.pl | 8 +++----- examples/dom-ifinfo.pl | 14 +++++++++----- examples/dom-stats.pl | 9 +++------ examples/node-info.pl | 26 +++++++++++++++++++------- 5 files changed, 39 insertions(+), 25 deletions(-) diff --git a/examples/dhcp-leases.pl b/examples/dhcp-leases.pl index 84a81ef..a2202d9 100644 --- a/examples/dhcp-leases.pl +++ b/examples/dhcp-leases.pl @@ -1,7 +1,6 @@ #!/usr/bin/perl use Sys::Virt; -use Data::Dumper; my $c = Sys::Virt->new(uri => "qemu:///system", readonly => 1); @@ -9,5 +8,9 @@ my $c = Sys::Virt->new(uri => "qemu:///system", $n = $c->get_network_by_name("default"); foreach my $lease ($n->get_dhcp_leases()) { - print Dumper($lease); + print "Interface ", $lease->{iface}, "\n"; + print " MAC: ", $lease->{mac}, "\n"; + print " IP: ", $lease->{ipaddr}, "\n"; + print " Host: ", $lease->{hostname}, "\n" if $lease->{hostname}; + print "\n"; } diff --git a/examples/dom-fsinfo.pl b/examples/dom-fsinfo.pl index 7763f78..46c64e9 100644 --- a/examples/dom-fsinfo.pl +++ b/examples/dom-fsinfo.pl @@ -1,6 +1,5 @@ #!/usr/bin/perl - use strict; use warnings; @@ -15,7 +14,6 @@ my $dom = $c->get_domain_by_name(shift @ARGV); my @fs = $dom->get_fs_info(); -use Data::Dumper; - -print Dumper($fs[0]); -print Dumper($fs[1]); +foreach my $fs (@fs) { + printf "%s (%s) at %s\n", $fs->{name}, $fs->{fstype}, $fs->{mountpoint}; +} diff --git a/examples/dom-ifinfo.pl b/examples/dom-ifinfo.pl index e10579b..66eb157 100644 --- a/examples/dom-ifinfo.pl +++ b/examples/dom-ifinfo.pl @@ -1,6 +1,5 @@ #!/usr/bin/perl - use strict; use warnings; @@ -13,9 +12,14 @@ my $c = Sys::Virt->new(uri => $uri); my $dom = $c->get_domain_by_name(shift @ARGV); -my @fs = $dom->get_interface_addresses( +my @nics = $dom->get_interface_addresses( Sys::Virt::Domain::INTERFACE_ADDRESSES_SRC_LEASE); -use Data::Dumper; - -print Dumper(@fs); +foreach my $nic (@nics) { + print "Interface ", $nic->{name}, "\n"; + print " MAC: ", $nic->{hwaddr}, "\n"; + foreach my $addr (@{$nic->{addrs}}) { + print " IP: ", $addr->{addr}, "\n"; + } + print "\n"; +} diff --git a/examples/dom-stats.pl b/examples/dom-stats.pl index 13d8fb7..1da0089 100644 --- a/examples/dom-stats.pl +++ b/examples/dom-stats.pl @@ -20,10 +20,7 @@ my @stats = $c->get_all_domain_stats(Sys::Virt::Domain::STATS_STATE, \@doms, Sys::Virt::Domain::GET_ALL_STATS_ENFORCE_STATS); -use Data::Dumper; - -print Dumper(\@stats); - -for (my $i = 0 ; $i <= $#stats ; $i++) { - print $stats[$i]->{'dom'}->get_name(), ": ", $stats[$i]->{'data'}->{'state.state'}, "\n"; +foreach my $stats (@stats) { + print "Guest ", $stats->{'dom'}->get_name(), "\n"; + print " State: ", $stats->{'data'}->{'state.state'}, "\n"; } diff --git a/examples/node-info.pl b/examples/node-info.pl index 89bc9ba..9655ab4 100644 --- a/examples/node-info.pl +++ b/examples/node-info.pl @@ -13,13 +13,25 @@ my $info = $hv->get_node_info(); my @models = $hv->get_cpu_model_names($info->{model}); -print join ("\n", sort{ lc $a cmp lc $b } @models), "\n"; - -my @info = $hv->get_node_free_pages([2048], 0, 0); - -use Data::Dumper; -print Dumper(\@info); - +print "Available CPU model names:\n"; +print join ("\n", map { " " . $_ } sort{ lc $a cmp lc $b } @models), "\n"; + +my @pagesizes = ( + 4, 2048, 1048576 + ); + +my @info = $hv->get_node_free_pages(\@pagesizes, 0, 0); + +print "Free pages per NUMA node:\n"; +foreach my $info (@info) { + print " Node: ", $info->{cell}, "\n"; + print " Free: "; + for (my $i = 0; $i <= $#pagesizes; $i++) { + my $pagesize = $pagesizes[$i]; + printf "%d @ %d KB, ", $info->{pages}->{$pagesize}, $pagesize; + } + print "\n"; +} my $xml = $hv->get_domain_capabilities(undef, "x86_64", undef, "kvm"); print $xml; -- 2.14.3

2 1

[libvirt] [PATCH perl] Remove use of Data::Dumper from example programs
by Daniel P. Berrangé 06 Feb '18

06 Feb '18

Using Data::Dumper in examples does not help devs understand the data structures that the Perl APIs are returning. Change to explicit field accesses to illustrate it better Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Virt.xs | 1 - examples/dhcp-leases.pl | 2 -- examples/dom-fsinfo.pl | 8 +++----- examples/dom-ifinfo.pl | 14 +++++++++----- examples/dom-stats.pl | 9 +++------ examples/node-info.pl | 26 +++++++++++++++++++------- 6 files changed, 34 insertions(+), 26 deletions(-) diff --git a/Virt.xs b/Virt.xs index 7d2f1a7..1254df2 100644 --- a/Virt.xs +++ b/Virt.xs @@ -3358,7 +3358,6 @@ void get_all_domain_stats(con, stats, doms_sv=&PL_sv_undef, flags=0) if (SvOK(doms_sv)) { doms_av = (AV*)SvRV(doms_sv); ndoms = av_len(doms_av) + 1; - fprintf(stderr, "Len %d\n", ndoms); } else { ndoms = 0; } diff --git a/examples/dhcp-leases.pl b/examples/dhcp-leases.pl index af9bd41..a2202d9 100644 --- a/examples/dhcp-leases.pl +++ b/examples/dhcp-leases.pl @@ -1,8 +1,6 @@ #!/usr/bin/perl -use Acme::ChuckNorris; use Sys::Virt; -use Data::Dumper; my $c = Sys::Virt->new(uri => "qemu:///system", readonly => 1); diff --git a/examples/dom-fsinfo.pl b/examples/dom-fsinfo.pl index 7763f78..46c64e9 100644 --- a/examples/dom-fsinfo.pl +++ b/examples/dom-fsinfo.pl @@ -1,6 +1,5 @@ #!/usr/bin/perl - use strict; use warnings; @@ -15,7 +14,6 @@ my $dom = $c->get_domain_by_name(shift @ARGV); my @fs = $dom->get_fs_info(); -use Data::Dumper; - -print Dumper($fs[0]); -print Dumper($fs[1]); +foreach my $fs (@fs) { + printf "%s (%s) at %s\n", $fs->{name}, $fs->{fstype}, $fs->{mountpoint}; +} diff --git a/examples/dom-ifinfo.pl b/examples/dom-ifinfo.pl index e10579b..66eb157 100644 --- a/examples/dom-ifinfo.pl +++ b/examples/dom-ifinfo.pl @@ -1,6 +1,5 @@ #!/usr/bin/perl - use strict; use warnings; @@ -13,9 +12,14 @@ my $c = Sys::Virt->new(uri => $uri); my $dom = $c->get_domain_by_name(shift @ARGV); -my @fs = $dom->get_interface_addresses( +my @nics = $dom->get_interface_addresses( Sys::Virt::Domain::INTERFACE_ADDRESSES_SRC_LEASE); -use Data::Dumper; - -print Dumper(@fs); +foreach my $nic (@nics) { + print "Interface ", $nic->{name}, "\n"; + print " MAC: ", $nic->{hwaddr}, "\n"; + foreach my $addr (@{$nic->{addrs}}) { + print " IP: ", $addr->{addr}, "\n"; + } + print "\n"; +} diff --git a/examples/dom-stats.pl b/examples/dom-stats.pl index 13d8fb7..1da0089 100644 --- a/examples/dom-stats.pl +++ b/examples/dom-stats.pl @@ -20,10 +20,7 @@ my @stats = $c->get_all_domain_stats(Sys::Virt::Domain::STATS_STATE, \@doms, Sys::Virt::Domain::GET_ALL_STATS_ENFORCE_STATS); -use Data::Dumper; - -print Dumper(\@stats); - -for (my $i = 0 ; $i <= $#stats ; $i++) { - print $stats[$i]->{'dom'}->get_name(), ": ", $stats[$i]->{'data'}->{'state.state'}, "\n"; +foreach my $stats (@stats) { + print "Guest ", $stats->{'dom'}->get_name(), "\n"; + print " State: ", $stats->{'data'}->{'state.state'}, "\n"; } diff --git a/examples/node-info.pl b/examples/node-info.pl index 89bc9ba..9655ab4 100644 --- a/examples/node-info.pl +++ b/examples/node-info.pl @@ -13,13 +13,25 @@ my $info = $hv->get_node_info(); my @models = $hv->get_cpu_model_names($info->{model}); -print join ("\n", sort{ lc $a cmp lc $b } @models), "\n"; - -my @info = $hv->get_node_free_pages([2048], 0, 0); - -use Data::Dumper; -print Dumper(\@info); - +print "Available CPU model names:\n"; +print join ("\n", map { " " . $_ } sort{ lc $a cmp lc $b } @models), "\n"; + +my @pagesizes = ( + 4, 2048, 1048576 + ); + +my @info = $hv->get_node_free_pages(\@pagesizes, 0, 0); + +print "Free pages per NUMA node:\n"; +foreach my $info (@info) { + print " Node: ", $info->{cell}, "\n"; + print " Free: "; + for (my $i = 0; $i <= $#pagesizes; $i++) { + my $pagesize = $pagesizes[$i]; + printf "%d @ %d KB, ", $info->{pages}->{$pagesize}, $pagesize; + } + print "\n"; +} my $xml = $hv->get_domain_capabilities(undef, "x86_64", undef, "kvm"); print $xml; -- 2.14.3

3 4