- Devel - libvirt List Archives

[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