- Devel - libvirt List Archives

[libvirt] [PATCH v3 0/3] Loadparm support
by Farhan Ali 30 May '17

30 May '17

This patch series introduces the support for new s390x 'loadparm' feature. The 'loadparm' can be used to select the boot entry to boot from, for a boot device. Here is a link to the QEMU patches: https://lists.nongnu.org/archive/html/qemu-devel/2017-05/msg00192.html ChangeLog --------- v2 -> v3: - Updated news.xml and formatdomain.html.in with a more architectural description of loadparm (patch 1) v1 -> v2: - Rebased the patch series on the latest master, commit 2f69dd3 virfiletest: include linux/falloc.h Thanks Farhan Ali Farhan Ali (3): conf : Add loadparm boot option for a boot device qemu : Add loadparm to qemu command line string tests : Testcases for loadparm docs/formatdomain.html.in | 9 ++- docs/news.xml | 11 ++++ docs/schemas/domaincommon.rng | 7 +++ src/conf/device_conf.h | 1 + src/conf/domain_conf.c | 69 +++++++++++++++++++++- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 37 ++++++++++++ ...-machine-loadparm-multiple-disks-nets-s390.args | 28 +++++++++ ...v-machine-loadparm-multiple-disks-nets-s390.xml | 43 ++++++++++++++ .../qemuxml2argv-machine-loadparm-net-s390.args | 20 +++++++ .../qemuxml2argv-machine-loadparm-net-s390.xml | 26 ++++++++ ...xml2argv-machine-loadparm-s390-char-invalid.xml | 26 ++++++++ ...uxml2argv-machine-loadparm-s390-len-invalid.xml | 26 ++++++++ .../qemuxml2argv-machine-loadparm-s390.args | 20 +++++++ .../qemuxml2argv-machine-loadparm-s390.xml | 26 ++++++++ tests/qemuxml2argvtest.c | 19 ++++++ 17 files changed, 367 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-char-invalid.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-len-invalid.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.xml -- 1.9.1

2 10

[libvirt] [PATCH] qemu: Don't error out if allocation info can't be queried
by Peter Krempa 30 May '17

30 May '17

qemuDomainGetBlockInfo would error out if qemu did not report 'wr_highest_offset'. This usually does not happen, but can happen briefly during active layer block commit. There's no need to report the error, we can simply report that the disk is fully alocated at that point. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1452045 --- src/qemu/qemu_driver.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 67f54282a..f6b352b56 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11541,14 +11541,6 @@ qemuDomainGetBlockInfo(virDomainPtr dom, } if (!entry->wr_highest_offset_valid) { - if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_BLOCK && - disk->src->format != VIR_STORAGE_FILE_RAW) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to query the maximum written offset of " - "block device '%s'"), disk->dst); - goto endjob; - } - info->allocation = entry->physical; } else { if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_FILE && -- 2.12.2

2 1

[libvirt] [libvirt-sandbox PATCH] Drop library/ from template name and image path
by Guido Günther 30 May '17

30 May '17

If one pastes from the output of virt-sansbox-image $ virt-sandbox-image list docker:/library/ubuntu?tag=17.04 docker:/library/debian?tag=latest verbatim $ virt-sandbox-image run -c qemu:///session docker:/library/debian?tag=latest This fails like /home/<usr>/.local/share/libvirt/images/library/debian:qbeilwxard.qcow2: Could not create file: No such file or directory Unable to start sandbox: Failed to create domain: XML error: name library/debian:qbeilwxard cannot contain '/' /usr/bin/virt-sandbox-image: [Errno 2] No such file or directory: '/home/<user>/.local/share/libvirt/images/library/debian:qbeilwxard.qcow2' so strip of any leading components. --- This might not be the correct fix but I hope you get the idea. libvirt-sandbox/image/cli.py | 2 +- libvirt-sandbox/image/sources/docker.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-sandbox/image/cli.py b/libvirt-sandbox/image/cli.py index 3a5ccfa..0f27a16 100644 --- a/libvirt-sandbox/image/cli.py +++ b/libvirt-sandbox/image/cli.py @@ -96,7 +96,7 @@ def run(args): name = args.name if name is None: randomid = ''.join(random.choice(string.lowercase) for i in range(10)) - name = tmpl.path[1:] + ":" + randomid + name = tmpl.path[1:].split('/')[-1] + ":" + randomid diskfile = source.get_disk(template=tmpl, templatedir=template_dir, diff --git a/libvirt-sandbox/image/sources/docker.py b/libvirt-sandbox/image/sources/docker.py index aa5675e..6ca086c 100755 --- a/libvirt-sandbox/image/sources/docker.py +++ b/libvirt-sandbox/image/sources/docker.py @@ -655,7 +655,7 @@ class DockerSource(base.Source): def get_disk(self, template, templatedir, imagedir, sandboxname): image = DockerImage.from_template(template) configfile, diskfile = self._get_template_data(image, templatedir) - tempfile = imagedir + "/" + sandboxname + ".qcow2" + tempfile = imagedir + "/" + sandboxname.split('/')[-1] + ".qcow2" if not os.path.exists(imagedir): os.makedirs(imagedir) cmd = ["qemu-img","create","-q","-f","qcow2"] -- 2.11.0

