- Devel - libvirt List Archives

[libvirt] [PATCH] storage: Don't dereference driver object if virStorageSource is not initialized
by Peter Krempa 07 Dec '17

07 Dec '17

virStorageFileReportBrokenChain uses data from the driver private data pointer to print the user and group. This would lead to a crash in call paths where we did not initialize the storage backend as recently added in commit 24e47ee2b93 to qemuDomainDetermineDiskChain. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1522682 --- Once pushed I'll also backport it to a maint branch of the last release if that's desired. src/storage/storage_source.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/src/storage/storage_source.c b/src/storage/storage_source.c index 4586ef4ad4..a5df84bae3 100644 --- a/src/storage/storage_source.c +++ b/src/storage/storage_source.c @@ -419,19 +419,33 @@ virStorageFileReportBrokenChain(int errcode, virStorageSourcePtr src, virStorageSourcePtr parent) { - unsigned int access_user = src->drv->uid; - unsigned int access_group = src->drv->gid; - - if (src == parent) { - virReportSystemError(errcode, - _("Cannot access storage file '%s' " - "(as uid:%u, gid:%u)"), - src->path, access_user, access_group); + + if (src->drv) { + unsigned int access_user = src->drv->uid; + unsigned int access_group = src->drv->gid; + + if (src == parent) { + virReportSystemError(errcode, + _("Cannot access storage file '%s' " + "(as uid:%u, gid:%u)"), + src->path, access_user, access_group); + } else { + virReportSystemError(errcode, + _("Cannot access backing file '%s' " + "of storage file '%s' (as uid:%u, gid:%u)"), + src->path, parent->path, access_user, access_group); + } } else { - virReportSystemError(errcode, - _("Cannot access backing file '%s' " - "of storage file '%s' (as uid:%u, gid:%u)"), - src->path, parent->path, access_user, access_group); + if (src == parent) { + virReportSystemError(errcode, + _("Cannot access storage file '%s' "), + src->path); + } else { + virReportSystemError(errcode, + _("Cannot access backing file '%s' " + "of storage file '%s'"), + src->path, parent->path); + } } } -- 2.15.0

2 2

[libvirt] [PATCH php v2] Fix crash in VIRT_HASH_CURRENT_KEY_INFO macro
by Dawid Zamirski 07 Dec '17

07 Dec '17

The PHP7 variant of the macro wasn't safe if the hash key was not a string type. This was found when running php script with just libvirt_connect call under xdebug session which segfaulted. This patch makes the following changes: * make sure that tmp_name is initialized to NULL * set the key name only when zend_hash_get_current_key_ex did set it to something which happens only when type is HASH_KEY_IS_STRING * stash the key index in out php_libvirt_hash_key_info struct because it wasn't there before and separate variable had to be used. --- v1: https://www.redhat.com/archives/libvir-list/2017-December/msg00151.html Changes since v1: * use zend_ulong in php_libvirt_hash_key_info struct so that no type cast is needed src/libvirt-connection.c | 8 +++----- src/libvirt-php.c | 6 ++---- src/libvirt-php.h | 1 + src/util.h | 16 +++++++++------- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/libvirt-connection.c b/src/libvirt-connection.c index 181b266..2d59d82 100644 --- a/src/libvirt-connection.c +++ b/src/libvirt-connection.c @@ -131,8 +131,6 @@ PHP_FUNCTION(libvirt_connect) HashPosition pointer; int array_count; - zend_ulong index; - unsigned long libVer; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sba", &url, &url_len, &readonly, &zcreds) == FAILURE) { @@ -176,13 +174,13 @@ PHP_FUNCTION(libvirt_connect) VIRT_FOREACH(arr_hash, pointer, data) { if (Z_TYPE_P(data) == IS_STRING) { php_libvirt_hash_key_info info; - VIRT_HASH_CURRENT_KEY_INFO(arr_hash, pointer, index, info); + VIRT_HASH_CURRENT_KEY_INFO(arr_hash, pointer, info); if (info.type == HASH_KEY_IS_STRING) { PHPWRITE(info.name, info.length); } else { - DPRINTF("%s: credentials index %d\n", PHPFUNC, (int)index); - creds[j].type = index; + DPRINTF("%s: credentials index %d\n", PHPFUNC, info.index); + creds[j].type = info.index; creds[j].result = (char *)emalloc(Z_STRLEN_P(data) + 1); memset(creds[j].result, 0, Z_STRLEN_P(data) + 1); creds[j].resultlen = Z_STRLEN_P(data); diff --git a/src/libvirt-php.c b/src/libvirt-php.c index ef057fe..efbef58 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -1921,7 +1921,6 @@ long get_next_free_numeric_value(virDomainPtr domain, char *xpath) HashPosition pointer; // int array_count; zval *data; - unsigned long index; long max_slot = -1; xml = virDomainGetXMLDesc(domain, VIR_DOMAIN_XML_INACTIVE); @@ -1934,7 +1933,7 @@ long get_next_free_numeric_value(virDomainPtr domain, char *xpath) VIRT_FOREACH(arr_hash, pointer, data) { if (Z_TYPE_P(data) == IS_STRING) { php_libvirt_hash_key_info info; - VIRT_HASH_CURRENT_KEY_INFO(arr_hash, pointer, index, info); + VIRT_HASH_CURRENT_KEY_INFO(arr_hash, pointer, info); if (info.type != HASH_KEY_IS_STRING) { long num = -1; @@ -2439,7 +2438,6 @@ void parse_array(zval *arr, tVMDisk *disk, tVMNetwork *network) zval *data; php_libvirt_hash_key_info key; HashPosition pointer; - unsigned long index; arr_hash = Z_ARRVAL_P(arr); //array_count = zend_hash_num_elements(arr_hash); @@ -2451,7 +2449,7 @@ void parse_array(zval *arr, tVMDisk *disk, tVMNetwork *network) VIRT_FOREACH(arr_hash, pointer, data) { if ((Z_TYPE_P(data) == IS_STRING) || (Z_TYPE_P(data) == IS_LONG)) { - VIRT_HASH_CURRENT_KEY_INFO(arr_hash, pointer, index, key); + VIRT_HASH_CURRENT_KEY_INFO(arr_hash, pointer, key); if (key.type == HASH_KEY_IS_STRING) { if (disk != NULL) { if ((Z_TYPE_P(data) == IS_STRING) && strcmp(key.name, "path") == 0) diff --git a/src/libvirt-php.h b/src/libvirt-php.h index 8d13a6b..aea43a2 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -137,6 +137,7 @@ typedef struct tVMNetwork { typedef struct _php_libvirt_hash_key_info { char *name; unsigned int length; + zend_ulong index; unsigned int type; } php_libvirt_hash_key_info; diff --git a/src/util.h b/src/util.h index ecb3a1f..fcd4075 100644 --- a/src/util.h +++ b/src/util.h @@ -135,12 +135,14 @@ # define VIRT_FOREACH_END(_dummy) -# define VIRT_HASH_CURRENT_KEY_INFO(_ht, _pos, _idx, _info) \ +# define VIRT_HASH_CURRENT_KEY_INFO(_ht, _pos, _info) \ do { \ - zend_string *tmp_key_info; \ - _info.type = zend_hash_get_current_key_ex(_ht, &tmp_key_info, &_idx, &_pos); \ - _info.name = ZSTR_VAL(tmp_key_info); \ - _info.length = ZSTR_LEN(tmp_key_info); \ + zend_string *tmp_name = NULL; \ + _info.type = zend_hash_get_current_key_ex(_ht, &tmp_name, &_info.index, &_pos); \ + if (tmp_name) { \ + _info.name = ZSTR_VAL(tmp_name); \ + _info.length = ZSTR_LEN(tmp_name); \ + } \ } while(0) # define VIRT_ARRAY_INIT(_name) do { \ @@ -213,9 +215,9 @@ # define VIRT_FOREACH_END(_dummy) \ }} -# define VIRT_HASH_CURRENT_KEY_INFO(_ht, _pos, _idx, _info) \ +# define VIRT_HASH_CURRENT_KEY_INFO(_ht, _pos, _info) \ do { \ - _info.type = zend_hash_get_current_key_ex(_ht, &_info.name, &_info.length, &_idx, 0, &_pos); \ + _info.type = zend_hash_get_current_key_ex(_ht, &_info.name, &_info.length, &_info.index, 0, &_pos); \ } while(0) # define VIRT_ARRAY_INIT(_name) do {\ -- 2.14.3

2 1

[libvirt] [PATCH] nwfilter: fix deadlock on firewalld restart/reload
by Nikolay Shirokovskiy 07 Dec '17

07 Dec '17

Deadlock scenario: 1. domain is being started and domain driver takes read lock for nwfilter update lock thru virNWFilterReadLockFilterUpdates. 2. firewalld restarted and event loop hangs trying to take write lock for nwfilter update lock in nwfilterStateReload. This is deadlock because for thread 1 to proceed we need a response from qemu/timeout but whole event loop is stuck by 2. Let's just offload nwfilter driver reload to a distinct thread. Besides resolving a deadlock this change offloads rather heavy operation (many hypervisor drivers X many domains for a driver) off the event loop. --- Concrete stacktrace. Thread 17 (Thread 0x7fbd5a22d880 (LWP 7329)): 0 0x00007fbd56bb903e in pthread_rwlock_wrlock () from /lib64/libpthread.so.0 1 0x00007fbd3d511297 in nwfilterStateReload () from /usr/lib64/libvirt/connection-driver/libvirt_driver_nwfilter.so 2 0x00007fbd3d511355 in nwfilterFirewalldDBusFilter () from /usr/lib64/libvirt/connection-driver/libvirt_driver_nwfilter.so 3 0x00007fbd57bc5dfe in dbus_connection_dispatch () from /lib64/libdbus-1.so.3 4 0x00007fbd5953e641 in virDBusWatchCallback () from /lib64/libvirt.so.0 5 0x00007fbd5954868e in virEventPollRunOnce () from /lib64/libvirt.so.0 6 0x00007fbd59547942 in virEventRunDefaultImpl () from /lib64/libvirt.so.0 7 0x00007fbd596a94ed in virNetDaemonRun () from /lib64/libvirt.so.0 8 0x00007fbd5a28b07c in main () Thread 3 (Thread 0x7fbd49553700 (LWP 8029)): 0 0x00007fbd56bb96d5 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 1 0x00007fbd59596816 in virCondWait () from /lib64/libvirt.so.0 2 0x00007fbd3d0183db in qemuMonitorSend () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so 3 0x00007fbd3d02c8d0 in qemuMonitorJSONCommandWithFd () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so 4 0x00007fbd3d02e1a1 in qemuMonitorJSONSetCapabilities () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so 5 0x00007fbd3cff965c in qemuConnectMonitor () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so 6 0x00007fbd3cffcb70 in qemuProcessWaitForMonitor () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so 7 0x00007fbd3d004668 in qemuProcessLaunch () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so 8 0x00007fbd3d0062a8 in qemuProcessStart () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so 9 0x00007fbd3d0679cb in qemuDomainObjStart.constprop.50 () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so 10 0x00007fbd3d068106 in qemuDomainCreateWithFlags () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so 11 0x00007fbd5964247d in virDomainCreateWithFlags () from /lib64/libvirt.so.0 12 0x00007fbd5a2a3b81 in remoteDispatchDomainCreateWithFlagsHelper () 13 0x00007fbd596af3c3 in virNetServerProgramDispatch () from /lib64/libvirt.so.0 14 0x00007fbd5a2c56cd in virNetServerHandleJob () 15 0x00007fbd59597221 in virThreadPoolWorker () from /lib64/libvirt.so.0 16 0x00007fbd595965a8 in virThreadHelper () from /lib64/libvirt.so.0 17 0x00007fbd56bb5dc5 in start_thread () from /lib64/libpthread.so.0 18 0x00007fbd568e473d in clone () from /lib64/libc.so.6 src/nwfilter/nwfilter_driver.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 2f9a51c..bcb4400 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -81,6 +81,12 @@ static void nwfilterDriverUnlock(void) #if HAVE_FIREWALLD +static void +nwfilterStateReloadAdapter(void *opaque ATTRIBUTE_UNUSED) +{ + nwfilterStateReload(); +} + static DBusHandlerResult nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED, DBusMessage *message, @@ -90,8 +96,12 @@ nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED, "NameOwnerChanged") || dbus_message_is_signal(message, "org.fedoraproject.FirewallD1", "Reloaded")) { + virThread thread; + VIR_DEBUG("Reload in nwfilter_driver because of firewalld."); - nwfilterStateReload(); + if (virThreadCreate(&thread, false, nwfilterStateReloadAdapter, NULL) < 0) + VIR_ERROR(_("Could not create thread. Network filter " + "driver reload failed")); } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -- 1.8.3.1

2 2

[libvirt] [PATCH v2 00/15] Move qemu command line controller checks to qemuDomainDeviceDefValidateController* checks
by John Ferlan 07 Dec '17

07 Dec '17

v1: https://www.redhat.com/archives/libvir-list/2017-December/msg00079.html Changes since v1: * Remove USB from the pile of things to move. That simplifies the Skip helper to remove the @flags argument. Even though it seems there was some sort of objection to Skip'ing during Validation I left that call in place since I feel it's better to have one common function rather than cutting out each individual check and placing it into the various ValidateController{IDE|PCI|SATA} helpers. Having two places to maintain such checks is less optimal in my viewpoint. * Be sure to Unref qemuCaps in patch 4 John Ferlan (12): qemu: Introduce qemuDomainDeviceDefValidateController qemu: Introduce qemuDomainDeviceDefSkipController qemu: Use virDomainControllerType in qemuBuildControllerDevStr switch qemu: Move CCW S390 Address check to controller def validate qemu: Introduce qemuDomainDeviceDefValidateControllerSCSI qemu: Introduce qemuDomainDeviceDefValidateControllerPCI qemu: Use virDomainPCIControllerOpts in qemuBuildControllerDevStr qemu: Move PCI command modelName check to controller def validate qemu: Move PCI command modelName TypeToString to controller def validate qemu: Move PCI more command checks to controller def validate qemu: Complete PCI command checks to controller def validate qemu: Introduce qemuDomainDeviceDefValidateControllerSATA Lin Ma (3): tests: Remove use of IDE disk for pseries floppy test tests: Drop IDE controller in CCW qemu: Introduce qemuDomainDeviceDefValidateControllerIDE src/qemu/qemu_command.c | 467 ++------------------ src/qemu/qemu_domain.c | 483 ++++++++++++++++++++- src/qemu/qemu_domain.h | 4 + .../qemuhotplug-base-ccw-live+ccw-virtio.xml | 4 - ...ive-with-2-ccw-virtio+ccw-virtio-1-explicit.xml | 4 - ...live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 4 - ...qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml | 4 - ...-live-with-ccw-virtio+ccw-virtio-2-explicit.xml | 4 - ...-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 4 - .../qemuhotplug-base-ccw-live-with-ccw-virtio.xml | 4 - .../qemuhotplug-base-ccw-live.xml | 4 - tests/qemumemlocktest.c | 14 + tests/qemuxml2argvdata/disk-floppy-pseries.args | 24 - tests/qemuxml2argvdata/disk-floppy-pseries.xml | 7 - tests/qemuxml2xmltest.c | 5 +- 15 files changed, 549 insertions(+), 487 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-floppy-pseries.args -- 2.13.6

1 16

[libvirt] [PATCH] docs: remove outdated link to Fedora mingw staging repo
by Daniel P. Berrange 06 Dec '17

06 Dec '17

The Fedora mingw support is all merged in Fedora repos, so remove the outdated link. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/windows.html.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/windows.html.in b/docs/windows.html.in index df60940750..3f012d18da 100644 --- a/docs/windows.html.in +++ b/docs/windows.html.in @@ -169,9 +169,7 @@ <p> You can also cross-compile to a Windows target from a Fedora machine - using the packages available - <a href="http://hg.et.redhat.com/misc/fedora-mingw--devel/">from the Fedora MinGW project</a> - (which includes a working libvirt specfile). + using the packages available in the Fedora repos. </p> <h3><a id="configure">By hand</a></h3> -- 2.14.3

2 1

[libvirt] [PATCH] docs: update entries in the apps page
by Daniel P. Berrange 06 Dec '17

06 Dec '17

Change all links to https:// where the remote site supports it. Fix URLs for a few packages that moved, and delete entries which appear to be dead. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/apps.html.in | 70 ++++++++++++++++++++++++------------------------------- 1 file changed, 30 insertions(+), 40 deletions(-) diff --git a/docs/apps.html.in b/docs/apps.html.in index 60edeb3af4..863be4ff23 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -65,21 +65,21 @@ management tasks on all libvirt managed domains, networks and storage. This is part of the libvirt core distribution. </dd> - <dt><a href="http://virt-manager.org/">virt-clone</a></dt> + <dt><a href="https://virt-manager.org/">virt-clone</a></dt> <dd> Allows the disk image(s) and configuration for an existing virtual machine to be cloned to form a new virtual machine. It automates copying of data across to new disk images, and updates the UUID, MAC address, and name in the configuration. </dd> - <dt><a href="http://et.redhat.com/~rjones/virt-df/">virt-df</a></dt> + <dt><a href="https://people.redhat.com/rjones/virt-df/">virt-df</a></dt> <dd> Examine the utilization of each filesystem in a virtual machine from the comfort of the host machine. This tool peeks into the guest disks and determines how much space is used. It can cope with common Linux filesystems and LVM volumes. </dd> - <dt><a href="http://virt-manager.org/">virt-image</a></dt> + <dt><a href="https://virt-manager.org/">virt-image</a></dt> <dd> Provides a way to deploy virtual appliances. It defines a simplified portable XML format describing the pre-requisites @@ -87,26 +87,26 @@ into the domain XML format for execution under any libvirt hypervisor meeting the pre-requisites. </dd> - <dt><a href="http://virt-manager.org/">virt-install</a></dt> + <dt><a href="https://virt-manager.org/">virt-install</a></dt> <dd> Provides a way to provision new virtual machines from a OS distribution install tree. It supports provisioning from local CD images, and the network over NFS, HTTP and FTP. </dd> - <dt><a href="http://et.redhat.com/~rjones/virt-top/">virt-top</a></dt> + <dt><a href="https://people.redhat.com/rjones/virt-top/">virt-top</a></dt> <dd> Watch the CPU, memory, network and disk utilization of all virtual machines running on a host. </dd> <dt> - <a href="http://people.redhat.com/~rjones/virt-what/">virt-what</a> + <a href="https://people.redhat.com/~rjones/virt-what/">virt-what</a> </dt> <dd> virt-what is a shell script for detecting if the program is running in a virtual machine. It prints out a list of facts about the virtual machine, derived from heuristics. </dd> - <dt><a href="http://sourceware.org/systemtap/">stap</a></dt> + <dt><a href="https://sourceware.org/systemtap/">stap</a></dt> <dd> SystemTap is a tool used to gather rich information about a running system through the use of scripts. Starting from v2.4, the front-end @@ -142,7 +142,7 @@ <h2><a id="continuousintegration">Continuous Integration</a></h2> <dl> - <dt><a href="http://buildbot.net/buildbot/docs/current/Libvirt.html">BuildBot</a></dt> + <dt><a href="https://buildbot.net/buildbot/docs/current/Libvirt.html">BuildBot</a></dt> <dd> BuildBot is a system to automate the compile/test cycle required by most software projects. CVS commits trigger new builds, run on @@ -152,7 +152,7 @@ </dl> <dl> - <dt><a href="http://wiki.jenkins-ci.org/display/JENKINS/Libvirt+Slaves+Plugin">Jenkins</a></dt> + <dt><a href="https://wiki.jenkins-ci.org/display/JENKINS/Libvirt+Slaves+Plugin">Jenkins</a></dt> <dd> This plugin for Jenkins adds a way to control guest domains hosted on Xen or QEMU/KVM. You configure a Jenkins Slave, @@ -197,28 +197,28 @@ <h2><a id="desktop">Desktop applications</a></h2> <dl> - <dt><a href="http://virt-manager.org/">virt-manager</a></dt> + <dt><a href="https://virt-manager.org/">virt-manager</a></dt> <dd> A general purpose desktop management tool, able to manage virtual machines across both local and remotely accessed hypervisors. It is targeted at home and small office usage up to managing 10-20 hosts and their VMs. </dd> - <dt><a href="http://virt-manager.org/">virt-viewer</a></dt> + <dt><a href="https://virt-manager.org/">virt-viewer</a></dt> <dd> A lightweight tool for accessing the graphical console associated with a virtual machine. It can securely connect to remote consoles supporting the VNC protocol. Also provides an optional mozilla browser plugin. </dd> - <dt><a href="http://f1ash.github.io/qt-virt-manager">qt-virt-manager</a></dt> + <dt><a href="https://f1ash.github.io/qt-virt-manager">qt-virt-manager</a></dt> <dd> The Qt GUI for create and control VMs and another virtual entities (aka networks, storages, interfaces, secrets, network filters). Contains integrated LXC/SPICE/VNC viewer for accessing the graphical or text console associated with a virtual machine or container. </dd> - <dt><a href="http://f1ash.github.io/qt-virt-manager/#virtual-machines-viewer">qt-remote-viewer</a></dt> + <dt><a href="https://f1ash.github.io/qt-virt-manager/#virtual-machines-viewer">qt-remote-viewer</a></dt> <dd> The Qt VNC/SPICE viewer for access to remote desktops or VMs. </dd> @@ -234,17 +234,7 @@ it easy to benefit from private Cloud Computing technology. </dd> - <dt><a href="http://www.emotivecloud.net">EMOTIVE Cloud</a></dt> - <dd>The EMOTIVE (Elastic Management Of Tasks In Virtualized - Environments) middleware allows executing tasks and providing - virtualized environments to the users with Xen, KVM or - VirtualBox hypervisor. EMOTIVE's main feature is VM management - with different scheduling policies. It can be also used as a - cloud provider and is very easy to extend thanks to its - modular Web Services architecture. - </dd> - - <dt><a href="http://www.eucalyptus.com">Eucalyptus</a></dt> + <dt><a href="https://github.com/eucalyptus/eucalyptus">Eucalyptus</a></dt> <dd> Eucalyptus is an on-premise Infrastructure as a Service cloud software platform that is open source and @@ -268,7 +258,7 @@ management. </dd> - <dt><a href="http://www.openstack.org">OpenStack</a></dt> + <dt><a href="https://www.openstack.org">OpenStack</a></dt> <dd> OpenStack is a "cloud operating system" usable for both public and private clouds. Its various parts take care of compute, @@ -314,7 +304,7 @@ Windows Registry in Windows guests. </dd> - <dt><a href="http://sandbox.libvirt.org">libvirt-sandbox</a></dt> + <dt><a href="https://sandbox.libvirt.org">libvirt-sandbox</a></dt> <dd> A library and command line tools for simplifying the creation of application sandboxes using virtualization technology. It currently @@ -334,7 +324,7 @@ <h2><a id="livecd">LiveCD / Appliances</a></h2> <dl> - <dt><a href="http://et.redhat.com/~rjones/virt-p2v/">virt-p2v</a></dt> + <dt><a href="http://libguestfs.org/virt-v2v/">virt-p2v</a></dt> <dd> An older tool for converting a physical machine into a virtual machine. It is a LiveCD which is booted on the machine to be @@ -346,7 +336,7 @@ <h2><a id="monitoring">Monitoring</a></h2> <dl> - <dt><a href="http://collectd.org/plugins/libvirt.shtml">collectd</a></dt> + <dt><a href="https://collectd.org/plugins/libvirt.shtml">collectd</a></dt> <dd> The libvirt-plugin is part of <a href="http://collectd.org/">collectd</a> and gathers statistics about virtualized guests on a system. This @@ -355,19 +345,19 @@ For a full description, please refer to the libvirt section in the collectd.conf(5) manual page. </dd> - <dt><a href="http://host-sflow.sourceforge.net/">Host sFlow</a></dt> + <dt><a href="http://www.sflow.net/">Host sFlow</a></dt> <dd> Host sFlow is a lightweight agent running on KVM hypervisors that links to libvirt library and exports standardized cpu, memory, network and disk metrics for all virtual machines. </dd> - <dt><a href="http://honk.sigxcpu.org/projects/libvirt/#munin">Munin</a></dt> + <dt><a href="https://honk.sigxcpu.org/projects/libvirt/#munin">Munin</a></dt> <dd> The plugins provided by Guido Günther allow to monitor various things like network and block I/O with <a href="http://munin.projects.linpro.no/">Munin</a>. </dd> - <dt><a href="http://et.redhat.com/~rjones/nagios-virt/">Nagios-virt</a></dt> + <dt><a href="http://people.redhat.com/rjones/nagios-virt/">Nagios-virt</a></dt> <dd> Nagios-virt is a configuration tool to add monitoring of your virtualised domains to <a href="http://www.nagios.org/">Nagios</a>. @@ -383,7 +373,7 @@ metrics. It supports pCPU, vCPU, memory, block device, network interface, and performance event metrics for each virtual guest. </dd> - <dt><a href="http://community.zenoss.org/docs/DOC-4687">Zenoss</a></dt> + <dt><a href="https://community.zenoss.org/docs/DOC-4687">Zenoss</a></dt> <dd> The Zenoss libvirt Zenpack adds support for monitoring virtualization servers. It has been tested with KVM, QEMU, VMware ESX, and VMware @@ -394,7 +384,7 @@ <h2><a id="provisioning">Provisioning</a></h2> <dl> - <dt><a href="http://www.ibm.com/software/tivoli/products/prov-mgr/">Tivoli Provisioning Manager</a></dt> + <dt><a href="https://www.ibm.com/developerworks/community/wikis/home?lang=en#!/wiki/Tivo…">Tivoli Provisioning Manager</a></dt> <dd> Part of the IBM Tivoli family, Tivoli Provisioning Manager (TPM) is an IT lifecycle automation product. It @@ -404,7 +394,7 @@ </dl> <dl> - <dt><a href="http://theforeman.org">Foreman</a></dt> + <dt><a href="https://theforeman.org">Foreman</a></dt> <dd> Foreman is an open source web based application aimed to be a Single Address For All Machines Life Cycle Management. Foreman: @@ -428,7 +418,7 @@ <h2><a id="web">Web applications</a></h2> <dl> - <dt><a href="http://community.abiquo.com/display/AbiCloud">AbiCloud</a></dt> + <dt><a href="http://www.abiquo.com/">AbiCloud</a></dt> <dd> AbiCloud is an open source cloud platform manager which allows to easily deploy a private cloud in your datacenter. One of the key @@ -444,14 +434,14 @@ Kimchi manages KVM guests through libvirt. The management interface is accessed over the web using a browser that supports HTML5. </dd> - <dt><a href="http://ovirt.org/">oVirt</a></dt> + <dt><a href="https://ovirt.org/">oVirt</a></dt> <dd> oVirt provides the ability to manage large numbers of virtual machines across an entire data center of hosts. It integrates with FreeIPA for Kerberos authentication, and in the future, certificate management. </dd> - <dt><a href="http://ispsystem.com/en/software/vmmanager">VMmanager</a></dt> + <dt><a href="https://ispsystem.com/en/software/vmmanager">VMmanager</a></dt> <dd> VMmanager is a software solution for virtualization management that can be used both for hosting virtual machines and @@ -460,7 +450,7 @@ functions, such as live migration that allows for load balancing between cluster nodes, monitoring CPU, memory. </dd> - <dt><a href="http://mist.io/">mist.io</a></dt> + <dt><a href="https://mist.io/">mist.io</a></dt> <dd> Mist.io is an open source project and a service that can assist you in managing your virtual machines on a unified way, providing a simple @@ -468,7 +458,7 @@ providers, OpenStack based public/private clouds, Docker servers, bare metal servers and now KVM hypervisors). </dd> - <dt><a href="http://ravada.upc.edu/">Ravada</a></dt> + <dt><a href="https://ravada.upc.edu/">Ravada</a></dt> <dd> Ravada is an open source tool for managing Virtual Desktop Infrastructure (VDI). It is very easy to install and use. Following @@ -492,7 +482,7 @@ <h2><a id="other">Other</a></h2> <dl> - <dt><a href="http://cuckoosandbox.org/">Cuckoo Sandbox</a></dt> + <dt><a href="https://cuckoosandbox.org/">Cuckoo Sandbox</a></dt> <dd> Cuckoo Sandbox is a malware analysis system. You can throw any suspicious file at it and in a matter of seconds Cuckoo -- 2.14.3

2 1

[libvirt] [PATCH] docs: update instructions for TLS cert generation
by Daniel P. Berrange 06 Dec '17

06 Dec '17

Currently we only describe setting the CN field for server certs. This leads to inevitable pain for users who set it to the fully qualified hostname and then use a unqualified hostname or IP address to connect in the URI. Describe the usage of Subject Alt Name extensions, to provide multiple hostnames and IP addresses. This will help users avoid the classic mistake and is important future proofing, since at least in browsers, TLS libraries no longer use the CN field for validation, mandating use of SAN info instead. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/remote.html.in | 72 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 20 deletions(-) diff --git a/docs/remote.html.in b/docs/remote.html.in index 9bafd9de67..6ae40b2bb2 100644 --- a/docs/remote.html.in +++ b/docs/remote.html.in @@ -30,7 +30,7 @@ to <code>virConnectOpen</code> (or <code>virsh -c ...</code>). For example, if you normally use <code>qemu:///system</code> to access the system-wide QEMU daemon, then to access the system-wide QEMU daemon on a remote machine called -<code>oirase</code> you would use <code>qemu://oirase/system</code>. +<code>compute1.libvirt.org</code> you would use <code>qemu://compute1.libvirt.org/system</code>. </p> <p> The <a href="#Remote_URI_reference">section on remote URIs</a> @@ -412,7 +412,9 @@ next section. <td> Server's certificate signed by the CA. (<a href="#Remote_TLS_server_certificates">more info</a>) </td> <td> CommonName (CN) must be the hostname of the server as it - is seen by clients. </td> + is seen by clients. All hostname and IP address variants that might + be used to reach the server should be lkisted in Subject Alt Name + fields.</td> </tr> <tr> <td> @@ -564,8 +566,8 @@ X.509 certificate info: Version: 3 Serial Number (hex): 00 -Subject: CN=Red Hat Emerging Technologies -Issuer: CN=Red Hat Emerging Technologies +Subject: CN=Libvirt Project +Issuer: CN=Libvirt Project Signature Algorithm: RSA-SHA Validity: Not Before: Mon Jun 18 16:22:18 2007 @@ -582,14 +584,20 @@ for your clients and servers. </h3> <p> For each server (libvirtd) you need to issue a certificate -with the X.509 CommonName (CN) field set to the hostname -of the server. The CN must match the hostname which -clients will be using to connect to the server. +containing one or more hostnames and/or IP addresses. +Historically the CommonName (CN) field would contain the +hostname of the server, and would match the hostname used +in the URI that clients pass to libvirt. In most TLS impls +the CN field is considered legacy data, the Subject Alt Name +(SAN) extension fields we be preferentially validated against. +In the future use of the CN field for validation may be +discontinuned entirely, so it is strongly recommended to +include the SAN fields. </p> <p> In the example below, clients will be connecting to the server using a <a href="#Remote_URI_reference">URI</a> of -<code>xen://oirase/</code>, so the CN must be "<code>oirase</code>". +<code>xen://virt.example/</code>, so the CN must be "<code>oirase</code>". </p> <p> Make a private key for the server: @@ -599,13 +607,25 @@ certtool --generate-privkey > serverkey.pem </pre> <p> and sign that key with the CA's private key by first -creating a template file called <code>server.info</code> -(only the CN field matters, which as explained above must -be the server's hostname): +creating a template file called <code>server.info</code>. +The 'cn' field should refer to the fully qualified public +hostname of the server. For the SAN extension data, there +must also be one or more 'dns_name' fields that contain all +possible hostnames that can be reasonably used by clients +to reach the server, both with and without domain name +qualifiers. If clients are likely to connect to the server +by IP address, then one or 'ip_address' fields should also +be added. </p> <pre> organization = <i>Name of your organization</i> -cn = oirase +cn = compute1.libvirt.org +dns_name = compute1 +dns_name = compute1.libvirt.org +ip_address = 10.0.0.74 +ip_address = 192.168.1.24 +ip_address = 2001:cafe::74 +ip_address = fe20::24 tls_www_server encryption_key signing_key @@ -635,16 +655,28 @@ X.509 certificate info: Version: 3 Serial Number (hex): 00 -Subject: O=Red Hat Emerging Technologies,CN=oirase -Issuer: CN=Red Hat Emerging Technologies +Subject: O=Libvirt Project,CN=compute1.libvirt.org +Issuer: CN=Libvirt Project Signature Algorithm: RSA-SHA Validity: Not Before: Mon Jun 18 16:34:49 2007 Not After: Tue Jun 17 16:34:49 2008 +Extensions: + Basic Constraints (critical): + Certificate Authority (CA): FALSE + Subject Alternative Name (not critical): + DNSname: compute1 + DNSname: compute1.libvirt.org + IPAddress: 10.0.0.74 + IPAddress: 192.168.1.24 + IPAddress: 2001:cafe::74 + IPAddress: fe20::24 </pre> <p> -Note the "Issuer" CN is "Red Hat Emerging Technologies" (the CA) and -the "Subject" CN is "oirase" (the server). +Note the "Issuer" CN is "Libvirt Project" (the CA) and +the "Subject" CN is "compute1.libvirt.org" (the server). +Notice that the hostname listed in the CN must also +be duplicated as a DNSname entry </p> <p> Finally we have two files to install: @@ -665,13 +697,13 @@ which can be installed on the server as </h3> <p> For each client (ie. any program linked with libvirt, such as -<a href="http://virt-manager.et.redhat.com/">virt-manager</a>) +<a href="http://virt-manager.org/">virt-manager</a>) you need to issue a certificate with the X.509 Distinguished Name (DN) set to a suitable name. You can decide this on a company / organisation policy. For example, I use: </p> <pre> -C=GB,ST=London,L=London,O=Red Hat,CN=<i>name_of_client</i> +C=GB,ST=London,L=London,O=Libvirt Project,CN=<i>name_of_client</i> </pre> <p> The process is the same as for @@ -692,7 +724,7 @@ Act as CA and sign the certificate. Create client.info containing: country = GB state = London locality = London -organization = Red Hat +organization = Libvirt Project cn = client1 tls_www_client encryption_key @@ -884,7 +916,7 @@ Blank lines and comments beginning with <code>#</code> are ignored. The default is that DNs are not checked. </p> <p> - This list may contain wildcards such as <code>"C=GB,ST=London,L=London,O=Red Hat,CN=*"</code> + This list may contain wildcards such as <code>"C=GB,ST=London,L=London,O=Libvirt Project,CN=*"</code> See the POSIX <code>fnmatch</code> function for the format of the wildcards. </p> -- 2.14.3

2 1

[libvirt] [PATCH] rng: fix nwfilter rule contents
by Daniel P. Berrange 06 Dec '17

06 Dec '17

The contents of a <rule> are a choice of exactly one union member. The RNG schema, however, was allowing an arbitrary number of instances of every union member at once. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/schemas/nwfilter.rng | 98 +---------------------------------------------- 1 file changed, 2 insertions(+), 96 deletions(-) diff --git a/docs/schemas/nwfilter.rng b/docs/schemas/nwfilter.rng index 7cfc05fa2e..cca6ff2954 100644 --- a/docs/schemas/nwfilter.rng +++ b/docs/schemas/nwfilter.rng @@ -19,58 +19,37 @@ </element> <element name="rule"> <ref name="rule-node-attributes"/> - <optional> - <zeroOrMore> + <choice> <element name="mac"> <ref name="match-attribute"/> <ref name="common-l2-attributes"/> <ref name="mac-attributes"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="vlan"> <ref name="match-attribute"/> <ref name="common-l2-attributes"/> <ref name="vlan-attributes"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="stp"> <ref name="match-attribute"/> <ref name="srcmacandmask-attributes"/> <ref name="stp-attributes"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="arp"> <ref name="match-attribute"/> <ref name="common-l2-attributes"/> <ref name="arp-attributes"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="rarp"> <ref name="match-attribute"/> <ref name="common-l2-attributes"/> <ref name="arp-attributes"/>  <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="ip"> <ref name="match-attribute"/> <ref name="common-l2-attributes"/> @@ -80,10 +59,6 @@ <ref name="dscp-attribute"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="ipv6"> <ref name="match-attribute"/> <ref name="common-l2-attributes"/> @@ -93,10 +68,6 @@ <ref name="icmp-attribute-ranges"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="tcp"> <ref name="match-attribute"/> <ref name="srcmac-attribute"/> @@ -106,10 +77,6 @@ <ref name="tcp-attributes"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="udp"> <ref name="match-attribute"/> <ref name="srcmac-attribute"/> @@ -118,10 +85,6 @@ <ref name="common-ip-attributes-p2"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="sctp"> <ref name="match-attribute"/> <ref name="srcmac-attribute"/> @@ -130,10 +93,6 @@ <ref name="common-ip-attributes-p2"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="icmp"> <ref name="match-attribute"/> <ref name="srcmac-attribute"/> @@ -142,10 +101,6 @@ <ref name="icmp-attributes"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="igmp"> <ref name="match-attribute"/> <ref name="srcmac-attribute"/> @@ -153,10 +108,6 @@ <ref name="common-ip-attributes-p2"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="all"> <ref name="match-attribute"/> <ref name="srcmac-attribute"/> @@ -164,10 +115,6 @@ <ref name="common-ip-attributes-p2"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="esp"> <ref name="match-attribute"/> <ref name="srcmac-attribute"/> @@ -175,10 +122,6 @@ <ref name="common-ip-attributes-p2"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="ah"> <ref name="match-attribute"/> <ref name="srcmac-attribute"/> @@ -186,10 +129,6 @@ <ref name="common-ip-attributes-p2"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="udplite"> <ref name="match-attribute"/> <ref name="srcmac-attribute"/> @@ -197,10 +136,6 @@ <ref name="common-ip-attributes-p2"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="tcp-ipv6"> <ref name="match-attribute"/> <ref name="srcmac-attribute"/> @@ -210,10 +145,6 @@ <ref name="tcp-attributes"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="udp-ipv6"> <ref name="match-attribute"/> <ref name="srcmac-attribute"/> @@ -222,10 +153,6 @@ <ref name="common-ipv6-attributes-p2"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="sctp-ipv6"> <ref name="match-attribute"/> <ref name="srcmac-attribute"/> @@ -234,10 +161,6 @@ <ref name="common-ipv6-attributes-p2"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="icmpv6"> <ref name="match-attribute"/> <ref name="srcmac-attribute"/> @@ -246,10 +169,6 @@ <ref name="icmp-attributes"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="all-ipv6"> <ref name="match-attribute"/> <ref name="srcmac-attribute"/> @@ -257,10 +176,6 @@ <ref name="common-ipv6-attributes-p2"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="esp-ipv6"> <ref name="match-attribute"/> <ref name="srcmac-attribute"/> @@ -268,10 +183,6 @@ <ref name="common-ipv6-attributes-p2"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="ah-ipv6"> <ref name="match-attribute"/> <ref name="srcmac-attribute"/> @@ -279,10 +190,6 @@ <ref name="common-ipv6-attributes-p2"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> - <optional> - <zeroOrMore> <element name="udplite-ipv6"> <ref name="match-attribute"/> <ref name="srcmac-attribute"/> @@ -290,8 +197,7 @@ <ref name="common-ipv6-attributes-p2"/> <ref name="comment-attribute"/> </element> - </zeroOrMore> - </optional> + </choice> </element> </choice> </zeroOrMore> -- 2.14.3

2 1

[libvirt] [PATCH] nwfilter: remove bogus 'protocolid' attribute on arp/rarp fields
by Daniel P. Berrange 06 Dec '17

06 Dec '17

Various example XML documents for arp/rarp filtering have a protocolid XML attribute defined. This is never parsed or output by the libvirt XML handling code, so shouldn't be present in example XML files either Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- tests/nwfilterxml2firewalldata/arp.xml | 1 - tests/nwfilterxml2firewalldata/rarp.xml | 1 - tests/nwfilterxml2xmlin/arp-test.xml | 1 - tests/nwfilterxml2xmlin/chain_prefixtest1.xml | 1 - tests/nwfilterxml2xmlin/rarp-test.xml | 1 - 5 files changed, 5 deletions(-) diff --git a/tests/nwfilterxml2firewalldata/arp.xml b/tests/nwfilterxml2firewalldata/arp.xml index d0abf946ad..657c4958a6 100644 --- a/tests/nwfilterxml2firewalldata/arp.xml +++ b/tests/nwfilterxml2firewalldata/arp.xml @@ -2,7 +2,6 @@ <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid> <rule action='accept' direction='out'> <arp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' - protocolid='arp' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' hwtype='12' protocoltype='34' diff --git a/tests/nwfilterxml2firewalldata/rarp.xml b/tests/nwfilterxml2firewalldata/rarp.xml index 77c1127efc..15f1ac92d1 100644 --- a/tests/nwfilterxml2firewalldata/rarp.xml +++ b/tests/nwfilterxml2firewalldata/rarp.xml @@ -2,7 +2,6 @@ <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid> <rule action='accept' direction='out'> <rarp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' - protocolid='rarp' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' hwtype='12' protocoltype='34' diff --git a/tests/nwfilterxml2xmlin/arp-test.xml b/tests/nwfilterxml2xmlin/arp-test.xml index e9d3768361..02bf4a8857 100644 --- a/tests/nwfilterxml2xmlin/arp-test.xml +++ b/tests/nwfilterxml2xmlin/arp-test.xml @@ -2,7 +2,6 @@ <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid> <rule action='accept' direction='out'> <arp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' - protocolid='arp' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' hwtype='12' protocoltype='34' diff --git a/tests/nwfilterxml2xmlin/chain_prefixtest1.xml b/tests/nwfilterxml2xmlin/chain_prefixtest1.xml index c2f3f77791..bd7f76f7d1 100644 --- a/tests/nwfilterxml2xmlin/chain_prefixtest1.xml +++ b/tests/nwfilterxml2xmlin/chain_prefixtest1.xml @@ -2,7 +2,6 @@ <uuid>e5700920-a333-4c05-8016-b669e46b7599</uuid> <rule action='accept' direction='out'> <arp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' - protocolid='arp' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' hwtype='12' protocoltype='34' diff --git a/tests/nwfilterxml2xmlin/rarp-test.xml b/tests/nwfilterxml2xmlin/rarp-test.xml index e08722204f..0e3ee91db5 100644 --- a/tests/nwfilterxml2xmlin/rarp-test.xml +++ b/tests/nwfilterxml2xmlin/rarp-test.xml @@ -2,7 +2,6 @@ <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid> <rule action='accept' direction='out'> <rarp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff' - protocolid='rarp' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' hwtype='12' protocoltype='34' -- 2.14.3

2 1

[libvirt] [libvirt-php PATCH] Fix crash in VIRT_HASH_CURRENT_KEY_INFO macro
by Dawid Zamirski 06 Dec '17

06 Dec '17

The PHP7 variant of the macro wasn't safe if the hash key was not a string type. This was found when running php script with just libvirt_connect call under xdebug session which segfaulted. This patch makes the following changes: * make sure that tmp_name is initialized to NULL * set the key name only when zend_hash_get_current_key_ex did set it to something which happens only when type is HASH_KEY_IS_STRING * stash the key index in out php_libvirt_hash_key_info struct because it wasn't there before and separate variable had to be used. --- src/libvirt-connection.c | 8 +++----- src/libvirt-php.c | 6 ++---- src/libvirt-php.h | 1 + src/util.h | 16 +++++++++------- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/libvirt-connection.c b/src/libvirt-connection.c index 181b266..2d59d82 100644 --- a/src/libvirt-connection.c +++ b/src/libvirt-connection.c @@ -131,8 +131,6 @@ PHP_FUNCTION(libvirt_connect) HashPosition pointer; int array_count; - zend_ulong index; - unsigned long libVer; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sba", &url, &url_len, &readonly, &zcreds) == FAILURE) { @@ -176,13 +174,13 @@ PHP_FUNCTION(libvirt_connect) VIRT_FOREACH(arr_hash, pointer, data) { if (Z_TYPE_P(data) == IS_STRING) { php_libvirt_hash_key_info info; - VIRT_HASH_CURRENT_KEY_INFO(arr_hash, pointer, index, info); + VIRT_HASH_CURRENT_KEY_INFO(arr_hash, pointer, info); if (info.type == HASH_KEY_IS_STRING) { PHPWRITE(info.name, info.length); } else { - DPRINTF("%s: credentials index %d\n", PHPFUNC, (int)index); - creds[j].type = index; + DPRINTF("%s: credentials index %d\n", PHPFUNC, info.index); + creds[j].type = info.index; creds[j].result = (char *)emalloc(Z_STRLEN_P(data) + 1); memset(creds[j].result, 0, Z_STRLEN_P(data) + 1); creds[j].resultlen = Z_STRLEN_P(data); diff --git a/src/libvirt-php.c b/src/libvirt-php.c index ef057fe..efbef58 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -1921,7 +1921,6 @@ long get_next_free_numeric_value(virDomainPtr domain, char *xpath) HashPosition pointer; // int array_count; zval *data; - unsigned long index; long max_slot = -1; xml = virDomainGetXMLDesc(domain, VIR_DOMAIN_XML_INACTIVE); @@ -1934,7 +1933,7 @@ long get_next_free_numeric_value(virDomainPtr domain, char *xpath) VIRT_FOREACH(arr_hash, pointer, data) { if (Z_TYPE_P(data) == IS_STRING) { php_libvirt_hash_key_info info; - VIRT_HASH_CURRENT_KEY_INFO(arr_hash, pointer, index, info); + VIRT_HASH_CURRENT_KEY_INFO(arr_hash, pointer, info); if (info.type != HASH_KEY_IS_STRING) { long num = -1; @@ -2439,7 +2438,6 @@ void parse_array(zval *arr, tVMDisk *disk, tVMNetwork *network) zval *data; php_libvirt_hash_key_info key; HashPosition pointer; - unsigned long index; arr_hash = Z_ARRVAL_P(arr); //array_count = zend_hash_num_elements(arr_hash); @@ -2451,7 +2449,7 @@ void parse_array(zval *arr, tVMDisk *disk, tVMNetwork *network) VIRT_FOREACH(arr_hash, pointer, data) { if ((Z_TYPE_P(data) == IS_STRING) || (Z_TYPE_P(data) == IS_LONG)) { - VIRT_HASH_CURRENT_KEY_INFO(arr_hash, pointer, index, key); + VIRT_HASH_CURRENT_KEY_INFO(arr_hash, pointer, key); if (key.type == HASH_KEY_IS_STRING) { if (disk != NULL) { if ((Z_TYPE_P(data) == IS_STRING) && strcmp(key.name, "path") == 0) diff --git a/src/libvirt-php.h b/src/libvirt-php.h index 8d13a6b..f24a329 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -137,6 +137,7 @@ typedef struct tVMNetwork { typedef struct _php_libvirt_hash_key_info { char *name; unsigned int length; + unsigned int index; unsigned int type; } php_libvirt_hash_key_info; diff --git a/src/util.h b/src/util.h index ecb3a1f..72cfa91 100644 --- a/src/util.h +++ b/src/util.h @@ -135,12 +135,14 @@ # define VIRT_FOREACH_END(_dummy) -# define VIRT_HASH_CURRENT_KEY_INFO(_ht, _pos, _idx, _info) \ +# define VIRT_HASH_CURRENT_KEY_INFO(_ht, _pos, _info) \ do { \ - zend_string *tmp_key_info; \ - _info.type = zend_hash_get_current_key_ex(_ht, &tmp_key_info, &_idx, &_pos); \ - _info.name = ZSTR_VAL(tmp_key_info); \ - _info.length = ZSTR_LEN(tmp_key_info); \ + zend_string *tmp_name = NULL; \ + _info.type = zend_hash_get_current_key_ex(_ht, &tmp_name, (zend_ulong *) &_info.index, &_pos); \ + if (tmp_name) { \ + _info.name = ZSTR_VAL(tmp_name); \ + _info.length = ZSTR_LEN(tmp_name); \ + } \ } while(0) # define VIRT_ARRAY_INIT(_name) do { \ @@ -213,9 +215,9 @@ # define VIRT_FOREACH_END(_dummy) \ }} -# define VIRT_HASH_CURRENT_KEY_INFO(_ht, _pos, _idx, _info) \ +# define VIRT_HASH_CURRENT_KEY_INFO(_ht, _pos, _info) \ do { \ - _info.type = zend_hash_get_current_key_ex(_ht, &_info.name, &_info.length, &_idx, 0, &_pos); \ + _info.type = zend_hash_get_current_key_ex(_ht, &_info.name, &_info.length, &_info.index, 0, &_pos); \ } while(0) # define VIRT_ARRAY_INIT(_name) do {\ -- 2.14.3

2 3

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

06 Dec '17

Recent series to just move IDE checks: (v4: https://www.redhat.com/archives/libvir-list/2017-December/msg00049.html) gave me enough "push" in order to move the bulk of qemu_command controller command line build "validation" checks into their own Validation helpers. The IDE only checks are essentially incorporated into this series. John Ferlan (14): qemu: Introduce qemuDomainDeviceDefValidateController qemu: Introduce qemuDomainDeviceDefSkipController qemu: Use virDomainControllerType in qemuBuildControllerDevStr switch qemu: Move CCW S390 Address check to controller def validate qemu: Introduce qemuDomainDeviceDefValidateControllerSCSI qemu: Introduce qemuDomainDeviceDefValidateControllerPCI qemu: Use virDomainPCIControllerOpts in qemuBuildControllerDevStr qemu: Move PCI command modelName check to controller def validate qemu: Move PCI command modelName TypeToString to controller def validate qemu: Move PCI more command checks to controller def validate qemu: Complete PCI command checks to controller def validate qemu: Introduce qemuDomainDeviceDefValidateControllerSATA qemu: Introduce qemuDomainDeviceDefValidateControllerUSB qemu: Complete move USB command checks to controller def validate Lin Ma (3): tests: Remove use of IDE disk for pseries floppy test tests: Drop IDE controller in CCW qemu: Introduce qemuDomainDeviceDefValidateControllerIDE src/qemu/qemu_command.c | 566 ++------------------ src/qemu/qemu_command.h | 2 + src/qemu/qemu_domain.c | 590 ++++++++++++++++++++- src/qemu/qemu_domain.h | 12 + .../qemuhotplug-base-ccw-live+ccw-virtio.xml | 4 - ...ive-with-2-ccw-virtio+ccw-virtio-1-explicit.xml | 4 - ...live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 4 - ...qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml | 4 - ...-live-with-ccw-virtio+ccw-virtio-2-explicit.xml | 4 - ...-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 4 - .../qemuhotplug-base-ccw-live-with-ccw-virtio.xml | 4 - .../qemuhotplug-base-ccw-live.xml | 4 - tests/qemumemlocktest.c | 14 + .../qemuxml2argv-disk-floppy-pseries.args | 24 - .../qemuxml2argv-disk-floppy-pseries.xml | 7 - tests/qemuxml2argvtest.c | 18 +- tests/qemuxml2xmltest.c | 20 +- 17 files changed, 689 insertions(+), 596 deletions(-) delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args -- 2.13.6

2 26

[libvirt] [sandbox 0/6] Misc patches
by Cédric Bosdonnat 06 Dec '17

06 Dec '17

Hi all, Here are a few patches I found sitting on my local copy. I also added a few patches to convert to python3. Cédric Bosdonnat (6): Pass debug and verbose values to init machine: use squash security mode for non-root virt-sandbox mounts Add tests .log and .trs files to gitignore service: fix bad ConfigMountHostImage constructor call Convert to python3 Don't hardcode interpreter path .gitignore | 2 + bin/virt-sandbox-image | 2 +- bin/virt-sandbox-service | 75 +++++++++++++---------- bin/virt-sandbox.c | 3 + examples/demo.py | 2 +- examples/shell.py | 2 +- examples/virt-sandbox-mkinitrd.py | 2 +- examples/virt-sandbox.py | 2 +- libvirt-sandbox/image/cli.py | 20 +++--- libvirt-sandbox/image/sources/base.py | 1 - libvirt-sandbox/image/sources/docker.py | 42 ++++++------- libvirt-sandbox/image/sources/virtbuilder.py | 1 - libvirt-sandbox/image/template.py | 8 +-- libvirt-sandbox/libvirt-sandbox-builder-machine.c | 5 +- libvirt-sandbox/libvirt-sandbox-config.c | 75 +++++++++++++++++++++++ libvirt-sandbox/libvirt-sandbox-config.h | 6 ++ libvirt-sandbox/libvirt-sandbox-init-common.c | 3 + libvirt-sandbox/libvirt-sandbox.sym | 4 ++ 18 files changed, 179 insertions(+), 76 deletions(-) -- 2.15.1

3 16

[libvirt] [PATCH jenkins-ci] Trigger rebuild of libvirt-go-xml when libvirt changes
by Daniel P. Berrange 06 Dec '17

06 Dec '17

Although the core code in libvirt-go-xml doesn't depend on libvirt, the test suite pulls in libvirt.git to validate XML parsing against all XML files found under libvirt.git/tests. We should thus have a dependancy in jenkins to trigger rebuilds when libvirt changes. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- projects/libvirt-go-xml.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/libvirt-go-xml.yaml b/projects/libvirt-go-xml.yaml index 3083b9f..126058b 100644 --- a/projects/libvirt-go-xml.yaml +++ b/projects/libvirt-go-xml.yaml @@ -15,6 +15,6 @@ export TEST_ARGS="-tags xmlroundtrip" jobs: - go-build-job: - parent_jobs: + parent_jobs: 'libvirt-master-build' - go-check-job: parent_jobs: 'libvirt-go-xml-master-build' -- 2.14.3

2 1

[libvirt] [jenkins-ci PATCH] guests: install additional debugging tools
by Pavel Hrdina 06 Dec '17

06 Dec '17

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- guests/vars/mappings.yml | 14 ++++++++++++++ guests/vars/projects/base.yml | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index eca8dbe..ff97231 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -100,6 +100,9 @@ mappings: default: gcc FreeBSD: + gdb: + default: gdb + gettext: default: gettext @@ -306,6 +309,9 @@ mappings: pkg: libxslt rpm: libxslt-devel + lsof: + default: lsof + lvm2: default: lvm2 FreeBSD: @@ -390,6 +396,10 @@ mappings: deb: libnetcf-dev rpm: netcf-devel + netstat: + default: net-tools + FreeBSD: + numad: default: numad FreeBSD: @@ -631,6 +641,10 @@ mappings: rpm: spice-gtk3-devel CentOS6: + strace: + default: strace + FreeBSD: + unzip: default: unzip FreeBSD: diff --git a/guests/vars/projects/base.yml b/guests/vars/projects/base.yml index d82f6b9..352e85a 100644 --- a/guests/vars/projects/base.yml +++ b/guests/vars/projects/base.yml @@ -6,12 +6,16 @@ packages: - ccache - cppi - gcc + - gdb - gettext - glibc - libtool - libtoolize + - lsof - make + - netstat - patch - perl - pkg-config - rpmbuild + - strace -- 2.13.6

2 1

[libvirt] [PATCH] nwfilter: don't crash listing filters in unprivileged daemon
by Daniel P. Berrange 06 Dec '17

06 Dec '17

The unprivileged libvirtd does not support nwfilter config, by leaves the driver active. It is supposed to result in all APIs being an effective no-op, but several APIs rely on driver->nwfilters being non-NULL, or they will reference a NULL pointer. Rather than adding checks for NULL in many places, just make sure driver->nwfilters is always initialized. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/nwfilter/nwfilter_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 2f9a51c405..89b767fe11 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -189,6 +189,8 @@ nwfilterStateInitialize(bool privileged, /* remember that we are going to use firewalld */ driver->watchingFirewallD = (sysbus != NULL); driver->privileged = privileged; + if (!(driver->nwfilters = virNWFilterObjListNew())) + goto error; if (!privileged) return 0; @@ -244,9 +246,6 @@ nwfilterStateInitialize(bool privileged, goto error; } - if (!(driver->nwfilters = virNWFilterObjListNew())) - goto error; - if (virNWFilterObjListLoadAllConfigs(driver->nwfilters, driver->configDir) < 0) goto error; @@ -271,6 +270,7 @@ nwfilterStateInitialize(bool privileged, virNWFilterIPAddrMapShutdown(); err_free_driverstate: + virNWFilterObjListFree(driver->nwfilters); VIR_FREE(driver); return -1; -- 2.14.3

3 2

[libvirt] [rust PATCH] README: update libvirt.org links
by Ján Tomko 05 Dec '17

05 Dec '17

The documentation page used the link from before libvirt.h was split into multiple files. The master repo linked to the go bindings. Fix both and switch them to https, which is now default for the website. --- Although trivial, I did not push these since I'm not a maintainer. README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 29d38a2..5643f74 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ The bindings use standard errors handling from Rust. Each method ## Documentation -* http://libvirt.org/html/libvirt-libvirt.html +* https://libvirt.org/html/index.html * https://docs.rs/crate/virt/ ## Tests/Exercises @@ -87,7 +87,7 @@ Or to send all patches on the current branch, against master Note the master GIT repository is at -* http://libvirt.org/git/?p=libvirt-go.git;a=summary +* https://libvirt.org/git/?p=libvirt-rust.git;a=summary The following automatic read-only mirrors are available as a convenience to allow contributors to "fork" the repository: -- 2.13.6

2 1

[libvirt] [PATCH] maint: Bump version number to 4.0.0
by Andrea Bolognani 05 Dec '17

05 Dec '17

As documented in https://libvirt.org/downloads.html#schedule https://libvirt.org/downloads.html#numbering the next release will happen in the middle of January 2018 and, being the first release of a new year, will bring a brand new major version number with it. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the "I can't believe you got it wrong, Michal!" rule. configure.ac | 2 +- docs/news.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index ec98e83d7..fba4e4bf5 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [3.11.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] +AC_INIT([libvirt], [4.0.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff --git a/docs/news.xml b/docs/news.xml index 72bdea220..0ec9857e2 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -33,7 +33,7 @@ --> <libvirt> - <release version="v3.11.0" date="unreleased"> + <release version="v4.0.0" date="unreleased"> <section title="New features"> </section> <section title="Improvements"> -- 2.14.3

1 0

[libvirt] [PATCH 0/3] macOS build and CI fixes
by Andrea Bolognani 05 Dec '17

05 Dec '17

The first one is technically a build breaker, but only affects development builds so it can wait the end of the freeze I guess. The second patch gets Travis to the point where the build failure would actually show up, and the last one is just a small cleanup. Andrea Bolognani (3): util: gettid() is Linux-specific travis: Upgrade brew packages travis: Don't try to install brew packages twice .travis.yml | 2 +- src/util/virthread.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.14.3

2 6

[libvirt] [PATCH 0/4] tests: Drop more useless prefixes
by Michal Privoznik 05 Dec '17

05 Dec '17

Yet again, trimmed patches, whole patches can be found here: https://github.com/zippy2/libvirt/commits/qemuxml2xmldata Michal Privoznik (4): test: Drop useless prefix for qemuagent test data test: Drop useless prefix for qemuargv2xml test data test: Drop useless prefix for qemuxml2xmldata test data test: Drop useless prefix for genericxml2xml test data tests/genericxml2xmltest.c | 4 ++-- tests/qemuagenttest.c | 2 +- tests/qemuargv2xmltest.c | 4 ++-- tests/qemuxml2xmltest.c | 8 ++++---- <trim/> 684 files changed, 15 insertions(+), 15 deletions(-) -- 2.13.6

2 5

[libvirt] libvirt 3.9.0 locks (was libvirt 3.5.0 locks)
by Vasiliy Tolstov 05 Dec '17

05 Dec '17

Hi again. I'm still try to determine why my libvirtd locks, this is another portion of gdb stuff: https://gist.github.com/vtolstov/ae8c4a67e15b2fbd14bbb95c226fb427 error looks in logs like: Dec 01 12:35:49 cn04 libvirtd[1171]: 2017-12-01 09:35:49.637+0000: 28063: error : qemuDomainObjBeginJobInternal:4403 : Timed out during operation: cannot acquire state change lock (held by remoteDispatchConnectGetAllDomainStats) Dec 01 12:35:49 cn04 libvirtd[1171]: 2017-12-01 09:35:49.637+0000: 28063: warning : qemuDomainObjBeginJobInternal:4391 : Cannot start job (destroy, none) for domain 225560-20001; current job is (query, none) owned by (1180 remoteDispatchConnectGetAllDomainStats, 0 <null>) for (30s, 0s) and virsh list says that domain in shutdown state (but qemu process already exited). Please, help me to solve this issue. -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

3 7

[libvirt] [PATCH for 3.11 0/2] qemuxml2argvdata: Drop useless prefix for test cases
by Michal Privoznik 05 Dec '17

05 Dec '17

The patches are trimmed out a lot to fit the size limit of our list. Anyway, the interesting bits are kept and also you can find the patches at my github: https://github.com/zippy2/libvirt/commits/qemuxml2argvdata If this approach is ACKed, I can continue because some other files suffer the same problem (e.g. qemuxml2xmloutdata). Michal Privoznik (2): tests: Drop qemuxml2argv- prefix for qemuxml2argv-*.xml test cases tests: Drop qemuxml2argv- prefix for qemuxml2argv test cases tests/qemuxml2argvtest.c | 4 ++-- tests/qemuxml2xmltest.c | 2 +- <very long list of renames/> 1481 files changed, 57 insertions(+), 57 deletions(-) -- 2.13.6

4 6

[libvirt] [PATCH v4 0/3] Move ide validation from qemuBuildControllerDevStr to qemuDomainDeviceDefValidate
by Lin Ma 05 Dec '17

05 Dec '17

Validate IDE controllers in qemuDomainDeviceDefValidate for reminding users earlier. v3->v4: Drop changes in tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-pseries.args Merged patch #3 and #4 for avoiding git bisect failure. Lin Ma (3): tests: qemuxml2argv: Use scsi controller instead of ide in pseries tests: qemuhotplugtest: Drop ide controller in ccw qemu_domain: Error out earlier when configuring IDE controller incorrectly src/qemu/qemu_command.c | 17 ----------- src/qemu/qemu_domain.c | 35 +++++++++++++++++++++- .../qemuhotplug-base-ccw-live+ccw-virtio.xml | 4 --- ...ive-with-2-ccw-virtio+ccw-virtio-1-explicit.xml | 4 --- ...live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 4 --- ...qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml | 4 --- ...-live-with-ccw-virtio+ccw-virtio-2-explicit.xml | 4 --- ...-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 4 --- .../qemuhotplug-base-ccw-live-with-ccw-virtio.xml | 4 --- .../qemuhotplug-base-ccw-live.xml | 4 --- .../qemuxml2argv-disk-floppy-pseries.xml | 4 +-- 11 files changed, 36 insertions(+), 52 deletions(-) -- 2.14.0

2 4

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

05 Dec '17

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

1 0

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

05 Dec '17

vif-* scripts support it for a long time, and expect addresses to be separated by spaces. Add appropriate support to libxl driver. --- src/libxl/libxl_conf.c | 29 +++++++++++++++++++++++++++-- src/libxl/libxl_domain.c | 12 ------------ 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 2a9be69..f84ffc6 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1067,6 +1067,31 @@ libxlUpdateDiskDef(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) ignore_value(virDomainDiskSetDriver(l_disk, driver)); } +static char * +libxlMakeIPList(virNetDevIPInfoPtr guestIP) +{ + size_t i; + char **address_array; + char *ret = NULL; + + if (VIR_ALLOC_N(address_array, guestIP->nips + 1) < 0) + return NULL; + + for (i = 0; i < guestIP->nips; i++) { + address_array[i] = virSocketAddrFormat(&guestIP->ips[i]->address); + if (!address_array[i]) + goto cleanup; + } + address_array[guestIP->nips] = NULL; + + ret = virStringListJoin((const char**)address_array, " "); + + cleanup: + while (i > 0) + VIR_FREE(address_array[--i]); + return ret; +} + int libxlMakeNic(virDomainDefPtr def, virDomainNetDefPtr l_nic, @@ -1144,7 +1169,7 @@ libxlMakeNic(virDomainDefPtr def, if (VIR_STRDUP(x_nic->script, l_nic->script) < 0) goto cleanup; if (l_nic->guestIP.nips > 0) { - x_nic->ip = virSocketAddrFormat(&l_nic->guestIP.ips[0]->address); + x_nic->ip = libxlMakeIPList(&l_nic->guestIP); if (!x_nic->ip) goto cleanup; } @@ -1160,7 +1185,7 @@ libxlMakeNic(virDomainDefPtr def, } if (l_nic->guestIP.nips > 0) { - x_nic->ip = virSocketAddrFormat(&l_nic->guestIP.ips[0]->address); + x_nic->ip = libxlMakeIPList(&l_nic->guestIP); if (!x_nic->ip) goto cleanup; } diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index d054b07..395c8a9 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -294,18 +294,6 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, def->os.type != VIR_DOMAIN_OSTYPE_HVM) dev->data.chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN; - if (dev->type == VIR_DOMAIN_DEVICE_NET && - (dev->data.net->type == VIR_DOMAIN_NET_TYPE_BRIDGE || - dev->data.net->type == VIR_DOMAIN_NET_TYPE_ETHERNET || - dev->data.net->type == VIR_DOMAIN_NET_TYPE_NETWORK)) { - if (dev->data.net->guestIP.nips > 1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("multiple IP addresses not supported on device type %s"), - virDomainNetTypeToString(dev->data.net->type)); - return -1; - } - } - if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV || (dev->type == VIR_DOMAIN_DEVICE_NET && dev->data.net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV)) { base-commit: 9f0ccc717ba9026c30ce38951a354dd66fa12e3b -- git-series 0.9.1

2 7

[libvirt] Release of libvirt-3.10.0
by Daniel Veillard 04 Dec '17

04 Dec '17

A little bit late but it's out, the new release is tagged in git and signed tarball and rpms have been pushed to the usual place: ftp://libvirt.org/libvirt/ I also pushed the corresponding release of python bindings at ftp://libvirt.org/libvirt/python/ This release brings a significant set of new features and noticeable improvements in addition to bug fixes: New features: - conf: Support defining distances between virtual NUMA cells A NUMA hardware architecture supports the notion of distances between NUMA cells. This can now be specified using the <distances> element within the NUMA cell configuration. Drivers which support this include Xen and QEMU. - Xen: Support defining vNUMA topology Xen now supports defining a virtual NUMA topology for VMs, including specifying distances between NUMA cells. - qemu: Add the ability to configure HPT resizing for pSeries guests The user can now decide whether HPT (Hash Page Table) resizing should be enabled, disabled or required instead of leaving it up to hypervisor defaults and negotiation between the guest and the host. - qemu: Add vmcoreinfo feature Starting with QEMU 2.11, the guest can save kernel debug details when this feature is enabled and the kernel supports it. It is useful to process kernel dump with KASLR enabled, and also provides various kernel details to crash tools. - conf: Move the auth and encryption definitions to disk source Allow parsing and formatting of the auth and encryption sub-elements to be a child of the source element. This will allow adding an auth sub-element to a backingStore or mirror elements as a means to track specific authentication and/or encryption needs. Improvements: - vbox: Add VirtualBox 5.2 support - vbox: Add support for configuring storage controllers The VirtualBox driver now supports the <controller> element in the domain XML for configuring storage controllers in VBOX VMs. Additionally, libvirt's domain XML schema was updated to allow optional model attribute for <controller type='ide'> which is used by the VBOX driver to set the IDE controller model to be one of 'piix4', 'piix4' (default), or 'ich6'. Finally, with this change dumpxml generates <controller> elements that correspond to current VBOX VM storage controller configuration. - vbox: Add support for attaching empty removable disks The VirutalBox driver now supports adding CD-ROM and floppy disk devices that do not have the disk source specified. Previously such devices were silently ignored. - vbox: Add support for attaching SAS storage controllers In VirtualBox, SCSI and SAS are distinct controller types whereas libvirt does not make such distinction. Therefore, the VBOX driver was updated to allow attaching SAS controllers via <controller type='scsi' model='lsisas1068'> element. If there are both SCSI and SAS controllers present in the VBOX VM, the domain XML can associate the disk device using the <address> element with the controller attribute, and optionally, set the port via unit attribute. - qemu: Generate predictable paths for qemu memory backends In some cases management applications need to know paths passed to memory-backend-file objects upfront. Libvirt now generates predictable paths so applications can prepare the files if they need to do so. - Shareable disks work properly with recent qemu Recent qemu versions added image locking to avoid potential corruption of disk images. This broke shareable disks with libvirt since the feature was turned on by default in qemu. Libvirt now enables sharing of those disks in qemu so that the image locking is not applied in that case. Additionally libvirt now checks that shareable disks have supported format (raw) to avoid metadata corruption. - Improve serial console behavior on non-x86 architectures ppc64, aarch64 and s390x guests were treating the <serial> and <console> elements differently from x86, in some cases presenting misleading information to the user. The behavior is now consistent across all architectures and the information reported is always accurate. Bug fixes: - vbox: Do not ignore failures to attach disk devices when defining The define now fails and reports an error if any of the controller or disk devices specified in the domain XML fail to attach to the VirtualBox VM. - vbox: Fix dumpxml to always output disk devices The VirtualBox driver was ignoring any disk devices in dumpxml output if there was a SAS storage controller attached to the VM. - vbox: Fix dumpxml to always generate valid domain XML When a VirtualBox VM has multiple disks attached, each to a different storage controller that uses 'sd' prefix for block device names e.g. one disk attached to SATA and one to SCSI controller, it no longer generates XML where both would have 'sda' device name assigned. Instead it properly assigns 'sda' and 'sdb' to those disks in the order of appearance. - Securely pass iSCSI authentication data Rather than supplying the authentication data as part of the iSCSI URL for a disk or host device, utilize the encrypted secret object to securely pass the authentication data. Thanks everybody for your help getting this release out, with ideas, patches, reviews, documentations, bug reports ... Enjoy this release, and please not that the next one (4.0.0) is scheduled for mid january ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] apparmor: allow qemu abstraction to read /proc/pid/cmdline
by Jim Fehlig 04 Dec '17

04 Dec '17

Noticed the following denial in audit.log when shutting down an apparmor confined domain type=AVC msg=audit(1512002299.742:131): apparmor="DENIED" operation="open" profile="libvirt-66154842-e926-4f92-92f0-1c1bf61dd1ff" name="/proc/1475/cmdline" pid=2958 comm="qemu-system-x86" requested_mask="r" denied_mask="r" fsuid=469 ouid=0 Squelch the denial by allowing read access to /proc/<pid>/cmdline. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Note: In the audit.log snippet, PID 1475 is libvirtd and 2958 is the qemu process. I must admit it is not clear to me why /proc/<libvirtd-pid>/cmdline is read on domain shutdown. examples/apparmor/libvirt-qemu | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu index 73bdbae87..3d9eed9ec 100644 --- a/examples/apparmor/libvirt-qemu +++ b/examples/apparmor/libvirt-qemu @@ -25,6 +25,7 @@ /dev/ptmx rw, /dev/kqemu rw, @{PROC}/*/status r, + @{PROC}/@{pid}/cmdline r, # Per man(5) proc, the kernel enforces that a thread may # only modify its comm value or those in its thread group. owner @{PROC}/@{pid}/task/@{tid}/comm rw, -- 2.15.0

4 7

[libvirt] [PATCH v2] libvirt: Adding POWER9 DD1.0/DD2.0 PVR value to cpu_map.xml
by Seeteena Thoufeek 04 Dec '17

04 Dec '17

DD1.0/DD2.0 PVR value is missing from cpu_map.xml. This patch provides those details Signed-off-by: Seeteena Thoufeek <s1seetee(a)linux.vnet.ibm.com> --- src/cpu/cpu_map.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index e5da7a8..be4e215 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -1729,6 +1729,8 @@ <model name='POWER9'> <vendor name='IBM'/> <pvr value='0x004e0000' mask='0xffff0000'/> + <pvr value='0x004e0100' mask='0xffff0000'/> + <pvr value='0x004e1200' mask='0xffff0000'/> </model>  -- 1.8.3.1

3 3

[libvirt] CFP deadline extended for FOSDEM18 Virt & IaaS Devroom
by Stefan Hajnoczi 04 Dec '17

04 Dec '17

The call for papers for the Virtualization and IaaS Devroom at FOSDEM18 is extended until December 7 midnight UTC. All other dates remain the same as you can read below. On behalf of oVirt and the Xen Project, we are excited to announce that the call for proposals is now open for the Virtualization & IaaS devroom at the upcoming FOSDEM 2018, to be hosted on February 3 and 4, 2017. This year will mark FOSDEM’s 18th anniversary as one of the longest-running free and open source software developer events, attracting thousands of developers and users from all over the world. FOSDEM will be held once again in Brussels, Belgium, on February 3 & 4, 2018. This devroom is a collaborative effort, and is organized by dedicated folks from projects such as OpenStack, Xen Project,, oVirt, QEMU, and Foreman. We would like to invite all those who are involved in these fields to submit your proposals by December 1st, 2017. About the Devroom The Virtualization & IaaS devroom will feature session topics such as open source hypervisors and virtual machine managers such as Xen Project, KVM, bhyve, and VirtualBox, and Infrastructure-as-a-Service projects such as Apache CloudStack, OpenStack, oVirt, QEMU, OpenNebula, and Ganeti. This devroom will host presentations that focus on topics of shared interest, such as KVM; libvirt; shared storage; virtualized networking; cloud security; clustering and high availability; interfacing with multiple hypervisors; hyperconverged deployments; and scaling across hundreds or thousands of servers. Presentations in this devroom will be aimed at developers working on these platforms who are looking to collaborate and improve shared infrastructure or solve common problems. We seek topics that encourage dialog between projects and continued work post-FOSDEM. Important Dates Submission deadline: 07 December 2017 Acceptance notifications: 14 December 2017 Final schedule announcement: 21 December 2017 Devroom: 03 and 04 February 2018 (two days- different rooms) Submit Your Proposal All submissions must be made via the Pentabarf event planning site[1]. If you have not used Pentabarf before, you will need to create an account. If you submitted proposals for FOSDEM in previous years, you can use your existing account. After creating the account, select Create Event to start the submission process. Make sure to select Virtualization and IaaS devroom from the Track list. Please fill out all the required fields, and provide a meaningful abstract and description of your proposed session. Submission Guidelines We expect more proposals than we can possibly accept, so it is vitally important that you submit your proposal on or before the deadline. Late submissions are unlikely to be considered. All presentation slots are 45 minutes, with 35 minutes planned for presentations, and 10 minutes for Q&A. All presentations will be recorded and made available under Creative Commons licenses. In the Submission notes field, please indicate that you agree that your presentation will be licensed under the CC-By-SA-4.0 or CC-By-4.0 license and that you agree to have your presentation recorded. For example: "If my presentation is accepted for FOSDEM, I hereby agree to license all recordings, slides, and other associated materials under the Creative Commons Attribution Share-Alike 4.0 International License. Sincerely, <NAME>." In the Submission notes field, please also confirm that if your talk is accepted, you will be able to attend FOSDEM and deliver your presentation. We will not consider proposals from prospective speakers who are unsure whether they will be able to secure funds for travel and lodging to attend FOSDEM. (Sadly, we are not able to offer travel funding for prospective speakers.) Speaker Mentoring Program As a part of the rising efforts to grow our communities and encourage a diverse and inclusive conference ecosystem, we're happy to announce that we'll be offering mentoring for new speakers. Our mentors can help you with tasks such as reviewing your abstract, reviewing your presentation outline or slides, or practicing your talk with you. You may apply to the mentoring program as a newcomer speaker if you: Never presented before or Presented only lightning talks or Presented full-length talks at small meetups (<50 ppl) Submission Guidelines Mentored presentations will have 25-minute slots, where 20 minutes will include the presentation and 5 minutes will be reserved for questions. The number of newcomer session slots is limited, so we will probably not be able to accept all applications. You must submit your talk and abstract to apply for the mentoring program, our mentors are volunteering their time and will happily provide feedback but won't write your presentation for you! If you are experiencing problems with Pentabarf, the proposal submission interface, or have other questions, you can email our devroom mailing list[2] and we will try to help you. How to Apply In addition to agreeing to video recording and confirming that you can attend FOSDEM in case your session is accepted, please write "speaker mentoring program application" in the "Submission notes" field, and list any prior speaking experience or other relevant information for your application. Call for Mentors Interested in mentoring newcomer speakers? We'd love to have your help! Please email iaas-virt-devroom at lists.fosdem.org with a short speaker biography and any specific fields of expertise (for example, KVM, OpenStack, storage, etc.) so that we can match you with a newcomer speaker from a similar field. Estimated time investment can be as low as a 5-10 hours in total, usually distributed weekly or bi-weekly. Never mentored a newcomer speaker but interested to try? As the mentoring program coordinator, email Brian Proffitt[3] and he will be happy to answer your questions! Code of Conduct Following the release of the updated code of conduct for FOSDEM, we'd like to remind all speakers and attendees that all of the presentations and discussions in our devroom are held under the guidelines set in the CoC and we expect attendees, speakers, and volunteers to follow the CoC at all times. If you submit a proposal and it is accepted, you will be required to confirm that you accept the FOSDEM CoC. If you have any questions about the CoC or wish to have one of the devroom organizers review your presentation slides or any other content for CoC compliance, please email us and we will do our best to assist you. Call for Volunteers We are also looking for volunteers to help run the devroom. We need assistance watching time for the speakers, and helping with video for the devroom. Please contact me, Brian Proffitt, for more information. Questions? If you have any questions about this devroom, please send your questions to our devroom mailing list. You can also subscribe to the list to receive updates about important dates, session announcements, and to connect with other attendees. See you all at FOSDEM! [1] https://penta.fosdem.org/submission/FOSDEM18 [2] iaas-virt-devroom at lists.fosdem.org [3] bkp at redhat.com

1 0

[libvirt] [PATCH] Adjust backslash alignment syntax-check
by Martin Kletzander 04 Dec '17

04 Dec '17

We have a check for backslash alignment that checks for two blanks preceding a backslash. However there can be alignment done using a tabulator and in some cases one might be enough. There are none currently, but I found out that was the case before. at some point. so let's check for \t preceding the final backslash as well. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- cfg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfg.mk b/cfg.mk index 5321a52b7ee2..ea10ca19f512 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1038,7 +1038,7 @@ sc_prohibit_http_urls: $(_sc_search_regexp) sc_prohibit_backslash_alignment: - @prohibit='[[:blank:]][[:blank:]]\\$$' \ + @prohibit='([[:blank:]][[:blank:]]| )\\$$' \ in_vc_files='*\.([chx]|am|mk)$$' \ halt='Do not attempt to right-align backslashes' \ $(_sc_search_regexp) -- 2.15.0

3 2

[libvirt] Entering freeze for libvirt-3.10.0
by Daniel Veillard 01 Dec '17

01 Dec '17

As planned yesterday (but a bit late) I tagged Release Candidate 1 in git and pushed the signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ Seems to work fine in my limited testing, but please give them a try especially for portability accross arches and platforms ! If things go well (and https://ci.centos.org/view/libvirt/ looks good !) then I will push RC2 on Fraiday and get the final 3.10.0 out on Monday, but please give it some testing and report ! thanks, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 4

[libvirt] [PATCH 0/2] fix chardev security labels
by Pavel Hrdina 01 Dec '17

01 Dec '17

Pavel Hrdina (2): security: introduce virSecurityManager(Set|Restore)ChardevLabel qemu: fix security labeling for attach/detach of char devices src/libvirt_private.syms | 2 ++ src/qemu/qemu_hotplug.c | 10 +++++++ src/qemu/qemu_security.c | 60 +++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_security.h | 8 ++++++ src/security/security_dac.c | 3 +++ src/security/security_driver.h | 11 ++++++++ src/security/security_manager.c | 40 +++++++++++++++++++++++++++ src/security/security_manager.h | 10 +++++++ src/security/security_nop.c | 20 ++++++++++++++ src/security/security_selinux.c | 3 +++ src/security/security_stack.c | 43 +++++++++++++++++++++++++++++ 11 files changed, 210 insertions(+) -- 2.14.3

2 3

[libvirt] [PATCH v3 0/4] Move ide validation from qemuBuildControllerDevStr to qemuDomainDeviceDefValidate
by Lin Ma 01 Dec '17

01 Dec '17

Validate IDE controllers in qemuDomainDeviceDefValidate for reminding users earlier. v2->v3: * split original patch to multiple patches. * making the validation is preferred over the PostParse for avoiding guests disappear. * remove ide from the pseries and the ccw tests. Lin Ma (4): tests: qemuxml2argv: Use scsi controller instead of ide in pseries tests: qemuhotplugtest: Drop ide controller in ccw qemu_command: Drop IDE validation code in qemuBuildControllerDevStr qemu_domain: Error out earlier when configuring IDE controller incorrectly src/qemu/qemu_command.c | 10 +------ src/qemu/qemu_domain.c | 35 +++++++++++++++++++++- .../qemuhotplug-base-ccw-live+ccw-virtio.xml | 4 --- ...ive-with-2-ccw-virtio+ccw-virtio-1-explicit.xml | 4 --- ...live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 4 --- ...qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml | 4 --- ...-live-with-ccw-virtio+ccw-virtio-2-explicit.xml | 4 --- ...-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 4 --- .../qemuhotplug-base-ccw-live-with-ccw-virtio.xml | 4 --- .../qemuhotplug-base-ccw-live.xml | 4 --- .../qemuxml2argv-disk-floppy-pseries.args | 2 +- .../qemuxml2argv-disk-floppy-pseries.xml | 4 +-- 12 files changed, 38 insertions(+), 45 deletions(-) -- 2.9.2

4 8

[libvirt] [PATCH jenkins-ci] Make args to 'go test' configurable
by Daniel P. Berrange 01 Dec '17

01 Dec '17

Each module has its own set of tags it may wish to pass to 'go test', so set it based on an env variable Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- jobs/go.yaml | 2 +- projects/libvirt-go-xml.yaml | 2 ++ projects/libvirt-go.yaml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/jobs/go.yaml b/jobs/go.yaml index 93b61ca..29a9f51 100644 --- a/jobs/go.yaml +++ b/jobs/go.yaml @@ -80,7 +80,7 @@ - shell: | {global_env} {local_env} - go test -tags api + go test $TEST_ARGS publishers: - email: recipients: '{obj:spam}' diff --git a/projects/libvirt-go-xml.yaml b/projects/libvirt-go-xml.yaml index 1c42e3d..3083b9f 100644 --- a/projects/libvirt-go-xml.yaml +++ b/projects/libvirt-go-xml.yaml @@ -11,6 +11,8 @@ - libvirt-freebsd-10 - libvirt-freebsd-11 title: Libvirt Go XML + local_env: | + export TEST_ARGS="-tags xmlroundtrip" jobs: - go-build-job: parent_jobs: diff --git a/projects/libvirt-go.yaml b/projects/libvirt-go.yaml index faa5265..141c862 100644 --- a/projects/libvirt-go.yaml +++ b/projects/libvirt-go.yaml @@ -11,6 +11,8 @@ - libvirt-freebsd-10 - libvirt-freebsd-11 title: Libvirt Go + local_env: | + export TEST_ARGS="-tags api" jobs: - go-build-job: parent_jobs: 'libvirt-master-build' -- 2.14.3

2 1

[libvirt] [PATCH 0/3] Couple of memleak fixes
by Michal Privoznik 01 Dec '17

01 Dec '17

Ideally, I'd like to merge these to the release. Michal Privoznik (3): virDomainDiskSourceNetworkParse: Don't leak @tlsCfg or @haveTLS virDomainDiskBackingStoreParse: Don't leak @idx qemuStateInitialize: Don't leak @memoryBackingPath src/conf/domain_conf.c | 3 +++ src/qemu/qemu_driver.c | 1 + 2 files changed, 4 insertions(+) -- 2.13.6

2 6

[libvirt] [PATCH 0/3] Adjust some formatting for numa distance code and resolve a memory leak
by John Ferlan 01 Dec '17

01 Dec '17

While reviewing the recent distance adjustments for Michal, I noted a couple of minor formatting things as well as a memory leak when removing the distances. John Ferlan (3): conf: Clean up virDomainNumaDefNodeDistanceParseXML conf: Clean up virDomainNumaDefCPUFormatXML conf: Fix memory leak for distances in virDomainNumaFree src/conf/numa_conf.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) -- 2.13.6

2 6

[libvirt] [PATCH v3 REBASE v2 0/2] qemu: report block job errors from qemu to the user
by Nikolay Shirokovskiy 30 Nov '17

30 Nov '17

So that you can see nice report on migration: "error: operation failed: migration of disk sda failed: No space left on device" diff from v2: ============ 1. split into 2 patches 2. change formal documentation where it is present accordingly 3. add variable initialization for safety Nikolay Shirokovskiy (2): qemu: prepare blockjob complete event error usage qemu: report drive mirror errors on migration src/qemu/qemu_blockjob.c | 14 +++++++++-- src/qemu/qemu_blockjob.h | 3 ++- src/qemu/qemu_domain.c | 10 +++++++- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 4 ++-- src/qemu/qemu_migration.c | 55 +++++++++++++++++++++++++++++++------------- src/qemu/qemu_monitor.c | 5 ++-- src/qemu/qemu_monitor.h | 4 +++- src/qemu/qemu_monitor_json.c | 4 +++- src/qemu/qemu_process.c | 4 ++++ 10 files changed, 78 insertions(+), 26 deletions(-) -- 1.8.3.1

2 5

[libvirt] [PATCH] conf: fix migratable XML for graphics if socket is generated based on config
by Pavel Hrdina 30 Nov '17

30 Nov '17

The graphics code is complex and there are a lot of exceptions and backward compatible combinations. One of them is the possibility to configure "spice_auto_unix_socket" in qemu.conf which will convert all spice graphics with listen type "address" without any address specified to listen type "socket" when the guest is started. We don't format this generated socket into migratable XML to make migration work with older libvirt. However, spice has another exception that if autoport='no' and there is no port configured it is converted to listen type "none". Because of this we need to format autoport='yes' to make sure that the listen type will be the same as the offline XML. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1511407 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/domain_conf.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b31917dad9..6b35ebf2e9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -25159,6 +25159,18 @@ virDomainGraphicsDefFormat(virBufferPtr buf, break; case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: + /* If socket is auto-generated based on config option we don't + * add any listen element into migratable XML because the original + * listen type is "address". + * We need to set autoport to make sure that libvirt on destination + * will parse it as listen type "address", without autoport it is + * parsed as listen type "none". */ + if ((flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE) && + glisten->fromConfig) { + virBufferAddStr(buf, " autoport='yes'"); + } + break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: break; } -- 2.14.3

2 1

[libvirt] [PATCH 0/4] Fix hotplug after daemon restart
by Ján Tomko 30 Nov '17

30 Nov '17

The logic in virQEMUCapsHasPCIMultiBus cannot be reasonably fixed for already running domains, since we dropped the MULTIBUS capability, so only resort to calling it if the domain is using user aliases. That way only hotplug on PPC machines other than pseries with QEMU < 2.0 (possibly older) that have a user alias on pci-root controller stays broken. Ján Tomko (4): Move USER_ALIAS_PREFIX to the header file qemu: prefer the PCI bus alias from status XML virQEMUCapsHasPCIMultiBus: use def->os.arch virQEMUCapsHasPCIMultiBus: assume true if we have no version information src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 2 ++ src/qemu/qemu_capabilities.c | 18 +++++----- src/qemu/qemu_capspriv.h | 4 --- src/qemu/qemu_command.c | 42 +++++++++++----------- .../ppc64-modern-bulk-result-live.xml | 2 +- .../ppc64-modern-individual-result-live.xml | 2 +- .../x86-modern-bulk-result-live.xml | 2 +- .../x86-modern-individual-add-result-live.xml | 2 +- .../x86-old-bulk-result-live.xml | 2 +- tests/qemuxml2argvtest.c | 5 --- 11 files changed, 39 insertions(+), 45 deletions(-) -- 2.13.6

3 9

[libvirt] [PATCH 0/3] qemu: Yet another backingStore terminator fix (blockdev-add saga)
by Peter Krempa 30 Nov '17

30 Nov '17

Raw images would not get the <backingStore/> terminator due to the changes. Peter Krempa (3): qemu: domain: Refactor control flow in qemuDomainDetermineDiskChain qemu: process: Move handling of non-backing files into qemuDomainDetermineDiskChain qemu: domain: Fix backing store terminator for non-backing local files src/qemu/qemu_domain.c | 59 ++++++++++++++-------- src/qemu/qemu_process.c | 10 ---- .../qemuhotplug-base-ccw-live+ccw-virtio.xml | 1 + ...live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 2 + ...qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml | 1 + ...-live-with-ccw-virtio+ccw-virtio-2-explicit.xml | 1 + ...-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 1 + ...-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml | 1 + .../qemuhotplug-base-live+disk-scsi.xml | 1 + .../qemuhotplug-base-live+disk-usb.xml | 1 + .../qemuhotplug-base-live+disk-virtio.xml | 1 + ...se-without-scsi-controller-live+disk-scsi-2.xml | 1 + 12 files changed, 50 insertions(+), 30 deletions(-) -- 2.14.3

2 9

[libvirt] [PATCH] qemu: forbid user aliases for implicit pci-root controllers
by Ján Tomko 30 Nov '17

30 Nov '17

For implicit controllers, we do not format user aliases on the command line so we provide a translation between the user alias and the qemu alias. However for pci-root controllers, the logic determining whether to use 'pci' or 'pci.0' depends on: * domain architecture * machine type * QEMU version (for PPC) Since we do not store the QEMU version in status XML and as of commit 5b783379 we no longer have the QEMU_CAPS_PCI_MULTIBUS capability formatted there either, we can only rely on the alias of the controller formatted there. Forbid user aliases for the implicit pci-root controllers so that we retain this information. This allows us to drop the call to virQEMUCapsHasPCIMultiBus, and fixing hotplug after daemon restart, since virQEMUCapsHasPCIMultiBus relies on qemuCaps->arch which is not filled out by reading the status XML either. Partially reverts commit 937f3195 which added the user alias -> qemu alias mapping for implicit PCI controllers. https://bugzilla.redhat.com/show_bug.cgi?id=1518148 --- While we cannot reliably map user aliases to qemu aliases in every corner case, I am not sure where to draw the line. For x86_64, HasPCIMultiBus could be fixed by using def->os.arch instead of qemuCaps->arch. So only PPC is unfixable, but this looked like the option with the least amount of exceptions. src/conf/domain_conf.c | 3 +-- src/conf/domain_conf.h | 2 ++ src/qemu/qemu_command.c | 16 +++++-------- src/qemu/qemu_domain.c | 26 +++++++++++++++++++++- .../qemuxml2argvdata/qemuxml2argv-user-aliases.xml | 4 +--- 5 files changed, 35 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 66536653b..d3cd598c8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6623,7 +6623,6 @@ virDomainDeviceAddressParseXML(xmlNodePtr address, } -#define USER_ALIAS_PREFIX "ua-" #define USER_ALIAS_CHARS \ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-" @@ -6680,7 +6679,7 @@ virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xmlopt ATTRIBUTE_UNUSED, if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) || (xmlopt->config.features & VIR_DOMAIN_DEF_FEATURE_USER_ALIAS && - STRPREFIX(aliasStr, USER_ALIAS_PREFIX) && + STRPREFIX(aliasStr, VIR_DOMAIN_USER_ALIAS_PREFIX) && strspn(aliasStr, USER_ALIAS_CHARS) == strlen(aliasStr))) VIR_STEAL_PTR(info->alias, aliasStr); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index dabbff1c2..de34fb163 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -57,6 +57,8 @@ # include "virtypedparam.h" # include "virsavecookie.h" +# define VIR_DOMAIN_USER_ALIAS_PREFIX "ua-" + /* forward declarations of all device types, required by * virDomainDeviceDef */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0eb591253..89e8b5350 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -321,16 +321,12 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, contIsPHB = virDomainControllerIsPSeriesPHB(cont); contTargetIndex = cont->opts.pciopts.targetIndex; - /* When domain has builtin pci-root controller we don't put it - * onto cmd line. Therefore we can't set its alias. In that - * case, use the default one. */ - if (!qemuDomainIsPSeries(domainDef) && - cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT) { - if (virQEMUCapsHasPCIMultiBus(qemuCaps, domainDef)) - contAlias = "pci.0"; - else - contAlias = "pci"; - } else if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT) { + /* The builtin pcie-root controller is not put on the command line. + * We cannot set a user alias, but we can reliably predict the one + * qemu will use. + * For builtin pci-root controllers we cannot do that once a domain + * is started, but user aliases are forbidden for those. */ + if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT) { contAlias = "pcie.0"; } else { contAlias = cont->info.alias; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9dab6b24b..ec33f3bad 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3718,6 +3718,27 @@ qemuDomainDeviceDefValidateDisk(const virDomainDiskDef *disk) static int +qemuDomainDeviceDefValidateController(const virDomainControllerDef *controller, + const virDomainDef *def) +{ + /* Forbid user aliases for implicit controllers where + * the qemu's device alias depends on the version and therefore + * we cannot figure it out for an already running domain. */ + if (controller->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT && + !qemuDomainIsPSeries(def) && + controller->info.alias && + STRPREFIX(controller->info.alias, VIR_DOMAIN_USER_ALIAS_PREFIX)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("user aliases are not available for " + "implicit pci-root controller")); + return -1; + } + + return 0; +} + + +static int qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, const virDomainDef *def, void *opaque ATTRIBUTE_UNUSED) @@ -3761,11 +3782,14 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, ret = qemuDomainDeviceDefValidateDisk(dev->data.disk); break; + case VIR_DOMAIN_DEVICE_CONTROLLER: + ret = qemuDomainDeviceDefValidateController(dev->data.controller, def); + break; + case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_FS: case VIR_DOMAIN_DEVICE_INPUT: case VIR_DOMAIN_DEVICE_SOUND: - case VIR_DOMAIN_DEVICE_CONTROLLER: case VIR_DOMAIN_DEVICE_GRAPHICS: case VIR_DOMAIN_DEVICE_HUB: case VIR_DOMAIN_DEVICE_MEMBALLOON: diff --git a/tests/qemuxml2argvdata/qemuxml2argv-user-aliases.xml b/tests/qemuxml2argvdata/qemuxml2argv-user-aliases.xml index c760098fe..d1cb8fea6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-user-aliases.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-user-aliases.xml @@ -74,9 +74,7 @@ <alias name='ua-SomeWeirdController'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> - <controller type='pci' index='0' model='pci-root'> - <alias name='ua-MyPCIRootController'/> - </controller> + <controller type='pci' index='0' model='pci-root'/> <controller type='ide' index='0'> <alias name='ua-DoesAnybodyStillUseIDE'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> -- 2.13.6

3 5

[libvirt] [PATCH] qemu_agent: report VIR_ERR_AGENT_UNSYNCED if guest_sync failed.
by Chen Hanxiao 30 Nov '17

30 Nov '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Commit 5e5019bf removed this kind of error. But we've already protected race condition by qemuDomainObjEnterAgent, it was very unlikely to revieve a sync from other calls. For call from virDomain*, it's better to show this error if we really got a mismatch sync. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/qemu/qemu_agent.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 5d125c413..cdcacf5c8 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -354,7 +354,9 @@ qemuAgentIOProcessLine(qemuAgentPtr mon, if (msg->id != id) { VIR_DEBUG("Guest agent returned ID: %llu instead of %llu", id, msg->id); - ret = 0; + virReportError(VIR_ERR_AGENT_UNSYNCED, + _("Guest agent returned ID: %llu " + "instead of %llu"), id, msg->id); goto cleanup; } } -- 2.14.3

2 3

[libvirt] [PATCH] Remove non-existant 'wiremode' attribute
by Daniel P. Berrange 30 Nov '17

30 Nov '17

The 'wiremode' attribute exists in a couple of Xen XML files, but no code has ever parsed that value. It was later added to the RNG schema too, again despite there not being any code which parses it. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/schemas/domaincommon.rng | 3 --- tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4f739abfb2..1e936f03d3 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3686,9 +3686,6 @@ <optional> <attribute name="service"/> </optional> - <optional> - <attribute name="wiremode"/> - </optional> <optional> <attribute name="channel"/> </optional> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml index 667ecbd4c2..3f0176e768 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml @@ -32,7 +32,7 @@ <target dev='ioemu:hda'/> </disk> <parallel type='tcp'> - <source mode='connect' host='localhost' service='9999' wiremode='raw'/> + <source mode='connect' host='localhost' service='9999'/> <target port='0'/> </parallel> <graphics type='vnc' port='5917' keymap='ja'/> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml index 72915b0a39..69603fea3a 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml @@ -32,7 +32,7 @@ <target dev='ioemu:hda'/> </disk> <serial type='tcp'> - <source mode='bind' host='localhost' service='9999' wiremode='raw'/> + <source mode='bind' host='localhost' service='9999'/> <target port='0'/> </serial> <graphics type='vnc' port='5917' keymap='ja'/> -- 2.14.3

2 2

[libvirt] [PATCH] Misc XML schema fixes for libxl
by Daniel P. Berrange 29 Nov '17

29 Nov '17

The libxlxml2domconfigdata directory was not covered in the RNG schema tests. This hid a few bugs in both the libxl XML files and the RNG schema itself. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/schemas/domaincommon.rng | 3 ++- tests/libxlxml2domconfigdata/basic-hvm.xml | 2 +- tests/libxlxml2domconfigdata/vnuma-hvm.xml | 2 +- tests/virschematest.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f1808065b2..4f739abfb2 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1169,7 +1169,7 @@ <optional> <element name="bootloader"> <choice> - <ref name="absFilePath"/> + <text/> <empty/> </choice> </element> @@ -2764,6 +2764,7 @@ <choice> <value>kvm</value> <value>vfio</value> + <value>xen</value> </choice> </attribute> </group> diff --git a/tests/libxlxml2domconfigdata/basic-hvm.xml b/tests/libxlxml2domconfigdata/basic-hvm.xml index d8cd2a283e..68c2ef08af 100644 --- a/tests/libxlxml2domconfigdata/basic-hvm.xml +++ b/tests/libxlxml2domconfigdata/basic-hvm.xml @@ -8,7 +8,7 @@ <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> - <clock sync='utc'/> + <clock offset='utc'/> <os> <type>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm.xml b/tests/libxlxml2domconfigdata/vnuma-hvm.xml index 28ad923e8f..6e265e31a9 100644 --- a/tests/libxlxml2domconfigdata/vnuma-hvm.xml +++ b/tests/libxlxml2domconfigdata/vnuma-hvm.xml @@ -8,7 +8,7 @@ <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> - <clock sync='utc'/> + <clock offset='utc'/> <os> <type>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> diff --git a/tests/virschematest.c b/tests/virschematest.c index 9dc4dc5ed8..f1d11437e0 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -221,7 +221,7 @@ mymain(void) "qemuxml2argvdata", "sexpr2xmldata", "xmconfigdata", "xml2sexprdata", "qemuxml2xmloutdata", "lxcxml2xmldata", "lxcxml2xmloutdata", "bhyvexml2argvdata", "genericxml2xmlindata", - "genericxml2xmloutdata", "xlconfigdata", + "genericxml2xmloutdata", "xlconfigdata", "libxlxml2domconfigdata", "qemuhotplugtestdomains"); DO_TEST_DIR("domaincaps.rng", "domaincapsschemadata"); DO_TEST_DIR("domainsnapshot.rng", "domainsnapshotxml2xmlin", -- 2.14.3

2 1

[libvirt] [libvirt-python][PATCH] Don't hardcode interpreter path
by Cédric Bosdonnat 29 Nov '17

29 Nov '17

This is particularly useful on operating systems that don't ship Python as part of the base system (eg. FreeBSD) while still working just as well as it did before on Linux. --- examples/event-test.py | 2 +- generator.py | 2 +- sanitytest.py | 2 +- setup.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/event-test.py b/examples/event-test.py index 4eb7142..2587226 100755 --- a/examples/event-test.py +++ b/examples/event-test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # # diff --git a/generator.py b/generator.py index 59e7531..74150b7 100755 --- a/generator.py +++ b/generator.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # generate python wrappers from the XML API description # diff --git a/sanitytest.py b/sanitytest.py index a5cb01b..1d65e8d 100644 --- a/sanitytest.py +++ b/sanitytest.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python import sys import lxml diff --git a/setup.py b/setup.py index 3cdfcbf..05a981e 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python from distutils.core import setup, Extension, Command from distutils.command.build import build -- 2.15.0

2 1

[libvirt] [PATCH] spec: don't package product dirs
by Nikolay Shirokovskiy 29 Nov '17

29 Nov '17

Directories /var/{lib,cache}/libvirt/qemu/ are created by libvirtd on start and their owner:group is changed according to the config. Thus no need to include them in libvirt-daemon-driver-qemu package. Otherwise we see noisy "directory changed" on rpm -V for the package. --- libvirt.spec.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index a3bd77f..e20f65c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1911,8 +1911,6 @@ exit 0 %config(noreplace) %{_sysconfdir}/libvirt/qemu-lockd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu %ghost %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/ -%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ %{_datadir}/augeas/lenses/libvirtd_qemu.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug %{_libdir}/%{name}/connection-driver/libvirt_driver_qemu.so -- 1.8.3.1

3 5

[libvirt] [PATCH] qemu-capabilities: Adjust function header comments of virQEMUCapsInitCPUModel*
by Boris Fiuczynski 29 Nov '17

29 Nov '17

Adjust function descriptions of virQEMUCapsInitCPUModelS390 and virQEMUCapsInitCPUModel to the changes introduced with commitID 74fc32a955. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> Reviewed-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f2d24a3..e4e25da 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3308,8 +3308,7 @@ virQEMUCapsCPUFilterFeatures(const char *name, /** * Returns 0 when host CPU model provided by QEMU was filled in qemuCaps, * 1 when the caller should fall back to using virCapsPtr->host.cpu, - * 2 when cpu model info is not supported for this configuration and - * fall back should not be used. + * 2 when cpu model info is not supported for this configuration, * -1 on error. */ static int @@ -3436,9 +3435,8 @@ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps, /** * Returns 0 when host CPU model provided by QEMU was filled in qemuCaps, - * 1 when the caller should fall back to other methods - * 2 when cpu model info is not supported for this configuration and - * fall back should not be used. + * 1 when the caller should fall back to other methods, + * 2 when cpu model info is not supported for this configuration, * -1 on error. */ int -- 2.9.4

2 1

[libvirt] [PATCH 0/2] spec: Make the build reproducible
by Jiri Denemark 29 Nov '17

29 Nov '17

Jiri Denemark (2): spec: Turn on verbose build spec: Make the build reproducible libvirt.spec.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 2.15.1

2 3

[libvirt] [PATCH 0/6] Remove some repetitive code from qemuDomainNamespace* functions
by Ján Tomko 29 Nov '17

29 Nov '17

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

2 7

[libvirt] Help：Can libvirt restore several xen snapshots more faster at same time?
by Chenjia (C) 28 Nov '17

28 Nov '17

Dear libvirt expert, we find a blocker issue in our project. Would you please offer us some feedback? Our project have a requirement: restore as much as xen snapshot at same time. we have done the following test(our environment is cpu E52620, 256G memory, SSD hard disk. The xen snapshot is Win7 OS with 1G memory): 1) Save 40 xen snapshots to disk, then restore these snapshot at sametime, we found the restore speed is too slow, and the bottleneck is the IO speed. 2) we save all the 40 xen snapshot to ramdisk, then we got a good performance, but the space is too big, about 40G, it is too expensive . Our question is : 1) each our xen snapshot is almost same except IP address(Win7 OS with 1G memory), does there have some way to reduce the 40 snapshots space? 2) Do you have some suggestion to improve the performance of restore as much as xen snapshot at same time? Best regards, wish your reply.

