- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Check duplicate WWNs also for hotplugged disks
by Peter Krempa 10 Jul '15

10 Jul '15

In commit 714b38cb232bcbbd7487af4c058fa6d0999b3326 I tried to avoid having two disks with the same WWN in a VM. I forgot to check the hotplug paths though which make it possible bypass that check. Reinforce the fix by checking the wwn when attaching the disk. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1208009 --- src/conf/domain_conf.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1f7862b..5a9a88d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -22135,6 +22135,34 @@ virDomainDeviceInfoCheckBootIndex(virDomainDefPtr def ATTRIBUTE_UNUSED, return 0; } + +/** + * virDomainDefGetDiskByWWN: + * @def: domain definition + * @wwn: wwn of a disk to find + * + * Returns a disk definition pointer corresponding to the given WWN identifier + * or NULL either if @wwn was NULL or if disk with given WWN is not present in + * the domain definition. + */ +static virDomainDiskDefPtr +virDomainDefGetDiskByWWN(virDomainDefPtr def, + const char *wwn) +{ + size_t i; + + if (!wwn) + return NULL; + + for (i = 0; i < def->ndisks; i++) { + if (STREQ_NULLABLE(def->disks[i]->wwn, wwn)) + return def->disks[i]; + } + + return NULL; +} + + int virDomainDefCompatibleDevice(virDomainDefPtr def, virDomainDeviceDefPtr dev, @@ -22178,6 +22206,15 @@ virDomainDefCompatibleDevice(virDomainDefPtr def, } } + if (dev->type == VIR_DOMAIN_DEVICE_DISK) { + if (!!virDomainDefGetDiskByWWN(def, dev->data.disk->wwn)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Domain already has a disk with wwn '%s'"), + dev->data.disk->wwn); + return -1; + } + } + return 0; } -- 2.4.5

2 2

[libvirt] [PATCH] cpu: Add support for MPX and AVX512 Intel features
by Jiri Denemark 10 Jul '15

10 Jul '15

Corresponding QEMU commits: MPX 79e9ebebbf2a00c46fcedb6dc7dd5e12bbd30216 AVX512 9aecd6f8aef653cea58932f06a2740299dbe5fd3 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu_map.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index b9e95cf..b924bd3 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -317,6 +317,12 @@ <feature name='rtm'> <cpuid function='0x00000007' ebx='0x00000800'/> </feature> + <feature name='mpx'> + <cpuid function='0x00000007' ebx='0x00004000'/> + </feature> + <feature name='avx512f'>  + <cpuid function='0x00000007' ebx='0x00010000'/> + </feature> <feature name='rdseed'> <cpuid function='0x00000007' ebx='0x00040000'/> </feature> @@ -326,6 +332,15 @@ <feature name='smap'> <cpuid function='0x00000007' ebx='0x00100000'/> </feature> + <feature name='avx512pf'>  + <cpuid function='0x00000007' ebx='0x04000000'/> + </feature> + <feature name='avx512er'>  + <cpuid function='0x00000007' ebx='0x08000000'/> + </feature> + <feature name='avx512cd'>  + <cpuid function='0x00000007' ebx='0x10000000'/> + </feature>  <feature name='invtsc' migratable='no'> -- 2.4.5

2 1

[libvirt] [PATCH v3] qemu: Use heads parameter for QXL driver
by Frediano Ziglio 10 Jul '15

10 Jul '15

Allows to specify maximum number of head to QXL driver. The patch to support the "max_outputs" in Qemu is still not merged but I got agreement on the name of the argument. Actually can be a compatiblity problem as heads in the XML configuration was set by default to '1'. Signed-off-by: Frediano Ziglio <fziglio(a)redhat.com> --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 5 +++++ 3 files changed, 8 insertions(+) Changes from v2: - removed capability tests (Martin Kletzander) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 27686c3..68060cd 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -287,6 +287,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "aarch64-off", "vhost-user-multiqueue", /* 190 */ + "qxl-vga.max_outputs", ); @@ -1649,6 +1650,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxl[] = { static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxlVga[] = { { "vgamem_mb", QEMU_CAPS_QXL_VGA_VGAMEM }, + { "max_outputs", QEMU_CAPS_QXL_VGA_MAX_OUTPUTS }, }; struct virQEMUCapsObjectTypeProps { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 30aa504..02f9e81 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -230,6 +230,7 @@ typedef enum { QEMU_CAPS_DEVICE_PCI_SERIAL = 188, /* -device pci-serial */ QEMU_CAPS_CPU_AARCH64_OFF = 189, /* -cpu ...,aarch64=off */ QEMU_CAPS_VHOSTUSER_MULTIQUEUE = 190, /* vhost-user with -netdev queues= */ + QEMU_CAPS_QXL_VGA_MAX_OUTPUTS = 191, /* qxl-vga.max_outputs */ QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 25a7bc6..59666e7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5661,6 +5661,11 @@ qemuBuildDeviceVideoStr(virDomainDefPtr def, /* QEMU accepts mebibytes for vgamem_mb. */ virBufferAsprintf(&buf, ",vgamem_mb=%u", video->vgamem / 1024); } + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VGA_MAX_OUTPUTS) && + video->heads > 0) { + virBufferAsprintf(&buf, ",max_outputs=%u", video->heads); + } } else if (video->vram && ((video->type == VIR_DOMAIN_VIDEO_TYPE_VGA && virQEMUCapsGet(qemuCaps, QEMU_CAPS_VGA_VGAMEM)) || -- 2.1.0

2 2

[libvirt] [PATCH] qemu: don't use initialized ret in qemuRemoveSharedDevice
by Guido Günther 10 Jul '15

10 Jul '15

This fixes CC qemu/libvirt_driver_qemu_impl_la-qemu_conf.lo qemu/qemu_conf.c: In function 'qemuRemoveSharedDevice': qemu/qemu_conf.c:1384:9: error: 'ret' may be used uninitialized in this function [-Werror=maybe-uninitialized] --- This is only catched by Debian Wheezy's gcc 4.7.2, Jessies gcc 4.9.2 doesn't trap on it. src/qemu/qemu_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 2ab5494..38d4a86 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1381,7 +1381,7 @@ qemuRemoveSharedHostdev(virQEMUDriverPtr driver, { char *dev_path = NULL; char *key = NULL; - int ret; + int ret = -1; if (!qemuIsSharedHostdev(hostdev)) return 0; -- 2.1.4

3 3

[libvirt] [PATCH] qemu: Log all arguments of qemuProcessStart
by Jiri Denemark 10 Jul '15

10 Jul '15

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_process.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ba84182..ee522b9 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4302,9 +4302,10 @@ int qemuProcessStart(virConnectPtr conn, size_t nnicindexes = 0; int *nicindexes = NULL; - VIR_DEBUG("vm=%p name=%s id=%d pid=%llu", - vm, vm->def->name, vm->def->id, - (unsigned long long)vm->pid); + VIR_DEBUG("vm=%p name=%s id=%d asyncJob=%d migrateFrom=%s stdin_fd=%d " + "stdin_path=%s snapshot=%p vmop=%d flags=0x%x", + vm, vm->def->name, vm->def->id, asyncJob, NULLSTR(migrateFrom), + stdin_fd, NULLSTR(stdin_path), snapshot, vmop, flags); /* Okay, these are just internal flags, * but doesn't hurt to check */ -- 2.4.5

2 2

[libvirt] [PATCH] qemu: Drop LFs at the end of error from QEMU log
by Jiri Denemark 10 Jul '15

10 Jul '15

Libvirt's error messages do not end with a LF. However, when reading the error from QEMU log, we would read the LF from the log and keep it in the message. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_monitor.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 93fcc7f..896d9fd 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -407,6 +407,9 @@ qemuMonitorGetErrorFromLog(qemuMonitorPtr mon) if ((len = qemuProcessReadLog(mon->logfd, logbuf, 4096 - 1, 0, true)) <= 0) goto error; + while (len > 0 && logbuf[len - 1] == '\n') + logbuf[--len] = '\0'; + cleanup: errno = orig_errno; VIR_FORCE_CLOSE(mon->logfd); -- 2.4.5

2 2

[libvirt] [PATCH v4 0/5] Add support for migration event
by Jiri Denemark 10 Jul '15

10 Jul '15

The final version of migration event patches which got accepted upstream had to be slightly modified -- the event is only emitted when "events" migration capability is turned on (default is off). Thus a new patch had to be added to libvirt. I'm resending all migration event patches for context even though they haven't changed at all since they were ACKed. Jiri Denemark (5): qemu_monitor: Wire up MIGRATION event qemu: Enable migration events on QMP monitor qemuDomainGetJobStatsInternal: Support migration events qemu: Update migration state according to MIGRATION event qemu: Wait for migration events on domain condition src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.h | 3 ++ src/qemu/qemu_driver.c | 27 ++++++++++++--- src/qemu/qemu_migration.c | 59 +++++++++++++++++++++++++++----- src/qemu/qemu_monitor.c | 16 ++++++++- src/qemu/qemu_monitor.h | 9 +++++ src/qemu/qemu_monitor_json.c | 23 +++++++++++++ src/qemu/qemu_process.c | 80 +++++++++++++++++++++++++++++++++++++------- 9 files changed, 195 insertions(+), 25 deletions(-) -- 2.4.5

2 9

[libvirt] [java] [PATCH 0/6] Fix JNA wrapping, fix memory leaks and wrap security model / label function
by Claudio Bley 10 Jul '15

10 Jul '15

Hi. First and foremost, this series fixes a few mistakes in the wrapping code found by inspecting the org.libvirt.jna.Libvirt interface and the corresponding C types of the XML API file. The last two patches add two missing functions introduced in libvirt 0.6.1. At the end of the day, this means libvirt-java has gained full coverage of the libvirt functions up to and including version 0.8.5. Yay! Claudio Bley (6): JNA: fix wrong return type void vs. int JNA: add CString class and fix memory leaks JNA: simplify freeing memory for C strings Use the CString class for Arrays of CStrings too Implement Domain.getSecurityLabel and add SecurityLabel class Implement Connect.getSecurityModel and add SecurityModel class src/main/java/org/libvirt/Connect.java | 74 +++++++++-------- src/main/java/org/libvirt/Device.java | 9 +- src/main/java/org/libvirt/Domain.java | 57 ++++++------- src/main/java/org/libvirt/DomainSnapshot.java | 8 +- src/main/java/org/libvirt/Interface.java | 7 +- src/main/java/org/libvirt/Library.java | 44 +++------- src/main/java/org/libvirt/Network.java | 14 +--- src/main/java/org/libvirt/NetworkFilter.java | 2 +- src/main/java/org/libvirt/Secret.java | 2 +- src/main/java/org/libvirt/SecurityLabel.java | 49 +++++++++++ src/main/java/org/libvirt/SecurityModel.java | 37 +++++++++ src/main/java/org/libvirt/StoragePool.java | 9 +- src/main/java/org/libvirt/StorageVol.java | 16 +--- src/main/java/org/libvirt/jna/CString.java | 85 +++++++++++++++++++ src/main/java/org/libvirt/jna/Libvirt.java | 114 +++++++++++++++++--------- 15 files changed, 343 insertions(+), 184 deletions(-) create mode 100644 src/main/java/org/libvirt/SecurityLabel.java create mode 100644 src/main/java/org/libvirt/SecurityModel.java create mode 100644 src/main/java/org/libvirt/jna/CString.java -- 2.2.2

2 9

[libvirt] [PATCHv4 0/2] Fix cloning of sparse raw volumes
by Ján Tomko 09 Jul '15

09 Jul '15

v3: https://www.redhat.com/archives/libvir-list/2015-June/msg01422.html v4: * introduces a new no-op patch changing the calculation of remaining allocation * allows partial allocation of new volumes on systems without fallocate Ján Tomko (1): Rewrite allocation tracking when cloning volumes Prerna Saxena (1): Fix cloning of raw, sparse volumes src/storage/storage_backend.c | 29 ++++++++++++++++++----------- src/storage/storage_driver.c | 5 ----- 2 files changed, 18 insertions(+), 16 deletions(-) -- 2.3.6

2 3

[libvirt] [PATCH v2 0/4] fix ejecting removable media and some cleanup
by Pavel Hrdina 09 Jul '15

09 Jul '15

Pavel Hrdina (4): virCondWaitUntil: add another return value virDomainObjSignal: drop this function monitor: detect that eject fails because the tray is locked qemu_hotplug: try harder to eject media src/conf/domain_conf.c | 27 ++++++++-------- src/conf/domain_conf.h | 1 - src/libvirt_private.syms | 1 - src/qemu/qemu_hotplug.c | 73 +++++++++++++++++++++----------------------- src/qemu/qemu_monitor_json.c | 14 +++++++++ src/qemu/qemu_monitor_text.c | 10 ++++++ src/qemu/qemu_process.c | 6 ++-- 7 files changed, 77 insertions(+), 55 deletions(-) -- 2.4.4

3 9

[libvirt] [PATCH 0/7] Simplify qemuMigrationFinish
by Jiri Denemark 09 Jul '15

09 Jul '15

While hacking qemuMigrationFinish I found it pretty hard to follow and revealed few bugs (patches 3 to 5) in the code. Jiri Denemark (7): qemu: Split qemuMigrationFinish qemu: Simplify qemuMigrationFinish qemu: Don't fail migration on save status failure qemu: Kill domain when migration finish fails qemu: Don't report false errors in migration protocol v2 qemuDomainEventQueue: Check if event is non-NULL qemu: Queue events in migration Finish phase ASAP src/qemu/qemu_blockjob.c | 6 +- src/qemu/qemu_cgroup.c | 3 +- src/qemu/qemu_domain.c | 6 +- src/qemu/qemu_driver.c | 87 +++++++------------- src/qemu/qemu_hotplug.c | 26 +++--- src/qemu/qemu_migration.c | 199 ++++++++++++++++++++++------------------------ src/qemu/qemu_process.c | 72 ++++++----------- 7 files changed, 167 insertions(+), 232 deletions(-) -- 2.4.5

2 14

[libvirt] [PATCH] storage: Revert volume obj list updating after volume creation (4749d82a)
by Erik Skultety 09 Jul '15

09 Jul '15

This patch reverts commit 4749d82a which tried to tweak the logic in volume creation. We did realloc and update our object list before we executed volume building within a specific storage backend. If that failed, we had to update (again) our object list to the original state as it was before the build and delete the volume from the pool (even though it didn't exist - this truly depends on the backend). I misunderstood the base idea to be able to poll the status of the volume creation using vol-info. After commit 4749d82a this wasn't possible anymore, although no BZ has been reported yet. Commit 4749d82a also claimed to fix https://bugzilla.redhat.com/show_bug.cgi?id=1223177, but commit c8be606b of the same series as 4749d82ad (which was more of a refactor than a fix) fixes the same issue so the revert should be pretty straightforward. Further more, BZ https://bugzilla.redhat.com/show_bug.cgi?id=1241454 can be fixed with this revert. --- src/storage/storage_driver.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index d3cdbc5..b67a5d8 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1803,6 +1803,9 @@ storageVolCreateXML(virStoragePoolPtr obj, goto cleanup; } + if (VIR_REALLOC_N(pool->volumes.objs, + pool->volumes.count+1) < 0) + goto cleanup; if (!backend->createVol) { virReportError(VIR_ERR_NO_SUPPORT, @@ -1817,6 +1820,14 @@ storageVolCreateXML(virStoragePoolPtr obj, if (backend->createVol(obj->conn, pool, voldef) < 0) goto cleanup; + pool->volumes.objs[pool->volumes.count++] = voldef; + volobj = virGetStorageVol(obj->conn, pool->def->name, voldef->name, + voldef->key, NULL, NULL); + if (!volobj) { + pool->volumes.count--; + goto cleanup; + } + if (VIR_ALLOC(buildvoldef) < 0) { voldef = NULL; goto cleanup; @@ -1845,18 +1856,15 @@ storageVolCreateXML(virStoragePoolPtr obj, voldef->building = false; pool->asyncjobs--; - if (buildret < 0) + if (buildret < 0) { + VIR_FREE(buildvoldef); + storageVolDeleteInternal(volobj, backend, pool, voldef, + 0, false); + voldef = NULL; goto cleanup; - } - - if (VIR_REALLOC_N(pool->volumes.objs, - pool->volumes.count+1) < 0) - goto cleanup; + } - pool->volumes.objs[pool->volumes.count++] = voldef; - if (!(volobj = virGetStorageVol(obj->conn, pool->def->name, voldef->name, - voldef->key, NULL, NULL))) - goto cleanup; + } if (backend->refreshVol && backend->refreshVol(obj->conn, pool, voldef) < 0) -- 1.9.3

2 2

[libvirt] shall libvirtd validate guest's name ?
by zhang bo 09 Jul '15

09 Jul '15

linux-ZyvZnF:~ # virsh list --all Id Name State ---------------------------------------------------- - redhat7;reboot shut off - oscar-vm-5 shut off As shown above, 1 we use command "virsh define a.xml" to define a guest with a name containing ';', that's 'redhat7;reboot' 2 then we start the guest: "virsh start redhat7;reboot" 3 shell consider the command as a) run "virsh start redhat7", failed b) run "reboot", to reboot the host And *the host get rebooted*. shall libvirtd do the guest-name-validation work? Or other suggustions? -- Oscar oscar.zhangbo(a)huawei.com

3 2

[libvirt] [PATCH v4 0/3] Allow PCI virtio on ARM "virt" machine
by Pavel Fedin 09 Jul '15

09 Jul '15

Virt machine in qemu since v2.3.0 has PCI generic host controller, and can use PCI devices. This provides performance improvement as well as vhost-net with irqfd support for virtio-net. However libvirt currently does not allow ARM virt machine to have PCI devices. This patchset adds the necessary support. Changes since v3: - Capability is based not on qemu version but on support of "gpex-pcihost" device by qemu - Added a workaround, allowing to pass "make check". The problem is that test suite does not build capabilities cache. Unfortunately this means that correct unit-test for the new functionality currently cannot be written. Test suite framework needs to be improved. Changes since v2: Complete rework, use different approach - Correctly model PCI Express bus on the machine. It is now possible to explicitly specify <address-type='pci'> with attributes. This allows to attach not only virtio, but any other PCI device to the model. - Default is not changed and still mmio, for backwards compatibility with existing installations. PCI bus has to be explicitly specified. - Check for the capability in correct place, in v2 it actually did not work Changes since v1: - Added capability based on qemu version number - Recognize also "virt-" prefix Pavel Fedin (3): Introduce QEMU_CAPS_OBJECT_GPEX Add PCI-Express root to ARM virt machine Build correct command line for PCI NICs on ARM src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 3 ++- src/qemu/qemu_domain.c | 17 +++++++++++++---- 4 files changed, 18 insertions(+), 5 deletions(-) -- 1.9.5.msysgit.0

1 3

[libvirt] [PATCH] conf: Don't allow duplicated targets regardless of bus
by John Ferlan 09 Jul '15

09 Jul '15

https://bugzilla.redhat.com/show_bug.cgi?id=1142631 Commit id 'e0e290552' added a check to determine if the same bus had the same target value. It seems that's not quite good enough as the check should check the target name value regardless of bus type. Also added a DO_TEST_DIFFERENT to exhibit the issue Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/conf/domain_conf.c | 3 +- .../qemuxml2argv-disk-same-targets.xml | 35 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-same-targets.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b10f6cd..7855bcb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12590,8 +12590,7 @@ virDomainDiskDefDstDuplicates(virDomainDefPtr def) for (i = 1; i < def->ndisks; i++) { for (j = 0; j < i; j++) { - if (def->disks[i]->bus == def->disks[j]->bus && - STREQ(def->disks[i]->dst, def->disks[j]->dst)) { + if (STREQ(def->disks[i]->dst, def->disks[j]->dst)) { virReportError(VIR_ERR_XML_ERROR, _("target '%s' duplicated for disk sources " "'%s' and '%s'"), diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-same-targets.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-same-targets.xml new file mode 100644 index 0000000..3276ce5 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-same-targets.xml @@ -0,0 +1,35 @@ +<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</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/usbdisk.img'/> + <target dev='sda' bus='usb'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/idedisk.img'/> + <target dev='sda' bus='ide'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/scsidisk.img'/> + <target dev='sda' bus='scsi'/> + </disk> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index be82dd2..b066681 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -882,6 +882,9 @@ mymain(void) QEMU_CAPS_DEVICE); DO_TEST("disk-snapshot", QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT); + DO_TEST_FAILURE("disk-same-targets", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_SCSI_LSI, + QEMU_CAPS_DEVICE_USB_STORAGE, QEMU_CAPS_NODEFCONFIG); DO_TEST("event_idx", QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_BLK_EVENT_IDX, -- 2.1.0

2 3

[libvirt] [PATCH v3 0/4] Followup for unpriv_sgio changes
by John Ferlan 09 Jul '15

09 Jul '15

v2: http://www.redhat.com/archives/libvir-list/2015-July/msg00204.html I pushed the first 3 patches already since they were ACK'd This is patches 4-8 adjusted for code review comments Patch1 (former patch4) - change the function to use qemuCheckUnprivSGIO not qemuCheckUnprivSGIO. Also used a -1 or -2 return value for handling the mismatched sgio setting error which requires the caller to have a message including the device with the issue Former patch 5 abandoned Patch2 (former patch6) - completely removed qemuGetSharedHostdevKey and replaced with inline code. Although this looks odd now, a future patch will use the device name on the add side. Patch3 (former patch7) - restored the {} in the right place Patch4 (former patch8) - remove val initialization - already ACK'd, but easier for me to just keep in the current order. Former patches 9 & 10 - keeping separate for downstream John Ferlan (4): qemu: Refactor qemuCheckSharedDisk to create qemuCheckUnprivSGIO qemu: Inline qemuGetHostdevPath qemu: Refactor qemuSetUnprivSGIO return values qemu: Fix integer/boolean logic in qemuSetUnprivSGIO src/qemu/qemu_conf.c | 151 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 89 insertions(+), 62 deletions(-) -- 2.1.0

2 8

[libvirt] [PATCH 00/10] Implement shared memory device - Part 1
by Luyao Huang 09 Jul '15

09 Jul '15

This part contains some small fix and Implement the hot-plug/hot-unplug and cold-plug/cold-unplug for Inter-VM Shared Memory PCI device. Luyao Huang (10): qemu: auto assign pci address for shared memory device qemu: always build id when generate shared memory device CLI qemu: Refactor creation of shared memory device commandline conf: use virDomainChrSourceDef to save the path conf:audit: introduce audit function for shared memory device conf: Add helpers to insert/remove/find shmem devices in domain def qemu: Implement shared memory device cold (un)plug qemu: Implement share memory device hot-plug qemu: Implement shared memory device hot-unplug qemu: report error when shmem have a invalid address docs/auditlog.html.in | 16 +++ src/conf/domain_audit.c | 16 +++ src/conf/domain_audit.h | 6 + src/conf/domain_conf.c | 69 ++++++++++- src/conf/domain_conf.h | 9 +- src/libvirt_private.syms | 5 + src/qemu/qemu_command.c | 82 +++++++------ src/qemu/qemu_command.h | 7 ++ src/qemu/qemu_driver.c | 35 +++++- src/qemu/qemu_hotplug.c | 156 ++++++++++++++++++++++++- src/qemu/qemu_hotplug.h | 6 + tests/qemuxml2argvdata/qemuxml2argv-shmem.args | 16 +-- 12 files changed, 372 insertions(+), 51 deletions(-) -- 1.8.3.1

3 30

[libvirt] [PATCH] qemu: fix no error settings if fail to find a disk match path
by Luyao Huang 09 Jul '15

09 Jul '15

When we use get blockjob info to a unexist disk path, we will get a error like this: # virsh blockjob r7 vdc error: An error occurred, but the cause is unknown This is because we do not set the error when jump to endjob. As virDomainDiskByName won't set the error, we need set them in the callers function. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 900740e..f134248 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16414,8 +16414,11 @@ qemuDomainGetBlockJobInfo(virDomainPtr dom, if (qemuDomainSupportsBlockJobs(vm, NULL) < 0) goto endjob; - if (!(disk = virDomainDiskByName(vm->def, path, true))) + if (!(disk = virDomainDiskByName(vm->def, path, true))) { + virReportError(VIR_ERR_INVALID_ARG, + _("invalid path %s not assigned to domain"), path); goto endjob; + } qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorGetBlockJobInfo(qemuDomainGetMonitor(vm), -- 1.8.3.1

3 3

[libvirt] [PATCH] libxl: rework setting the state of virDomainObj
by Jim Fehlig 09 Jul '15

09 Jul '15

Set the state of virDomainObj in the functions that actually change the domain state, instead of the generic libxlDomainCleanup function. This approach gives functions calling libxlDomainCleanup more flexibility wrt when and how they change virDomainObj state via virDomainObjSetState. The prior approach of calling virDomainObjSetState in libxlDomainCleanup resulted in the following incorrect coding pattern in the various functions that change domain state libxlDomain<DoStateTransition> call libxl function to do state transition emit lifecycle event libxlDomainCleanup virDomainObjSetState Once simple manifestation of this bug is seeing a domain running in virt-manager after selecting the shutdown button, even after the domain has long shutdown. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- I considered emitting the lifecycle event in libxlDomainCleanup, but IMO it is best to change the state and emit the event where where the state change actually occurs. src/libxl/libxl_domain.c | 23 ++++++++++++----------- src/libxl/libxl_domain.h | 3 +-- src/libxl/libxl_driver.c | 28 ++++++++++++++++++---------- src/libxl/libxl_migration.c | 8 ++++++-- 4 files changed, 37 insertions(+), 25 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 8e8a292..224ff77 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -397,7 +397,6 @@ libxlDomainShutdownThread(void *opaque) libxlDriverPrivatePtr driver = shutdown_info->driver; virObjectEventPtr dom_event = NULL; libxl_shutdown_reason xl_reason = ev->u.domain_shutdown.shutdown_reason; - virDomainShutoffReason reason = VIR_DOMAIN_SHUTOFF_SHUTDOWN; libxlDriverConfigPtr cfg; cfg = libxlDriverConfigGet(driver); @@ -406,12 +405,14 @@ libxlDomainShutdownThread(void *opaque) goto cleanup; if (xl_reason == LIBXL_SHUTDOWN_REASON_POWEROFF) { + virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_SHUTDOWN); + dom_event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); switch ((virDomainLifecycleAction) vm->def->onPoweroff) { case VIR_DOMAIN_LIFECYCLE_DESTROY: - reason = VIR_DOMAIN_SHUTOFF_SHUTDOWN; goto destroy; case VIR_DOMAIN_LIFECYCLE_RESTART: case VIR_DOMAIN_LIFECYCLE_RESTART_RENAME: @@ -421,12 +422,14 @@ libxlDomainShutdownThread(void *opaque) goto endjob; } } else if (xl_reason == LIBXL_SHUTDOWN_REASON_CRASH) { + virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_CRASHED); + dom_event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_CRASHED); switch ((virDomainLifecycleCrashAction) vm->def->onCrash) { case VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY: - reason = VIR_DOMAIN_SHUTOFF_CRASHED; goto destroy; case VIR_DOMAIN_LIFECYCLE_CRASH_RESTART: case VIR_DOMAIN_LIFECYCLE_CRASH_RESTART_RENAME: @@ -442,12 +445,14 @@ libxlDomainShutdownThread(void *opaque) goto restart; } } else if (xl_reason == LIBXL_SHUTDOWN_REASON_REBOOT) { + virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_SHUTDOWN); + dom_event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); switch ((virDomainLifecycleAction) vm->def->onReboot) { case VIR_DOMAIN_LIFECYCLE_DESTROY: - reason = VIR_DOMAIN_SHUTOFF_SHUTDOWN; goto destroy; case VIR_DOMAIN_LIFECYCLE_RESTART: case VIR_DOMAIN_LIFECYCLE_RESTART_RENAME: @@ -467,7 +472,7 @@ libxlDomainShutdownThread(void *opaque) dom_event = NULL; } libxlDomainDestroyInternal(driver, vm); - libxlDomainCleanup(driver, vm, reason); + libxlDomainCleanup(driver, vm); if (!vm->persistent) virDomainObjListRemove(driver->domains, vm); @@ -479,7 +484,7 @@ libxlDomainShutdownThread(void *opaque) dom_event = NULL; } libxlDomainDestroyInternal(driver, vm); - libxlDomainCleanup(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN); + libxlDomainCleanup(driver, vm); if (libxlDomainStart(driver, vm, false, -1) < 0) { virErrorPtr err = virGetLastError(); VIR_ERROR(_("Failed to restart VM '%s': %s"), @@ -685,8 +690,7 @@ libxlDomainDestroyInternal(libxlDriverPrivatePtr driver, */ void libxlDomainCleanup(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - virDomainShutoffReason reason) + virDomainObjPtr vm) { libxlDomainObjPrivatePtr priv = vm->privateData; libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); @@ -709,9 +713,6 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, priv->deathW = NULL; } - if (vm->persistent) - virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, reason); - if (virAtomicIntDecAndTest(&driver->nactive) && driver->inhibitCallback) driver->inhibitCallback(false, driver->inhibitOpaque); diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 8c73cc4..44b3e0b 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -110,8 +110,7 @@ libxlDomainDestroyInternal(libxlDriverPrivatePtr driver, void libxlDomainCleanup(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - virDomainShutoffReason reason); + virDomainObjPtr vm); /* * Note: Xen 4.3 removed the const from the event handler signature. diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 149ef70..50861ac 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -383,7 +383,7 @@ libxlReconnectDomain(virDomainObjPtr vm, return 0; out: - libxlDomainCleanup(driver, vm, VIR_DOMAIN_SHUTOFF_UNKNOWN); + libxlDomainCleanup(driver, vm); if (!vm->persistent) virDomainObjListRemoveLocked(driver->domains, vm); else @@ -1266,16 +1266,19 @@ libxlDomainDestroyFlags(virDomainPtr dom, goto endjob; } + if (libxlDomainDestroyInternal(driver, vm) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to destroy domain '%d'"), vm->def->id); + goto endjob; + } + + virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_DESTROYED); + event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_DESTROYED); - if (libxlDomainDestroyInternal(driver, vm) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to destroy domain '%d'"), vm->def->id); - goto endjob; - } - - libxlDomainCleanup(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED); + libxlDomainCleanup(driver, vm); if (!vm->persistent) virDomainObjListRemove(driver->domains, vm); @@ -1609,6 +1612,9 @@ libxlDoDomainSave(libxlDriverPrivatePtr driver, virDomainObjPtr vm, goto cleanup; } + virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_SAVED); + event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_SAVED); @@ -1618,7 +1624,7 @@ libxlDoDomainSave(libxlDriverPrivatePtr driver, virDomainObjPtr vm, goto cleanup; } - libxlDomainCleanup(driver, vm, VIR_DOMAIN_SHUTOFF_SAVED); + libxlDomainCleanup(driver, vm); vm->hasManagedSave = true; ret = 0; @@ -1825,7 +1831,9 @@ libxlDomainCoreDump(virDomainPtr dom, const char *to, unsigned int flags) goto unpause; } - libxlDomainCleanup(driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED); + libxlDomainCleanup(driver, vm); + virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_CRASHED); event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_CRASHED); if (!vm->persistent) diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 39e4a65..aa9547b 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -585,7 +585,9 @@ libxlDomainMigrationFinish(virConnectPtr dconn, cleanup: if (dom == NULL) { libxlDomainDestroyInternal(driver, vm); - libxlDomainCleanup(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); + libxlDomainCleanup(driver, vm); + virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_FAILED); event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_FAILED); if (!vm->persistent) @@ -624,7 +626,9 @@ libxlDomainMigrationConfirm(libxlDriverPrivatePtr driver, } libxlDomainDestroyInternal(driver, vm); - libxlDomainCleanup(driver, vm, VIR_DOMAIN_SHUTOFF_MIGRATED); + libxlDomainCleanup(driver, vm); + virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, + VIR_DOMAIN_SHUTOFF_MIGRATED); event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_MIGRATED); -- 2.1.4

2 2

[libvirt] [PATCH] libxl: support dom0
by Jim Fehlig 09 Jul '15

09 Jul '15

In Xen, dom0 is really just another domain that supports ballooning, adding/removing devices, changing vcpu configuration, etc. This patch adds support to the libxl driver for managing dom0. Note that the legacy xend driver has long supported managing dom0. Operations that are not supported on dom0 are filtered in libvirt where a sensible error is reported. Errors from libxl are not always helpful. E.g., attempting a save on dom0 results in 2015-06-23 15:25:05 MDT libxl: debug: libxl_dom.c:1570:libxl__toolstack_save: domain=0 toolstack data size=8 2015-06-23 15:25:05 MDT libxl: debug: libxl.c:979:do_libxl_domain_suspend: ao 0x7f7e68000b70: inprogress: poller=0x7f7e68000930, flags=i 2015-06-23 15:25:05 MDT libxl-save-helper: debug: starting save: Success 2015-06-23 15:25:05 MDT xc: detail: xc_domain_save_suse: starting save of domid 0 2015-06-23 15:25:05 MDT xc: error: Couldn't map live_shinfo (3 = No such process): Internal error 2015-06-23 15:25:05 MDT xc: detail: Save exit of domid 0 with errno=3 2015-06-23 15:25:05 MDT libxl-save-helper: debug: complete r=1: No such process 2015-06-23 15:25:05 MDT libxl: error: libxl_dom.c:1876:libxl__xc_domain_save_done: saving domain: domain did not respond to suspend request: No such process 2015-06-23 15:25:05 MDT libxl: error: libxl_dom.c:2033:remus_teardown_done: Remus: failed to teardown device for guest with domid 0, rc -8 Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 149ef70..d0b76ac 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -79,6 +79,15 @@ VIR_LOG_INIT("libxl.libxl_driver"); /* Number of Xen scheduler parameters */ #define XEN_SCHED_CREDIT_NPARAM 2 +#define LIBXL_CHECK_DOM0_GOTO(name, label) \ + do { \ + if (STREQ_NULLABLE(name, "Domain-0")) { \ + virReportError(VIR_ERR_OPERATION_INVALID, "%s", \ + _("Domain-0 does not support requested operation")); \ + goto label; \ + } \ + } while (0) + static libxlDriverPrivatePtr libxl_driver; @@ -501,6 +510,62 @@ const struct libxl_event_hooks ev_hooks = { }; static int +libxlAddDom0(libxlDriverPrivatePtr driver) +{ + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + virDomainDefPtr def = NULL; + virDomainObjPtr vm = NULL; + virDomainDefPtr oldDef = NULL; + libxl_dominfo d_info; + int ret = -1; + + libxl_dominfo_init(&d_info); + + /* Ensure we have a dom0 */ + if (libxl_domain_info(cfg->ctx, &d_info, 0) != 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("unable to get Domain-0 information from libxenlight")); + goto cleanup; + } + + if (!(def = virDomainDefNew())) + goto cleanup; + + def->id = 0; + def->virtType = VIR_DOMAIN_VIRT_XEN; + if (VIR_STRDUP(def->name, "Domain-0") < 0) + goto cleanup; + + def->os.type = VIR_DOMAIN_OSTYPE_XEN; + + if (virUUIDParse("00000000-0000-0000-0000-000000000000", def->uuid) < 0) + goto cleanup; + + vm->def->vcpus = d_info.vcpu_online; + vm->def->maxvcpus = d_info.vcpu_max_id + 1; + vm->def->mem.cur_balloon = d_info.current_memkb; + vm->def->mem.max_balloon = d_info.max_memkb; + + if (!(vm = virDomainObjListAdd(driver->domains, def, + driver->xmlopt, + 0, + &oldDef))) + goto cleanup; + + def = NULL; + ret = 0; + + cleanup: + libxl_dominfo_dispose(&d_info); + virDomainDefFree(def); + virDomainDefFree(oldDef); + if (vm) + virObjectUnlock(vm); + virObjectUnref(cfg); + return ret; +} + +static int libxlStateInitialize(bool privileged, virStateInhibitCallback callback ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) @@ -616,6 +681,10 @@ libxlStateInitialize(bool privileged, if (!(libxl_driver->xmlopt = libxlCreateXMLConf())) goto error; + /* Add Domain-0 */ + if (libxlAddDom0(libxl_driver) < 0) + goto error; + /* Load running domains first. */ if (virDomainObjListLoadAllConfigs(libxl_driver->domains, cfg->stateDir, @@ -1030,6 +1099,8 @@ libxlDomainSuspend(virDomainPtr dom) if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; + LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup); + if (virDomainSuspendEnsureACL(dom->conn, vm->def) < 0) goto cleanup; @@ -1086,6 +1157,8 @@ libxlDomainResume(virDomainPtr dom) if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; + LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup); + if (virDomainResumeEnsureACL(dom->conn, vm->def) < 0) goto cleanup; @@ -1147,6 +1220,8 @@ libxlDomainShutdownFlags(virDomainPtr dom, unsigned int flags) if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; + LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup); + if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; @@ -1212,6 +1287,8 @@ libxlDomainReboot(virDomainPtr dom, unsigned int flags) if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; + LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup); + if (virDomainRebootEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; @@ -1254,6 +1331,8 @@ libxlDomainDestroyFlags(virDomainPtr dom, if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; + LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup); + if (virDomainDestroyFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; @@ -1656,6 +1735,8 @@ libxlDomainSaveFlags(virDomainPtr dom, const char *to, const char *dxml, if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; + LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup); + if (virDomainSaveFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; @@ -1782,6 +1863,8 @@ libxlDomainCoreDump(virDomainPtr dom, const char *to, unsigned int flags) if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; + LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup); + if (virDomainCoreDumpEnsureACL(dom->conn, vm->def) < 0) goto cleanup; @@ -1877,6 +1960,8 @@ libxlDomainManagedSave(virDomainPtr dom, unsigned int flags) if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; + LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup); + if (virDomainManagedSaveEnsureACL(dom->conn, vm->def) < 0) goto cleanup; @@ -4000,6 +4085,8 @@ libxlDomainSetAutostart(virDomainPtr dom, int autostart) if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; + LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup); + if (virDomainSetAutostartEnsureACL(dom->conn, vm->def) < 0) goto cleanup; @@ -4294,6 +4381,8 @@ libxlDomainOpenConsole(virDomainPtr dom, if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; + LIBXL_CHECK_DOM0_GOTO(vm->def->name, cleanup); + if (virDomainOpenConsoleEnsureACL(dom->conn, vm->def) < 0) goto cleanup; @@ -4817,6 +4906,12 @@ libxlDomainMigrateBegin3Params(virDomainPtr domain, if (!(vm = libxlDomObjFromDomain(domain))) return NULL; + if (STREQ_NULLABLE(vm->def->name, "Domain-0")) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Domain-0 cannot be migrated")); + return NULL; + } + if (virDomainMigrateBegin3ParamsEnsureACL(domain->conn, vm->def) < 0) { virObjectUnlock(vm); return NULL; -- 2.1.4

2 3

[libvirt] [PATCH v2 0/4] virt-aa-helper fixes
by Cédric Bosdonnat 08 Jul '15

08 Jul '15

This patch series includes a new version for the trailing slash fix, but also includes other fixes to get virt-sandbox run nicely with apparmor. Thus only one patch has v2 ;) Cédric Bosdonnat (4): virt-aa-helper: fix rules for paths with trailing slash Get more libvirt errors from virt-aa-helper virt-aa-helper: rename ctl->hvm to ctl->os virt-aa-helper: add DomainGuest to mockup caps src/security/security_apparmor.c | 4 ++++ src/security/virt-aa-helper.c | 38 ++++++++++++++++++++++++++++++++++---- tests/virt-aa-helper-test | 3 --- 3 files changed, 38 insertions(+), 7 deletions(-) -- 2.1.4

