- Devel - libvirt List Archives

[libvirt] [PATCH] qemu_cgroup: Fix 'rc' argument on virDomainAuditCgroupPath() calls
by Eduardo Habkost 04 Jan '18

04 Jan '18

All calls to virDomainAuditCgroupPath() were passing 'rc == 0' as argument, when it was supposed to pass the 'rc' value directly. As a consequence, the audit events that were supposed to be logged (actual cgroup changes) were never being logged, and bogus audit events were logged when using regular files as disk image. Fix all calls to use the return value of virCgroup{Allow,Deny}Device*() directly as the 'rc' argument. Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com> --- src/qemu/qemu_cgroup.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 19252ea23..1f8fd870c 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -75,7 +75,7 @@ qemuSetupImagePathCgroup(virDomainObjPtr vm, virDomainAuditCgroupPath(vm, priv->cgroup, "allow", path, virCgroupGetDevicePermsString(perms), - ret == 0); + ret); return ret; } @@ -129,7 +129,7 @@ qemuTeardownImageCgroup(virDomainObjPtr vm, ret = virCgroupDenyDevicePath(priv->cgroup, src->path, perms, true); virDomainAuditCgroupPath(vm, priv->cgroup, "deny", src->path, - virCgroupGetDevicePermsString(perms), ret == 0); + virCgroupGetDevicePermsString(perms), ret); return ret; } @@ -187,7 +187,7 @@ qemuSetupChrSourceCgroup(virDomainObjPtr vm, ret = virCgroupAllowDevicePath(priv->cgroup, source->data.file.path, VIR_CGROUP_DEVICE_RW, false); virDomainAuditCgroupPath(vm, priv->cgroup, "allow", - source->data.file.path, "rw", ret == 0); + source->data.file.path, "rw", ret); return ret; } @@ -211,7 +211,7 @@ qemuTeardownChrSourceCgroup(virDomainObjPtr vm, ret = virCgroupDenyDevicePath(priv->cgroup, source->data.file.path, VIR_CGROUP_DEVICE_RW, false); virDomainAuditCgroupPath(vm, priv->cgroup, "deny", - source->data.file.path, "rw", ret == 0); + source->data.file.path, "rw", ret); return ret; } @@ -261,7 +261,7 @@ qemuSetupInputCgroup(virDomainObjPtr vm, VIR_DEBUG("Process path '%s' for input device", dev->source.evdev); ret = virCgroupAllowDevicePath(priv->cgroup, dev->source.evdev, VIR_CGROUP_DEVICE_RW, false); - virDomainAuditCgroupPath(vm, priv->cgroup, "allow", dev->source.evdev, "rw", ret == 0); + virDomainAuditCgroupPath(vm, priv->cgroup, "allow", dev->source.evdev, "rw", ret); break; } @@ -284,7 +284,7 @@ qemuTeardownInputCgroup(virDomainObjPtr vm, VIR_DEBUG("Process path '%s' for input device", dev->source.evdev); ret = virCgroupDenyDevicePath(priv->cgroup, dev->source.evdev, VIR_CGROUP_DEVICE_RWM, false); - virDomainAuditCgroupPath(vm, priv->cgroup, "deny", dev->source.evdev, "rwm", ret == 0); + virDomainAuditCgroupPath(vm, priv->cgroup, "deny", dev->source.evdev, "rwm", ret); break; } @@ -313,7 +313,7 @@ qemuSetupHostdevCgroup(virDomainObjPtr vm, rv = virCgroupAllowDevicePath(priv->cgroup, path[i], perms[i], false); virDomainAuditCgroupPath(vm, priv->cgroup, "allow", path[i], virCgroupGetDevicePermsString(perms[i]), - ret == 0); + ret); if (rv < 0) goto cleanup; } @@ -357,7 +357,7 @@ qemuTeardownHostdevCgroup(virDomainObjPtr vm, rv = virCgroupDenyDevicePath(priv->cgroup, path[i], VIR_CGROUP_DEVICE_RWM, false); virDomainAuditCgroupPath(vm, priv->cgroup, - "deny", path[i], "rwm", rv == 0); + "deny", path[i], "rwm", rv); if (rv < 0) goto cleanup; } @@ -388,7 +388,7 @@ qemuSetupMemoryDevicesCgroup(virDomainObjPtr vm, rv = virCgroupAllowDevicePath(priv->cgroup, mem->nvdimmPath, VIR_CGROUP_DEVICE_RW, false); virDomainAuditCgroupPath(vm, priv->cgroup, "allow", - mem->nvdimmPath, "rw", rv == 0); + mem->nvdimmPath, "rw", rv); return rv; } @@ -410,7 +410,7 @@ qemuTeardownMemoryDevicesCgroup(virDomainObjPtr vm, rv = virCgroupDenyDevicePath(priv->cgroup, mem->nvdimmPath, VIR_CGROUP_DEVICE_RWM, false); virDomainAuditCgroupPath(vm, priv->cgroup, - "deny", mem->nvdimmPath, "rwm", rv == 0); + "deny", mem->nvdimmPath, "rwm", rv); return rv; } @@ -434,7 +434,7 @@ qemuSetupGraphicsCgroup(virDomainObjPtr vm, ret = virCgroupAllowDevicePath(priv->cgroup, rendernode, VIR_CGROUP_DEVICE_RW, false); virDomainAuditCgroupPath(vm, priv->cgroup, "allow", rendernode, - "rw", ret == 0); + "rw", ret); return ret; } @@ -573,7 +573,7 @@ qemuSetupRNGCgroup(virDomainObjPtr vm, VIR_CGROUP_DEVICE_RW, false); virDomainAuditCgroupPath(vm, priv->cgroup, "allow", rng->source.file, - "rw", rv == 0); + "rw", rv); if (rv < 0 && !virLastErrorIsSystemErrno(ENOENT)) return -1; @@ -600,7 +600,7 @@ qemuTeardownRNGCgroup(virDomainObjPtr vm, VIR_CGROUP_DEVICE_RW, false); virDomainAuditCgroupPath(vm, priv->cgroup, "deny", rng->source.file, - "rw", rv == 0); + "rw", rv); if (rv < 0 && !virLastErrorIsSystemErrno(ENOENT)) return -1; @@ -693,7 +693,7 @@ qemuSetupDevicesCgroup(virDomainObjPtr vm) rv = virCgroupAllowDevicePath(priv->cgroup, deviceACL[i], VIR_CGROUP_DEVICE_RW, false); - virDomainAuditCgroupPath(vm, priv->cgroup, "allow", deviceACL[i], "rw", rv == 0); + virDomainAuditCgroupPath(vm, priv->cgroup, "allow", deviceACL[i], "rw", rv); if (rv < 0 && !virLastErrorIsSystemErrno(ENOENT)) goto cleanup; -- 2.14.3

2 1

[libvirt] [PATCH] virstringtest: Fix alignment of backslashes
by Michal Privoznik 04 Jan '18

04 Jan '18

We don't try to right align the backslashes anymore. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial & build breaker rules. tests/virstringtest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/virstringtest.c b/tests/virstringtest.c index e8518ede1..1230aba5b 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -1119,9 +1119,9 @@ mymain(void) #define TEST_FILTER_CHARS(str, filter, res) \ do { \ struct testFilterData filterData = { \ - .string = str, \ + .string = str, \ .valid = filter, \ - .result = res, \ + .result = res, \ }; \ if (virTestRun("Filter chars from " #str, \ testFilterChars, &filterData) < 0) \ -- 2.13.6

1 0

[libvirt] [PATCH] util: fix a wrong description
by Chen Hanxiao 04 Jan '18

04 Jan '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We don't have @result. Use the right one: @matches Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/util/virstring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index b2ebce27f..0cb06bdc9 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1038,7 +1038,7 @@ int virStringSortRevCompare(const void *a, const void *b) * @str: string to search * @regexp: POSIX Extended regular expression pattern used for matching * @max_matches: maximum number of substrings to return - * @result: pointer to an array to be filled with NULL terminated list of matches + * @matches: pointer to an array to be filled with NULL terminated list of matches * * Performs a POSIX extended regex search against a string and return all matching substrings. * The @result value should be freed with virStringListFree() when no longer -- 2.14.3

3 3

[libvirt] [PATCH] maint: Update to latest gnulib
by Michal Privoznik 03 Jan '18

03 Jan '18

Unfortunately, since gnulib's commit of 2c5d558745 there's an unused parameter to stat_time_normalize() function which gnulib developers don't want to fix [1]. Therefore, we have to work around it by temporarily suspending -Wunused-parameter. 1: http://lists.gnu.org/archive/html/bug-gnulib/2018-01/msg00000.html Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- While we have 'gnulib update free' push rule, this one is not trivial at all and thus I have not pushed it. It's ugly and I don't like it. So any ideas are welcome. .gnulib | 2 +- bootstrap | 4 ++-- src/storage/storage_util.c | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gnulib b/.gnulib index 5e9abf871..c2cb55b34 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 5e9abf87163ad4aeaefef0b02961f8674b0a4879 +Subproject commit c2cb55b34e76546479f195c14202dfcc870c4914 diff --git a/bootstrap b/bootstrap index 85b85c530..25920e991 100755 --- a/bootstrap +++ b/bootstrap @@ -4,7 +4,7 @@ scriptversion=2017-09-19.08; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -792,7 +792,7 @@ symlink_to_dir() # aren't confused into doing unnecessary builds. Conversely, if the # existing symlink's timestamp is older than the source, make it afresh, # so that broken tools aren't confused into skipping needed builds. See - # <https://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00326.html>. + # <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00326.html>. test -h "$dst" && src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 && dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 && diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 899a55758..da6381f52 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -64,7 +64,10 @@ #include "virfile.h" #include "virjson.h" #include "virqemu.h" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-parameter" #include "stat-time.h" +#pragma GCC diagnostic pop #include "virstring.h" #include "virxml.h" #include "virfdstream.h" -- 2.13.6

4 6

[libvirt] [PATCH v2] maint: Update to latest gnulib
by Eric Blake 03 Jan '18

03 Jan '18

From: Michal Privoznik <mprivozn(a)redhat.com> Unfortunately, since gnulib's commit of 2c5d558745 there's an unused parameter to stat_time_normalize() function which gnulib developers don't want to fix yet [1]. Therefore, we have to work around it by temporarily providing a downstream patch. 1: http://lists.gnu.org/archive/html/bug-gnulib/2018-01/msg00000.html Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> [eblake: use gnulib local diff, instead of #pragma] Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v2: perhaps nicer than Michal's original suggestion, but I'd still wait another day or two to see if my arguments on the upstream gnulib thread can instead give us a better submodule commit to update to that avoids the problem altogether. --- .gnulib | 2 +- bootstrap | 4 ++-- gnulib/local/lib/stat-time.h.diff | 13 +++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 gnulib/local/lib/stat-time.h.diff diff --git a/.gnulib b/.gnulib index 5e9abf8716..c2cb55b34e 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 5e9abf87163ad4aeaefef0b02961f8674b0a4879 +Subproject commit c2cb55b34e76546479f195c14202dfcc870c4914 diff --git a/bootstrap b/bootstrap index 85b85c530f..25920e991c 100755 --- a/bootstrap +++ b/bootstrap @@ -4,7 +4,7 @@ scriptversion=2017-09-19.08; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -792,7 +792,7 @@ symlink_to_dir() # aren't confused into doing unnecessary builds. Conversely, if the # existing symlink's timestamp is older than the source, make it afresh, # so that broken tools aren't confused into skipping needed builds. See - # <https://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00326.html>. + # <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00326.html>. test -h "$dst" && src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 && dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 && diff --git a/gnulib/local/lib/stat-time.h.diff b/gnulib/local/lib/stat-time.h.diff new file mode 100644 index 0000000000..8333520d2d --- /dev/null +++ b/gnulib/local/lib/stat-time.h.diff @@ -0,0 +1,13 @@ +diff --git i/lib/stat-time.h w/lib/stat-time.h +index 5f8bf4e12..68871f567 100644 +--- i/lib/stat-time.h ++++ w/lib/stat-time.h +@@ -212,7 +212,7 @@ get_stat_birthtime (struct stat const *st) + errno to EOVERFLOW if normalization overflowed. This function + is intended to be private to this .h file. */ + _GL_STAT_TIME_INLINE int +-stat_time_normalize (int result, struct stat *st) ++stat_time_normalize (int result, struct stat *st _GL_UNUSED) + { + #if defined __sun && defined STAT_TIMESPEC + if (result == 0) -- 2.14.3

2 2

[libvirt] [PATCH] apparmor: fix virt-aa-helper profile
by Cédric Bosdonnat 03 Jan '18

03 Jan '18

Fix rule introduced by commit 0f33025a: * to handle /var/run not being a symlink to /run * to be properly parsed: missing comma at the end. --- examples/apparmor/usr.lib.libvirt.virt-aa-helper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper index 9c822b644..105f09e43 100644 --- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper +++ b/examples/apparmor/usr.lib.libvirt.virt-aa-helper @@ -51,7 +51,7 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper { /var/lib/libvirt/images/** r, /{media,mnt,opt,srv}/** r, # For virt-sandbox - /run/libvirt/**/[sv]d[a-z] r + /{,var/}run/libvirt/**/[sv]d[a-z] r, /**.img r, /**.raw r, -- 2.15.1

4 3

[libvirt] [PATCH] storage: Fixing missing 'backingStore' tag from volume XML dumps.
by Julio Faracco 03 Jan '18

03 Jan '18

After commit a693fdb 'vol-dumpxml' missed the ability to show backingStore information. This commit adds a volume type for files that fixes this problem. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1529663 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/storage/storage_util.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 899a557..9e1b63a 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -1957,6 +1957,8 @@ virStorageBackendUpdateVolTargetInfoFD(virStorageSourcePtr target, target->timestamps->ctime = get_stat_ctime(sb); target->timestamps->mtime = get_stat_mtime(sb); + target->type = VIR_STORAGE_TYPE_FILE; + VIR_FREE(target->perms->label); #if WITH_SELINUX -- 2.7.4

2 2

[libvirt] [PATCH v2] qemuBuildMemPathStr: Forbid memoryBacking/access for non-numa case
by Michal Privoznik 03 Jan '18

03 Jan '18

https://bugzilla.redhat.com/show_bug.cgi?id=1448149 If a domain has no numa nodes, that means we don't put any memory-backend-file onto the qemu command line. That in turn means we can't set access='shared'. Therefore, we should produce an error instead of ignoring the setting silently. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v2: - switched from check at cmd line generation to validation callback (as requested in review). src/qemu/qemu_domain.c | 29 ++++++++- tests/qemuxml2argvdata/hugepages-memaccess3.xml | 87 +++++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 + 3 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/hugepages-memaccess3.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 43bd0fff4..70fb40650 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3997,6 +3997,30 @@ qemuDomainDeviceDefValidateController(const virDomainControllerDef *controller, } +static int +qemuDomainDeviceDefValidateMemory(const virDomainMemoryDef *memory ATTRIBUTE_UNUSED, + const virDomainDef *def) +{ + const long system_page_size = virGetSystemPageSizeKB(); + + /* We can't guarantee any other mem.access + * if no guest NUMA nodes are defined. */ + if (def->mem.nhugepages != 0 && + def->mem.hugepages[0].size != system_page_size && + virDomainNumaGetNodeCount(def->numa) == 0 && + def->mem.access != VIR_DOMAIN_MEMORY_ACCESS_DEFAULT && + def->mem.access != VIR_DOMAIN_MEMORY_ACCESS_PRIVATE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("memory access mode '%s' not supported " + "without guest numa node"), + virDomainMemoryAccessTypeToString(def->mem.access)); + return -1; + } + + return 0; +} + + static int qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, const virDomainDef *def, @@ -4052,6 +4076,10 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, qemuCaps); break; + case VIR_DOMAIN_DEVICE_MEMORY: + ret = qemuDomainDeviceDefValidateMemory(dev->data.memory, def); + break; + case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_FS: case VIR_DOMAIN_DEVICE_INPUT: @@ -4063,7 +4091,6 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, case VIR_DOMAIN_DEVICE_SHMEM: case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: - case VIR_DOMAIN_DEVICE_MEMORY: case VIR_DOMAIN_DEVICE_IOMMU: case VIR_DOMAIN_DEVICE_NONE: case VIR_DOMAIN_DEVICE_LAST: diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.xml b/tests/qemuxml2argvdata/hugepages-memaccess3.xml new file mode 100644 index 000000000..8ec38d802 --- /dev/null +++ b/tests/qemuxml2argvdata/hugepages-memaccess3.xml @@ -0,0 +1,87 @@ +<domain type='kvm'> + <name>fedora</name> + <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <memoryBacking> + <hugepages/> + <access mode='shared'/> + </memoryBacking> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='x86_64' machine='pc-i440fx-2.9'>hvm</type> + <bootmenu enable='yes'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <cpu mode='host-model' check='partial'> + <model fallback='allow'/> + </cpu> + <clock offset='variable' adjustment='500' basis='utc'> + <timer name='rtc' tickpolicy='catchup'/> + <timer name='pit' tickpolicy='delay'/> + <timer name='hpet' present='no'/> + </clock> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <pm> + <suspend-to-mem enabled='yes'/> + <suspend-to-disk enabled='yes'/> + </pm> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2' discard='unmap'/> + <source file='/var/lib/libvirt/images/fedora.qcow2'/> + <target dev='sda' bus='scsi'/> + <boot order='1'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0' model='piix3-uhci'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <controller type='scsi' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </controller> + <controller type='virtio-serial' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <serial type='pty'> + <target type='isa-serial' port='1'> + <model name='isa-serial'/> + </target> + </serial> + <console type='pty'> + <target type='serial' port='1'/> + </console> + <channel type='unix'> + <target type='virtio' name='org.qemu.guest_agent.0'/> + <address type='virtio-serial' controller='0' bus='0' port='1'/> + </channel> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'> + <listen type='address' address='0.0.0.0'/> + </graphics> + <graphics type='spice'> + <listen type='socket' socket='/tmp/spice.sock'/> + </graphics> + <video> + <model type='virtio' heads='1' primary='yes'> + <acceleration accel3d='yes'/> + </model> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 10ab8d787..fe15072dc 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -861,6 +861,9 @@ mymain(void) DO_TEST("hugepages-memaccess2", QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA); + DO_TEST_FAILURE("hugepages-memaccess3", QEMU_CAPS_MEM_PATH, + QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE, + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("nosharepages", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MEM_MERGE); DO_TEST("disk-cdrom", NONE); DO_TEST("disk-iscsi", NONE); -- 2.13.6

2 1

[libvirt] [PATCH 0/2] qemu: Don't log partial buffer reads from qemu monitor
by Peter Krempa 03 Jan '18

03 Jan '18

I was debugging a case where 200 snapshots of a disk would result in a VERY long reconnect time after libvirtd restart when debug logging was enabled. I've figured out that qemu responds with 9MiB of json after calling "query-named-block-nodes" and this resulted in > 26 GiB of libvirtd debug log just to process the message. I'll report the qemu flaw separately. Peter Krempa (2): util: probe: Add quiet versions of the "PROBE" macro qemu: monitor: Decrease logging verbosity src/qemu/qemu_monitor.c | 4 ++-- src/qemu/qemu_monitor_json.c | 3 +++ src/util/virprobe.h | 8 ++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) -- 2.15.0

3 5

[libvirt] [PATCH] util: fix another wrong description
by Chen Hanxiao 03 Jan '18

03 Jan '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> commit 9026d1152c236ac7a7ab25845220a8e14d6bc630 forgot to change the referenced @result variable. This patch completed this. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/util/virstring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index 0cb06bdc9..b6e7e279c 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1041,7 +1041,7 @@ int virStringSortRevCompare(const void *a, const void *b) * @matches: pointer to an array to be filled with NULL terminated list of matches * * Performs a POSIX extended regex search against a string and return all matching substrings. - * The @result value should be freed with virStringListFree() when no longer + * The @matches value should be freed with virStringListFree() when no longer * required. * * @code -- 2.14.3

2 1

[libvirt] [PATCH] apparmor: allow unix stream for p2p migrations
by Christian Ehrhardt 03 Jan '18

03 Jan '18

On live migration with --p2p like: $ virsh migrate --live --p2p kvmguest-bionic-normal \ qemu+ssh://10.6.221.80/system We hit an apparmor deny like: apparmor="DENIED" operation="file_inherit" profile="/usr/sbin/libvirtd" pid=23477 comm="ssh" family="unix" sock_type="stream" protocol=0 requested_mask="send receive" denied_mask="send" addr=none peer_addr=none peer="unconfined" The rule is not perfect, but can't be restricted further at the moment (new upstream kernel features needed). For now the lack of a profile on the peer as well as comm not being a conditional on rules do not allow to filter further. Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- examples/apparmor/usr.sbin.libvirtd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd index 8d61d15..febe8a4 100644 --- a/examples/apparmor/usr.sbin.libvirtd +++ b/examples/apparmor/usr.sbin.libvirtd @@ -53,6 +53,9 @@ network packet dgram, network packet raw, + # for --p2p migrations + unix (send, receive) type=stream addr=none peer=(label=unconfined addr=none), + ptrace (trace) peer=unconfined, ptrace (trace) peer=/usr/sbin/libvirtd, ptrace (trace) peer=/usr/sbin/dnsmasq, -- 2.7.4

3 2

[libvirt] [PATCH 0/2] Set hostname in lxc containers
by Cédric Bosdonnat 03 Jan '18

03 Jan '18

Hey there, Here are two commits to set a transient hostname on lxc containers based on the guest name. Cédric Bosdonnat (2): Add virStringFilterChars() string utility lxc: set a hostname based on the container name src/libvirt_private.syms | 1 + src/lxc/lxc_container.c | 35 +++++++++++++++++++++++++++++++++++ src/util/virstring.c | 24 ++++++++++++++++++++++++ src/util/virstring.h | 1 + tests/virstringtest.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 107 insertions(+) -- 2.15.1

2 3

[libvirt] virt-install ERROR Host does not support any virtualization options
by Mihamina RAKOTOMANDIMBY 03 Jan '18

03 Jan '18

Hello, I face this problem and I am willing to provide a patch in order to have a more informative message. This, of course with our help. I am not quite certain. First of all: What is the problem? On a fresh Install (ArchLinux for me), if ever forget to install Qemu and launch "virt-install" with "--type kvm", I get the message: "Host does not support any virtualization options" According to me, this message should be improved: if Qemu is not found, this should be "Did not find Qemu, please install it". As I searched, the message is generated by this piece of code: https://github.com/virt-manager/virt-manager/blob/c92aade081687b19f5a60cddf… As I write now, I cant find the pice of code actually calling the "quemu" binary. I think I should add a try/catch block there and Raise the right Exception. Would someone help me a bit? Thank you.

2 1

[libvirt] [PATCH] blockjob: Fix error checking of blockjob status
by Jie Wang 02 Jan '18

02 Jan '18