2 1

[libvirt] [PATCH v2] nodedev: Increase the netlink socket buffer size to the one used by udev
by Erik Skultety 30 May '17

30 May '17

From: "ning.bo" <ning.bo9(a)zte.com.cn> When a number of SRIOV VFs (up to 128 on Intel XL710) is created: for i in `seq 0 1`; do echo 63 > /sys/class/net/<interface>/device/sriov_numvfs done libvirtd will then report "udev_monitor_receive_device returned NULL" error because the netlink socket buffer is not big enough (using GDB on libudev confirmed this with ENOBUFFS) and thus some udev events were dropped. This results in some devices being missing in the nodedev-list output. This patch overrides the system's rmem_max limit but for that, we need to make sure we've got root privileges. https://bugzilla.redhat.com/show_bug.cgi?id=1450960 Signed-off-by: ning.bo <ning.bo9(a)zte.com.cn> Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Additionally, we might want to check for the errno, providing a specific message if such issue occurs again in a further non-specified point in time and return the generic, yet cryptic one for all other cases. src/node_device/node_device_udev.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 4ecb0b18f..0b3717397 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1728,6 +1728,13 @@ static int nodeStateInitialize(bool privileged, udev_monitor_enable_receiving(priv->udev_monitor); + /* mimic udevd's behaviour and override the systems rmem_max limit in case + * there's a significant number of device 'add' events + */ + if (geteuid() == 0) + udev_monitor_set_receive_buffer_size(priv->udev_monitor, + 128 * 1024 * 1024); + /* We register the monitor with the event callback so we are * notified by udev of device changes before we enumerate existing * devices because libvirt will simply recreate the device if we -- 2.13.0

3 4

[libvirt] [PATCH] qemu:json: Fix daemon crash on handling domain shutdown event
by Erik Skultety 30 May '17

30 May '17

commit a8eba5036 added further checking of the guest shutdown cause, but this enhancement is available since qemu 2.10, causing a crash because of a NULL pointer dereference on older qemus. Thread 1 "libvirtd" received signal SIGSEGV, Segmentation fault. 0x00007ffff72441af in virJSONValueObjectGet (object=0x0, key=0x7fffd5ef11bf "guest") at util/virjson.c:769 769 if (object->type != VIR_JSON_TYPE_OBJECT) (gdb) bt 0 in virJSONValueObjectGet 1 in virJSONValueObjectGetBoolean 2 in qemuMonitorJSONHandleShutdown 3 in qemuMonitorJSONIOProcessEvent 4 in qemuMonitorJSONIOProcessLine 5 in qemuMonitorJSONIOProcess 6 in qemuMonitorIOProcess 7 in qemuMonitorIO 8 in virEventPollDispatchHandles 9 in virEventPollRunOnce 10 in virEventRunDefaultImpl 11 in virNetDaemonRun 12 in main Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 757595dd7..f208dd05a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -528,7 +528,7 @@ static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValuePtr da bool guest = false; virTristateBool guest_initiated = VIR_TRISTATE_BOOL_ABSENT; - if (virJSONValueObjectGetBoolean(data, "guest", &guest) == 0) + if (data && virJSONValueObjectGetBoolean(data, "guest", &guest) == 0) guest_initiated = guest ? VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO; qemuMonitorEmitShutdown(mon, guest_initiated); -- 2.13.0

2 2

[libvirt] [PATCH v3] Regression: Report correct CPUs present on executing virsh nodecpumap
by Nitesh Konkar 30 May '17

30 May '17