3 6

[libvirt] [[PATCH v5] autocreate tap device for VIR_DOMAIN_NET_TYPE_ETHERNET] autocreate tap device for VIR_DOMAIN_NET_TYPE_ETHERNET
by Vasiliy Tolstov 08 Jul '15

08 Jul '15

If a user specify ehernet device create it via libvirt and run script if it provided. After this commit user does not need to run external script to create tap device or add root to qemu process. Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- src/qemu/qemu_command.c | 139 ++++++++++++++++++++++++++++++------------------ src/qemu/qemu_hotplug.c | 13 ++--- src/qemu/qemu_process.c | 6 +++ 3 files changed, 98 insertions(+), 60 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3886b4f..f9008e4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -332,10 +332,39 @@ static int qemuCreateInBridgePortWithHelper(virQEMUDriverConfigPtr cfg, return *tapfd < 0 ? -1 : 0; } +/** + * qemuExecuteEthernetScript: + * @ifname: the interface name + * @script: the script name + * + * This function executes script for new tap device created by libvirt. + * Returns 0 in case of success or -1 on failure + */ +static int +qemuExecuteEthernetScript(const char *ifname, const char *script) +{ + virCommandPtr cmd; + int ret; + + cmd = virCommandNew(script); + virCommandAddArgFormat(cmd, "%s", ifname); + virCommandClearCaps(cmd); +#ifdef CAP_NET_ADMIN + virCommandAllowCap(cmd, CAP_NET_ADMIN); +#endif + virCommandAddEnvPassCommon(cmd); + + ret = virCommandRun(cmd, NULL); + + virCommandFree(cmd); + return ret; +} + /* qemuNetworkIfaceConnect - *only* called if actualType is - * VIR_DOMAIN_NET_TYPE_NETWORK or VIR_DOMAIN_NET_TYPE_BRIDGE (i.e. if - * the connection is made with a tap device connecting to a bridge - * device) + * VIR_DOMAIN_NET_TYPE_NETWORK, VIR_DOMAIN_NET_TYPE_BRIDGE + * VIR_DOMAIN_NET_TYPE_ETHERNET (i.e. if the connection is + * made with a tap device connecting to a bridge device or + * use plain tap device) */ int qemuNetworkIfaceConnect(virDomainDefPtr def, @@ -351,6 +380,7 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, bool template_ifname = false; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); const char *tunpath = "/dev/net/tun"; + virMacAddr tapmac; if (net->backend.tap) { tunpath = net->backend.tap; @@ -361,11 +391,6 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, } } - if (!(brname = virDomainNetGetActualBridgeName(net))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing bridge name")); - goto cleanup; - } - if (!net->ifname || STRPREFIX(net->ifname, VIR_NET_GENERATED_PREFIX) || strchr(net->ifname, '%')) { @@ -381,40 +406,62 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, tap_create_flags |= VIR_NETDEV_TAP_CREATE_VNET_HDR; } - if (cfg->privileged) { - if (virNetDevTapCreateInBridgePort(brname, &net->ifname, &net->mac, - def->uuid, tunpath, tapfd, *tapfdSize, - virDomainNetGetActualVirtPortProfile(net), - virDomainNetGetActualVlan(net), - tap_create_flags) < 0) { + if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_ETHERNET) { + if (virNetDevTapCreate(&net->ifname, tunpath, tapfd, *tapfdSize, + tap_create_flags) < 0) { virDomainAuditNetDevice(def, net, tunpath, false); goto cleanup; } - if (virDomainNetGetActualBridgeMACTableManager(net) - == VIR_NETWORK_BRIDGE_MAC_TABLE_MANAGER_LIBVIRT) { - /* libvirt is managing the FDB of the bridge this device - * is attaching to, so we need to turn off learning and - * unicast_flood on the device to prevent the kernel from - * adding any FDB entries for it. We will add add an fdb - * entry ourselves (during qemuInterfaceStartDevices(), - * using the MAC address from the interface config. - */ - if (virNetDevBridgePortSetLearning(brname, net->ifname, false) < 0) - goto cleanup; - if (virNetDevBridgePortSetUnicastFlood(brname, net->ifname, false) < 0) + virMacAddrSet(&tapmac, &net->mac); + + if (virNetDevSetMAC(net->ifname, &tapmac) < 0) + goto cleanup; + + if (net->script) { + if (qemuExecuteEthernetScript(net->ifname, net->script) < 0) goto cleanup; } } else { - if (qemuCreateInBridgePortWithHelper(cfg, brname, - &net->ifname, - tapfd, tap_create_flags) < 0) { - virDomainAuditNetDevice(def, net, tunpath, false); + if (!(brname = virDomainNetGetActualBridgeName(net))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing bridge name")); goto cleanup; } - /* qemuCreateInBridgePortWithHelper can only create a single FD */ - if (*tapfdSize > 1) { - VIR_WARN("Ignoring multiqueue network request"); - *tapfdSize = 1; + + if (cfg->privileged) { + if (virNetDevTapCreateInBridgePort(brname, &net->ifname, &net->mac, + def->uuid, tunpath, tapfd, *tapfdSize, + virDomainNetGetActualVirtPortProfile(net), + virDomainNetGetActualVlan(net), + tap_create_flags) < 0) { + virDomainAuditNetDevice(def, net, tunpath, false); + goto cleanup; + } + if (virDomainNetGetActualBridgeMACTableManager(net) + == VIR_NETWORK_BRIDGE_MAC_TABLE_MANAGER_LIBVIRT) { + /* libvirt is managing the FDB of the bridge this device + * is attaching to, so we need to turn off learning and + * unicast_flood on the device to prevent the kernel from + * adding any FDB entries for it. We will add add an fdb + * entry ourselves (during qemuInterfaceStartDevices(), + * using the MAC address from the interface config. + */ + if (virNetDevBridgePortSetLearning(brname, net->ifname, false) < 0) + goto cleanup; + if (virNetDevBridgePortSetUnicastFlood(brname, net->ifname, false) < 0) + goto cleanup; + } + } else { + if (qemuCreateInBridgePortWithHelper(cfg, brname, + &net->ifname, + tapfd, tap_create_flags) < 0) { + virDomainAuditNetDevice(def, net, tunpath, false); + goto cleanup; + } + /* qemuCreateInBridgePortWithHelper can only create a single FD */ + if (*tapfdSize > 1) { + VIR_WARN("Ignoring multiqueue network request"); + *tapfdSize = 1; + } } } @@ -5221,6 +5268,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_DIRECT: + case VIR_DOMAIN_NET_TYPE_ETHERNET: virBufferAsprintf(&buf, "tap%c", type_sep); /* for one tapfd 'fd=' shall be used, * for more than one 'fds=' is the right choice */ @@ -5238,20 +5286,6 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, is_tap = true; break; - case VIR_DOMAIN_NET_TYPE_ETHERNET: - virBufferAddLit(&buf, "tap"); - if (net->ifname) { - virBufferAsprintf(&buf, "%cifname=%s", type_sep, net->ifname); - type_sep = ','; - } - if (net->script) { - virBufferAsprintf(&buf, "%cscript=%s", type_sep, - net->script); - type_sep = ','; - } - is_tap = true; - break; - case VIR_DOMAIN_NET_TYPE_CLIENT: virBufferAsprintf(&buf, "socket%cconnect=%s:%d", type_sep, @@ -8226,7 +8260,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, /* Currently nothing besides TAP devices supports multiqueue. */ if (net->driver.virtio.queues > 0 && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE)) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Multiqueue network is not supported for: %s"), virDomainNetTypeToString(actualType)); @@ -8235,7 +8270,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, if (net->backend.tap && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE)) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Custom tap device path is not supported for: %s"), virDomainNetTypeToString(actualType)); @@ -8245,7 +8281,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, cfg = virQEMUDriverGetConfig(driver); if (actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { tapfdSize = net->driver.virtio.queues; if (!tapfdSize) tapfdSize = 1; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index cc86a3b..21ea3fd 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -908,7 +908,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, /* Currently nothing besides TAP devices supports multiqueue. */ if (net->driver.virtio.queues > 0 && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE)) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Multiqueue network is not supported for: %s"), virDomainNetTypeToString(actualType)); @@ -916,7 +917,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, } if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || - actualType == VIR_DOMAIN_NET_TYPE_NETWORK) { + actualType == VIR_DOMAIN_NET_TYPE_NETWORK || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { tapfdSize = vhostfdSize = net->driver.virtio.queues; if (!tapfdSize) tapfdSize = vhostfdSize = 1; @@ -947,13 +949,6 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, iface_connected = true; if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0) goto cleanup; - } else if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { - vhostfdSize = 1; - if (VIR_ALLOC(vhostfd) < 0) - goto cleanup; - *vhostfd = -1; - if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0) - goto cleanup; } /* Set device online immediately */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 64ee049..d866e44 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5205,6 +5205,12 @@ void qemuProcessStop(virQEMUDriverPtr driver, cfg->stateDir)); VIR_FREE(net->ifname); break; + case VIR_DOMAIN_NET_TYPE_ETHERNET: + if (net->ifname) { + ignore_value(virNetDevTapDelete(net->ifname, net->backend.tap)); + VIR_FREE(net->ifname); + } + break; case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: #ifdef VIR_NETDEV_TAP_REQUIRE_MANUAL_CLEANUP -- 2.3.3

2 4

[libvirt] [PATCH v3 0/3] Allow PCI virtio on ARM "virt" machine
by Pavel Fedin 08 Jul '15

08 Jul '15

Virt machine in qemu since v2.3.0 has PCI generic host controller, and can use PCI devices. This provides performance improvement as well as vhost-net with irqfd support for virtio-net. However libvirt currently does not allow ARM virt machine to have PCI devices. This patchset adds the necessary support. This version is completely reworked and uses different approach. Changes since v2: - Correctly model PCI Express bus on the machine. It is now possible to explicitly specify <address-type='pci'> with attributes. This allows to attach not only virtio, but any other PCI device to the model. - Default is not changed and still mmio, for backwards compatibility with existing installations. PCI bus has to be explicitly specified. - Check for the capability in correct place, in v2 it actually did not work Changes since v1: - Added capability based on qemu version number - Recognize also "virt-" prefix Pavel Fedin (3): Introduce QEMU_CAPS_ARM_VIRT_PCI Add PCI-Express root to ARM virt machine Build correct command line for PCI NICs on ARM src/qemu/qemu_capabilities.c | 5 +++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 3 ++- src/qemu/qemu_domain.c | 12 ++++++++---- 4 files changed, 16 insertions(+), 5 deletions(-) -- 1.9.5.msysgit.0

3 8

[libvirt] [PATCH] vz: use PRL_USE_VNET_NAME_FOR_BRIDGE_NAME
by Maxim Nestratov 08 Jul '15

08 Jul '15

It is better not to assume that newly created network should be connected to a bridge with same name, but specify it explicitly by PRL_USE_VNET_NAME_FOR_BRIDGE_NAME flag. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/vz/vz_sdk.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 1b66958..1c56655 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2834,7 +2834,9 @@ static int prlsdkAddNet(PRL_HANDLE sdkdom, pret = PrlVirtNet_SetNetworkType(vnet, PVN_BRIDGED_ETHERNET); prlsdkCheckRetGoto(pret, cleanup); - job = PrlSrv_AddVirtualNetwork(privconn->server, vnet, 0); + job = PrlSrv_AddVirtualNetwork(privconn->server, + vnet, + PRL_USE_VNET_NAME_FOR_BRIDGE_NAME); if (PRL_FAILED(pret = waitJob(job))) goto cleanup; -- 1.7.1

2 2

[libvirt] [PATCH v2 00/10] Restore code to allow unpriv_sgio for hostdev SCSI generic
by John Ferlan 08 Jul '15

08 Jul '15

v1 here: http://www.redhat.com/archives/libvir-list/2015-June/msg00814.html Changes since v1: - Add doc patch 1 to indicate that this feature may only be supported by certain kernels - Adjust former patch 1 to add call to qemuIsSharedHostdev from qemuSetUnprivSGIO - Insert patches 7 & 8 which essentially refactor qemuSetUnprivSGIO a bit. There should be no functional difference - Patch 9 is now a much slimmer former patch 6 The end result is that 'generically speaking' if any kernel supports setting the unprivileged SGIO feature, then these patches provide the capability to do so. Although as pointed out in the review of v1 only one specific downstream kernel supports the feature, that doesn't mean other distros couldn't add support in the same manner. So rather than just remove all traces from libvirt completely, it seems it would be reasonable to keep the checks in place and if a kernel then decides to add support this code exists to assist. John Ferlan (10): docs: Clarify unprivileged sgio feature for host devices qemu: Introduce qemuIsSharedHostdev qemu: Introduce qemuGetHostdevPath qemu: Refactor qemuCheckSharedDisk to create virCheckUnprivSGIO qemu: Refactor qemuAddSharedHostdev and qemuRemoveSharedHostdev qemu: Extract qemuGetHostdevPath from qemuGetSharedHostdevKey qemu: Refactor qemuSetUnprivSGIO return values qemu: Fix integer/boolean logic in qemuSetUnprivSGIO qemu: Add ability to set sgio values for hostdev qemu: Add check for unpriv sgio for SCSI generic host device docs/formatdomain.html.in | 7 +- src/qemu/qemu_conf.c | 226 ++++++++++++++++++++++++++++++---------------- 2 files changed, 154 insertions(+), 79 deletions(-) -- 2.1.0

2 23

[libvirt] [PATCH v2 0/2] Add support for portable-rpcgen from portablexdr library
by Pavel Fedin 08 Jul '15

08 Jul '15

This patch set allows to build libvirt natively under MinGW/MSYS using portablexdr library. An updated version of portablexdr with fixed bugs is available as part of MSYS2 project. Differences from v1: - Split into two parts - Reflect structure definiton change also in xc_monitor_protocol-structs, fix "make syntax-check" Pavel Fedin (2): Remove explicit enum from protocol structures Add support for portable-rpcgen from portablexdr library configure.ac | 2 +- src/lxc/lxc_monitor_protocol.x | 2 +- src/lxc_monitor_protocol-structs | 2 +- src/rpc/genprotocol.pl | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) -- 1.9.5.msysgit.0

2 3

[libvirt] [PATCH] virt-aa-helper: add unix channels for nserials as well
by Serge Hallyn 08 Jul '15

08 Jul '15

Commit 03d7462d added it for channels, but it is also needed for serials. Add it for serials, parallels, and consoles as well. This solves https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1015154 Signed-off-by: Serge Hallyn <serge.hallyn(a)ubuntu.com> --- src/security/virt-aa-helper.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 13f8a6a..4440552 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -951,8 +951,10 @@ get_files(vahControl * ctl) (ctl->def->serials[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY || ctl->def->serials[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV || ctl->def->serials[i]->source.type == VIR_DOMAIN_CHR_TYPE_FILE || + ctl->def->serials[i]->source.type == VIR_DOMAIN_CHR_TYPE_UNIX || ctl->def->serials[i]->source.type == VIR_DOMAIN_CHR_TYPE_PIPE) && - ctl->def->serials[i]->source.data.file.path) + ctl->def->serials[i]->source.data.file.path && + ctl->def->serials[i]->source.data.file.path[0] != '\0') if (vah_add_file_chardev(&buf, ctl->def->serials[i]->source.data.file.path, "rw", @@ -964,8 +966,10 @@ get_files(vahControl * ctl) (ctl->def->consoles[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY || ctl->def->consoles[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV || ctl->def->consoles[i]->source.type == VIR_DOMAIN_CHR_TYPE_FILE || + ctl->def->consoles[i]->source.type == VIR_DOMAIN_CHR_TYPE_UNIX || ctl->def->consoles[i]->source.type == VIR_DOMAIN_CHR_TYPE_PIPE) && - ctl->def->consoles[i]->source.data.file.path) + ctl->def->consoles[i]->source.data.file.path && + ctl->def->consoles[i]->source.data.file.path[0] != '\0') if (vah_add_file(&buf, ctl->def->consoles[i]->source.data.file.path, "rw") != 0) goto cleanup; @@ -975,8 +979,10 @@ get_files(vahControl * ctl) (ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PTY || ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_DEV || ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_FILE || + ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_UNIX || ctl->def->parallels[i]->source.type == VIR_DOMAIN_CHR_TYPE_PIPE) && - ctl->def->parallels[i]->source.data.file.path) + ctl->def->parallels[i]->source.data.file.path && + ctl->def->parallels[i]->source.data.file.path[0] != '\0') if (vah_add_file_chardev(&buf, ctl->def->parallels[i]->source.data.file.path, "rw", -- 2.1.4

2 1

[libvirt] [PATCH v3 0/2] Fix nodeinfo output on PPC64 KVM hosts
by Andrea Bolognani 08 Jul '15

08 Jul '15

I have reworked the original code quite a bit, while maintaining the same logic and hopefully introducing no bugs of my own :) Notable changes from v2 to v3: * the function to get the number of threads per subcore has been moved to the from virarch.c, which deals with architecture names only and is therefore not the right place to read host configuration, to nodeinfo.c where the rest of this stuff lives; * said function has also been given a shorter name; * the "valid subcore mode" boolean has been removed: threads_per_subcore will be a positive number if subcores should be taken into account, and if that's not the case (x86 host, tainted configuration) it will simply be zero, so now the code needs to keep track of a single variable instead of two; * the test case has been renamed to be more descriptive; * the test data has been cleaned up by removing all cpu/cpu*/node* links, which prevented 'make dist' from working due to recursive linking. I've added a Signed-off-by: tag to each commit and maintained Shivaprasad as commit author; if that's not a proper way to handle authorship information in this situation please let me know. Shivaprasad G Bhat (2): Fix nodeinfo output on PPC64 KVM hosts Add testcase for PPC64 kvm host nodeinfo src/libvirt_private.syms | 1 + src/nodeinfo.c | 140 +++++++++++++++++++-- src/nodeinfo.h | 1 + tests/Makefile.am | 6 + tests/nodeinfodata/linux-ppc64-subcores.cpuinfo | 59 +++++++++ tests/nodeinfodata/linux-ppc64-subcores.expected | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu0/online | 1 + .../linux-subcores/cpu/cpu0/physical_id | 1 + .../linux-subcores/cpu/cpu0/topology/core_id | 1 + .../linux-subcores/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 + tests/nodeinfodata/linux-subcores/cpu/cpu1/online | 1 + .../linux-subcores/cpu/cpu1/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu10/online | 1 + .../linux-subcores/cpu/cpu10/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu11/online | 1 + .../linux-subcores/cpu/cpu11/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu12/online | 1 + .../linux-subcores/cpu/cpu12/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu13/online | 1 + .../linux-subcores/cpu/cpu13/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu14/online | 1 + .../linux-subcores/cpu/cpu14/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu15/online | 1 + .../linux-subcores/cpu/cpu15/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu16/online | 1 + .../linux-subcores/cpu/cpu16/physical_id | 1 + .../linux-subcores/cpu/cpu16/topology/core_id | 1 + .../cpu/cpu16/topology/core_siblings | 1 + .../cpu/cpu16/topology/core_siblings_list | 1 + .../cpu/cpu16/topology/physical_package_id | 1 + .../cpu/cpu16/topology/thread_siblings | 1 + .../cpu/cpu16/topology/thread_siblings_list | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu17/online | 1 + .../linux-subcores/cpu/cpu17/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu18/online | 1 + .../linux-subcores/cpu/cpu18/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu19/online | 1 + .../linux-subcores/cpu/cpu19/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu2/online | 1 + .../linux-subcores/cpu/cpu2/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu20/online | 1 + .../linux-subcores/cpu/cpu20/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu21/online | 1 + .../linux-subcores/cpu/cpu21/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu22/online | 1 + .../linux-subcores/cpu/cpu22/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu23/online | 1 + .../linux-subcores/cpu/cpu23/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu24/online | 1 + .../linux-subcores/cpu/cpu24/physical_id | 1 + .../linux-subcores/cpu/cpu24/topology/core_id | 1 + .../cpu/cpu24/topology/core_siblings | 1 + .../cpu/cpu24/topology/core_siblings_list | 1 + .../cpu/cpu24/topology/physical_package_id | 1 + .../cpu/cpu24/topology/thread_siblings | 1 + .../cpu/cpu24/topology/thread_siblings_list | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu25/online | 1 + .../linux-subcores/cpu/cpu25/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu26/online | 1 + .../linux-subcores/cpu/cpu26/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu27/online | 1 + .../linux-subcores/cpu/cpu27/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu28/online | 1 + .../linux-subcores/cpu/cpu28/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu29/online | 1 + .../linux-subcores/cpu/cpu29/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu3/online | 1 + .../linux-subcores/cpu/cpu3/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu30/online | 1 + .../linux-subcores/cpu/cpu30/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu31/online | 1 + .../linux-subcores/cpu/cpu31/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu32/online | 1 + .../linux-subcores/cpu/cpu32/physical_id | 1 + .../linux-subcores/cpu/cpu32/topology/core_id | 1 + .../cpu/cpu32/topology/core_siblings | 1 + .../cpu/cpu32/topology/core_siblings_list | 1 + .../cpu/cpu32/topology/physical_package_id | 1 + .../cpu/cpu32/topology/thread_siblings | 1 + .../cpu/cpu32/topology/thread_siblings_list | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu33/online | 1 + .../linux-subcores/cpu/cpu33/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu34/online | 1 + .../linux-subcores/cpu/cpu34/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu35/online | 1 + .../linux-subcores/cpu/cpu35/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu36/online | 1 + .../linux-subcores/cpu/cpu36/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu37/online | 1 + .../linux-subcores/cpu/cpu37/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu38/online | 1 + .../linux-subcores/cpu/cpu38/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu39/online | 1 + .../linux-subcores/cpu/cpu39/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu4/online | 1 + .../linux-subcores/cpu/cpu4/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu40/online | 1 + .../linux-subcores/cpu/cpu40/physical_id | 1 + .../linux-subcores/cpu/cpu40/topology/core_id | 1 + .../cpu/cpu40/topology/core_siblings | 1 + .../cpu/cpu40/topology/core_siblings_list | 1 + .../cpu/cpu40/topology/physical_package_id | 1 + .../cpu/cpu40/topology/thread_siblings | 1 + .../cpu/cpu40/topology/thread_siblings_list | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu41/online | 1 + .../linux-subcores/cpu/cpu41/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu42/online | 1 + .../linux-subcores/cpu/cpu42/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu43/online | 1 + .../linux-subcores/cpu/cpu43/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu44/online | 1 + .../linux-subcores/cpu/cpu44/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu45/online | 1 + .../linux-subcores/cpu/cpu45/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu46/online | 1 + .../linux-subcores/cpu/cpu46/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu47/online | 1 + .../linux-subcores/cpu/cpu47/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu48/online | 1 + .../linux-subcores/cpu/cpu48/physical_id | 1 + .../linux-subcores/cpu/cpu48/topology/core_id | 1 + .../cpu/cpu48/topology/core_siblings | 1 + .../cpu/cpu48/topology/core_siblings_list | 1 + .../cpu/cpu48/topology/physical_package_id | 1 + .../cpu/cpu48/topology/thread_siblings | 1 + .../cpu/cpu48/topology/thread_siblings_list | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu49/online | 1 + .../linux-subcores/cpu/cpu49/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu5/online | 1 + .../linux-subcores/cpu/cpu5/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu50/online | 1 + .../linux-subcores/cpu/cpu50/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu51/online | 1 + .../linux-subcores/cpu/cpu51/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu52/online | 1 + .../linux-subcores/cpu/cpu52/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu53/online | 1 + .../linux-subcores/cpu/cpu53/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu54/online | 1 + .../linux-subcores/cpu/cpu54/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu55/online | 1 + .../linux-subcores/cpu/cpu55/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu56/online | 1 + .../linux-subcores/cpu/cpu56/physical_id | 1 + .../linux-subcores/cpu/cpu56/topology/core_id | 1 + .../cpu/cpu56/topology/core_siblings | 1 + .../cpu/cpu56/topology/core_siblings_list | 1 + .../cpu/cpu56/topology/physical_package_id | 1 + .../cpu/cpu56/topology/thread_siblings | 1 + .../cpu/cpu56/topology/thread_siblings_list | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu57/online | 1 + .../linux-subcores/cpu/cpu57/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu58/online | 1 + .../linux-subcores/cpu/cpu58/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu59/online | 1 + .../linux-subcores/cpu/cpu59/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu6/online | 1 + .../linux-subcores/cpu/cpu6/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu60/online | 1 + .../linux-subcores/cpu/cpu60/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu61/online | 1 + .../linux-subcores/cpu/cpu61/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu62/online | 1 + .../linux-subcores/cpu/cpu62/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu63/online | 1 + .../linux-subcores/cpu/cpu63/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu64/online | 1 + .../linux-subcores/cpu/cpu64/physical_id | 1 + .../linux-subcores/cpu/cpu64/topology/core_id | 1 + .../cpu/cpu64/topology/core_siblings | 1 + .../cpu/cpu64/topology/core_siblings_list | 1 + .../cpu/cpu64/topology/physical_package_id | 1 + .../cpu/cpu64/topology/thread_siblings | 1 + .../cpu/cpu64/topology/thread_siblings_list | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu65/online | 1 + .../linux-subcores/cpu/cpu65/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu66/online | 1 + .../linux-subcores/cpu/cpu66/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu67/online | 1 + .../linux-subcores/cpu/cpu67/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu68/online | 1 + .../linux-subcores/cpu/cpu68/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu69/online | 1 + .../linux-subcores/cpu/cpu69/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu7/online | 1 + .../linux-subcores/cpu/cpu7/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu70/online | 1 + .../linux-subcores/cpu/cpu70/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu71/online | 1 + .../linux-subcores/cpu/cpu71/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu72/online | 1 + .../linux-subcores/cpu/cpu72/physical_id | 1 + .../linux-subcores/cpu/cpu72/topology/core_id | 1 + .../cpu/cpu72/topology/core_siblings | 1 + .../cpu/cpu72/topology/core_siblings_list | 1 + .../cpu/cpu72/topology/physical_package_id | 1 + .../cpu/cpu72/topology/thread_siblings | 1 + .../cpu/cpu72/topology/thread_siblings_list | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu73/online | 1 + .../linux-subcores/cpu/cpu73/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu74/online | 1 + .../linux-subcores/cpu/cpu74/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu75/online | 1 + .../linux-subcores/cpu/cpu75/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu76/online | 1 + .../linux-subcores/cpu/cpu76/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu77/online | 1 + .../linux-subcores/cpu/cpu77/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu78/online | 1 + .../linux-subcores/cpu/cpu78/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu79/online | 1 + .../linux-subcores/cpu/cpu79/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu8/online | 1 + .../linux-subcores/cpu/cpu8/physical_id | 1 + .../linux-subcores/cpu/cpu8/topology/core_id | 1 + .../linux-subcores/cpu/cpu8/topology/core_siblings | 1 + .../cpu/cpu8/topology/core_siblings_list | 1 + .../cpu/cpu8/topology/physical_package_id | 1 + .../cpu/cpu8/topology/thread_siblings | 1 + .../cpu/cpu8/topology/thread_siblings_list | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu80/online | 1 + .../linux-subcores/cpu/cpu80/physical_id | 1 + .../linux-subcores/cpu/cpu80/topology/core_id | 1 + .../cpu/cpu80/topology/core_siblings | 1 + .../cpu/cpu80/topology/core_siblings_list | 1 + .../cpu/cpu80/topology/physical_package_id | 1 + .../cpu/cpu80/topology/thread_siblings | 1 + .../cpu/cpu80/topology/thread_siblings_list | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu81/online | 1 + .../linux-subcores/cpu/cpu81/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu82/online | 1 + .../linux-subcores/cpu/cpu82/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu83/online | 1 + .../linux-subcores/cpu/cpu83/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu84/online | 1 + .../linux-subcores/cpu/cpu84/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu85/online | 1 + .../linux-subcores/cpu/cpu85/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu86/online | 1 + .../linux-subcores/cpu/cpu86/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu87/online | 1 + .../linux-subcores/cpu/cpu87/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu88/online | 1 + .../linux-subcores/cpu/cpu88/physical_id | 1 + .../linux-subcores/cpu/cpu88/topology/core_id | 1 + .../cpu/cpu88/topology/core_siblings | 1 + .../cpu/cpu88/topology/core_siblings_list | 1 + .../cpu/cpu88/topology/physical_package_id | 1 + .../cpu/cpu88/topology/thread_siblings | 1 + .../cpu/cpu88/topology/thread_siblings_list | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu89/online | 1 + .../linux-subcores/cpu/cpu89/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu9/online | 1 + .../linux-subcores/cpu/cpu9/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu90/online | 1 + .../linux-subcores/cpu/cpu90/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu91/online | 1 + .../linux-subcores/cpu/cpu91/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu92/online | 1 + .../linux-subcores/cpu/cpu92/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu93/online | 1 + .../linux-subcores/cpu/cpu93/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu94/online | 1 + .../linux-subcores/cpu/cpu94/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/cpu95/online | 1 + .../linux-subcores/cpu/cpu95/physical_id | 1 + tests/nodeinfodata/linux-subcores/cpu/dscr_default | 1 + tests/nodeinfodata/linux-subcores/cpu/kernel_max | 1 + tests/nodeinfodata/linux-subcores/cpu/offline | 1 + tests/nodeinfodata/linux-subcores/cpu/online | 1 + tests/nodeinfodata/linux-subcores/cpu/possible | 1 + tests/nodeinfodata/linux-subcores/cpu/present | 1 + .../linux-subcores/cpu/subcores_per_core | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu0 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu1 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu10 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu11 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu12 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu13 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu14 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu15 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu16 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu17 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu18 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu19 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu2 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu20 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu21 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu22 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu23 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu3 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu4 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu5 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu6 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu7 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu8 | 1 + tests/nodeinfodata/linux-subcores/node/node0/cpu9 | 1 + .../nodeinfodata/linux-subcores/node/node0/cpulist | 1 + .../nodeinfodata/linux-subcores/node/node0/cpumap | 1 + .../linux-subcores/node/node0/distance | 1 + .../nodeinfodata/linux-subcores/node/node0/meminfo | 29 +++++ .../linux-subcores/node/node0/numastat | 6 + tests/nodeinfodata/linux-subcores/node/node1/cpu24 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu25 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu26 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu27 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu28 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu29 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu30 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu31 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu32 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu33 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu34 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu35 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu36 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu37 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu38 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu39 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu40 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu41 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu42 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu43 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu44 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu45 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu46 | 1 + tests/nodeinfodata/linux-subcores/node/node1/cpu47 | 1 + .../nodeinfodata/linux-subcores/node/node1/cpulist | 1 + .../nodeinfodata/linux-subcores/node/node1/cpumap | 1 + .../linux-subcores/node/node1/distance | 1 + .../nodeinfodata/linux-subcores/node/node1/meminfo | 29 +++++ .../linux-subcores/node/node1/numastat | 6 + .../nodeinfodata/linux-subcores/node/node16/cpu48 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu49 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu50 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu51 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu52 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu53 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu54 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu55 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu56 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu57 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu58 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu59 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu60 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu61 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu62 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu63 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu64 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu65 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu66 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu67 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu68 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu69 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu70 | 1 + .../nodeinfodata/linux-subcores/node/node16/cpu71 | 1 + .../linux-subcores/node/node16/cpulist | 1 + .../nodeinfodata/linux-subcores/node/node16/cpumap | 1 + .../linux-subcores/node/node16/distance | 1 + .../linux-subcores/node/node16/meminfo | 29 +++++ .../linux-subcores/node/node16/numastat | 6 + .../nodeinfodata/linux-subcores/node/node16/uevent | 0 .../nodeinfodata/linux-subcores/node/node16/vmstat | 39 ++++++ .../nodeinfodata/linux-subcores/node/node17/cpu72 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu73 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu74 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu75 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu76 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu77 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu78 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu79 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu80 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu81 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu82 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu83 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu84 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu85 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu86 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu87 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu88 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu89 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu90 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu91 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu92 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu93 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu94 | 1 + .../nodeinfodata/linux-subcores/node/node17/cpu95 | 1 + .../linux-subcores/node/node17/cpulist | 1 + .../nodeinfodata/linux-subcores/node/node17/cpumap | 1 + .../linux-subcores/node/node17/distance | 1 + .../linux-subcores/node/node17/meminfo | 29 +++++ .../linux-subcores/node/node17/numastat | 6 + .../nodeinfodata/linux-subcores/node/node17/vmstat | 39 ++++++ tests/nodeinfodata/linux-subcores/node/online | 1 + tests/nodeinfodata/linux-subcores/node/possible | 1 + tests/nodeinfomock.c | 35 ++++++ tests/nodeinfotest.c | 3 +- 400 files changed, 831 insertions(+), 14 deletions(-) create mode 100644 tests/nodeinfodata/linux-ppc64-subcores.cpuinfo create mode 100644 tests/nodeinfodata/linux-ppc64-subcores.expected create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu0/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu0/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu0/topology/core_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu0/topology/core_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu0/topology/core_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu0/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu0/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu0/topology/thread_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu1/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu1/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu10/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu10/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu11/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu11/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu12/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu12/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu13/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu13/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu14/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu14/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu15/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu15/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu16/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu16/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu16/topology/core_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu16/topology/core_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu16/topology/core_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu16/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu16/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu16/topology/thread_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu17/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu17/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu18/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu18/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu19/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu19/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu2/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu2/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu20/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu20/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu21/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu21/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu22/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu22/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu23/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu23/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu24/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu24/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu24/topology/core_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu24/topology/core_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu24/topology/core_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu24/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu24/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu24/topology/thread_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu25/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu25/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu26/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu26/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu27/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu27/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu28/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu28/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu29/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu29/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu3/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu3/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu30/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu30/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu31/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu31/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu32/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu32/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu32/topology/core_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu32/topology/core_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu32/topology/core_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu32/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu32/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu32/topology/thread_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu33/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu33/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu34/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu34/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu35/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu35/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu36/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu36/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu37/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu37/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu38/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu38/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu39/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu39/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu4/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu4/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu40/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu40/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu40/topology/core_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu40/topology/core_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu40/topology/core_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu40/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu40/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu40/topology/thread_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu41/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu41/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu42/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu42/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu43/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu43/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu44/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu44/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu45/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu45/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu46/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu46/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu47/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu47/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu48/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu48/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu48/topology/core_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu48/topology/core_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu48/topology/core_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu48/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu48/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu48/topology/thread_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu49/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu49/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu5/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu5/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu50/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu50/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu51/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu51/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu52/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu52/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu53/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu53/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu54/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu54/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu55/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu55/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu56/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu56/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu56/topology/core_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu56/topology/core_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu56/topology/core_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu56/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu56/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu56/topology/thread_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu57/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu57/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu58/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu58/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu59/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu59/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu6/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu6/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu60/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu60/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu61/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu61/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu62/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu62/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu63/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu63/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu64/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu64/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu64/topology/core_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu64/topology/core_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu64/topology/core_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu64/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu64/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu64/topology/thread_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu65/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu65/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu66/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu66/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu67/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu67/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu68/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu68/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu69/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu69/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu7/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu7/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu70/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu70/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu71/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu71/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu72/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu72/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu72/topology/core_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu72/topology/core_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu72/topology/core_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu72/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu72/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu72/topology/thread_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu73/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu73/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu74/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu74/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu75/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu75/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu76/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu76/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu77/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu77/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu78/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu78/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu79/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu79/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu8/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu8/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu8/topology/core_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu8/topology/core_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu8/topology/core_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu8/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu8/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu8/topology/thread_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu80/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu80/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu80/topology/core_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu80/topology/core_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu80/topology/core_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu80/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu80/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu80/topology/thread_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu81/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu81/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu82/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu82/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu83/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu83/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu84/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu84/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu85/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu85/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu86/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu86/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu87/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu87/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu88/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu88/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu88/topology/core_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu88/topology/core_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu88/topology/core_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu88/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu88/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu88/topology/thread_siblings_list create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu89/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu89/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu9/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu9/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu90/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu90/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu91/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu91/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu92/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu92/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu93/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu93/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu94/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu94/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu95/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/cpu95/physical_id create mode 100644 tests/nodeinfodata/linux-subcores/cpu/dscr_default create mode 100644 tests/nodeinfodata/linux-subcores/cpu/kernel_max create mode 100644 tests/nodeinfodata/linux-subcores/cpu/offline create mode 100644 tests/nodeinfodata/linux-subcores/cpu/online create mode 100644 tests/nodeinfodata/linux-subcores/cpu/possible create mode 100644 tests/nodeinfodata/linux-subcores/cpu/present create mode 100644 tests/nodeinfodata/linux-subcores/cpu/subcores_per_core create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu0 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu1 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu10 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu11 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu12 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu13 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu14 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu15 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu16 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu17 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu18 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu19 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu2 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu20 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu21 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu22 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu23 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu3 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu4 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu5 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu6 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu7 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu8 create mode 120000 tests/nodeinfodata/linux-subcores/node/node0/cpu9 create mode 100644 tests/nodeinfodata/linux-subcores/node/node0/cpulist create mode 100644 tests/nodeinfodata/linux-subcores/node/node0/cpumap create mode 100644 tests/nodeinfodata/linux-subcores/node/node0/distance create mode 100644 tests/nodeinfodata/linux-subcores/node/node0/meminfo create mode 100644 tests/nodeinfodata/linux-subcores/node/node0/numastat create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu24 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu25 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu26 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu27 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu28 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu29 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu30 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu31 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu32 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu33 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu34 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu35 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu36 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu37 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu38 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu39 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu40 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu41 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu42 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu43 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu44 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu45 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu46 create mode 120000 tests/nodeinfodata/linux-subcores/node/node1/cpu47 create mode 100644 tests/nodeinfodata/linux-subcores/node/node1/cpulist create mode 100644 tests/nodeinfodata/linux-subcores/node/node1/cpumap create mode 100644 tests/nodeinfodata/linux-subcores/node/node1/distance create mode 100644 tests/nodeinfodata/linux-subcores/node/node1/meminfo create mode 100644 tests/nodeinfodata/linux-subcores/node/node1/numastat create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu48 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu49 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu50 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu51 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu52 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu53 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu54 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu55 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu56 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu57 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu58 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu59 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu60 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu61 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu62 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu63 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu64 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu65 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu66 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu67 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu68 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu69 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu70 create mode 120000 tests/nodeinfodata/linux-subcores/node/node16/cpu71 create mode 100644 tests/nodeinfodata/linux-subcores/node/node16/cpulist create mode 100644 tests/nodeinfodata/linux-subcores/node/node16/cpumap create mode 100644 tests/nodeinfodata/linux-subcores/node/node16/distance create mode 100644 tests/nodeinfodata/linux-subcores/node/node16/meminfo create mode 100644 tests/nodeinfodata/linux-subcores/node/node16/numastat create mode 100644 tests/nodeinfodata/linux-subcores/node/node16/uevent create mode 100644 tests/nodeinfodata/linux-subcores/node/node16/vmstat create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu72 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu73 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu74 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu75 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu76 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu77 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu78 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu79 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu80 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu81 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu82 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu83 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu84 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu85 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu86 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu87 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu88 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu89 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu90 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu91 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu92 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu93 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu94 create mode 120000 tests/nodeinfodata/linux-subcores/node/node17/cpu95 create mode 100644 tests/nodeinfodata/linux-subcores/node/node17/cpulist create mode 100644 tests/nodeinfodata/linux-subcores/node/node17/cpumap create mode 100644 tests/nodeinfodata/linux-subcores/node/node17/distance create mode 100644 tests/nodeinfodata/linux-subcores/node/node17/meminfo create mode 100644 tests/nodeinfodata/linux-subcores/node/node17/numastat create mode 100644 tests/nodeinfodata/linux-subcores/node/node17/vmstat create mode 100644 tests/nodeinfodata/linux-subcores/node/online create mode 100644 tests/nodeinfodata/linux-subcores/node/possible create mode 100644 tests/nodeinfomock.c -- 2.4.3

2 5

[libvirt] [PATCH] storage: Fix regression in storagePoolUpdateAllState
by Erik Skultety 08 Jul '15

08 Jul '15

Commit 2a31c5f0 introduced support for storage pool state XMLs, however it also introduced a regression: if (!virstoragePoolObjIsActive(pool)) { virStoragePoolObjUnlock(pool); continue; } The idea behind this was that since we've got state XMLs and the pool wasn't marked as active by autostart routine (if the autostart flag had been set earlier), the pool is inactive and we can leave it be and continue with other pools. However, filesystem type pools like fs,dir, possibly netfs are supposed to be active if the filesystem is mounted on the host. And this is exactly where the regression occurs, e.g. pool type 'dir' which has been previously destroyed and marked as !autostart gets filtered out by the condition above. The resolution should be simply to remove the condition completely, all pools will get their 'active' flag updated by check callback and if they do not support such callback, the logic doesn't change and such pools will be inactive by default (e.g. RBD, even if a state XML exists). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1238610 --- src/storage/storage_driver.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index e600514..d3cdbc5 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -142,11 +142,6 @@ storagePoolUpdateAllState(void) virStoragePoolObjPtr pool = driver->pools.objs[i]; virStoragePoolObjLock(pool); - if (!virStoragePoolObjIsActive(pool)) { - virStoragePoolObjUnlock(pool); - continue; - } - storagePoolUpdateState(pool); virStoragePoolObjUnlock(pool); } -- 1.9.3

2 2

[libvirt] [PATCH 0/3] bitmap: Fix regression when getting iothread info
by Peter Krempa 08 Jul '15

08 Jul '15

Peter Krempa (3): vz: Remove dead code from vzDomainGetVcpus vz: Use virBitmapToDataBuf instead of virBitmapToData in vzDomainGetVcpus util: bitmap: Don't alloc overly large binary bitmaps src/util/virbitmap.c | 7 +++++-- src/vz/vz_driver.c | 24 ++++-------------------- 2 files changed, 9 insertions(+), 22 deletions(-) -- 2.4.5

2 5

[libvirt] [PATCH] qemu: move the guest status check before agent config and status check
by Luyao Huang 08 Jul '15

08 Jul '15

When use setvcpus command with --guest option to a offline vm, we will get error: # virsh setvcpus test3 1 --guest error: Guest agent is not responding: QEMU guest agent is not connected However guest is not running, agent status could not be connected. In this case, report domain is not running will be better than agent is not connected. Move the guest status check more early to output error to point out guest status is not right. Also from the logic, a running vm is a basic requirement to use agent, we cannot use agent if vm is not running. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_domain.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f9bf32c..814fb2c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3084,6 +3084,13 @@ qemuDomainAgentAvailable(virDomainObjPtr vm, } return false; } + if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) { + if (reportError) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not running")); + } + return false; + } if (!priv->agent) { if (qemuFindAgentConfig(vm->def)) { if (reportError) { @@ -3099,13 +3106,6 @@ qemuDomainAgentAvailable(virDomainObjPtr vm, return false; } } - if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) { - if (reportError) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("domain is not running")); - } - return false; - } return true; } -- 1.8.3.1

3 2

[libvirt] [PATCH] qemu: remove deadcode in qemuDomain{HelperGetVcpus|GetIOThreadsLive}
by Luyao Huang 08 Jul '15

08 Jul '15

We set hostcpus but not use them. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7a04e67..3f002b3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1418,13 +1418,9 @@ static int qemuDomainHelperGetVcpus(virDomainObjPtr vm, virVcpuInfoPtr info, int maxinfo, unsigned char *cpumaps, int maplen) { - int hostcpus; size_t i, v; qemuDomainObjPrivatePtr priv = vm->privateData; - if ((hostcpus = nodeGetCPUCount()) < 0) - return -1; - if (priv->vcpupids == NULL) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cpu affinity is not supported")); @@ -5579,7 +5575,6 @@ qemuDomainGetIOThreadsLive(virQEMUDriverPtr driver, qemuMonitorIOThreadInfoPtr *iothreads = NULL; virDomainIOThreadInfoPtr *info_ret = NULL; int niothreads = 0; - int hostcpus; size_t i; int ret = -1; @@ -5612,9 +5607,6 @@ qemuDomainGetIOThreadsLive(virQEMUDriverPtr driver, goto endjob; } - if ((hostcpus = nodeGetCPUCount()) < 0) - goto endjob; - if (VIR_ALLOC_N(info_ret, niothreads) < 0) goto endjob; -- 1.8.3.1

3 2

[libvirt] [PATCH] rpc: ensure daemon is spawn even if dead socket exists
by Daniel P. Berrange 08 Jul '15

08 Jul '15

The auto-spawn code would originally attempt to spawn the daemon for both ENOENT and ECONNREFUSED errors from connect(). The various refactorings eventually lost this so we only spawn the daemon on ENOENT. The result is if the daemon exits uncleanly, so that the socket is left in the filesystem, we will never be able to auto-spawn the daemon again. --- src/rpc/virnetsocket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 3d75081..106d09a 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -681,7 +681,8 @@ int virNetSocketNewConnectUNIX(const char *path, while (retries && connect(fd, &remoteAddr.data.sa, remoteAddr.len) < 0) { - if (!(spawnDaemon && errno == ENOENT)) { + if (!(spawnDaemon && (errno == ENOENT || + errno == ECONNREFUSED))) { virReportSystemError(errno, _("Failed to connect socket to '%s'"), path); goto cleanup; -- 2.4.3

2 1

[libvirt] [glib v2 0/2] misc gconfig fixes
by Cédric Bosdonnat 08 Jul '15

08 Jul '15

Hi all, Here is a version fixing two bugs I introduced. Diff to v1: * takes into account teuf's comments. Cédric Bosdonnat (2): Don't overwrite filesystem type when writing format Dsitribute the whole tests/xml folder libvirt-gconfig/libvirt-gconfig-domain-filesys.c | 4 ++-- tests/Makefile.am | 14 +------------- tests/test-gconfig.c | 2 +- tests/xml/gconfig-domain-device-filesys.xml | 2 +- 4 files changed, 5 insertions(+), 17 deletions(-) -- 2.1.4

2 3

[libvirt] [glib] Don't overwrite filesystem type when writing format
by Cédric Bosdonnat 08 Jul '15

08 Jul '15

When setting filesystem driver format first and type, only the type remained and vice-versa. --- libvirt-gconfig/libvirt-gconfig-domain-filesys.c | 8 ++++++-- tests/test-gconfig.c | 2 +- tests/xml/gconfig-domain-device-filesys.xml | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c index 9b73af5..4e33d5f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c @@ -125,7 +125,9 @@ void gvir_config_domain_filesys_set_driver_type(GVirConfigDomainFilesys *filesys GVirConfigObject *node; g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_FILESYS(filesys)); - node = gvir_config_object_replace_child(GVIR_CONFIG_OBJECT(filesys), "driver"); + node = gvir_config_object_get_child(GVIR_CONFIG_OBJECT(filesys), "driver"); + if (!node) + node = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(filesys), "driver"); g_return_if_fail(GVIR_CONFIG_IS_OBJECT(node)); if (type != GVIR_CONFIG_DOMAIN_FILESYS_DRIVER_DEFAULT) gvir_config_object_set_attribute_with_type( @@ -143,7 +145,9 @@ void gvir_config_domain_filesys_set_driver_format(GVirConfigDomainFilesys *files GVirConfigObject *node; g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_FILESYS(filesys)); - node = gvir_config_object_replace_child(GVIR_CONFIG_OBJECT(filesys), "driver"); + node = gvir_config_object_get_child(GVIR_CONFIG_OBJECT(filesys), "driver"); + if (!node) + node = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(filesys), "driver"); g_return_if_fail(GVIR_CONFIG_IS_OBJECT(node)); gvir_config_object_set_attribute_with_type( diff --git a/tests/test-gconfig.c b/tests/test-gconfig.c index bd2daa6..0eec53e 100644 --- a/tests/test-gconfig.c +++ b/tests/test-gconfig.c @@ -368,7 +368,7 @@ static void test_domain_device_filesystem(void) fs = gvir_config_domain_filesys_new(); gvir_config_domain_filesys_set_type(fs, GVIR_CONFIG_DOMAIN_FILESYS_FILE); gvir_config_domain_filesys_set_access_type(fs, GVIR_CONFIG_DOMAIN_FILESYS_ACCESS_MAPPED); - gvir_config_domain_filesys_set_driver_type(fs, GVIR_CONFIG_DOMAIN_FILESYS_DRIVER_DEFAULT); + gvir_config_domain_filesys_set_driver_type(fs, GVIR_CONFIG_DOMAIN_FILESYS_DRIVER_NBD); gvir_config_domain_filesys_set_driver_format(fs, GVIR_CONFIG_DOMAIN_DISK_FORMAT_QCOW2); gvir_config_domain_filesys_set_source(fs, "/path/to/source"); gvir_config_domain_filesys_set_target(fs, "/path/to/target1"); diff --git a/tests/xml/gconfig-domain-device-filesys.xml b/tests/xml/gconfig-domain-device-filesys.xml index 30152d2..a831c02 100644 --- a/tests/xml/gconfig-domain-device-filesys.xml +++ b/tests/xml/gconfig-domain-device-filesys.xml @@ -1,7 +1,7 @@ <domain> <devices> <filesystem type="file" accessmode="mapped"> - <driver format="qcow2"/> + <driver type="nbd" format="qcow2"/> <source file="/path/to/source"/> <target dir="/path/to/target1"/> <readonly/> -- 2.1.4

3 3

[libvirt] [glib] Add filesys xml file to distribution
by Cédric Bosdonnat 07 Jul '15

07 Jul '15

Tests can't succeed from the distribution tarball: the new gconfig-domain-device-filesys.xml file wasn't included. --- tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 63865e8..c8bb4c7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -23,6 +23,7 @@ EXTRA_DIST += \ xml/gconfig-domain-device-channel.xml \ xml/gconfig-domain-device-console.xml \ xml/gconfig-domain-device-disk.xml \ + xml/gconfig-domain-device-filesys.xml \ xml/gconfig-domain-device-graphics.xml \ xml/gconfig-domain-device-input.xml \ xml/gconfig-domain-device-network.xml \ -- 2.1.4

2 1

[libvirt] [PATCH v2 0/1] vz: assign static IPs and default gateways for network adapter
by Mikhail Feoktistov 07 Jul '15

07 Jul '15

fix "avoid_if_before_free" warnings for VIR_FREE calls fix "found diagnostic without %" warnings for virReportError calls use virAsprintf instead of virBufferAsprintf set default gateway only if static ip is present write inet family to log in case of unsupported gateway Mikhail Feoktistov (1): vz: assign static IPs and default gateways for network adapter

2 2

[libvirt] [PATCH RESEND] Added support for portable-rpcgen from portablexdr library
by Pavel Fedin 07 Jul '15

07 Jul '15

This patch allows to build libvirt natively under MinGW/MSYS using portablexdr library. An updated version of portablexdr with fixed bugs is available as part of MSYS2 project. Signed-off-by: Pavel Fedin <p.fedin(a)samsung.com> --- configure.ac | 2 +- src/lxc/lxc_monitor_protocol.x | 2 +- src/rpc/genprotocol.pl | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index aed0934..547a405 100644 --- a/configure.ac +++ b/configure.ac @@ -397,7 +397,7 @@ AM_CONDITIONAL([HAVE_LIBTASN1], [test "x$ac_cv_header_libtasn1_h" = "xyes"]) AC_CHECK_LIB([intl],[gettext],[]) dnl Do we have rpcgen? -AC_PATH_PROG([RPCGEN], [rpcgen], [no]) +AC_PATH_PROGS([RPCGEN], [rpcgen portable-rpcgen], [no]) AM_CONDITIONAL([HAVE_RPCGEN], [test "x$ac_cv_path_RPCGEN" != "xno"]) dnl Is this GLIBC's buggy rpcgen? AM_CONDITIONAL([HAVE_GLIBC_RPCGEN], diff --git a/src/lxc/lxc_monitor_protocol.x b/src/lxc/lxc_monitor_protocol.x index 3b66af5..205d7c2 100644 --- a/src/lxc/lxc_monitor_protocol.x +++ b/src/lxc/lxc_monitor_protocol.x @@ -30,7 +30,7 @@ enum virLXCMonitorExitStatus { }; struct virLXCMonitorExitEventMsg { - enum virLXCMonitorExitStatus status; + virLXCMonitorExitStatus status; }; struct virLXCMonitorInitEventMsg { diff --git a/src/rpc/genprotocol.pl b/src/rpc/genprotocol.pl index 6e6d6d4..1ac2507 100755 --- a/src/rpc/genprotocol.pl +++ b/src/rpc/genprotocol.pl @@ -38,7 +38,10 @@ my $target = shift; unlink $target; -open RPCGEN, "-|", $rpcgen, $mode, $xdrdef +if ($rpcgen =~ /portable-rpcgen/) { + $rpcgen = "$rpcgen -o -"; +} +open RPCGEN, "-|", "$rpcgen $mode $xdrdef" or die "cannot run $rpcgen $mode $xdrdef: $!"; open TARGET, ">$target" or die "cannot create $target: $!"; -- 1.9.5.msysgit.0 -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list

2 4

[libvirt] [PATCH] vz: assign static IPs and default gateways for network adapter
by Mikhail Feoktistov 07 Jul '15

07 Jul '15

We support only one IPv4 and one IPv6 default gateway. If static IPs are not present in instance config, then we switch on DHCP for this adapter. PrlVmDevNet_SetAutoApply to makes necessary settings within guest OS In linux case it creates network startup scripts /etc/sysconfig/network-scripts/ifcfg-ethN and fills it with necessary parameters. --- src/vz/vz_sdk.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 120 insertions(+), 0 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index f27098c..7d318f8 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2788,8 +2788,13 @@ static int prlsdkAddNet(PRL_HANDLE sdkdom, PRL_HANDLE sdknet = PRL_INVALID_HANDLE; PRL_HANDLE vnet = PRL_INVALID_HANDLE; PRL_HANDLE job = PRL_INVALID_HANDLE; + PRL_HANDLE addrlist = PRL_INVALID_HANDLE; + size_t i; int ret = -1; char macstr[PRL_MAC_STRING_BUFNAME]; + char *addrstr = NULL; + bool ipv6present = false; + bool ipv4present = false; if (prlsdkCheckNetUnsupportedParams(net) < 0) return -1; @@ -2814,6 +2819,118 @@ static int prlsdkAddNet(PRL_HANDLE sdkdom, pret = PrlVmDevNet_SetMacAddress(sdknet, macstr); prlsdkCheckRetGoto(pret, cleanup); + pret = PrlApi_CreateStringsList(&addrlist); + prlsdkCheckRetGoto(pret, cleanup); + + for (i = 0; i < net->nips; i++) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + char *tmpstr; + + if (AF_INET == VIR_SOCKET_ADDR_FAMILY(&net->ips[i]->address)) + ipv4present = true; + else if (AF_INET6 == VIR_SOCKET_ADDR_FAMILY(&net->ips[i]->address)) + ipv6present = true; + else + continue; + + if (!(tmpstr = virSocketAddrFormat(&net->ips[i]->address))) + goto cleanup; + + virBufferAsprintf(&buf, "%s/%d", tmpstr, net->ips[i]->prefix); + VIR_FREE(tmpstr); + if (!(addrstr = virBufferContentAndReset(&buf))) + goto cleanup; + + pret = PrlStrList_AddItem(addrlist, addrstr); + prlsdkCheckRetGoto(pret, cleanup); + + VIR_FREE(addrstr); + addrstr = NULL; + } + + if (ipv4present || ipv6present) { + pret = PrlVmDevNet_SetNetAddresses(sdknet, addrlist); + prlsdkCheckRetGoto(pret, cleanup); + } + + pret = PrlVmDevNet_SetConfigureWithDhcp(sdknet, !ipv4present); + prlsdkCheckRetGoto(pret, cleanup); + + pret = PrlVmDevNet_SetConfigureWithDhcpIPv6(sdknet, !ipv6present); + prlsdkCheckRetGoto(pret, cleanup); + + pret = PrlVmDevNet_SetAutoApply(sdknet, true); + prlsdkCheckRetGoto(pret, cleanup); + + if (net->nroutes) { + bool alreadySetIPv4Gateway = false; + bool alreadySetIPv6Gateway = false; + + for (i = 0; i < net->nroutes; i++) { + virSocketAddrPtr addrdst, gateway; + virSocketAddr zero; + + addrdst = virNetworkRouteDefGetAddress(net->routes[i]); + gateway = virNetworkRouteDefGetGateway(net->routes[i]); + + ignore_value(virSocketAddrParse(&zero, + (VIR_SOCKET_ADDR_IS_FAMILY(addrdst, AF_INET) + ? VIR_SOCKET_ADDR_IPV4_ALL + : VIR_SOCKET_ADDR_IPV6_ALL), + VIR_SOCKET_ADDR_FAMILY(addrdst))); + + if (!virSocketAddrEqual(addrdst, &zero)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Support only default gateway")); + goto cleanup; + } + + switch (VIR_SOCKET_ADDR_FAMILY(gateway)) { + case AF_INET: + if (alreadySetIPv4Gateway) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Support only one IPv4 default gateway")); + goto cleanup; + } + + if (!(addrstr = virSocketAddrFormat(gateway))) + goto cleanup; + + pret = PrlVmDevNet_SetDefaultGateway(sdknet, addrstr); + prlsdkCheckRetGoto(pret, cleanup); + + alreadySetIPv4Gateway = true; + break; + + case AF_INET6: + if (alreadySetIPv6Gateway) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Support only one IPv6 default gateway")); + goto cleanup; + } + + if (!(addrstr = virSocketAddrFormat(gateway))) + goto cleanup; + + pret = PrlVmDevNet_SetDefaultGatewayIPv6(sdknet, addrstr); + prlsdkCheckRetGoto(pret, cleanup); + + alreadySetIPv6Gateway = true; + break; + + default: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Support only IPv4 and IPv6 default gateways")); + goto cleanup; + } + + if (addrstr) { + VIR_FREE(addrstr); + addrstr = NULL; + } + } + } + if (isCt) { if (net->model) VIR_WARN("Setting network adapter for containers is not " @@ -2879,6 +2996,9 @@ static int prlsdkAddNet(PRL_HANDLE sdkdom, ret = 0; cleanup: + if (addrstr) + VIR_FREE(addrstr); + PrlHandle_Free(addrlist); PrlHandle_Free(vnet); PrlHandle_Free(sdknet); return ret; -- 1.7.1

2 2

[libvirt] More coverage for networking API v4
by Zeeshan Ali (Khattak) 07 Jul '15

07 Jul '15

I wasn't setting return values to GTask correctly in the v3. Fixed now.

2 16

[libvirt] [PATCH v2] vz: fix building capabilities
by Dmitry Guryanov 06 Jul '15

06 Jul '15

There should be at least one domain for each guest in cababilities. And in current code we don't add domain for this guest for example. if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64, "vz", NULL, 0, NULL)) == NULL) Anyway, with two virt types it looks a litte messy, so let's move adding guest and domain to a separate function. Signed-off-by: Dmitry Guryanov <dguryanov(a)parallels.com> --- src/vz/vz_driver.c | 92 ++++++++++++++++++++++-------------------------------- 1 file changed, 38 insertions(+), 54 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 47c5023..8c3c818 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -78,14 +78,45 @@ vzDriverUnlock(vzConnPtr driver) virMutexUnlock(&driver->lock); } +static int +vzCapsAddGuestDomain(virCapsPtr caps, + virDomainOSType ostype, + virArch arch, + const char * emulator, + virDomainVirtType virt_type) +{ + virCapsGuestPtr guest; + + if ((guest = virCapabilitiesAddGuest(caps, ostype, arch, emulator, + NULL, 0, NULL)) == NULL) + return -1; + + + if (virCapabilitiesAddGuestDomain(guest, virt_type, + NULL, NULL, 0, NULL) == NULL) + return -1; + + return 0; +} + static virCapsPtr vzBuildCapabilities(void) { virCapsPtr caps = NULL; virCPUDefPtr cpu = NULL; virCPUDataPtr data = NULL; - virCapsGuestPtr guest; virNodeInfo nodeinfo; + virDomainOSType ostypes[] = { + VIR_DOMAIN_OSTYPE_HVM, + VIR_DOMAIN_OSTYPE_EXE + }; + virArch archs[] = { VIR_ARCH_I686, VIR_ARCH_X86_64 }; + const char *const emulators[] = { "parallels", "vz" }; + virDomainVirtType virt_types[] = { + VIR_DOMAIN_VIRT_PARALLELS, + VIR_DOMAIN_VIRT_VZ + }; + size_t i, j, k; if ((caps = virCapabilitiesNew(virArchFromHost(), false, false)) == NULL) @@ -94,59 +125,12 @@ vzBuildCapabilities(void) if (nodeCapsInitNUMA(caps) < 0) goto error; - if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, - VIR_ARCH_X86_64, - "parallels", - NULL, 0, NULL)) == NULL) - goto error; - - if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, - VIR_ARCH_I686, - "parallels", - NULL, 0, NULL)) == NULL) - goto error; - - - if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_PARALLELS, - NULL, NULL, 0, NULL) == NULL) - goto error; - - if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_EXE, - VIR_ARCH_X86_64, - "parallels", - NULL, 0, NULL)) == NULL) - goto error; - - if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_PARALLELS, - NULL, NULL, 0, NULL) == NULL) - goto error; - - if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, - VIR_ARCH_X86_64, - "vz", - NULL, 0, NULL)) == NULL) - goto error; - - if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, - VIR_ARCH_I686, - "vz", - NULL, 0, NULL)) == NULL) - goto error; - - - if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VZ, - NULL, NULL, 0, NULL) == NULL) - goto error; - - if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_EXE, - VIR_ARCH_X86_64, - "vz", - NULL, 0, NULL)) == NULL) - goto error; - - if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VZ, - NULL, NULL, 0, NULL) == NULL) - goto error; + for (i = 0; i < 2; i++) + for (j = 0; j < 2; j++) + for (k = 0; k < 2; k++) + if (vzCapsAddGuestDomain(caps, ostypes[i], archs[j], + emulators[k], virt_types[k]) < 0) + goto error; if (nodeGetInfo(&nodeinfo)) goto error; -- 2.4.3