3 8

[libvirt] [PATCH v4 00/30] Fix serial console behavior on non-x86 architectures
by Andrea Bolognani 28 Nov '17

28 Nov '17

Changes from [v3]: * document which target types have an associated address; * add capability for pl011. Changes from [v2]: * don't drop -serial suffix from existing target types; * add capability and machine type checks for isa-serial; * reduce code duplication; * improve documentation. Changes from [v1]: * introduce target model to go along with target type and store the actual hypervisor-specific device name, as suggested by Pavel; * shorten the names of the esisting target types; * introduce a bunch of additional cleanups required for the first item. [v1] https://www.redhat.com/archives/libvir-list/2017-November/msg00545.html [v2] https://www.redhat.com/archives/libvir-list/2017-November/msg00831.html [v3] https://www.redhat.com/archives/libvir-list/2017-November/msg01027.html Andrea Bolognani (26): docs: Improve documentation for serial consoles qemu: Introduce qemuDomainChrDefPostParse() conf: Run devicePostParse() again for the first serial device conf: Introduce VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE conf: Drop virDomainChrDeviceType.targetTypeAttr conf: Introduce virDomainChrTargetDefFormat() conf: Improve error handling in virDomainChrDefFormat() conf: Check virDomainChrSourceDefFormat() return value conf: Improve virDomainChrTargetDefFormat() conf: Remove ATTRIBUTE_FALLTHROUGH from virDomainChrTargetDefFormat() qemu: Introduce qemuDomainChrTargetDefValidate() qemu: Improve qemuDomainChrTargetDefValidate() conf: Parse and format virDomainChrSerialTargetModel qemu: Set targetModel based on targetType for serial devices qemu: Validate target model for serial devices qemu: Format targetModel for serial devices qemu: Remove redundancy in qemuBuildSerialChrDeviceStr() conf: Add target type and model for spapr-vty qemu: Support usb-serial and pci-serial on pSeries conf: Add target type and model for pl011 qemu: Add QEMU_CAPS_DEVICE_ISA_SERIAL qemu: Require QEMU_CAPS_DEVICE_ISA_SERIAL for isa-serial qemu: Limit isa-serial usage to x86 guests qemu: Add QEMU_CAPS_DEVICE_PL011 qemu: Require QEMU_CAPS_DEVICE_PL011 for pl011 news: Update for serial console fixes Pino Toscano (4): conf: add VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP conf: pass parseFlags down to virDomainDefAddConsoleCompat conf: convert sclp/sclplm <console> as <serial> qemu: switch s390/s390x default console back to serial docs/formatdomain.html.in | 239 ++++++++++++---- docs/news.xml | 12 + docs/schemas/domaincommon.rng | 22 ++ src/conf/domain_conf.c | 304 ++++++++++++++++----- src/conf/domain_conf.h | 26 +- src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 147 +++++----- src/qemu/qemu_domain.c | 301 ++++++++++++++++++-- src/qemu/qemu_domain_address.c | 7 +- src/vz/vz_sdk.c | 5 +- .../qemuargv2xml-console-compat.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-serial-file.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-serial-many.xml | 8 +- tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml | 4 +- .../qemuargv2xml-serial-tcp-telnet.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml | 8 +- .../qemuargv2xmldata/qemuargv2xml-serial-unix.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml | 4 +- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + .../caps_2.10.0-gicv2.aarch64.xml | 2 + .../caps_2.10.0-gicv3.aarch64.xml | 2 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 2 + .../caps_2.6.0-gicv3.aarch64.xml | 2 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + tests/qemuhelptest.c | 5 + ...otplug-console-compat-2-live+console-virtio.xml | 12 +- .../qemuhotplug-console-compat-2-live.xml | 12 +- .../qemuxml2argv-mach-virt-console-native.args | 1 + .../qemuxml2argv-mach-virt-console-native.xml | 17 ++ ... => qemuxml2argv-mach-virt-console-virtio.args} | 15 +- .../qemuxml2argv-mach-virt-console-virtio.xml | 19 ++ ...muxml2argv-mach-virt-serial+console-native.args | 1 + ...emuxml2argv-mach-virt-serial+console-native.xml | 18 ++ .../qemuxml2argv-mach-virt-serial-compat.args | 1 + .../qemuxml2argv-mach-virt-serial-compat.xml | 19 ++ ...muxml2argv-mach-virt-serial-invalid-machine.xml | 21 ++ ...s => qemuxml2argv-mach-virt-serial-native.args} | 12 +- .../qemuxml2argv-mach-virt-serial-native.xml | 16 ++ .../qemuxml2argv-mach-virt-serial-pci.args | 26 ++ .../qemuxml2argv-mach-virt-serial-pci.xml | 18 ++ .../qemuxml2argv-mach-virt-serial-usb.args | 27 ++ .../qemuxml2argv-mach-virt-serial-usb.xml | 21 ++ .../qemuxml2argv-pseries-basic.args | 2 +- .../qemuxml2argv-pseries-console-native.args | 1 + .../qemuxml2argv-pseries-console-native.xml | 17 ++ ...gs => qemuxml2argv-pseries-console-virtio.args} | 10 +- .../qemuxml2argv-pseries-console-virtio.xml | 19 ++ .../qemuxml2argv-pseries-cpu-compat-power9.args | 2 +- .../qemuxml2argv-pseries-cpu-compat.args | 2 +- .../qemuxml2argv-pseries-cpu-exact.args | 2 +- .../qemuxml2argv-pseries-cpu-le.args | 2 +- .../qemuxml2argv-pseries-panic-missing.args | 2 +- .../qemuxml2argv-pseries-panic-no-address.args | 2 +- ...qemuxml2argv-pseries-serial+console-native.args | 1 + .../qemuxml2argv-pseries-serial+console-native.xml | 18 ++ .../qemuxml2argv-pseries-serial-compat.args | 1 + .../qemuxml2argv-pseries-serial-compat.xml | 19 ++ ...qemuxml2argv-pseries-serial-invalid-machine.xml | 19 ++ ...rgs => qemuxml2argv-pseries-serial-native.args} | 7 +- .../qemuxml2argv-pseries-serial-native.xml | 16 ++ ...c.args => qemuxml2argv-pseries-serial-pci.args} | 7 +- .../qemuxml2argv-pseries-serial-pci.xml | 18 ++ ...c.args => qemuxml2argv-pseries-serial-usb.args} | 8 +- .../qemuxml2argv-pseries-serial-usb.xml | 21 ++ .../qemuxml2argv-pseries-usb-default.args | 2 +- .../qemuxml2argv-pseries-usb-kbd.args | 2 +- .../qemuxml2argv-pseries-usb-multi.args | 2 +- .../qemuxml2argv-pseries-vio-user-assigned.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 4 +- ....args => qemuxml2argv-s390-console2serial.args} | 11 +- .../qemuxml2argv-s390-console2serial.xml | 19 ++ ...power9.args => qemuxml2argv-s390-serial-2.args} | 14 +- .../qemuxml2argv-s390-serial-2.xml | 19 ++ ....args => qemuxml2argv-s390-serial-console.args} | 11 +- .../qemuxml2argv-s390-serial-console.xml | 15 + ...es-basic.args => qemuxml2argv-s390-serial.args} | 11 +- .../qemuxml2argvdata/qemuxml2argv-s390-serial.xml | 14 + ...muxml2argv-serial-tcp-tlsx509-chardev-notls.xml | 8 +- .../qemuxml2argvdata/qemuxml2argv-user-aliases.xml | 8 +- tests/qemuxml2argvtest.c | 110 +++++++- .../qemuxml2xmlout-aarch64-pci-serial.xml | 4 +- .../qemuxml2xmlout-aarch64-virtio-pci-default.xml | 4 +- .../qemuxml2xmlout-bios-nvram-os-interleave.xml | 4 +- .../qemuxml2xmlout-chardev-label.xml | 8 +- .../qemuxml2xmlout-console-compat-auto.xml | 4 +- .../qemuxml2xmlout-console-compat.xml | 4 +- .../qemuxml2xmlout-console-compat2.xml | 4 +- .../qemuxml2xmlout-console-virtio-many.xml | 4 +- .../qemuxml2xmlout-interface-driver.xml | 4 +- .../qemuxml2xmlout-interface-server.xml | 8 +- .../qemuxml2xmlout-mach-virt-console-native.xml | 1 + ...=> qemuxml2xmlout-mach-virt-console-virtio.xml} | 19 +- ...uxml2xmlout-mach-virt-serial+console-native.xml | 1 + .../qemuxml2xmlout-mach-virt-serial-compat.xml | 31 +++ .../qemuxml2xmlout-mach-virt-serial-native.xml | 1 + ...xml => qemuxml2xmlout-mach-virt-serial-pci.xml} | 15 +- .../qemuxml2xmlout-mach-virt-serial-usb.xml | 41 +++ .../qemuxml2xmlout-net-bandwidth.xml | 4 +- .../qemuxml2xmlout-net-bandwidth2.xml | 4 +- .../qemuxml2xmlout-net-coalesce.xml | 4 +- .../qemuxml2xmloutdata/qemuxml2xmlout-net-mtu.xml | 4 +- .../qemuxml2xmlout-panic-pseries.xml | 4 +- .../qemuxml2xmlout-pci-serial-dev-chardev.xml | 4 +- .../qemuxml2xmlout-pseries-console-native.xml | 1 + ...l => qemuxml2xmlout-pseries-console-virtio.xml} | 16 +- .../qemuxml2xmlout-pseries-cpu-compat-power9.xml | 4 +- .../qemuxml2xmlout-pseries-cpu-compat.xml | 4 +- .../qemuxml2xmlout-pseries-cpu-exact.xml | 4 +- .../qemuxml2xmlout-pseries-panic-missing.xml | 4 +- .../qemuxml2xmlout-pseries-panic-no-address.xml | 4 +- ...emuxml2xmlout-pseries-serial+console-native.xml | 1 + .../qemuxml2xmlout-pseries-serial-compat.xml | 1 + ...ml => qemuxml2xmlout-pseries-serial-native.xml} | 10 +- ...g.xml => qemuxml2xmlout-pseries-serial-pci.xml} | 16 +- ...g.xml => qemuxml2xmlout-pseries-serial-usb.xml} | 13 +- .../qemuxml2xmlout-q35-virt-manager-basic.xml | 4 +- .../qemuxml2xmlout-s390-defaultconsole.xml | 8 +- .../qemuxml2xmlout-s390-serial-2.xml | 33 +++ .../qemuxml2xmlout-s390-serial-console.xml | 28 ++ .../qemuxml2xmlout-s390-serial.xml | 28 ++ .../qemuxml2xmlout-serial-spiceport-nospice.xml | 4 +- .../qemuxml2xmlout-serial-spiceport.xml | 4 +- .../qemuxml2xmlout-serial-target-port-auto.xml | 12 +- .../qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml | 8 +- .../qemuxml2xmlout-tap-vhost-incorrect.xml | 4 +- .../qemuxml2xmlout-tap-vhost.xml | 4 +- .../qemuxml2xmlout-vhost_queues.xml | 4 +- tests/qemuxml2xmltest.c | 54 ++++ 147 files changed, 1923 insertions(+), 390 deletions(-) create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-mach-virt-console-virtio.args} (53%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-virtio.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-invalid-machine.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-mach-virt-serial-native.args} (62%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-native.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-pci.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-pci.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-usb.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-usb.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-pseries-console-virtio.args} (59%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-console-virtio.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-invalid-machine.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-pseries-serial-native.args} (70%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-native.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-pseries-serial-pci.args} (70%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-pci.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-pseries-serial-usb.args} (65%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-usb.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-s390-console2serial.args} (71%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-console2serial.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-cpu-compat-power9.args => qemuxml2argv-s390-serial-2.args} (62%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-serial-2.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-s390-serial-console.args} (71%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-s390-serial.args} (71%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-serial.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-native.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-s390-defaultconsole.xml => qemuxml2xmlout-mach-virt-console-virtio.xml} (50%) create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial+console-native.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-compat.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-native.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-pci-serial.xml => qemuxml2xmlout-mach-virt-serial-pci.xml} (78%) create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-usb.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-console-native.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-panic-pseries.xml => qemuxml2xmlout-pseries-console-virtio.xml} (75%) create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial+console-native.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-compat.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-panic-missing.xml => qemuxml2xmlout-pseries-serial-native.xml} (82%) copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-panic-missing.xml => qemuxml2xmlout-pseries-serial-pci.xml} (74%) copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-panic-missing.xml => qemuxml2xmlout-pseries-serial-usb.xml} (75%) create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-2.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-console.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial.xml -- 2.14.3