when the blockjob return status:"BLOCK_JOB_COMPLETED" with error: "File descriptor in bad state", "offset" and "len" are equal to zero, but the blockjob event should be "VIR_DOMAIN_BLOCK_JOB_FAILED" --- 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 e45868b..943360a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -886,7 +886,7 @@ qemuMonitorJSONHandleBlockJobImpl(qemuMonitorPtr mon, case VIR_DOMAIN_BLOCK_JOB_COMPLETED: error = virJSONValueObjectGetString(data, "error"); /* Make sure the whole device has been processed */ - if (offset != len) + if (offset != len || offset == 0) event = VIR_DOMAIN_BLOCK_JOB_FAILED; break; case VIR_DOMAIN_BLOCK_JOB_CANCELED: -- 1.8.3.1

2 1

[libvirt] [PATCH] docs: Fix serial console configuration examples
by Andrea Bolognani 02 Jan '18

02 Jan '18

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. docs/formatdomain.html.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 01db83e60..d272cc1ba 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -6603,6 +6603,7 @@ qemu-kvm -net nic,model=? /dev/null <pre> ... +<devices>  <console type='pty'> <source path='/dev/pts/5'/> @@ -6694,7 +6695,7 @@ qemu-kvm -net nic,model=? /dev/null <pre> ... -</devices> +<devices> <console type='pty'> <target type='serial'/> </console> @@ -6719,21 +6720,21 @@ qemu-kvm -net nic,model=? /dev/null <pre> ... -</devices> +<devices> <serial type='pty'/> </devices> ...</pre> <pre> ... -</devices> +<devices> <console type='pty'/> </devices> ...</pre> <pre> ... -</devices> +<devices> <serial type='pty'/> <console type='pty'/> </devices> -- 2.14.3

1 0

[libvirt] [PATCH] conf: honor maxnames in nodeListDevices API
by Pavel Hrdina 02 Jan '18

02 Jan '18

Introduced by commit <4ae9dbea99c>. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1528572 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/virnodedeviceobj.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 872ec1fd4b..c4e3a40d3a 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -798,6 +798,9 @@ virNodeDeviceObjListGetNamesCallback(void *payload, if (data->error) return 0; + if (data->nnames >= data->maxnames) + return 0; + virObjectLock(obj); def = obj->def; -- 2.14.3

2 1

[libvirt] error: operation failed: domain save job: unexpectedly failed
by Oscar Segarra 02 Jan '18

02 Jan '18

Hi, For any unkown reason the virsh save raises an error in my environment Centos 7.2: [root@vdicnode02 ~]# virsh list Id Name State ---------------------------------------------------- 2 vdicsunstone01 running 3 one-27 running [root@vdicnode02 ~]# export LIBVIRT_DEBUG=0 [root@vdicnode02 ~]# export LIBVIRT_LOG_OUTPUTS="1:file:virsh.log" [root@vdicnode02 ~]# virsh --debug 0 --connect qemu:///system save one-27 /var/lib/one//datastores/100/27/checkpoint save: domain(optdata): one-27 save: file(optdata): /var/lib/one//datastores/100/27/checkpoint save: found option <domain>: one-27 save: <domain> trying as domain NAME save: found option <domain>: one-27 save: <domain> trying as domain NAME error: Failed to save domain one-27 to /var/lib/one//datastores/100/27/checkpoint error: operation failed: domain save job: unexpectedly failed [root@vdicnode02 ~]# cat virsh.log 2017-12-27 21:56:26.676+0000: 86761: info : libvirt version: 3.2.0, package: 14.el7_4.5 (CentOS BuildSystem <http://bugs.centos.org>, 2017-12-07-15:37:23, c1bm.rdu2.centos.org) 2017-12-27 21:56:26.676+0000: 86761: info : hostname: vdicnode02 2017-12-27 21:56:26.676+0000: 86761: error : virNetClientProgramDispatchError:177 : operation failed: domain save job: unexpectedly failed [root@vdicnode02 ~]# Versions: [root@vdicnode02 ~]# /usr/libexec/qemu-kvm --version QEMU emulator version 1.5.3 (qemu-kvm-1.5.3-141.el7_4.4), Copyright (c) 2003-2008 Fabrice Bellard [root@vdicnode02 ~]# libvirtd --version libvirtd (libvirt) 3.2.0 The process: [root@vdicnode02 ~]# ps -defa | grep one-27 oneadmin 59956 1 56 20:36 ? 01:20:27 /usr/libexec/qemu-kvm -name one-27 -S -machine pc-i440fx-rhel7.0.0,accel=kvm,usb=off,dump-guest-core=off -cpu SandyBridge -m 1024 -realtime mlock=off -smp 2,sockets=2,cores=1,threads=1 -uuid f3d850ce-25cb-446f-a017-0564751514a1 -no-user-config -nodefaults -chardev socket,id=charmonitor,path=/var/lib/libvirt/qemu/domain-3-one-27/monitor.sock,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -no-shutdown -boot strict=on -device nec-usb-xhci,id=usb,bus=pci.0,addr=0x5 -device virtio-scsi-pci,id=scsi0,num_queues=4,bus=pci.0,addr=0x6 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x7 -device usb-hub,id=hub0,bus=usb.0,port=1 -drive file=rbd:vdicvmpool-ssd/one-2-27-0:id=libvirt:key=AQDE5KVZeuJlIBAAiRDxHOGcbtioGTnBVECyrQ==:auth_supported=cephx\;none:mon_host=vdicnode01\:6789\;vdicnode02\:6789,format=raw,if=none,id=drive-virtio-disk0,cache=writeback -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x8,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 -drive file=/var/lib/one//datastores/100/27/disk.1,format=raw,if=none,id=drive-ide0-0-0,readonly=on -device ide-cd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 -netdev tap,fd=27,id=hostnet0,vhost=on,vhostfd=30 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=02:00:2f:4e:9c:3e,bus=pci.0,addr=0x3 -chardev spicevmc,id=charchannel0,name=vdagent -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=com.redhat.spice.0 -chardev socket,id=charchannel1,path=/var/lib/libvirt/qemu/channel/target/domain-3-one-27/org.qemu.guest_agent.0,server,nowait -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=org.qemu.guest_agent.0 -device usb-tablet,id=input0,bus=usb.0,port=2 -spice port=5927,addr=0.0.0.0,disable-ticketing,seamless-migration=on -k es -vga qxl -global qxl-vga.ram_size=67108864 -global qxl-vga.vram_size=67108864 -global qxl-vga.vgamem_mb=64 -global qxl-vga.max_outputs=1 -device intel-hda,id=sound0,bus=pci.0,addr=0x4 -device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 -chardev spicevmc,id=charredir0,name=usbredir -device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=3 -chardev spicevmc,id=charredir1,name=usbredir -device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=4 -chardev spicevmc,id=charredir2,name=usbredir -device usb-redir,chardev=charredir2,id=redir2,bus=usb.0,port=1.1 -chardev spicevmc,id=charredir3,name=usbredir -device usb-redir,chardev=charredir3,id=redir3,bus=usb.0,port=1.2 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x9 -msg timestamp=on Any help will be welcome! Thanks a lot.

2 1

[libvirt] [PATCH] blockjob: Fix error checking of blockjob status
by Jie Wang 02 Jan '18

02 Jan '18

when the blockjob return status:"BLOCK_JOB_COMPLETED" with error: "File descriptor in bad state", "offset" and "len" are equal to zero, but the blockjob event should be "VIR_DOMAIN_BLOCK_JOB_FAILED" --- 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 e45868b..943360a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -886,7 +886,7 @@ qemuMonitorJSONHandleBlockJobImpl(qemuMonitorPtr mon, case VIR_DOMAIN_BLOCK_JOB_COMPLETED: error = virJSONValueObjectGetString(data, "error"); /* Make sure the whole device has been processed */ - if (offset != len) + if (offset != len || offset == 0) event = VIR_DOMAIN_BLOCK_JOB_FAILED; break; case VIR_DOMAIN_BLOCK_JOB_CANCELED: -- 1.8.3.1

1 0

[libvirt] error: qemu unexpectedly closed the monitor: load of migration failed
by Oscar Segarra 27 Dec '17

27 Dec '17

Hi, For any unkown reason the virsh migrate raises an error in my environment Centos 7.2: [root@vdicnode02 ~]# virsh list Id Name State ---------------------------------------------------- 2 vdicsunstone01 running 3 one-27 running [root@vdicnode02 ~]# export LIBVIRT_DEBUG=0 [root@vdicnode02 ~]# export LIBVIRT_LOG_OUTPUTS="1:file:virsh.log" [root@vdicnode02 ~]# virsh --debug 0 --connect=qemu:///system --quiet migrate --live one-27 qemu+ssh://vdicnode01/system migrate: live(bool): (none) migrate: domain(optdata): one-27 migrate: desturi(optdata): qemu+ssh://vdicnode01/system migrate: found option <domain>: one-27 migrate: <domain> trying as domain NAME migrate: found option <domain>: one-27 migrate: <domain> trying as domain NAME error: internal error: qemu unexpectedly closed the monitor: load of migration failed [root@vdicnode02 ~]# cat virsh.log 2017-12-27 22:01:34.211+0000: 92553: info : libvirt version: 3.2.0, package: 14.el7_4.5 (CentOS BuildSystem <http://bugs.centos.org>, 2017-12-07-15:37:23, c1bm.rdu2.centos.org) 2017-12-27 22:01:34.211+0000: 92553: info : hostname: vdicnode02 2017-12-27 22:01:34.211+0000: 92553: error : virNetClientProgramDispatchError:177 : operation failed: migration job: unexpectedly failed 2017-12-27 22:01:34.435+0000: 92553: error : virNetClientProgramDispatchError:177 : internal error: qemu unexpectedly closed the monitor: load of migration failed [root@vdicnode02 ~]# Versions: [root@vdicnode02 ~]# /usr/libexec/qemu-kvm --version QEMU emulator version 1.5.3 (qemu-kvm-1.5.3-141.el7_4.4), Copyright (c) 2003-2008 Fabrice Bellard [root@vdicnode02 ~]# libvirtd --version libvirtd (libvirt) 3.2.0 The process: [root@vdicnode02 ~]# ps -defa | grep one-27 oneadmin 59956 1 56 20:36 ? 01:20:27 /usr/libexec/qemu-kvm -name one-27 -S -machine pc-i440fx-rhel7.0.0,accel=kvm,usb=off,dump-guest-core=off -cpu SandyBridge -m 1024 -realtime mlock=off -smp 2,sockets=2,cores=1,threads=1 -uuid f3d850ce-25cb-446f-a017-0564751514a1 -no-user-config -nodefaults -chardev socket,id=charmonitor,path=/ var/lib/libvirt/qemu/domain-3-one-27/monitor.sock,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -no-shutdown -boot strict=on -device nec-usb-xhci,id=usb,bus=pci.0,addr=0x5 -device virtio-scsi-pci,id=scsi0,num_queues=4,bus=pci.0,addr=0x6 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x7 -device usb-hub,id=hub0,bus=usb.0,port=1 -drive file=rbd:vdicvmpool-ssd/one-2- 27-0:id=libvirt:key=AQDE5KVZeuJlIBAAiRDxHOGcbtioGTnBVECyrQ==:auth_supported= cephx\;none:mon_host=vdicnode01\:6789\;vdicnode02\: 6789,format=raw,if=none,id=drive-virtio-disk0,cache=writeback -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x8,drive=drive- virtio-disk0,id=virtio-disk0,bootindex=1 -drive file=/var/lib/one//datastores/100/27/disk.1,format=raw,if= none,id=drive-ide0-0-0,readonly=on -device ide-cd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 -netdev tap,fd=27,id=hostnet0,vhost=on,vhostfd=30 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=02:00:2f:4e:9c:3e,bus=pci.0,addr=0x3 -chardev spicevmc,id=charchannel0,name=vdagent -device virtserialport,bus=virtio-serial0.0,nr=1,chardev= charchannel0,id=channel0,name=com.redhat.spice.0 -chardev socket,id=charchannel1,path=/var/lib/libvirt/qemu/channel/ target/domain-3-one-27/org.qemu.guest_agent.0,server,nowait -device virtserialport,bus=virtio-serial0.0,nr=2,chardev= charchannel1,id=channel1,name=org.qemu.guest_agent.0 -device usb-tablet,id=input0,bus=usb.0,port=2 -spice port=5927,addr=0.0.0.0, disable-ticketing,seamless-migration=on -k es -vga qxl -global qxl-vga.ram_size=67108864 -global qxl-vga.vram_size=67108864 -global qxl-vga.vgamem_mb=64 -global qxl-vga.max_outputs=1 -device intel-hda,id=sound0,bus=pci.0,addr=0x4 -device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 -chardev spicevmc,id=charredir0,name=usbredir -device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=3 -chardev spicevmc,id=charredir1,name=usbredir -device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=4 -chardev spicevmc,id=charredir2,name=usbredir -device usb-redir,chardev=charredir2,id=redir2,bus=usb.0,port=1.1 -chardev spicevmc,id=charredir3,name=usbredir -device usb-redir,chardev=charredir3,id=redir3,bus=usb.0,port=1.2 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x9 -msg timestamp=on Any help will be welcome! Thanks a lot.

1 0

[libvirt] [PATCH v5 0/3] daemon: fix termination/reload issues
by John Ferlan 25 Dec '17

25 Dec '17

v4: https://www.redhat.com/archives/libvir-list/2017-October/msg01249.html Difference to v4 - inserted a patch to handle the Unref possibilities in virLockDaemonNew when either the @srv is placed into the daemon net server hash table or if virNetDaemonNew fails. Patch 3 has a minor change (from previous review) to not set dmn->servers = NULL allowing the virHashFree in virNetDaemonDispose. John Ferlan (1): lockd: Need to Unref @srv when done with it. Nikolay Shirokovskiy (2): virtlogd: add missing netserver refcount increment on reload libvirtd: fix crash on termination src/locking/lock_daemon.c | 4 ++++ src/rpc/virnetdaemon.c | 2 ++ 2 files changed, 6 insertions(+) -- 2.13.6

6 43

[libvirt] [PATCH v2 00/14] Fix race on srv->nclients_unauth and some other changes
by Marc Hartmayer 22 Dec '17

22 Dec '17

This patch series fixes some locking issues, a memory leak, some other cosmetic changes, and it fixes a bug that led to a libvirtd which doesn't accept new connections. Changelog: v1->v2: + Added r-b's + Patch 2: Replaced the patch with a new fix for the memory leak + Patch 5: Introduce *Locked and simplified the function as John suggested + Patch 7: Fixed coding style issues, merged in the former patch 9, reworded commit message + Patch 9: (former patch 10) reworded the commit message and fixed coding style issues + Patch 10: (former patch 11) Fixed coding style issues, moved check to ExecRestart, reworded function description of virNetServerSetClientAuthCompletedLocked + New patch 14: Add locking around the critical section in remoteSASLFinish Marc Hartmayer (14): rpc: Remove duplicate declaration of virNetServerAddClient tests: virnetserverclienttest: Fix memory leak @client rpc: Use the enum value instead of a numerical value rpc: Add typedef for the anonymous enum used for authentication methods rpc: Be more precise in which cases the authentication is needed and introduce *Locked rpc: First test if authentication is required rpc: Refactor the condition whether a client needs authentication rpc: Correct locking and simplify the function rpc: Introduce virNetServerSetClientAuthenticated rpc: virnetserver: Fix race on srv->nclients_unauth tests: virnetdaemontest: Enable testing for 'auth_pending' rpc: Remove virNetServerClientNeedAuthLocked rpc: Replace virNetServerClientNeedAuth with virNetServerClientIsAuthenticated remote: add locking around the critical section in remoteSASLFinish daemon/remote.c | 33 +++--- src/libvirt_remote.syms | 14 +-- src/rpc/virnetserver.c | 82 +++++++++----- src/rpc/virnetserver.h | 6 +- src/rpc/virnetserverclient.c | 118 ++++++++++++++++----- src/rpc/virnetserverclient.h | 11 +- src/rpc/virnetserverprogram.c | 9 +- src/rpc/virnetserverservice.h | 4 +- .../input-data-client-auth-pending-failure.json | 44 ++++++++ .../input-data-client-auth-pending.json | 70 ++++++++++++ .../virnetdaemondata/output-data-admin-nomdns.json | 4 + .../output-data-admin-server-names.json | 4 + .../virnetdaemondata/output-data-anon-clients.json | 2 + ...s.json => output-data-client-auth-pending.json} | 4 +- tests/virnetdaemondata/output-data-client-ids.json | 2 + .../output-data-client-timestamp.json | 2 + .../output-data-initial-nomdns.json | 2 + tests/virnetdaemondata/output-data-initial.json | 2 + .../output-data-no-keepalive-required.json | 4 + tests/virnetdaemontest.c | 2 + tests/virnetserverclienttest.c | 1 + 21 files changed, 331 insertions(+), 89 deletions(-) create mode 100644 tests/virnetdaemondata/input-data-client-auth-pending-failure.json create mode 100644 tests/virnetdaemondata/input-data-client-auth-pending.json copy tests/virnetdaemondata/{output-data-client-ids.json => output-data-client-auth-pending.json} (94%) -- 2.13.4

2 18

Re: [libvirt] RFC: Introduce a dlm-corosync for Lock manager plugin
by Lin Fu 22 Dec '17

22 Dec '17

> How are locks acquired by libdlm scoped ? The reason we have virtlockd is > that the fcntl() locks need to be held by a running process, and we wanted > them to persist across libvirtd restarts. This required holding them in a > separate process. Locks are managed by 'dlm_controld' daemon. There is a flag marked as `LKF_PERSISTENT` could archive the purpose that locks still exist after restarting libvirtd. And within my current cognition, lock would only disappear after rebooting OS, (not release the locks manually); at the same time, other nodes in clusters could recovery the lock context. > Are libdlm locks automatically released when the process that acquired > them dies, or is a manual release action required ? If they always require > a manual release, then there would be no need to use virtlockd - the plugin > can just take care of acquire & release, and still cope with lbivirtd > restarts. So why do I talk about virtlockd? It about the lockid. And what is lockid? In dlm, there are concepts about 'lockspace', 'resource' and 'lockid'. The relationship: multiple locks could be associated with the same resource, one lockspace could be added in multiple resource. When acquire a lock for the resource, lockid is returned by acquiring API call. Question: How could I know that which lockid is associated with the clear resource? After all, all lockid information will be lost after rebooting libvirtd in generally. I think about some resolution: one is using virtlockd to maintain those information, another is use some ways(such as share memory, write it to disk) to persistent information Fortunately, maybe I don't have to use virtlockd. LVM project also use the dlm, I could to refer it's implements. ----- >> The first half of 2017, QEMU introduced the `share-rw` and `file.locking` to >> handle a problem: https://bugzilla.redhat.com/show_bug.cgi?id=1080152 , link correction: https://bugzilla.redhat.com/show_bug.cgi?id=1378241 -- Regards River

2 1

[libvirt] [PATCH] add support of iSER transport type in qemu with libiscsi
by lichstor＠gmail.com 22 Dec '17

22 Dec '17

From: zhangshengyu <zhangshengyu(a)fusionstack.cn> --- docs/schemas/domaincommon.rng | 28 +++++++++++++ src/conf/domain_conf.c | 8 ++++ src/qemu/qemu_block.c | 24 ++++++++++- src/qemu/qemu_command.c | 3 ++ src/qemu/qemu_parse_command.c | 10 ++++- src/storage/storage_backend_gluster.c | 1 + src/util/virstoragefile.c | 3 +- src/util/virstoragefile.h | 1 + .../disk-drive-network-iser-auth.args | 25 ++++++++++++ .../disk-drive-network-iser-auth.xml | 44 ++++++++++++++++++++ .../qemuargv2xmldata/disk-drive-network-iser.args | 25 ++++++++++++ tests/qemuargv2xmldata/disk-drive-network-iser.xml | 41 +++++++++++++++++++ tests/qemuargv2xmltest.c | 2 + ...-drive-network-iser-auth-secrettype-invalid.xml | 33 +++++++++++++++ ...sk-drive-network-iser-auth-wrong-secrettype.xml | 33 +++++++++++++++ .../disk-drive-network-iser-auth.args | 31 ++++++++++++++ .../disk-drive-network-iser-auth.xml | 43 ++++++++++++++++++++ .../disk-drive-network-iser-lun.args | 27 +++++++++++++ .../disk-drive-network-iser-lun.xml | 28 +++++++++++++ .../qemuxml2argvdata/disk-drive-network-iser.args | 29 +++++++++++++ tests/qemuxml2argvdata/disk-drive-network-iser.xml | 37 +++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../disk-drive-network-iser-auth.xml | 47 ++++++++++++++++++++++ .../qemuxml2xmloutdata/disk-drive-network-iser.xml | 41 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 25 files changed, 562 insertions(+), 4 deletions(-) create mode 100644 tests/qemuargv2xmldata/disk-drive-network-iser-auth.args create mode 100644 tests/qemuargv2xmldata/disk-drive-network-iser-auth.xml create mode 100644 tests/qemuargv2xmldata/disk-drive-network-iser.args create mode 100644 tests/qemuargv2xmldata/disk-drive-network-iser.xml create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser-auth-secrettype-invalid.xml create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser-auth-wrong-secrettype.xml create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser-auth.args create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser-auth.xml create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser-lun.args create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser-lun.xml create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser.args create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser.xml create mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-iser-auth.xml create mode 100644 tests/qemuxml2xmloutdata/disk-drive-network-iser.xml diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f22c932f6..819a8791d 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1534,6 +1534,7 @@ <choice> <value>tcp</value> <value>rdma</value> + <value>iser</value> </choice> </attribute> </optional> @@ -1613,6 +1614,15 @@ <optional> <ref name="encryption"/> </optional> + <optional> + <attribute name="transport"> + <choice> + <value>tcp</value> + <value>rdma</value> + <value>iser</value> + </choice> + </attribute> + </optional> </element> </define> @@ -4386,6 +4396,15 @@ <attribute name="name"> <text/> </attribute> + <optional> + <attribute name="transport"> + <choice> + <value>tcp</value> + <value>rdma</value> + <value>iser</value> + </choice> + </attribute> + </optional> <interleave> <oneOrMore> <element name='host'> @@ -4397,6 +4416,15 @@ <ref name="PortNumber"/> </attribute> </optional> + <optional> + <attribute name="transport"> + <choice> + <value>tcp</value> + <value>rdma</value> + <value>iser</value> + </choice> + </attribute> + </optional> <empty/> </element> </oneOrMore> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9a62bc472..4c71855b4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7080,6 +7080,7 @@ virDomainStorageNetworkParseHosts(xmlNodePtr node, virStorageNetHostDefPtr *hosts, size_t *nhosts) { + char *transport = NULL; xmlNodePtr child; for (child = node->children; child; child = child->next) { @@ -7091,6 +7092,9 @@ virDomainStorageNetworkParseHosts(xmlNodePtr node, } } + if ((*hosts) && (transport = virXMLPropString(node, "transport"))) + (*hosts)->transport = virStorageNetHostTransportTypeFromString(transport); + return 0; } @@ -8495,6 +8499,7 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, if (virDomainStorageNetworkParseHosts(node, &src->hosts, &src->nhosts) < 0) goto cleanup; + virStorageSourceNetworkAssignDefaultPorts(src); ret = 0; @@ -22364,6 +22369,9 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf, VIR_FREE(path); + if (src->hosts && src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_ISER) + virBufferEscapeString(attrBuf, " transport='%s'", "iser"); + if (src->haveTLS != VIR_TRISTATE_BOOL_ABSENT && !(flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE && src->tlsFromConfig)) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 585f0255e..49837205f 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -433,6 +433,12 @@ qemuBlockStorageSourceGetURI(virStorageSourcePtr src) if (VIR_STRDUP(uri->scheme, virStorageNetProtocolTypeToString(src->protocol)) < 0) goto cleanup; + } else if (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_ISER) { + uri->port = src->hosts->port; + + if (VIR_STRDUP(uri->scheme, + virStorageNetHostTransportTypeToString(src->hosts->transport)) < 0) + goto cleanup; } else { if (virAsprintf(&uri->scheme, "%s+%s", virStorageNetProtocolTypeToString(src->protocol), @@ -506,6 +512,19 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDefPtr host, goto cleanup; break; + case VIR_STORAGE_NET_HOST_TRANS_ISER: + transport = "iser"; + if (virAsprintf(&port, "%u", host->port) < 0) + goto cleanup; + + if (virJSONValueObjectCreate(&server, + "s:type", transport, + "s:host", host->name, + "s:port", port, + NULL) < 0) + goto cleanup; + break; + case VIR_STORAGE_NET_HOST_TRANS_UNIX: if (virJSONValueObjectCreate(&server, "s:type", "unix", @@ -590,7 +609,8 @@ qemuBlockStorageSourceBuildJSONInetSocketAddress(virStorageNetHostDefPtr host) virJSONValuePtr ret = NULL; char *port = NULL; - if (host->transport != VIR_STORAGE_NET_HOST_TRANS_TCP) { + if (host->transport != VIR_STORAGE_NET_HOST_TRANS_TCP && + host->transport != VIR_STORAGE_NET_HOST_TRANS_ISER) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("only TCP protocol can be converted to InetSocketAddress")); return NULL; @@ -831,7 +851,7 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourcePtr src) "s:portal", portal, "s:target", target, "u:lun", lun, - "s:transport", "tcp", + "s:transport", virStorageNetHostTransportTypeToString(src->hosts->transport), "S:user", username, "S:password-secret", objalias, NULL)); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4d0c141e5..eb482097f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -883,6 +883,8 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, if (!((src->hosts->name && strchr(src->hosts->name, ':')) || (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_TCP && !src->hosts->name) || + (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_ISER && + !src->hosts->name) || (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_UNIX && src->hosts->socket && src->hosts->socket[0] != '/'))) { @@ -891,6 +893,7 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, switch (src->hosts->transport) { case VIR_STORAGE_NET_HOST_TRANS_TCP: + case VIR_STORAGE_NET_HOST_TRANS_ISER: virBufferAsprintf(&buf, "%s:%u", src->hosts->name, src->hosts->port); break; diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 5fe3f97d0..d376af208 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -70,7 +70,9 @@ qemuParseDriveURIString(virDomainDiskDefPtr def, virURIPtr uri, if (transp) *transp++ = 0; - if (STRNEQ(uri->scheme, scheme)) { + if (STREQ(uri->scheme, "iser")) { + transp = (char *)"iser"; + } else if (STRNEQ(uri->scheme, scheme)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid transport/scheme '%s'"), uri->scheme); goto error; @@ -709,6 +711,12 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, if (qemuParseISCSIString(def) < 0) goto error; + } else if (STRPREFIX(def->src->path, "iser:")) { + def->src->type = VIR_STORAGE_TYPE_NETWORK; + def->src->protocol = VIR_STORAGE_NET_PROTOCOL_ISCSI; + + if (qemuParseISCSIString(def) < 0) + goto error; } else if (STRPREFIX(def->src->path, "sheepdog:")) { char *p = def->src->path; char *port, *vdi; diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index 5eea84f16..1452fa0cd 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -608,6 +608,7 @@ virStorageFileBackendGlusterInitServer(virStorageFileBackendGlusterPrivPtr priv, hoststr = host->socket; break; + case VIR_STORAGE_NET_HOST_TRANS_ISER: case VIR_STORAGE_NET_HOST_TRANS_LAST: break; } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 5780180a9..63253a9c4 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -92,7 +92,8 @@ VIR_ENUM_IMPL(virStorageNetProtocol, VIR_STORAGE_NET_PROTOCOL_LAST, VIR_ENUM_IMPL(virStorageNetHostTransport, VIR_STORAGE_NET_HOST_TRANS_LAST, "tcp", "unix", - "rdma") + "rdma", + "iser") VIR_ENUM_IMPL(virStorageSourcePoolMode, VIR_STORAGE_SOURCE_POOL_MODE_LAST, diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index ecd806c93..5a6ec7776 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -147,6 +147,7 @@ typedef enum { VIR_STORAGE_NET_HOST_TRANS_TCP, VIR_STORAGE_NET_HOST_TRANS_UNIX, VIR_STORAGE_NET_HOST_TRANS_RDMA, + VIR_STORAGE_NET_HOST_TRANS_ISER, VIR_STORAGE_NET_HOST_TRANS_LAST } virStorageNetHostTransport; diff --git a/tests/qemuargv2xmldata/disk-drive-network-iser-auth.args b/tests/qemuargv2xmldata/disk-drive-network-iser-auth.args new file mode 100644 index 000000000..aaf10d8c8 --- /dev/null +++ b/tests/qemuargv2xmldata/disk-drive-network-iser-auth.args @@ -0,0 +1,25 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=iser://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ +6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=virtio \ +-drive file=iser://example.org:6000/iqn.1992-01.com.example%3Astorage/2,\ +format=raw,if=virtio \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-network-iser-auth.xml b/tests/qemuargv2xmldata/disk-drive-network-iser-auth.xml new file mode 100644 index 000000000..7226443fb --- /dev/null +++ b/tests/qemuargv2xmldata/disk-drive-network-iser-auth.xml @@ -0,0 +1,44 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='iscsi' usage='qemuargv2xml_usage'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vdb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuargv2xmldata/disk-drive-network-iser.args b/tests/qemuargv2xmldata/disk-drive-network-iser.args new file mode 100644 index 000000000..c476e759e --- /dev/null +++ b/tests/qemuargv2xmldata/disk-drive-network-iser.args @@ -0,0 +1,25 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=iser://example.org:6000/iqn.1992-01.com.example,format=raw,\ +if=virtio \ +-drive file=iser://example.org:6000/iqn.1992-01.com.example/1,format=raw,\ +if=virtio \ +-net none \ +-serial none \ +-parallel none diff --git a/tests/qemuargv2xmldata/disk-drive-network-iser.xml b/tests/qemuargv2xmldata/disk-drive-network-iser.xml new file mode 100644 index 000000000..88f043f66 --- /dev/null +++ b/tests/qemuargv2xmldata/disk-drive-network-iser.xml @@ -0,0 +1,41 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/0' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vdb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index cb010268c..59b26c647 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -213,6 +213,8 @@ mymain(void) DO_TEST("disk-drive-network-nbd-unix"); DO_TEST("disk-drive-network-iscsi"); DO_TEST("disk-drive-network-iscsi-auth"); + DO_TEST("disk-drive-network-iser"); + DO_TEST("disk-drive-network-iser-auth"); DO_TEST("disk-drive-network-gluster"); DO_TEST("disk-drive-network-rbd"); DO_TEST("disk-drive-network-rbd-auth"); diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser-auth-secrettype-invalid.xml b/tests/qemuxml2argvdata/disk-drive-network-iser-auth-secrettype-invalid.xml new file mode 100644 index 000000000..dbcf484dc --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser-auth-secrettype-invalid.xml @@ -0,0 +1,33 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser-auth-wrong-secrettype.xml b/tests/qemuxml2argvdata/disk-drive-network-iser-auth-wrong-secrettype.xml new file mode 100644 index 000000000..5525e9d86 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser-auth-wrong-secrettype.xml @@ -0,0 +1,33 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='ceph' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser-auth.args b/tests/qemuxml2argvdata/disk-drive-network-iser-auth.args new file mode 100644 index 000000000..5fa7a04bb --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser-auth.args @@ -0,0 +1,31 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=iser://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ +6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=none,\ +id=drive-virtio-disk0 \ +-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ +id=virtio-disk0 \ +-drive file=iser://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ +6000/iqn.1992-01.com.example%3Astorage/2,format=raw,if=none,\ +id=drive-virtio-disk1 \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ +id=virtio-disk1 diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser-auth.xml b/tests/qemuxml2argvdata/disk-drive-network-iser-auth.xml new file mode 100644 index 000000000..fbcb6b4f1 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser-auth.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vdb' bus='virtio'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser-lun.args b/tests/qemuxml2argvdata/disk-drive-network-iser-lun.args new file mode 100644 index 000000000..d9428533b --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser-lun.args @@ -0,0 +1,27 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ +-usb \ +-drive file=iser://example.org:3260/iqn.1992-01.com.example/0,format=raw,\ +if=none,id=drive-scsi0-0-0-0 \ +-device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ +drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser-lun.xml b/tests/qemuxml2argvdata/disk-drive-network-iser-lun.xml new file mode 100644 index 000000000..25fa76140 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser-lun.xml @@ -0,0 +1,28 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='lun'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example' transport='iser'> + <host name='example.org' port='3260' transport='iser'/> + </source> + <target dev='sda' bus='scsi'/> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser.args b/tests/qemuxml2argvdata/disk-drive-network-iser.args new file mode 100644 index 000000000..49ea467ff --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser.args @@ -0,0 +1,29 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=iser://example.org:6000/iqn.1992-01.com.example/0,format=raw,\ +if=none,id=drive-virtio-disk0 \ +-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ +id=virtio-disk0 \ +-drive file=iser://example.org:6000/iqn.1992-01.com.example/1,format=raw,\ +if=none,id=drive-virtio-disk1 \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ +id=virtio-disk1 diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser.xml b/tests/qemuxml2argvdata/disk-drive-network-iser.xml new file mode 100644 index 000000000..b1634555c --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser.xml @@ -0,0 +1,37 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example' transport='iser'> + <host name='example.org' port='6000'/> + </source> + <target dev='vda' bus='virtio'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/1' transport='iser'> + <host name='example.org' port='6000'/> + </source> + <target dev='vdb' bus='virtio'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ca24e0bbb..accfdaf4b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -936,6 +936,7 @@ mymain(void) DO_TEST("disk-drive-network-iscsi-lun", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_BLOCK); + DO_TEST("disk-drive-network-iser", NONE); DO_TEST("disk-drive-network-gluster", QEMU_CAPS_GLUSTER_DEBUG_LEVEL); DO_TEST("disk-drive-network-rbd", NONE); diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-iser-auth.xml b/tests/qemuxml2xmloutdata/disk-drive-network-iser-auth.xml new file mode 100644 index 000000000..1b27fdea2 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-drive-network-iser-auth.xml @@ -0,0 +1,47 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vdb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/disk-drive-network-iser.xml b/tests/qemuxml2xmloutdata/disk-drive-network-iser.xml new file mode 100644 index 000000000..88f043f66 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-drive-network-iser.xml @@ -0,0 +1,41 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/0' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/1' transport='iser'> + <host name='example.org' port='6000' transport='iser'/> + </source> + <target dev='vdb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2be8eb2c1..23f9292c4 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -515,6 +515,7 @@ mymain(void) DO_TEST("disk-drive-network-nbd-unix", NONE); DO_TEST("disk-drive-network-iscsi", NONE); DO_TEST("disk-drive-network-iscsi-auth", NONE); + DO_TEST("disk-drive-network-iser", NONE); DO_TEST("disk-drive-network-gluster", NONE); DO_TEST("disk-drive-network-rbd", NONE); DO_TEST("disk-drive-network-rbd-auth", NONE); -- 2.13.6 (Apple Git-96)

1 0

[libvirt] [BUG] We can hot plug more than one vhost-user nics with the same chardev backend
by linzhecheng 22 Dec '17

22 Dec '17

We use virsh attach-device to hot-plug vhost-user nic with the following xml: <interface type='vhostuser'> <mac address='52:54:01:3b:83:a5'/> <source type='unix' path='/var/run/vhost-user/port1' mode='client'/> <target dev='port1'/> <model type='virtio'/> <driver queues='4'/> </interface> We can successfully hot plug more than one vhost-user nics with the same unix path ('/var/run/vhost-user/port1') which is a chardev backend. However, only one nic attached can work, because the unix path can only pair with one front-end of nic. So should we do something to forbid this operation?

1 0

[libvirt] [PATCH] qemu: Introduce qemuDomainDelChardevTLSObjects
by John Ferlan 21 Dec '17

21 Dec '17

Let's make a comment deletion helper similar to the Add helper that can be called after the ExitMonitor. The modify qemuDomainRemoveChrDevice and qemuDomainRemoveRNGDevice to call the helper instead of inlining the copy and pasted code. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- An offshoot of the redirdev hot unplug patches from Chen Hanxiao. Let's create a helper that can remove the TLS chardev objects for the specific devices that may have used them. src/qemu/qemu_hotplug.c | 107 +++++++++++++++++++++++------------------------- 1 file changed, 52 insertions(+), 55 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7de04c85a..85f47bee2 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1562,6 +1562,47 @@ qemuDomainAddChardevTLSObjects(virConnectPtr conn, } +static int +qemuDomainDelChardevTLSObjects(virQEMUDriverPtr driver, + virDomainObjPtr vm, + const char *inAlias) +{ + int ret = -1; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + qemuDomainObjPrivatePtr priv = vm->privateData; + char *tlsAlias = NULL; + char *secAlias = NULL; + + if (!(tlsAlias = qemuAliasTLSObjFromSrcAlias(inAlias))) + goto cleanup; + + /* Best shot at this as the secinfo is destroyed after process launch + * and this path does not recreate it. Thus, if the config has the + * secret UUID and we have a serial TCP chardev, then formulate a + * secAlias which we'll attempt to destroy. */ + if (cfg->chardevTLSx509secretUUID && + !(secAlias = qemuDomainGetSecretAESAlias(inAlias, false))) + goto cleanup; + + qemuDomainObjEnterMonitor(driver, vm); + + ignore_value(qemuMonitorDelObject(priv->mon, tlsAlias)); + if (secAlias) + ignore_value(qemuMonitorDelObject(priv->mon, secAlias)); + + if (qemuDomainObjExitMonitor(driver, vm) < 0) + goto cleanup; + + ret = 0; + + cleanup: + VIR_FREE(tlsAlias); + VIR_FREE(secAlias); + virObjectUnref(cfg); + return ret; +} + + int qemuDomainAttachRedirdevDevice(virConnectPtr conn, virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -4120,10 +4161,7 @@ qemuDomainRemoveChrDevice(virQEMUDriverPtr driver, virDomainChrDefPtr chr) { virObjectEventPtr event; - virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); char *charAlias = NULL; - char *tlsAlias = NULL; - char *secAlias = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; int ret = -1; int rc; @@ -4134,34 +4172,18 @@ qemuDomainRemoveChrDevice(virQEMUDriverPtr driver, if (!(charAlias = qemuAliasChardevFromDevAlias(chr->info.alias))) goto cleanup; - if (chr->source->type == VIR_DOMAIN_CHR_TYPE_TCP && - chr->source->data.tcp.haveTLS == VIR_TRISTATE_BOOL_YES) { - - if (!(tlsAlias = qemuAliasTLSObjFromSrcAlias(charAlias))) - goto cleanup; - - /* Best shot at this as the secinfo is destroyed after process launch - * and this path does not recreate it. Thus, if the config has the - * secret UUID and we have a serial TCP chardev, then formulate a - * secAlias which we'll attempt to destroy. */ - if (cfg->chardevTLSx509secretUUID && - !(secAlias = qemuDomainGetSecretAESAlias(charAlias, false))) - goto cleanup; - } - qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorDetachCharDev(priv->mon, charAlias); - if (rc == 0) { - if (tlsAlias) - ignore_value(qemuMonitorDelObject(priv->mon, tlsAlias)); - if (secAlias) - ignore_value(qemuMonitorDelObject(priv->mon, secAlias)); - } - if (qemuDomainObjExitMonitor(driver, vm) < 0) goto cleanup; + if (chr->source->type == VIR_DOMAIN_CHR_TYPE_TCP && + chr->source->data.tcp.haveTLS == VIR_TRISTATE_BOOL_YES && + rc == 0 && + qemuDomainDelChardevTLSObjects(driver, vm, charAlias) < 0) + goto cleanup; + virDomainAuditChardev(vm, chr, NULL, "detach", rc == 0); if (rc < 0) @@ -4185,9 +4207,6 @@ qemuDomainRemoveChrDevice(virQEMUDriverPtr driver, cleanup: VIR_FREE(charAlias); - VIR_FREE(tlsAlias); - VIR_FREE(secAlias); - virObjectUnref(cfg); return ret; } @@ -4198,11 +4217,8 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, virDomainRNGDefPtr rng) { virObjectEventPtr event; - virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); char *charAlias = NULL; char *objAlias = NULL; - char *tlsAlias = NULL; - char *secAlias = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; ssize_t idx; int ret = -1; @@ -4218,34 +4234,18 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, if (!(charAlias = qemuAliasChardevFromDevAlias(rng->info.alias))) goto cleanup; - if (rng->backend == VIR_DOMAIN_RNG_BACKEND_EGD) { - if (!(tlsAlias = qemuAliasTLSObjFromSrcAlias(charAlias))) - goto cleanup; - - /* Best shot at this as the secinfo is destroyed after process launch - * and this path does not recreate it. Thus, if the config has the - * secret UUID and we have a serial TCP chardev, then formulate a - * secAlias which we'll attempt to destroy. */ - if (cfg->chardevTLSx509secretUUID && - !(secAlias = qemuDomainGetSecretAESAlias(charAlias, false))) - goto cleanup; - } - qemuDomainObjEnterMonitor(driver, vm); rc = qemuMonitorDelObject(priv->mon, objAlias); - if (rc == 0 && rng->backend == VIR_DOMAIN_RNG_BACKEND_EGD) { - ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias)); - if (tlsAlias) - ignore_value(qemuMonitorDelObject(priv->mon, tlsAlias)); - if (secAlias) - ignore_value(qemuMonitorDelObject(priv->mon, secAlias)); - } - if (qemuDomainObjExitMonitor(driver, vm) < 0) goto cleanup; + if (rng->backend == VIR_DOMAIN_RNG_BACKEND_EGD && + rc == 0 && + qemuDomainDelChardevTLSObjects(driver, vm, charAlias) < 0) + goto cleanup; + virDomainAuditRNG(vm, rng, NULL, "detach", rc == 0); if (rc < 0) @@ -4269,9 +4269,6 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, cleanup: VIR_FREE(charAlias); VIR_FREE(objAlias); - VIR_FREE(tlsAlias); - VIR_FREE(secAlias); - virObjectUnref(cfg); return ret; } -- 2.13.6

2 3

[libvirt] Executing gdb/gcore as an on_crash action
by Sergio Lopez 21 Dec '17

21 Dec '17

Hi, Right now, the actions coredump-[destroy|restart] for on_crash work in a similar way as "virsh dump", requesting a dump of Guest's memory contents to QEMU. I think it'd be nice to have the ability for executing gdb/gcore to produce a full core dump of QEMU. This would be especially useful for debugging hard/soft lockups on the Guest. Of course, this should be implemented in a completely optional way, checking if the gdb binary is present, to avoid creating a direct dependency between libvirt and gdb. I'm willing to work on a patch implementing this feature myself, but first I'd like to know if this sounds good to you. Also, if it does, do you think the behavior of coredump-[destroy|restart] should be changed to use gdb if available, falling back to qemuDomainCoreDump if it isn't, or just implement another action for on_crash? -- Sergio

2 2

[libvirt] [PATCH 00/14] Fix race on srv->nclients_unauth and some other changes
by Marc Hartmayer 21 Dec '17

21 Dec '17

This patch series fixes some locking issues, memory leaks, some other cosmetic changes, and it fixes a bug that led to a libvirtd which doesn't accept new connections. Marc Hartmayer (14): rpc: Remove duplicate declaration of virNetServerAddClient rpc: Fix memory leaks @virnetserverclient rpc: Use the enum value instead of a numerical value rpc: Add typedef for the anonymous enum used for authentication methods rpc: Be more precise in which cases the authentication is needed rpc: First test if authentication is required rpc: Correct locking and simplify the function rpc: Refactor the condition whether a client needs authentication rpc: Merge critical sections and preparations for upcoming patches rpc: Introduce virNetServerSetClientAuthenticated rpc: virnetserver: Fix race on srv->nclients_unauth tests: virnetdaemontest: Enable testing for 'auth_pending' rpc: Remove virNetServerClientNeedAuthLocked rpc: Replace virNetServerClientNeedAuth with virNetServerClientIsAuthenticated daemon/remote.c | 13 +-- src/libvirt_remote.syms | 14 +-- src/rpc/virnetserver.c | 82 ++++++++++----- src/rpc/virnetserver.h | 6 +- src/rpc/virnetserverclient.c | 113 ++++++++++++++++----- src/rpc/virnetserverclient.h | 11 +- src/rpc/virnetserverprogram.c | 9 +- src/rpc/virnetserverservice.h | 4 +- .../input-data-client-auth-pending-failure.json | 44 ++++++++ .../input-data-client-auth-pending.json | 70 +++++++++++++ .../virnetdaemondata/output-data-admin-nomdns.json | 4 + .../output-data-admin-server-names.json | 4 + .../virnetdaemondata/output-data-anon-clients.json | 2 + ...s.json => output-data-client-auth-pending.json} | 4 +- tests/virnetdaemondata/output-data-client-ids.json | 2 + .../output-data-client-timestamp.json | 2 + .../output-data-initial-nomdns.json | 2 + tests/virnetdaemondata/output-data-initial.json | 2 + .../output-data-no-keepalive-required.json | 4 + tests/virnetdaemontest.c | 2 + 20 files changed, 310 insertions(+), 84 deletions(-) create mode 100644 tests/virnetdaemondata/input-data-client-auth-pending-failure.json create mode 100644 tests/virnetdaemondata/input-data-client-auth-pending.json copy tests/virnetdaemondata/{output-data-client-ids.json => output-data-client-auth-pending.json} (94%) -- 2.13.4

3 41

[libvirt] [PATCH] virt-aa-helper: handle more disk images
by Cédric Bosdonnat 21 Dec '17

21 Dec '17

virt-aa-helper needs read access to the disk image to resolve symlinks and add the proper rules to the profile. Its profile whitelists a few common paths, but users can place their images anywhere. This commit helps users allowing access to their images by adding their own rules in apparmor.d/local/usr.lib.libvirt.virt-aa-helper. This commit also adds rules to allow reading files named: - *.raw as this is a rather common disk image extension - /run/libvirt/**[vd]d[a-z] as these are used by virt-sandbox --- examples/Makefile.am | 24 ++++++++++++++++++++++-- examples/apparmor/usr.lib.libvirt.virt-aa-helper | 4 ++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index ef2f79db3..8a1d6919a 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -67,6 +67,9 @@ admin_client_info_SOURCES = admin/client_info.c admin_client_close_SOURCES = admin/client_close.c admin_logging_SOURCES = admin/logging.c +INSTALL_DATA_LOCAL = +UNINSTALL_LOCAL = + if WITH_APPARMOR_PROFILES apparmordir = $(sysconfdir)/apparmor.d/ apparmor_DATA = \ @@ -85,20 +88,37 @@ templates_DATA = \ apparmor/TEMPLATE.qemu \ apparmor/TEMPLATE.lxc \ $(NULL) + +APPARMOR_LOCAL_DIR = "$(DESTDIR)$(apparmordir)/local" +install-apparmor-local: + $(MKDIR_P) "$(APPARMOR_LOCAL_DIR)" + echo "# Site-specific additions and overrides for \ + 'usr.lib.libvirt.virt-aa-helper'" \ + >$(APPARMOR_LOCAL_DIR)/usr.lib.libvirt.virt-aa-helper + +INSTALL_DATA_LOCAL += install-apparmor-local +UNINSTALL_LOCAL += uninstall-apparmor-local endif WITH_APPARMOR_PROFILES if WITH_NWFILTER NWFILTER_DIR = "$(DESTDIR)$(sysconfdir)/libvirt/nwfilter" -install-data-local: +install-nwfilter-local: $(MKDIR_P) "$(NWFILTER_DIR)" for f in $(FILTERS); do \ $(INSTALL_DATA) $$f "$(NWFILTER_DIR)"; \ done -uninstall-local:: +uninstall-nwfilter-local:: for f in $(FILTERS); do \ rm -f "$(NWFILTER_DIR)/`basename $$f`"; \ done -test -z "$(shell ls $(NWFILTER_DIR))" || rmdir $(NWFILTER_DIR) + +INSTALL_DATA_LOCAL += install-nwfilter-local +UNINSTALL_LOCAL += uninstall-nwfilter-local endif WITH_NWFILTER + +install-data-local: $(INSTALL_DATA_LOCAL) + +uninstall-local: $(UNINSTALL_LOCAL) diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper index bd6181d00..f3069d369 100644 --- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper +++ b/examples/apparmor/usr.lib.libvirt.virt-aa-helper @@ -3,6 +3,7 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper { #include <abstractions/base> + #include <local/usr.lib.libvirt.virt-aa-helper> # needed for searching directories capability dac_override, @@ -50,8 +51,11 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper { /var/lib/libvirt/images/ r, /var/lib/libvirt/images/** r, /{media,mnt,opt,srv}/** r, + # For virt-sandbox + /run/libvirt/**/[sv]d[a-z] r /**.img r, + /**.raw r, /**.qcow{,2} r, /**.qed r, /**.vmdk r, -- 2.15.1

5 9

[libvirt] [PATCH] netserver: close clients before stopping all drivers
by Cédric Bosdonnat 21 Dec '17

21 Dec '17

So far clients were closed when disposing the daemon, after the state driver cleanup. This was leading to libvirtd crashing at shutdown due to missing driver. Moving the client close in virNetServerClose() fixes the problem. --- src/rpc/virnetserver.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 2b76daab5..43f889e2a 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -774,10 +774,8 @@ void virNetServerDispose(void *obj) virObjectUnref(srv->programs[i]); VIR_FREE(srv->programs); - for (i = 0; i < srv->nclients; i++) { - virNetServerClientClose(srv->clients[i]); + for (i = 0; i < srv->nclients; i++) virObjectUnref(srv->clients[i]); - } VIR_FREE(srv->clients); VIR_FREE(srv->mdnsGroupName); @@ -796,6 +794,9 @@ void virNetServerClose(virNetServerPtr srv) for (i = 0; i < srv->nservices; i++) virNetServerServiceClose(srv->services[i]); + for (i = 0; i < srv->nclients; i++) + virNetServerClientClose(srv->clients[i]); + virObjectUnlock(srv); } -- 2.15.1

2 1

[libvirt] [PATCH] qemu: hotplug: unify "not found" logs when detaching device
by Chen Hanxiao 20 Dec '17

20 Dec '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Some services, such as Nova, check whether device was not found by errror messages "not found". [1] This patch unify logs of qemuDomainDetachDeviceLive, which will be helpful. [1] https://github.com/openstack/nova/blob/master/nova/virt/libvirt/guest.py#L4… Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/qemu/qemu_hotplug.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index d97aa6051..925574b92 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5093,7 +5093,7 @@ qemuDomainDetachShmemDevice(virQEMUDriverPtr driver, if ((idx = virDomainShmemDefFind(vm->def, dev)) < 0) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("device not present in domain configuration")); + _("device not found in domain configuration")); return -1; } @@ -5150,7 +5150,7 @@ qemuDomainDetachWatchdog(virQEMUDriverPtr driver, watchdog->action == dev->action && virDomainDeviceInfoAddressIsEqual(&dev->info, &watchdog->info))) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("watchdog device not present in domain configuration")); + _("watchdog device not found in domain configuration")); return -1; } @@ -5233,8 +5233,11 @@ qemuDomainDetachNetDevice(virQEMUDriverPtr driver, virDomainNetDefPtr detach = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; - if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net)) < 0) + if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net)) < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("netdev %s not found"), dev->data.net->mac.addr); goto cleanup; + } detach = vm->def->nets[detachidx]; @@ -5420,8 +5423,9 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver, char *devstr = NULL; if (!(tmpChr = virDomainChrFind(vmdef, chr))) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("device not present in domain configuration")); + virReportError(VIR_ERR_OPERATION_INVALID, + _("device %s not found in domain configuration"), + chr->target.name); goto cleanup; } @@ -5468,7 +5472,7 @@ qemuDomainDetachRNGDevice(virQEMUDriverPtr driver, if ((idx = virDomainRNGFind(vm->def, rng)) < 0) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("device not present in domain configuration")); + _("device not found in domain configuration")); return -1; } @@ -5511,7 +5515,7 @@ qemuDomainDetachMemoryDevice(virQEMUDriverPtr driver, if ((idx = virDomainMemoryFindByDef(vm->def, memdef)) < 0) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("device not present in domain configuration")); + _("device not found in domain configuration")); return -1; } -- 2.14.3

2 4

[libvirt] [PATCH 0/2] Forbid memoryBacking/access for non-numa case
by Michal Privoznik 20 Dec '17

20 Dec '17

*** BLURB HERE *** Michal Privoznik (2): src: Export virDomainMemoryAccessType*String qemuBuildMemPathStr: Forbid memoryBacking/access for non-numa case src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 9 +++ tests/qemuxml2argvdata/hugepages-memaccess3.xml | 87 +++++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 + 4 files changed, 101 insertions(+) create mode 100644 tests/qemuxml2argvdata/hugepages-memaccess3.xml -- 2.13.6

3 7

[libvirt] RFC: Introduce a dlm-corosync for Lock manager plugin
by Fu.Lin 20 Dec '17

20 Dec '17

Hi, Currently the lock manager infrastructure has implementation of nop, sanlock and lockd. The first do nothing, while sanlock and lockd all requires the share stroage, and lockd is not provided fence mechanism, sanlock would force to restart OS when stopping daemon. The first half of 2017, QEMU introduced the `share-rw` and `file.locking` to handle a problem: https://bugzilla.redhat.com/show_bug.cgi?id=1080152 , someone said: There is also scope for creating new plugins for libvirt to use other mechanism if someone comes up with other ideas. So what about dlm-corosync? DLM(distributed lock manage) is implemented by kernel, it provides some userspace API by "libdlm" to lock/unlock resource, using these API need a daemon named dlm_controld. "Corosync" is cluster messager layer using TCP or UDP, responsible for members management in cluster. dlm_controld and corosync are formed a kind of lock which could be used in cluster. And there is another component named "sbd" providing fence mechanism, it's not necessary, `dlm_controld -f 0` would disable it. As for implement, I think we could make use of virtlockd daemon, just add some RPC callback in micro-on. -- Regards River

2 1

[libvirt] [PATCH] treat host models as case-insensitive strings
by Scott Garfinkle 20 Dec '17

20 Dec '17

Qemu now allows case-insensitive specification of CPU models. This fixes the resulting problems on POWER arch machines. I believe a similar change is needed in src/cpu/cpu_x86.c but I don't have a way to test this. Signed-off-by: Scott Garfinkle <scottgar(a)linux.vnet.ibm.com> --- src/conf/domain_capabilities.c | 2 +- src/cpu/cpu_ppc64.c | 16 ++++++++-------- src/internal.h | 1 + 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index e7323a8..f7d9be5 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -271,7 +271,7 @@ virDomainCapsCPUModelsGet(virDomainCapsCPUModelsPtr cpuModels, return NULL; for (i = 0; i < cpuModels->nmodels; i++) { - if (STREQ(cpuModels->models[i].name, name)) + if (STRCASEEQ(cpuModels->models[i].name, name)) return cpuModels->models + i; } diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index 76582d4..9f7e2bb 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -67,10 +67,10 @@ static int virCPUppc64ConvertLegacy(virCPUDefPtr cpu) { if (cpu->model && - (STREQ(cpu->model, "POWER7_v2.1") || - STREQ(cpu->model, "POWER7_v2.3") || - STREQ(cpu->model, "POWER7+_v2.1") || - STREQ(cpu->model, "POWER8_v1.0"))) { + (STRCASEEQ(cpu->model, "POWER7_v2.1") || + STRCASEEQ(cpu->model, "POWER7_v2.3") || + STRCASEEQ(cpu->model, "POWER7+_v2.1") || + STRCASEEQ(cpu->model, "POWER8_v1.0"))) { cpu->model[strlen("POWERx")] = 0; } @@ -93,7 +93,7 @@ ppc64CheckCompatibilityMode(const char *host_model, return VIR_CPU_COMPARE_IDENTICAL; /* Valid host CPUs: POWER6, POWER7, POWER8, POWER9 */ - if (!STRPREFIX(host_model, "POWER") || + if (!STRCASEPREFIX(host_model, "POWER") || !(tmp = (char *) host_model + strlen("POWER")) || virStrToLong_i(tmp, NULL, 10, &host) < 0 || host < 6 || host > 9) { @@ -104,7 +104,7 @@ ppc64CheckCompatibilityMode(const char *host_model, } /* Valid compatibility modes: power6, power7, power8, power9 */ - if (!STRPREFIX(compat_mode, "power") || + if (!STRCASEPREFIX(compat_mode, "power") || !(tmp = (char *) compat_mode + strlen("power")) || virStrToLong_i(tmp, NULL, 10, &compat) < 0 || compat < 6 || compat > 9) { @@ -168,7 +168,7 @@ ppc64VendorFind(const struct ppc64_map *map, size_t i; for (i = 0; i < map->nvendors; i++) { - if (STREQ(map->vendors[i]->name, name)) + if (STRCASEEQ(map->vendors[i]->name, name)) return map->vendors[i]; } @@ -216,7 +216,7 @@ ppc64ModelFind(const struct ppc64_map *map, size_t i; for (i = 0; i < map->nmodels; i++) { - if (STREQ(map->models[i]->name, name)) + if (STRCASEEQ(map->models[i]->name, name)) return map->models[i]; } diff --git a/src/internal.h b/src/internal.h index 5895030..1760e3b 100644 --- a/src/internal.h +++ b/src/internal.h @@ -75,6 +75,7 @@ # define STRNEQLEN(a, b, n) (strncmp(a, b, n) != 0) # define STRCASENEQLEN(a, b, n) (c_strncasecmp(a, b, n) != 0) # define STRPREFIX(a, b) (strncmp(a, b, strlen(b)) == 0) +# define STRCASEPREFIX(a, b) (c_strncasecmp(a, b, strlen(b)) == 0) # define STRSKIP(a, b) (STRPREFIX(a, b) ? (a) + strlen(b) : NULL) # define STREQ_NULLABLE(a, b) \ -- 1.8.3.1

3 3

[libvirt] [PATCH v2.1 0/2] Add support for hot unplug redirdev
by Chen Hanxiao 20 Dec '17

20 Dec '17

v2.1: split original patch into a patchset, put News in a seperate patch Chen Hanxiao (2): qemu: Add support for hot unplug redirdev device news: add change of hot unplug redirdev docs/news.xml | 9 ++++ src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_hotplug.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_hotplug.h | 3 ++ 4 files changed, 126 insertions(+), 1 deletion(-) -- 2.14.3

2 5

[libvirt] [PATCH] rpc: fix race sending and encoding sasl data
by Daniel P. Berrange 19 Dec '17

19 Dec '17

The virNetSocketWriteSASL method has to encode the buffer it is given and then write it to the underlying socket. This write is not guaranteed to send the full amount of data that was encoded by SASL. We cache the SASL encoded data so that on the next invokation of virNetSocketWriteSASL we carry on sending it. The subtle problem is that the 'len' value passed into virNetSocketWriteSASL on the 2nd call may be larger than the original value. So when we've completed sending the SASL encoded data we previously cached, we must return the original length we encoded, not the new length. This flaw means we could potentially have been discarded queued data without sending it. This would have exhibited itself as a libvirt client never receiving the reply to a method it invokes, async events silently going missing, or worse stream data silently getting dropped. For this to be a problem libvirtd would have to be queued data to send to the client, while at the same time the TCP socket send buffer is full (due to a very slow client). This is quite unlikely so if this bug was ever triggered by a real world user it would be almost impossible to reproduce or diagnose, if indeed it was ever noticed at all. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/rpc/virnetsocket.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 23089afef4..2d41a716ba 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -107,6 +107,7 @@ struct _virNetSocket { const char *saslEncoded; size_t saslEncodedLength; + size_t saslEncodedRawLength; size_t saslEncodedOffset; #endif #if WITH_SSH2 @@ -1927,6 +1928,7 @@ static ssize_t virNetSocketWriteSASL(virNetSocketPtr sock, const char *buf, size &sock->saslEncodedLength) < 0) return -1; + sock->saslEncodedRawLength = tosend; sock->saslEncodedOffset = 0; } @@ -1943,11 +1945,20 @@ static ssize_t virNetSocketWriteSASL(virNetSocketPtr sock, const char *buf, size /* Sent all encoded, so update raw buffer to indicate completion */ if (sock->saslEncodedOffset == sock->saslEncodedLength) { + ssize_t done = sock->saslEncodedRawLength; sock->saslEncoded = NULL; - sock->saslEncodedOffset = sock->saslEncodedLength = 0; - - /* Mark as complete, so caller detects completion */ - return tosend; + sock->saslEncodedOffset = sock->saslEncodedLength = sock->saslEncodedRawLength = 0; + + /* Mark as complete, so caller detects completion. + * + * Note that 'done' is possibly less than our current + * 'tosend' value, since if virNetSocketWriteWire + * only partially sent the data, we might have been + * called a 2nd time to write remaining cached + * encoded data. This means that the caller might + * also have further raw data pending that's included + * in 'tosend' */ + return done; } else { /* Still have stuff pending in saslEncoded buffer. * Pretend to caller that we didn't send any yet. -- 2.14.3

2 1

[libvirt] [PATCH] Let virt-manager 1.4.0+ work to access console of VM
by Bryan Quigley 19 Dec '17

19 Dec '17

Also see Ubuntu bug https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1668681 First reported https://askubuntu.com/questions/833964/virt-manager-cant-connect-to-graphic… --- examples/apparmor/libvirt-qemu | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu index a9020aa..19d99e5 100644 --- a/examples/apparmor/libvirt-qemu +++ b/examples/apparmor/libvirt-qemu @@ -151,3 +151,6 @@ /etc/udev/udev.conf r, /sys/bus/ r, /sys/class/ r, + + # allow connect with openGraphicsFD to work + unix (send, receive) type=stream peer=(label=/usr/sbin/libvirtd), -- 2.10.2

3 5

[libvirt] [PATCH v2 0/2] qemu: Enforce vCPU hotplug granularity constraints
by Andrea Bolognani 19 Dec '17

19 Dec '17

Changes from [v1]: * make qemuDomainDefGetVcpuHotplugGranularity() simpler by returning the result directy instead of requiring a return location; * fix inaccurate comments. [v1] https://www.redhat.com/archives/libvir-list/2017-December/msg00539.html Andrea Bolognani (2): qemu: Invert condition nesting in qemuDomainDefValidate() qemu: Enforce vCPU hotplug granularity constraints src/qemu/qemu_domain.c | 58 +++++++++++++++++++--- tests/qemuxml2argvdata/cpu-hotplug-granularity.xml | 18 +++++++ tests/qemuxml2argvtest.c | 3 ++ 3 files changed, 73 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/cpu-hotplug-granularity.xml -- 2.14.3

2 4

[libvirt] [PATCH 0/2] Two qemu config validation patches
by Laine Stump 19 Dec '17

19 Dec '17

The first is a bug fix to a recently pushed bugfix, the 2nd is just reorganizing working code. Laine Stump (2): qemu: assign correct type of PCI address for vhost-scsi when using pcie-root qemu: move qemuDomainDefValidateVideo into qemuDomainDeviceDefValidateVideo src/qemu/qemu_domain.c | 151 +++++++++------------ src/qemu/qemu_domain_address.c | 7 + .../hostdev-scsi-vhost-scsi-pcie.args | 25 ++++ .../hostdev-scsi-vhost-scsi-pcie.xml | 23 ++++ tests/qemuxml2argvtest.c | 7 + .../hostdev-scsi-vhost-scsi-pcie.xml | 40 ++++++ tests/qemuxml2xmltest.c | 7 + 7 files changed, 175 insertions(+), 85 deletions(-) create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args create mode 100644 tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml -- 2.13.6

2 4

[libvirt] libvirt wiki account request
by Ján Tomko 18 Dec '17

18 Dec '17

Hello. On 5th anniversary of commit 9d92bf1 I would like to request a libvirt wiki account. login: jtomko e-mail: jtomko(a)redhat.com password: hunter2 Thank you, Jan

3 2

[libvirt] Qemu capability probes lifecycle should be tied to libvirtd
by Christian Ehrhardt 18 Dec '17

18 Dec '17

Hi, on libvirt 3.10 I see a set of qemu processes used for capability probing [1] (in my case 8x x86_64 and 3xi386 which seems a lot, but ok). But when stopping the service those still stay around [2]. That is correct for guests that were started by libvirt as their lifecycle isn't tied to the libvirtd service. But those probes are IMHO tied to the service. At first this might seem non-relevant, but e.g. when users want to uninstall they might think on stopping their guests, but I'd assume no one will clean up the capability probes before the hard removal. But then on the removal scripts will run into issues e.g. failing to remove users as they are still in use by those qemu processes. Right now Distro's have to be aware to clean those up at least at times where packaging would expect them to be gone, but I wanted to ask if there would be a consensus that it would be "correct" to stop the processes on a libvirtd stop? [1]: http://paste.ubuntu.com/26208661/ [2]: http://paste.ubuntu.com/26208664/ P.S. I discussed this on IRC last Friday, but other than Michael confirming the current state there was no further traction on the discussion yet. -- Christian Ehrhardt Software Engineer, Ubuntu Server Canonical Ltd

2 2

[libvirt] virsh save/restore not working
by Christopher Pereira 18 Dec '17

18 Dec '17

Hi, We are unable to do a basic virsh save/restore operation on two different servers, using different libvirt versions. Error is: "Failed to restore domain (Start tag expected, '<' not found)" The XML inside the status file is valid. We filed a bug report with details here: https://bugzilla.redhat.com/show_bug.cgi?id=1525734 Any hint?

1 0

[libvirt] [PATCH] Improve filtering of Xen domain0 in libvirt-guests
by Jim Fehlig 18 Dec '17

18 Dec '17

The list_guests function in libvirt-guests uses 'grep -v' to filter Xen domain0 from a list of guests. If domain0 is the only item in the list, 'grep -v' returns 1, causing the 'stop' operation to fail when action is 'suspend'. Improve the filtering by using sed to remove domain0 from the list of guests. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Failure of the 'stop' operation was fixed in commit 69ed99c7 by marking domain0 as a persistent domain. That fixes cases where domain0 is the only domain in the list of persistent domains. But there may be cases where domain0 is the only domain in 'virsh list --uuid', and the code should be made more robust to handle those. tools/libvirt-guests.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index 791d9277b..8a158cca4 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -121,7 +121,7 @@ list_guests() { return 1 fi - echo "$list" | grep -v 00000000-0000-0000-0000-000000000000 + echo "$list" | sed "/00000000-0000-0000-0000-000000000000/d" } # guest_name URI UUID -- 2.15.1

2 1

[libvirt] RFC: auto port allocations
by Nikolay Shirokovskiy 18 Dec '17

18 Dec '17

There is a problem with current port allocations in libvirt. 1. With default qemu driver conf values remote_display_port_min = 5900 and remote_websocket_port_min = 5700 one can not start more than 200 domains each of one have vnc graphics with auto allocated socket and websocket. For the 200th domain driver allocate 6100 port for both socket and websocket and qemu fail to start. 2. Different hypervisor drivers use port pools with same borders (libxl and qemu migration ports, hardcoded libxl vnc sockets and default conf qemu vnc sockets for example. However I'm not sure it is possible/practical to use these drivers simultaneously on same host). As a result there can be failures due to races when first driver check for bind successfully then second driver check for bind successfully and then both pass same port value to hypervisors. Suggestion is to make port bitmap driver/daemon global and leave only borders in port pool object. This was we can solve the first and the both issues correspondingly. Nikolay

2 1

[libvirt] [perl] Fix check of return value from virStreamRecv*
by Jim Fehlig 18 Dec '17

18 Dec '17

Commit 049baec5 introduced a small bug in the logic checking return value of virStreamRecv*. Change the logic to only croak when return value is < 0 and not equal to -2 or -3. --- Changes | 2 +- Virt.xs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changes b/Changes index 3763b1d..96b42f8 100644 --- a/Changes +++ b/Changes @@ -2,7 +2,7 @@ Revision history for perl module Sys::Virt 4.0.0 2018-00-00 - - XXX + - Fix check of return value from virStreamRecv* 3.9.1 2017-12-05 diff --git a/Virt.xs b/Virt.xs index 415eb8a..c47b915 100644 --- a/Virt.xs +++ b/Virt.xs @@ -8074,7 +8074,7 @@ recv(st, data, nbytes, flags=0) else RETVAL = virStreamRecv(st, rawdata, nbytes); - if (RETVAL != -2 && RETVAL != -3) { + if ((RETVAL < 0) && (RETVAL != -2 || RETVAL != -3)) { Safefree(rawdata); _croak_error(); } -- 2.15.1

2 1

[libvirt] [PATCH] deamon: TLS: use default value if ca_file, cert_file or key_file not set
by Chen Hanxiao 18 Dec '17

18 Dec '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> As the description of daemon/libvirtd.conf, setting key_file, cert_file or key_file will override the default value. But if we set any one of them, we need to set all the rest of them. This patch set default value to them as daemon/libvirtd.conf described. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- daemon/libvirtd.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 6d3b83355..93983f63b 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -493,19 +493,28 @@ daemonSetupNetworking(virNetServerPtr srv, config->cert_file || config->key_file) { if (!config->ca_file) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("No CA certificate path set to match server key/cert")); - goto cleanup; + VIR_WARN("Using default path for ca_file"); + if (VIR_STRDUP(config->ca_file, LIBVIRT_CACERT) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("No CA certificate path set to match server key/cert")); + goto cleanup; + } } if (!config->cert_file) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("No server certificate path set to match server key")); - goto cleanup; + VIR_WARN("Using default path for cert_file"); + if (VIR_STRDUP(config->cert_file, LIBVIRT_SERVERCERT) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("No server certificate path set to match server key")); + goto cleanup; + } } if (!config->key_file) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("No server key path set to match server cert")); - goto cleanup; + VIR_WARN("Using default path for key_file"); + if (VIR_STRDUP(config->key_file, LIBVIRT_SERVERKEY) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("No server key path set to match server cert")); + goto cleanup; + } } VIR_DEBUG("Using CA='%s' cert='%s' key='%s'", config->ca_file, config->cert_file, config->key_file); -- 2.14.3

1 0

[libvirt] [PATCH] apparmor: add ptrace/mediation rules for unconfined guests
by Christian Ehrhardt 16 Dec '17

16 Dec '17

If a guest runs unconfined <seclabel type='none'>, but libvirtd is confined then the peer for signal/ptrace can only be detected as 'unconfined'. That triggers issues like: apparmor="DENIED" operation="signal" profile="/usr/sbin/libvirtd" pid=22395 comm="libvirtd" requested_mask="send" denied_mask="send" signal=term peer="unconfined" To fix this add unconfined as an allowed peer for those operations. I discussed with the apparmor folks, right now there is no better separation to be made in this case. But there might be further down the road with "policy namespaces with scope and view control + stacking" This is more a use-case addition than a fix to the following two changes: - 3b1d19e6 AppArmor: add rules needed with additional mediation features - b482925c apparmor: support ptrace checks Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- examples/apparmor/usr.sbin.libvirtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd index 8d61d15..23e8aa3 100644 --- a/examples/apparmor/usr.sbin.libvirtd +++ b/examples/apparmor/usr.sbin.libvirtd @@ -61,6 +61,10 @@ signal (send) peer=/usr/sbin/dnsmasq, signal (read, send) peer=libvirt-*, + # required if guests run unconfined seclabel type='none' but libvirtd is confined + signal (read, send) peer=unconfined, + ptrace (trace) peer=unconfined, + # Very lenient profile for libvirtd since we want to first focus on confining # the guests. Guests will have a very restricted profile. / r, -- 2.7.4

3 2

[libvirt] [PATCH] add support of iSER transport type in qemu with libiscsi
by lichstor＠gmail.com 16 Dec '17

16 Dec '17

From: zhangshengyu <zhangshengyu(a)fusionstack.cn> --- src/conf/domain_conf.c | 13 ++++++++ src/qemu/qemu_block.c | 17 +++++++++- src/util/virstoragefile.c | 3 +- src/util/virstoragefile.h | 1 + tests/qemuxml2argvdata/disk-drive-network-iser.xml | 37 ++++++++++++++++++++++ 5 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-drive-network-iser.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 66e21c4bd..bf20cfd0c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7201,6 +7201,9 @@ virDomainHostdevSubsysSCSIiSCSIDefParseXML(xmlNodePtr sourcenode, iscsisrc->src->type = VIR_STORAGE_TYPE_NETWORK; iscsisrc->src->protocol = VIR_STORAGE_NET_PROTOCOL_ISCSI; +virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("virDomainHostdevSubsysSCSIiSCSIDefParseXML")); + if (!(iscsisrc->src->path = virXMLPropString(sourcenode, "name"))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing iSCSI hostdev source path name")); @@ -8416,6 +8419,7 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, unsigned int flags) { char *protocol = NULL; + char *transport = NULL; char *haveTLS = NULL; char *tlsCfg = NULL; int tlsCfgVal; @@ -8427,6 +8431,10 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, goto cleanup; } + if (!(transport = virXMLPropString(node, "transport"))) { + VIR_WARN("missing network source transport type"); + } + if ((src->protocol = virStorageNetProtocolTypeFromString(protocol)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown protocol type '%s'"), protocol); @@ -8495,6 +8503,9 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, if (virDomainStorageNetworkParseHosts(node, &src->hosts, &src->nhosts) < 0) goto cleanup; + if(src->hosts) + src->hosts->transport = virStorageNetHostTransportTypeFromString(transport); + virStorageSourceNetworkAssignDefaultPorts(src); ret = 0; @@ -22326,6 +22337,8 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf, VIR_FREE(path); + virBufferEscapeString(attrBuf, " transport='%s'", "iser"); + if (src->haveTLS != VIR_TRISTATE_BOOL_ABSENT && !(flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE && src->tlsFromConfig)) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 585f0255e..dcd7c6a5e 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -506,6 +506,20 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDefPtr host, goto cleanup; break; + case VIR_STORAGE_NET_HOST_TRANS_ISER: + transport = "iser"; + if (virAsprintf(&port, "%u", host->port) < 0) + goto cleanup; + + if (virJSONValueObjectCreate(&server, + "s:type", transport, + "s:host", host->name, + "s:port", port, + NULL) < 0) + goto cleanup; + + + break; case VIR_STORAGE_NET_HOST_TRANS_UNIX: if (virJSONValueObjectCreate(&server, "s:type", "unix", @@ -831,7 +845,8 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourcePtr src) "s:portal", portal, "s:target", target, "u:lun", lun, - "s:transport", "tcp", + "s:transport", + virStorageNetHostTransportTypeToString(src->hosts->transport), "S:user", username, "S:password-secret", objalias, NULL)); diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 6594715e5..02d62a68e 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -92,7 +92,8 @@ VIR_ENUM_IMPL(virStorageNetProtocol, VIR_STORAGE_NET_PROTOCOL_LAST, VIR_ENUM_IMPL(virStorageNetHostTransport, VIR_STORAGE_NET_HOST_TRANS_LAST, "tcp", "unix", - "rdma") + "rdma", + "iser") VIR_ENUM_IMPL(virStorageSourcePoolMode, VIR_STORAGE_SOURCE_POOL_MODE_LAST, diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 24382a0a6..4eb650186 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -147,6 +147,7 @@ typedef enum { VIR_STORAGE_NET_HOST_TRANS_TCP, VIR_STORAGE_NET_HOST_TRANS_UNIX, VIR_STORAGE_NET_HOST_TRANS_RDMA, + VIR_STORAGE_NET_HOST_TRANS_ISER, VIR_STORAGE_NET_HOST_TRANS_LAST } virStorageNetHostTransport; diff --git a/tests/qemuxml2argvdata/disk-drive-network-iser.xml b/tests/qemuxml2argvdata/disk-drive-network-iser.xml new file mode 100644 index 000000000..b3f4f9bfb --- /dev/null +++ b/tests/qemuxml2argvdata/disk-drive-network-iser.xml @@ -0,0 +1,37 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>e301d9ab-f5ad-47bf-988c-9645577a1af4</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example' transport='iser'> + <host name='example.org' port='6000'/> + </source> + <target dev='vda' bus='virtio'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <source protocol='iscsi' name='iqn.1992-01.com.example/1' transport='iser'> + <host name='example.org' port='6000'/> + </source> + <target dev='vdb' bus='virtio'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> -- 2.13.6 (Apple Git-96)

3 3

[libvirt] [PATCH] admin: Use the connection to determine a client is connected readonly
by Erik Skultety 15 Dec '17

15 Dec '17

Prior to this change, we relied solely on the inherited readonly attribute of a service's socket. This only worked for our UNIX sockets (and only to some degree), but doesn't work for TCP sockets which are RW by default, but such connections support RO as well. This patch forces an update on the client object once we have established a connection to reflect the nature of the connection itself rather than relying on the underlying socket's attributes. Clients connected to the admin server have always been connected as RW only. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1524399 Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- daemon/remote.c | 5 +++++ src/libvirt_remote.syms | 1 + src/rpc/virnetserverclient.c | 11 +++++++++++ src/rpc/virnetserverclient.h | 1 + 4 files changed, 18 insertions(+) diff --git a/daemon/remote.c b/daemon/remote.c index c2111ae37..8e99a4d86 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1814,6 +1814,11 @@ remoteDispatchConnectOpen(virNetServerPtr server ATTRIBUTE_UNUSED, if (priv->conn == NULL) goto cleanup; + /* force update the @readonly attribute which was inherited from the + * virNetServerService object - this is important for sockets that are RW + * by default, but do accept RO flags, e.g. TCP + */ + virNetServerClientSetReadonly(client, (flags & VIR_CONNECT_RO)); rv = 0; cleanup: diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms index 61c20d530..1c107e1d6 100644 --- a/src/libvirt_remote.syms +++ b/src/libvirt_remote.syms @@ -153,6 +153,7 @@ virNetServerClientSendMessage; virNetServerClientSetAuth; virNetServerClientSetCloseHook; virNetServerClientSetDispatcher; +virNetServerClientSetReadonly; virNetServerClientStartKeepAlive; virNetServerClientWantClose; diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 6e086b7b4..f4a2571f5 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -638,6 +638,17 @@ bool virNetServerClientGetReadonly(virNetServerClientPtr client) return readonly; } + +void +virNetServerClientSetReadonly(virNetServerClientPtr client, + bool readonly) +{ + virObjectLock(client); + client->readonly = readonly; + virObjectUnlock(client); +} + + unsigned long long virNetServerClientGetID(virNetServerClientPtr client) { return client->id; diff --git a/src/rpc/virnetserverclient.h b/src/rpc/virnetserverclient.h index e45c78882..2569f93c3 100644 --- a/src/rpc/virnetserverclient.h +++ b/src/rpc/virnetserverclient.h @@ -81,6 +81,7 @@ void virNetServerClientRemoveFilter(virNetServerClientPtr client, int virNetServerClientGetAuth(virNetServerClientPtr client); void virNetServerClientSetAuth(virNetServerClientPtr client, int auth); bool virNetServerClientGetReadonly(virNetServerClientPtr client); +void virNetServerClientSetReadonly(virNetServerClientPtr client, bool readonly); unsigned long long virNetServerClientGetID(virNetServerClientPtr client); long long virNetServerClientGetTimestamp(virNetServerClientPtr client); -- 2.13.6

2 1

[libvirt] [PATCH] storage: Add unique UUID check for virStoragePoolObjAssignDef
by John Ferlan 15 Dec '17

15 Dec '17

Commit id '4b2e0ed6e' converted to using hash tables for storing storage pool objs by name and uuid; however, neglected to add a check to virStoragePoolObjAssignDef that the pool by uuid wasn't defined. This caused issues for the virt-manager test driver which ended up using the same UUID for a newly named pool and started having failures from adding a non unique UUID. So instead of getting a "Duplicate key", let's add a more descriptive error message indicating which pool object by name already exists using the same UUID as the pool object that is attempting to be added. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- FWIW: The virt-manager test was also fixed to not use a duplicate UUID as of commit '4224b0926' in the virt-manager git repo. src/conf/virstorageobj.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 49fe24b28..e3acc817c 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -747,10 +747,18 @@ virStoragePoolObjAssignDef(virStoragePoolObjListPtr pools, return obj; } + virUUIDFormat(def->uuid, uuidstr); + if ((obj = virStoragePoolObjFindByUUIDLocked(pools, def->uuid))) { + virObjectLock(obj); + virReportError(VIR_ERR_OPERATION_FAILED, + _("storage pool '%s' already exists with uuid %s"), + obj->def->name, uuidstr); + goto error; + } + if (!(obj = virStoragePoolObjNew())) return NULL; - virUUIDFormat(def->uuid, uuidstr); if (virHashAddEntry(pools->objs, uuidstr, obj) < 0) goto error; virObjectRef(obj); -- 2.13.6

2 1

[libvirt] [PATCH 0/2] qemu: Enforce vCPU hotplug granularity constraints
by Andrea Bolognani 15 Dec '17

15 Dec '17

return -ENOBLURB; Andrea Bolognani (2): qemu: Invert condition nesting in qemuDomainDefValidate() qemu: Enforce vCPU hotplug granularity constraints src/qemu/qemu_domain.c | 56 +++++++++++++++++++--- tests/qemuxml2argvdata/cpu-hotplug-granularity.xml | 18 +++++++ tests/qemuxml2argvtest.c | 3 ++ 3 files changed, 71 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/cpu-hotplug-granularity.xml -- 2.14.3

2 8

[libvirt] [RFC] 5-level paging Support
by Feng, Shaohe 15 Dec '17

15 Dec '17

Hi all, Now both qemu and kvm support 5-level paging. We can start qemu with a "cpu,+la57" to set 57-bit vitrual address space. So VM can be aware that it need to enable 5-level paging. We can also set another "cpu,phys-bits=52" to set the VM physical address space. Actually, VM can still turn on 5 level paging even without "phys-bits=52", yet this means the guest physical address width are limited, meaning less practical benefits. In to support 5-level paging, I suggest to add two attribute for the domain cpu element in libvirt. <cpu la57='yes', phys-bits='52'\> Here we need to be able to set phys-bits directly, because it is potentially migration sensitive. If la57='no', libvirt will ignore phys-bits, no matter whether hardware support la57. If la57='yes', libvirt will probe the host capability, and will throw error if hardware does support la57. If la57='yes', even phys-bits less than 52, libvirt will also pass it to qemu though less practical benefits. [info] [1] [Qemu-devel] [PATCH]x86: implement la57 paging mode <https://lists.gnu.org/archive/html/qemu-devel/2016-12/msg02096.html> [2] [Qemu-devel] [PATCH v4 2/5] x86: Allow physical address bits to be set <https://lists.gnu.org/archive/html/qemu-devel/2016-07/msg01950.html> BR Shaohe Feng

2 2

[libvirt] [PATCH] cfg.mk: Simplify backslash alignment check
by Andrea Bolognani 15 Dec '17

15 Dec '17

The use of [[:blank:]] was intended to cover tabs as well, but it couldn't possibly work in its current form, so the regex was tweaked in d09429abe826. With the original reason for using [[:blank:]] now gone, we can replace its usage with plain spaces. A comment about the purpose of the check is added as well. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- cfg.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cfg.mk b/cfg.mk index ea10ca19f..5cdeb7c65 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1037,8 +1037,10 @@ sc_prohibit_http_urls: halt='Links must use https:// protocol' \ $(_sc_search_regexp) +# Alignment is usually achieved through spaces (at least two of them) +# or tabs (at least one of them) right before the trailing backslash sc_prohibit_backslash_alignment: - @prohibit='([[:blank:]][[:blank:]]| )\\$$' \ + @prohibit='( | )\\$$' \ in_vc_files='*\.([chx]|am|mk)$$' \ halt='Do not attempt to right-align backslashes' \ $(_sc_search_regexp) -- 2.14.3

2 1

[libvirt] [PATCH v3] qemu: change monitor.sock from /var/lib/libvirt/qemu/domain-*** to /var/run/libvirt/qemu/domain-***
by xinhua.Cao 15 Dec '17

15 Dec '17

directory /var/lib alway is Persistence directory, but in redhat system, /var/run is memory directory. our running domain xml is saved at /var/run/libvirt/qemu. so if we cold reset system, the /var/run/libvirt/qemu directory is clear, but /var/lib/libvirt/qemu/domain-*** is saved., so there have same /var/lib/libvirt/qemu/domain-*** directory will be left over at system cold reset. --- src/qemu/qemu_domain.c | 2 +- tests/qemuxml2argvtest.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 13e77ee..67da8fa 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1713,7 +1713,7 @@ qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, goto cleanup; if (!priv->libDir && - virAsprintf(&priv->libDir, "%s/domain-%s", cfg->libDir, domname) < 0) + virAsprintf(&priv->libDir, "%s/domain-%s", cfg->stateDir, domname) < 0) goto cleanup; if (!priv->channelTargetDir && diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 03b1bcb..b596bd2 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -620,6 +620,10 @@ mymain(void) if (VIR_STRDUP_QUIET(driver.config->memoryBackingDir, "/var/lib/libvirt/qemu/ram") < 0) return EXIT_FAILURE; + VIR_FREE(driver.config->stateDir); + if (VIR_STRDUP(driver.config->stateDir, "/tmp/lib") < 0) + return EXIT_FAILURE; + # define DO_TEST_FULL(name, migrateFrom, migrateFd, flags, \ parseFlags, gic, ...) \ do { \ -- 2.8.3

3 2

[libvirt] [PATCH] libxl: mark domain0 as persistent
by Jim Fehlig 15 Dec '17

15 Dec '17

A Xen domain0 is better described as a persistent domain. Mark it as such during intialization. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- I noticed this while debugging a libvirt-guests issue. The list_guests() function filters domain0 with echo "$list" | grep -v 00000000-0000-0000-0000-000000000000 If domain0 is the only item in $list, the grep returns 1, causing a failure of the stop operation when action is suspend. This patch fixes the libvirt-guests issue, but I can also send a patch to improve the filter if desired. E.g. echo "$list" | sed "s/00000000-0000-0000-0000-000000000000//g" src/libxl/libxl_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 40328a6cb..79e29ce07 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -609,6 +609,7 @@ libxlAddDom0(libxlDriverPrivatePtr driver) def = NULL; + vm->persistent = 1; virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_BOOTED); if (virDomainDefSetVcpusMax(vm->def, d_info.vcpu_max_id + 1, driver->xmlopt)) goto cleanup; -- 2.15.1

2 3

[libvirt] [PATCH] virfile: relax checks for hugetlbfs
by David Vrabel 15 Dec '17

15 Dec '17

There are use cases where it is useful to use the support in libvirt for file-backed guest memory, but without using hugetlbfs but tmpfs instead (for example, to run tests on hosts that do not have hugepages configured, or to use Linux's idle page tracking to monitor guest memory accesses at a 4k page granularity.). Drop the check for hugetlbfs when querying the huge page size, but move it to the loop that's searching for a suitable mount to use. Change-Id: I2c9589191e14653724725b944171689553ee6bae --- src/util/virfile.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 82cb36dbc..24ff5e208 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3438,19 +3438,23 @@ virFileGetHugepageSize(const char *path, goto cleanup; } - if (fs.f_type != HUGETLBFS_MAGIC) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("not a hugetlbfs mount: '%s'"), - path); - goto cleanup; - } - *size = fs.f_bsize / 1024; /* we are storing size in KiB */ ret = 0; cleanup: return ret; } +static bool +virFileIsHugeTLBFS(const char *path) +{ + struct statfs fs; + + if (statfs(path, &fs) < 0) { + return false; + } + return fs.f_type == HUGETLBFS_MAGIC; +} + # define PROC_MEMINFO "/proc/meminfo" # define HUGEPAGESIZE_STR "Hugepagesize:" @@ -3517,6 +3521,9 @@ virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs, if (STRNEQ(mb.mnt_type, "hugetlbfs")) continue; + if (!virFileIsHugeTLBFS(mb.mnt_dir)) + continue; + if (VIR_EXPAND_N(fs, nfs, 1) < 0) goto cleanup; -- 2.11.0

2 2

[libvirt] [PATCH 0/3] Fix problems found for SCSIVHost
by John Ferlan 14 Dec '17

14 Dec '17

See details in patches. John Ferlan (3): qemu: Need to assign PCI address to vhost-scsi util: Fix error path in virSCSIVHostOpenVhostSCSI util: Report error if vhost-scsi device file cannot be found src/qemu/qemu_domain_address.c | 3 +- src/util/virscsivhost.c | 8 +++- .../hostdev-scsi-vhost-scsi-ccw.xml | 1 - .../hostdev-scsi-vhost-scsi-pci.xml | 1 - .../hostdev-scsi-vhost-scsi-ccw.xml | 35 +++++++++++++++++- .../hostdev-scsi-vhost-scsi-pci.xml | 43 +++++++++++++++++++++- 6 files changed, 84 insertions(+), 7 deletions(-) mode change 120000 => 100644 tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml -- 2.13.6

3 9

[libvirt] [PATCH] qemu: remove input device after receiving the event
by Ján Tomko 14 Dec '17

14 Dec '17

Also call qemuDomainRemoveInputDevice if we receive the event after the Detach API ends. Commit 67486bb failed to include this. https://bugzilla.redhat.com/show_bug.cgi?id=1524837 --- src/qemu/qemu_hotplug.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index c4f8c0fa4..2033c7dd0 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4412,10 +4412,13 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver, ret = qemuDomainRemoveShmemDevice(driver, vm, dev->data.shmem); break; + case VIR_DOMAIN_DEVICE_INPUT: + ret = qemuDomainRemoveInputDevice(vm, dev->data.input); + break; + case VIR_DOMAIN_DEVICE_NONE: case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_FS: - case VIR_DOMAIN_DEVICE_INPUT: case VIR_DOMAIN_DEVICE_SOUND: case VIR_DOMAIN_DEVICE_VIDEO: case VIR_DOMAIN_DEVICE_WATCHDOG: -- 2.13.6

2 1

[libvirt] [PATCH 0/3] nodedev driver initialization adjustments
by John Ferlan 14 Dec '17

14 Dec '17

While running the Avocado test suite on my laptop/host (f26), I ran into a few instances where if the timing is just right the libvirtd restart will "hang" and ends up not being stoppable - leaving the libvirtd <defunct> eventually once a kill -9 is run. I tracked this into a pci_system_init() call that never returns. Since I was mucking in the code - I also figured we could move device enumeration into its own thread to "speed" startup. John Ferlan (3): nodedev: Move device enumumeration out of nodeStateInitialize nodedev: Move the udevPCITranslate{Init|Deinit} nodedev: Move the udevPCITranslateInit call src/conf/virnodedeviceobj.h | 1 + src/node_device/node_device_udev.c | 107 ++++++++++++++++++++++++------------- 2 files changed, 70 insertions(+), 38 deletions(-) -- 2.13.6

2 9

[libvirt] [PATCH 0/4] libvirtd: fix hang on termination in qemu driver
by Nikolay Shirokovskiy 14 Dec '17

14 Dec '17

Libvirtd termination can hang. For example if some API call in qemu driver awaiting monitor response it will never finish because event loop does not functional during termination. As a result we hang in virNetDaemonClose call during termination as this call finishes RPC threads. Let's ask hypervisor drivers to finish all API calls by calling introduced state driver shutdown function before call to virNetDaemonClose. Nikolay Shirokovskiy (4): libvirt: introduce hypervisor driver shutdown function qemu: implement state driver shutdown function qemu: agent: fix monitor close during first sync qemu: monitor: check monitor not closed upon send daemon/libvirtd.c | 2 ++ src/driver-state.h | 4 ++++ src/libvirt.c | 18 ++++++++++++++++++ src/libvirt_internal.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_agent.c | 14 +++++++------- src/qemu/qemu_driver.c | 39 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 27 +++++++++++++-------------- 8 files changed, 85 insertions(+), 21 deletions(-) -- 1.8.3.1

2 6

[libvirt] [PATCH 0/3] Fix --keep-relative for block commit after libvirtd restart (blockdev-add saga)
by Peter Krempa 14 Dec '17

14 Dec '17

Relative paths were restored from the disks on libvirtd restart. Now that we load the backing chain from XML we'll need to store them somewhere. Peter Krempa (3): conf: Add infrastructure for disk source private data XML util: storage: Add helpers to parse and format relPath into privateData qemu: domain: Parse and format relPath into disk source private data src/conf/domain_conf.c | 136 ++++++++++++++++++++++++++++++++++---------- src/conf/domain_conf.h | 17 +++++- src/conf/snapshot_conf.c | 18 +++--- src/libvirt_private.syms | 2 + src/network/bridge_driver.c | 2 +- src/qemu/qemu_domain.c | 4 +- src/util/virstoragefile.c | 20 +++++++ src/util/virstoragefile.h | 8 +++ tests/qemublocktest.c | 4 +- tests/virstoragetest.c | 2 +- 10 files changed, 168 insertions(+), 45 deletions(-) -- 2.15.0

2 4

[libvirt] [PATCH v2 0/4] Improvements to CPU frequency reporting
by Andrea Bolognani 14 Dec '17

14 Dec '17

Changes from [v1]: * adopt Bjoern's approach to refactoring. [v1] https://www.redhat.com/archives/libvir-list/2017-December/msg00356.html Andrea Bolognani (3): tests: Add host CPU data for Moonshot (RHEL 7.4) util: Tweak virHostCPUParseFrequencyString() util: Don't report CPU frequency for ARM hosts Bjoern Walk (1): util: virhostcpu: factor out frequency parsing src/util/virhostcpu.c | 141 +++++++++------------ .../linux-aarch64-rhel74-moonshot.cpuinfo | 72 +++++++++++ .../linux-aarch64-rhel74-moonshot.expected | 1 + .../linux-armv6l-raspberrypi.expected | 2 +- .../linux-rhel74-moonshot/cpu/cpu0/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu0/online | 1 + .../cpu/cpu0/topology/core_id | 1 + .../cpu/cpu0/topology/core_siblings | 1 + .../cpu/cpu0/topology/core_siblings_list | 1 + .../cpu/cpu0/topology/physical_package_id | 1 + .../cpu/cpu0/topology/thread_siblings | 1 + .../cpu/cpu0/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu1/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu1/online | 1 + .../cpu/cpu1/topology/core_id | 1 + .../cpu/cpu1/topology/core_siblings | 1 + .../cpu/cpu1/topology/core_siblings_list | 1 + .../cpu/cpu1/topology/physical_package_id | 1 + .../cpu/cpu1/topology/thread_siblings | 1 + .../cpu/cpu1/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu2/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu2/online | 1 + .../cpu/cpu2/topology/core_id | 1 + .../cpu/cpu2/topology/core_siblings | 1 + .../cpu/cpu2/topology/core_siblings_list | 1 + .../cpu/cpu2/topology/physical_package_id | 1 + .../cpu/cpu2/topology/thread_siblings | 1 + .../cpu/cpu2/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu3/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu3/online | 1 + .../cpu/cpu3/topology/core_id | 1 + .../cpu/cpu3/topology/core_siblings | 1 + .../cpu/cpu3/topology/core_siblings_list | 1 + .../cpu/cpu3/topology/physical_package_id | 1 + .../cpu/cpu3/topology/thread_siblings | 1 + .../cpu/cpu3/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu4/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu4/online | 1 + .../cpu/cpu4/topology/core_id | 1 + .../cpu/cpu4/topology/core_siblings | 1 + .../cpu/cpu4/topology/core_siblings_list | 1 + .../cpu/cpu4/topology/physical_package_id | 1 + .../cpu/cpu4/topology/thread_siblings | 1 + .../cpu/cpu4/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu5/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu5/online | 1 + .../cpu/cpu5/topology/core_id | 1 + .../cpu/cpu5/topology/core_siblings | 1 + .../cpu/cpu5/topology/core_siblings_list | 1 + .../cpu/cpu5/topology/physical_package_id | 1 + .../cpu/cpu5/topology/thread_siblings | 1 + .../cpu/cpu5/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu6/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu6/online | 1 + .../cpu/cpu6/topology/core_id | 1 + .../cpu/cpu6/topology/core_siblings | 1 + .../cpu/cpu6/topology/core_siblings_list | 1 + .../cpu/cpu6/topology/physical_package_id | 1 + .../cpu/cpu6/topology/thread_siblings | 1 + .../cpu/cpu6/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu7/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu7/online | 1 + .../cpu/cpu7/topology/core_id | 1 + .../cpu/cpu7/topology/core_siblings | 1 + .../cpu/cpu7/topology/core_siblings_list | 1 + .../cpu/cpu7/topology/physical_package_id | 1 + .../cpu/cpu7/topology/thread_siblings | 1 + .../cpu/cpu7/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/kernel_max | 1 + .../linux-rhel74-moonshot/cpu/offline | 1 + .../linux-rhel74-moonshot/cpu/online | 1 + .../linux-rhel74-moonshot/cpu/possible | 1 + .../linux-rhel74-moonshot/cpu/present | 1 + .../linux-rhel74-moonshot/node/has_cpu | 1 + .../linux-rhel74-moonshot/node/has_memory | 1 + .../linux-rhel74-moonshot/node/has_normal_memory | 1 + .../linux-rhel74-moonshot/node/node0/cpu0 | 1 + .../linux-rhel74-moonshot/node/node0/cpu1 | 1 + .../linux-rhel74-moonshot/node/node0/cpu2 | 1 + .../linux-rhel74-moonshot/node/node0/cpu3 | 1 + .../linux-rhel74-moonshot/node/node0/cpu4 | 1 + .../linux-rhel74-moonshot/node/node0/cpu5 | 1 + .../linux-rhel74-moonshot/node/node0/cpu6 | 1 + .../linux-rhel74-moonshot/node/node0/cpu7 | 1 + .../linux-rhel74-moonshot/node/node0/cpulist | 1 + .../linux-rhel74-moonshot/node/node0/cpumap | 1 + .../linux-rhel74-moonshot/node/online | 1 + .../linux-rhel74-moonshot/node/possible | 1 + tests/virhostcputest.c | 1 + 89 files changed, 221 insertions(+), 80 deletions(-) create mode 100644 tests/virhostcpudata/linux-aarch64-rhel74-moonshot.cpuinfo create mode 100644 tests/virhostcpudata/linux-aarch64-rhel74-moonshot.expected create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/kernel_max create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/offline create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/possible create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/present create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/has_cpu create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/has_memory create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/has_normal_memory create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu0 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu1 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu2 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu3 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu4 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu5 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu6 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu7 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpulist create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpumap create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/possible -- 2.14.3

3 10

[libvirt] [PATCH 0/1] *** Add iSER block type supported in qemu ***
by lichstor＠gmail.com 14 Dec '17

14 Dec '17

From: zhangshengyu <zhangshengyu(a)fusionstack.cn> *** Add iSER block type supported in qemu *** zhangshengyu (1): add support for iSER block type. src/conf/domain_conf.c | 8 ++++- src/qemu/qemu_block.c | 3 +- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 3 ++ src/qemu/qemu_parse_command.c | 7 ++++ src/util/virstoragefile.c | 75 +++++++++++++++++++++++++++++++++++++++++++ src/util/virstoragefile.h | 1 + 8 files changed, 98 insertions(+), 4 deletions(-) -- 2.13.6 (Apple Git-96)

3 6

[libvirt] [PATCH 0/2] Fix a couple small networking bugs
by Laine Stump 14 Dec '17

14 Dec '17

Laine Stump (2): qemu: delete exist bandwidth restrictions when they are removed from config qemu: log error on attempts to set filterref on an OVS-connected interface src/qemu/qemu_command.c | 28 +++++++++++++++++++--------- src/qemu/qemu_hotplug.c | 18 +++++++++++++----- 2 files changed, 32 insertions(+), 14 deletions(-) -- 2.13.6

2 4

[libvirt] [PATCH] docs: Fix news.xml syntax
by John Ferlan 14 Dec '17

14 Dec '17

Commit id '1241e487' used <code><interface></code> which is not valid syntax for a <summary>. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed under build breaker rule as CI libvirt-master-check was failing docs/news.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/news.xml b/docs/news.xml index 7509416ec..bb611b7ba 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -39,8 +39,7 @@ <section title="Improvements"> <change> <summary> - Xen: Add support for multiple IP addresses on - <code><interface></code> devices + Xen: Add support for multiple IP addresses on interface devices </summary> </change> </section> -- 2.13.6

1 0

[libvirt] [PATCH] xenconfig: fix issues found by coverity in multiple IP support
by Marek Marczykowski-Górecki 13 Dec '17

13 Dec '17

- virStringSplit may return NULL - VIR_ALLOC_N initialize the array already Cc: John Ferlan <jferlan(a)redhat.com> Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- src/xenconfig/xen_common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index ff0df5fb7..ca3b4dee6 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -968,6 +968,9 @@ xenParseVif(virConfPtr conf, virDomainDefPtr def, const char *vif_typename) char **ip_list = virStringSplit(ip, " ", 0); size_t i; + if (!ip_list) + goto cleanup; + for (i = 0; ip_list[i]; i++) { if (virDomainNetAppendIPAddress(net, ip_list[i], 0, 0) < 0) { virStringListFree(ip_list); @@ -1191,8 +1194,6 @@ xenMakeIPList(virNetDevIPInfoPtr guestIP) if (!address_array[i]) goto cleanup; } - address_array[guestIP->nips] = NULL; - ret = virStringListJoin((const char**)address_array, " "); cleanup: -- 2.13.6

2 1

[libvirt] [PATCH 0/4] Complete storage pool object privatization and use of RWLockable
by John Ferlan 13 Dec '17

13 Dec '17

After this series the storage pool will be private to virstorageobj and will be a self locking list of hash tables similar to other drivers. All that remains will be to make the storage volume lists be hash tables, but that's only once this is accepted. First patch is related to review comment from last series. John Ferlan (4): storage: Fix path check in storagePoolLookupByTargetPath storage: Privatize virStoragePoolObjListPtr storage: Convert virStoragePoolObjList to use virObjectRWLockable storage: Reduce need for using storageDriverLock src/conf/virstorageobj.c | 649 ++++++++++++++++++++++++++++++------------- src/conf/virstorageobj.h | 12 +- src/libvirt_private.syms | 2 +- src/storage/storage_driver.c | 180 +++++------- src/test/test_driver.c | 51 ++-- 5 files changed, 545 insertions(+), 349 deletions(-) -- 2.13.6

2 8

[libvirt] [RFC v2] arm64: KVM: KVM API extensions for SVE
by Dave Martin 13 Dec '17

13 Dec '17

Hi all, 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

2 2

[libvirt] [PATCH 0/6] Improvements to CPU frequency reporting
by Andrea Bolognani 13 Dec '17

13 Dec '17

A few steps towards eventually fixing https://bugzilla.redhat.com/show_bug.cgi?id=1206353 The commit message for patch 6/6 contains most of the rationale, previous patches are cleanups. If not for the new test case added with patch 1/6, the overall diffstat would be negative. Andrea Bolognani (6): tests: Add host CPU data for Moonshot (RHEL 7.4) util: Introduce virHostCPUGetInfoParseCPUInfo() util: Introduce virHostCPUGetInfoParseCPUFrequency() util: Tweak virHostCPUGetInfoParseCPUFrequency() util: Tweak s390(x) case for CPU frequency util: Don't report CPU frequency for ARM hosts src/util/virhostcpu.c | 151 ++++++++++----------- .../linux-aarch64-rhel74-moonshot.cpuinfo | 72 ++++++++++ .../linux-aarch64-rhel74-moonshot.expected | 1 + .../linux-armv6l-raspberrypi.expected | 2 +- .../linux-rhel74-moonshot/cpu/cpu0/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu0/online | 1 + .../cpu/cpu0/topology/core_id | 1 + .../cpu/cpu0/topology/core_siblings | 1 + .../cpu/cpu0/topology/core_siblings_list | 1 + .../cpu/cpu0/topology/physical_package_id | 1 + .../cpu/cpu0/topology/thread_siblings | 1 + .../cpu/cpu0/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu1/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu1/online | 1 + .../cpu/cpu1/topology/core_id | 1 + .../cpu/cpu1/topology/core_siblings | 1 + .../cpu/cpu1/topology/core_siblings_list | 1 + .../cpu/cpu1/topology/physical_package_id | 1 + .../cpu/cpu1/topology/thread_siblings | 1 + .../cpu/cpu1/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu2/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu2/online | 1 + .../cpu/cpu2/topology/core_id | 1 + .../cpu/cpu2/topology/core_siblings | 1 + .../cpu/cpu2/topology/core_siblings_list | 1 + .../cpu/cpu2/topology/physical_package_id | 1 + .../cpu/cpu2/topology/thread_siblings | 1 + .../cpu/cpu2/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu3/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu3/online | 1 + .../cpu/cpu3/topology/core_id | 1 + .../cpu/cpu3/topology/core_siblings | 1 + .../cpu/cpu3/topology/core_siblings_list | 1 + .../cpu/cpu3/topology/physical_package_id | 1 + .../cpu/cpu3/topology/thread_siblings | 1 + .../cpu/cpu3/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu4/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu4/online | 1 + .../cpu/cpu4/topology/core_id | 1 + .../cpu/cpu4/topology/core_siblings | 1 + .../cpu/cpu4/topology/core_siblings_list | 1 + .../cpu/cpu4/topology/physical_package_id | 1 + .../cpu/cpu4/topology/thread_siblings | 1 + .../cpu/cpu4/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu5/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu5/online | 1 + .../cpu/cpu5/topology/core_id | 1 + .../cpu/cpu5/topology/core_siblings | 1 + .../cpu/cpu5/topology/core_siblings_list | 1 + .../cpu/cpu5/topology/physical_package_id | 1 + .../cpu/cpu5/topology/thread_siblings | 1 + .../cpu/cpu5/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu6/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu6/online | 1 + .../cpu/cpu6/topology/core_id | 1 + .../cpu/cpu6/topology/core_siblings | 1 + .../cpu/cpu6/topology/core_siblings_list | 1 + .../cpu/cpu6/topology/physical_package_id | 1 + .../cpu/cpu6/topology/thread_siblings | 1 + .../cpu/cpu6/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/cpu7/node0 | 1 + .../linux-rhel74-moonshot/cpu/cpu7/online | 1 + .../cpu/cpu7/topology/core_id | 1 + .../cpu/cpu7/topology/core_siblings | 1 + .../cpu/cpu7/topology/core_siblings_list | 1 + .../cpu/cpu7/topology/physical_package_id | 1 + .../cpu/cpu7/topology/thread_siblings | 1 + .../cpu/cpu7/topology/thread_siblings_list | 1 + .../linux-rhel74-moonshot/cpu/kernel_max | 1 + .../linux-rhel74-moonshot/cpu/offline | 1 + .../linux-rhel74-moonshot/cpu/online | 1 + .../linux-rhel74-moonshot/cpu/possible | 1 + .../linux-rhel74-moonshot/cpu/present | 1 + .../linux-rhel74-moonshot/node/has_cpu | 1 + .../linux-rhel74-moonshot/node/has_memory | 1 + .../linux-rhel74-moonshot/node/has_normal_memory | 1 + .../linux-rhel74-moonshot/node/node0/cpu0 | 1 + .../linux-rhel74-moonshot/node/node0/cpu1 | 1 + .../linux-rhel74-moonshot/node/node0/cpu2 | 1 + .../linux-rhel74-moonshot/node/node0/cpu3 | 1 + .../linux-rhel74-moonshot/node/node0/cpu4 | 1 + .../linux-rhel74-moonshot/node/node0/cpu5 | 1 + .../linux-rhel74-moonshot/node/node0/cpu6 | 1 + .../linux-rhel74-moonshot/node/node0/cpu7 | 1 + .../linux-rhel74-moonshot/node/node0/cpulist | 1 + .../linux-rhel74-moonshot/node/node0/cpumap | 1 + .../linux-rhel74-moonshot/node/online | 1 + .../linux-rhel74-moonshot/node/possible | 1 + tests/virhostcputest.c | 1 + 89 files changed, 230 insertions(+), 81 deletions(-) create mode 100644 tests/virhostcpudata/linux-aarch64-rhel74-moonshot.cpuinfo create mode 100644 tests/virhostcpudata/linux-aarch64-rhel74-moonshot.expected create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/thread_siblings_list create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/node0 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/core_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/core_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/core_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/physical_package_id create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/thread_siblings create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/thread_siblings_list create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/kernel_max create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/offline create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/possible create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/present create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/has_cpu create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/has_memory create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/has_normal_memory create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu0 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu1 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu2 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu3 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu4 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu5 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu6 create mode 120000 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpu7 create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpulist create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/node0/cpumap create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/online create mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/node/possible -- 2.14.3

3 20

[libvirt] [PATCH v2 1/1] audit: Log only an info message if audit_level < 2 and audit is not supported
by Marc Hartmayer 13 Dec '17

13 Dec '17

Replace the error message during startup of libvirtd with an info message if audit_level < 2 and audit is not supported by the kernel. Audit is not supported by the current kernel if the kernel does not have audit compiled in or if audit is disabled (e.g. by the kernel cmdline). Signed-off-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- daemon/libvirtd.c | 2 +- src/util/viraudit.c | 16 ++++++++++++++-- src/util/viraudit.h | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 5103e8debea6..6d3b83355bca 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1422,7 +1422,7 @@ int main(int argc, char **argv) { if (config->audit_level) { VIR_DEBUG("Attempting to configure auditing subsystem"); - if (virAuditOpen() < 0) { + if (virAuditOpen(config->audit_level) < 0) { if (config->audit_level > 1) { ret = VIR_DAEMON_ERR_AUDIT; goto cleanup; diff --git a/src/util/viraudit.c b/src/util/viraudit.c index 17e58b3a9574..3c444b69ab9f 100644 --- a/src/util/viraudit.c +++ b/src/util/viraudit.c @@ -55,11 +55,23 @@ static int auditfd = -1; #endif static bool auditlog; -int virAuditOpen(void) +int virAuditOpen(ATTRIBUTE_UNUSED unsigned int audit_level) { #if WITH_AUDIT if ((auditfd = audit_open()) < 0) { - virReportSystemError(errno, "%s", _("Unable to initialize audit layer")); + /* You get these error codes only when the kernel does not + * have audit compiled in or it's disabled (e.g. by the kernel + * cmdline) */ + if (errno == EINVAL || errno == EPROTONOSUPPORT || + errno == EAFNOSUPPORT) { + if (audit_level < 2) + VIR_INFO("Audit is not supported by the kernel"); + else + virReportError(VIR_FROM_THIS, "%s", _("Audit is not supported by the kernel")); + } else { + virReportSystemError(errno, "%s", _("Unable to initialize audit layer")); + } + return -1; } diff --git a/src/util/viraudit.h b/src/util/viraudit.h index ed3d66ab5d0f..478dc8408f4e 100644 --- a/src/util/viraudit.h +++ b/src/util/viraudit.h @@ -32,7 +32,7 @@ typedef enum { VIR_AUDIT_RECORD_RESOURCE, } virAuditRecordType; -int virAuditOpen(void); +int virAuditOpen(unsigned int audit_level); void virAuditLog(bool enabled); -- 2.13.4

2 2

[libvirt] [PATCH v2] autogen.sh: tell user the correct make command
by Daniel P. Berrange 13 Dec '17

13 Dec '17

When autogen.sh finishes it helpfully prints "Now type 'make' to compile libvirt." which is fine if on a host with GNU make, but on *BSD running 'make' will end in tears. We should tell users to run 'gmake' on these platforms. If 'gmake' doesn't exist then we should report an error too "GNU make is required to build libvirt" Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- autogen.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index d5d836aa71..ea94528de6 100755 --- a/autogen.sh +++ b/autogen.sh @@ -175,6 +175,18 @@ if test "$OBJ_DIR"; then } fi +# Make sure we can find GNU make and tell the user +# the right command to run +if make -v 2>&1 | grep -q "GNU Make"; then + MAKE=make +else + if which gmake >/dev/null 2>&1; then + MAKE=gmake + else + die "GNU make is required to build libvirt" + fi +fi + if test -z "$*" && test -z "$extra_args" && test -f config.status; then echo "Running config.status..." ./config.status --recheck || { @@ -193,4 +205,4 @@ else fi echo -echo "Now type 'make' to compile libvirt." +echo "Now type '$MAKE' to compile libvirt." -- 2.14.3

2 2

[libvirt] [PATCH] audit: Log only an info message if audit_level < 2 and audit is not supported
by Marc Hartmayer 13 Dec '17

13 Dec '17

Replace the error message during startup of libvirtd with an info message if audit_level < 2 and audit is not supported by the kernel. Audit is not supported by the current kernel if the kernel does not have audit compiled in or if audit is disabled (e.g. by the kernel cmdline). Signed-off-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- daemon/libvirtd.c | 2 +- src/util/viraudit.c | 17 +++++++++++++++-- src/util/viraudit.h | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 589b32192e3d..6bbff0d45684 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1418,7 +1418,7 @@ int main(int argc, char **argv) { if (config->audit_level) { VIR_DEBUG("Attempting to configure auditing subsystem"); - if (virAuditOpen() < 0) { + if (virAuditOpen(config->audit_level) < 0) { if (config->audit_level > 1) { ret = VIR_DAEMON_ERR_AUDIT; goto cleanup; diff --git a/src/util/viraudit.c b/src/util/viraudit.c index 17e58b3a9574..9b755e384f24 100644 --- a/src/util/viraudit.c +++ b/src/util/viraudit.c @@ -55,11 +55,24 @@ static int auditfd = -1; #endif static bool auditlog; -int virAuditOpen(void) +int virAuditOpen(unsigned int audit_level) { #if WITH_AUDIT if ((auditfd = audit_open()) < 0) { - virReportSystemError(errno, "%s", _("Unable to initialize audit layer")); + /* You get these error codes only when the kernel does not + * have audit compiled in or it's disabled (e.g. by the kernel + * cmdline) */ + if (errno == EINVAL || errno == EPROTONOSUPPORT || + errno == EAFNOSUPPORT) { + const char msg[] = "Audit is not supported by the kernel"; + if (audit_level < 2) + VIR_INFO("%s", _(msg)); + else + virReportError(VIR_FROM_THIS, "%s", _(msg)); + } else { + virReportSystemError(errno, "%s", _("Unable to initialize audit layer")); + } + return -1; } diff --git a/src/util/viraudit.h b/src/util/viraudit.h index edaddf3c886f..e0471be1a85d 100644 --- a/src/util/viraudit.h +++ b/src/util/viraudit.h @@ -32,7 +32,7 @@ typedef enum { VIR_AUDIT_RECORD_RESOURCE, } virAuditRecordType; -int virAuditOpen(void); +int virAuditOpen(unsigned int audit_level); void virAuditLog(bool enabled); -- 2.13.4

2 5

[libvirt] [PATCH] virsh: fix typo s/node filters/network filters/
by Daniel P. Berrange 12 Dec '17

12 Dec '17

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed under trivial rule tools/virsh-nwfilter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c index 0f64c446f3..40bc193ad5 100644 --- a/tools/virsh-nwfilter.c +++ b/tools/virsh-nwfilter.c @@ -272,7 +272,7 @@ virshNWFilterListCollect(vshControl *ctl, } /* there was an error during the call */ - vshError(ctl, "%s", _("Failed to list node filters")); + vshError(ctl, "%s", _("Failed to list network filters")); goto cleanup; -- 2.14.3

1 0

Re: [libvirt] [PATCH 12/12] qemu: block: add iSER support in qemu block type
by Peter Krempa 12 Dec '17

12 Dec '17

This is not a properly formatted patch. Please use git send-email for submissions. Also read https://libvirt.org/hacking.html for coding style guidelines ... On Tue, Dec 12, 2017 at 16:53:48 +0800, zhangshengyu(a)fusionstack.cn wrote: > diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c > index 66e21c4bd..c83ce5718 100644 > --- a/src/conf/domain_conf.c > +++ b/src/conf/domain_conf.c > @@ -4554,6 +4554,11 @@ virDomainDeviceDefPostParseCommon(virDomainDeviceDefPtr dev, > disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI && > virDomainPostParseCheckISCSIPath(&disk->src->path) < 0) > return -1; > + > + if (disk->src->type == VIR_STORAGE_TYPE_NETWORK && > + disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISER && > + virDomainPostParseCheckISCSIPath(&disk->src->path) < 0) > + return -1; ... like how to format the code properly. > > if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO && > virDomainCheckVirtioOptions(disk->virtio) < 0) > @@ -5160,7 +5165,8 @@ virDomainDiskDefValidate(const virDomainDiskDef *disk) > if (!(disk->src->type == VIR_STORAGE_TYPE_BLOCK || > disk->src->type == VIR_STORAGE_TYPE_VOLUME || > (disk->src->type == VIR_STORAGE_TYPE_NETWORK && > - disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI))) { > + (disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI || > + disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISER)))) { > virReportError(VIR_ERR_CONFIG_UNSUPPORTED, > _("disk '%s' improperly configured for a " > "device='lun'"), disk->dst); > diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c > index 585f0255e..a9543293d 100644 > --- a/src/qemu/qemu_block.c > +++ b/src/qemu/qemu_block.c > @@ -831,7 +831,7 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourcePtr src) > "s:portal", portal, > "s:target", target, > "u:lun", lun, > - "s:transport", "tcp", > + "s:transport", src->protocol == VIR_STORAGE_NET_PROTOCOL_ISER? "iser":"tcp", too long line. > "S:user", username, > "S:password-secret", objalias, > NULL)); > @@ -1030,6 +1030,7 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourcePtr src) > break; > > case VIR_STORAGE_NET_PROTOCOL_ISCSI: > + case VIR_STORAGE_NET_PROTOCOL_ISER: Is it really a new protocol? Isn't it just a variation of ISCSI. Qemu treats it as a variation. > if (!(fileprops = qemuBlockStorageSourceGetISCSIProps(src))) > return NULL; > break; > diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c > index d7150cae1..76b2a6cc9 100644 > --- a/src/qemu/qemu_domain.c > +++ b/src/qemu/qemu_domain.c > @@ -8133,7 +8133,7 @@ int > qemuDomainDefValidateDiskLunSource(const virStorageSource *src) > { > if (virStorageSourceGetActualType(src) == VIR_STORAGE_TYPE_NETWORK) { > - if (src->protocol != VIR_STORAGE_NET_PROTOCOL_ISCSI) { > + if (src->protocol != VIR_STORAGE_NET_PROTOCOL_ISCSI && src->protocol != VIR_STORAGE_NET_PROTOCOL_ISER) { > virReportError(VIR_ERR_CONFIG_UNSUPPORTED, > _("disk device='lun' is not supported " > "for protocol='%s'"), [...] > diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c > index 5fe3f97d0..72e137ce4 100644 > --- a/src/qemu/qemu_parse_command.c > +++ b/src/qemu/qemu_parse_command.c > @@ -709,6 +709,12 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, > > if (qemuParseISCSIString(def) < 0) > goto error; > + } else if (STRPREFIX(def->src->path, "iser:")) { > + def->src->type = VIR_STORAGE_TYPE_NETWORK; > + def->src->protocol = VIR_STORAGE_NET_PROTOCOL_ISER; > + > + if (qemuParseISCSIString(def) < 0) > + goto error; > } else if (STRPREFIX(def->src->path, "sheepdog:")) { > char *p = def->src->path; > char *port, *vdi; > @@ -2157,6 +2163,7 @@ qemuParseCommandLine(virCapsPtr caps, > goto error; > > break; > + case VIR_STORAGE_NET_PROTOCOL_ISER: > case VIR_STORAGE_NET_PROTOCOL_ISCSI: > if (qemuParseISCSIString(disk) < 0) > goto error; > diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c > index 6594715e5..cf5c2904e 100644 > --- a/src/util/virstoragefile.c > +++ b/src/util/virstoragefile.c [...] > @@ -3295,6 +3368,7 @@ static const struct virStorageSourceJSONDriverParser jsonParsers[] = { > {"tftp", virStorageSourceParseBackingJSONUri, VIR_STORAGE_NET_PROTOCOL_TFTP}, > {"gluster", virStorageSourceParseBackingJSONGluster, 0}, > {"iscsi", virStorageSourceParseBackingJSONiSCSI, 0}, > + {"iser", virStorageSourceParseBackingJSONiSER, 0}, So this is plain wrong. In qemu it's stil protocol called 'iscsi' with a transport of 'iser', not a completely new protocol. citation from qemu.git/qmp/block-core.json: ## # @IscsiTransport: # # An enumeration of libiscsi transport types # # Since: 2.9 ## { 'enum': 'IscsiTransport', 'data': [ 'tcp', 'iser' ] } ## # @IscsiHeaderDigest: # # An enumeration of header digests supported by libiscsi # # Since: 2.9 ## { 'enum': 'IscsiHeaderDigest', 'prefix': 'QAPI_ISCSI_HEADER_DIGEST', 'data': [ 'crc32c', 'none', 'crc32c-none', 'none-crc32c' ] } ## # @BlockdevOptionsIscsi: # # @transport: The iscsi transport type # # @portal: The address of the iscsi portal # # @target: The target iqn name # # @lun: LUN to connect to. Defaults to 0. # # @user: User name to log in with. If omitted, no CHAP # authentication is performed. # # @password-secret: The ID of a QCryptoSecret object providing # the password for the login. This option is required if # @user is specified. # # @initiator-name: The iqn name we want to identify to the target # as. If this option is not specified, an initiator name is # generated automatically. # # @header-digest: The desired header digest. Defaults to # none-crc32c. # # @timeout: Timeout in seconds after which a request will # timeout. 0 means no timeout and is the default. # # Driver specific block device options for iscsi # # Since: 2.9 ## { 'struct': 'BlockdevOptionsIscsi', 'data': { 'transport': 'IscsiTransport', 'portal': 'str', 'target': 'str', '*lun': 'int', '*user': 'str', '*password-secret': 'str', '*initiator-name': 'str', '*header-digest': 'IscsiHeaderDigest', '*timeout': 'int' } } Also it's missing a test case. > {"nbd", virStorageSourceParseBackingJSONNbd, 0}, > {"sheepdog", virStorageSourceParseBackingJSONSheepdog, 0}, > {"ssh", virStorageSourceParseBackingJSONSSH, 0}, I don't object to adding iser transport per-se, but this patch is a mess. It's missing proper commit message and the protocol is not a new protocol but rather a different transport for ISCSI. Please follow the contributor guidelines before submitting a new patch. Also please add a case to the qemuxml2argv test so that this addition is tested properly as I suspect that iser would work only if you enable authentication in current libvirt since you did not tweak qemuDiskSourceNeedsProps Peter

1 0

[libvirt] [PATCH 0/3] Couple of mem leak fixes
by Michal Privoznik 12 Dec '17

12 Dec '17

*** BLURB HERE *** Michal Privoznik (3): xenParseXLVnuma: Don't leak @tmp and @token xenMakeIPList: Don't leak @address_array fillQemuCaps: Don't leak machine string src/xenconfig/xen_common.c | 1 + src/xenconfig/xen_xl.c | 2 ++ tests/domaincapstest.c | 10 ++++++---- 3 files changed, 9 insertions(+), 4 deletions(-) -- 2.13.6

2 7

[libvirt] ANNOUNCE: Upstream libvirt{, -python} releases built for CentOS
by Jiri Denemark 12 Dec '17

12 Dec '17

Hi all, Apparently some folks use CentOS for developing and/or testing software on top of libvirt (e.g., oVirt), which may be a bit troublesome since the version of libvirt released with CentOS is usually quite old compared to upstream. Using the downstream releases of libvirt for developing new features can introduce several months of delay, which may not be acceptable. So to make the development easier for folks who want to stick with CentOS I started to built upstream libvirt releases for Virt-SIG. The builds are not just a result of "make rpm", they are proper rebased versions of the released CentOS builds. In other words, all required downstream changes are ported to the new libvirt release. Regular CentOS builds essentially use one of these rebased builds as a base. You can expect both libvirt and libvirt-python CentOS builds within a few days after they are released upstream, unless I'm on vacation or CBS is not cooperating. The official repository for these build is http://mirror.centos.org/centos-7/7/virt/x86_64/libvirt-latest/ If you want packages for other architectures (there's no virt directory in http://mirror.centos.org/altarch/7/) you can use https://buildlogs.centos.org/centos/7/virt/$basearch/libvirt-latest/ or specifically https://buildlogs.centos.org/centos/7/virt/ppc64le/libvirt-latest/ https://buildlogs.centos.org/centos/7/virt/aarch64/libvirt-latest/ https://buildlogs.centos.org/centos/7/virt/x86_64/libvirt-latest/ Happy hacking. Jirka

1 0

[libvirt] Add iSER support in libvirt
by Charles Kelimod 12 Dec '17

12 Dec '17

I want to add iSER support in libvirt project, how can I submit (if possible) my modification to it? Best Regards, Charles.

2 2

[libvirt] [PATCH 12/12] qemu: block: add iSER support in qemu block type
by zhangshengyu＠fusionstack.cn 12 Dec '17

12 Dec '17

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 66e21c4bd..c83ce5718 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4554,6 +4554,11 @@ virDomainDeviceDefPostParseCommon(virDomainDeviceDefPtr dev, disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI && virDomainPostParseCheckISCSIPath(&disk->src->path) < 0) return -1; + + if (disk->src->type == VIR_STORAGE_TYPE_NETWORK && + disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISER && + virDomainPostParseCheckISCSIPath(&disk->src->path) < 0) + return -1; if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO && virDomainCheckVirtioOptions(disk->virtio) < 0) @@ -5160,7 +5165,8 @@ virDomainDiskDefValidate(const virDomainDiskDef *disk) if (!(disk->src->type == VIR_STORAGE_TYPE_BLOCK || disk->src->type == VIR_STORAGE_TYPE_VOLUME || (disk->src->type == VIR_STORAGE_TYPE_NETWORK && - disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI))) { + (disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI || + disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISER)))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk '%s' improperly configured for a " "device='lun'"), disk->dst); diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 585f0255e..a9543293d 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -831,7 +831,7 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSourcePtr src) "s:portal", portal, "s:target", target, "u:lun", lun, - "s:transport", "tcp", + "s:transport", src->protocol == VIR_STORAGE_NET_PROTOCOL_ISER? "iser":"tcp", "S:user", username, "S:password-secret", objalias, NULL)); @@ -1030,6 +1030,7 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourcePtr src) break; case VIR_STORAGE_NET_PROTOCOL_ISCSI: + case VIR_STORAGE_NET_PROTOCOL_ISER: if (!(fileprops = qemuBlockStorageSourceGetISCSIProps(src))) return NULL; break; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 645802795..a21ba0ae4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -932,6 +932,7 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, case VIR_STORAGE_NET_PROTOCOL_FTPS: case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_ISCSI: + case VIR_STORAGE_NET_PROTOCOL_ISER: case VIR_STORAGE_NET_PROTOCOL_GLUSTER: ret = qemuBuildNetworkDriveURI(src, secinfo); break; @@ -1482,7 +1483,7 @@ qemuDiskSourceNeedsProps(virStorageSourcePtr src, return true; if (actualType == VIR_STORAGE_TYPE_NETWORK && - src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI && + (src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI || src->protocol == VIR_STORAGE_NET_PROTOCOL_ISER) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_ISCSI_PASSWORD_SECRET)) return true; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d7150cae1..76b2a6cc9 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8133,7 +8133,7 @@ int qemuDomainDefValidateDiskLunSource(const virStorageSource *src) { if (virStorageSourceGetActualType(src) == VIR_STORAGE_TYPE_NETWORK) { - if (src->protocol != VIR_STORAGE_NET_PROTOCOL_ISCSI) { + if (src->protocol != VIR_STORAGE_NET_PROTOCOL_ISCSI && src->protocol != VIR_STORAGE_NET_PROTOCOL_ISER) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk device='lun' is not supported " "for protocol='%s'"), diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index aa30b119a..104b73ebe 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13983,6 +13983,7 @@ qemuDomainSnapshotPrepareDiskExternalInactive(virDomainSnapshotDiskDefPtr snapdi case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: case VIR_STORAGE_NET_PROTOCOL_GLUSTER: case VIR_STORAGE_NET_PROTOCOL_ISCSI: + case VIR_STORAGE_NET_PROTOCOL_ISER: case VIR_STORAGE_NET_PROTOCOL_HTTP: case VIR_STORAGE_NET_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_FTP: @@ -14060,6 +14061,7 @@ qemuDomainSnapshotPrepareDiskExternalActive(virDomainSnapshotDiskDefPtr snapdisk case VIR_STORAGE_NET_PROTOCOL_RBD: case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: case VIR_STORAGE_NET_PROTOCOL_ISCSI: + case VIR_STORAGE_NET_PROTOCOL_ISER: case VIR_STORAGE_NET_PROTOCOL_HTTP: case VIR_STORAGE_NET_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_FTP: @@ -14178,6 +14180,7 @@ qemuDomainSnapshotPrepareDiskInternal(virConnectPtr conn, case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG: case VIR_STORAGE_NET_PROTOCOL_GLUSTER: case VIR_STORAGE_NET_PROTOCOL_ISCSI: + case VIR_STORAGE_NET_PROTOCOL_ISER: case VIR_STORAGE_NET_PROTOCOL_HTTP: case VIR_STORAGE_NET_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_FTP: diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 5fe3f97d0..72e137ce4 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -709,6 +709,12 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, if (qemuParseISCSIString(def) < 0) goto error; + } else if (STRPREFIX(def->src->path, "iser:")) { + def->src->type = VIR_STORAGE_TYPE_NETWORK; + def->src->protocol = VIR_STORAGE_NET_PROTOCOL_ISER; + + if (qemuParseISCSIString(def) < 0) + goto error; } else if (STRPREFIX(def->src->path, "sheepdog:")) { char *p = def->src->path; char *port, *vdi; @@ -2157,6 +2163,7 @@ qemuParseCommandLine(virCapsPtr caps, goto error; break; + case VIR_STORAGE_NET_PROTOCOL_ISER: case VIR_STORAGE_NET_PROTOCOL_ISCSI: if (qemuParseISCSIString(disk) < 0) goto error; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 6594715e5..cf5c2904e 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -81,6 +81,7 @@ VIR_ENUM_IMPL(virStorageNetProtocol, VIR_STORAGE_NET_PROTOCOL_LAST, "sheepdog", "gluster", "iscsi", + "iser", "http", "https", "ftp", @@ -2750,6 +2751,7 @@ virStorageSourceParseBackingColon(virStorageSourcePtr src, case VIR_STORAGE_NET_PROTOCOL_FTPS: case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_ISCSI: + case VIR_STORAGE_NET_PROTOCOL_ISER: case VIR_STORAGE_NET_PROTOCOL_GLUSTER: case VIR_STORAGE_NET_PROTOCOL_SSH: case VIR_STORAGE_NET_PROTOCOL_VXHS: @@ -3040,6 +3042,77 @@ virStorageSourceParseBackingJSONiSCSI(virStorageSourcePtr src, return ret; } +static int +virStorageSourceParseBackingJSONiSER(virStorageSourcePtr src, + virJSONValuePtr json, + int opaque ATTRIBUTE_UNUSED) +{ + const char *transport = virJSONValueObjectGetString(json, "transport"); + const char *portal = virJSONValueObjectGetString(json, "portal"); + const char *target = virJSONValueObjectGetString(json, "target"); + const char *uri; + char *port; + unsigned int lun = 0; + char *fulltarget = NULL; + int ret = -1; + + /* legacy URI based syntax passed via 'filename' option */ + if ((uri = virJSONValueObjectGetString(json, "filename"))) + return virStorageSourceParseBackingJSONUriStr(src, uri, + VIR_STORAGE_NET_PROTOCOL_ISER); + + src->type = VIR_STORAGE_TYPE_NETWORK; + src->protocol = VIR_STORAGE_NET_PROTOCOL_ISER; + + if (VIR_ALLOC(src->hosts) < 0) + goto cleanup; + + src->nhosts = 1; + + if (STRNEQ_NULLABLE(transport, "iser")) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("only ISER transport is supported for iSER volumes")); + goto cleanup; + } + + src->hosts->transport = VIR_STORAGE_NET_HOST_TRANS_TCP; + + if (!portal) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("missing 'portal' address in iSER backing definition")); + goto cleanup; + } + + if (!target) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("missing 'target' in iSER backing definition")); + goto cleanup; + } + + if (VIR_STRDUP(src->hosts->name, portal) < 0) + goto cleanup; + + if ((port = strrchr(src->hosts->name, ':')) && + !strchr(port, ']')) { + if (virStringParsePort(port + 1, &src->hosts->port) < 0) + goto cleanup; + + *port = '\0'; + } + + ignore_value(virJSONValueObjectGetNumberUint(json, "lun", &lun)); + + if (virAsprintf(&fulltarget, "%s/%u", target, lun) < 0) + goto cleanup; + + VIR_STEAL_PTR(src->path, fulltarget); + + ret = 0; + + cleanup: + VIR_FREE(fulltarget); + return ret; +} static int virStorageSourceParseBackingJSONNbd(virStorageSourcePtr src, @@ -3295,6 +3368,7 @@ static const struct virStorageSourceJSONDriverParser jsonParsers[] = { {"tftp", virStorageSourceParseBackingJSONUri, VIR_STORAGE_NET_PROTOCOL_TFTP}, {"gluster", virStorageSourceParseBackingJSONGluster, 0}, {"iscsi", virStorageSourceParseBackingJSONiSCSI, 0}, + {"iser", virStorageSourceParseBackingJSONiSER, 0}, {"nbd", virStorageSourceParseBackingJSONNbd, 0}, {"sheepdog", virStorageSourceParseBackingJSONSheepdog, 0}, {"ssh", virStorageSourceParseBackingJSONSSH, 0}, @@ -4054,6 +4128,7 @@ virStorageSourceNetworkDefaultPort(virStorageNetProtocol protocol) return 22; case VIR_STORAGE_NET_PROTOCOL_ISCSI: + case VIR_STORAGE_NET_PROTOCOL_ISER: return 3260; case VIR_STORAGE_NET_PROTOCOL_GLUSTER: diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 24382a0a6..33771ddaf 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -129,6 +129,7 @@ typedef enum { VIR_STORAGE_NET_PROTOCOL_SHEEPDOG, VIR_STORAGE_NET_PROTOCOL_GLUSTER, VIR_STORAGE_NET_PROTOCOL_ISCSI, + VIR_STORAGE_NET_PROTOCOL_ISER, VIR_STORAGE_NET_PROTOCOL_HTTP, VIR_STORAGE_NET_PROTOCOL_HTTPS, VIR_STORAGE_NET_PROTOCOL_FTP, Best Regards, Charles. zhangshengyu(a)fusionstack.cn

1 0

[libvirt] [PATCH] Fix minor typos (watchog, schedular)
by Yuri Chornoivan 12 Dec '17

12 Dec '17

Hi, Please find the attached patch for the following fixes watchog -> watchdog schedular -> scheduler Many thanks in advance for reviewing the fixes. Best regards, Yuri

2 1

[libvirt] [PATCH v2] libvirt-python : PyObject memory leak
by Peng Hao 11 Dec '17

11 Dec '17

libvirt_virConnectDomainEventTunableCallback leak a PyObject. Signed-off-by: Peng Hao <peng.hao2(a)zte.com.cn> Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- libvirt-override.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-override.c b/libvirt-override.c index d746350..78a7f08 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -6662,11 +6662,11 @@ libvirt_virConnectDomainEventTunableCallback(virConnectPtr conn ATTRIBUTE_UNUSED if (!pyobj_ret) { DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); PyErr_Print(); - Py_XDECREF(pyobj_dict); } else { Py_DECREF(pyobj_ret); ret = 0; } + Py_XDECREF(pyobj_dict); LIBVIRT_RELEASE_THREAD_STATE; return ret; -- 1.8.3.1

2 1

[libvirt] [PATCH 0/3] qemu: Clean up PCI controller options
by Andrea Bolognani 11 Dec '17

11 Dec '17

See patch 3/3 for an explanation. Andrea Bolognani (3): qemu: Add missing checks for pcie-root-port options tests: Add some tests for PCI controller options qemu: Clean up PCI controller options src/qemu/qemu_command.c | 4 +- src/qemu/qemu_domain.c | 117 +++++++++++++++++++++ .../i440fx-controllers-pciopts.args | 24 +++++ .../i440fx-controllers-pciopts.xml | 36 +++++++ .../pseries-controllers-pciopts.args | 22 ++++ .../pseries-controllers-pciopts.xml | 36 +++++++ .../qemuxml2argvdata/q35-controllers-pciopts.args | 28 +++++ tests/qemuxml2argvdata/q35-controllers-pciopts.xml | 60 +++++++++++ tests/qemuxml2argvtest.c | 17 +++ .../i440fx-controllers-pciopts.xml | 42 ++++++++ tests/qemuxml2xmloutdata/pcie-expander-bus.xml | 4 +- .../pseries-controllers-pciopts.xml | 41 ++++++++ .../qemuxml2xmloutdata/q35-controllers-pciopts.xml | 63 +++++++++++ tests/qemuxml2xmltest.c | 17 +++ 14 files changed, 507 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/i440fx-controllers-pciopts.args create mode 100644 tests/qemuxml2argvdata/i440fx-controllers-pciopts.xml create mode 100644 tests/qemuxml2argvdata/pseries-controllers-pciopts.args create mode 100644 tests/qemuxml2argvdata/pseries-controllers-pciopts.xml create mode 100644 tests/qemuxml2argvdata/q35-controllers-pciopts.args create mode 100644 tests/qemuxml2argvdata/q35-controllers-pciopts.xml create mode 100644 tests/qemuxml2xmloutdata/i440fx-controllers-pciopts.xml create mode 100644 tests/qemuxml2xmloutdata/pseries-controllers-pciopts.xml create mode 100644 tests/qemuxml2xmloutdata/q35-controllers-pciopts.xml -- 2.14.3

2 7

[libvirt] [PATCH v2 1/3] libxl: add support for multiple IP addresses
by Marek Marczykowski-Górecki 11 Dec '17

11 Dec '17

vif-* scripts support it for a long time, and expect addresses to be separated by spaces. Add appropriate support to libxl driver. --- changed in v2: - moved libxlMakeIPList function to xenconfig/xen_common.c and renamed to xenMakeIPList --- src/libxl/libxl_conf.c | 5 +++-- src/libxl/libxl_domain.c | 12 ------------ src/xenconfig/xen_common.c | 24 ++++++++++++++++++++++++ src/xenconfig/xen_common.h | 1 + 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 2a9be69..970cff2 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -49,6 +49,7 @@ #include "virstoragefile.h" #include "secret_util.h" #include "cpu/cpu.h" +#include "xen_common.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -1144,7 +1145,7 @@ libxlMakeNic(virDomainDefPtr def, if (VIR_STRDUP(x_nic->script, l_nic->script) < 0) goto cleanup; if (l_nic->guestIP.nips > 0) { - x_nic->ip = virSocketAddrFormat(&l_nic->guestIP.ips[0]->address); + x_nic->ip = xenMakeIPList(&l_nic->guestIP); if (!x_nic->ip) goto cleanup; } @@ -1160,7 +1161,7 @@ libxlMakeNic(virDomainDefPtr def, } if (l_nic->guestIP.nips > 0) { - x_nic->ip = virSocketAddrFormat(&l_nic->guestIP.ips[0]->address); + x_nic->ip = xenMakeIPList(&l_nic->guestIP); if (!x_nic->ip) goto cleanup; } diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index d054b07..395c8a9 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -294,18 +294,6 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, def->os.type != VIR_DOMAIN_OSTYPE_HVM) dev->data.chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN; - if (dev->type == VIR_DOMAIN_DEVICE_NET && - (dev->data.net->type == VIR_DOMAIN_NET_TYPE_BRIDGE || - dev->data.net->type == VIR_DOMAIN_NET_TYPE_ETHERNET || - dev->data.net->type == VIR_DOMAIN_NET_TYPE_NETWORK)) { - if (dev->data.net->guestIP.nips > 1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("multiple IP addresses not supported on device type %s"), - virDomainNetTypeToString(dev->data.net->type)); - return -1; - } - } - if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV || (dev->type == VIR_DOMAIN_DEVICE_NET && dev->data.net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV)) { diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index ded0aca..7f838b6 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -1166,6 +1166,30 @@ xenFormatSerial(virConfValuePtr list, virDomainChrDefPtr serial) return -1; } +char * +xenMakeIPList(virNetDevIPInfoPtr guestIP) +{ + size_t i; + char **address_array; + char *ret = NULL; + + if (VIR_ALLOC_N(address_array, guestIP->nips + 1) < 0) + return NULL; + + for (i = 0; i < guestIP->nips; i++) { + address_array[i] = virSocketAddrFormat(&guestIP->ips[i]->address); + if (!address_array[i]) + goto cleanup; + } + address_array[guestIP->nips] = NULL; + + ret = virStringListJoin((const char**)address_array, " "); + + cleanup: + while (i > 0) + VIR_FREE(address_array[--i]); + return ret; +} static int xenFormatNet(virConnectPtr conn, diff --git a/src/xenconfig/xen_common.h b/src/xenconfig/xen_common.h index 9055692..3b7a5db 100644 --- a/src/xenconfig/xen_common.h +++ b/src/xenconfig/xen_common.h @@ -67,6 +67,7 @@ int xenFormatConfigCommon(virConfPtr conf, virConnectPtr conn, const char *nativeFormat); +char *xenMakeIPList(virNetDevIPInfoPtr guestIP); int xenDomainDefAddImplicitInputDevice(virDomainDefPtr def); base-commit: 9f0ccc717ba9026c30ce38951a354dd66fa12e3b -- git-series 0.9.1

3 10

[libvirt] [PATCH] qemu: Avoid comparing size_t with -1
by Jiri Denemark 11 Dec '17

11 Dec '17

ncpus would be -1 on error and the cleanup for loop would not be skipped in this case. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8c65de956e..9673ef857b 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2965,7 +2965,7 @@ virQEMUCapsFetchCPUDefinitions(qemuMonitorPtr mon) size_t i; if ((ncpus = qemuMonitorGetCPUDefinitions(mon, &cpus)) < 0) - goto error; + return NULL; if (!(models = virDomainCapsCPUModelsNew(ncpus))) goto error; -- 2.15.1

2 1

[libvirt] [PATCH 0/2] qemu: Fix upgrade with running domains with host-model CPUs
by Jiri Denemark 11 Dec '17

11 Dec '17

When upgrading old libvirt on a host with EPYC host CPU (or any other CPU which was added to cpu_map.xml in newer libvirt releases), we would replace host-model CPU definition for running domains to EPYC even though a different CPU model was used to start the domain. And sync old libvirt doesn't know about EPYC, migrating the domain to another host running the same old libvirt would be impossible. https://bugzilla.redhat.com/show_bug.cgi?id=1521202 Jiri Denemark (2): qemu: Separate fetching CPU definitions from filling qemuCaps qemu: Make sure host-model uses CPU model supported by QEMU src/qemu/qemu_capabilities.c | 59 +++++++++++++++++++++++++++----------------- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_process.c | 30 ++++++++++++++++++++++ 3 files changed, 68 insertions(+), 22 deletions(-) -- 2.15.1

3 5

[libvirt] [PATCH v3] qemuDomainUndefineFlags: Fix error message
by Michal Privoznik 11 Dec '17

11 Dec '17

https://bugzilla.redhat.com/show_bug.cgi?id=1522706 If domain is active, but the undefine API was called without the VIR_DOMAIN_UNDEFINE_KEEP_NVRAM flag set, the following incorrect error message is produced: error: Requested operation is not valid: cannot delete inactive domain with nvram Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Diff to v2: - Drop state from the message completely src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index aa30b119a..d18cea4d0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7538,7 +7538,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, } } else if (!(flags & VIR_DOMAIN_UNDEFINE_KEEP_NVRAM)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot delete inactive domain with nvram")); + _("cannot delete domain with nvram")); goto endjob; } } -- 2.13.6

2 1

[libvirt] [PATCH] news: mention multiple IP addresses support for Xen
by Jim Fehlig 11 Dec '17

11 Dec '17

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- docs/news.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 0ec9857e2..7509416ec 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -37,6 +37,12 @@ <section title="New features"> </section> <section title="Improvements"> + <change> + <summary> + Xen: Add support for multiple IP addresses on + <code><interface></code> devices + </summary> + </change> </section> <section title="Bug fixes"> </section> -- 2.15.1

2 1

[libvirt] [PATCH v2] qemuDomainUndefineFlags: Fix error message
by Michal Privoznik 11 Dec '17

11 Dec '17

https://bugzilla.redhat.com/show_bug.cgi?id=1522706 If domain is active, but the undefine API was called without the VIR_DOMAIN_UNDEFINE_KEEP_NVRAM flag set, the following incorrect error message is produced: error: Requested operation is not valid: cannot delete inactive domain with nvram Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Diff to v1: - switched to different code pattern to make it easier for translators src/qemu/qemu_driver.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index aa30b119a..cc5520c54 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7537,8 +7537,13 @@ qemuDomainUndefineFlags(virDomainPtr dom, goto endjob; } } else if (!(flags & VIR_DOMAIN_UNDEFINE_KEEP_NVRAM)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot delete inactive domain with nvram")); + if (virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("cannot delete active domain with nvram")); + } else { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("cannot delete inactive domain with nvram")); + } goto endjob; } } -- 2.13.6

3 2

[libvirt] [libvirt-php][PATCH 0/5] Couple of fixes
by Michal Privoznik 11 Dec '17

11 Dec '17

Mostly memleaks. Michal Privoznik (5): maint: Drop INSTALL install-sh and missing src: Don't leak @uuid in libvirt_nwfilter_get_uuid_string src: Fix a typo in php_libvirt_nwfilter_dtor src: Free @filters array in libvirt_list_all_nwfilters src: Don't leak connection_get_emulator retval INSTALL | 370 ---------------------------------- install-sh | 501 ----------------------------------------------- missing | 215 -------------------- src/libvirt-connection.c | 2 + src/libvirt-nwfilter.c | 7 +- src/libvirt-php.c | 11 +- 6 files changed, 14 insertions(+), 1092 deletions(-) delete mode 100644 INSTALL delete mode 100755 install-sh delete mode 100755 missing -- 2.13.6

2 12

[libvirt] [PATCH] qemuDomainUndefineFlags: Fix error message
by Michal Privoznik 11 Dec '17

11 Dec '17

https://bugzilla.redhat.com/show_bug.cgi?id=1522706 If domain is active, but the undefine API was called without the VIR_DOMAIN_UNDEFINE_KEEP_NVRAM flag set, the following incorrect error message is produced: error: Requested operation is not valid: cannot delete inactive domain with nvram Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index aa30b119a..f2e8f3edc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7537,8 +7537,10 @@ qemuDomainUndefineFlags(virDomainPtr dom, goto endjob; } } else if (!(flags & VIR_DOMAIN_UNDEFINE_KEEP_NVRAM)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot delete inactive domain with nvram")); + virReportError(VIR_ERR_OPERATION_INVALID, + _("cannot delete %s domain with nvram"), + virDomainObjIsActive(vm) ? + _("active") : _("inactive")); goto endjob; } } -- 2.13.6

2 1

[libvirt] [PATCH v3 00/12] Move qemu command line controller checks to qemuDomainDeviceDefValidateController* checks
by John Ferlan 09 Dec '17

09 Dec '17

v2: https://www.redhat.com/archives/libvir-list/2017-December/msg00173.html Changes since v2: * Push a few patches from v1 that were ACK'd * Make the Skip helper private to qemu_command.c and just copied the various skip checks from the new helper into the specific controller validate helper to make it painfully obvious what was being skipped rather than having common code handle that and possibly obsfuscate those details from the casual reader. John Ferlan (11): qemu: Introduce qemuBuildSkipController qemu: Introduce qemuDomainDeviceDefValidateController qemu: Move CCW S390 Address check to controller def validate qemu: Introduce qemuDomainDeviceDefValidateControllerSCSI qemu: Introduce qemuDomainDeviceDefValidateControllerPCI qemu: Use virDomainPCIControllerOpts in qemuBuildControllerDevStr qemu: Move PCI command modelName check to controller def validate qemu: Move PCI command modelName TypeToString to controller def validate qemu: Move PCI more command checks to controller def validate qemu: Complete PCI command checks to controller def validate qemu: Introduce qemuDomainDeviceDefValidateControllerSATA Lin Ma (1): qemu: Introduce qemuDomainDeviceDefValidateControllerIDE src/qemu/qemu_command.c | 497 ++++++++---------------------------------------- src/qemu/qemu_domain.c | 469 ++++++++++++++++++++++++++++++++++++++++++++- tests/qemumemlocktest.c | 14 ++ tests/qemuxml2xmltest.c | 5 +- 4 files changed, 564 insertions(+), 421 deletions(-) -- 2.13.6

3 27

[libvirt] [PATCH] migration.html: Clarify configuration file handling docs
by Jiri Denemark 08 Dec '17

08 Dec '17

Migration never removes any configuration files on the destination host. Thus when the domain is already defined on the destination, it will stay persistent even after migration without --persist. https://bugzilla.redhat.com/show_bug.cgi?id=1514930 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- docs/migration.html.in | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/migration.html.in b/docs/migration.html.in index de7d4def75..7c345b65b7 100644 --- a/docs/migration.html.in +++ b/docs/migration.html.in @@ -206,14 +206,14 @@ <h2><a id="config">Configuration file handling</a></h2> <p> - There are two types of virtual machine known to libvirt. A <em>transient</em> + There are two types of virtual machines known to libvirt. A <em>transient</em> guest only exists while it is running, and has no configuration file stored on disk. A <em>persistent</em> guest maintains a configuration file on disk even when it is not running. </p> <p> - By default, a migration operation will not attempt to change any configuration + By default, a migration operation will not attempt to modify any configuration files that may be stored on either the source or destination host. It is the administrator, or management application's, responsibility to manage distribution of configuration files (if desired). It is important to note that the <code>/etc/libvirt</code> @@ -230,14 +230,14 @@ host and removed on the original. </li> <li>Centralized configuration files outside libvirt, in a database. A data center - management application may not storage configuration files at all. Instead it + management application may not store configuration files at all. Instead it may generate libvirt XML on the fly when a guest is booted. It will typically use transient guests, and thus not have to consider configuration files during migration. </li> <li>Distributed configuration inside libvirt. The configuration file for each guest is copied to every host where the guest is able to run. Upon migration - the existing config merely needs to be updated with any changes + the existing config merely needs to be updated with any changes. </li> <li>Ad-hoc configuration management inside libvirt. Each guest is tied to a specific host and rarely migrated. When migration is required, the config @@ -246,7 +246,7 @@ </ul> <p> - As mentioned above, libvirt will not touch configuration files during + As mentioned above, libvirt will not modify configuration files during migration by default. The <code>virsh</code> command has two flags to influence this behaviour. The <code>--undefine-source</code> flag will cause the configuration file to be removed on the source host @@ -265,12 +265,12 @@ <th colspan="3">After migration</th> </tr> <tr class="subhead"> - <th>Guest type</th> + <th>Source type</th> <th>Source config</th> <th>Dest config</th> <th>--undefine-source</th> <th>--persist</th> - <th>Guest type</th> + <th>Dest type</th> <th>Source config</th> <th>Dest config</th> </tr> @@ -325,9 +325,9 @@ <td class="y">Y</td> <td class="n">N</td> <td class="n">N</td> - <td>Transient</td> - <td class="n">N</td> + <td>Persistent</td> <td class="n">N</td> + <td class="y">Y<br/>(unchanged dest config)</td> </tr> <tr> <td>Transient</td> @@ -335,9 +335,9 @@ <td class="y">Y</td> <td class="y">Y</td> <td class="n">N</td> - <td>Transient</td> - <td class="n">N</td> + <td>Persistent</td> <td class="n">N</td> + <td class="y">Y<br/>(unchanged dest config)</td> </tr> <tr> <td>Transient</td> @@ -347,7 +347,7 @@ <td class="y">Y</td> <td>Persistent</td> <td class="n">N</td> - <td class="y">Y</td> + <td class="y">Y<br/>(replaced with source)</td> </tr> <tr> <td>Transient</td> @@ -357,7 +357,7 @@ <td class="y">Y</td> <td>Persistent</td> <td class="n">N</td> - <td class="y">Y</td> + <td class="y">Y<br/>(replaced with source)</td> </tr>  @@ -411,7 +411,7 @@ <td class="n">N</td> <td>Persistent</td> <td class="y">Y</td> - <td class="y">Y</td> + <td class="y">Y<br/>(unchanged dest config)</td> </tr> <tr> <td>Persistent</td> @@ -421,7 +421,7 @@ <td class="n">N</td> <td>Persistent</td> <td class="n">N</td> - <td class="y">Y</td> + <td class="y">Y<br/>(unchanged dest config)</td> </tr> <tr> <td>Persistent</td> @@ -431,7 +431,7 @@ <td class="y">Y</td> <td>Persistent</td> <td class="y">Y</td> - <td class="y">Y</td> + <td class="y">Y<br/>(replaced with source)</td> </tr> <tr> <td>Persistent</td> @@ -441,7 +441,7 @@ <td class="y">Y</td> <td>Persistent</td> <td class="n">N</td> - <td class="y">Y</td> + <td class="y">Y<br/>(replaced with source)</td> </tr> </tbody> </table> -- 2.15.1

2 1

[libvirt] [libvirt-php][PATCH 0/7] Rework libvirt_domain_new a bit
by Michal Privoznik 08 Dec '17

08 Dec '17

Patches for: https://bugzilla.redhat.com/show_bug.cgi?id=1513190 You can also get the patches from my github: https://github.com/zippy2/libvirt-php/commits/libvirt_domain_new Apart from usual case where I just push patches immediately, I'm gonna give others chance to review since it's not trivial change set. Michal Privoznik (7): Make installation_get_xml hurt my eyes less. Rework libvirt_domain_new a bit installation_get_xml: Don't override defaults of <on_reboot/> and friends util: Introduce VIR_FREE libvirt_domain_new: Resolve couple of memleaks installation_get_xml: Resolve couple of memleaks src: Use VIR_FREE instead of free src/libvirt-connection.c | 26 ++--- src/libvirt-domain.c | 278 +++++++++++++++++++++++++++-------------------- src/libvirt-network.c | 26 ++--- src/libvirt-node.c | 9 +- src/libvirt-nodedev.c | 52 ++++----- src/libvirt-nwfilter.c | 6 +- src/libvirt-php.c | 234 ++++++++++++++++++++------------------- src/libvirt-php.h | 2 +- src/libvirt-snapshot.c | 4 +- src/libvirt-storage.c | 20 ++-- src/util.c | 2 +- src/util.h | 6 + src/vncfunc.c | 5 +- 13 files changed, 362 insertions(+), 308 deletions(-) -- 2.13.6

2 15

[libvirt] [PATCH v2] qemu: Add support for hot unplug redirdev device
by Chen Hanxiao 08 Dec '17

08 Dec '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We lacked of hot unplugging redirdev device. This patch add support for it. We could use detach-device --live now. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- v2: add news section docs/news.xml | 9 ++++ src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_hotplug.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_hotplug.h | 3 ++ 4 files changed, 126 insertions(+), 1 deletion(-) diff --git a/docs/news.xml b/docs/news.xml index 0ec9857e2..ec32dc850 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -35,6 +35,15 @@ <libvirt> <release version="v4.0.0" date="unreleased"> <section title="New features"> + <change> + <summary> + qemu: Add support for hot unplug redirdev device + </summary> + <description> + We've supported hotplug redirdev device, but lacked of + hot unplug feature. Now we can do it by libvirt. + </description> + </change> </section> <section title="Improvements"> </section> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index aa30b119a..180bd0ebf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7787,6 +7787,9 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_INPUT: ret = qemuDomainDetachInputDevice(vm, dev->data.input); break; + case VIR_DOMAIN_DEVICE_REDIRDEV: + ret = qemuDomainDetachRedirdevDevice(driver, vm, dev->data.redirdev); + break; case VIR_DOMAIN_DEVICE_FS: case VIR_DOMAIN_DEVICE_SOUND: @@ -7796,7 +7799,6 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_MEMBALLOON: case VIR_DOMAIN_DEVICE_NVRAM: - case VIR_DOMAIN_DEVICE_REDIRDEV: case VIR_DOMAIN_DEVICE_NONE: case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 24631cb8f..d97aa6051 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4375,6 +4375,74 @@ qemuDomainRemoveInputDevice(virDomainObjPtr vm, return 0; } +static int +qemuDomainRemoveRedirdevDevice(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainRedirdevDefPtr redirdev) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + virObjectEventPtr event; + char *charAlias = NULL; + char *tlsAlias = NULL; + char *secAlias = NULL; + ssize_t idx; + int ret = -1; + + VIR_DEBUG("Removing redirdev device %s from domain %p %s", + redirdev->info.alias, vm, vm->def->name); + + if (!(charAlias = qemuAliasChardevFromDevAlias(redirdev->info.alias))) + goto cleanup; + + if (redirdev->source->type == VIR_DOMAIN_CHR_TYPE_TCP && + redirdev->source->data.tcp.haveTLS == VIR_TRISTATE_BOOL_YES) { + + if (!(tlsAlias = qemuAliasTLSObjFromSrcAlias(charAlias))) + goto cleanup; + + /* Best shot at this as the secinfo is destroyed after process launch + * and this path does not recreate it. Thus, if the config has the + * secret UUID and we have a serial TCP chardev, then formulate a + * secAlias which we'll attempt to destroy. */ + if (cfg->chardevTLSx509secretUUID && + !(secAlias = qemuDomainGetSecretAESAlias(charAlias, false))) + goto cleanup; + } + + qemuDomainObjEnterMonitor(driver, vm); + /* Usually device_del will remove related chardev as well, + * So we don't need to check its return value. + */ + ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias)); + + if (tlsAlias) + ignore_value(qemuMonitorDelObject(priv->mon, tlsAlias)); + if (secAlias) + ignore_value(qemuMonitorDelObject(priv->mon, secAlias)); + + if (qemuDomainObjExitMonitor(driver, vm) < 0) + goto cleanup; + + virDomainAuditRedirdev(vm, redirdev, "detach", true); + + event = virDomainEventDeviceRemovedNewFromObj(vm, redirdev->info.alias); + qemuDomainEventQueue(driver, event); + + if ((idx = virDomainRedirdevDefFind(vm->def, redirdev)) >= 0) + virDomainRedirdevDefRemove(vm->def, idx); + qemuDomainReleaseDeviceAddress(vm, &redirdev->info, NULL); + virDomainRedirdevDefFree(redirdev); + + ret = 0; + + cleanup: + VIR_FREE(charAlias); + VIR_FREE(tlsAlias); + VIR_FREE(secAlias); + return ret; +} + int qemuDomainRemoveDevice(virQEMUDriverPtr driver, @@ -5112,6 +5180,49 @@ qemuDomainDetachWatchdog(virQEMUDriverPtr driver, return ret; } +int +qemuDomainDetachRedirdevDevice(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainRedirdevDefPtr redirdev) +{ + int ret = -1; + qemuDomainObjPrivatePtr priv = vm->privateData; + virDomainDefPtr vmdef = vm->def; + virDomainRedirdevDefPtr tmpRedirdevDef; + ssize_t idx; + + if ((idx = virDomainRedirdevDefFind(vmdef, redirdev)) < 0) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("no matching redirdev was not found")); + return -1; + } + + tmpRedirdevDef = vm->def->redirdevs[idx]; + + if (!tmpRedirdevDef->info.alias) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("alias not set for redirdev device")); + return -1; + } + + qemuDomainMarkDeviceForRemoval(vm, &tmpRedirdevDef->info); + + qemuDomainObjEnterMonitor(driver, vm); + if (qemuMonitorDelDevice(priv->mon, tmpRedirdevDef->info.alias) < 0) { + ignore_value(qemuDomainObjExitMonitor(driver, vm)); + goto cleanup; + } + if (qemuDomainObjExitMonitor(driver, vm) < 0) + goto cleanup; + + if ((ret = qemuDomainWaitForDeviceRemoval(vm)) == 1) + ret = qemuDomainRemoveRedirdevDevice(driver, vm, tmpRedirdevDef); + + cleanup: + qemuDomainResetDeviceRemoval(vm); + return ret; +} + int qemuDomainDetachNetDevice(virQEMUDriverPtr driver, diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 3e0d618e0..6c642c4fd 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -125,6 +125,9 @@ int qemuDomainDetachShmemDevice(virQEMUDriverPtr driver, int qemuDomainDetachWatchdog(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainWatchdogDefPtr watchdog); +int qemuDomainDetachRedirdevDevice(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainRedirdevDefPtr redirdev); int qemuDomainAttachInputDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, -- 2.14.3

2 2

[libvirt] [PATCH] qemu: blockjob: Reset disk source index after pivot
by Peter Krempa 07 Dec '17

07 Dec '17

Since we are re-detecting the backing chain after pivoting to the active block commit target (or block copy target) the disk index needs to be reset to 0. This is necessary since we move a member of the backing chain to disk->src but clear indexes only starting from disk->src->backingStore. The freshly detected images have indexes starting from 1, but since we've pivoted into an image which was previously a backing store it would have a non-0 index. The lookup function would then return the top of the chain for queries like 'vda[1]' instead of the first backing store. This problem will not be present once we keep the disk indexes stable. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1519745 --- src/qemu/qemu_blockjob.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 0b1616a214..617e4ee564 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -175,6 +175,7 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver, disk->mirror = NULL; disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_NONE; disk->mirrorJob = VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN; + disk->src->id = 0; ignore_value(qemuDomainDetermineDiskChain(driver, vm, disk, true, true)); ignore_value(qemuBlockNodeNamesDetect(driver, vm, asyncJob)); -- 2.15.0

2 1

[libvirt] [PATCH] libvirt-python : PyObject memory leak
by Peng Hao 07 Dec '17

07 Dec '17

libvirt_virConnectDomainEventTunableCallback leak a PyObject Signed-off-by: Peng Hao <peng.hao2(a)zte.com.cn> Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- libvirt-override.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt-override.c b/libvirt-override.c index d746350..eab9b62 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -6665,6 +6665,7 @@ libvirt_virConnectDomainEventTunableCallback(virConnectPtr conn ATTRIBUTE_UNUSED Py_XDECREF(pyobj_dict); } else { Py_DECREF(pyobj_ret); + Py_DECREF(pyobj_dict); ret = 0; } -- 1.8.3.1

2 1

[libvirt] [REBASE PATCH v2 00/10] Implement query-dump command
by John Ferlan 07 Dec '17

07 Dec '17

Original v2: https://www.redhat.com/archives/libvir-list/2017-November/msg00779.html Rebase due to additional capabilitiies v2 Cover: v1: https://www.redhat.com/archives/libvir-list/2017-November/msg00731.html Differences from v1 (besides more patches) Rather than use a timing loop in order to fetch the dump stats and the presence of the 'query-dump' command, let's use the DUMP_COMPLETED event and wire that up in order to determine when the dump has been completed. In the mean time, the previous timing loop is converted into a qemuDomainGetJobInfoDumpStats to be called if the "right conditions" exist. Also found/fixed a couple of minor issues from v1 regarding usage "dumpformat" instead of just "format" from my patch 2 adjustment and a type for qemuMonitorDumpStatus (was qemuMontiorDumpStatus in v1). NB: (from v1 cover): Details in the patches. Essentially though QEMU 2.6 added the ability to perform the 'dump-guest-memory' via a thread by adding a 'detach' boolean to the command. In order to watch the progress of the thread the 'query-dump' command was added. The query-dump will return just the current status, the total size to be dumped, and the current progress. So using the migrate stats data in the DomainJobInfo we can then save our current progress allowing tools such as virsh to watch that progress. As an added benefit, the dump-guest-memory is now truly asynchronous. John Ferlan (10): qemu: Clean up style for the qemuDumpToFd definition qemu: Alter dump-guest-memory command generation qemu: Add support for DUMP_COMPLETED event qemu: Introduce qemuProcessHandleDumpCompleted qemu: Introduce qemuMonitor[JSON]QueryDump qemu: Add new parameter to qemuMonitorDumpToFd qemu: Introduce qemuDomainGetJobInfoMigrationStats qemu: Introduce qemuDomainGetJobInfoDumpStats qemu: Add dump completed event to the capabilities qemu: Allow showing the dump progress for memory only dump src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 2 + src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 157 ++++++++++++++++++--- src/qemu/qemu_monitor.c | 39 ++++- src/qemu/qemu_monitor.h | 33 ++++- src/qemu/qemu_monitor_json.c | 122 ++++++++++++++-- src/qemu/qemu_monitor_json.h | 7 +- src/qemu/qemu_process.c | 23 +++ .../caps_2.10.0-gicv2.aarch64.xml | 1 + .../caps_2.10.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + tests/qemumonitorjsontest.c | 3 +- 27 files changed, 365 insertions(+), 42 deletions(-) -- 2.13.6

2 12

[libvirt] [PATCHv2 0/7] Remove some repetitive code from qemuDomainNamespace* functions
by Ján Tomko 07 Dec '17

07 Dec '17

Rebased + rename path to paths in one more function. Ján Tomko (7): qemuDomainNamespaceTeardownHostdev: rename path to paths qemuDomainNamespaceSetupHostdev: rename path to paths Introduce qemuDomainNamespaceMknodPaths Introduce qemuDomainNamespaceMknodPath Introduce qemuDomainNamespaceUnlinkPaths Introduce qemuDomainNamespaceUnlinkPath Do not pass driver to qemuDomainNamespace{Setup,Teardown} functions src/qemu/qemu_domain.c | 394 ++++++++++++++++++------------------------------ src/qemu/qemu_domain.h | 30 ++-- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 42 +++--- 4 files changed, 176 insertions(+), 292 deletions(-) -- 2.13.6

3 11

[libvirt] [PATCH] qemuDomainNamespaceSetupDisk: initialize npaths
by Ján Tomko 07 Dec '17

07 Dec '17

Introduced by commit d3db304. Reported-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as trivial. 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 75cecb1bb..d7150cae1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10034,7 +10034,7 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm, { virStorageSourcePtr next; char **paths = NULL; - size_t npaths; + size_t npaths = 0; int ret = -1; if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) -- 2.13.6

1 0

[libvirt] [PATCH] docs: domain: Fix documentation of the 'snapshot' attribute for <disk>
by Peter Krempa 07 Dec '17

07 Dec '17

Emphasise the valid values by wrapping them in <code> and reword the last sentence so that the invalid value example can be dropped. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1523070 --- docs/formatdomain.html.in | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 29a9681467..01db83e608 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2584,17 +2584,16 @@ <dt><code>snapshot</code></dt> <dd> Indicates the default behavior of the disk during disk snapshots: - "internal" requires a file format such as qcow2 that can store - both the snapshot and the data changes since the snapshot; - "external" will separate the snapshot from the live data; and - "no" means the disk will not participate in snapshots. Read-only - disks default to "no", while the default for other disks depends - on the hypervisor's capabilities. Some hypervisors allow a - per-snapshot choice as well, during + "<code>internal</code>" requires a file format such as qcow2 that + can store both the snapshot and the data changes since the snapshot; + "<code>external</code>" will separate the snapshot from the live + data; and "<code>no</code>" means the disk will not participate in + snapshots. Read-only disks default to "<code>no</code>", while the + default for other disks depends on the hypervisor's capabilities. + Some hypervisors allow a per-snapshot choice as well, during <a href="formatsnapshot.html">domain snapshot creation</a>. - Not all snapshot modes are supported; for example, - <code>snapshot='yes'</code> with a transient disk generally - does not make sense. + Not all snapshot modes are supported; for example, enabling + snapshots with a transient disk generally does not make sense. <span class="since">Since 0.9.5</span> </dd> </dl> -- 2.15.0

2 1

[libvirt] [PATCH] virerror: mark VIR_ERR_AGENT_UNSYNCED as DEPRECATED
by Chen Hanxiao 07 Dec '17

07 Dec '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Since commit 5e5019bf, we've no longer use VIR_ERR_AGENT_UNSYNCED anymore. Mark it as DEPRECATED. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- include/libvirt/virterror.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index d2b5f1fd4..91ba29784 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -318,7 +318,7 @@ typedef enum { VIR_ERR_NO_SERVER = 95, /* Server was not found */ VIR_ERR_NO_CLIENT = 96, /* Client was not found */ VIR_ERR_AGENT_UNSYNCED = 97, /* guest agent replies with wrong id - to guest-sync command */ + to guest-sync command (DEPRECATED)*/ VIR_ERR_LIBSSH = 98, /* error in libssh transport driver */ } virErrorNumber; -- 2.14.3

2 3

[libvirt] Snapshot: Request to review patch
by Madhu Pavan 07 Dec '17

07 Dec '17

Hi all, Could someone please review https://www.redhat.com/archives/libvir-list/2017-October/msg01333.html This patch is based on comments from Jiri Denemark ( https://www.redhat.com/archives/libvir-list/2017-October/msg01275.html ) This patch potentially fixes https://bugzilla.redhat.com/show_bug.cgi?id=1494471 Thanks, Madhu.

2 1