2 2

[libvirt] [PATCH v2 0/2] Allow PCI virtio on ARM "virt" machine
by Pavel Fedin 06 Jul '15

06 Jul '15

Virt machine in qemu since v2.3.0 has PCI generic host controller, and can use PCI devices. This provides performance improvement as well as vhost-net with irqfd support for virtio-net. However libvirt still insists on virtio devices attached to virt machine to have MMIO bindings. This patch allows to use both. If the user doesn't specify <address type='virtio-mmio'>, PCI will be used by default. Changes since v1: - Added capability based on qemu version number - Recognize also "virt-" prefix Pavel Fedin (2): Introduce QEMU_CAPS_ARM_VIRT_PCI Allow PCI virtio on ARM "virt" machine src/qemu/qemu_capabilities.c | 5 +++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 15 ++++++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) -- 1.9.5.msysgit.0

4 16

[libvirt] [PATCH] vz: fix building capabilities
by Dmitry Guryanov 04 Jul '15

04 Jul '15

There should be at least one domain for each guest in cababilities. And in current code we don't add domain for this guest for example. if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64, "vz", NULL, 0, NULL)) == NULL) Anyway, with two virt types it looks a litte messy, so let's move adding guest and domain to a separate function. --- src/vz/vz_driver.c | 92 +++++++++++++++++++++------------------------------ 1 files changed, 38 insertions(+), 54 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 47c5023..a86ae28 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -78,14 +78,45 @@ vzDriverUnlock(vzConnPtr driver) virMutexUnlock(&driver->lock); } +static int +vzCapsAddGuestDomain(virCapsPtr caps, + virDomainOSType ostype, + virArch arch, + const char * emulator, + virDomainVirtType virt_type) +{ + virCapsGuestPtr guest; + + if ((guest = virCapabilitiesAddGuest(caps, ostype, arch, emulator, + NULL, 0, NULL)) == NULL) + return -1; + + + if (virCapabilitiesAddGuestDomain(guest, virt_type, + NULL, NULL, 0, NULL) == NULL) + return -1; + + return 0; +} + static virCapsPtr vzBuildCapabilities(void) { virCapsPtr caps = NULL; virCPUDefPtr cpu = NULL; virCPUDataPtr data = NULL; - virCapsGuestPtr guest; virNodeInfo nodeinfo; + virDomainOSType ostypes[] = { + VIR_DOMAIN_OSTYPE_HVM, + VIR_DOMAIN_OSTYPE_EXE + }; + virArch archs[] = { VIR_ARCH_I686, VIR_ARCH_X86_64 }; + const char *const emulators[] = { "parallels", "vz" }; + virDomainVirtType virt_types[] = { + VIR_DOMAIN_VIRT_PARALLELS, + VIR_DOMAIN_VIRT_VZ + }; + size_t i, j, k; if ((caps = virCapabilitiesNew(virArchFromHost(), false, false)) == NULL) @@ -94,59 +125,12 @@ vzBuildCapabilities(void) if (nodeCapsInitNUMA(caps) < 0) goto error; - if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, - VIR_ARCH_X86_64, - "parallels", - NULL, 0, NULL)) == NULL) - goto error; - - if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, - VIR_ARCH_I686, - "parallels", - NULL, 0, NULL)) == NULL) - goto error; - - - if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_PARALLELS, - NULL, NULL, 0, NULL) == NULL) - goto error; - - if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_EXE, - VIR_ARCH_X86_64, - "parallels", - NULL, 0, NULL)) == NULL) - goto error; - - if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_PARALLELS, - NULL, NULL, 0, NULL) == NULL) - goto error; - - if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, - VIR_ARCH_X86_64, - "vz", - NULL, 0, NULL)) == NULL) - goto error; - - if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, - VIR_ARCH_I686, - "vz", - NULL, 0, NULL)) == NULL) - goto error; - - - if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VZ, - NULL, NULL, 0, NULL) == NULL) - goto error; - - if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_EXE, - VIR_ARCH_X86_64, - "vz", - NULL, 0, NULL)) == NULL) - goto error; - - if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VZ, - NULL, NULL, 0, NULL) == NULL) - goto error; + for (i = 0; i < 1; i++) + for (j = 0; j < 1; j++) + for (k = 0; k < 1; k++) + if (vzCapsAddGuestDomain(caps, ostypes[i], archs[j], + emulators[k], virt_types[k]) < 0) + goto error; if (nodeGetInfo(&nodeinfo)) goto error; -- 1.7.1