2 36

[libvirt] Redesigning Libvirt: Adapting for the next 12 years
by Daniel P. Berrange 28 Nov '17

28 Nov '17

Hold tight, this is a long one... It is hard for me to believe it, but the libvirt project is now 12 years old (born on Nov 2, 2005), and I've been working on it since March 2006, making it easily the most significant project I've worked on. It started off life as an attempt to provide a stable application development API for the Xen hypervisor, interfacing across XenD, XenStore and Xen hypercalls. It was initially just a plain C library and Python binding, but when we added QEMU support in Feb 2007 the libvirtd daemon was born. That cemented a split of hypervisor drivers into two distinct architectures, stateless drivers where all logic was in the library (VMware ESX, VirtualBox, original Xen) and stateful drivers where all logic was in the daemon (QEMU, LXC, UML, modern Xen). The project has been wildly successful beyond our expectations, in particular the hypervisor abstraction layer made it possible for RHEL to switch from using Xen to KVM while keeping the userspace tooling the same for users. Libvirt is now used, to some degree, by likely 100's of applications with KVM being the dominant hypervisor choice by a long way. There is an old adage in the computer industry though "Adapt or die" This is usually applied to companies who see their primary product suddenly become a commodity, or disappear into irrelevance as new technology disrupts the market, killing their revenue stream. It is, however, just as reasonable to apply this to open source projects which can see their core usage scenarios disrupted by new startup projects & technologies. While the open source code will never go away, the companies who pay for the project's developers can quickly reassign them elsewhere, seriously harming the viability of the community thereafter. IOW, while Libvirt has seen 12 years of great success, we must not be so naive to assume we are going to see another 12 years without being disrupted. Over time we've done alot of work refactoring libvirt code to introduce new concepts and support new hypervisor targets, but I think its fair to say that at a high level the architecture is unchanged since we first introduced libvirtd, and then its multithreaded internals in the 2006-2008 timeframe. We've taken a fairly conservative, evolutionary approach to our changes. This is good, because providing stability to our users is a critically important reason for libvirt to exist. This is bad, because we've not been willing to take risks in short term that could potentially be very beneficial in the long term (5-10 year time). I think that now is the time to consider some major architectural changes in the approach we take. There's no single reason, rather a combination of factors all coming together to form a compelling case for ambitious change. Before going further though, I want to highlight one important point: I am NOT suggesting changing the public API or the XML format in a backwards incompatible manner. API & XML stability is the single most important part of libvirt and MUST be maintained on a par with that's available today. IOW we can add new features, but can't remove what's there already. This even leaves the door open for providing a libvirt2.so, provided we're willing to still maintain libvirt.so indefinitely alongside, though that's not something I'd encourage. The majority of the hard problems we face are not in the API design, or in the XML format, so that's not a significant limiting factor IMHO. There are three core areas of libvirt I see that are problematic, and where the fixes have major implications. At a very high level what I'm going to suggest is - Expose key hypervisor specific concepts as fully supported features to applications. In particular provide a way for an application to launch QEMU processes directly in their process execution environment, rather than as a child of libvirtd. - Explode the libvirtd daemon into a swarm of independant daemons. This would provide a more reliable system where a single bug doesn't take out the entire libvirt management daemon. It would allow for better security isolation of components. It would let session libvirtd use system daemons for networking & hostdev setup - Adopt use of Go and gradually convert (all|most) our C code into Go. This would improve the reliablity of libvirt, by giving us a memory safe language with garbage collection. It would improve productivity by letting us spend more time writing interesting code, rather than wasting time on platform portability or building basic abstractions for things like OO programming, hash tables, etc (much of the stuff we have in src/util), no more XML parsers needed (just annotated struct fields). It would increase the talent pool of potential contributors to libvirt by lowering the bar to getting work done. To avoid this mail getting too long, I'll cover each area in a separate mail. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