On executing the virsh nodecpumap command, the number of CPUs present was shown as (last cpu online id + 1). This patch fixes the issue by reporting the current number of CPUs present. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/util/virhostcpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index aa9cfeac2..c485a9721 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -1093,7 +1093,7 @@ virHostCPUGetMap(unsigned char **cpumap, if (online) *online = virBitmapCountBits(cpus); - ret = virBitmapSize(cpus); + ret = virHostCPUGetCount(); cleanup: if (ret < 0 && cpumap) -- 2.11.0

2 1

[libvirt] [libvirt-sandbox PATCH] mkinitrd: Add missing fscrypto module
by Guido Günther 30 May '17

30 May '17

--- libvirt-sandbox/libvirt-sandbox-builder-machine.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sandbox/libvirt-sandbox-builder-machine.c index bdec490..7204f71 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c +++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c @@ -186,6 +186,7 @@ static gchar *gvir_sandbox_builder_machine_mkinitrd(GVirSandboxConfig *config, /* In case ext4 is built as a module, include it and its deps * for the root mount */ + gvir_sandbox_config_initrd_add_module(initrd, "fscrypto.ko"); gvir_sandbox_config_initrd_add_module(initrd, "mbcache.ko"); gvir_sandbox_config_initrd_add_module(initrd, "jbd2.ko"); gvir_sandbox_config_initrd_add_module(initrd, "crc16.ko"); -- 2.11.0

2 2

[libvirt] [libvirt-sandbox PATCH] docker: Don't ignore qemu-img errors
by Guido Günther 30 May '17

30 May '17

--- libvirt-sandbox/image/sources/docker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-sandbox/image/sources/docker.py b/libvirt-sandbox/image/sources/docker.py index 43e9c32..aa5675e 100755 --- a/libvirt-sandbox/image/sources/docker.py +++ b/libvirt-sandbox/image/sources/docker.py @@ -662,7 +662,7 @@ class DockerSource(base.Source): cmd.append("-o") cmd.append("backing_fmt=qcow2,backing_file=%s" % diskfile) cmd.append(tempfile) - subprocess.call(cmd) + subprocess.check_call(cmd) return tempfile def get_command(self, template, templatedir, userargs): -- 2.11.0

2 2

[libvirt] [PATCH] tools: make setvcpus --maximum imply --config
by Chen Hanxiao 29 May '17

29 May '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Currently --maximum was possible if and only if --config was specified. This patch makes setvcpus --maximum imply --config. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- tools/virsh-domain.c | 7 ++++--- tools/virsh.pod | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 5c42021..04ef816 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6819,8 +6819,8 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) VSH_EXCLUSIVE_OPTIONS_VAR(current, live); VSH_EXCLUSIVE_OPTIONS_VAR(current, config); VSH_EXCLUSIVE_OPTIONS_VAR(guest, config); - - VSH_REQUIRE_OPTION_VAR(maximum, config); + VSH_EXCLUSIVE_OPTIONS_VAR(maximum, live); + VSH_EXCLUSIVE_OPTIONS_VAR(maximum, current); if (config) flags |= VIR_DOMAIN_AFFECT_CONFIG; @@ -6829,7 +6829,8 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) if (guest) flags |= VIR_DOMAIN_VCPU_GUEST; if (maximum) - flags |= VIR_DOMAIN_VCPU_MAXIMUM; + flags |= VIR_DOMAIN_VCPU_MAXIMUM | + VIR_DOMAIN_AFFECT_CONFIG; if (hotpluggable) flags |= VIR_DOMAIN_VCPU_HOTPLUGGABLE; diff --git a/tools/virsh.pod b/tools/virsh.pod index e7c513b..bc8b539 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2501,10 +2501,11 @@ flag. Vcpus added to live domains supporting vcpu unplug are automatically marked as hotpluggable. The I<--maximum> flag controls the maximum number of virtual cpus that can -be hot-plugged the next time the domain is booted. As such, it must only be -used with the I<--config> flag, and not with the I<--live> or the I<--current> -flag. Note that it may not be possible to change the maximum vcpu count if -the processor topology is specified for the guest. +be hot-plugged the next time the domain is booted. As such, it implies +I<--config> be set. Also it can be used with the I<--config> flag, +but not with the I<--live> or the I<--current> flag. Note that it may not +be possible to change the maximum vcpu count if the processor topology +is specified for the guest. =item B<setvcpu> I<domain> I<vcpulist> [I<--enable>] | [I<--disable>] [[I<--live>] [I<--config>] | [I<--current>]] -- 2.7.4

3 4

[libvirt] [PATCH] virCapabilitiesInitCaches: Don't leak @cpus
by Michal Privoznik 29 May '17

29 May '17

The @cpus is allocated by virFileReadValueBitmap() but never freed: ==21274== 40 (32 direct, 8 indirect) bytes in 1 blocks are definitely lost in loss record 808 of 1,004 ==21274== at 0x4C2E080: calloc (vg_replace_malloc.c:711) ==21274== by 0x54BA561: virAlloc (viralloc.c:144) ==21274== by 0x54BC604: virBitmapNewEmpty (virbitmap.c:126) ==21274== by 0x54BD059: virBitmapParseUnlimited (virbitmap.c:570) ==21274== by 0x54EECE9: virFileReadValueBitmap (virfile.c:4113) ==21274== by 0x5563132: virCapabilitiesInitCaches (capabilities.c:1548) ==21274== by 0x2BB86E59: virQEMUCapsInit (qemu_capabilities.c:1132) ==21274== by 0x2BBEC067: virQEMUDriverCreateCapabilities (qemu_conf.c:928) ==21274== by 0x2BC3DEAA: qemuStateInitialize (qemu_driver.c:845) ==21274== by 0x5625AAC: virStateInitialize (libvirt.c:770) ==21274== by 0x124519: daemonRunStateInit (libvirtd.c:881) ==21274== by 0x554C927: virThreadHelper (virthread.c:206) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/capabilities.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index a91a72a35..43b15761a 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1643,5 +1643,6 @@ virCapabilitiesInitCaches(virCapsPtr caps) VIR_FREE(path); VIR_DIR_CLOSE(dirp); virCapsHostCacheBankFree(bank); + virBitmapFree(cpus); return ret; } -- 2.13.0

2 1