2 2

[libvirt] [libvirt-glib] gobject: Remove redundant virtual functions
by Zeeshan Ali (Khattak) 03 Jul '15

03 Jul '15

These virtual functions were most likely a result of copy&paste error. --- libvirt-gobject/libvirt-gobject-network.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-network.h b/libvirt-gobject/libvirt-gobject-network.h index 5617ed6..8c31af4 100644 --- a/libvirt-gobject/libvirt-gobject-network.h +++ b/libvirt-gobject/libvirt-gobject-network.h @@ -55,10 +55,7 @@ struct _GVirNetworkClass { GObjectClass parent_class; - void (*started)(GVirNetwork *net); - void (*stopped)(GVirNetwork *net); - - gpointer padding[20]; + gpointer padding[22]; }; -- 2.4.3

2 3

[libvirt] [PATCH 0/2] [V3] Libvirt : Storage fixes
by Prerna Saxena 03 Jul '15

03 Jul '15

Here is V3 of storage fixes, which addresses review comments of v2. Summary: Prerna Saxena (2): Storage: Introduce shadow vol for refresh while the main vol builds. Storage : Fix cloning of raw, sparse volumes src/storage/storage_backend.c | 23 ++++++++++------------- src/storage/storage_driver.c | 19 ++++++++++++------- 2 files changed, 22 insertions(+), 20 deletions(-) V2 : http://www.redhat.com/archives/libvir-list/2015-June/msg01052.html Changelog: Modified patches 1,2 per review comments. -- 1.8.3.1 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 5