10 41

[libvirt] [PATCH v3 00/28] Fix serial console behavior on non-x86 architectures
by Andrea Bolognani 28 Nov '17

28 Nov '17

Happy birthday to me. Changes from [v2]: * don't drop -serial suffix from existing target types; * add capability and machine type checks for isa-serial; * reduce code duplication; * improve documentation. Changes from [v1]: * introduce target model to go along with target type and store the actual hypervisor-specific device name, as suggested by Pavel; * shorten the names of the esisting target types; * introduce a bunch of additional cleanups required for the first item. [v1] https://www.redhat.com/archives/libvir-list/2017-November/msg00545.html [v2] https://www.redhat.com/archives/libvir-list/2017-November/msg00831.html Andrea Bolognani (24): docs: Improve documentation for serial consoles qemu: Introduce qemuDomainChrDefPostParse() conf: Run devicePostParse() again for the first serial device conf: Introduce VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE conf: Drop virDomainChrDeviceType.targetTypeAttr conf: Introduce virDomainChrTargetDefFormat() conf: Improve error handling in virDomainChrDefFormat() conf: Check virDomainChrSourceDefFormat() return value conf: Improve virDomainChrTargetDefFormat() conf: Remove ATTRIBUTE_FALLTHROUGH from virDomainChrTargetDefFormat() qemu: Introduce qemuDomainChrTargetDefValidate() qemu: Improve qemuDomainChrTargetDefValidate() conf: Parse and format virDomainChrSerialTargetModel qemu: Set targetModel based on targetType for serial devices qemu: Validate target model for serial devices qemu: Format targetModel for serial devices qemu: Remove redundancy in qemuBuildSerialChrDeviceStr() conf: Add target type and model for spapr-vty qemu: Support usb-serial and pci-serial on pSeries conf: Add target type and model for pl011 qemu: Add QEMU_CAPS_DEVICE_ISA_SERIAL qemu: Require QEMU_CAPS_DEVICE_ISA_SERIAL for isa-serial qemu: Limit isa-serial usage to x86 guests news: Update for serial console fixes Pino Toscano (4): conf: add VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP conf: pass parseFlags down to virDomainDefAddConsoleCompat conf: convert sclp/sclplm <console> as <serial> qemu: switch s390/s390x default console back to serial docs/formatdomain.html.in | 233 ++++++++++++---- docs/news.xml | 12 + docs/schemas/domaincommon.rng | 22 ++ src/conf/domain_conf.c | 304 ++++++++++++++++----- src/conf/domain_conf.h | 26 +- src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 134 ++++----- src/qemu/qemu_domain.c | 301 ++++++++++++++++++-- src/qemu/qemu_domain_address.c | 7 +- src/vz/vz_sdk.c | 5 +- .../qemuargv2xml-console-compat.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-serial-file.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-serial-many.xml | 8 +- tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml | 4 +- .../qemuargv2xml-serial-tcp-telnet.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml | 8 +- .../qemuargv2xmldata/qemuargv2xml-serial-unix.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml | 4 +- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + .../caps_2.10.0-gicv2.aarch64.xml | 1 + .../caps_2.10.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + tests/qemuhelptest.c | 5 + ...otplug-console-compat-2-live+console-virtio.xml | 12 +- .../qemuhotplug-console-compat-2-live.xml | 12 +- .../qemuxml2argv-mach-virt-console-native.args | 1 + .../qemuxml2argv-mach-virt-console-native.xml | 17 ++ ... => qemuxml2argv-mach-virt-console-virtio.args} | 15 +- .../qemuxml2argv-mach-virt-console-virtio.xml | 19 ++ ...muxml2argv-mach-virt-serial+console-native.args | 1 + ...emuxml2argv-mach-virt-serial+console-native.xml | 18 ++ .../qemuxml2argv-mach-virt-serial-compat.args | 1 + .../qemuxml2argv-mach-virt-serial-compat.xml | 19 ++ ...muxml2argv-mach-virt-serial-invalid-machine.xml | 21 ++ ...s => qemuxml2argv-mach-virt-serial-native.args} | 12 +- .../qemuxml2argv-mach-virt-serial-native.xml | 16 ++ .../qemuxml2argv-mach-virt-serial-pci.args | 26 ++ .../qemuxml2argv-mach-virt-serial-pci.xml | 18 ++ .../qemuxml2argv-mach-virt-serial-usb.args | 27 ++ .../qemuxml2argv-mach-virt-serial-usb.xml | 21 ++ .../qemuxml2argv-pseries-basic.args | 2 +- .../qemuxml2argv-pseries-console-native.args | 1 + .../qemuxml2argv-pseries-console-native.xml | 17 ++ ...gs => qemuxml2argv-pseries-console-virtio.args} | 10 +- .../qemuxml2argv-pseries-console-virtio.xml | 19 ++ .../qemuxml2argv-pseries-cpu-compat-power9.args | 2 +- .../qemuxml2argv-pseries-cpu-compat.args | 2 +- .../qemuxml2argv-pseries-cpu-exact.args | 2 +- .../qemuxml2argv-pseries-cpu-le.args | 2 +- .../qemuxml2argv-pseries-panic-missing.args | 2 +- .../qemuxml2argv-pseries-panic-no-address.args | 2 +- ...qemuxml2argv-pseries-serial+console-native.args | 1 + .../qemuxml2argv-pseries-serial+console-native.xml | 18 ++ .../qemuxml2argv-pseries-serial-compat.args | 1 + .../qemuxml2argv-pseries-serial-compat.xml | 19 ++ ...qemuxml2argv-pseries-serial-invalid-machine.xml | 19 ++ ...rgs => qemuxml2argv-pseries-serial-native.args} | 7 +- .../qemuxml2argv-pseries-serial-native.xml | 16 ++ ...c.args => qemuxml2argv-pseries-serial-pci.args} | 7 +- .../qemuxml2argv-pseries-serial-pci.xml | 18 ++ ...c.args => qemuxml2argv-pseries-serial-usb.args} | 8 +- .../qemuxml2argv-pseries-serial-usb.xml | 21 ++ .../qemuxml2argv-pseries-usb-default.args | 2 +- .../qemuxml2argv-pseries-usb-kbd.args | 2 +- .../qemuxml2argv-pseries-usb-multi.args | 2 +- .../qemuxml2argv-pseries-vio-user-assigned.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 4 +- ....args => qemuxml2argv-s390-console2serial.args} | 11 +- .../qemuxml2argv-s390-console2serial.xml | 19 ++ ...power9.args => qemuxml2argv-s390-serial-2.args} | 14 +- .../qemuxml2argv-s390-serial-2.xml | 19 ++ ....args => qemuxml2argv-s390-serial-console.args} | 11 +- .../qemuxml2argv-s390-serial-console.xml | 15 + ...es-basic.args => qemuxml2argv-s390-serial.args} | 11 +- .../qemuxml2argvdata/qemuxml2argv-s390-serial.xml | 14 + ...muxml2argv-serial-tcp-tlsx509-chardev-notls.xml | 8 +- .../qemuxml2argvdata/qemuxml2argv-user-aliases.xml | 8 +- tests/qemuxml2argvtest.c | 101 ++++++- .../qemuxml2xmlout-aarch64-pci-serial.xml | 4 +- .../qemuxml2xmlout-aarch64-virtio-pci-default.xml | 4 +- .../qemuxml2xmlout-bios-nvram-os-interleave.xml | 4 +- .../qemuxml2xmlout-chardev-label.xml | 8 +- .../qemuxml2xmlout-console-compat-auto.xml | 4 +- .../qemuxml2xmlout-console-compat.xml | 4 +- .../qemuxml2xmlout-console-compat2.xml | 4 +- .../qemuxml2xmlout-console-virtio-many.xml | 4 +- .../qemuxml2xmlout-interface-driver.xml | 4 +- .../qemuxml2xmlout-interface-server.xml | 8 +- .../qemuxml2xmlout-mach-virt-console-native.xml | 1 + ...=> qemuxml2xmlout-mach-virt-console-virtio.xml} | 19 +- ...uxml2xmlout-mach-virt-serial+console-native.xml | 1 + .../qemuxml2xmlout-mach-virt-serial-compat.xml | 31 +++ .../qemuxml2xmlout-mach-virt-serial-native.xml | 1 + ...xml => qemuxml2xmlout-mach-virt-serial-pci.xml} | 15 +- .../qemuxml2xmlout-mach-virt-serial-usb.xml | 41 +++ .../qemuxml2xmlout-net-bandwidth.xml | 4 +- .../qemuxml2xmlout-net-bandwidth2.xml | 4 +- .../qemuxml2xmlout-net-coalesce.xml | 4 +- .../qemuxml2xmloutdata/qemuxml2xmlout-net-mtu.xml | 4 +- .../qemuxml2xmlout-panic-pseries.xml | 4 +- .../qemuxml2xmlout-pci-serial-dev-chardev.xml | 4 +- .../qemuxml2xmlout-pseries-console-native.xml | 1 + ...l => qemuxml2xmlout-pseries-console-virtio.xml} | 16 +- .../qemuxml2xmlout-pseries-cpu-compat-power9.xml | 4 +- .../qemuxml2xmlout-pseries-cpu-compat.xml | 4 +- .../qemuxml2xmlout-pseries-cpu-exact.xml | 4 +- .../qemuxml2xmlout-pseries-panic-missing.xml | 4 +- .../qemuxml2xmlout-pseries-panic-no-address.xml | 4 +- ...emuxml2xmlout-pseries-serial+console-native.xml | 1 + .../qemuxml2xmlout-pseries-serial-compat.xml | 1 + ...ml => qemuxml2xmlout-pseries-serial-native.xml} | 10 +- ...g.xml => qemuxml2xmlout-pseries-serial-pci.xml} | 16 +- ...g.xml => qemuxml2xmlout-pseries-serial-usb.xml} | 13 +- .../qemuxml2xmlout-q35-virt-manager-basic.xml | 4 +- .../qemuxml2xmlout-s390-defaultconsole.xml | 8 +- .../qemuxml2xmlout-s390-serial-2.xml | 33 +++ .../qemuxml2xmlout-s390-serial-console.xml | 28 ++ .../qemuxml2xmlout-s390-serial.xml | 28 ++ .../qemuxml2xmlout-serial-spiceport-nospice.xml | 4 +- .../qemuxml2xmlout-serial-spiceport.xml | 4 +- .../qemuxml2xmlout-serial-target-port-auto.xml | 12 +- .../qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml | 8 +- .../qemuxml2xmlout-tap-vhost-incorrect.xml | 4 +- .../qemuxml2xmlout-tap-vhost.xml | 4 +- .../qemuxml2xmlout-vhost_queues.xml | 4 +- tests/qemuxml2xmltest.c | 54 ++++ 147 files changed, 1883 insertions(+), 391 deletions(-) create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-mach-virt-console-virtio.args} (53%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-virtio.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-invalid-machine.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-mach-virt-serial-native.args} (62%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-native.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-pci.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-pci.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-usb.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-usb.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-pseries-console-virtio.args} (59%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-console-virtio.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-invalid-machine.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-pseries-serial-native.args} (70%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-native.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-pseries-serial-pci.args} (70%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-pci.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-pseries-serial-usb.args} (65%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-usb.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-s390-console2serial.args} (71%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-console2serial.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-cpu-compat-power9.args => qemuxml2argv-s390-serial-2.args} (62%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-serial-2.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-s390-serial-console.args} (71%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-s390-serial.args} (71%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-serial.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-native.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-s390-defaultconsole.xml => qemuxml2xmlout-mach-virt-console-virtio.xml} (50%) create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial+console-native.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-compat.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-native.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-pci-serial.xml => qemuxml2xmlout-mach-virt-serial-pci.xml} (78%) create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-usb.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-console-native.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-panic-pseries.xml => qemuxml2xmlout-pseries-console-virtio.xml} (75%) create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial+console-native.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-compat.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-panic-missing.xml => qemuxml2xmlout-pseries-serial-native.xml} (82%) copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-panic-missing.xml => qemuxml2xmlout-pseries-serial-pci.xml} (74%) copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-panic-missing.xml => qemuxml2xmlout-pseries-serial-usb.xml} (75%) create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-2.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-console.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial.xml -- 2.14.3

2 40

[libvirt] Plans for next releases
by Daniel Veillard 28 Nov '17

28 Nov '17

So November went through faster than expected and we are already a bit late w.r.t. freezing for the release. I suggest to do this at the end of the day, have RC2 on Thursday late or fFriday and the release over the week-end. Then for Jan/Feb as usual between the end of year breaks and the short month of February, egt only one release mid January, and the next one for end of February, hope this works for everybody, thanks, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] Adding POWER9 DD1.0/DD2.0 PVR value to cpu_map.xml
by Seeteena Thoufeek 28 Nov '17

28 Nov '17

DD1.0/DD2.0 PVR value is missing from cpu_map.xml. This patch provides those details Signed-off-by: Seeteena Thoufeek <s1seetee(a)linux.vnet.ibm.com> --- src/cpu/cpu_map.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index e5da7a8..e4e4e68 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -1729,6 +1729,8 @@ <model name='POWER9'> <vendor name='IBM'/> <pvr value='0x004e0000' mask='0xffff0000'/> + <pvr value='0x004e0100' mask='0xffff0000'/> + <pvr value='0x004e0200' mask='0xffff0000'/> </model>  -- 1.8.3.1

1 0

[libvirt] [PATCH v2] qemu_domain: Error out eariler when configuring IDE controller incorrectly
by Lin Ma 28 Nov '17

28 Nov '17

Move error handling of IDE controller from qemuBuildControllerDevStr to qemuDomainDeviceDefValidate for reminding users eariler. Signed-off-by: Lin Ma <lma(a)suse.com> --- src/qemu/qemu_command.c | 17 ----------------- src/qemu/qemu_domain.c | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b1cfafa79..463952d9b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3106,23 +3106,6 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef, } break; - case VIR_DOMAIN_CONTROLLER_TYPE_IDE: - /* Since we currently only support the integrated IDE - * controller on various boards, if we ever get to here, it's - * because some other machinetype had an IDE controller - * specified, or one with a single IDE contraller had multiple - * ide controllers specified. - */ - if (qemuDomainHasBuiltinIDE(domainDef)) - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only a single IDE controller is supported " - "for this machine type")); - else - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("IDE controllers are unsupported for " - "this QEMU binary or machine type")); - goto error; - default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported controller type: %s"), diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ece8ee7dd..d0be2afaf 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3539,6 +3539,29 @@ qemuDomainWatchdogDefValidate(const virDomainWatchdogDef *dev, } +static int +qemuDomainControllerDefValidate(const virDomainControllerDefPtr controller, + const virDomainDef *def) +{ + if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE) { + if (qemuDomainHasBuiltinIDE(def) && controller->idx != 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only a single IDE controller is supported " + "for this machine type")); + return -1; + } + if (qemuDomainIsQ35(def)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("IDE controllers are unsupported for q35 " + "machine type")); + return -1; + } + } + + return 0; +} + + static int qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, const virDomainDef *def, @@ -3650,6 +3673,9 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, } else if (dev->type == VIR_DOMAIN_DEVICE_WATCHDOG) { if (qemuDomainWatchdogDefValidate(dev->data.watchdog, def) < 0) goto cleanup; + } else if (dev->type == VIR_DOMAIN_DEVICE_CONTROLLER) { + if (qemuDomainControllerDefValidate(dev->data.controller, def) < 0) + goto cleanup; } /* forbid capabilities mode hostdev in this kind of hypervisor */ -- 2.14.0

2 3

[libvirt] [PATCH] news: Document qemu image locking
by Peter Krempa 28 Nov '17

28 Nov '17

--- docs/news.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 81b7b68f95..76dfc92a20 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -135,6 +135,19 @@ can prepare the files if they need to do so. </description> </change> + <change> + <summary> + Shareable disks work properly with recent qemu + </summary> + <description> + Recent qemu versions added image locking to avoid potential corruption + of disk images. This broke shareable disks with libvirt since the + feature was turned on by default in qemu. Libvirt now enables sharing + of those disks in qemu so that the image locking is not applied in + that case. Additionally libvirt now checks that shareable disks have + supported format (raw) to avoid metadata corruption. + </description> + </change> </section> <section title="Bug fixes"> <change> -- 2.14.3

2 1

[libvirt] [PATCH] qemu: Add support for hot unplug redirdev device
by Chen Hanxiao 27 Nov '17

27 Nov '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We lacked of hot unplugging redirdev device. This patch adds support for it. We could use detach-device --live now. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_hotplug.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_hotplug.h | 3 ++ 3 files changed, 117 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6132bc4a9..2628699d8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7786,6 +7786,9 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_INPUT: ret = qemuDomainDetachInputDevice(vm, dev->data.input); break; + case VIR_DOMAIN_DEVICE_REDIRDEV: + ret = qemuDomainDetachRedirdevDevice(driver, vm, dev->data.redirdev); + break; case VIR_DOMAIN_DEVICE_FS: case VIR_DOMAIN_DEVICE_SOUND: @@ -7795,7 +7798,6 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_MEMBALLOON: case VIR_DOMAIN_DEVICE_NVRAM: - case VIR_DOMAIN_DEVICE_REDIRDEV: case VIR_DOMAIN_DEVICE_NONE: case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index ce63b4a4d..497d7284b 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4281,6 +4281,74 @@ qemuDomainRemoveInputDevice(virDomainObjPtr vm, return 0; } +static int +qemuDomainRemoveRedirdevDevice(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainRedirdevDefPtr redirdev) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + virObjectEventPtr event; + char *charAlias = NULL; + char *tlsAlias = NULL; + char *secAlias = NULL; + ssize_t idx; + int ret = -1; + + VIR_DEBUG("Removing redirdev device %s from domain %p %s", + redirdev->info.alias, vm, vm->def->name); + + if (!(charAlias = qemuAliasChardevFromDevAlias(redirdev->info.alias))) + goto cleanup; + + if (redirdev->source->type == VIR_DOMAIN_CHR_TYPE_TCP && + redirdev->source->data.tcp.haveTLS == VIR_TRISTATE_BOOL_YES) { + + if (!(tlsAlias = qemuAliasTLSObjFromSrcAlias(charAlias))) + goto cleanup; + + /* Best shot at this as the secinfo is destroyed after process launch + * and this path does not recreate it. Thus, if the config has the + * secret UUID and we have a serial TCP chardev, then formulate a + * secAlias which we'll attempt to destroy. */ + if (cfg->chardevTLSx509secretUUID && + !(secAlias = qemuDomainGetSecretAESAlias(charAlias, false))) + goto cleanup; + } + + qemuDomainObjEnterMonitor(driver, vm); + /* Usually device_del will remove related chardev as well, + * So we don't need to check its return value. + */ + ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias)); + + if (tlsAlias) + ignore_value(qemuMonitorDelObject(priv->mon, tlsAlias)); + if (secAlias) + ignore_value(qemuMonitorDelObject(priv->mon, secAlias)); + + if (qemuDomainObjExitMonitor(driver, vm) < 0) + goto cleanup; + + virDomainAuditRedirdev(vm, redirdev, "detach", true); + + event = virDomainEventDeviceRemovedNewFromObj(vm, redirdev->info.alias); + qemuDomainEventQueue(driver, event); + + if ((idx = virDomainRedirdevDefFind(vm->def, redirdev)) >= 0) + virDomainRedirdevDefRemove(vm->def, idx); + qemuDomainReleaseDeviceAddress(vm, &redirdev->info, NULL); + virDomainRedirdevDefFree(redirdev); + + ret = 0; + + cleanup: + VIR_FREE(charAlias); + VIR_FREE(tlsAlias); + VIR_FREE(secAlias); + return ret; +} + int qemuDomainRemoveDevice(virQEMUDriverPtr driver, @@ -5018,6 +5086,49 @@ qemuDomainDetachWatchdog(virQEMUDriverPtr driver, return ret; } +int +qemuDomainDetachRedirdevDevice(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainRedirdevDefPtr redirdev) +{ + int ret = -1; + qemuDomainObjPrivatePtr priv = vm->privateData; + virDomainDefPtr vmdef = vm->def; + virDomainRedirdevDefPtr tmpRedirdevDef; + ssize_t idx; + + if ((idx = virDomainRedirdevDefFind(vmdef, redirdev)) < 0) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("no matching redirdev was not found")); + return -1; + } + + tmpRedirdevDef = vm->def->redirdevs[idx]; + + if (!tmpRedirdevDef->info.alias) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("alias not set for redirdev device")); + return -1; + } + + qemuDomainMarkDeviceForRemoval(vm, &tmpRedirdevDef->info); + + qemuDomainObjEnterMonitor(driver, vm); + if (qemuMonitorDelDevice(priv->mon, tmpRedirdevDef->info.alias) < 0) { + ignore_value(qemuDomainObjExitMonitor(driver, vm)); + goto cleanup; + } + if (qemuDomainObjExitMonitor(driver, vm) < 0) + goto cleanup; + + if ((ret = qemuDomainWaitForDeviceRemoval(vm)) == 1) + ret = qemuDomainRemoveRedirdevDevice(driver, vm, tmpRedirdevDef); + + cleanup: + qemuDomainResetDeviceRemoval(vm); + return ret; +} + int qemuDomainDetachNetDevice(virQEMUDriverPtr driver, diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 3e0d618e0..6c642c4fd 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -125,6 +125,9 @@ int qemuDomainDetachShmemDevice(virQEMUDriverPtr driver, int qemuDomainDetachWatchdog(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainWatchdogDefPtr watchdog); +int qemuDomainDetachRedirdevDevice(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainRedirdevDefPtr redirdev); int qemuDomainAttachInputDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, -- 2.13.6

1 2

[libvirt] New QEMU daemon for persistent reservations
by Paolo Bonzini 27 Nov '17

27 Nov '17

Hi all, I am adding a new daemon to QEMU, that QEMU can connect to in order to issue persistent reservation commands. The daemon can only issue the commands on file descriptor that QEMU already has. In addition normal users shouldn't have access to the daemon's Unix socket in /run, so the daemon is protected against misuse. My question is what is the best way to handle the connection to the daemon socket. Currently, the path to the socket is passed to QEMU on the command line: -object pr-manager-helper,id=mgr,path=/run/qemu-pr-helper.sock \ -drive if=none,id=hd,driver=raw,filename=/dev/sdb,file.pr-manager=mgr \ -device scsi-block,drive=hd (the new parts are "-object pr-manager-helper" and "file.pr-manager"). I could just make it root:root and pass a file descriptor from libvirt to QEMU, but this would make it impossible for QEMU to reconnect to the daemon in case someone does a "systemctl restart" or even just kills it inadvertently. The daemon is stateless, so transparent reconnection would be a nice feature to have. The alternative is to somehow label the daemon socket so that it can be accessed by QEMU, but I'm not very well versed in SELinux. Any ideas? Paolo

4 51

[libvirt] [PATCH] s390: qemu-capabilities: Avoid error message when missing non-kvm host cpu info
by Boris Fiuczynski 27 Nov '17

27 Nov '17

From: "Jason J. Herne" <jjherne(a)linux.vnet.ibm.com> Libvirt prints an error on startup when it is missing host cpu model information for any queried qemu binary. On s390 we only have host cpu model information for kvm enabled qemu instances. So when virt type is not kvm, this is actually not an error on s390. This patch adds virt type as a parameter to virQEMUCapsInitCPUModelS390, and a new return code 2 for virQEMUCapsInitCPUModel and virQEMUCapsInitCPUModelS390. If the virt type is not kvm then we skip printing the scary error message and return 2 because this case is actually expected behavior. The new return code is meant to differentiate between the failure case and the case where we simply expect the cpu model information to be unattainable. Signed-off-by: Jason J. Herne <jjherne(a)linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> Reviewed-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3adea66..b073841 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3306,22 +3306,28 @@ virQEMUCapsCPUFilterFeatures(const char *name, /** * Returns 0 when host CPU model provided by QEMU was filled in qemuCaps, * 1 when the caller should fall back to using virCapsPtr->host.cpu, + * 2 when cpu model info is not supported for this configuration and + * fall back should not be used. * -1 on error. */ static int virQEMUCapsInitCPUModelS390(virQEMUCapsPtr qemuCaps, qemuMonitorCPUModelInfoPtr modelInfo, virCPUDefPtr cpu, - bool migratable) + bool migratable, + virDomainVirtType type) { size_t i; if (!modelInfo) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("missing host CPU model info from QEMU capabilities " - "for binary %s"), - qemuCaps->binary); - return -1; + if (type == VIR_DOMAIN_VIRT_KVM) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("missing host CPU model info from QEMU " + "capabilities for binary %s"), + qemuCaps->binary); + return -1; + } + return 2; } if (VIR_STRDUP(cpu->model, modelInfo->name) < 0 || @@ -3429,6 +3435,8 @@ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps, /** * Returns 0 when host CPU model provided by QEMU was filled in qemuCaps, * 1 when the caller should fall back to other methods + * 2 when cpu model info is not supported for this configuration and + * fall back should not be used. * -1 on error. */ int @@ -3445,13 +3453,13 @@ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps, if (ARCH_IS_S390(qemuCaps->arch)) { ret = virQEMUCapsInitCPUModelS390(qemuCaps, cpuData->info, - cpu, migratable); + cpu, migratable, type); } else if (ARCH_IS_X86(qemuCaps->arch)) { ret = virQEMUCapsInitCPUModelX86(qemuCaps, type, cpuData->info, cpu, migratable); } - if (ret == 0) + if (ret == 0 || ret == 2) cpu->fallback = VIR_CPU_FALLBACK_FORBID; return ret; @@ -3504,6 +3512,12 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps, virQEMUCapsCPUFilterFeatures, &qemuCaps->arch) < 0) goto error; + } else if (rc == 2) { + VIR_DEBUG("Qemu does not provide cpu model for arch=%s virttype=%s", + virArchToString(qemuCaps->arch), + virDomainVirtTypeToString(type)); + virCPUDefFree(cpu); + goto cleanup; } else if (type == VIR_DOMAIN_VIRT_KVM && virCPUGetHostIsSupported(qemuCaps->arch)) { if (!(fullCPU = virCPUGetHost(qemuCaps->arch, VIR_CPU_TYPE_GUEST, -- 2.9.4

2 2

[libvirt] [PATCH] virsh: fixing virsh prompt when connection changes to readonly mode.
by Julio Faracco 27 Nov '17

27 Nov '17

This commit, fixes the virsh prompt when reconnection to the same URI is called: `virsh # connect --readonly` (Reconnect). The problem is happening because the code is considering URI (name) as a mandatory parameter to change the prompt. This commit remove the assignment into `priv->readonly` from `if (name)` conditional. Before: virsh # uri qemu:///system virsh # connect --readonly virsh # After: virsh # uri qemu:///system virsh # connect --readonly virsh > Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1507737 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- tools/virsh.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/virsh.c b/tools/virsh.c index d1789f0..89a2bea 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -251,8 +251,10 @@ virshReconnect(vshControl *ctl, const char *name, bool readonly, bool force) if (name) { VIR_FREE(ctl->connname); ctl->connname = vshStrdup(ctl, name); - priv->readonly = readonly; } + + priv->readonly = readonly; + if (virConnectRegisterCloseCallback(priv->conn, virshCatchDisconnect, ctl, NULL) < 0) vshError(ctl, "%s", _("Unable to register disconnect callback")); -- 2.7.4

3 2

[libvirt] [PATCH v3] qemu: network user/direct/hostdev do not support backend.
by Julio Faracco 27 Nov '17

27 Nov '17

The tag backend is not supported for user/direct/hostdev network when you try to define them inside the domain XML. So, other ways to include devices cannot be permitted too. But the attach-device command is wrongly adding unsupported features. This commit fixes this bug. After the patch: virsh # attach-device rhel7.4 backend.xml error: Failed to attach device from backend.xml error: unsupported configuration: Custom tap device path is not supported for: user Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1480251 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/qemu/qemu_domain.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9dab6b2..bee44d1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3622,6 +3622,16 @@ qemuDomainDeviceDefValidateNetwork(const virDomainNetDef *net) return -1; } + if (net->type == VIR_DOMAIN_NET_TYPE_DIRECT || + net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) { + if (net->backend.tap) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Custom tap device path is not supported for: %s"), + virDomainNetTypeToString(net->type)); + return -1; + } + } + if (STREQ_NULLABLE(net->model, "virtio")) { if (net->driver.virtio.rx_queue_size & (net->driver.virtio.rx_queue_size - 1)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", -- 2.7.4

1 0

[libvirt] [PATCH v2 00/12] Make auto completion better
by Michal Privoznik 24 Nov '17

24 Nov '17

v2 of: https://www.redhat.com/archives/libvir-list/2017-November/msg00213.html diff to v1: -cmdComplete reworked -Dozen of small improvements The command completion is still missing. I mean, 'virsh start<TAB><TAB>' will still give you list of --options rather than a list of domains to start with it. And honestly, the code is so ugly, that I haven't even tried to implement it. Be my guest. Michal Privoznik (12): vshCommandParse: Don't leak @tkdata vshCommandStringParse: Allow retrieving partial result vshReadlineParse: Escape returned results if needed vshCommandOpt: Allow caller avoiding assert() vsh: Fix vshCompleter signature vsh: Call vshCmdOptDef.completer properly vshCompleter: Pass partially parsed command vsh: Introduce complete command tools: Provide bash autompletion file virsh: Introduce virshDomainNameCompleter virsh: Introduce virshDomainInterfaceCompleter virt-admin: Introduce vshAdmServerCompleter configure.ac | 3 + libvirt.spec.in | 2 + m4/virt-bash-completion.m4 | 74 ++++++++++++++ tools/Makefile.am | 40 +++++++- tools/bash-completion/vsh | 67 +++++++++++++ tools/virsh-completer.c | 150 ++++++++++++++++++++++++++++ tools/virsh-completer.h | 41 ++++++++ tools/virsh-domain-monitor.c | 33 +++--- tools/virsh-domain.c | 186 +++++++++++++++++----------------- tools/virsh-snapshot.c | 24 ++--- tools/virsh.c | 5 +- tools/virsh.h | 7 +- tools/virt-admin-completer.c | 76 ++++++++++++++ tools/virt-admin-completer.h | 33 ++++++ tools/virt-admin.c | 13 ++- tools/vsh.c | 232 +++++++++++++++++++++++++++++++++---------- tools/vsh.h | 23 ++++- 17 files changed, 831 insertions(+), 178 deletions(-) create mode 100644 m4/virt-bash-completion.m4 create mode 100644 tools/bash-completion/vsh create mode 100644 tools/virsh-completer.c create mode 100644 tools/virsh-completer.h create mode 100644 tools/virt-admin-completer.c create mode 100644 tools/virt-admin-completer.h -- 2.13.6

1 13

[libvirt] [PATCH] storage: Fix broken storage_driver build
by John Ferlan 24 Nov '17

24 Nov '17

Commit id '5d5c732d7' had an incorrect assignment and was found by travis build: storage/storage_driver.c:1668:14: error: equality comparison with extraneous parentheses [-Werror,-Wparentheses-equality] if ((obj == virStoragePoolObjListSearch(&driver->pools, ~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- <sigh> Where are those damn pink ears. Pushed as a build breaker. src/storage/storage_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index cb45052ef7..561ca36f90 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1665,9 +1665,9 @@ storagePoolLookupByTargetPath(virConnectPtr conn, return NULL; storageDriverLock(); - if ((obj == virStoragePoolObjListSearch(&driver->pools, - storagePoolLookupByTargetPathCallback, - path))) { + if ((obj = virStoragePoolObjListSearch(&driver->pools, + storagePoolLookupByTargetPathCallback, + path))) { def = virStoragePoolObjGetDef(obj); pool = virGetStoragePool(conn, def->name, def->uuid, NULL, NULL); virStoragePoolObjEndAPI(&obj); -- 2.13.6

2 1

[libvirt] [PATCH v2 00/21] Fix serial console behavior on non-x86 architectures
by Andrea Bolognani 24 Nov '17

24 Nov '17

Changes from [v1]: * introduce target model to go along with target type and store the actual hypervisor-specific device name, as suggested by Pavel; * shorten the names of the esisting target types; * introduce a bunch of additional cleanups required for the first item. I've kept existing R-bs because the changes didn't IMHO invalidate them, but feel free to double check and possibly disagree. Proper documentation will come as a follow-up, see the previous version to get an idea of what it will look like. [1] https://www.redhat.com/archives/libvir-list/2017-November/msg00545.html Andrea Bolognani (17): qemu: Introduce qemuDomainChrDefPostParse() conf: Run devicePostParse() again for the first serial device conf: Introduce VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE conf: Drop virDomainChrDeviceType.targetTypeAttr conf: Introduce virDomainChrTargetDefFormat() conf: Improve error handling in virDomainChrDefFormat() conf: Improve virDomainChrTargetDefFormat() conf: Remove ATTRIBUTE_FALLTHROUGH from virDomainChrTargetDefFormat() qemu: Introduce qemuDomainChrTargetDefValidate() conf: Parse and format virDomainChrSerialTargetModel qemu: Set targetModel based on targetType for serial devices qemu: Validate target model for serial devices qemu: Format targetModel for serial devices conf: Shorten names in virDomainChrSerialTarget enumeration conf: Add target type and model for spapr-vty qemu: Support usb-serial and pci-serial on pSeries conf: Add target type and model for pl011 Pino Toscano (4): conf: add VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP conf: pass parseFlags down to virDomainDefAddConsoleCompat conf: convert sclp/sclplm <console> as <serial> qemu: switch s390/s390x default console back to serial docs/formatdomain.html.in | 13 +- docs/schemas/domaincommon.rng | 26 ++ src/conf/domain_conf.c | 311 +++++++++++++++++---- src/conf/domain_conf.h | 26 +- src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 126 ++++----- src/qemu/qemu_domain.c | 310 ++++++++++++++++++-- src/qemu/qemu_domain_address.c | 7 +- src/vz/vz_sdk.c | 5 +- .../qemuargv2xml-console-compat.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-serial-file.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-serial-many.xml | 8 +- tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml | 4 +- .../qemuargv2xml-serial-tcp-telnet.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml | 8 +- .../qemuargv2xmldata/qemuargv2xml-serial-unix.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml | 4 +- ...otplug-console-compat-2-live+console-virtio.xml | 12 +- .../qemuhotplug-console-compat-2-live.xml | 12 +- .../qemuxml2argv-mach-virt-console-native.args | 1 + .../qemuxml2argv-mach-virt-console-native.xml | 17 ++ ... => qemuxml2argv-mach-virt-console-virtio.args} | 15 +- .../qemuxml2argv-mach-virt-console-virtio.xml | 19 ++ ...muxml2argv-mach-virt-serial+console-native.args | 1 + ...emuxml2argv-mach-virt-serial+console-native.xml | 18 ++ .../qemuxml2argv-mach-virt-serial-compat.args | 1 + .../qemuxml2argv-mach-virt-serial-compat.xml | 19 ++ ...muxml2argv-mach-virt-serial-invalid-machine.xml | 21 ++ ...s => qemuxml2argv-mach-virt-serial-native.args} | 12 +- .../qemuxml2argv-mach-virt-serial-native.xml | 16 ++ .../qemuxml2argv-mach-virt-serial-pci.args | 26 ++ .../qemuxml2argv-mach-virt-serial-pci.xml | 18 ++ .../qemuxml2argv-mach-virt-serial-usb.args | 27 ++ .../qemuxml2argv-mach-virt-serial-usb.xml | 21 ++ .../qemuxml2argv-pseries-basic.args | 2 +- .../qemuxml2argv-pseries-console-native.args | 1 + .../qemuxml2argv-pseries-console-native.xml | 17 ++ ...gs => qemuxml2argv-pseries-console-virtio.args} | 10 +- .../qemuxml2argv-pseries-console-virtio.xml | 19 ++ .../qemuxml2argv-pseries-cpu-compat-power9.args | 2 +- .../qemuxml2argv-pseries-cpu-compat.args | 2 +- .../qemuxml2argv-pseries-cpu-exact.args | 2 +- .../qemuxml2argv-pseries-cpu-le.args | 2 +- .../qemuxml2argv-pseries-panic-missing.args | 2 +- .../qemuxml2argv-pseries-panic-no-address.args | 2 +- ...qemuxml2argv-pseries-serial+console-native.args | 1 + .../qemuxml2argv-pseries-serial+console-native.xml | 18 ++ .../qemuxml2argv-pseries-serial-compat.args | 1 + .../qemuxml2argv-pseries-serial-compat.xml | 19 ++ ...qemuxml2argv-pseries-serial-invalid-machine.xml | 19 ++ ...rgs => qemuxml2argv-pseries-serial-native.args} | 7 +- .../qemuxml2argv-pseries-serial-native.xml | 16 ++ ...c.args => qemuxml2argv-pseries-serial-pci.args} | 7 +- .../qemuxml2argv-pseries-serial-pci.xml | 18 ++ ...c.args => qemuxml2argv-pseries-serial-usb.args} | 8 +- .../qemuxml2argv-pseries-serial-usb.xml | 21 ++ .../qemuxml2argv-pseries-usb-default.args | 2 +- .../qemuxml2argv-pseries-usb-kbd.args | 2 +- .../qemuxml2argv-pseries-usb-multi.args | 2 +- .../qemuxml2argv-pseries-vio-user-assigned.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 4 +- ....args => qemuxml2argv-s390-console2serial.args} | 11 +- .../qemuxml2argv-s390-console2serial.xml | 19 ++ ...power9.args => qemuxml2argv-s390-serial-2.args} | 14 +- .../qemuxml2argv-s390-serial-2.xml | 19 ++ ....args => qemuxml2argv-s390-serial-console.args} | 11 +- .../qemuxml2argv-s390-serial-console.xml | 15 + ...es-basic.args => qemuxml2argv-s390-serial.args} | 11 +- .../qemuxml2argvdata/qemuxml2argv-s390-serial.xml | 14 + ...muxml2argv-serial-tcp-tlsx509-chardev-notls.xml | 8 +- .../qemuxml2argvdata/qemuxml2argv-user-aliases.xml | 8 +- tests/qemuxml2argvtest.c | 72 +++++ .../qemuxml2xmlout-aarch64-pci-serial.xml | 4 +- .../qemuxml2xmlout-aarch64-virtio-pci-default.xml | 4 +- .../qemuxml2xmlout-bios-nvram-os-interleave.xml | 4 +- .../qemuxml2xmlout-chardev-label.xml | 8 +- .../qemuxml2xmlout-console-compat-auto.xml | 4 +- .../qemuxml2xmlout-console-compat.xml | 4 +- .../qemuxml2xmlout-console-compat2.xml | 4 +- .../qemuxml2xmlout-console-virtio-many.xml | 4 +- .../qemuxml2xmlout-interface-driver.xml | 4 +- .../qemuxml2xmlout-interface-server.xml | 8 +- .../qemuxml2xmlout-mach-virt-console-native.xml | 1 + ...=> qemuxml2xmlout-mach-virt-console-virtio.xml} | 19 +- ...uxml2xmlout-mach-virt-serial+console-native.xml | 1 + .../qemuxml2xmlout-mach-virt-serial-compat.xml | 31 ++ .../qemuxml2xmlout-mach-virt-serial-native.xml | 1 + ...xml => qemuxml2xmlout-mach-virt-serial-pci.xml} | 15 +- .../qemuxml2xmlout-mach-virt-serial-usb.xml | 41 +++ .../qemuxml2xmlout-net-bandwidth.xml | 4 +- .../qemuxml2xmlout-net-bandwidth2.xml | 4 +- .../qemuxml2xmlout-net-coalesce.xml | 4 +- .../qemuxml2xmloutdata/qemuxml2xmlout-net-mtu.xml | 4 +- .../qemuxml2xmlout-panic-pseries.xml | 4 +- .../qemuxml2xmlout-pci-serial-dev-chardev.xml | 4 +- .../qemuxml2xmlout-pseries-console-native.xml | 1 + ...l => qemuxml2xmlout-pseries-console-virtio.xml} | 16 +- .../qemuxml2xmlout-pseries-cpu-compat-power9.xml | 4 +- .../qemuxml2xmlout-pseries-cpu-compat.xml | 4 +- .../qemuxml2xmlout-pseries-cpu-exact.xml | 4 +- .../qemuxml2xmlout-pseries-panic-missing.xml | 4 +- .../qemuxml2xmlout-pseries-panic-no-address.xml | 4 +- ...emuxml2xmlout-pseries-serial+console-native.xml | 1 + .../qemuxml2xmlout-pseries-serial-compat.xml | 1 + ...ml => qemuxml2xmlout-pseries-serial-native.xml} | 10 +- ...g.xml => qemuxml2xmlout-pseries-serial-pci.xml} | 16 +- ...g.xml => qemuxml2xmlout-pseries-serial-usb.xml} | 13 +- .../qemuxml2xmlout-q35-virt-manager-basic.xml | 4 +- .../qemuxml2xmlout-s390-defaultconsole.xml | 8 +- .../qemuxml2xmlout-s390-serial-2.xml | 33 +++ .../qemuxml2xmlout-s390-serial-console.xml | 28 ++ .../qemuxml2xmlout-s390-serial.xml | 28 ++ .../qemuxml2xmlout-serial-spiceport-nospice.xml | 4 +- .../qemuxml2xmlout-serial-spiceport.xml | 4 +- .../qemuxml2xmlout-serial-target-port-auto.xml | 12 +- .../qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml | 8 +- .../qemuxml2xmlout-tap-vhost-incorrect.xml | 4 +- .../qemuxml2xmlout-tap-vhost.xml | 4 +- .../qemuxml2xmlout-vhost_queues.xml | 4 +- tests/qemuxml2xmltest.c | 54 ++++ 122 files changed, 1667 insertions(+), 329 deletions(-) create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-mach-virt-console-virtio.args} (53%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-virtio.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-invalid-machine.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-mach-virt-serial-native.args} (62%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-native.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-pci.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-pci.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-usb.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-usb.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-pseries-console-virtio.args} (59%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-console-virtio.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-invalid-machine.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-pseries-serial-native.args} (70%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-native.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-pseries-serial-pci.args} (70%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-pci.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-pseries-serial-usb.args} (65%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-usb.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-s390-console2serial.args} (71%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-console2serial.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-cpu-compat-power9.args => qemuxml2argv-s390-serial-2.args} (62%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-serial-2.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-s390-serial-console.args} (71%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-s390-serial.args} (71%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-serial.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-native.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-s390-defaultconsole.xml => qemuxml2xmlout-mach-virt-console-virtio.xml} (50%) create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial+console-native.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-compat.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-native.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-aarch64-pci-serial.xml => qemuxml2xmlout-mach-virt-serial-pci.xml} (79%) create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-usb.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-console-native.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-panic-pseries.xml => qemuxml2xmlout-pseries-console-virtio.xml} (75%) create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial+console-native.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-compat.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-panic-missing.xml => qemuxml2xmlout-pseries-serial-native.xml} (82%) copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-panic-missing.xml => qemuxml2xmlout-pseries-serial-pci.xml} (74%) copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-panic-missing.xml => qemuxml2xmlout-pseries-serial-usb.xml} (75%) create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-2.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-console.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial.xml -- 2.14.3

4 50

[libvirt] [PATCH 0/5] Fix labeling for evdev passthrough hotplug
by Ján Tomko 24 Nov '17

24 Nov '17

https://bugzilla.redhat.com/show_bug.cgi?id=1509866 Ján Tomko (5): Introduce virDomainInputDefGetPath security: Introduce functions for input device hot(un)plug qemu: Introduce functions for input device cgroup manipulation qemu: functions for dealing with input device namespaces and labels qemu: Properly label and create evdev on input device hotplug src/conf/domain_conf.c | 16 +++++++ src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 3 ++ src/qemu/qemu_cgroup.c | 25 ++++++++++- src/qemu/qemu_cgroup.h | 4 ++ src/qemu/qemu_domain.c | 93 +++++++++++++++++++++++++++++++++-------- src/qemu/qemu_domain.h | 6 +++ src/qemu/qemu_hotplug.c | 40 ++++++++++++++++-- src/qemu/qemu_security.c | 58 +++++++++++++++++++++++++ src/qemu/qemu_security.h | 6 +++ src/security/security_dac.c | 3 ++ src/security/security_driver.h | 9 ++++ src/security/security_manager.c | 36 ++++++++++++++++ src/security/security_manager.h | 8 ++++ src/security/security_nop.c | 11 +++++ src/security/security_selinux.c | 3 ++ src/security/security_stack.c | 38 +++++++++++++++++ 17 files changed, 339 insertions(+), 21 deletions(-) -- 2.13.6

2 7

[libvirt] [PATCH v2 0/2] Removing backend support when net interface is user/direct/hostdev.
by Julio Faracco 23 Nov '17

23 Nov '17

The <backend> xml tag is not supported for some interface types and the virsh command 'attach-device' permits to add <backend> settings to all of them. These commits avoid <backend> for user, direct and hostdev interface types. One commit changes some test cases to avoid wrong <backend> usage. Julio Faracco (2): tests: changing network interface types when backend tag is defined. qemu: network user/direct/hostdev do not support backend. src/qemu/qemu_domain.c | 15 +++++++++++++++ .../qemuxml2argvdata/qemuxml2argv-tap-vhost-incorrect.xml | 6 ++++-- tests/qemuxml2argvdata/qemuxml2argv-tap-vhost.xml | 3 ++- .../qemuxml2xmlout-tap-vhost-incorrect.xml | 6 ++++-- tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml | 3 ++- 5 files changed, 27 insertions(+), 6 deletions(-) -- 2.7.4

2 6

[libvirt] [REPOST PATCH v6 0/8] Use secret objects to pass iSCSI passwords
by John Ferlan 23 Nov '17

23 Nov '17

Repost after updating the series to account for Peter's most recent -drive and blockdev-add saga changes. Includes adding the port number to the .args output and updating the *.xmlfor the newly added ppc and gic*-aarch64 capabilitiesdata Also merge the news.xml changes w/ recent vbox changes. Previous repost here: https://www.redhat.com/archives/libvir-list/2017-November/msg00124.html Original: https://www.redhat.com/archives/libvir-list/2017-October/msg01012.html Copy of Original cover letter: v5: https://www.redhat.com/archives/libvir-list/2017-October/msg00228.html FWIW: AFAICT this series does not need/require changes that Peter has posted for continuing blocked-add saga related to user-specified backing chains: https://www.redhat.com/archives/libvir-list/2017-October/msg00956.html Changes since v5: * Some patches pushed as part of Peter Krempa's work and the two patches to perform the parsing of auth and encryption data in virStorageSource were pushed separately * Removed patches dealing with qemuDomainStorageSourceCopy and virDomainDiskStorageSourceNew Patches 9->16 reworked Patch1: (previous patch 10) - Rework logic to remove the need to pass around the @xmlopt for virStorageSourcePtr allocation and instead VIR_ALLOC(iscsisrc->src) directly as other consumers do. Patch2: (previous patch 11) - Use the qemuDomainStorageSourcePrivatePtr and friend macro QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE to manage the iscsisrc->src data making sure to ensure that srcPriv (e.g. privateData) exists. Patch3: (previous patch 12) - Only minor merge related changes. Patch4: (previous patch 13) - Merge related plus additional check to ensure srcPriv exists before dereference secinfo Patch5: (previous patch 14) - No change Patch 6: (previous patch 15) - Merge related changes, plus checks for srcPriv before deref secinfo NB: Testing note - I did ensure at this point if the password secret capability check fails that the code will still do the right thing. Patch7: (previous patch 9) - No change... Presented since it wasn't ACK'd before Patch8: (previous patch16) - No change John Ferlan (8): conf,qemu: Replace iscsisrc fields with virStorageSourcePtr qemu: Use private storage source for iscsi instead of private hostdev qemu: Remove private hostdev qemu: Refactor qemuBuildSCSIiSCSIHostdevDrvStr slightly qemu: Get capabilities to use iscsi password-secret argument qemu: Use secret objects to pass iSCSI passwords docs: Add news article regarding auth/encryption placement docs: Add news article to describe iSCSI usage of secret object docs/news.xml | 23 ++++++ src/conf/domain_conf.c | 58 ++++++++-------- src/conf/domain_conf.h | 9 +-- src/lxc/lxc_native.c | 2 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 75 +++++++++++++++----- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_domain.c | 81 +++++++--------------- src/qemu/qemu_domain.h | 14 ---- src/qemu/qemu_hotplug.c | 52 +++++++++++++- src/qemu/qemu_parse_command.c | 4 +- src/vbox/vbox_common.c | 2 +- src/xenconfig/xen_common.c | 2 +- src/xenconfig/xen_sxpr.c | 2 +- src/xenconfig/xen_xl.c | 2 +- .../caps_2.10.0-gicv2.aarch64.xml | 1 + .../caps_2.10.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + ...xml2argv-disk-drive-network-iscsi-auth-AES.args | 41 +++++++++++ ...uxml2argv-disk-drive-network-iscsi-auth-AES.xml | 43 ++++++++++++ ...ml2argv-hostdev-scsi-virtio-iscsi-auth-AES.args | 45 ++++++++++++ ...xml2argv-hostdev-scsi-virtio-iscsi-auth-AES.xml | 48 +++++++++++++ tests/qemuxml2argvtest.c | 10 +++ tests/virhostdevtest.c | 2 +- 30 files changed, 390 insertions(+), 139 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth-AES.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth-AES.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth-AES.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth-AES.xml -- 2.13.6

2 18

[libvirt] [PATCH] tools: Work around ancient readline
by Michal Privoznik 23 Nov '17

23 Nov '17

My latest commit of a785186446de785d uncovered a problem we fixed in 9eb23fe2 but then reverted in 834c5720e443. Turns out, some systems (I'm looking at you OS X) have ancient readline with broken header file. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as build breaker. tools/vsh.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/vsh.c b/tools/vsh.c index 472438ead..e878119b9 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2892,6 +2892,7 @@ vshReadlineInit(vshControl *ctl) int ret = -1; char *histsize_env = NULL; const char *histsize_str = NULL; + const char *break_characters = " \t\n\\`@$><=;|&{("; /* Opaque data for autocomplete callbacks. */ autoCompleteOpaque = ctl; @@ -2900,12 +2901,20 @@ vshReadlineInit(vshControl *ctl) * Work around ancient readline 4.1 (hello Mac OS X), * which declared it as 'char *' instead of 'const char *'. */ +# if defined(RL_READLINE_VERSION) && RL_READLINE_VERSION > 0x0402 rl_readline_name = ctl->name; +# else + rl_readline_name = (char *) ctl->name; +# endif /* Tell the completer that we want a crack first. */ rl_attempted_completion_function = vshReadlineCompletion; - rl_basic_word_break_characters = " \t\n\\`@$><=;|&{("; +# if defined(RL_READLINE_VERSION) && RL_READLINE_VERSION > 0x0402 + rl_basic_word_break_characters = break_characters; +# else + rl_basic_word_break_characters = (char *) break_characters; +# endif if (virAsprintf(&histsize_env, "%s_HISTSIZE", ctl->env_prefix) < 0) goto cleanup; -- 2.13.6

1 0

[libvirt] [PATCH 0/6] qemu: command: Clean up formatting of some attributes (blockdev-add saga)
by Peter Krempa 23 Nov '17

23 Nov '17

'file.password-secret' and 'file.debug' were improperly added to a random place when formatting -drive. This would not play well when the same attributes should be formatted via the JSON generator. Clean up the mess. Peter Krempa (6): qemu: command: Inject password-secret only when not using JSON props util: storage: Add fields for debug options for disk drivers qemu: block: Add support for formatting gluster debug level via JSON qemu: hotplug: Rename qemuDomainPrepareDisk to qemuHotplugPrepareDiskAccess qemu: domain: Unify disk source prepare steps qemu: command: Properly format disk 'debug' attribute src/qemu/qemu_block.c | 17 +++++++++++++++-- src/qemu/qemu_command.c | 34 ++++++++++------------------------ src/qemu/qemu_command.h | 1 - src/qemu/qemu_domain.c | 27 +++++++++++++++++++++++++-- src/qemu/qemu_domain.h | 16 ++++++---------- src/qemu/qemu_hotplug.c | 29 +++++++++++++---------------- src/qemu/qemu_process.c | 5 +---- src/util/virstoragefile.c | 2 ++ src/util/virstoragefile.h | 3 +++ 9 files changed, 75 insertions(+), 59 deletions(-) -- 2.14.3

2 9

[libvirt] [PATCH v2 00/11] qemu: Fix <shareable/> disks for new qemu
by Peter Krempa 23 Nov '17

23 Nov '17

Introduction of the disk image locking in qemu created a regression where disk shared access with <shareable/> would not work. Since the disk locking is a desired feature, allow libvirt to configure qemu in such way that <shareable/> disks are exempt from write locks. First few patches refactor some stuff so that it's less ugly. This series also mandates that sharing is used only with 'raw' disks since other formats could corrupt metadata. v2: - better capability detection (all the drive types) - fixed bug when share-rw would be used only with virtio disks - improved error message with automatic format probing - rebased to current master (new capability) - added BZ links into few cover letters Peter Krempa (11): qemu: Move snapshot disk validation functions into one qemu: domain: Despaghetify qemuDomainDeviceDefValidate qemu: domain: Move hostdev validation into separate function qemu: domain: Move video device validation into separate function qemu: domain: Refactor domain device validation function qemu: block: Add function to check if storage source allows concurrent access qemu: domain: Reject shared disk access if backing format does not support it qemu: snapshot: Disallow snapshot of unsupported shared disks qemu: Disallow pivot of shared disks to unsupported storage qemu: caps: Add capability for 'share-rw' disk option qemu: command: Mark <shared/> disks as such in qemu src/qemu/qemu_block.c | 15 ++ src/qemu/qemu_block.h | 3 + src/qemu/qemu_capabilities.c | 5 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 4 + src/qemu/qemu_domain.c | 299 +++++++++++++-------- src/qemu/qemu_driver.c | 121 +++++---- .../caps_2.10.0-gicv2.aarch64.xml | 1 + .../caps_2.10.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../qemuxml2argv-disk-drive-shared-locking.args | 32 +++ .../qemuxml2argv-disk-drive-shared-locking.xml | 42 +++ .../qemuxml2argv-disk-drive-shared-qcow.xml | 28 ++ .../qemuxml2argv-disk-drive-shared.args | 2 +- .../qemuxml2argv-disk-drive-shared.xml | 2 +- tests/qemuxml2argvtest.c | 3 + 21 files changed, 401 insertions(+), 164 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared-locking.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared-locking.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared-qcow.xml -- 2.14.3

2 14

[libvirt] [PATCH] qemu: add support for setting OEM strings SMBIOS data fields
by Daniel P. Berrange 23 Nov '17

23 Nov '17

The OEM strings table in SMBIOS allows the vendor to pass arbitrary strings into the guest OS. This can be used as a way to pass data to an application like cloud-init, or potentially as an alternative to the kernel command line for OS installers where you can't modify the install ISO image to change the kernel args. As an example, consider if cloud-init and anaconda supported OEM strings you could use something like <oemStrings> <entry>cloud-init:ds=nocloud-net;s=http://10.10.0.1:8000/</entry> <entry>anaconda:method=http://dl.fedoraproject.org/pub/fedora/linux/releases/25/x8…</entry> </oemStrings> use of a application specific prefix as illustrated above is recommended so that an app can reliably identify which of the many OEM strings are targetted at it. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- NB, the QEMU side of this patch is queued but won't merge until 2.12 opens up for dev work, so this libvirt patch will need to wait a little docs/formatdomain.html.in | 13 ++++++ docs/schemas/domaincommon.rng | 9 ++++ src/conf/domain_conf.c | 53 ++++++++++++++++++++++ src/qemu/qemu_command.c | 28 ++++++++++++ src/util/virsysinfo.c | 33 ++++++++++++++ src/util/virsysinfo.h | 10 ++++ tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-smbios.xml | 5 ++ tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios.xml | 5 ++ 9 files changed, 158 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8dbea6af71..bd7c542173 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -411,6 +411,10 @@ <entry name='version'>0B98401 Pro</entry> <entry name='serial'>W1KS427111E</entry> </baseBoard> + <oemStrings> + <entry>myappname:some arbitrary data</entry> + <entry>otherappname:more arbitrary data</entry> + </oemStrings> </sysinfo> ...</pre> @@ -498,6 +502,15 @@ validation and <code>date</code> format checking, all values are passed as strings to the hypervisor driver. </dd> + <dt><code>oemStrings</code></dt> + <dd> + This is block 11 of SMBIOS. This element should appear once and + can have multiple <code>entry</code> child elements, each providing + arbitrary string data. There are no restrictions on what data can + be provided in the entries, however, if the data is intended to be + consumed by an application in the guest, it is recommended to use + the application name as a prefix in the string. + </dd> </dl> </dd> </dl> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 82fdfd5f73..98de7d2cb1 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4834,6 +4834,15 @@ </oneOrMore> </element> </zeroOrMore> + <optional> + <element name="oemStrings"> + <oneOrMore> + <element name="entry"> + <ref name="sysinfo-value"/> + </element> + </oneOrMore> + </element> + </optional> </interleave> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0e4f76f066..5d81fbb555 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14315,6 +14315,48 @@ virSysinfoBaseBoardParseXML(xmlXPathContextPtr ctxt, return ret; } +static int +virSysinfoOEMStringsParseXML(xmlNodePtr node, + xmlXPathContextPtr ctxt, + virSysinfoOEMStringsDefPtr *oem) +{ + int ret = -1; + virSysinfoOEMStringsDefPtr def; + xmlNodePtr *strings = NULL; + int nstrings; + size_t i; + + if (!virXMLNodeNameEqual(node, "oemStrings")) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("XML does not contain expected 'system' element")); + return ret; + } + + nstrings = virXPathNodeSet("./entry", ctxt, &strings); + if (nstrings < 0) + return -1; + if (nstrings == 0) + return 0; + + if (VIR_ALLOC(def) < 0) + goto cleanup; + + if (VIR_ALLOC_N(def->values, nstrings) < 0) + goto cleanup; + + def->nvalues = nstrings; + for (i = 0; i < nstrings; i++) + def->values[i] = virXMLNodeContentString(strings[i]); + + *oem = def; + def = NULL; + ret = 0; + cleanup: + VIR_FREE(strings); + virSysinfoOEMStringsDefFree(def); + return ret; +} + static virSysinfoDefPtr virSysinfoParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, @@ -14373,6 +14415,17 @@ virSysinfoParseXML(xmlNodePtr node, if (virSysinfoBaseBoardParseXML(ctxt, &def->baseBoard, &def->nbaseBoard) < 0) goto error; + /* Extract system related metadata */ + if ((tmpnode = virXPathNode("./oemStrings[1]", ctxt)) != NULL) { + oldnode = ctxt->node; + ctxt->node = tmpnode; + if (virSysinfoOEMStringsParseXML(tmpnode, ctxt, &def->oemStrings) < 0) { + ctxt->node = oldnode; + goto error; + } + ctxt->node = oldnode; + } + cleanup: VIR_FREE(type); return def; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 56729e4981..01fb8dff6e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6063,6 +6063,26 @@ qemuBuildSmbiosBaseBoardStr(virSysinfoBaseBoardDefPtr def) } +static char * +qemuBuildSmbiosOEMStringsStr(virSysinfoOEMStringsDefPtr def) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + size_t i; + + if (!def) + return NULL; + + virBufferAddLit(&buf, "type=11"); + + for (i = 0; i < def->nvalues; i++) { + virBufferAddLit(&buf, ",value="); + virQEMUBuildBufferEscapeComma(&buf, def->values[i]); + } + + return virBufferContentAndReset(&buf); +} + + static int qemuBuildSmbiosCommandLine(virCommandPtr cmd, virQEMUDriverPtr driver, @@ -6133,6 +6153,14 @@ qemuBuildSmbiosCommandLine(virCommandPtr cmd, virCommandAddArgList(cmd, "-smbios", smbioscmd, NULL); VIR_FREE(smbioscmd); } + + if (source->oemStrings) { + if (!(smbioscmd = qemuBuildSmbiosOEMStringsStr(source->oemStrings))) + return -1; + + virCommandAddArgList(cmd, "-smbios", smbioscmd, NULL); + VIR_FREE(smbioscmd); + } } return 0; diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index ab81b1f7f0..0ad3e6c70d 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -106,6 +106,18 @@ void virSysinfoBaseBoardDefClear(virSysinfoBaseBoardDefPtr def) VIR_FREE(def->location); } +void virSysinfoOEMStringsDefFree(virSysinfoOEMStringsDefPtr def) +{ + size_t i; + + if (def == NULL) + return; + + for (i = 0; i < def->nvalues; i++) + VIR_FREE(def->values[i]); + VIR_FREE(def->values); +} + /** * virSysinfoDefFree: * @def: a sysinfo structure @@ -155,6 +167,8 @@ void virSysinfoDefFree(virSysinfoDefPtr def) } VIR_FREE(def->memory); + virSysinfoOEMStringsDefFree(def->oemStrings); + VIR_FREE(def); } @@ -1263,6 +1277,24 @@ virSysinfoMemoryFormat(virBufferPtr buf, virSysinfoDefPtr def) } } +static void +virSysinfoOEMStringsFormat(virBufferPtr buf, virSysinfoOEMStringsDefPtr def) +{ + size_t i; + + if (!def) + return; + + virBufferAddLit(buf, "<oemStrings>\n"); + virBufferAdjustIndent(buf, 2); + for (i = 0; i < def->nvalues; i++) { + virBufferEscapeString(buf, "<entry>%s</entry>\n", + def->values[i]); + } + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "</oemStrings>\n"); +} + /** * virSysinfoFormat: * @buf: buffer to append output to (may use auto-indentation) @@ -1293,6 +1325,7 @@ virSysinfoFormat(virBufferPtr buf, virSysinfoDefPtr def) virSysinfoBaseBoardFormat(&childrenBuf, def->baseBoard, def->nbaseBoard); virSysinfoProcessorFormat(&childrenBuf, def); virSysinfoMemoryFormat(&childrenBuf, def); + virSysinfoOEMStringsFormat(&childrenBuf, def->oemStrings); virBufferAsprintf(buf, "<sysinfo type='%s'", type); if (virBufferUse(&childrenBuf)) { diff --git a/src/util/virsysinfo.h b/src/util/virsysinfo.h index 1e51d2cafa..ecb3a36eb8 100644 --- a/src/util/virsysinfo.h +++ b/src/util/virsysinfo.h @@ -98,6 +98,13 @@ struct _virSysinfoBaseBoardDef { /* XXX board type */ }; +typedef struct _virSysinfoOEMStringsDef virSysinfoOEMStringsDef; +typedef virSysinfoOEMStringsDef *virSysinfoOEMStringsDefPtr; +struct _virSysinfoOEMStringsDef { + size_t nvalues; + char **values; +}; + typedef struct _virSysinfoDef virSysinfoDef; typedef virSysinfoDef *virSysinfoDefPtr; struct _virSysinfoDef { @@ -114,6 +121,8 @@ struct _virSysinfoDef { size_t nmemory; virSysinfoMemoryDefPtr memory; + + virSysinfoOEMStringsDefPtr oemStrings; }; virSysinfoDefPtr virSysinfoRead(void); @@ -121,6 +130,7 @@ virSysinfoDefPtr virSysinfoRead(void); void virSysinfoBIOSDefFree(virSysinfoBIOSDefPtr def); void virSysinfoSystemDefFree(virSysinfoSystemDefPtr def); void virSysinfoBaseBoardDefClear(virSysinfoBaseBoardDefPtr def); +void virSysinfoOEMStringsDefFree(virSysinfoOEMStringsDefPtr def); void virSysinfoDefFree(virSysinfoDefPtr def); int virSysinfoFormat(virBufferPtr buf, virSysinfoDefPtr def) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args index 3d94a109f9..d27d436a3a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smbios.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-smbios.args @@ -17,6 +17,8 @@ serial=32dfcb37-5af1-552b-357c-be8c3aa38310,\ uuid=c7a5fdbd-edaf-9455-926a-d65c16db1809,sku=1234567890,family=Red Hat' \ -smbios 'type=2,manufacturer=Hewlett-Packard,product=0B4Ch,version=D,\ serial=CZC1065993,asset=CZC1065993,location=Upside down' \ +-smbios 'type=11,value=Hello,value=World,value=This is,,\ + more tricky value=escaped' \ -nographic \ -nodefaults \ -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml b/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml index c12477dcb5..319bdf61df 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml @@ -26,6 +26,11 @@ <entry name='asset'>CZC1065993</entry> <entry name='location'>Upside down</entry> </baseBoard> + <oemStrings> + <entry>Hello</entry> + <entry>World</entry> + <entry>This is, more tricky value=escaped</entry> + </oemStrings> </sysinfo> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios.xml index d21f6275f0..cbe616c7da 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios.xml @@ -26,6 +26,11 @@ <entry name='asset'>CZC1065993</entry> <entry name='location'>Upside down</entry> </baseBoard> + <oemStrings> + <entry>Hello</entry> + <entry>World</entry> + <entry>This is, more tricky value=escaped</entry> + </oemStrings> </sysinfo> <os> <type arch='i686' machine='pc'>hvm</type> -- 2.14.3

2 2

[libvirt] [PATCH 0/3] Couple of improvements
by Michal Privoznik 23 Nov '17

23 Nov '17

*** BLURB HERE *** Michal Privoznik (3): vsh: Make self-test more robust tools: Set CFLAGS for wireshark properly tools: Enable warnings for more binaries/libs tools/Makefile.am | 19 ++++++++++--------- tools/vsh.c | 29 ++++++++++++++++++++++------- 2 files changed, 32 insertions(+), 16 deletions(-) -- 2.13.6

3 10

[libvirt] [PATCH] nodedev: Restore setting of privileged
by John Ferlan 23 Nov '17

23 Nov '17

Commit id '36555364' removed the setting of the driver->privileged, which the udevProcessPCI would need in order to read the PCI device configs. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Not quite sure after seeing other issues how I missed this during review of the series to change the udev nodedev code to use a thread. I tripped across this while "investigating" a recurring issue I'm having with the udev code in an avocado nwfilter test where during a libvirtd restart the udev initialization "hangs" and cannot be killed resulting in a <defunct> process and the only recovery is reboot. Still trying to hack through that, but figured this should go into 3.10 at least. So far only 3.9 would be affected, but only to not get PCI device details. src/node_device/node_device_udev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 35df13b153..1e1b71742b 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1933,6 +1933,8 @@ nodeStateInitialize(bool privileged, return -1; } + driver->privileged = privileged; + if (!(driver->devs = virNodeDeviceObjListNew()) || !(priv = udevEventDataNew())) goto cleanup; -- 2.13.6

2 2

[libvirt] [PATCH 0/4] Convert virStoragePoolObj into virObjectLockable
by John Ferlan 23 Nov '17

23 Nov '17

Next in the push to get the storage pool objects to be more common is to use the virObjectLockable for the Pool objects. The patches describe the transformation. John Ferlan (4): storage: Introduce virStoragePoolObjEndAPI storage: Introduce virStoragePoolObjListForEach storage: Introduce virStoragePoolObjListSearch storage: Convert virStoragePoolObj into virObjectLockable src/conf/virstorageobj.c | 194 +++++++++++----- src/conf/virstorageobj.h | 27 ++- src/libvirt_private.syms | 5 +- src/storage/storage_backend_scsi.c | 2 +- src/storage/storage_driver.c | 446 +++++++++++++++++++------------------ src/test/test_driver.c | 158 +++++++------ tests/storagevolxml2argvtest.c | 4 +- 7 files changed, 476 insertions(+), 360 deletions(-) -- 2.13.6

2 10

[libvirt] [PATCH 0/3] qemu: Fix error reporting from QEMU log
by Jiri Denemark 23 Nov '17

23 Nov '17

Jiri Denemark (3): qemu: Properly skip "char device redirected to" in QEMU log vierror: Define VIR_ERROR_MAX_LENGTH macro qemu: Use the end of QEMU log for reporting errors src/qemu/qemu_process.c | 36 +++++++++++++++++++++++++++++++----- src/util/virerror.c | 6 +++--- src/util/virerror.h | 2 ++ 3 files changed, 36 insertions(+), 8 deletions(-) -- 2.15.0

2 4

[libvirt] [PATCH v2 0/5] qemu: Support setting NUMA distances
by Michal Privoznik 23 Nov '17

23 Nov '17

diff to v1: - Renamed & simplified function in 2/5 - Other small nits fixed as raised in review Michal Privoznik (5): virDomainNumaGetNodeDistance: Fix input arguments validation numa: Introduce virDomainNumaNodeDistanceIsUsingDefaults qemu_capabilities: Introcude QEMU_CAPS_NUMA_DIST qemu: Support setting NUMA distances news: Document which drivers support NUMA distances docs/formatdomain.html.in | 2 +- docs/news.xml | 2 +- src/conf/numa_conf.c | 25 ++++++++- src/conf/numa_conf.h | 4 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 5 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 39 ++++++++++++- .../caps_2.10.0-gicv2.aarch64.xml | 1 + .../caps_2.10.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + .../qemuxml2argv-numatune-distances.args | 63 +++++++++++++++++++++ .../qemuxml2argv-numatune-distances.xml | 65 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 + 16 files changed, 209 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-distances.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-distances.xml -- 2.13.6

2 6

[libvirt] Speak at FOSDEM18 Virt & IaaS Devroom!
by Stefan Hajnoczi 23 Nov '17

23 Nov '17

FOSDEM 2018 will be held in Brussels, Belgium on February 3 & 4, 2018. The Virt & Iaas Devroom is hosting talks on KVM, Libvirt, QEMU, OpenStack, and more. The submission deadline for talks is 1 December 2017. See the Call For Papers below for details. I hope to see you there! Stefan --- I am excited to announce that the call for proposals is now open for the Virtualization & IaaS devroom at the upcoming FOSDEM 2018, to be hosted on February 3 and 4, 2018. This year will mark FOSDEM’s 18th anniversary as one of the longest-running free and open source software developer events, attracting thousands of developers and users from all over the world. FOSDEM will be held once again in Brussels, Belgium, on February 3 & 4, 2018. This devroom is a collaborative effort, and is organized by dedicated folks from projects such as OpenStack, Xen Project, oVirt, QEMU, KVM, libvirt, and Foreman. We would like to invite all those who are involved in these fields to submit your proposals by December 1st, 2017. About the Devroom The Virtualization & IaaS devroom will feature session topics such as open source hypervisors and virtual machine managers such as Xen Project, KVM, bhyve, and VirtualBox, and Infrastructure-as-a-Service projects such as Apache CloudStack, OpenStack, oVirt, QEMU, OpenNebula, and Ganeti. This devroom will host presentations that focus on topics of shared interest, such as KVM; libvirt; shared storage; virtualized networking; cloud security; clustering and high availability; interfacing with multiple hypervisors; hyperconverged deployments; and scaling across hundreds or thousands of servers. Presentations in this devroom will be aimed at developers working on these platforms who are looking to collaborate and improve shared infrastructure or solve common problems. We seek topics that encourage dialog between projects and continued work post-FOSDEM. Important Dates Submission deadline: 01 December 2017 Acceptance notifications: 14 December 2017 Final schedule announcement: 21 December 2017 Devroom: 03 and 04 February 2018 (two days- different rooms) Submit Your Proposal All submissions must be made via the Pentabarf event planning site[1]. If you have not used Pentabarf before, you will need to create an account. If you submitted proposals for FOSDEM in previous years, you can use your existing account. After creating the account, select Create Event to start the submission process. Make sure to select Virtualization and IaaS devroom from the Track list. Please fill out all the required fields, and provide a meaningful abstract and description of your proposed session. Submission Guidelines We expect more proposals than we can possibly accept, so it is vitally important that you submit your proposal on or before the deadline. Late submissions are unlikely to be considered. All presentation slots are 45 minutes, with 35 minutes planned for presentations, and 10 minutes for Q&A. All presentations will be recorded and made available under Creative Commons licenses. In the Submission notes field, please indicate that you agree that your presentation will be licensed under the CC-By-SA-4.0 or CC-By-4.0 license and that you agree to have your presentation recorded. For example: "If my presentation is accepted for FOSDEM, I hereby agree to license all recordings, slides, and other associated materials under the Creative Commons Attribution Share-Alike 4.0 International License. Sincerely, <NAME>." In the Submission notes field, please also confirm that if your talk is accepted, you will be able to attend FOSDEM and deliver your presentation. We will not consider proposals from prospective speakers who are unsure whether they will be able to secure funds for travel and lodging to attend FOSDEM. (Sadly, we are not able to offer travel funding for prospective speakers.) Speaker Mentoring Program As a part of the rising efforts to grow our communities and encourage a diverse and inclusive conference ecosystem, we're happy to announce that we'll be offering mentoring for new speakers. Our mentors can help you with tasks such as reviewing your abstract, reviewing your presentation outline or slides, or practicing your talk with you. You may apply to the mentoring program as a newcomer speaker if you: Never presented before or Presented only lightning talks or Presented full-length talks at small meetups (<50 ppl) Submission Guidelines Mentored presentations will have 25-minute slots, where 20 minutes will include the presentation and 5 minutes will be reserved for questions. The number of newcomer session slots is limited, so we will probably not be able to accept all applications. You must submit your talk and abstract to apply for the mentoring program, our mentors are volunteering their time and will happily provide feedback but won't write your presentation for you! If you are experiencing problems with Pentabarf, the proposal submission interface, or have other questions, you can email our devroom mailing list[2] and we will try to help you. How to Apply In addition to agreeing to video recording and confirming that you can attend FOSDEM in case your session is accepted, please write "speaker mentoring program application" in the "Submission notes" field, and list any prior speaking experience or other relevant information for your application. Call for Mentors Interested in mentoring newcomer speakers? We'd love to have your help! Please email iaas-virt-devroom at lists.fosdem.org with a short speaker biography and any specific fields of expertise (for example, KVM, OpenStack, storage, etc.) so that we can match you with a newcomer speaker from a similar field. Estimated time investment can be as low as a 5-10 hours in total, usually distributed weekly or bi-weekly. Never mentored a newcomer speaker but interested to try? As the mentoring program coordinator, email Brian Proffitt[3] and he will be happy to answer your questions! Code of Conduct Following the release of the updated code of conduct for FOSDEM, we'd like to remind all speakers and attendees that all of the presentations and discussions in our devroom are held under the guidelines set in the CoC and we expect attendees, speakers, and volunteers to follow the CoC at all times. If you submit a proposal and it is accepted, you will be required to confirm that you accept the FOSDEM CoC. If you have any questions about the CoC or wish to have one of the devroom organizers review your presentation slides or any other content for CoC compliance, please email us and we will do our best to assist you. Call for Volunteers We are also looking for volunteers to help run the devroom. We need assistance watching time for the speakers, and helping with video for the devroom. Please contact me, Brian Proffitt, for more information. Questions? If you have any questions about this devroom, please send your questions to our devroom mailing list. You can also subscribe to the list to receive updates about important dates, session announcements, and to connect with other attendees. See you all at FOSDEM! [1] <https://penta.fosdem.org/submission/FOSDEM18> https://penta.fosdem.org/submission/FOSDEM18 [2] iaas-virt-devroom at lists.fosdem.org <https://lists.fosdem.org/listinfo/fosdem> [3] bkp at redhat.com

1 0

[libvirt] [PATCH] util: Fix leak in virStringTrimOptionalNewline
by Martin Kletzander 23 Nov '17

23 Nov '17

Do not access any data if strlen() == 0. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virstring.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/util/virstring.c b/src/util/virstring.c index eac4774b533e..b2ebce27ff49 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1394,9 +1394,13 @@ virStringEncodeBase64(const uint8_t *buf, size_t buflen) */ void virStringTrimOptionalNewline(char *str) { - char *tmp = str + strlen(str) - 1; - if (*tmp == '\n') - *tmp = '\0'; + size_t len = strlen(str); + + if (!len) + return; + + if (str[len - 1] == '\n') + str[len - 1] = '\0'; } -- 2.15.0

2 1

[libvirt] [PATCH v2 0/9] qemu: command: Refactor handling of disk drive arguments (blockdev-add saga)
by Peter Krempa 22 Nov '17

22 Nov '17

Version 2 only prepares for the move of the arguments to -device which will be used together with -blockdev rather than switching right away. This will prevent breaking old qemu support since individual parameters were moved to -device in separate instances. Peter Krempa (9): qemu: command: Split out geometry frontend attribute formatting from -drive tests: qemuxml2xml: Run the 'disk-serial' test tests: qemuxml2argv: Test SD card with serial number qemu: command: Move disk 'serial' into frontend parameter formatter qemu: command: Move around order of generating -drive arguments qemu: command: Refactor logic when formatting -drive qemu: command: Move disk trhottling argument building into a separate function qemu: command: Move formatting of disk io error policy from -drive qemu: command: Anotate formatting of the frontend attributes with -drive src/qemu/qemu_command.c | 241 ++++++++++++--------- .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 2 +- .../qemuxml2argv-boot-complex-bootindex.args | 2 +- .../qemuxml2argv-boot-complex.args | 2 +- ...xml2argv-boot-menu-disable-drive-bootindex.args | 2 +- .../qemuxml2argv-boot-menu-disable-drive.args | 2 +- .../qemuxml2argv-boot-menu-disable.args | 2 +- .../qemuxml2argv-boot-menu-enable-bootindex.args | 2 +- ...qemuxml2argv-boot-menu-enable-with-timeout.args | 2 +- .../qemuxml2argv-boot-menu-enable.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-order.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-strict.args | 2 +- .../qemuxml2argv-controller-order.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 4 +- .../qemuxml2argv-disk-cdrom-empty.args | 2 +- .../qemuxml2argv-disk-cdrom-network-ftp.args | 2 +- .../qemuxml2argv-disk-cdrom-network-ftps.args | 2 +- .../qemuxml2argv-disk-cdrom-network-http.args | 2 +- .../qemuxml2argv-disk-cdrom-network-https.args | 2 +- .../qemuxml2argv-disk-cdrom-network-tftp.args | 2 +- ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 2 +- .../qemuxml2argv-disk-cdrom-tray.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 2 +- .../qemuxml2argv-disk-copy_on_read.args | 2 +- .../qemuxml2argv-disk-drive-boot-cdrom.args | 4 +- .../qemuxml2argv-disk-drive-boot-disk.args | 4 +- .../qemuxml2argv-disk-drive-cache-directsync.args | 4 +- .../qemuxml2argv-disk-drive-cache-unsafe.args | 4 +- .../qemuxml2argv-disk-drive-cache-v2-none.args | 4 +- .../qemuxml2argv-disk-drive-cache-v2-wb.args | 4 +- .../qemuxml2argv-disk-drive-cache-v2-wt.args | 4 +- .../qemuxml2argv-disk-drive-detect-zeroes.args | 2 +- .../qemuxml2argv-disk-drive-discard.args | 2 +- ...uxml2argv-disk-drive-error-policy-enospace.args | 6 +- .../qemuxml2argv-disk-drive-error-policy-stop.args | 6 +- ...gv-disk-drive-error-policy-wreport-rignore.args | 6 +- .../qemuxml2argv-disk-drive-fmt-qcow.args | 4 +- .../qemuxml2argv-disk-drive-no-boot.args | 4 +- .../qemuxml2argv-disk-drive-readonly-disk.args | 2 +- ...qemuxml2argv-disk-drive-readonly-no-device.args | 2 +- .../qemuxml2argv-disk-drive-shared.args | 4 +- .../qemuxml2argv-disk-ioeventfd.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-order.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-disk-serial.args | 1 + .../qemuxml2argvdata/qemuxml2argv-disk-serial.xml | 5 + .../qemuxml2argv-disk-snapshot.args | 4 +- .../qemuxml2argv-disk-source-pool-mode.args | 12 +- .../qemuxml2argv-disk-source-pool.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 2 +- .../qemuxml2argv-graphics-spice-timeout.args | 2 +- .../qemuxml2argv-hugepages-numa.args | 2 +- .../qemuxml2argv-pci-autoadd-addr.args | 4 +- .../qemuxml2argv-pci-autoadd-idx.args | 4 +- .../qemuxml2argv-pci-autofill-addr.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-pci-bridge.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-pci-many.args | 4 +- .../qemuxml2argv-user-aliases.args | 2 +- .../qemuxml2xmlout-disk-serial.xml | 47 ++++ tests/qemuxml2xmltest.c | 2 + 61 files changed, 280 insertions(+), 192 deletions(-) create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-serial.xml -- 2.14.3

2 10

[libvirt] [PATCH] qemu: domain: Don't call namespace setup for storage already accessed by vm
by Peter Krempa 22 Nov '17

22 Nov '17

When doing block commit we need to allow write for members of the backing chain so that we can commit the data into them. qemuDomainDiskChainElementPrepare was used for this which since commit 786d8d91b4 calls qemuDomainNamespaceSetupDisk which has very adverse side-effects, namely it relabels the nodes to the same label it has in the main namespace. This was messing up permissions for the commit operation since its touching various parts of a single backing chain. Since we are are actually not introducing new images at that point add a flag for qemuDomainDiskChainElementPrepare which will refrain from calling to the namespace setup function. Calls from qemuDomainSnapshotCreateSingleDiskActive and qemuDomainBlockCopyCommon do introduce new members all calls from qemuDomainBlockCommit do not, so the calls are anotated accordingly. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1506072 --- src/qemu/qemu_domain.c | 17 ++++++++++++++--- src/qemu/qemu_domain.h | 3 ++- src/qemu/qemu_driver.c | 12 ++++++------ 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index cc7596bad1..f12450cc69 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6146,15 +6146,25 @@ qemuDomainDiskChainElementRevoke(virQEMUDriverPtr driver, /** * qemuDomainDiskChainElementPrepare: + * @driver: qemu driver data + * @vm: domain object + * @elem: source structure to set access for + * @readonly: setup read-only access if true + * @newSource: @elem describes a storage source which @vm can't access yet * * Allow a VM access to a single element of a disk backing chain; this helper * ensures that the lock manager, cgroup device controller, and security manager - * labelling are all aware of each new file before it is added to a chain */ + * labelling are all aware of each new file before it is added to a chain. + * + * When modifying permissions of @elem which @vm can already access (is in the + * backing chain) @newSource needs to be set to false. + */ int qemuDomainDiskChainElementPrepare(virQEMUDriverPtr driver, virDomainObjPtr vm, virStorageSourcePtr elem, - bool readonly) + bool readonly, + bool newSource) { bool was_readonly = elem->readonly; virQEMUDriverConfigPtr cfg = NULL; @@ -6167,7 +6177,8 @@ qemuDomainDiskChainElementPrepare(virQEMUDriverPtr driver, if (virDomainLockImageAttach(driver->lockManager, cfg->uri, vm, elem) < 0) goto cleanup; - if (qemuDomainNamespaceSetupDisk(driver, vm, elem) < 0) + if (newSource && + qemuDomainNamespaceSetupDisk(driver, vm, elem) < 0) goto cleanup; if (qemuSetupImageCgroup(vm, elem) < 0) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index e021da51fc..9066f5d0f5 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -689,7 +689,8 @@ void qemuDomainDiskChainElementRevoke(virQEMUDriverPtr driver, int qemuDomainDiskChainElementPrepare(virQEMUDriverPtr driver, virDomainObjPtr vm, virStorageSourcePtr elem, - bool readonly); + bool readonly, + bool newSource); int qemuDomainCleanupAdd(virDomainObjPtr vm, qemuDomainCleanupCallback cb); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3a0e3b6cec..809863be57 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14570,7 +14570,7 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver, } /* set correct security, cgroup and locking options on the new image */ - if (qemuDomainDiskChainElementPrepare(driver, vm, dd->src, false) < 0) { + if (qemuDomainDiskChainElementPrepare(driver, vm, dd->src, false, true) < 0) { qemuDomainDiskChainElementRevoke(driver, vm, dd->src); goto cleanup; } @@ -17165,7 +17165,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, keepParentLabel) < 0) goto endjob; - if (qemuDomainDiskChainElementPrepare(driver, vm, mirror, false) < 0) { + if (qemuDomainDiskChainElementPrepare(driver, vm, mirror, false, true) < 0) { qemuDomainDiskChainElementRevoke(driver, vm, mirror); goto endjob; } @@ -17558,9 +17558,9 @@ qemuDomainBlockCommit(virDomainPtr dom, * operation succeeds, but doing that requires tracking the * operation in XML across libvirtd restarts. */ clean_access = true; - if (qemuDomainDiskChainElementPrepare(driver, vm, baseSource, false) < 0 || + if (qemuDomainDiskChainElementPrepare(driver, vm, baseSource, false, false) < 0 || (top_parent && top_parent != disk->src && - qemuDomainDiskChainElementPrepare(driver, vm, top_parent, false) < 0)) + qemuDomainDiskChainElementPrepare(driver, vm, top_parent, false, false) < 0)) goto endjob; /* Start the commit operation. Pass the user's original spelling, @@ -17604,9 +17604,9 @@ qemuDomainBlockCommit(virDomainPtr dom, if (ret < 0 && clean_access) { virErrorPtr orig_err = virSaveLastError(); /* Revert access to read-only, if possible. */ - qemuDomainDiskChainElementPrepare(driver, vm, baseSource, true); + qemuDomainDiskChainElementPrepare(driver, vm, baseSource, true, false); if (top_parent && top_parent != disk->src) - qemuDomainDiskChainElementPrepare(driver, vm, top_parent, true); + qemuDomainDiskChainElementPrepare(driver, vm, top_parent, true, false); if (orig_err) { virSetError(orig_err); -- 2.14.3

2 1

[libvirt] [PATCH 0/5] qemu: Support setting NUMA distances
by Michal Privoznik 22 Nov '17

22 Nov '17

Now that XML parsing & formatting is merged this is fairly trivial. Michal Privoznik (5): virDomainNumaGetNodeDistance: Fix input arguments validation numa: Introduce virDomainNumaNodeDistanceSpecified qemu_capabilities: Introcude QEMU_CAPS_NUMA_DIST qemu: Support setting NUMA distances news: Document which drivers support NUMA distances docs/news.xml | 2 +- src/conf/numa_conf.c | 15 ++++- src/conf/numa_conf.h | 4 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 5 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 36 +++++++++++- .../caps_2.10.0-gicv2.aarch64.xml | 1 + .../caps_2.10.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + .../qemuxml2argv-numatune-distances.args | 63 +++++++++++++++++++++ .../qemuxml2argv-numatune-distances.xml | 65 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 + 15 files changed, 196 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-distances.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-distances.xml -- 2.13.6

3 18

[libvirt] [PATCH] virsh: domifstat: clarify description of --help option
by ZhiPeng Lu 22 Nov '17

22 Nov '17

<interface-device> can be the interface target by name or MAC address. So clarify description of --help option Signed-off-by:ZhiPeng Lu <lu.zhipeng(a)zte.com.cn> --- tools/virsh-domain-monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 960fd37..4e8fc46 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -995,7 +995,7 @@ static const vshCmdOptDef opts_domifstat[] = { {.name = "interface", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, - .help = N_("interface device") + .help = N_("interface device (MAC Address)") }, {.name = NULL} }; -- 1.8.3.1

2 1

[libvirt] [PATCH 00/11] qemu: Fix <shareable/> disks for new qemu
by Peter Krempa 22 Nov '17

22 Nov '17

Introduction of the disk image locking in qemu created a regression where disk shared access with <shareable/> would not work. Since the disk locking is a desired feature, allow libvirt to configure qemu in such way that <shareable/> disks are exempt from write locks. First few patches refactor some stuff so that it's less ugly. This series also mandates that sharing is used only with 'raw' disks since other formats could corrupt metadata. Peter Krempa (11): qemu: Move snapshot disk validation functions into one qemu: domain: Despaghetify qemuDomainDeviceDefValidate qemu: domain: Move hostdev validation into separate function qemu: domain: Move video device validation into separate function qemu: domain: Refactor domain device validation function qemu: block: Add function to check if storage source allows concurrent access qemu: domain: Reject shared disk access if backing format does not support it qemu: snapshot: Disallow snapshot of unsupported shared disks qemu: Disallow pivot of shared disks to unsupported storage qemu: caps: Add capability for 'share-rw' disk option qemu: command: Mark <shared/> disks as such in qemu src/qemu/qemu_block.c | 15 ++ src/qemu/qemu_block.h | 3 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 4 + src/qemu/qemu_domain.c | 291 +++++++++++++-------- src/qemu/qemu_driver.c | 121 +++++---- .../caps_2.10.0-gicv2.aarch64.xml | 1 + .../caps_2.10.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../qemuxml2argv-disk-drive-shared-locking.args | 28 ++ .../qemuxml2argv-disk-drive-shared-locking.xml | 36 +++ .../qemuxml2argv-disk-drive-shared-qcow.xml | 28 ++ .../qemuxml2argv-disk-drive-shared.args | 2 +- .../qemuxml2argv-disk-drive-shared.xml | 2 +- tests/qemuxml2argvtest.c | 3 + 19 files changed, 378 insertions(+), 164 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared-locking.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared-locking.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared-qcow.xml -- 2.14.3

1 12

[libvirt] [PATCH] build: Fix make dist
by Martin Kletzander 22 Nov '17

22 Nov '17

Since we don't pack symlinks we cannot have recursive loops in them. Since we need one directory to be in tests/vircaps2xmldata/linux-caches/, instead of creating a symlink, just move the files in that directory and adjust tests. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed under the build-breaker rule tests/vircaps2xmldata/linux-caches/system | 1 - .../linux-caches/{ => system}/cpu/cpu0/cache/index0/id | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index0/level | 0 .../{ => system}/cpu/cpu0/cache/index0/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index0/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index0/size | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index0/type | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index1/id | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index1/level | 0 .../{ => system}/cpu/cpu0/cache/index1/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index1/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index1/size | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index1/type | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index2/id | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index2/level | 0 .../{ => system}/cpu/cpu0/cache/index2/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index2/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index2/size | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index2/type | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index3/id | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index3/level | 0 .../{ => system}/cpu/cpu0/cache/index3/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index3/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index3/size | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index3/type | 0 .../linux-caches/{ => system}/cpu/cpu0/topology/core_id | 0 .../linux-caches/{ => system}/cpu/cpu0/topology/core_siblings | 0 .../linux-caches/{ => system}/cpu/cpu0/topology/core_siblings_list | 0 .../{ => system}/cpu/cpu0/topology/physical_package_id | 0 .../linux-caches/{ => system}/cpu/cpu0/topology/thread_siblings | 0 .../{ => system}/cpu/cpu0/topology/thread_siblings_list | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index0/id | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index0/level | 0 .../{ => system}/cpu/cpu1/cache/index0/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index0/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index0/size | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index0/type | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index1/id | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index1/level | 0 .../{ => system}/cpu/cpu1/cache/index1/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index1/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index1/size | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index1/type | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index2/id | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index2/level | 0 .../{ => system}/cpu/cpu1/cache/index2/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index2/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index2/size | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index2/type | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index3/id | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index3/level | 0 .../{ => system}/cpu/cpu1/cache/index3/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index3/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index3/size | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index3/type | 0 .../linux-caches/{ => system}/cpu/cpu1/topology/core_id | 0 .../linux-caches/{ => system}/cpu/cpu1/topology/core_siblings | 0 .../linux-caches/{ => system}/cpu/cpu1/topology/core_siblings_list | 0 .../{ => system}/cpu/cpu1/topology/physical_package_id | 0 .../linux-caches/{ => system}/cpu/cpu1/topology/thread_siblings | 0 .../{ => system}/cpu/cpu1/topology/thread_siblings_list | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index0/id | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index0/level | 0 .../{ => system}/cpu/cpu2/cache/index0/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index0/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index0/size | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index0/type | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index1/id | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index1/level | 0 .../{ => system}/cpu/cpu2/cache/index1/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index1/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index1/size | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index1/type | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index2/id | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index2/level | 0 .../{ => system}/cpu/cpu2/cache/index2/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index2/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index2/size | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index2/type | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index3/id | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index3/level | 0 .../{ => system}/cpu/cpu2/cache/index3/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index3/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index3/size | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index3/type | 0 .../linux-caches/{ => system}/cpu/cpu2/topology/core_id | 0 .../linux-caches/{ => system}/cpu/cpu2/topology/core_siblings | 0 .../linux-caches/{ => system}/cpu/cpu2/topology/core_siblings_list | 0 .../{ => system}/cpu/cpu2/topology/physical_package_id | 0 .../linux-caches/{ => system}/cpu/cpu2/topology/thread_siblings | 0 .../{ => system}/cpu/cpu2/topology/thread_siblings_list | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index0/id | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index0/level | 0 .../{ => system}/cpu/cpu3/cache/index0/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index0/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index0/size | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index0/type | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index1/id | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index1/level | 0 .../{ => system}/cpu/cpu3/cache/index1/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index1/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index1/size | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index1/type | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index2/id | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index2/level | 0 .../{ => system}/cpu/cpu3/cache/index2/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index2/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index2/size | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index2/type | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index3/id | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index3/level | 0 .../{ => system}/cpu/cpu3/cache/index3/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index3/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index3/size | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index3/type | 0 .../linux-caches/{ => system}/cpu/cpu3/topology/core_id | 0 .../linux-caches/{ => system}/cpu/cpu3/topology/core_siblings | 0 .../linux-caches/{ => system}/cpu/cpu3/topology/core_siblings_list | 0 .../{ => system}/cpu/cpu3/topology/physical_package_id | 0 .../linux-caches/{ => system}/cpu/cpu3/topology/thread_siblings | 0 .../{ => system}/cpu/cpu3/topology/thread_siblings_list | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index0/id | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index0/level | 0 .../{ => system}/cpu/cpu4/cache/index0/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index0/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index0/size | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index0/type | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index1/id | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index1/level | 0 .../{ => system}/cpu/cpu4/cache/index1/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index1/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index1/size | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index1/type | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index2/id | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index2/level | 0 .../{ => system}/cpu/cpu4/cache/index2/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index2/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index2/size | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index2/type | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index3/id | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index3/level | 0 .../{ => system}/cpu/cpu4/cache/index3/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index3/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index3/size | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index3/type | 0 .../linux-caches/{ => system}/cpu/cpu4/topology/core_id | 0 .../linux-caches/{ => system}/cpu/cpu4/topology/core_siblings | 0 .../linux-caches/{ => system}/cpu/cpu4/topology/core_siblings_list | 0 .../{ => system}/cpu/cpu4/topology/physical_package_id | 0 .../linux-caches/{ => system}/cpu/cpu4/topology/thread_siblings | 0 .../{ => system}/cpu/cpu4/topology/thread_siblings_list | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index0/id | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index0/level | 0 .../{ => system}/cpu/cpu5/cache/index0/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index0/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index0/size | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index0/type | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index1/id | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index1/level | 0 .../{ => system}/cpu/cpu5/cache/index1/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index1/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index1/size | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index1/type | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index2/id | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index2/level | 0 .../{ => system}/cpu/cpu5/cache/index2/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index2/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index2/size | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index2/type | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index3/id | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index3/level | 0 .../{ => system}/cpu/cpu5/cache/index3/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index3/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index3/size | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index3/type | 0 .../linux-caches/{ => system}/cpu/cpu5/topology/core_id | 0 .../linux-caches/{ => system}/cpu/cpu5/topology/core_siblings | 0 .../linux-caches/{ => system}/cpu/cpu5/topology/core_siblings_list | 0 .../{ => system}/cpu/cpu5/topology/physical_package_id | 0 .../linux-caches/{ => system}/cpu/cpu5/topology/thread_siblings | 0 .../{ => system}/cpu/cpu5/topology/thread_siblings_list | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index0/id | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index0/level | 0 .../{ => system}/cpu/cpu6/cache/index0/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index0/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index0/size | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index0/type | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index1/id | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index1/level | 0 .../{ => system}/cpu/cpu6/cache/index1/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index1/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index1/size | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index1/type | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index2/id | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index2/level | 0 .../{ => system}/cpu/cpu6/cache/index2/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index2/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index2/size | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index2/type | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index3/id | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index3/level | 0 .../{ => system}/cpu/cpu6/cache/index3/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index3/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index3/size | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index3/type | 0 .../linux-caches/{ => system}/cpu/cpu6/topology/core_id | 0 .../linux-caches/{ => system}/cpu/cpu6/topology/core_siblings | 0 .../linux-caches/{ => system}/cpu/cpu6/topology/core_siblings_list | 0 .../{ => system}/cpu/cpu6/topology/physical_package_id | 0 .../linux-caches/{ => system}/cpu/cpu6/topology/thread_siblings | 0 .../{ => system}/cpu/cpu6/topology/thread_siblings_list | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index0/id | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index0/level | 0 .../{ => system}/cpu/cpu7/cache/index0/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index0/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index0/size | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index0/type | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index1/id | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index1/level | 0 .../{ => system}/cpu/cpu7/cache/index1/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index1/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index1/size | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index1/type | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index2/id | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index2/level | 0 .../{ => system}/cpu/cpu7/cache/index2/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index2/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index2/size | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index2/type | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index3/id | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index3/level | 0 .../{ => system}/cpu/cpu7/cache/index3/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index3/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index3/size | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index3/type | 0 .../linux-caches/{ => system}/cpu/cpu7/topology/core_id | 0 .../linux-caches/{ => system}/cpu/cpu7/topology/core_siblings | 0 .../linux-caches/{ => system}/cpu/cpu7/topology/core_siblings_list | 0 .../{ => system}/cpu/cpu7/topology/physical_package_id | 0 .../linux-caches/{ => system}/cpu/cpu7/topology/thread_siblings | 0 .../{ => system}/cpu/cpu7/topology/thread_siblings_list | 0 tests/vircaps2xmldata/linux-caches/{ => system}/cpu/kernel_max | 0 tests/vircaps2xmldata/linux-caches/{ => system}/cpu/online | 0 tests/vircaps2xmldata/linux-caches/{ => system}/cpu/present | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu0 | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu1 | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu2 | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu3 | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu4 | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu5 | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu6 | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu7 | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpulist | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/meminfo | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/online | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/possible | 0 tests/vircaps2xmltest.c | 7 ++++--- 257 files changed, 4 insertions(+), 4 deletions(-) delete mode 120000 tests/vircaps2xmldata/linux-caches/system rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index0/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index0/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index0/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index0/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index0/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index0/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index1/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index1/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index1/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index1/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index1/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index1/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index2/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index2/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index2/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index2/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index2/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index2/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index3/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index3/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index3/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index3/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index3/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index3/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/topology/core_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index0/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index0/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index0/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index0/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index0/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index0/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index1/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index1/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index1/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index1/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index1/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index1/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index2/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index2/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index2/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index2/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index2/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index2/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index3/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index3/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index3/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index3/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index3/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index3/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/topology/core_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index0/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index0/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index0/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index0/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index0/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index0/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index1/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index1/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index1/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index1/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index1/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index1/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index2/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index2/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index2/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index2/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index2/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index2/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index3/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index3/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index3/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index3/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index3/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index3/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/topology/core_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index0/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index0/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index0/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index0/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index0/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index0/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index1/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index1/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index1/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index1/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index1/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index1/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index2/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index2/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index2/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index2/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index2/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index2/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index3/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index3/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index3/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index3/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index3/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index3/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/topology/core_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index0/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index0/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index0/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index0/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index0/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index0/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index1/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index1/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index1/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index1/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index1/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index1/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index2/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index2/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index2/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index2/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index2/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index2/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index3/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index3/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index3/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index3/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index3/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index3/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/topology/core_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index0/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index0/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index0/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index0/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index0/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index0/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index1/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index1/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index1/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index1/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index1/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index1/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index2/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index2/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index2/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index2/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index2/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index2/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index3/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index3/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index3/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index3/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index3/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index3/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/topology/core_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index0/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index0/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index0/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index0/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index0/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index0/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index1/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index1/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index1/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index1/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index1/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index1/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index2/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index2/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index2/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index2/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index2/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index2/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index3/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index3/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index3/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index3/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index3/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index3/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/topology/core_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index0/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index0/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index0/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index0/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index0/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index0/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index1/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index1/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index1/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index1/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index1/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index1/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index2/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index2/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index2/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index2/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index2/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index2/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index3/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index3/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index3/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index3/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index3/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index3/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/topology/core_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/kernel_max (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/online (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/present (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu0 (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu1 (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu2 (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu3 (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu4 (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu5 (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu6 (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu7 (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpulist (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/meminfo (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/online (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/possible (100%) diff --git a/tests/vircaps2xmldata/linux-caches/system b/tests/vircaps2xmldata/linux-caches/system deleted file mode 120000 index 945c9b46d684..000000000000 --- a/tests/vircaps2xmldata/linux-caches/system +++ /dev/null @@ -1 +0,0 @@ -. \ No newline at end of file diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/core_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/core_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/physical_package_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/thread_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/core_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/core_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/physical_package_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/thread_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/core_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/core_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/physical_package_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/thread_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/core_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/core_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/physical_package_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/thread_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/core_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/core_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/physical_package_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/thread_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/core_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/core_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/physical_package_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/thread_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/core_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/core_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/physical_package_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/thread_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/core_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/core_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/physical_package_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/thread_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/kernel_max b/tests/vircaps2xmldata/linux-caches/system/cpu/kernel_max similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/kernel_max rename to tests/vircaps2xmldata/linux-caches/system/cpu/kernel_max diff --git a/tests/vircaps2xmldata/linux-caches/cpu/online b/tests/vircaps2xmldata/linux-caches/system/cpu/online similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/online rename to tests/vircaps2xmldata/linux-caches/system/cpu/online diff --git a/tests/vircaps2xmldata/linux-caches/cpu/present b/tests/vircaps2xmldata/linux-caches/system/cpu/present similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/present rename to tests/vircaps2xmldata/linux-caches/system/cpu/present diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu0 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu0 similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu0 rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu0 diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu1 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu1 similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu1 rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu1 diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu2 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu2 similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu2 rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu2 diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu3 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu3 similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu3 rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu3 diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu4 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu4 similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu4 rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu4 diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu5 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu5 similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu5 rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu5 diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu6 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu6 similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu6 rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu6 diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu7 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu7 similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu7 rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu7 diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpulist b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpulist similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/node0/cpulist rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpulist diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/meminfo b/tests/vircaps2xmldata/linux-caches/system/node/node0/meminfo similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/node0/meminfo rename to tests/vircaps2xmldata/linux-caches/system/node/node0/meminfo diff --git a/tests/vircaps2xmldata/linux-caches/node/online b/tests/vircaps2xmldata/linux-caches/system/node/online similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/online rename to tests/vircaps2xmldata/linux-caches/system/node/online diff --git a/tests/vircaps2xmldata/linux-caches/node/possible b/tests/vircaps2xmldata/linux-caches/system/node/possible similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/possible rename to tests/vircaps2xmldata/linux-caches/system/node/possible diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index 12c43f42c6b9..ede546825edc 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -111,12 +111,13 @@ mymain(void) ret = -1; \ } while (0) -#define DO_TEST(filename, arch) DO_TEST_FULL(filename, arch, true, true, false) - DO_TEST_FULL("basic", VIR_ARCH_X86_64, false, false, false); DO_TEST_FULL("basic", VIR_ARCH_AARCH64, true, false, false); - DO_TEST("caches", VIR_ARCH_X86_64); + /* We say there is 'resctrl' even though there is none. This is special + * case because we want to use this test data for a negative tests for + * resctrl. */ + DO_TEST_FULL("caches", VIR_ARCH_X86_64, true, true, true); DO_TEST_FULL("resctrl", VIR_ARCH_X86_64, true, true, true); DO_TEST_FULL("resctrl-cdp", VIR_ARCH_X86_64, true, true, true); -- 2.15.0

1 0

[libvirt] Set allmulticast automatically on macvtap interfaces
by Marc Haber 22 Nov '17

22 Nov '17

Hi, the easiest way to connect a domain to a network is a macvtap interface with the following XML code: <interface type='direct'> <mac address='52:54:00:fb:de:4d'/> <source dev='int181' mode='bridge'/> <target dev='macvtap1'/> <model type='virtio'/> <alias name='net0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> This makes everything work but incoming IPv6, which relies on multicast, which is filtered by the macvtap interface by default. I need to do "ip link set dev macvtap1 allmulticast on" on the host after starting the domain to make incoming IPv6 work. >From reading the docs, I guess that setting the interface's trustGuestRxFilters attribute to yes would help here. However, https://libvirt.org/formatdomain.html#elementsNICS says If the model type is set to virtio and interface's trustGuestRxFilters attribute is set to yes, changes made to the interface mac address, unicast/multicast receive filters, and vlan settings in the guest will be monitored and propagated to the associated macvtap device on the host Does that mean that the guest will be able to change its VLAN to any other VLAN that is present on the host? Or am I misunderstanding things here? Assuming that trustGuestRxFilters is the right thing to do and that it does not open myself to blatant security issues, how would I set that from virt-manager? Greetings Marc -- ----------------------------------------------------------------------------- Marc Haber | "I don't trust Computers. They | Mailadresse im Header Leimen, Germany | lose things." Winona Ryder | Fon: *49 6224 1600402 Nordisch by Nature | How to make an American Quilt | Fax: *49 6224 1600421

1 0

[libvirt] [RFC] externall (pull) backup API
by Nikolay Shirokovskiy 22 Nov '17

22 Nov '17

Table of contents. I Preface 1. Fleece API 2. Export API 3. Incremental backups 4. Other hypervisors II Links I Preface This is a RFC for external (or pull) backup API in libvirt. There was a series [1] with more limited API scope and functionality for this kind of backup API. Besides other issues the series was abandoned as qemu blockdev-del command has experimental status at that time. There is also a long pending RFC series for internal (or push) backup API [2] which however has not much in comman with this RFC. Also there is RFC with overall agreement to having a backup API in libvirt [3]. The aim of external backup API is to provide means for 3d party application to read/write domain disks as block devices for the purpuse of backup. Disk is read on backup operation and in case of active domain is presented at some point in time (preferable in some guest consistent state). Disk is written on restore operation. As to providing disk state at some point in time one can use existing disks snapshots for this purpose. However this RFC introduces API to leverage image fleecing (blockdev-backup command) instead. Image fleecing is somewhat inverse to snapshots. In case of snapshots writes go to top image thus backing image stays constant, in case of fleecing writes go to same image as before but old data is previously popped out to fleece image which have original image as backing. As a result fleece image became disk snapshot. Another task of this API is to provide disks for read/write operations. One could try to leverage libvirt stream API for this purpose but AFAIK clients want random access to disks data which is not what stream API suitable for. I'm not sure what is costs of adding block API to libvirt, particularly what it costs to make it effective implementation at RPC level thus this RFC add means to export disks data thru existing block interfaces. For qemu it is NBD. 1. Fleece API So the below API is to provide means to start/stop/query disk image fleecing. I use BlockSnaphost name for this operation. Other options are Fleecing, BlockFleecing, TempBlockSnapshot etc. /* Start fleecing */ virDomainBlockSnapshotPtr virDomainBlockSnapshotCreateXML(virDomainPtr domain, const char *xmlDesc, unsigned int flags); /* Stop fleecing */ int virDomainBlockSnapshotDelete(virDomainBlockSnapshotPtr snapshot, unsigned int flags); /* List active fleecings */ virDomainBlockSnapshotList(virDomainPtr domain, virDomainBlockSnapshotPtr **snaps, unsigned int flags); /* Get fleecing description */ char* virDomainBlockSnapshotGetXMLDesc(virDomainBlockSnapshotPtr snapshot, unsigned int flags); /* Get fleecing by name */ virDomainBlockSnapshotPtr virDomainBlockSnapshotLookupByName(virDomainPtr domain, const char *name); Here is a minimal block snapshot xml description to feed creating function: <domainblocksnapshot> <snapshot disk='sda'> <fleece file="/path/to/fleece-image-sda"/> </snapshot> <snapshot disk='sdb'> <fleece file="/path/to/fleece-image-sdb"/> </snapshot> </domainblocksnapshot> Below is an example of what getting description function should provide upon successful block snaphost creation. The difference with the above xml is that name element (it can be specified on creation as well) and aliases are generated. Aliases will be useful later to identify block devices on exporting thru nbd. <domainblocksnapshot> <name>5768a388-c1c4-414c-ac4e-eab216ba7c0c</name> <snapshot disk='sda'> <fleece file="/path/to/fleece-image-sda"/> <alias name="scsi0-0-0-0-backup"/> </snapshot> <snapshot disk='sdb'> <fleece file="/path/to/fleece-image-sdb"/> <alias name="scsi0-0-0-1-backup"/> </snapshot> </domainblocksnapshot> 2. Export API During backup operation we need to provide read access to fleecing image. This is done thru qemu process nbd server. We just need to specify the disks to export. /* start block export */ int virDomainBlockExportStart(virDomainPtr domain, const char *xmlDesc, unsigned int flags); /* stop block export */ int virDomainBlockExportStop(virDomainPtr domain, const char *diskName, unsigned int flags); Here is an example of xml for starting function: <blockexport type="nbd" port="8001"> <listen type="address" address="10.0.2.10"/> <disk name="scsi0-0-0-1-backup"/> </blockexport> qemu nbd server is started upon first disk export start and shutted down upon last disk export stop. Another option is to control ndb server explicitly. One way to do it is to consider ndb server a new device so to start/stop/update ndb server we can use attach/detach/update device functions. Then in block export start we need to refer to this device somehow. This can be a generated name/uuid or type/address pair. Actually this approach to expose ndb server looks more natural to me even it includes more management from client side. I am not suggesting it in the first place mostly due to hesitations on how to refer to ndb server on block export. In any case I'd like to provide export info in active domain config: <devices> <blockexport type="nbd" port="8001"> <listen type="address" address="10.0.2.10"/> <disk name="scsi0-0-0-1-backup"/> <disk name="scsi0-0-0-2-backup"/> </blockexport> </devices> This API is used in restore operation too. Domain is started in paused state, the disks to be restored are exported and backup client fills it with the backup data. 3. Incremental backups Qemu can track what disk parts are changed from from fleecing start. This is what typically called CBT (dirty bitmap in qemu community I guess). There are also experimental ndb support [4] and a bunch of merged/agreed/proposed bitmap operation that help to organize incremental backups. Different hypervisors has different bitmap implementations with different costs thus it is up to hyperivsor whether to start CBT or not upon block snapshot create by default. Qemu implementations has memory and disk costs for every bitmap thus I suggest by default start fleecing without bitmap and add flag VIR_DOMAIN_BLOCK_SNAPSHOT_CREATE_CHECKPOINT to ask to start a bitmap. Disks bitmaps are visible in active domain definition with the name of block snapshot for which bitmap was started. <disk type='file' device='disk'> .. <target dev='sda' bus='scsi'/> <alias name='scsi0-0-0-0'/> <checkpoint name="93a5c045-6457-2c09-e56c-927cdf34e178"> <checkpoint name="5768a388-c1c4-414c-ac4e-eab216ba7c0c"> .. </disk> The bitmap can be specified upon disk export like below (I guess there is no need to provide more then one bitmap per disk). Active domain config section for block export is expanded similarly. <blockexport type="nbd" port="8001"> <listen type="address" address="10.0.2.10"/> <disk name="scsi0-0-0-1-backup" checkpoint="5768a388-c1c4-414c-ac4e-eab216ba7c0c"/> </blockexport> If bitmap was created on backup start but client failed to make a backup for some reason then it makes no sense to keep this checkpoint anymore. As having bitmap takes resources it is convinient to drop bitmap in this case. Also one may want to drop bitmap for pure resource managment issues. So we need API to remove bitmap: virDomainBlockCheckpointRemove(virDomainPtr domain, const char *name, unsigned int flags); 4. Other hypervisors I took a somewhat considerable look only at vmware backup interface at [5] etc. Looks like they don't have fleecing like qemu has so for vmware snapshots one can use usual disks snapshots API. Also there is no nbd interface for snapshots expectedly thus to deal with vmware snapshot disks one eventually will have to add block API to libvirt. So the only point this RFC has to vmware backups is exporting checkpoints in disk xml. The vmware documentation does not say much about bitmap limitations but I guess they still can provide only a number of them which can be exposed as suggested for active domain disks. II Links: [1] https://www.redhat.com/archives/libvir-list/2016-September/msg00192.html [2] https://www.redhat.com/archives/libvir-list/2017-May/msg00379.html [3] https://www.redhat.com/archives/libvir-list/2016-March/msg00937.html [4] https://github.com/NetworkBlockDevice/nbd/commit/cfa8ebfc354b2adbdf73b6e6c2… [5] https://code.vmware.com/doc/preview?id=4076#/doc/vddkBkupVadp.9.3.html#1014…

1 1

[libvirt] [PATCH 0/6] implement support to configure sound output
by Pavel Hrdina 21 Nov '17

21 Nov '17

Pavel Hrdina (6): tests: add test cases for default sound output qemu: move QEMU_AUDIO_DRIVER out of graphic into sound qemu: explicitly disable audio if there is no sound device conf: introduce <output> element for <sound> devices qemu: implement <output> element for <sound> devices tests: add test cases for specific sound output docs/formatdomain.html.in | 11 ++++ docs/schemas/domaincommon.rng | 14 ++++ src/conf/domain_conf.c | 61 ++++++++++++++++++ src/conf/domain_conf.h | 14 ++++ src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 75 ++++++++++++++-------- src/qemu/qemu_domain.c | 54 ++++++++++++++++ src/qemu/qemu_process.c | 41 ++++++++++++ .../qemuxml2argv-channel-spicevmc-old.args | 2 +- .../qemuxml2argv-channel-spicevmc.args | 2 +- .../qemuxml2argv-clock-france.args | 2 +- .../qemuxml2argv-graphics-sdl-fullscreen.args | 1 + .../qemuxml2argv-graphics-sdl.args | 1 + ...emuxml2argv-graphics-spice-agent-file-xfer.args | 2 +- .../qemuxml2argv-graphics-spice-agentmouse.args | 2 +- ...emuxml2argv-graphics-spice-auto-socket-cfg.args | 2 +- .../qemuxml2argv-graphics-spice-auto-socket.args | 2 +- .../qemuxml2argv-graphics-spice-compression.args | 2 +- .../qemuxml2argv-graphics-spice-no-args.args | 2 +- .../qemuxml2argv-graphics-spice-qxl-vga.args | 2 +- .../qemuxml2argv-graphics-spice-sasl.args | 2 +- .../qemuxml2argv-graphics-spice-socket.args | 2 +- .../qemuxml2argv-graphics-spice-usb-redir.args | 2 +- .../qemuxml2argv-graphics-spice.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-name-escape.args | 2 +- .../qemuxml2argv-serial-spiceport.args | 2 +- .../qemuxml2argv-sound-default-output-sdl.args | 23 +++++++ .../qemuxml2argv-sound-default-output-sdl.xml | 24 +++++++ ...emuxml2argv-sound-default-output-spice-vnc.args | 25 ++++++++ ...qemuxml2argv-sound-default-output-spice-vnc.xml | 25 ++++++++ .../qemuxml2argv-sound-default-output-spice.args | 24 +++++++ .../qemuxml2argv-sound-default-output-spice.xml | 24 +++++++ ...emuxml2argv-sound-default-output-vnc-spice.args | 25 ++++++++ ...qemuxml2argv-sound-default-output-vnc-spice.xml | 25 ++++++++ .../qemuxml2argv-sound-default-output-vnc.args | 24 +++++++ .../qemuxml2argv-sound-default-output-vnc.xml | 24 +++++++ ...xml2argv-sound-multi-different-output-spice.xml | 29 +++++++++ .../qemuxml2argv-sound-multi-pa-output-spice.args | 26 ++++++++ .../qemuxml2argv-sound-multi-pa-output-spice.xml | 27 ++++++++ .../qemuxml2argv-sound-pa-output-spice.args | 24 +++++++ .../qemuxml2argv-sound-pa-output-spice.xml | 26 ++++++++ .../qemuxml2argv-video-virtio-gpu-spice-gl.args | 2 +- tests/qemuxml2argvtest.c | 34 ++++++++++ 43 files changed, 675 insertions(+), 42 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-default-output-sdl.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-default-output-sdl.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-default-output-spice-vnc.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-default-output-spice-vnc.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-default-output-spice.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-default-output-spice.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-default-output-vnc-spice.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-default-output-vnc-spice.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-default-output-vnc.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-default-output-vnc.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-multi-different-output-spice.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-multi-pa-output-spice.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-multi-pa-output-spice.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-pa-output-spice.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-pa-output-spice.xml -- 2.13.6

4 36

[libvirt] [PATCH 00/12] qemu: command: Move frontend disk attributes to -device (blockdev-add saga)
by Peter Krempa 21 Nov '17

21 Nov '17

For legacy reasons we've formatted some attributes of the disk frontend in -drive which now mostly holds backend arguments. (-drive was used by itself some time ago and still is for sdcards) Since we will no longer use -drive with -blockdev, some of them need to be moved (and the rest interpreted with -blockdev). Peter Krempa (12): qemu: command: Split out geometry frontend attribute formatting from -drive qemu: command: Format frontend props with -device rather than -drive tests: qemuxml2xml: Run the 'disk-serial' test tests: qemuxml2argv: Test SD card with serial number qemu: command: Move disk 'serial' into frontend parameter formatter qemu: command: Move around order of generating -drive arguments qemu: command: Refactor logic when formatting -drive qemu: command: Move disk trhottling argument building into a separate function qemu: command: Move formatting of disk io error policy from -drive qemu: command: Move around logic for formatting bootindex qemu: command: Move formatting of 'boot' attribute to -device qemu: command: Explain formatting of 'media=cdrom' in -drive src/qemu/qemu_command.c | 252 ++++++++++++--------- src/qemu/qemu_command.h | 2 +- src/qemu/qemu_hotplug.c | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 2 +- .../qemuxml2argv-boot-complex-bootindex.args | 2 +- .../qemuxml2argv-boot-complex.args | 6 +- ...xml2argv-boot-menu-disable-drive-bootindex.args | 2 +- .../qemuxml2argv-boot-menu-disable-drive.args | 2 +- .../qemuxml2argv-boot-menu-disable.args | 2 +- .../qemuxml2argv-boot-menu-enable-bootindex.args | 2 +- ...qemuxml2argv-boot-menu-enable-with-timeout.args | 2 +- .../qemuxml2argv-boot-menu-enable.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-order.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-strict.args | 2 +- .../qemuxml2argv-controller-order.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 4 +- .../qemuxml2argv-disk-cdrom-empty.args | 2 +- .../qemuxml2argv-disk-cdrom-network-ftp.args | 2 +- .../qemuxml2argv-disk-cdrom-network-ftps.args | 2 +- .../qemuxml2argv-disk-cdrom-network-http.args | 2 +- .../qemuxml2argv-disk-cdrom-network-https.args | 2 +- .../qemuxml2argv-disk-cdrom-network-tftp.args | 2 +- ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 2 +- .../qemuxml2argv-disk-cdrom-tray.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 2 +- .../qemuxml2argv-disk-copy_on_read.args | 2 +- .../qemuxml2argv-disk-drive-boot-cdrom.args | 4 +- .../qemuxml2argv-disk-drive-boot-disk.args | 4 +- .../qemuxml2argv-disk-drive-cache-directsync.args | 4 +- .../qemuxml2argv-disk-drive-cache-unsafe.args | 4 +- .../qemuxml2argv-disk-drive-cache-v2-none.args | 4 +- .../qemuxml2argv-disk-drive-cache-v2-wb.args | 4 +- .../qemuxml2argv-disk-drive-cache-v2-wt.args | 4 +- .../qemuxml2argv-disk-drive-detect-zeroes.args | 2 +- .../qemuxml2argv-disk-drive-discard.args | 2 +- ...uxml2argv-disk-drive-error-policy-enospace.args | 9 +- .../qemuxml2argv-disk-drive-error-policy-stop.args | 9 +- ...gv-disk-drive-error-policy-wreport-rignore.args | 9 +- .../qemuxml2argv-disk-drive-fmt-qcow.args | 4 +- .../qemuxml2argv-disk-drive-no-boot.args | 4 +- .../qemuxml2argv-disk-drive-readonly-disk.args | 2 +- ...qemuxml2argv-disk-drive-readonly-no-device.args | 2 +- .../qemuxml2argv-disk-drive-shared.args | 9 +- .../qemuxml2argv-disk-geometry.args | 6 +- .../qemuxml2argv-disk-ide-wwn.args | 5 +- .../qemuxml2argv-disk-ioeventfd.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-order.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-disk-serial.args | 9 +- .../qemuxml2argvdata/qemuxml2argv-disk-serial.xml | 5 + .../qemuxml2argv-disk-snapshot.args | 4 +- .../qemuxml2argv-disk-source-pool-mode.args | 12 +- .../qemuxml2argv-disk-source-pool.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 2 +- .../qemuxml2argv-graphics-spice-timeout.args | 2 +- .../qemuxml2argv-hugepages-numa.args | 2 +- .../qemuxml2argv-pci-autoadd-addr.args | 4 +- .../qemuxml2argv-pci-autoadd-idx.args | 4 +- .../qemuxml2argv-pci-autofill-addr.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-pci-bridge.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-pci-many.args | 4 +- .../qemuxml2argv-user-aliases.args | 2 +- .../qemuxml2xmlout-disk-serial.xml | 47 ++++ tests/qemuxml2xmltest.c | 2 + 65 files changed, 305 insertions(+), 219 deletions(-) create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-serial.xml -- 2.14.3

1 13

[libvirt] [PATCH 00/21] Initial support for resctrl (CAT)
by Martin Kletzander 21 Nov '17

21 Nov '17

This is an initial support for resctrl, so that domains can make use of Cache Allocation Technology (🐈). After bunch of initial discussions I followed most of those things except one detail. In order to distinguish different allocations while minimizing the number of them at the same time, I changed the XML design, but only slightly. See docs in patch 17 for detail. There is still much missing, but all is designed in a way that should not collied with the future additions. Missing features include: - After allocation is created the file should be re-read and parsed into the al the allocation so that the masks reflect what kernel actually uses (just in case there was a change) - When formatting live XML, used masks for allocations should be formatted as well - Each <cache/> should support shared allocations, for now every single allocation is exclusive only - Suuport for different backing, particularly if allocation has type='both' (code as well as data) and the host supports CDP (Code Data Partitioning), meaning it can allocate code and data portions separately the code currently fails even though it is possible to convert such allocation. - APIs for manipulation with various resctrl groups. What's needed is reading and setting values of the default group as well as any cachetune of a domain. Martin Kletzander (21): Only output initialized capabilities with VIR_TEST_DEBUG > 1 util: Introduce virPrettySize util: Make prefix optional in virBitampString util: Rename virBitmapString to virBitmapToString util: Rename virBitmapDataToString to virBitmapDataFormat util: Don't output too many zeros from virBitmapToString util: Introduce virBitmapNewString util: Reintroduce virBitmapSubtract util: Introduce virBitmapShrink conf: Sort cache banks in capabilities XML conf: Format cache banks in capabilities with virPrettySize resctrl: Instantiate all resctrl information at once tests: Remove executable bits on plain data files tests: Change some schemata for the default group caps2xml resctrl-skx-twocaches resctrl: Add functions to work with resctrl allocations conf: cachetune tests: Minor adjustments for test data tests: Add virresctrltest qemu: Add support for resctrl docs: Add CAT (resctrl) support into news.xml docs/formatdomain.html.in | 24 + docs/news.xml | 11 + docs/schemas/domaincommon.rng | 32 + po/POTFILES.in | 1 + src/Makefile.am | 2 +- src/conf/capabilities.c | 113 +- src/conf/capabilities.h | 4 +- src/conf/domain_conf.c | 249 ++++ src/conf/domain_conf.h | 21 + src/libvirt_private.syms | 24 +- src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_process.c | 61 +- src/util/virbitmap.c | 118 +- src/util/virbitmap.h | 15 +- src/util/virresctrl.c | 1317 ++++++++++++++++++-- src/util/virresctrl.h | 81 +- src/util/virresctrlpriv.h | 32 + src/util/virutil.c | 50 + src/util/virutil.h | 3 + tests/Makefile.am | 8 +- .../genericxml2xmlindata/generic-cachetune-cdp.xml | 36 + .../generic-cachetune-colliding-allocs.xml | 30 + .../generic-cachetune-colliding-tunes.xml | 32 + .../generic-cachetune-colliding-types.xml | 30 + .../generic-cachetune-small.xml | 29 + tests/genericxml2xmlindata/generic-cachetune.xml | 33 + tests/genericxml2xmltest.c | 10 + tests/testutils.c | 2 +- tests/virbitmaptest.c | 84 +- tests/vircaps2xmldata/linux-caches/system | 1 + .../linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask | 0 .../resctrl/info/L3CODE/min_cbm_bits | 0 .../resctrl/info/L3CODE/num_closids | 0 .../linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask | 0 .../resctrl/info/L3DATA/min_cbm_bits | 0 .../resctrl/info/L3DATA/num_closids | 0 .../linux-resctrl-cdp/resctrl/schemata | 4 +- .../resctrl/info/L3/cbm_mask | 1 + .../resctrl/info/L3}/min_cbm_bits | 0 .../resctrl/info/L3/num_closids | 1 + .../linux-resctrl-skx-twocaches/resctrl/schemata | 1 + .../resctrl/some_reservation/schemata | 1 + .../system/cpu/cpu0/cache/index0/id | 1 + .../system/cpu/cpu0/cache/index0/level | 1 + .../system/cpu/cpu0/cache/index0/shared_cpu_list | 1 + .../system/cpu/cpu0/cache/index0/shared_cpu_map | 1 + .../system/cpu/cpu0/cache/index0/size | 1 + .../system/cpu/cpu0/cache/index0/type | 1 + .../system/cpu/cpu0/cache/index1/id} | 0 .../system/cpu/cpu0/cache/index1/level | 1 + .../system/cpu/cpu0/cache/index1/shared_cpu_list | 1 + .../system/cpu/cpu0/cache/index1/shared_cpu_map | 1 + .../system/cpu/cpu0/cache/index1/size | 1 + .../system/cpu/cpu0/cache/index1/type | 1 + .../system/cpu/cpu0/online} | 0 .../system/cpu/cpu0/topology/core_id | 1 + .../system/cpu/cpu0/topology/core_siblings | 1 + .../system/cpu/cpu0/topology/core_siblings_list | 1 + .../system/cpu/cpu0/topology/physical_package_id | 1 + .../system/cpu/cpu0/topology/thread_siblings | 1 + .../system/cpu/cpu0/topology/thread_siblings_list | 1 + .../linux-resctrl-skx-twocaches/system/cpu/online | 1 + .../linux-resctrl-skx-twocaches/system/cpu/present | 1 + .../system/node/node0/cpu0 | 1 + .../system/node/node0/cpulist | 1 + .../system/node/node0/cpumap | 1 + .../system/node/node0/distance | 1 + .../linux-resctrl-skx-twocaches/system/node/online | 1 + .../linux-resctrl-skx/resctrl/empty/schemata | 0 .../linux-resctrl-skx/resctrl/schemata | 2 +- .../vircaps2xmldata/linux-resctrl/resctrl/schemata | 2 +- tests/vircaps2xmldata/vircaps-x86_64-caches.xml | 2 +- .../vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml | 4 +- ...ml => vircaps-x86_64-resctrl-skx-twocaches.xml} | 7 +- .../vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml | 4 +- tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 4 +- tests/vircaps2xmltest.c | 1 + .../resctrl--cachetune/vcpus-0-1.alloc | 1 + .../resctrl--cachetune/vcpus-3.alloc | 1 + .../resctrl-cdp--cachetune-cdp/vcpus-0-1.alloc | 2 + .../resctrl-cdp--cachetune-cdp/vcpus-2.alloc | 1 + .../resctrl-cdp--cachetune-cdp/vcpus-3.alloc | 1 + tests/virresctrldata/resctrl-cdp.schemata | 2 + .../virresctrldata/resctrl-skx-twocaches.schemata | 1 + tests/virresctrldata/resctrl-skx.schemata | 1 + tests/virresctrldata/resctrl.schemata | 1 + tests/virresctrltest.c | 277 ++++ tools/virsh-domain.c | 4 +- tools/virsh-host.c | 2 +- 89 files changed, 2626 insertions(+), 183 deletions(-) create mode 100644 src/util/virresctrlpriv.h create mode 100644 tests/genericxml2xmlindata/generic-cachetune-cdp.xml create mode 100644 tests/genericxml2xmlindata/generic-cachetune-colliding-allocs.xml create mode 100644 tests/genericxml2xmlindata/generic-cachetune-colliding-tunes.xml create mode 100644 tests/genericxml2xmlindata/generic-cachetune-colliding-types.xml create mode 100644 tests/genericxml2xmlindata/generic-cachetune-small.xml create mode 100644 tests/genericxml2xmlindata/generic-cachetune.xml create mode 120000 tests/vircaps2xmldata/linux-caches/system mode change 100755 => 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask mode change 100755 => 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits mode change 100755 => 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/num_closids mode change 100755 => 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask mode change 100755 => 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/min_cbm_bits mode change 100755 => 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/num_closids create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/cbm_mask copy tests/vircaps2xmldata/{linux-resctrl-cdp/resctrl/info/L3CODE => linux-resctrl-skx-twocaches/resctrl/info/L3}/min_cbm_bits (100%) mode change 100755 => 100644 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/num_closids create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/schemata create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/some_reservation/schemata create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/level create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/size create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/type copy tests/vircaps2xmldata/{linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits => linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/id} (100%) mode change 100755 => 100644 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/level create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/size create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/type copy tests/vircaps2xmldata/{linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits => linux-resctrl-skx-twocaches/system/cpu/cpu0/online} (100%) mode change 100755 => 100644 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_id create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/online create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/present create mode 120000 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpu0 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpulist create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpumap create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/distance create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/online create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/resctrl/empty/schemata copy tests/vircaps2xmldata/{vircaps-x86_64-resctrl-skx.xml => vircaps-x86_64-resctrl-skx-twocaches.xml} (68%) create mode 100644 tests/virresctrldata/resctrl--cachetune/vcpus-0-1.alloc create mode 100644 tests/virresctrldata/resctrl--cachetune/vcpus-3.alloc create mode 100644 tests/virresctrldata/resctrl-cdp--cachetune-cdp/vcpus-0-1.alloc create mode 100644 tests/virresctrldata/resctrl-cdp--cachetune-cdp/vcpus-2.alloc create mode 100644 tests/virresctrldata/resctrl-cdp--cachetune-cdp/vcpus-3.alloc create mode 100644 tests/virresctrldata/resctrl-cdp.schemata create mode 100644 tests/virresctrldata/resctrl-skx-twocaches.schemata create mode 100644 tests/virresctrldata/resctrl-skx.schemata create mode 100644 tests/virresctrldata/resctrl.schemata create mode 100644 tests/virresctrltest.c -- 2.15.0

3 57

[libvirt] [PATCH v4 1/2] remote: Extract common clearing of event callbacks of client private data
by xinhua.Cao 20 Nov '17

20 Nov '17

Extract common clearing of event callbacks as remoteClientFreePrivateCallbacks. the common function also separation including the sysident handling. --- daemon/remote.c | 73 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 34 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index cbcb6e8..2dcec1e 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1689,6 +1689,44 @@ void remoteRelayConnectionClosedEvent(virConnectPtr conn ATTRIBUTE_UNUSED, int r neventCallbacks = 0; \ } while (0); + +static void +remoteClientFreePrivateCallbacks(struct daemonClientPrivate *priv) +{ + virIdentityPtr sysident = virIdentityGetSystem(); + virIdentitySetCurrent(sysident); + + DEREG_CB(priv->conn, priv->domainEventCallbacks, + priv->ndomainEventCallbacks, + virConnectDomainEventDeregisterAny, "domain"); + DEREG_CB(priv->conn, priv->networkEventCallbacks, + priv->nnetworkEventCallbacks, + virConnectNetworkEventDeregisterAny, "network"); + DEREG_CB(priv->conn, priv->storageEventCallbacks, + priv->nstorageEventCallbacks, + virConnectStoragePoolEventDeregisterAny, "storage"); + DEREG_CB(priv->conn, priv->nodeDeviceEventCallbacks, + priv->nnodeDeviceEventCallbacks, + virConnectNodeDeviceEventDeregisterAny, "node device"); + DEREG_CB(priv->conn, priv->secretEventCallbacks, + priv->nsecretEventCallbacks, + virConnectSecretEventDeregisterAny, "secret"); + DEREG_CB(priv->conn, priv->qemuEventCallbacks, + priv->nqemuEventCallbacks, + virConnectDomainQemuMonitorEventDeregister, "qemu monitor"); + + if (priv->closeRegistered) { + if (virConnectUnregisterCloseCallback(priv->conn, + remoteRelayConnectionClosedEvent) < 0) + VIR_WARN("unexpected close callback event deregister failure"); + } + + virIdentitySetCurrent(NULL); + virObjectUnref(sysident); +} +#undef DEREG_CB + + /* * You must hold lock for at least the client * We don't free stuff here, merely disconnect the client's @@ -1702,44 +1740,11 @@ void remoteClientFreeFunc(void *data) /* Deregister event delivery callback */ if (priv->conn) { - virIdentityPtr sysident = virIdentityGetSystem(); - - virIdentitySetCurrent(sysident); - - DEREG_CB(priv->conn, priv->domainEventCallbacks, - priv->ndomainEventCallbacks, - virConnectDomainEventDeregisterAny, "domain"); - DEREG_CB(priv->conn, priv->networkEventCallbacks, - priv->nnetworkEventCallbacks, - virConnectNetworkEventDeregisterAny, "network"); - DEREG_CB(priv->conn, priv->storageEventCallbacks, - priv->nstorageEventCallbacks, - virConnectStoragePoolEventDeregisterAny, "storage"); - DEREG_CB(priv->conn, priv->nodeDeviceEventCallbacks, - priv->nnodeDeviceEventCallbacks, - virConnectNodeDeviceEventDeregisterAny, "node device"); - DEREG_CB(priv->conn, priv->secretEventCallbacks, - priv->nsecretEventCallbacks, - virConnectSecretEventDeregisterAny, "secret"); - DEREG_CB(priv->conn, priv->qemuEventCallbacks, - priv->nqemuEventCallbacks, - virConnectDomainQemuMonitorEventDeregister, "qemu monitor"); - - if (priv->closeRegistered) { - if (virConnectUnregisterCloseCallback(priv->conn, - remoteRelayConnectionClosedEvent) < 0) - VIR_WARN("unexpected close callback event deregister failure"); - } - + remoteClientFreePrivateCallbacks(priv); virConnectClose(priv->conn); - - virIdentitySetCurrent(NULL); - virObjectUnref(sysident); } - VIR_FREE(priv); } -#undef DEREG_CB static void remoteClientCloseFunc(virNetServerClientPtr client) -- 2.8.3

3 5

[libvirt] [PATCH v2 00/10] Implement query-dump command
by John Ferlan 20 Nov '17

20 Nov '17

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

1 10

[libvirt] [jenkins-ci PATCH 0/5] Fix environment handling
by Andrea Bolognani 20 Nov '17

20 Nov '17

My own attempt at fixing libosinfo-master-rpm's failing status, and then some. This is an extension of Pavel's attempt[1] in a way; except of course I think my approach is superior, otherwise I wouldn't have bothered ;) It also sets the groundwork for finally moving $VIRT_PREFIX and friends out of the Jenkins server configuration, where they are invisible to anyone but the CI admins, and into the git repository so that they can be tracked alongside the jobs using them. [1] https://www.redhat.com/archives/libvir-list/2017-November/msg00045.html Andrea Bolognani (5): jobs: Rename {make_env} to {global_env} jobs: Include {global_env} everywhere jobs: Rename {check_env} to {env} jobs: Include {env} everywhere jobs: Include $PATH definition in {global_env} jobs/autotools.yaml | 17 ++++++++++++----- jobs/defaults.yaml | 5 +++-- jobs/generic.yaml | 20 ++++++++++++++++---- jobs/go.yaml | 4 ++++ jobs/perl-makemaker.yaml | 9 ++++++--- jobs/perl-modulebuild.yaml | 6 ++++++ jobs/python-distutils.yaml | 6 ++++++ projects/libosinfo.yaml | 2 +- projects/libvirt.yaml | 2 +- projects/osinfo-db.yaml | 4 ---- 10 files changed, 55 insertions(+), 20 deletions(-) -- 2.14.3

2 8

[libvirt] [PATCH 00/14] Fix serial console behavior on non-x86 architectures
by Andrea Bolognani 20 Nov '17

20 Nov '17

See the last commit for a short explanation of what this series is all about. Andrea Bolognani (10): qemu: Add QEMU_CAPS_DEVICE_SPAPR_VTY conf,qemu: Use type-aware switches where possible qemu: Introduce qemuDomainChrDefPostParse() conf: Run devicePostParse() again for the first serial device conf: Introduce VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE conf: Drop virDomainChrDeviceType.targetTypeAttr conf: Add VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SPAPR qemu: Support usb-serial and pci-serial on pSeries conf: Add VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PL011 news: Update for serial console fixes Pino Toscano (4): conf: add VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP/SCLPLM conf: pass parseFlags down to virDomainDefAddConsoleCompat conf: convert sclp/sclplm <console> as <serial> qemu: switch s390/s390x default console back to serial docs/formatdomain.html.in | 13 +- docs/news.xml | 12 ++ docs/schemas/domaincommon.rng | 4 + src/conf/domain_conf.c | 132 +++++++++++++++----- src/conf/domain_conf.h | 11 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 136 +++++++++++++-------- src/qemu/qemu_domain.c | 95 ++++++++++++-- src/qemu/qemu_domain_address.c | 8 +- src/vz/vz_sdk.c | 5 +- .../qemuargv2xml-console-compat.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-serial-file.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-serial-many.xml | 4 +- tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml | 2 +- .../qemuargv2xml-serial-tcp-telnet.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml | 4 +- .../qemuargv2xmldata/qemuargv2xml-serial-unix.xml | 2 +- tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + ...otplug-console-compat-2-live+console-virtio.xml | 4 +- .../qemuhotplug-console-compat-2-live.xml | 4 +- .../qemuxml2argv-mach-virt-console-native.args | 1 + .../qemuxml2argv-mach-virt-console-native.xml | 17 +++ ... => qemuxml2argv-mach-virt-console-virtio.args} | 15 +-- .../qemuxml2argv-mach-virt-console-virtio.xml | 19 +++ ...muxml2argv-mach-virt-serial+console-native.args | 1 + ...emuxml2argv-mach-virt-serial+console-native.xml | 18 +++ .../qemuxml2argv-mach-virt-serial-compat.args | 1 + .../qemuxml2argv-mach-virt-serial-compat.xml | 19 +++ ...muxml2argv-mach-virt-serial-invalid-machine.xml | 19 +++ ...s => qemuxml2argv-mach-virt-serial-native.args} | 12 +- .../qemuxml2argv-mach-virt-serial-native.xml | 16 +++ .../qemuxml2argv-mach-virt-serial-pci.args | 26 ++++ .../qemuxml2argv-mach-virt-serial-pci.xml | 18 +++ .../qemuxml2argv-mach-virt-serial-usb.args | 27 ++++ .../qemuxml2argv-mach-virt-serial-usb.xml | 21 ++++ .../qemuxml2argv-pseries-basic.args | 2 +- .../qemuxml2argv-pseries-console-native.args | 1 + .../qemuxml2argv-pseries-console-native.xml | 17 +++ ...gs => qemuxml2argv-pseries-console-virtio.args} | 10 +- .../qemuxml2argv-pseries-console-virtio.xml | 19 +++ .../qemuxml2argv-pseries-cpu-compat-power9.args | 2 +- .../qemuxml2argv-pseries-cpu-compat.args | 2 +- .../qemuxml2argv-pseries-cpu-exact.args | 2 +- .../qemuxml2argv-pseries-cpu-le.args | 2 +- .../qemuxml2argv-pseries-panic-missing.args | 2 +- .../qemuxml2argv-pseries-panic-no-address.args | 2 +- ...qemuxml2argv-pseries-serial+console-native.args | 1 + .../qemuxml2argv-pseries-serial+console-native.xml | 18 +++ .../qemuxml2argv-pseries-serial-compat.args | 1 + .../qemuxml2argv-pseries-serial-compat.xml | 19 +++ ...qemuxml2argv-pseries-serial-invalid-machine.xml | 19 +++ ...rgs => qemuxml2argv-pseries-serial-native.args} | 7 +- .../qemuxml2argv-pseries-serial-native.xml | 16 +++ ...c.args => qemuxml2argv-pseries-serial-pci.args} | 7 +- .../qemuxml2argv-pseries-serial-pci.xml | 18 +++ ...c.args => qemuxml2argv-pseries-serial-usb.args} | 8 +- .../qemuxml2argv-pseries-serial-usb.xml | 21 ++++ .../qemuxml2argv-pseries-usb-default.args | 2 +- .../qemuxml2argv-pseries-usb-kbd.args | 2 +- .../qemuxml2argv-pseries-usb-multi.args | 2 +- .../qemuxml2argv-pseries-vio-user-assigned.args | 4 +- .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 4 +- ....args => qemuxml2argv-s390-console2serial.args} | 11 +- .../qemuxml2argv-s390-console2serial.xml | 19 +++ ...power9.args => qemuxml2argv-s390-serial-2.args} | 14 +-- .../qemuxml2argv-s390-serial-2.xml | 17 +++ ....args => qemuxml2argv-s390-serial-console.args} | 11 +- .../qemuxml2argv-s390-serial-console.xml | 15 +++ ...es-basic.args => qemuxml2argv-s390-serial.args} | 11 +- .../qemuxml2argvdata/qemuxml2argv-s390-serial.xml | 14 +++ ...muxml2argv-serial-tcp-tlsx509-chardev-notls.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-user-aliases.xml | 4 +- tests/qemuxml2argvtest.c | 83 +++++++++++++ .../qemuxml2xmlout-aarch64-virtio-pci-default.xml | 2 +- .../qemuxml2xmlout-bios-nvram-os-interleave.xml | 2 +- .../qemuxml2xmlout-chardev-label.xml | 4 +- .../qemuxml2xmlout-console-compat-auto.xml | 2 +- .../qemuxml2xmlout-console-compat.xml | 2 +- .../qemuxml2xmlout-console-compat2.xml | 2 +- .../qemuxml2xmlout-console-virtio-many.xml | 2 +- .../qemuxml2xmlout-interface-driver.xml | 2 +- .../qemuxml2xmlout-interface-server.xml | 4 +- .../qemuxml2xmlout-mach-virt-console-native.xml | 1 + ...=> qemuxml2xmlout-mach-virt-console-virtio.xml} | 19 +-- ...uxml2xmlout-mach-virt-serial+console-native.xml | 1 + .../qemuxml2xmlout-mach-virt-serial-compat.xml | 29 +++++ .../qemuxml2xmlout-mach-virt-serial-native.xml | 1 + .../qemuxml2xmlout-mach-virt-serial-pci.xml | 42 +++++++ .../qemuxml2xmlout-mach-virt-serial-usb.xml | 39 ++++++ .../qemuxml2xmlout-net-bandwidth.xml | 2 +- .../qemuxml2xmlout-net-bandwidth2.xml | 2 +- .../qemuxml2xmlout-net-coalesce.xml | 2 +- .../qemuxml2xmloutdata/qemuxml2xmlout-net-mtu.xml | 2 +- .../qemuxml2xmlout-panic-pseries.xml | 2 +- .../qemuxml2xmlout-pseries-console-native.xml | 1 + ...l => qemuxml2xmlout-pseries-console-virtio.xml} | 16 +-- .../qemuxml2xmlout-pseries-cpu-compat-power9.xml | 2 +- .../qemuxml2xmlout-pseries-cpu-compat.xml | 2 +- .../qemuxml2xmlout-pseries-cpu-exact.xml | 2 +- .../qemuxml2xmlout-pseries-panic-missing.xml | 2 +- .../qemuxml2xmlout-pseries-panic-no-address.xml | 2 +- ...emuxml2xmlout-pseries-serial+console-native.xml | 1 + .../qemuxml2xmlout-pseries-serial-compat.xml | 1 + ...ml => qemuxml2xmlout-pseries-serial-native.xml} | 8 +- ...g.xml => qemuxml2xmlout-pseries-serial-pci.xml} | 14 +-- ...g.xml => qemuxml2xmlout-pseries-serial-usb.xml} | 11 +- .../qemuxml2xmlout-q35-virt-manager-basic.xml | 2 +- .../qemuxml2xmlout-s390-defaultconsole.xml | 6 +- .../qemuxml2xmlout-s390-serial-2.xml | 29 +++++ ....xml => qemuxml2xmlout-s390-serial-console.xml} | 18 +-- ...tconsole.xml => qemuxml2xmlout-s390-serial.xml} | 18 +-- .../qemuxml2xmlout-serial-spiceport-nospice.xml | 2 +- .../qemuxml2xmlout-serial-spiceport.xml | 2 +- .../qemuxml2xmlout-serial-target-port-auto.xml | 6 +- .../qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml | 4 +- .../qemuxml2xmlout-tap-vhost-incorrect.xml | 2 +- .../qemuxml2xmlout-tap-vhost.xml | 2 +- .../qemuxml2xmlout-vhost_queues.xml | 2 +- tests/qemuxml2xmltest.c | 54 ++++++++ 125 files changed, 1186 insertions(+), 284 deletions(-) create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-native.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-mach-virt-console-virtio.args} (53%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-console-virtio.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial+console-native.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-compat.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-invalid-machine.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-mach-virt-serial-native.args} (62%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-native.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-pci.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-pci.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-usb.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-mach-virt-serial-usb.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-console-native.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-pseries-console-virtio.args} (59%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-console-virtio.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial+console-native.xml create mode 120000 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-compat.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-invalid-machine.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-pseries-serial-native.args} (70%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-native.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-pseries-serial-pci.args} (70%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-pci.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-pseries-serial-usb.args} (65%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-serial-usb.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-s390-console2serial.args} (71%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-console2serial.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-cpu-compat-power9.args => qemuxml2argv-s390-serial-2.args} (62%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-serial-2.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-s390-serial-console.args} (71%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-serial-console.xml copy tests/qemuxml2argvdata/{qemuxml2argv-pseries-basic.args => qemuxml2argv-s390-serial.args} (71%) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-serial.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-console-native.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-s390-defaultconsole.xml => qemuxml2xmlout-mach-virt-console-virtio.xml} (50%) create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial+console-native.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-compat.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-native.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-pci.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-mach-virt-serial-usb.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-console-native.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-panic-pseries.xml => qemuxml2xmlout-pseries-console-virtio.xml} (75%) create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial+console-native.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-serial-compat.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-panic-missing.xml => qemuxml2xmlout-pseries-serial-native.xml} (82%) copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-panic-missing.xml => qemuxml2xmlout-pseries-serial-pci.xml} (74%) copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-panic-missing.xml => qemuxml2xmlout-pseries-serial-usb.xml} (75%) create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-s390-serial-2.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-s390-defaultconsole.xml => qemuxml2xmlout-s390-serial-console.xml} (50%) copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-s390-defaultconsole.xml => qemuxml2xmlout-s390-serial.xml} (50%) -- 2.13.6