[libvirt] [PATCH 0/7] Address some Coverity found issues
by John Ferlan 03 Jul '15

03 Jul '15

The following Coverity issues are flagged in Coverity 7.6.1 compared to not being seen in 7.5.1 - this series just addresses those issues before 7.6.1 is installed in our upstream Jenkins environment: http://jenkins-virt.usersys.redhat.com/job/libvirt-coverity/ It seems the bulk are essentially false positives, but we can do something in order to work around them. For the first 3 patches, Coverity complains that virVasprintfInternal can set "*strp = NULL;" on return (in the error path), but the callers don't associate the error path (< 0) with the 'buffer' and thus believe there could be some path where a return 0 would occur. This would result in the callers of the virPCIFile, virPCIDriverFile, and virPCIDriverDir having an error. Rather than try to add sa_assert()'s for each, adjust the calls and callers to return the buffer For the fourth patch, the strtok_r call expects that the first call will have a non-NULL value for the first parameter and subsequent calls over the same string would pass a NULL value in the first parameter and a non-NULL parameter in the third parameter to be used as the "point" in the string to continue looking for the token. However, Coverity doesn't realize this and thus flags the strtok_r call with a possible forward NULL dereference because we initialize the third parameter to NULL. By adding an 'sa_assert' for what is the first argument lets Coverity know we know what we're doing. Additionally, VIR_STRDUP could return a NULL string and a zero return, the assertion in openvz_conf.c is on the passed value to be scanned. The fifth patch is perhaps the only one fixing a real issue; however, it's been around since 1.2.11, so perhaps it's a less traveled path. The sixth patch seems to be a false positive, but since Coverity doesn't make the connection between nstack and stack, it's just as safe to add the protection in the Free routine against a strange path being hit. For the last patch, this is a false positive, but it also shows up in the 7.5.1 coverity build: http://jenkins-virt.usersys.redhat.com/job/libvirt-coverity/128/ Essentially the issue is that virResizeN can "return 0;" prior to the virExpandN and that causes Coverity some angst since it would then be possible to not have anything returned in "*ret" which would cause a NULL dereference. Stepping through the logic has no path in which that could happen. In order to handle this, rather than use VIR_RESIZE_N for 'n' times through the loop, let's first count the matches, use VIR_ALLOC_N, and then rerun the same loop filling in each address as before. The difference being 'n' VIR_RESIZE_N versus 2*'n' STREQ calls - perhaps a small wash performance wise. John Ferlan (7): util: Resolve Coverity FORWARD_NULL util: Resolve Coverity FORWARD_NULL util: Resolve Coverity FORWARD_NULL Avoid Coverity FORWARD_NULL prior to strtok_r calls phyp: Resolve Coverity FORWARD_NULL util: Resolve Coverity FORWARD_NULL util: Avoid Coverity FORWARD_NULL src/esx/esx_vi.c | 1 + src/libxl/libxl_conf.c | 1 + src/openvz/openvz_conf.c | 2 ++ src/phyp/phyp_driver.c | 3 +-- src/util/virdbus.c | 4 +++ src/util/virpci.c | 67 ++++++++++++++++++++++++----------------------- src/util/virtypedparam.c | 14 ++++++---- src/xenapi/xenapi_utils.c | 1 + 8 files changed, 53 insertions(+), 40 deletions(-) -- 2.1.0