5 46

[libvirt] [jenkins-ci PATCH 0/3] Add Fedora 27, remove Fedora 25
by Andrea Bolognani 20 Nov '17

20 Nov '17

'tis the season. Andrea Bolognani (3): Add Fedora 27 builder Remove Fedora 25 builder guests: Adjust Fedora 26 install URL guests/host_vars/libvirt-fedora-26/install.yml | 2 +- .../install.yml | 2 +- .../main.yml | 0 guests/inventory | 2 +- guests/vars/vault.yml | 90 +++++++++++----------- projects/libosinfo.yaml | 4 +- projects/libvirt-cim.yaml | 2 +- projects/libvirt-glib.yaml | 4 +- projects/libvirt-go-xml.yaml | 2 +- projects/libvirt-go.yaml | 2 +- projects/libvirt-perl.yaml | 4 +- projects/libvirt-python.yaml | 4 +- projects/libvirt-sandbox.yaml | 4 +- projects/libvirt-tck.yaml | 4 +- projects/libvirt.yaml | 6 +- projects/osinfo-db-tools.yaml | 4 +- projects/osinfo-db.yaml | 4 +- projects/virt-manager.yaml | 4 +- projects/virt-viewer.yaml | 4 +- 19 files changed, 74 insertions(+), 74 deletions(-) rename guests/host_vars/{libvirt-fedora-25 => libvirt-fedora-27}/install.yml (74%) rename guests/host_vars/{libvirt-fedora-25 => libvirt-fedora-27}/main.yml (100%) -- 2.14.3

2 6

[libvirt] [PATCH 0/2] tests: commandtest: handle tcmalloc hacking environment
by Nikolay Shirokovskiy 20 Nov '17

20 Nov '17

3 11

[libvirt] [PATCH 0/6] Implement query-dump command
by John Ferlan 20 Nov '17

20 Nov '17

https://bugzilla.redhat.com/show_bug.cgi?id=916061 Details in the patches. Essentially though QEMU 2.6 added the ability to perform the 'dump-guest-memory' via a thread by adding a 'detach' boolean to the command. In order to watch the progress of the thread the 'query-dump' command was added. The query-dump will return just the current status, the total size to be dumped, and the current progress. So using the migrate stats data in the DomainJobInfo we can then save our current progress allowing tools such as virsh to watch that progress. As an added benefit, the dump-guest-memory is now truly asynchronous. John Ferlan (6): qemu: Fix the qemuDumpToFd definition qemu: Alter dump-guest-memory command generation qemu: Add query-dump to the capabilities qemu: Introduce qemuMonitor[JSON]QueryDump qemu: Add new @detach parameter to dump-guest-memory qemu: Allow showing the dump progress for memory only dump src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 95 ++++++++++++++++++++-- src/qemu/qemu_monitor.c | 25 +++++- src/qemu/qemu_monitor.h | 25 +++++- src/qemu/qemu_monitor_json.c | 91 +++++++++++++++++---- src/qemu/qemu_monitor_json.h | 7 +- .../caps_2.10.0-gicv2.aarch64.xml | 1 + .../caps_2.10.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + tests/qemumonitorjsontest.c | 3 +- 24 files changed, 240 insertions(+), 27 deletions(-) -- 2.13.6