3 19

[libvirt] [PATCH 0/2] some qemu_driver cleanups
by Pavel Hrdina 03 Jul '15

03 Jul '15

Pavel Hrdina (2): qemu_driver: live/config checks cleanup qemu_driver: remove duplicate code src/qemu/qemu_driver.c | 85 ++++++-------------------------------------------- 1 file changed, 9 insertions(+), 76 deletions(-) -- 2.4.5

2 5

[libvirt] Avoid XSS vulnerability on the search engine
by Daniel Veillard 03 Jul '15

03 Jul '15

Raised by https://www.xssposed.org/incidents/69566/ Need to escape the user provided query before displaying it back I pushed immediately as this was made public, Daniel diff --git a/docs/search.php.code.in b/docs/search.php.code.in index df25cd6..84f8759 100644 --- a/docs/search.php.code.in +++ b/docs/search.php.code.in @@ -13,7 +13,7 @@ <form action="<?php echo $_SERVER['PHP_SELF'], "?query=", rawurlencode($query) ?>" enctype="application/x-www-form-urlencoded" method="get"> - <input name="query" type="text" size="50" value="<?php echo $query?>"/> + <input name="query" type="text" size="50" value="<?php echo htmlspecialchars($query, ENT_QUOTES, 'UTF-8')?>"/> <select name="scope"> <option value="any">Search All</option> <option value="API" <?php if ($scope == 'API') print "selected='selected'"?>>Only the APIs</option> -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] Fix nodeinfo output on PPC64 KVM hosts
by Shivaprasad G Bhat 03 Jul '15

03 Jul '15

The nodeinfo is reporting incorrect number of cpus and incorrect host topology on PPC64 KVM hosts. The KVM hypervisor on PPC64 needs only the primary thread in a core to be online, and the secondaries offlined. While scheduling a guest in, the kvm scheduler wakes up the secondaries to run in guest context. The host scheduling of the guests happen at the core level(as only primary thread is online). The kvm scheduler exploits as many threads of the core as needed by guest. Further, starting POWER8, the processor allows splitting a physical core into multiple subcores with 2 or 4 threads each. Again, only the primary thread in a subcore is online in the host. The KVM-PPC scheduler allows guests to exploit all the offline threads in the subcore, by bringing them online when needed. (Kernel patches on split-core http://www.spinics.net/lists/kvm-ppc/msg09121.html) Recently with dynamic micro-threading changes in ppc-kvm, makes sure to utilize all the offline cpus across guests, and across guests with different cpu topologies. (https://www.mail-archive.com/kvm@vger.kernel.org/msg115978.html) Since the offline cpus are brought online in the guest context, it is safe to count them as online. Nodeinfo today discounts these offline cpus from cpu count/topology calclulation, and the nodeinfo output is not of any help and the host appears overcommited when it is actually not. The patch carefully counts those offline threads whose primary threads are online. The host topology displayed by the nodeinfo is also fixed when the host is in valid kvm state. Test results with and without fix: http://ur1.ca/mx25y Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/nodeinfo.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 2fafe2d..1a27080 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -32,6 +32,8 @@ #include <sys/utsname.h> #include <sched.h> #include "conf/domain_conf.h" +#include <fcntl.h> +#include <sys/ioctl.h> #if defined(__FreeBSD__) || defined(__APPLE__) # include <sys/time.h> @@ -428,6 +430,10 @@ virNodeParseNode(const char *node, unsigned int cpu; int online; int direrr; + int kvmfd = -1; + int lastonline; + int threads_per_subcore = 1; + bool valid_ppc64_kvmhost_mode = false; *threads = 0; *cores = 0; @@ -464,6 +470,66 @@ virNodeParseNode(const char *node, sock_max++; + if (ARCH_IS_PPC64(arch)) { + /* PPC-KVM needs the secondary threads of a core to be offline on the + * host. The kvm schedular brings the secondary threads online in the + * guest context. Moreover, P8 processor has split-core capability + * where, there can be 1,2 or 4 subcores per core. The primaries of the + * subcores alone will be online on the host for a subcore in the + * host. Even though the actual threads per core for P8 processor is 8, + * depending on the subcores_per_core = 1, 2 or 4, the threads per + * subcore will vary accordingly to 8, 4 and 2 repectively. + * So, On host threads_per_core what is arrived at from sysfs in the + * current logic is actually the subcores_per_core. Threads per subcore + * can only be obtained from the kvm device. For example, on P8 wih 1 + * core having 8 threads, sub_cores_percore=4, the threads 0,2,4 & 6 + * will be online. The sysfs reflects this and in the current logic + * variable 'threads' will be 4 which is nothing but subcores_per_core. + * If the user tampers the cpu online/offline states using chcpu or other + * means, then it is an unsupported configuration for kvm. + * The code below tries to keep in mind + * - when the libvirtd is run inside a KVM guest or Phyp based guest. + * - Or on the kvm host where user manually tampers the cpu states to + * offline/online randomly. + */ +# if HAVE_LINUX_KVM_H +# include <linux/kvm.h> + kvmfd = open("/dev/kvm", O_RDONLY); + if (kvmfd >= 0) { +# ifdef KVM_CAP_PPC_SMT + valid_ppc64_kvmhost_mode = true; + /* For Phyp and KVM based guests the ioctl for KVM_CAP_PPC_SMT + * returns zero and both primary and secondary threads will be + * online. Dont try to alter or interpret anything here. + */ + threads_per_subcore = ioctl(kvmfd, KVM_CHECK_EXTENSION, KVM_CAP_PPC_SMT); + if (threads_per_subcore == 0) + valid_ppc64_kvmhost_mode = false; +# endif + } + VIR_FORCE_CLOSE(kvmfd); +# endif + rewinddir(cpudir); + lastonline = -1; + while (valid_ppc64_kvmhost_mode && + ((direrr = virDirRead(cpudir, &cpudirent, node)) > 0)) { + if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) + continue; + if ((online = virNodeGetCpuValue(node, cpu, "online", 1)) < 0) + goto cleanup; + + if (online) { + if (lastonline != -1 && + (cpu - lastonline) < threads_per_subcore) { + valid_ppc64_kvmhost_mode = false; /* if any of secondaries + * online */ + break; + } + lastonline = cpu; + } + } + } + /* allocate cpu maps for each socket */ if (VIR_ALLOC_N(core_maps, sock_max) < 0) goto cleanup; @@ -473,6 +539,7 @@ virNodeParseNode(const char *node, /* iterate over all CPU's in the node */ rewinddir(cpudir); + lastonline = -1; while ((direrr = virDirRead(cpudir, &cpudirent, node)) > 0) { if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; @@ -480,6 +547,17 @@ virNodeParseNode(const char *node, if ((online = virNodeGetCpuValue(node, cpu, "online", 1)) < 0) goto cleanup; + if (ARCH_IS_PPC64(arch) && valid_ppc64_kvmhost_mode) { + if (online) { + lastonline = cpu; + } else if (lastonline != -1 && + (cpu-lastonline) < threads_per_subcore) { + processors++; /* Count only those secondaries whose primary + subcore is online */ + continue; + } + } + if (!online) { (*offline)++; continue; @@ -528,6 +606,13 @@ virNodeParseNode(const char *node, *cores = core; } + if (ARCH_IS_PPC64(arch) && valid_ppc64_kvmhost_mode) { + /* The actual host threads per core is + * multiple of the subcores_per_core(i.e variable *threads in this case) + * and threads_per_subcore. + */ + *threads = *threads * threads_per_subcore; + } ret = processors; cleanup:

3 4

[libvirt] [PATCH] virsh: report error if vcpu number exceed the guest maxvcpu number
by Luyao Huang 03 Jul '15

03 Jul '15

If usr pass a vcpu which exceed guest maxvcpu number, virsh client will only output an header like this: # virsh vcpupin test3 1000 VCPU: CPU Affinity ---------------------------------- After this patch: # virsh vcpupin test3 1000 error: vcpu 1000 is out of range of cpu count 2 Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- tools/virsh-domain.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 27d62e9..681fc1a 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6497,6 +6497,11 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) goto cleanup; } + if (got_vcpu && vcpu >= ncpus) { + vshError(ctl, _("vcpu %d is out of range of cpu count %d"), vcpu, ncpus); + goto cleanup; + } + cpumaplen = VIR_CPU_MAPLEN(maxcpu); cpumap = vshMalloc(ctl, ncpus * cpumaplen); if ((ncpus = virDomainGetVcpuPinInfo(dom, ncpus, cpumap, -- 1.8.3.1

4 5