2 8

[libvirt] [PATCH] docs: don't use https in XML namespace URIs
by Daniel P. Berrange 20 Nov '17

20 Nov '17

The XML namespace URI for the QEMU/LXC drivers must use http as the protocol otherwise it won't match the parser's expectations. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/drvlxc.html.in | 2 +- docs/drvqemu.html.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index 94c6b82cfd..58a336ed30 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -601,7 +601,7 @@ rather than creating new network namespace for the container. In this case privn ignored. </p> <pre> -<domain type='lxc' xmlns:lxc='https://libvirt.org/schemas/domain/lxc/1.0'> +<domain type='lxc' xmlns:lxc='http://libvirt.org/schemas/domain/lxc/1.0'> ... <lxc:namespace> <lxc:sharenet type='netns' value='red'/> diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index e2a0797cfb..cb41b505d7 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -546,7 +546,7 @@ $ virsh domxml-to-native qemu-argv demo.xml (<span class="since">Since 0.8.3</span>). In order to use the XML additions, it is necessary to issue an XML namespace request (the special <code>xmlns:<i>name</i></code> attribute) that - pulls in <code>https://libvirt.org/schemas/domain/qemu/1.0</code>; + pulls in <code>http://libvirt.org/schemas/domain/qemu/1.0</code>; typically, the namespace is given the name of <code>qemu</code>. With the namespace in place, it is then possible to add an element <code><qemu:commandline></code> @@ -566,7 +566,7 @@ $ virsh domxml-to-native qemu-argv demo.xml and optional <code>value</code>.</dd> </dl> <p>Example:</p><pre> -<domain type='qemu' xmlns:qemu='https://libvirt.org/schemas/domain/qemu/1.0'> +<domain type='qemu' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> <name>QEmu-fedora-i686</name> <memory>219200</memory> <os> -- 2.14.3

2 1

[libvirt] [PATCH] AppArmor: add rules needed with additional mediation features brought by Linux 4.14.
by intrigeri 19 Nov '17

19 Nov '17

--- examples/apparmor/libvirt-qemu | 2 ++ examples/apparmor/usr.sbin.libvirtd | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu index b341e31f42..5994a35042 100644 --- a/examples/apparmor/libvirt-qemu +++ b/examples/apparmor/libvirt-qemu @@ -16,6 +16,8 @@ network inet stream, network inet6 stream, + signal (receive) set=("term") peer=/usr/sbin/libvirtd, + /dev/net/tun rw, /dev/kvm rw, /dev/ptmx rw, diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd index 819068ffc3..17b5ee38ff 100644 --- a/examples/apparmor/usr.sbin.libvirtd +++ b/examples/apparmor/usr.sbin.libvirtd @@ -30,6 +30,8 @@ # Needed for vfio capability sys_resource, + mount, + network inet stream, network inet dgram, network inet6 stream, @@ -37,11 +39,18 @@ network packet dgram, network packet raw, + network netlink raw, + network unix dgram, + network unix stream, + ptrace (trace) peer=unconfined, ptrace (trace) peer=/usr/sbin/libvirtd, ptrace (trace) peer=/usr/sbin/dnsmasq, ptrace (trace) peer=libvirt-*, + signal (send) set=("hup") peer=/usr/sbin/dnsmasq, + signal (send) set=("term") peer=libvirt-*, + # Very lenient profile for libvirtd since we want to first focus on confining # the guests. Guests will have a very restricted profile. / r, -- 2.15.0.rc2

5 16

[libvirt] [PATCH 0/2] vmcoreinfo feature
by marcandre.lureau＠redhat.com 18 Nov '17

18 Nov '17

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, Starting with QEMU 2.11, the guest can save kernel debug details when this feature is enabled and the kernel supports it. It is useful to process kernel dump with KASLR enabled, and also provides various kernel details to crash tools. rfc->v1: - rebased - update commit message to give some internal fw_cfg details - add news patch Marc-André Lureau (2): qemu: add vmcoreinfo support news: add vmcoreinfo feature details docs/formatdomain.html.in | 4 +++ docs/news.xml | 11 +++++++ docs/schemas/domaincommon.rng | 9 +++++ src/conf/domain_conf.c | 3 ++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 26 +++++++++++++++ .../qemuxml2argvdata/qemuxml2argv-vmcoreinfo.args | 25 ++++++++++++++ tests/qemuxml2argvdata/qemuxml2argv-vmcoreinfo.xml | 28 ++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmlout-vmcoreinfo.xml | 38 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 13 files changed, 150 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-vmcoreinfo.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-vmcoreinfo.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-vmcoreinfo.xml -- 2.15.0.125.g8f49766d64

2 3

[libvirt] [PATCH] xenconfig: fix compilation error
by Jim Fehlig 17 Nov '17

17 Nov '17

Commit 03d0959a introduced a compilation error in src/xenconfig/xen_xl.c on ARM. Found by Xen's osstest http://logs.test-lab.xenproject.org/osstest/logs/116216/build-armhf-libvirt… Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Pushing under the build-breaker rule. src/xenconfig/xen_xl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index 05146d7db..984024bba 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -1261,11 +1261,11 @@ xenFormatXLVnuma(virConfValuePtr list, numaVnode->list = NULL; /* pnode */ - virBufferAsprintf(&buf, "pnode=%ld", node); + virBufferAsprintf(&buf, "pnode=%zu", node); xenFormatXLVnode(numaVnode, &buf); /* size */ - virBufferAsprintf(&buf, "size=%ld", nodeSize); + virBufferAsprintf(&buf, "size=%zu", nodeSize); xenFormatXLVnode(numaVnode, &buf); /* vcpus */ -- 2.15.0

1 0