- Devel - libvirt List Archives

[libvirt] CLI management tool
by Michal Privoznik 11 May '17

11 May '17

Dear list, you might have seen a discussion about virsh, and adding some new features to it [1]. While the feature was rejected, it got me thinking. What options do we offer for sysadmins that: a) want to stay in command line b) want higher level mgmt of their domains c) yet want to manage a single host Basically, virsh is just too low level for some operations (and using it in non-interactive mode from a script can mean hundreds of connections). Then we have virt-manager, which suits b) and c), but it's not a CLI tool. Therefore I was thinking whether we should start a new project on the top of libvirt that would fit all three points. Personally, I've never been a sysadmin, so perhaps I am not the best one to write the tool. But I'm open for suggestions. What do you think? Michal 1: https://www.redhat.com/archives/libvir-list/2017-May/msg00051.html

4 3

[libvirt] [PATCH] virsh: Add --tls description for the virsh man page
by John Ferlan 11 May '17

11 May '17

https://bugzilla.redhat.com/show_bug.cgi?id=1448806 Commit id '6a8d898d' neglected to update the man page. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- tools/virsh.pod | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index cd1f25f..727acf6 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1672,7 +1672,7 @@ I<domain> I<desturi> [I<migrateuri>] [I<graphicsuri>] [I<listen-address>] [I<dna [I<--compressed>] [I<--comp-methods> B<method-list>] [I<--comp-mt-level>] [I<--comp-mt-threads>] [I<--comp-mt-dthreads>] [I<--comp-xbzrle-cache>] [I<--auto-converge>] [I<auto-converge-initial>] -[I<auto-converge-increment>] [I<--persistent-xml> B<file>] +[I<auto-converge-increment>] [I<--persistent-xml> B<file>] [I<--tls>] Migrate domain to another host. Add I<--live> for live migration; <--p2p> for peer-2-peer migration; I<--direct> for direct migration; or I<--tunnelled> @@ -1753,6 +1753,11 @@ compression. I<--comp-mt-threads> and I<--comp-mt-dthreads> set the number of compress threads on source and the number of decompress threads on target respectively. I<--comp-xbzrle-cache> sets size of page cache in bytes. +Providing I<--tls> causes the migration to use the host configured TLS setup +(see migrate_tls_x509_cert_dir in /etc/libvirt/qemu.conf) in order to perform +the migration of the domain. Usage requires proper TLS setup for both source +and target. + Running migration can be canceled by interrupting virsh (usually using C<Ctrl-C>) or by B<domjobabort> command sent from another virsh instance. -- 2.9.3

2 1

[libvirt] [libvirt-php PATCH 0/2] implement a few network API bindings
by Dawid Zamirski 11 May '17

11 May '17

Hello, The followinig two patches add a few useful API bindings for dealing with libvirt networks: * virConnectListAllNetworks - allows for better control when filtering and returns array of handles to virNetworkPtr which can then be used to get other info for each network such as name, uuid, autostart etc. * virNetworkGetUUIDString, virNetworkGetUUID, virNetworkGetName to be able to easily get said info when working with virNetworkPtr handles. Dawid Zamirski (2): implement binding for virConnectListAllNetworks. implement additional network functions. src/libvirt-php.c | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/libvirt-php.h | 4 ++ 2 files changed, 153 insertions(+) -- 2.12.2

3 5

[libvirt] src/remote_protocol-structs file
by Vasiliy Tolstov 11 May '17

11 May '17

Hi. While i'm writing go binding for libvirt rpc api i'm parse src/remote/remote_protocol.x and generate needed code for go, but as i see libvirt have src/remote_protocol-structs file. That contains all needed data in mo simple syntax. But i don't see such files for qemu_protocol.x and lxc_protocol.x do you plan to add files for this xdr files, or src/remote_protocol-structs will be deprecated? Thanks! -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

2 2

[libvirt] [PATCH v2 0/5] Prevent losing IPv6 routes due to forwarding
by Cédric Bosdonnat 11 May '17

11 May '17

Hi Laine, all, Here is the v2 of my series. The changes are: * Add a commit to create a virNetDevGetName() function * Fix Laine's comments Cédric Bosdonnat (5): util: extract the request sending code from virNetlinkCommand() util: add virNetlinkDumpCommand() bridge_driver.c: more uses of SYSCTL_PATH util: add virNetDevGetName() function network: check accept_ra before enabling ipv6 forwarding src/libvirt_private.syms | 3 + src/network/bridge_driver.c | 25 ++++--- src/util/virnetdev.c | 19 ++++++ src/util/virnetdev.h | 2 + src/util/virnetdevip.c | 158 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetdevip.h | 1 + src/util/virnetlink.c | 145 ++++++++++++++++++++++++++++++---------- src/util/virnetlink.h | 9 +++ 8 files changed, 319 insertions(+), 43 deletions(-) -- 2.11.0

5 23

[libvirt] [PATCH v2] libxl: report numa sibling distances on host capabilities
by Wim Ten Have 10 May '17

10 May '17

From: Wim ten Have <wim.ten.have(a)oracle.com> When running on a NUMA machine, populate the sibling node and distance information using data supplied by Xen. Wim ten Have (1): libxl: report numa sibling distances on host capabilities src/libxl/libxl_capabilities.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) -- 2.9.3

3 3

[libvirt] [PATCH] Add missing deps on virfilewrapper.h
by Daniel P. Berrange 10 May '17

10 May '17

The test programs depend on virfilewrapper.h as well as the virfilewrapper.c. Adding the dep ensures that virfilewrapper.h gets included in the dist tarball. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a build fix, since RPM build / distcheck is broken without this tests/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 5c77b55..7673329 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -930,7 +930,7 @@ virconftest_SOURCES = \ virconftest_LDADD = $(LDADDS) virhostcputest_SOURCES = \ - virhostcputest.c testutils.h testutils.c virfilewrapper.c + virhostcputest.c testutils.h testutils.c virfilewrapper.h virfilewrapper.c virhostcputest_LDADD = $(LDADDS) commandtest_SOURCES = \ @@ -1147,7 +1147,7 @@ virhostcpumock_la_LIBADD = $(MOCKLIBS_LIBS) if WITH_LINUX vircaps2xmltest_SOURCES = \ - vircaps2xmltest.c testutils.h testutils.c virfilewrapper.c + vircaps2xmltest.c testutils.h testutils.c virfilewrapper.h virfilewrapper.c vircaps2xmltest_LDADD = $(LDADDS) virnumamock_la_SOURCES = \ -- 2.9.3

1 0

[libvirt] [PATCH] nodedev_udev: Fix missing events when kernel report lots of udev events within a short time
by ZhiPeng Lu 10 May '17

10 May '17

From: "ning.bo" <ning.bo9(a)zte.com.cn> When create Virtual Function for Inter XL710 use below commands: for i in `seq 0 1`; do echo 63 > /sys/devices/pci0000:00/0000:00:03.2/0000:07:00.$i/sriov_numvfs done for i in `seq 0 3`; do echo 31 > /sys/devices/pci0000:80/0000:80:02.2/0000:82:00.$i/sriov_numvfs done The libvirtd will missing some udev events, the result of libvirt-python API listDevices('pci') will not list all pci devices. The reason is that the buffer of udev monitor default size cann't save all udev events reported by kernel. So we need change buffer size so that we can receive as much events as possible whitin a short time. Signed-off-by: ning.bo <ning.bo9(a)zte.com.cn> --- src/node_device/node_device_udev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 6e706a1..d813206 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1564,6 +1564,7 @@ static int nodeStateInitialize(bool privileged, } udev_monitor_enable_receiving(priv->udev_monitor); + udev_monitor_set_receive_buffer_size(priv->udev_monitor, 128 * 1024 * 1024); /* We register the monitor with the event callback so we are * notified by udev of device changes before we enumerate existing -- 2.8.3

3 3

[libvirt] [PATCH 0/2] qemu: driver: Document and fix usage of qemuOpenFile
by Peter Krempa 10 May '17

10 May '17

Peter Krempa (2): qemu: driver: Document qemuOpenFile qemu: driver: Fix usage of qemuOpenFile src/qemu/qemu_driver.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) -- 2.12.2

2 3

[libvirt] [PATCH] Don't inline virStringTrimOptionalNewline
by Daniel P. Berrange 10 May '17

10 May '17

GCC complains that inlining virStringTrimOptionalNewline is not likely on some platforms: cc1: warnings being treated as errors ../../src/util/virfile.c: In function 'virFileReadValueBitmap': ../../src/util/virstring.h:292: error: inlining failed in call to 'virStringTrimOptionalNewline': call is unlikely and code size would grow [-Winline] ../../src/util/virfile.c:3987: error: called from here [-Winline] Inlining this function is not going to be a measurable performance benefit either, since the time required to execute it is going to be dominated by running of strlen() over the string, not by the function call overhead. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a broken build fix src/libvirt_private.syms | 1 + src/util/virstring.c | 14 ++++++++++++++ src/util/virstring.h | 8 +------- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4cca0ca..afb9100 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2630,6 +2630,7 @@ virStringSplitCount; virStringStripControlChars; virStringStripIPv6Brackets; virStringToUpper; +virStringTrimOptionalNewline; virStrncpy; virStrndup; virStrToDouble; diff --git a/src/util/virstring.c b/src/util/virstring.c index 69abc26..335e773 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1180,3 +1180,17 @@ virStringEncodeBase64(const uint8_t *buf, size_t buflen) return ret; } + +/** + * virStringTrimOptionalNewline: + * @str: the string to modify in-place + * + * Modify @str to remove a single '\n' character + * from its end, if one exists. + */ +void virStringTrimOptionalNewline(char *str) +{ + char *tmp = str + strlen(str) - 1; + if (*tmp == '\n') + *tmp = '\0'; +} diff --git a/src/util/virstring.h b/src/util/virstring.h index 603650a..c545ca3 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -288,12 +288,6 @@ bool virStringBufferIsPrintable(const uint8_t *buf, size_t buflen); char *virStringEncodeBase64(const uint8_t *buf, size_t buflen); -static inline void -virStringTrimOptionalNewline(char *str) -{ - char *tmp = str + strlen(str) - 1; - if (*tmp == '\n') - *tmp = '\0'; -} +void virStringTrimOptionalNewline(char *str); #endif /* __VIR_STRING_H__ */ -- 2.9.3

2 2

[libvirt] [RFC PATCH REBASE 00/10] introduce push backups
by Nikolay Shirokovskiy 10 May '17

10 May '17

Push backup is a backup when hypervisor itself copy backup data to destination in contrast to pull backup when hypervisor exports backup data thru some interface and mgmt itself make a copy. This patch series basically adds creating backup to API/remote/qemu/virsh and initial backup XML definition. Just like other blockjobs backup creation is asynchronous. That is creation is merely a backup start and client should track backup error/completion thru blockjob events. As backup is done transactionally all individual disk backup jobs will be aborted by qemu itself in case of error, client need not to do it manually. Client can cancel the backup by aborting blockjob on any disk being backed up. Backup xml desription is similar to snapshot one with some exceptions and is described in more details in definition patch [1]. I guess good client will track progress for every disk in backup to report progress and detect hangs so it don't need extra backup complete/error event that aggregate the overall backup result. However it looks like aborting backup can be implemented in libvirt as code will be common for all clients. We need to abort some of not yet completed per disk backups and retry if job to be aborted is completed meanwhile. Of coures this series is far from being complete. Incremental backups and backup persistent metadata is to be implemented. Let's just start work in this direction. Nikolay Shirokovskiy (10): api: backup: add api to create backup api: backup: add driver based implementation remote: backup: add create backup implementation backup: qemu: monitor: add drive-backup command backup: misc: add backup block job type conf: backup: add backup xml definition [1] qemu: backup: add qemuDomainBackupCreateXML implementation qemu: backup: check backup destination before start qemu: backup: prepare backup destination virsh: backup: add backup-create command Links: In [1] we came to agreement to create distinct API to support backup operations and there is a discussion of pull backup series in [2]. The latter is blocked as some necessary operations are still experimental in qemu. [1] https://www.redhat.com/archives/libvir-list/2016-March/msg00937.html [2] https://www.redhat.com/archives/libvir-list/2016-September/msg00192.html daemon/remote.c | 8 + examples/object-events/event-test.c | 3 + include/libvirt/libvirt-domain-backup.h | 59 +++++++ include/libvirt/libvirt-domain.h | 3 + include/libvirt/libvirt.h | 1 + include/libvirt/virterror.h | 2 + po/POTFILES.in | 2 + src/Makefile.am | 3 + src/access/viraccessperm.c | 3 +- src/access/viraccessperm.h | 6 + src/conf/backup_conf.c | 299 ++++++++++++++++++++++++++++++++ src/conf/backup_conf.h | 70 ++++++++ src/conf/domain_conf.c | 2 +- src/datatypes.c | 60 +++++++ src/datatypes.h | 29 ++++ src/driver-hypervisor.h | 5 + src/libvirt-domain-backup.c | 202 +++++++++++++++++++++ src/libvirt_private.syms | 9 + src/libvirt_public.syms | 10 ++ src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 239 ++++++++++++++++++++++++- src/qemu/qemu_monitor.c | 14 ++ src/qemu/qemu_monitor.h | 5 + src/qemu/qemu_monitor_json.c | 36 ++++ src/qemu/qemu_monitor_json.h | 5 + src/remote/remote_driver.c | 7 + src/remote/remote_protocol.x | 23 ++- src/rpc/gendispatch.pl | 29 +++- src/util/virerror.c | 6 + tools/Makefile.am | 1 + tools/virsh-backup.c | 100 +++++++++++ tools/virsh-backup.h | 29 ++++ tools/virsh-domain.c | 3 +- tools/virsh-util.c | 11 ++ tools/virsh-util.h | 3 + tools/virsh.c | 2 + tools/virsh.h | 1 + 37 files changed, 1279 insertions(+), 12 deletions(-) create mode 100644 include/libvirt/libvirt-domain-backup.h create mode 100644 src/conf/backup_conf.c create mode 100644 src/conf/backup_conf.h create mode 100644 src/libvirt-domain-backup.c create mode 100644 tools/virsh-backup.c create mode 100644 tools/virsh-backup.h -- 1.8.3.1

2 14

[libvirt] [PATCH] spec: Update version check for maint Source URL
by Cole Robinson 09 May '17

09 May '17

New maint release version numbers of just A.B.C format, not the old A.B.C.D format. Adjust the check that dynamically changes the Source URL for maint releases --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index b249224..734b187 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -233,7 +233,7 @@ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ -%if %(echo %{version} | grep -o \\. | wc -l) == 3 +%if %(echo %{version} | grep -q "\.0$"; echo $?) == 1 %define mainturl stable_updates/ %endif Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz -- 2.9.3

2 3

[libvirt] [PATCH] conf: Check CPU cache for ABI stability
by Jiri Denemark 09 May '17

09 May '17

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/cpu_conf.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 1b098c476..194f03faf 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -915,6 +915,16 @@ virCPUDefIsEqual(virCPUDefPtr src, } } + if ((src->cache && !dst->cache) || + (!src->cache && dst->cache) || + (src->cache && dst->cache && + (src->cache->level != dst->cache->level || + src->cache->mode != dst->cache->mode))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + "Target CPU cache does not match source"); + goto cleanup; + } + identical = true; cleanup: -- 2.12.2

2 1

[libvirt] [PATCH 0/3] Add support for CPU cache specification
by Jiri Denemark 09 May '17

09 May '17

Apparently setting a guest CPU cache (even faked) can dramatically increase performance in some use cases [1]. This series adds support for specifying the guest CPU cache in domain XML. See patch 2/3 for more details and documentation. [1] https://patchwork.kernel.org/patch/9308401/ Jiri Denemark (3): conf: Rename mode parameter in virCPUDefParseXML Add support for CPU cache specification qemu: Add support for guest CPU cache docs/formatdomain.html.in | 35 +++++++++++ docs/schemas/cputypes.rng | 21 +++++++ docs/schemas/domaincommon.rng | 3 + src/conf/cpu_conf.c | 68 +++++++++++++++++++++- src/conf/cpu_conf.h | 19 ++++++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 8 +++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 37 ++++++++++++ src/qemu/qemu_domain.c | 54 +++++++++++++++++ .../generic-cpu-cache-disable.xml | 20 +++++++ .../generic-cpu-cache-emulate.xml | 20 +++++++ .../generic-cpu-cache-passthrough.xml | 20 +++++++ .../generic-cpu-cache-disable.xml | 20 +++++++ .../generic-cpu-cache-emulate.xml | 20 +++++++ .../generic-cpu-cache-passthrough.xml | 20 +++++++ tests/genericxml2xmltest.c | 4 ++ tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 + .../qemuxml2argv-cpu-cache-disable.args | 21 +++++++ .../qemuxml2argv-cpu-cache-disable.xml | 20 +++++++ .../qemuxml2argv-cpu-cache-disable2.args | 21 +++++++ .../qemuxml2argv-cpu-cache-disable2.xml | 20 +++++++ .../qemuxml2argv-cpu-cache-disable3.args | 22 +++++++ .../qemuxml2argv-cpu-cache-disable3.xml | 20 +++++++ .../qemuxml2argv-cpu-cache-emulate-l2.xml | 20 +++++++ .../qemuxml2argv-cpu-cache-emulate-l3.args | 21 +++++++ .../qemuxml2argv-cpu-cache-emulate-l3.xml | 20 +++++++ .../qemuxml2argv-cpu-cache-passthrough-l3.xml | 20 +++++++ .../qemuxml2argv-cpu-cache-passthrough.args | 21 +++++++ .../qemuxml2argv-cpu-cache-passthrough.xml | 20 +++++++ .../qemuxml2argv-cpu-cache-passthrough2.args | 21 +++++++ .../qemuxml2argv-cpu-cache-passthrough2.xml | 20 +++++++ .../qemuxml2argv-cpu-cache-passthrough3.xml | 20 +++++++ tests/qemuxml2argvtest.c | 16 +++++ 34 files changed, 695 insertions(+), 3 deletions(-) create mode 100644 tests/genericxml2xmlindata/generic-cpu-cache-disable.xml create mode 100644 tests/genericxml2xmlindata/generic-cpu-cache-emulate.xml create mode 100644 tests/genericxml2xmlindata/generic-cpu-cache-passthrough.xml create mode 100644 tests/genericxml2xmloutdata/generic-cpu-cache-disable.xml create mode 100644 tests/genericxml2xmloutdata/generic-cpu-cache-emulate.xml create mode 100644 tests/genericxml2xmloutdata/generic-cpu-cache-passthrough.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-disable3.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-emulate-l3.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough-l3.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-cache-passthrough3.xml -- 2.12.2

4 11

[libvirt] [PATCH] Adding POWER9 cpu model to cpu_map.xml
by Kothapally Madhu Pavan 09 May '17

09 May '17

As POWER9 model is not available in cpu_map.xml virsh capabilities donot display the cpu model and vendor details. This patch provides those details --- src/cpu/cpu_map.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 7d5540a..29b5b59 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -1571,6 +1571,11 @@ <pvr value='0x004d0000' mask='0xffff0000'/> </model> + <model name='POWER9'> + <vendor name='IBM'/> + <pvr value='0x004e0000' mask='0xffff0000'/> + </model> +  <model name='POWERPC_e5500'> <vendor name='Freescale'/>

2 1

[libvirt] [PATCH v3 0/6] Add mdev reporting capability to the nodedev driver
by Erik Skultety 09 May '17

09 May '17

since v1: - dropped the <description> element from the parent device nested capability - added missing RNG schema and tests - updated the documentation to describe the MDEV elements in both the parent and the child since v2: - I further split our PCI sub-capability parser into more blocks as suggested - instead of one capability 'mdev' for both mdev device and physical parent I introduced 2, so we can do virsh nodedev-list --cap 'mdev_types' | 'mdev' to see either parent devices or the mediated devices themselves - other minor adjustments pointed out during review. Erik Erik Skultety (6): mdev: Pass a uuidstr rather than an mdev object to some util functions nodedev: conf: Split PCI sub-capability parsing to separate methods nodedev: Introduce new mdev_types and mdev nodedev capabilities nodedev: Introduce the mdev capability to a PCI parent device nodedev: Introduce mdev capability for mediated devices docs: Document the mediated devices within the nodedev driver docs/drvnodedev.html.in | 164 +++++++++++- docs/schemas/nodedev.rng | 43 ++++ include/libvirt/libvirt-nodedev.h | 2 + src/conf/node_device_conf.c | 279 +++++++++++++++++---- src/conf/node_device_conf.h | 29 ++- src/conf/virnodedeviceobj.c | 11 +- src/libvirt-nodedev.c | 2 + src/libvirt_private.syms | 1 + src/node_device/node_device_driver.c | 2 + src/node_device/node_device_udev.c | 165 +++++++++++- src/qemu/qemu_domain.c | 8 +- src/security/security_apparmor.c | 10 +- src/security/security_dac.c | 20 +- src/security/security_selinux.c | 20 +- src/util/virmdev.c | 21 +- src/util/virmdev.h | 4 +- .../mdev_3627463d_b7f0_4fea_b468_f1da537d301b.xml | 8 + .../pci_0000_02_10_7_mdev_types.xml | 32 +++ tests/nodedevxml2xmltest.c | 2 + tools/virsh-nodedev.c | 6 + 20 files changed, 712 insertions(+), 117 deletions(-) create mode 100644 tests/nodedevschemadata/mdev_3627463d_b7f0_4fea_b468_f1da537d301b.xml create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_mdev_types.xml -- 2.12.2

2 9

[libvirt] [PATCH] tests: fix virfilewrapper
by Roman Bogorodskiy 09 May '17

09 May '17

If __lxstat() and __xstat() functions are not available, build fails with: CC virfilewrapper.o virfilewrapper.c:180:5: error: no previous prototype for function '__lxstat' [-Werror,-Wmissing-prototypes] int __lxstat(int ver, const char *path, struct stat *sb) ^ virfilewrapper.c:208:5: error: no previous prototype for function '__xstat' [-Werror,-Wmissing-prototypes] int __xstat(int ver, const char *path, struct stat *sb) Luckily, we already check presence of these functions in configure using AC_CHECK_FUNCS, so just don't wrap these if they're not available. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- Pushed under build-breaker fix. tests/virfilewrapper.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c index 75c32bfca..5ea70b34d 100644 --- a/tests/virfilewrapper.c +++ b/tests/virfilewrapper.c @@ -177,6 +177,7 @@ int access(const char *path, int mode) return ret; } +#ifdef HAVE___LXSTAT int __lxstat(int ver, const char *path, struct stat *sb) { int ret = -1; @@ -190,6 +191,7 @@ int __lxstat(int ver, const char *path, struct stat *sb) return ret; } +#endif /* HAVE___LXSTAT */ int lstat(const char *path, struct stat *sb) { @@ -205,6 +207,7 @@ int lstat(const char *path, struct stat *sb) return ret; } +#ifdef HAVE___XSTAT int __xstat(int ver, const char *path, struct stat *sb) { int ret = -1; @@ -218,6 +221,7 @@ int __xstat(int ver, const char *path, struct stat *sb) return ret; } +#endif /* HAVE___XSTAT */ int stat(const char *path, struct stat *sb) { -- 2.12.1

1 0

[libvirt] [PATCH] util: Define SYSFS_SYSTEM_PATH unconditionally in virhostcpu
by Martin Kletzander 09 May '17

09 May '17

The code is already prepared to handle the non-existence of it. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed under the build-breaker rule. src/util/virhostcpu.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 317c52410a0b..aa9cfeac203c 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -188,10 +188,15 @@ virHostCPUGetStatsFreeBSD(int cpuNum, #endif /* __FreeBSD__ */ +/* + * Even though it doesn't exist on some platforms, the code is adjusted for + * graceful handling of that so that we don't have too many stub functions. + */ +#define SYSFS_SYSTEM_PATH "/sys/devices/system" + #ifdef __linux__ # define CPUINFO_PATH "/proc/cpuinfo" # define PROCSTAT_PATH "/proc/stat" -# define SYSFS_SYSTEM_PATH "/sys/devices/system" # define VIR_HOST_CPU_MASK_LEN 1024 # define LINUX_NB_CPU_STATS 4 -- 2.12.2

1 0

[libvirt] [PATCH] Don't use ceph-devel on Fedora
by Daniel P. Berrange 09 May '17

09 May '17

A previous commit changed the spec to use librbd1-devel on RHEL-7, since this replaces ceph-devel from RHEL-6: commit 6cfc8834c858849cc74c3082078dc91fb1cbae38 Author: Peter Krempa <pkrempa(a)redhat.com> Date: Thu Mar 5 11:40:54 2015 +0100 spec: Enable RBD storage driver in RHEL-7 Use correct package names too as they differ. RHEL-7 inherited this split from Fedora though, so it should have also made Fedora use the new names. This was missed, because Fedora still provides a (deprecated) back-compat RPM for ceph-devel that just pulls in librbd1-devel (and others). Fixing this stops libvirt pulling Java into the build root in Fedora. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index b249224..4c7b658 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -359,7 +359,7 @@ BuildRequires: parted-devel # For Multipath support BuildRequires: device-mapper-devel %if %{with_storage_rbd} - %if 0%{?rhel} >= 7 + %if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: librados2-devel BuildRequires: librbd1-devel %else -- 2.9.3

2 1

[libvirt] How about fuzz testing on oss-fuzz?
by Dan 09 May '17

09 May '17

Hi all, I have seen libxml2 has already been added as a project in oss-fuzz [1]. Any idea about libvirt? While we could do our own fuzzing of some form, do we want to also try it out using google's free resource? Dan [1] https://github.com/google/oss-fuzz

4 4

[libvirt] [PATCH] qemu: change the name of tap device for a tap and bridge network
by ZhiPeng Lu 09 May '17

09 May '17

Creating tap device and adding the device to bridge are not atomic operation. Similarly deleting tap device and removing it from bridge are not atomic operation. The Problem occurs when two vms start and shutdown. When one vm with the nic named "vnet0" stopping, it deleted tap device but not removing port from bridge. At this time, another vm created the tap device named "vnet0" and added port to the same bridge. Then, the first vm deleted the tap device from the same bridge. Finally, the tap device of the second vm don't attached to the bridge. So, we can add domid to vm's nic name. For example, the vm's domid is 1 and vnet0 is renamed to vnet1.0. Signed-off-by: ZhiPeng Lu <lu.zhipeng(a)zte.com.cn> --- src/qemu/qemu_interface.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index d0850c0..17d40a7 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -512,6 +512,7 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def, bool template_ifname = false; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); const char *tunpath = "/dev/net/tun"; + char *domIdPlusIndex = NULL; if (net->backend.tap) { tunpath = net->backend.tap; @@ -531,8 +532,13 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def, STRPREFIX(net->ifname, VIR_NET_GENERATED_PREFIX) || strchr(net->ifname, '%')) { VIR_FREE(net->ifname); - if (VIR_STRDUP(net->ifname, VIR_NET_GENERATED_PREFIX "%d") < 0) + if (virAsprintf(&domIdPlusIndex, "%s%d.%s", + VIR_NET_GENERATED_PREFIX, def->id, "%d") < 0) { + goto cleanup; + } + if (VIR_STRDUP(net->ifname, domIdPlusIndex) < 0) { goto cleanup; + } /* avoid exposing vnet%d in getXMLDesc or error outputs */ template_ifname = true; } @@ -594,6 +600,7 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def, ret = 0; cleanup: + VIR_FREE(domIdPlusIndex); if (ret < 0) { size_t i; for (i = 0; i < *tapfdSize && tapfd[i] >= 0; i++) -- 1.8.3.1

5 12

[libvirt] GSoC Project
by Venkat Datta 09 May '17

09 May '17

Hi Team, I'm an undergraduate student studying Computer Science at PES University , India . I had applied for the GSoC program this year . I'm happy to hear that my proposal has been accepted. The project idea i will be working on " Conversion to and from OCI-formatted containers " [ http://wiki.libvirt.org/page/Google_Summer_of_Code_Ideas#Conversion_to_and_… ]. I'm looking forward to learn more and keep contributing to the libvirt community. Thanks, Venkat Datta N H

2 1

[libvirt] [PATCH] Post-release version bump to 3.4.0
by Erik Skultety 09 May '17

09 May '17

Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed as trivial. configure.ac | 2 +- docs/news.xml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0b564a030..3329b1781 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [3.3.0], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [3.4.0], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff --git a/docs/news.xml b/docs/news.xml index fb4e792ec..2f0144972 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -33,6 +33,14 @@ --> <libvirt> + <release version="v3.4.0" date="unreleased"> + <section title="New features"> + </section> + <section title="Improvements"> + </section> + <section title="Bug fixes"> + </section> + </release> <release version="v3.3.0" date="2017-05-05"> <section title="New features"> <change> -- 2.12.2

1 0

[libvirt] [PATCH] configure: enforce presence of python for build
by Daniel P. Berrange 08 May '17

08 May '17

The API docs extractor, ESX code generator and keycodemapdb tools rely on python. Historically every platform that this present, but with switch to Python3 by default, we're increasingly seeing installs without a /usr/bin/python. This tightens up the check during configure, so it exits immediately if python is missing, rather than leaving an empty $(PYTHON) make variable which leads to more obscure errors later. Also add it as a build dep for Mingw, since Fedora build roots no longer get python2 by default. This was not previously a major problem, since both ESX & API generated files were included in EXTRA_DIST, but the keycodemapdb generated files are not, so we require python all the time now. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 5 ++++- mingw-libvirt.spec.in | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5f7a07a..0b564a0 100644 --- a/configure.ac +++ b/configure.ac @@ -624,9 +624,12 @@ fi dnl Allow perl/python overrides AC_PATH_PROGS([PYTHON], [python2 python]) +if test -z "$PYTHON"; then + AC_MSG_ERROR(['python' or 'python2' binary is required to build libvirt]) +fi AC_PATH_PROG([PERL], [perl]) if test -z "$PERL"; then - AC_MSG_ERROR([Failed to find perl.]) + AC_MSG_ERROR(['perl' binary is required to build libvirt]) fi LIBVIRT_ARG_WITH([TEST_SUITE], [build test suite by default], [check]) diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index dec799b..302f663 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -54,6 +54,7 @@ BuildRequires: mingw64-portablexdr BuildRequires: pkgconfig # Need native version for msgfmt BuildRequires: gettext +BuildRequires: python BuildRequires: perl BuildRequires: perl(Getopt::Long) %if 0%{?enable_autotools} -- 2.9.3

2 1

[libvirt] [PATCH v2] qemu: clean up network interfaces before qemuProcessKill is called in qemuProcessStop
by ZhiPeng Lu 08 May '17

08 May '17

In qemuProcessStop we explicitly remove the port from the openvswitch bridge after qemuProcessKill is called. But there is a certain interval of time between deleting tap device and removing it from bridge. The problem occurs when two vms start and shutdown with the same name's network interface attached to the same openvswitch bridge. When one vm with the nic named "vnet0" stopping, it deleted tap device without timely removing the port from bridge. At this time, another vm created the tap device named "vnet0" and added port to the same bridge. Then, the first vm removed the port from the same bridge. Finally, the tap device of the second vm did not attached to the bridge. We need to delete the bridge port before deleting the tap device instead of after. So what's needed is to move the loop in qemuProcessStop that cleans up network interfaces so that it happens before qemuProcessKill is called. Signed-off-by: Zhipeng Lu <lu.zhipeng(a)zte.com.cn> Signed-off-by: Laine Stump <laine(a)laine.org> --- src/qemu/qemu_process.c | 99 ++++++++++++++++++++++++------------------------- 1 file changed, 49 insertions(+), 50 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 53170d7..f76ced1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6253,56 +6253,6 @@ void qemuProcessStop(virQEMUDriverPtr driver, qemuProcessCleanupChardevDevice, NULL)); - - /* shut it off for sure */ - ignore_value(qemuProcessKill(vm, - VIR_QEMU_PROCESS_KILL_FORCE| - VIR_QEMU_PROCESS_KILL_NOCHECK)); - - qemuDomainCleanupRun(driver, vm); - - /* Stop autodestroy in case guest is restarted */ - qemuProcessAutoDestroyRemove(driver, vm); - - /* now that we know it's stopped call the hook if present */ - if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { - char *xml = qemuDomainDefFormatXML(driver, vm->def, 0); - - /* we can't stop the operation even if the script raised an error */ - ignore_value(virHookCall(VIR_HOOK_DRIVER_QEMU, vm->def->name, - VIR_HOOK_QEMU_OP_STOPPED, VIR_HOOK_SUBOP_END, - NULL, xml, NULL)); - VIR_FREE(xml); - } - - /* Reset Security Labels unless caller don't want us to */ - if (!(flags & VIR_QEMU_PROCESS_STOP_NO_RELABEL)) - qemuSecurityRestoreAllLabel(driver, vm, - !!(flags & VIR_QEMU_PROCESS_STOP_MIGRATED)); - - qemuSecurityReleaseLabel(driver->securityManager, vm->def); - - for (i = 0; i < vm->def->ndisks; i++) { - virDomainDeviceDef dev; - virDomainDiskDefPtr disk = vm->def->disks[i]; - - dev.type = VIR_DOMAIN_DEVICE_DISK; - dev.data.disk = disk; - ignore_value(qemuRemoveSharedDevice(driver, &dev, vm->def->name)); - } - - /* Clear out dynamically assigned labels */ - for (i = 0; i < vm->def->nseclabels; i++) { - if (vm->def->seclabels[i]->type == VIR_DOMAIN_SECLABEL_DYNAMIC) - VIR_FREE(vm->def->seclabels[i]->label); - VIR_FREE(vm->def->seclabels[i]->imagelabel); - } - - virStringListFree(priv->qemuDevices); - priv->qemuDevices = NULL; - - qemuHostdevReAttachDomainDevices(driver, vm->def); - def = vm->def; for (i = 0; i < def->nnets; i++) { virDomainNetDefPtr net = def->nets[i]; @@ -6360,6 +6310,55 @@ void qemuProcessStop(virQEMUDriverPtr driver, networkReleaseActualDevice(vm->def, net); } + /* shut it off for sure */ + ignore_value(qemuProcessKill(vm, + VIR_QEMU_PROCESS_KILL_FORCE| + VIR_QEMU_PROCESS_KILL_NOCHECK)); + + qemuDomainCleanupRun(driver, vm); + + /* Stop autodestroy in case guest is restarted */ + qemuProcessAutoDestroyRemove(driver, vm); + + /* now that we know it's stopped call the hook if present */ + if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { + char *xml = qemuDomainDefFormatXML(driver, vm->def, 0); + + /* we can't stop the operation even if the script raised an error */ + ignore_value(virHookCall(VIR_HOOK_DRIVER_QEMU, vm->def->name, + VIR_HOOK_QEMU_OP_STOPPED, VIR_HOOK_SUBOP_END, + NULL, xml, NULL)); + VIR_FREE(xml); + } + + /* Reset Security Labels unless caller don't want us to */ + if (!(flags & VIR_QEMU_PROCESS_STOP_NO_RELABEL)) + qemuSecurityRestoreAllLabel(driver, vm, + !!(flags & VIR_QEMU_PROCESS_STOP_MIGRATED)); + + qemuSecurityReleaseLabel(driver->securityManager, vm->def); + + for (i = 0; i < vm->def->ndisks; i++) { + virDomainDeviceDef dev; + virDomainDiskDefPtr disk = vm->def->disks[i]; + + dev.type = VIR_DOMAIN_DEVICE_DISK; + dev.data.disk = disk; + ignore_value(qemuRemoveSharedDevice(driver, &dev, vm->def->name)); + } + + /* Clear out dynamically assigned labels */ + for (i = 0; i < vm->def->nseclabels; i++) { + if (vm->def->seclabels[i]->type == VIR_DOMAIN_SECLABEL_DYNAMIC) + VIR_FREE(vm->def->seclabels[i]->label); + VIR_FREE(vm->def->seclabels[i]->imagelabel); + } + + virStringListFree(priv->qemuDevices); + priv->qemuDevices = NULL; + + qemuHostdevReAttachDomainDevices(driver, vm->def); + retry: if ((ret = qemuRemoveCgroup(vm)) < 0) { if (ret == -EBUSY && (retries++ < 5)) { -- 1.8.3.1

3 5

[libvirt] [PATCH] Detect VMDK version 3 files
by Daniel P. Berrange 08 May '17

08 May '17

The metadata libvirt cares about is identical for version 3 as for previous versions, so we merely need list the new version number. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virstoragefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 94a77ce..3109b40 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -374,7 +374,7 @@ static struct FileTypeInfo const fileTypeInfo[] = { }, [VIR_STORAGE_FILE_VMDK] = { 0, "KDMV", NULL, - LV_LITTLE_ENDIAN, 4, 4, {1, 2}, + LV_LITTLE_ENDIAN, 4, 4, {1, 2, 3}, 4+4+4, 8, 512, NULL, vmdk4GetBackingStore, NULL }, }; -- 2.9.3

1 0

[libvirt] [PATCH] Add "io" option to virsh attach-disk sub-command.
by Gordon Messmer 07 May '17

07 May '17

--- tools/virsh-domain.c | 14 +++++++++++--- tools/virsh.pod | 2 ++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0d19d0e..d2a2a05 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -267,6 +267,10 @@ static const vshCmdOptDef opts_attach_disk[] = { .type = VSH_OT_STRING, .help = N_("cache mode of disk device") }, + {.name = "io", + .type = VSH_OT_STRING, + .help = N_("io mode of disk device") + }, {.name = "type", .type = VSH_OT_STRING, .help = N_("target device type") @@ -504,8 +508,9 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom = NULL; const char *source = NULL, *target = NULL, *driver = NULL, *subdriver = NULL, *type = NULL, *mode = NULL, - *iothread = NULL, *cache = NULL, *serial = NULL, - *straddr = NULL, *wwn = NULL, *targetbus = NULL; + *iothread = NULL, *cache = NULL, *io = NULL, + *serial = NULL, *straddr = NULL, *wwn = NULL, + *targetbus = NULL; struct DiskAddress diskAddr; bool isFile = false, functionReturn = false; int ret; @@ -537,6 +542,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) vshCommandOptStringReq(ctl, cmd, "mode", &mode) < 0 || vshCommandOptStringReq(ctl, cmd, "iothread", &iothread) < 0 || vshCommandOptStringReq(ctl, cmd, "cache", &cache) < 0 || + vshCommandOptStringReq(ctl, cmd, "io", &io) < 0 || vshCommandOptStringReq(ctl, cmd, "serial", &serial) < 0 || vshCommandOptStringReq(ctl, cmd, "wwn", &wwn) < 0 || vshCommandOptStringReq(ctl, cmd, "address", &straddr) < 0 || @@ -579,7 +585,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) virBufferAddLit(&buf, ">\n"); virBufferAdjustIndent(&buf, 2); - if (driver || subdriver || iothread || cache) { + if (driver || subdriver || iothread || cache || io) { virBufferAddLit(&buf, "<driver"); if (driver) @@ -590,6 +596,8 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) virBufferAsprintf(&buf, " iothread='%s'", iothread); if (cache) virBufferAsprintf(&buf, " cache='%s'", cache); + if (io) + virBufferAsprintf(&buf, " io='%s'", io); virBufferAddLit(&buf, "/>\n"); } diff --git a/tools/virsh.pod b/tools/virsh.pod index cd1f25f..9656411 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2860,6 +2860,8 @@ I<mode> can specify the two specific mode I<readonly> or I<shareable>. I<sourcetype> can indicate the type of source (block|file) I<cache> can be one of "default", "none", "writethrough", "writeback", "directsync" or "unsafe". +I<io> io is "threads", or "native" and selects between pthread based disk +I/O and native Linux AIO. I<iothread> is the number within the range of domain IOThreads to which this disk may be attached (QEMU only). I<serial> is the serial of disk device. I<wwn> is the wwn of disk device. -- 2.9.3

1 0

[libvirt] vmdk matches vmdk magic, but version is wrong
by Yaniv Kaul 07 May '17

07 May '17

ykaul.tlv.redhat.com libvirtd[23662]: 23688: warning : virStorageFileProbeFormatFromBuf:834 : File /home/ykaul/Downloads/Dallas/Dallas-VM-disk001.vmdk matches vmdk magic, but version is wrong. Please report new version to libvir-list(a)redhat.com I hope this helps: 00000000 4B 44 4D 56 03 00 00 00 01 00 03 00 00 00 80 02 00 00 00 00 80 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 02 00 00 00 00 00 00 00 KDMV........................................ 0000002C 00 02 00 00 00 00 00 00 00 00 00 00 FF FF FF FF FF FF FF FF 80 00 00 00 00 00 00 00 00 0A 20 0D 0A 01 00 00 00 00 00 00 00 00 00 00 .............................. ............. 00000058 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ............................................ 00000084 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ............................................ 000000B0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ............................................ 000000DC 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ............................................ 00000108 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ............................................ 00000134 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ............................................ 00000160 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ............................................ 0000018C 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ............................................ 000001B8 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ............................................ 000001E4 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 23 20 44 69 73 6B 20 44 65 73 63 72 69 70 74 6F ............................# Disk Descripto 00000210 72 46 69 6C 65 0A 76 65 72 73 69 6F 6E 3D 31 0A 43 49 44 3D 32 63 33 65 32 30 34 37 0A 70 61 72 65 6E 74 43 49 44 3D 66 66 66 66 66 rFile.version=1.CID=2c3e2047.parentCID=fffff 0000023C 66 66 66 0A 63 72 65 61 74 65 54 79 70 65 3D 22 73 74 72 65 61 6D 4F 70 74 69 6D 69 7A 65 64 22 0A 0A 23 20 45 78 74 65 6E 74 20 64 fff.createType="streamOptimized"..# Extent d 00000268 65 73 63 72 69 70 74 69 6F 6E 0A 52 44 4F 4E 4C 59 20 34 31 39 34 33 30 34 30 20 53 50 41 52 53 45 20 22 44 61 6C 6C 61 73 2D 56 4D escription.RDONLY 41943040 SPARSE "Dallas-VM 00000294 2D 64 69 73 6B 30 30 31 2E 76 6D 64 6B 22 0A 0A 23 20 54 68 65 20 64 69 73 6B 20 44 61 74 61 20 42 61 73 65 20 0A 23 44 44 42 0A 0A -disk001.vmdk"..# The disk Data Base .#DDB.. 000002C0 64 64 62 2E 76 69 72 74 75 61 6C 48 57 56 65 72 73 69 6F 6E 20 3D 20 22 34 22 0A 64 64 62 2E 61 64 61 70 74 65 72 54 79 70 65 3D 22 ddb.virtualHWVersion = "4".ddb.adapterType=" 000002EC 69 64 65 22 0A 64 64 62 2E 67 65 6F 6D 65 74 72 79 2E 63 79 6C 69 6E 64 65 72 73 3D 22 31 36 33 38 33 22 0A 64 64 62 2E 67 65 6F 6D ide".ddb.geometry.cylinders="16383".ddb.geom 00000318 65 74 72 79 2E 68 65 61 64 73 3D 22 31 36 22 0A 64 64 62 2E 67 65 6F 6D 65 74 72 79 2E 73 65 63 74 6F 72 73 3D 22 36 33 22 0A 64 64 etry.heads="16".ddb.geometry.sectors="63".dd 00000344 62 2E 67 65 6F 6D 65 74 72 79 2E 62 69 6F 73 43 79 6C 69 6E 64 65 72 73 3D 22 31 30 32 34 22 0A 64 64 62 2E 67 65 6F 6D 65 74 72 79 b.geometry.biosCylinders="1024".ddb.geometry 00000370 2E 62 69 6F 73 48 65 61 64 73 3D 22 32 35 35 22 0A 64 64 62 2E 67 65 6F 6D 65 74 72 79 2E 62 69 6F 73 53 65 63 74 6F 72 73 3D 22 36 .biosHeads="255".ddb.geometry.biosSectors="6 0000039C 33 22 0A 64 64 62 2E 75 75 69 64 2E 69 6D 61 67 65 3D 22 39 30 33 33 38 66 61 63 2D 66 31 38 38 2D 34 61 30 61 2D 62 37 31 36 2D 34 3".ddb.uuid.image="90338fac-f188-4a0a-b716-4 000003C8 64 38 64 63 61 38 61 37 61 36 61 22 0A 64 64 62 2E 75 75 69 64 2E 70 61 72 65 6E 74 3D 22 30 30 30 30 30 30 30 30 2D 30 30 30 30 2D d8dca8a7a6a".ddb.uuid.parent="00000000-0000- 000003F4 30 30 30 30 2D 30 30 30 30 2D 30 30 30 30 30 30 30 30 30 30 30 30 22 0A 64 64 62 2E 75 75 69 64 2E 6D 6F 64 69 66 69 63 61 74 69 6F 0000-0000-000000000000".ddb.uuid.modificatio 00000420 6E 3D 22 30 30 30 30 30 30 30 30 2D 30 30 30 30 2D 30 30 30 30 2D 30 30 30 30 2D 30 30 30 30 30 30 30 30 30 30 30 30 22 0A 64 64 62 n="00000000-0000-0000-0000-000000000000".ddb 0000044C 2E 75 75 69 64 2E 70 61 72 65 6E 74 6D 6F 64 69 66 69 63 61 74 69 6F 6E 3D 22 30 30 30 30 30 30 30 30 2D 30 30 30 30 2D 30 30 30 30 .uuid.parentmodification="00000000-0000-0000 00000478 2D 30 30 30 30 2D 30 30 30 30 30 30 30 30 30 30 30 30 22 0A 64 64 62 2E 63 6F 6D 6D 65 6E 74 3D 22 22 0A 00 00 00 00 00 00 00 00 00 -0000-000000000000".ddb.comment="".......... libvirt version: 2.2.0, package: 2.fc25 (Fedora Project, 2016-11-14-21:04:29, buildvm-25.phx2.fedoraproject.org

1 0

[libvirt] Release of libvirt-3.3.0
by Daniel Veillard 06 May '17

06 May '17

I did the release yesterday evening, just sending this mail now. The release has been tagged in git, I have pushed signed tarball and rpms to the usual place at : ftp://libvirt.org/libvirt/ I also pushed version 3.3.0 of the python bindings, same tagged in git and signed tarball and rpms should be in their respective place: ftp://libvirt.org/libvirt/python/ this is a balanced release with a fair amount of both new features and improvements, in addition to a set of bug fixes: * New features - net: Add support for coalesce settings Enabling data batching through these settings can improve network performance for guests. - qemu: Add support for guest CPU cache specification This features allows fine-grained control of the cache behavior of the guest CPU. - qemu: Add support for the qemu-xhci USB controller * Improvements - hyperv: Support Hyper-V 2012 and newer Starting with Hyper-V 2012 the API has changed causing the existing driver to be unable to send and process requests properly. This has been resolved by adding abstractions to handle the differences and ease handling such breaks if they happen in the future. - libxl: Add support for nested HVM domains Xen has supported nested HVM domains since version 4.4. The libvirt libxl driver now supports nested HVM domains by specifying the host-passthrough CPU mode when defining a domain. - qemu: Implement ACPI support for aarch64 guests Up until this point, ACPI support was only advertised for x86_64 guests and disabling it for aarch64 guests was not possible at all. - vz: Add support for changing the number of vCPUs - qemu: Automatically choose the best USB controller for guests The recently introduced qemu-xhci USB controller is the best choice for both ppc64 and aarch64 guests, so use it by default on those architectures if available. - daemon: Increase default task limit for libvirtd The default number of tasks for the pids cgroup controller is 512, which libvirtd can quickly bump into when starting lots of guests. Raise the limit to a more reasonable 32768. - docs: Include man pages describing key code names and values - virsh: Report initialization errors Sometimes virsh might be unable to start: when that happens, report useful diagnostics instead of failing silently. * Bug fixes - nss: Don't require a network restart for libvirt_guest Previously, the libvirt_guest NSS module would only work properly after the corresponding network had been restarted; now newly started guests will be reported correctly right away. - storage: Remove unavailable transient pools after restart Solve an issue where transient storage pools would be stuck in an unmanageable state if the source disappeared and libvirtd was subsequently restarted. - storage: Fix capacity value for LUKS encrypted volumes The 'capacity' value (e.g. guest logical size) for a LUKS volume is smaller than the 'physical' value of the file in the file system, so we need to account for that. - qemu: Fix regression when hyperv/vendor_id feature is used Guests using the feature would not be started at all; it is now possible to start them as expected. - qemu: Do not crash on USB address with no port and invalid bus - crypto: Always pad data before encrypting it If this step is not performed, when the data length matches the chunk size the decryption routines will misinterpret the last byte of data as the padding length and fail to decode it correctly. Thanks everybody for your help toward this release, be it with patches, documentation, bug reports, reviews ideas, etc ... Enjoy ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] libxl: add default controllers for USB devices
by Jim Fehlig 05 May '17

05 May '17

Attempting to start a domain with USB hostdevs but no USB controllers fails with the rather cryptic error libxl: error: libxl_qmp.c:287:qmp_handle_error_response: received an error message from QMP server: Bus 'xenusb-0.0' not found This can be fixed by creating default USB controllers. When no USB controllers are defined, create the number of 8 port controllers necessary to accommodate the number of defined USB devices. Note that USB controllers are already created as needed in the domainAttachDevice code path. E.g. a USB controller will be created, if necessary, when attaching a USB device with 'virsh attach-device dom usbdev.xml'. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_conf.c | 80 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 69 insertions(+), 11 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 4bab651b3..ed36dd1ff 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1786,34 +1786,92 @@ libxlMakeUSBController(virDomainControllerDefPtr controller, } static int +libxlMakeDefaultUSBControllers(virDomainDefPtr def, + libxl_domain_config *d_config) +{ + virDomainControllerDefPtr l_controller = NULL; + libxl_device_usbctrl *x_controllers = NULL; + size_t nusbdevs = 0; + size_t ncontrollers; + size_t i; + + for (i = 0; i < def->nhostdevs; i++) { + if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) + nusbdevs++; + } + + /* No controllers needed if there are no USB devs */ + if (nusbdevs == 0) + return 0; + + /* Create USB controllers with 8 ports */ + ncontrollers = VIR_DIV_UP(nusbdevs, 8); + if (VIR_ALLOC_N(x_controllers, ncontrollers) < 0) + return -1; + + for (i = 0; i < ncontrollers; i++) { + if (!(l_controller = virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER_TYPE_USB))) + goto error; + + l_controller->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_QUSB2; + l_controller->idx = i; + l_controller->opts.usbopts.ports = 8; + + libxl_device_usbctrl_init(&x_controllers[i]); + + if (libxlMakeUSBController(l_controller, &x_controllers[i]) < 0) + goto error; + + virDomainControllerInsertPreAlloced(def, l_controller); + l_controller = NULL; + } + + d_config->usbctrls = x_controllers; + d_config->num_usbctrls = ncontrollers; + return 0; + + error: + virDomainControllerDefFree(l_controller); + for (i = 0; i < ncontrollers; i++) + libxl_device_usbctrl_dispose(&x_controllers[i]); + VIR_FREE(x_controllers); + return -1; +} + +static int libxlMakeUSBControllerList(virDomainDefPtr def, libxl_domain_config *d_config) { virDomainControllerDefPtr *l_controllers = def->controllers; size_t ncontrollers = def->ncontrollers; size_t nusbctrls = 0; libxl_device_usbctrl *x_usbctrls; - size_t i; - - if (ncontrollers == 0) - return 0; - - if (VIR_ALLOC_N(x_usbctrls, ncontrollers) < 0) - return -1; + size_t i, j; for (i = 0; i < ncontrollers; i++) { + if (l_controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) + nusbctrls++; + } + + if (nusbctrls == 0) + return libxlMakeDefaultUSBControllers(def, d_config); + + if (VIR_ALLOC_N(x_usbctrls, nusbctrls) < 0) + return -1; + + for (i = 0, j = 0; i < ncontrollers && j < nusbctrls; i++) { if (l_controllers[i]->type != VIR_DOMAIN_CONTROLLER_TYPE_USB) continue; - libxl_device_usbctrl_init(&x_usbctrls[nusbctrls]); + libxl_device_usbctrl_init(&x_usbctrls[j]); if (libxlMakeUSBController(l_controllers[i], - &x_usbctrls[nusbctrls]) < 0) + &x_usbctrls[j]) < 0) goto error; - nusbctrls++; + j++; } - VIR_SHRINK_N(x_usbctrls, ncontrollers, ncontrollers - nusbctrls); d_config->usbctrls = x_usbctrls; d_config->num_usbctrls = nusbctrls; -- 2.11.0

1 1

[libvirt] [PATCH go-xml] remove superfluous state & omitempty entries
by Ryan Goodfellow 05 May '17

05 May '17

This commit removes the superfluous state and omit entries from my last commit. It factors the 'state' data member into a DomainFeatureState struct and only uses that struct where necessary e.g. HyperV features as well as a few top level features such as PMU, HAP etc. The HyperV suffix has also been added to features that are specific to HyperV. --- domain.go | 62 +++++++++++++++++++++++++++++----------------------------- domain_test.go | 26 +++++++++++++----------- 2 files changed, 46 insertions(+), 42 deletions(-) diff --git a/domain.go b/domain.go index c9ffaef..b4b2256 100644 --- a/domain.go +++ b/domain.go @@ -372,61 +372,61 @@ type DomainCPU struct { } type DomainFeature struct { +} + +type DomainFeatureState struct { State string `xml:"state,attr,omitempty"` } type DomainFeatureAPIC struct { - DomainFeature EOI string `xml:"eio,attr,omitempty"` } -type DomainFeatureVendorId struct { - DomainFeature +type DomainFeatureHyperVVendorId struct { + DomainFeatureState Value string `xml:"value,attr,omitempty"` } -type DomainFeatureSpinlocks struct { - DomainFeature +type DomainFeatureHyperVSpinlocks struct { + DomainFeatureState Retries uint `xml:"retries,attr,omitempty"` } type DomainFeatureHyperV struct { DomainFeature - Relaxed *DomainFeature `xml:"relaxed,omitempty"` - VAPIC *DomainFeature `xml:"vapic,omitempty"` - Spinlocks *DomainFeatureSpinlocks `xml:"spinlocks,omitempty"` - VPIndex *DomainFeature `xml:"vpindex,omitempty"` - Runtime *DomainFeature `xml:"runtime,omitempty"` - Synic *DomainFeature `xml:"synic,omitempty"` - STimer *DomainFeature `xml:"stimer,omitempty"` - Reset *DomainFeature `xml:"reset,omitempty"` - VendorId *DomainFeatureVendorId `xml:"vendor_id,omitempty"` + Relaxed *DomainFeatureState `xml:"relaxed"` + VAPIC *DomainFeatureState `xml:"vapic"` + Spinlocks *DomainFeatureHyperVSpinlocks `xml:"spinlocks"` + VPIndex *DomainFeatureState `xml:"vpindex"` + Runtime *DomainFeatureState `xml:"runtime"` + Synic *DomainFeatureState `xml:"synic"` + STimer *DomainFeatureState `xml:"stimer"` + Reset *DomainFeatureState `xml:"reset"` + VendorId *DomainFeatureHyperVVendorId `xml:"vendor_id"` } type DomainFeatureKVM struct { - DomainFeature - Hidden *DomainFeature `xml:"hidden,omitempty"` + Hidden *DomainFeatureState `xml:"hidden"` } type DomainFeatureGIC struct { - DomainFeature Version string `xml:"version,attr,omitempty"` } type DomainFeatureList struct { - PAE *DomainFeature `xml:"pae,omitempty"` - ACPI *DomainFeature `xml:"acpi,omitempty"` - APIC *DomainFeatureAPIC `xml:"apic,omitempty"` - HAP *DomainFeature `xml:"hap,omitempty"` - Viridian *DomainFeature `xml:"viridian,omitempty"` - PrivNet *DomainFeature `xml:"privnet,omitempty"` - HyperV *DomainFeatureHyperV `xml:"hyperv,omitempty"` - KVM *DomainFeatureKVM `xml:"kvm,omitempty"` - PVSpinlock *DomainFeature `xml:"pvspinlock,omitempty"` - PMU *DomainFeature `xml:"pmu,omitempty"` - VMPort *DomainFeature `xml:"vmport,omitempty"` - GIC *DomainFeatureGIC `xml:"gic,omitempty"` - SMM *DomainFeature `xml:"smm,omitempty"` + PAE *DomainFeature `xml:"pae"` + ACPI *DomainFeature `xml:"acpi"` + APIC *DomainFeatureAPIC `xml:"apic"` + HAP *DomainFeatureState `xml:"hap"` + Viridian *DomainFeature `xml:"viridian"` + PrivNet *DomainFeature `xml:"privnet"` + HyperV *DomainFeatureHyperV `xml:"hyperv"` + KVM *DomainFeatureKVM `xml:"kvm"` + PVSpinlock *DomainFeatureState `xml:"pvspinlock"` + PMU *DomainFeatureState `xml:"pmu"` + VMPort *DomainFeatureState `xml:"vmport"` + GIC *DomainFeatureGIC `xml:"gic"` + SMM *DomainFeatureState `xml:"smm"` } type Domain struct { @@ -446,7 +446,7 @@ type Domain struct { OnPoweroff string `xml:"on_poweroff,omitempty"` OnReboot string `xml:"on_reboot,omitempty"` OnCrash string `xml:"on_crash,omitempty"` - Features *DomainFeatureList `xml:"features,omitempty"` + Features *DomainFeatureList `xml:"features"` } func (d *Domain) Unmarshal(doc string) error { diff --git a/domain_test.go b/domain_test.go index e25007e..11156c1 100644 --- a/domain_test.go +++ b/domain_test.go @@ -753,22 +753,26 @@ var domainTestData = []struct { PAE: &DomainFeature{}, ACPI: &DomainFeature{}, APIC: &DomainFeatureAPIC{}, - HAP: &DomainFeature{}, + HAP: &DomainFeatureState{}, PrivNet: &DomainFeature{}, HyperV: &DomainFeatureHyperV{ - Relaxed: &DomainFeature{State: "on"}, - VAPIC: &DomainFeature{State: "on"}, - Spinlocks: &DomainFeatureSpinlocks{DomainFeature{State: "on"}, 4096}, - VPIndex: &DomainFeature{State: "on"}, - Runtime: &DomainFeature{State: "on"}, - Synic: &DomainFeature{State: "on"}, - Reset: &DomainFeature{State: "on"}, - VendorId: &DomainFeatureVendorId{DomainFeature{State: "on"}, "KVM Hv"}, + Relaxed: &DomainFeatureState{State: "on"}, + VAPIC: &DomainFeatureState{State: "on"}, + Spinlocks: &DomainFeatureHyperVSpinlocks{ + DomainFeatureState{State: "on"}, 4096, + }, + VPIndex: &DomainFeatureState{State: "on"}, + Runtime: &DomainFeatureState{State: "on"}, + Synic: &DomainFeatureState{State: "on"}, + Reset: &DomainFeatureState{State: "on"}, + VendorId: &DomainFeatureHyperVVendorId{ + DomainFeatureState{State: "on"}, "KVM Hv", + }, }, KVM: &DomainFeatureKVM{ - Hidden: &DomainFeature{State: "on"}, + Hidden: &DomainFeatureState{State: "on"}, }, - PVSpinlock: &DomainFeature{State: "on"}, + PVSpinlock: &DomainFeatureState{State: "on"}, GIC: &DomainFeatureGIC{Version: "2"}, }, }, -- 2.11.0

2 1

[libvirt] [PATCH go-xml] add support for domain features
by Ryan Goodfellow 05 May '17

05 May '17

This commit adds support for domain features. It does so by introducing a new family of types DomainFeature*. The aggregate type DomainFeatureList has been added to the Domain type to plumb in the new type family. Testing has also been added in domain_test.go --- domain.go | 91 +++++++++++++++++++++++++++++++++++++++++++++++----------- domain_test.go | 55 +++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 16 deletions(-) diff --git a/domain.go b/domain.go index cccd9a6..c9ffaef 100644 --- a/domain.go +++ b/domain.go @@ -371,23 +371,82 @@ type DomainCPU struct { Features []DomainCPUFeature `xml:"feature"` } +type DomainFeature struct { + State string `xml:"state,attr,omitempty"` +} + +type DomainFeatureAPIC struct { + DomainFeature + EOI string `xml:"eio,attr,omitempty"` +} + +type DomainFeatureVendorId struct { + DomainFeature + Value string `xml:"value,attr,omitempty"` +} + +type DomainFeatureSpinlocks struct { + DomainFeature + Retries uint `xml:"retries,attr,omitempty"` +} + +type DomainFeatureHyperV struct { + DomainFeature + Relaxed *DomainFeature `xml:"relaxed,omitempty"` + VAPIC *DomainFeature `xml:"vapic,omitempty"` + Spinlocks *DomainFeatureSpinlocks `xml:"spinlocks,omitempty"` + VPIndex *DomainFeature `xml:"vpindex,omitempty"` + Runtime *DomainFeature `xml:"runtime,omitempty"` + Synic *DomainFeature `xml:"synic,omitempty"` + STimer *DomainFeature `xml:"stimer,omitempty"` + Reset *DomainFeature `xml:"reset,omitempty"` + VendorId *DomainFeatureVendorId `xml:"vendor_id,omitempty"` +} + +type DomainFeatureKVM struct { + DomainFeature + Hidden *DomainFeature `xml:"hidden,omitempty"` +} + +type DomainFeatureGIC struct { + DomainFeature + Version string `xml:"version,attr,omitempty"` +} + +type DomainFeatureList struct { + PAE *DomainFeature `xml:"pae,omitempty"` + ACPI *DomainFeature `xml:"acpi,omitempty"` + APIC *DomainFeatureAPIC `xml:"apic,omitempty"` + HAP *DomainFeature `xml:"hap,omitempty"` + Viridian *DomainFeature `xml:"viridian,omitempty"` + PrivNet *DomainFeature `xml:"privnet,omitempty"` + HyperV *DomainFeatureHyperV `xml:"hyperv,omitempty"` + KVM *DomainFeatureKVM `xml:"kvm,omitempty"` + PVSpinlock *DomainFeature `xml:"pvspinlock,omitempty"` + PMU *DomainFeature `xml:"pmu,omitempty"` + VMPort *DomainFeature `xml:"vmport,omitempty"` + GIC *DomainFeatureGIC `xml:"gic,omitempty"` + SMM *DomainFeature `xml:"smm,omitempty"` +} + type Domain struct { - XMLName xml.Name `xml:"domain"` - Type string `xml:"type,attr,omitempty"` - Name string `xml:"name"` - UUID string `xml:"uuid,omitempty"` - Memory *DomainMemory `xml:"memory"` - CurrentMemory *DomainMemory `xml:"currentMemory"` - MaximumMemory *DomainMaxMemory `xml:"maxMemory"` - VCPU *DomainVCPU `xml:"vcpu"` - CPU *DomainCPU `xml:"cpu"` - Resource *DomainResource `xml:"resource"` - Devices *DomainDeviceList `xml:"devices"` - OS *DomainOS `xml:"os"` - SysInfo *DomainSysInfo `xml:"sysinfo"` - OnPoweroff string `xml:"on_poweroff,omitempty"` - OnReboot string `xml:"on_reboot,omitempty"` - OnCrash string `xml:"on_crash,omitempty"` + XMLName xml.Name `xml:"domain"` + Type string `xml:"type,attr,omitempty"` + Name string `xml:"name"` + UUID string `xml:"uuid,omitempty"` + Memory *DomainMemory `xml:"memory"` + CurrentMemory *DomainMemory `xml:"currentMemory"` + MaximumMemory *DomainMaxMemory `xml:"maxMemory"` + VCPU *DomainVCPU `xml:"vcpu"` + CPU *DomainCPU `xml:"cpu"` + Resource *DomainResource `xml:"resource"` + Devices *DomainDeviceList `xml:"devices"` + OS *DomainOS `xml:"os"` + SysInfo *DomainSysInfo `xml:"sysinfo"` + OnPoweroff string `xml:"on_poweroff,omitempty"` + OnReboot string `xml:"on_reboot,omitempty"` + OnCrash string `xml:"on_crash,omitempty"` + Features *DomainFeatureList `xml:"features,omitempty"` } func (d *Domain) Unmarshal(doc string) error { diff --git a/domain_test.go b/domain_test.go index 06d585c..e25007e 100644 --- a/domain_test.go +++ b/domain_test.go @@ -745,6 +745,61 @@ var domainTestData = []struct { `</domain>`, }, }, + { + Object: &Domain{ + Type: "kvm", + Name: "test", + Features: &DomainFeatureList{ + PAE: &DomainFeature{}, + ACPI: &DomainFeature{}, + APIC: &DomainFeatureAPIC{}, + HAP: &DomainFeature{}, + PrivNet: &DomainFeature{}, + HyperV: &DomainFeatureHyperV{ + Relaxed: &DomainFeature{State: "on"}, + VAPIC: &DomainFeature{State: "on"}, + Spinlocks: &DomainFeatureSpinlocks{DomainFeature{State: "on"}, 4096}, + VPIndex: &DomainFeature{State: "on"}, + Runtime: &DomainFeature{State: "on"}, + Synic: &DomainFeature{State: "on"}, + Reset: &DomainFeature{State: "on"}, + VendorId: &DomainFeatureVendorId{DomainFeature{State: "on"}, "KVM Hv"}, + }, + KVM: &DomainFeatureKVM{ + Hidden: &DomainFeature{State: "on"}, + }, + PVSpinlock: &DomainFeature{State: "on"}, + GIC: &DomainFeatureGIC{Version: "2"}, + }, + }, + Expected: []string{ + `<domain type="kvm">`, + ` <name>test</name>`, + ` <features>`, + ` <pae></pae>`, + ` <acpi></acpi>`, + ` <apic></apic>`, + ` <hap></hap>`, + ` <privnet></privnet>`, + ` <hyperv>`, + ` <relaxed state="on"></relaxed>`, + ` <vapic state="on"></vapic>`, + ` <spinlocks state="on" retries="4096"></spinlocks>`, + ` <vpindex state="on"></vpindex>`, + ` <runtime state="on"></runtime>`, + ` <synic state="on"></synic>`, + ` <reset state="on"></reset>`, + ` <vendor_id state="on" value="KVM Hv"></vendor_id>`, + ` </hyperv>`, + ` <kvm>`, + ` <hidden state="on"></hidden>`, + ` </kvm>`, + ` <pvspinlock state="on"></pvspinlock>`, + ` <gic version="2"></gic>`, + ` </features>`, + `</domain>`, + }, + }, } func TestDomain(t *testing.T) { -- 2.11.0

2 4

[libvirt] [PATCH v2 0/4] qemu: Allow setting sslverify option
by Peter Krempa 05 May '17

05 May '17

This is a rebased version now that the <cookie> support was postponed. Peter Krempa (4): qemu: capabilities: Add capability for the sslverify curl driver option conf: Use only one temporary string in virDomainDiskSourceParse conf: Add support for modifying ssl validation for https/ftps disks qemu: command: Implement ssl verification configuration docs/formatdomain.html.in | 9 ++++ docs/schemas/domaincommon.rng | 47 ++++++++++++++++++- src/conf/domain_conf.c | 34 +++++++++++--- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 22 +++++++-- src/util/virstoragefile.h | 1 + .../generic-disk-network-http.xml | 9 ++++ tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../qemuxml2argv-disk-drive-network-http.args | 37 +++++++++++++++ .../qemuxml2argv-disk-drive-network-http.xml | 52 ++++++++++++++++++++++ 11 files changed, 202 insertions(+), 13 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-http.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-http.xml -- 2.12.2

2 7

[libvirt] [PATCH] mdev: Cleanup code after commits @daf5081b and @2739a983
by Erik Skultety 05 May '17

05 May '17

So, because mingw is somehow OK with dereferencing a pointer within a VIR_DEBUG macro, compared to outside of it to which it complained with a "potential NULL pointer dereference" error (still a false positive), we can make the code a tiny bit cleaner. Sighed-by: Erik Skultety <eskultet(a)redhat.com> Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/util/virmdev.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 174f48cb3..bd8e3f8de 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -449,13 +449,8 @@ virMediatedDeviceListMarkDevices(virMediatedDeviceListPtr dst, virObjectLock(dst); for (i = 0; i < count; i++) { - const char *mdev_path = NULL; virMediatedDevicePtr mdev = virMediatedDeviceListGet(src, i); - if (!mdev) - goto cleanup; - - mdev_path = mdev->path; if (virMediatedDeviceIsUsed(mdev, dst) || virMediatedDeviceSetUsedBy(mdev, drvname, domname) < 0) goto cleanup; @@ -464,11 +459,11 @@ virMediatedDeviceListMarkDevices(virMediatedDeviceListPtr dst, * - caller is responsible for NOT freeing devices in @src on success * - we're responsible for performing a rollback on failure */ + VIR_DEBUG("Add '%s' to list of active mediated devices used by '%s'", + mdev->path, domname); if (virMediatedDeviceListAdd(dst, &mdev) < 0) goto rollback; - VIR_DEBUG("'%s' added to list of active mediated devices used by '%s'", - mdev_path, domname); } ret = 0; -- 2.12.2

2 2

[libvirt] [PATCH] virNWFilterObjListFree: Don't leak nwfilters->objs
by Michal Privoznik 04 May '17

04 May '17

When adding a nwfilter onto the list in virNWFilterObjListAssignDef() this array is re-allocated to match demand for new size. However, it is never freed leading to a leak: ==26535== 136 bytes in 1 blocks are definitely lost in loss record 1,079 of 1,250 ==26535== at 0x4C2E2BE: realloc (vg_replace_malloc.c:785) ==26535== by 0x54BA28E: virReallocN (viralloc.c:245) ==26535== by 0x54BA384: virExpandN (viralloc.c:294) ==26535== by 0x54BA657: virInsertElementsN (viralloc.c:436) ==26535== by 0x55DB011: virNWFilterObjListAssignDef (virnwfilterobj.c:362) ==26535== by 0x55DB530: virNWFilterObjListLoadConfig (virnwfilterobj.c:503) ==26535== by 0x55DB635: virNWFilterObjListLoadAllConfigs (virnwfilterobj.c:539) ==26535== by 0x2AC5A28B: nwfilterStateInitialize (nwfilter_driver.c:250) ==26535== by 0x5621C64: virStateInitialize (libvirt.c:770) ==26535== by 0x124379: daemonRunStateInit (libvirtd.c:881) ==26535== by 0x554AC78: virThreadHelper (virthread.c:206) ==26535== by 0x8F5F493: start_thread (in /lib64/libpthread-2.23.so) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/virnwfilterobj.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c index c69407a..b5aaa6b 100644 --- a/src/conf/virnwfilterobj.c +++ b/src/conf/virnwfilterobj.c @@ -110,6 +110,7 @@ virNWFilterObjListFree(virNWFilterObjListPtr nwfilters) size_t i; for (i = 0; i < nwfilters->count; i++) virNWFilterObjFree(nwfilters->objs[i]); + VIR_FREE(nwfilters->objs); VIR_FREE(nwfilters); } -- 2.10.2

2 1

[libvirt] [PATCH] virPerfEventIsEnabled: Accept NULL @perf
by Michal Privoznik 04 May '17

04 May '17

After bdcf6e481 there is a crasher in libvirt. The commit assumes that priv->perf is always set. That is not true. For inactive domains, the priv->perf is not allocated as it is set in qemuProcessLaunch(). Now, usually we differentiate between accesses to inactive and active definition and it works just fine. Except for 'domstats'. There priv->perf is accessed without prior check for domain inactivity. While we could check for that, more robust solution is to make virPerfEventIsEnabled() accept NULL. How to reproduce: 1) ensure you have at least one inactive domain 2) virsh domstats Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virperf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virperf.c b/src/util/virperf.c index fa5b6cc..2c832b3 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -297,7 +297,7 @@ virPerfEventDisable(virPerfPtr perf, bool virPerfEventIsEnabled(virPerfPtr perf, virPerfEventType type) { - return perf->events[type].enabled; + return perf && perf->events[type].enabled; } int -- 2.10.2

2 2

[libvirt] Entering freeze for libvirt-3.3.0
by Daniel Veillard 04 May '17

04 May '17

As planned, I tagged RC1 in git and pushed signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ Seems to work in my limited testing, https://ci.centos.org/view/libvirt/ seems mostly clean and happy, but please give it some testing ! Assuming things go well, I think I will make RC2 on Tuesday (Monday being closed in most of Europe we should have one day of worktime to test) and that would imply a release on Thursday 3rd, assuming nothing critical is found, thanks in advance for your testing and reports :-) Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 3

[libvirt] [PATCH] mdev: Fix mingw build by adding a check for non-NULL pointer
by Erik Skultety 04 May '17

04 May '17

This patch fixes the following MinGW error (although actually being a false positive): ../../src/util/virmdev.c: In function 'virMediatedDeviceListMarkDevices': ../../src/util/virmdev.c:453:21: error: potential null pointer dereference [-Werror=null-dereference] const char *mdev_path = mdev->path; ^~~~~~~~~ Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed under the build breaker rule. Erik src/util/virmdev.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/virmdev.c b/src/util/virmdev.c index c861d21..174f48c 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -449,9 +449,13 @@ virMediatedDeviceListMarkDevices(virMediatedDeviceListPtr dst, virObjectLock(dst); for (i = 0; i < count; i++) { + const char *mdev_path = NULL; virMediatedDevicePtr mdev = virMediatedDeviceListGet(src, i); - const char *mdev_path = mdev->path; + if (!mdev) + goto cleanup; + + mdev_path = mdev->path; if (virMediatedDeviceIsUsed(mdev, dst) || virMediatedDeviceSetUsedBy(mdev, drvname, domname) < 0) goto cleanup; -- 2.9.3

2 2

[libvirt] Raising limits for our RPC messages
by Michal Privoznik 04 May '17

04 May '17

Dear list, maybe you've seen us raising limit for various parts of RPC messages (for eaxmple: d15b29be, 66bfc7cc61ca0, e914dcfd, etc.). It usually happens when we receive a report that current limits are not enough. Well, we just did: https://bugzilla.redhat.com/show_bug.cgi?id=1440683 The thing is, virConnectGetAllDomainStats() is unable to encode RPC message because there's so much domains & stats to send that the limit is reached. Now, I was thinking how to approach this problem. Yes, we can raise the limits again. But we also have another approach: split data into multiple messages. The current limit for an RPC message is 4MB. Say you have 9MB of data you want to send to the other side. We could construct 3 messages (4 + 4 + 1) and send them to the other side where the data would be reconstructed. At RPC level, we could use @status header file to represent intermediate messages. That is, for the example above messages with the following headers would be constructed: {.len = 4MB, prog, vers, proc, .type = VIR_NET_REPLY, .serial, .status = VIR_NET_CONTINUE} {.len = 4MB, prog, vers, proc, .type = VIR_NET_REPLY, .serial, .status = VIR_NET_CONTINUE} {.len = 1MB, prog, vers, proc, .type = VIR_NET_REPLY, .serial, .status = VIR_NET_OK} (the actual @len accounts for message header too, so the message would be split into <nearly 4MB + nearly 4MB + slightly over 1MB> chunks, but that is not important right now) Just like we have in streams, VIR_NET_CONTINUE tells that there is more data yet to come, VIR_NET_OK could then mark the last packet in the stream. Cool you say, this could work. But not really. The problem with this approach is: a) we just transform problem to a different one (the limit of number of messages data can be split into) b) increased overhead (message header is sent multiple times) c) I don't expect we will ever support cherry-picking of messages (caller picks just the message that contains data they are interested in and discards the rest). So after all, we will effectively have the limit of message size increased to $limit_of_split_messages * $current_limit_of_message_size. Instead of introducing complex code that splits data into messages and reconstructs back, we might as well increase the current limit of message size. Michal

3 6

[libvirt] [PATCH 0/2] news: Update for v3.3.0
by Andrea Bolognani 04 May '17

04 May '17

The release notes have been almost completely neglected this cycle, so I've spent some time going through the git log and trying to include what to me looked like relevant changes. Summaries and descriptions are going to be worse that they would be if they were written by the people implementing the changes, but I reckon it's still better than nothing :) Reviews are much appreciated, but if I won't get any feedback I will push this anyway before release just so that v3.3.0 doesn't end up including such sorry excuse for release notes in the final tarball. Andrea Bolognani (2): news: Tweak existing v3.3.0 entries news: Add more v3.3.0 entries docs/news.xml | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 119 insertions(+), 4 deletions(-) -- 2.7.4

4 11

[libvirt] [PATCH 0/2] Fix daemon crash caused by virHostdevUpdateActiveMediatedDevices
by Erik Skultety 04 May '17

04 May '17

Erik Skultety (2): util: mdev: Use a local variable instead of an invalid pointer reference mdev: Fix daemon crash on domain shutdown after reconnect src/util/virhostdev.c | 4 ++-- src/util/virmdev.c | 18 +++++++++++------- src/util/virmdev.h | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) -- 2.12.2

3 7

Re: [libvirt] 答复: Re: 答复: Re: [PATCH] qemu: change the name of tap device for a tapand bridge network
by Laine Stump 04 May '17

04 May '17

(Please don't top-post replies. ALso, I added libvir-list back to the To:) On 05/03/2017 08:46 PM, lu.zhipeng(a)zte.com.cn wrote: > > Some other scenarios such as migration. > > Can we guarantee that the network card driver has been > closed before killing QEMU ? During a migration, before we ever get to the point of killing the source qemu process, we have already stopped the guest CPUs and made sure that the entire state of the guest has been transferred to the qemu process on the destination host. It doesn't matter if we detach the tap device from the bridge or not - any traffic received on the source host during that time (after stopping the guest CPUs) will be dropped (and re-transmitted + received by the guest after it starts running on the destination). Since the guest CPU is already stopped on the source, and the guest on the destination already has the full state of the guest ready to start up (and will not receive any new updates), keeping the tap device connected to the bridge for a small fraction of a second is not going to make any difference at all. Is that convincing enough? :-) > > if we are sure,that's ok > > > > > > *为了让您的VPlat虚拟化故障得到高效的处理，请上报故障到: $VPlat技术支持。* > > 芦志朋 luzhipeng > > > IT开发工程师 IT Development Engineer > 操作系统产品部/中心研究院/系统产品 OS Product Dept./Central R＆D > Institute/System Product > > > > 深圳市南山区科技南路55号中兴通讯研发大楼33楼 > 33/F, R&D Building, ZTE Corporation Hi-tech Road South, > Hi-tech Industrial Park Nanshan District, Shenzhen, P.R.China, 518057 > T: +86 755 xxxxxxxx F:+86 755 xxxxxxxx > M: +86 xxxxxxxxxxx > E: lu.zhipeng(a)zte.com.cn > www.zte.com.cn <http://www.zte.com.cn/> > > 原始邮件 > *发件人：*＜laine(a)laine.org>; > *收件人：*芦志朋10108272; > *日期：*2017年05月04日 08:31 > *主题：**Re: 答复: Re: [libvirt] [PATCH] qemu: change the name of tap > device for a tapand bridge network* > > > > > On May 3, 2017 8:28 PM, ＜lu.zhipeng(a)zte.com.cn > <mailto:lu.zhipeng@zte.com..cn>＞ wrote: > > > I'm worried that the network packet loss rate will increase after > reversing the order. > > > Why? The guest is already shut down (or being shut down). By this time > there is no traffic that would make any difference. And anyway, we've > already determined that the current order causes a race so it is wrong. > > > > > > *为了让您的VPlat虚拟化故障得到高效的处理，请上报故障到: $VPlat技术支 > 持。* > > 芦志朋 luzhipeng > > > IT开发工程师 IT Development Engineer > 操作系统产品部/中心研究院/系统产品 OS Product Dept./Central R＆D > Institute/System Product > > > > 深圳市南山区科技南路55号中兴通讯研发大楼33楼 > 33/F, R&D Building, ZTE Corporation Hi-tech Road South, > Hi-tech Industrial Park Nanshan District, Shenzhen, P.R.China, 518057 > T: +86 755 xxxxxxxx F:+86 755 xxxxxxxx > M: +86 xxxxxxxxxxx > E: lu.zhipeng(a)zte.com.cn <mailto:lu.zhipeng@zte.com.cn> > www.zte.com.cn <http://www.zte.com.cn/> > > 原始邮件 > *发件人：*＜berrange(a)redhat.com <mailto:berrange@redhat.com>＞; > *收件人：*＜laine(a)laine.org <mailto:laine@laine.org>＞; > *抄送人：*＜libvir-list(a)redhat.com <mailto:libvir- > list(a)redhat.com>＞;芦志朋10108272; > *日期：*2017年05月02日 16:30 > *主题：**Re: [libvirt] [PATCH] qemu: change the name of tap device > for a tapand bridge network* > > > On Fri, Apr 28, 2017 at 01:08:45PM -0400, Laine Stump wrote: > ＞ On 04/28/2017 05:33 AM, Daniel P. Berrange wrote: > ＞＞ On Fri, Apr 28, 2017 at 05:23:19PM +0800, ZhiPeng Lu wrote: > ＞＞＞ Creating tap device and adding the device to bridge are not atomic operation. > ＞＞＞ Similarly deleting tap device and removing it from bridge are not atomic operation. > ＞＞＞ The Problem occurs when two vms start and shutdown. When one vm with the nic > ＞＞＞ named "vnet0" stopping, it deleted tap device but not removing port from bridge. > ＞＞＞ At this time, another vm created the tap device named "vnet0" and added port to the > ＞＞＞ same bridge. Then, the first vm deleted the tap device from the same bridge. > ＞＞＞ Finally, the tap device of the second vm don't attached to the bridge. > ＞＞＞ So, we can add domid to vm's nic name. For example, the vm's domid is 1 and vnet0 > ＞＞＞ is renamed to vnet1.0. > ＞＞ > ＞＞ Surely deleting the NIC automatically removes it from the bridge so we > ＞＞ can just remove the code that delets the bridge port. > ＞ > ＞ That is true when using a Linux host bridge, but I recall that for > ＞ openvswitch (which I think is what ZhiPeng is using, based on an earlier > ＞ patch), you must explicitly remove the port from the bridge - apparently > ＞ the port is still there in openvswitch's table as some sort of "zombie" > ＞ connection even after the tap device itself no longer exists. > ＞ > ＞ > ＞ But instead of changing the naming scheme, maybe we should just delete > ＞ the bridge port *before* deleting the tap device instead of after. (Am I > ＞ recalling correctly that the tap device is deleted automatically when > ＞ the qemu process is killed? If so, then what's needed is to move the > ＞ loop in qemuProcessStop() that cleans up network interfaces so that it > ＞ happens before qemuProcessKill() is called. > > Agreed, we should just reverse the order. > > Regards, > Daniel > -- > |: https://berrange.com -o- https://www.flickr.com/photos/dberrange > <https://www.flickr.com/photos/dberrange> :| > |: https://libvirt.org -o- https://fstop138.berrange.com > <https://fstop138..berrange.com> :| > |: https://entangle-photo.org -o- https://www.instagram.com/dberrange > <https://www.instagram.com/dberrange> :| > > -- > libvir-list mailing list > libvir-list(a)redhat.com <mailto:libvir-list@redhat.com> > https://www.redhat.com/mailman/listinfo/libvir-list > <https://www.redhat.com/mailman/listinfo/libvir-list> > > > > > >

1 0

[libvirt] [PATCH v1] libxl: report numa sibling distances on host capabilities
by Wim Ten Have 03 May '17

03 May '17

From: Wim ten Have <wim.ten.have(a)oracle.com> When running on a NUMA machine, populate the sibling node and distance information using data supplied by Xen. Wim ten Have (1): libxl: report numa sibling distances on host capabilities src/libxl/libxl_capabilities.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) -- 2.9.3

2 2

[libvirt] [PATCH 0/5] qemu: Couple of namespace fixes
by Michal Privoznik 03 May '17

03 May '17

It was brought to my attention on IRC by Cedric that there's a bug in our namespace code. Namely, if a disk has say /dev/shm/blah source. For more detailed description see the first patch. The rest is just subsequent fixes. Michal Privoznik (5): qemuDomainBuildNamespace: Move /dev/* mountpoints later qemuDomainCreateDeviceRecursive: pass a structure instead of bare path qemuDomainCreateDeviceRecursive: Don't try to create devices under preserved mount points qemuDomainAttachDeviceMknodRecursive: Don't try to create devices under preserved mount points qemuDomainDetachDeviceUnlink: Don't unlink files we haven't created src/qemu/qemu_domain.c | 373 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 275 insertions(+), 98 deletions(-) -- 2.10.2

2 10

[libvirt] [PATCH] client: Report proper close reason
by Jiri Denemark 03 May '17

03 May '17

When we get a POLLHUP or VIR_EVENT_HANDLE_HANGUP event for a client, we still want to read from the socket to process any accumulated data. But doing so inevitably results in an error and a call to virNetClientMarkClose before we get to processing the hangup event (and another call to virNetClientMarkClose). However the close reason passed to the second virNetClientMarkClose call is ignored because another one was already set. We need to pass the correct close reason when marking the socket to be closed for the first time. https://bugzilla.redhat.com/show_bug.cgi?id=1373859 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/rpc/virnetclient.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index c95974794..837a8a707 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1595,6 +1595,7 @@ static int virNetClientIOEventLoop(virNetClientPtr client, { struct pollfd fds[2]; bool error = false; + int closeReason; int ret; fds[0].fd = virNetSocketGetFD(client->sock); @@ -1703,9 +1704,14 @@ static int virNetClientIOEventLoop(virNetClientPtr client, } } + if (fds[0].revents & POLLHUP) + closeReason = VIR_CONNECT_CLOSE_REASON_EOF; + else + closeReason = VIR_CONNECT_CLOSE_REASON_ERROR; + if (fds[0].revents & POLLOUT) { if (virNetClientIOHandleOutput(client) < 0) { - virNetClientMarkClose(client, VIR_CONNECT_CLOSE_REASON_ERROR); + virNetClientMarkClose(client, closeReason); error = true; /* Fall through to process any pending data. */ } @@ -1713,7 +1719,7 @@ static int virNetClientIOEventLoop(virNetClientPtr client, if (fds[0].revents & POLLIN) { if (virNetClientIOHandleInput(client) < 0) { - virNetClientMarkClose(client, VIR_CONNECT_CLOSE_REASON_ERROR); + virNetClientMarkClose(client, closeReason); error = true; /* Fall through to process any pending data. */ } @@ -1746,13 +1752,13 @@ static int virNetClientIOEventLoop(virNetClientPtr client, if (fds[0].revents & POLLHUP) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("received hangup event on socket")); - virNetClientMarkClose(client, VIR_CONNECT_CLOSE_REASON_EOF); + virNetClientMarkClose(client, closeReason); goto error; } if (fds[0].revents & POLLERR) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("received error event on socket")); - virNetClientMarkClose(client, VIR_CONNECT_CLOSE_REASON_ERROR); + virNetClientMarkClose(client, closeReason); goto error; } } @@ -1968,6 +1974,7 @@ void virNetClientIncomingEvent(virNetSocketPtr sock, void *opaque) { virNetClientPtr client = opaque; + int closeReason; virObjectLock(client); @@ -1981,23 +1988,25 @@ void virNetClientIncomingEvent(virNetSocketPtr sock, VIR_DEBUG("Event fired %p %d", sock, events); + if (events & VIR_EVENT_HANDLE_HANGUP) + closeReason = VIR_CONNECT_CLOSE_REASON_EOF; + else + closeReason = VIR_CONNECT_CLOSE_REASON_ERROR; + if (events & VIR_EVENT_HANDLE_WRITABLE) { if (virNetClientIOHandleOutput(client) < 0) - virNetClientMarkClose(client, VIR_CONNECT_CLOSE_REASON_ERROR); + virNetClientMarkClose(client, closeReason); } if (events & VIR_EVENT_HANDLE_READABLE) { if (virNetClientIOHandleInput(client) < 0) - virNetClientMarkClose(client, VIR_CONNECT_CLOSE_REASON_ERROR); + virNetClientMarkClose(client, closeReason); } if (events & (VIR_EVENT_HANDLE_HANGUP | VIR_EVENT_HANDLE_ERROR)) { VIR_DEBUG("VIR_EVENT_HANDLE_HANGUP or " "VIR_EVENT_HANDLE_ERROR encountered"); - virNetClientMarkClose(client, - (events & VIR_EVENT_HANDLE_HANGUP) ? - VIR_CONNECT_CLOSE_REASON_EOF : - VIR_CONNECT_CLOSE_REASON_ERROR); + virNetClientMarkClose(client, closeReason); goto done; } -- 2.12.2

2 1

[libvirt] [PATCH v3 0/8] Rework sysfs handling
by Martin Kletzander 03 May '17

03 May '17

Basically all of these were ACKed, however I was on vacation and in the meatime there were changes. The virFileMock cannot be named 'mock' because it fails the 'noinline' test, but it doesn't actually mock anything, so I just renamed it. There was decision in another series to use the same naming for cache types and cache allocation scopes, so the types now are 'both', 'code', and 'data'. There was still no consensus reached with regards to the naming of that attribute (is it 'type' or 'scope'). The patches are fine otherwise. This version keeps it at 'type', we can change it before release or I can change it before pushing. All changes Erik wanted me to incorporate are there, except those that were optional and I felt like keeping the code as-is was better. Or those that I missed or forgot about (hopefully none). Martin Kletzander (8): tests: Add virfilewrapper -- the new super "mock" util: Remove virsysfs and instead enhance virFileReadValue* functions tests: Test vircaps2xmldata XMLs in virschematest tests: Add missing cache data for vircaps2xmltest Add host cache information in capabilities Init host cache info in drivers tests: Add support for more complicated hierarchies in vircaps2xmltest tests: Add resctrl test for vircaps2xmltest cfg.mk | 4 +- docs/schemas/capability.rng | 34 +++ src/Makefile.am | 2 - src/conf/capabilities.c | 205 ++++++++++++++- src/conf/capabilities.h | 29 +++ src/libvirt_private.syms | 17 +- src/lxc/lxc_conf.c | 3 + src/openvz/openvz_conf.c | 3 + src/phyp/phyp_driver.c | 3 + src/qemu/qemu_capabilities.c | 3 + src/uml/uml_conf.c | 3 + src/util/virfile.c | 204 ++++++++++++--- src/util/virfile.h | 14 +- src/util/virhostcpu.c | 39 +-- src/util/virsysfs.c | 231 ----------------- src/util/virsysfs.h | 70 ----- src/vbox/vbox_common.c | 3 + src/vmware/vmware_conf.c | 3 + src/vz/vz_driver.c | 2 + tests/Makefile.am | 7 +- .../linux-caches/cpu/cpu0/cache/index0/id | 1 + .../cpu/cpu0/cache/index0/shared_cpu_list | 2 +- .../cpu/cpu0/cache/index0/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu0/cache/index1/id | 1 + .../cpu/cpu0/cache/index1/shared_cpu_list | 2 +- .../cpu/cpu0/cache/index1/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu0/cache/index2/id | 1 + .../cpu/cpu0/cache/index2/shared_cpu_list | 2 +- .../cpu/cpu0/cache/index2/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu0/cache/index3/id | 1 + .../linux-caches/cpu/cpu1/cache/index0/id | 1 + .../cpu/cpu1/cache/index0/shared_cpu_list | 2 +- .../cpu/cpu1/cache/index0/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu1/cache/index1/id | 1 + .../cpu/cpu1/cache/index1/shared_cpu_list | 2 +- .../cpu/cpu1/cache/index1/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu1/cache/index2/id | 1 + .../cpu/cpu1/cache/index2/shared_cpu_list | 2 +- .../cpu/cpu1/cache/index2/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu1/cache/index3/id | 1 + .../linux-caches/cpu/cpu2/cache/index0/id | 1 + .../cpu/cpu2/cache/index0/shared_cpu_list | 2 +- .../cpu/cpu2/cache/index0/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu2/cache/index1/id | 1 + .../cpu/cpu2/cache/index1/shared_cpu_list | 2 +- .../cpu/cpu2/cache/index1/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu2/cache/index2/id | 1 + .../cpu/cpu2/cache/index2/shared_cpu_list | 2 +- .../cpu/cpu2/cache/index2/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu2/cache/index3/id | 1 + .../linux-caches/cpu/cpu3/cache/index0/id | 1 + .../cpu/cpu3/cache/index0/shared_cpu_list | 2 +- .../cpu/cpu3/cache/index0/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu3/cache/index1/id | 1 + .../cpu/cpu3/cache/index1/shared_cpu_list | 2 +- .../cpu/cpu3/cache/index1/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu3/cache/index2/id | 1 + .../cpu/cpu3/cache/index2/shared_cpu_list | 2 +- .../cpu/cpu3/cache/index2/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu3/cache/index3/id | 1 + .../linux-caches/cpu/cpu4/cache/index0/id | 1 + .../cpu/cpu4/cache/index0/shared_cpu_list | 2 +- .../cpu/cpu4/cache/index0/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu4/cache/index1/id | 1 + .../cpu/cpu4/cache/index1/shared_cpu_list | 2 +- .../cpu/cpu4/cache/index1/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu4/cache/index2/id | 1 + .../cpu/cpu4/cache/index2/shared_cpu_list | 2 +- .../cpu/cpu4/cache/index2/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu4/cache/index3/id | 1 + .../linux-caches/cpu/cpu5/cache/index0/id | 1 + .../cpu/cpu5/cache/index0/shared_cpu_list | 2 +- .../cpu/cpu5/cache/index0/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu5/cache/index1/id | 1 + .../cpu/cpu5/cache/index1/shared_cpu_list | 2 +- .../cpu/cpu5/cache/index1/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu5/cache/index2/id | 1 + .../cpu/cpu5/cache/index2/shared_cpu_list | 2 +- .../cpu/cpu5/cache/index2/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu5/cache/index3/id | 1 + .../linux-caches/cpu/cpu6/cache/index0/id | 1 + .../cpu/cpu6/cache/index0/shared_cpu_list | 2 +- .../cpu/cpu6/cache/index0/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu6/cache/index1/id | 1 + .../cpu/cpu6/cache/index1/shared_cpu_list | 2 +- .../cpu/cpu6/cache/index1/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu6/cache/index2/id | 1 + .../cpu/cpu6/cache/index2/shared_cpu_list | 2 +- .../cpu/cpu6/cache/index2/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu6/cache/index3/id | 1 + .../linux-caches/cpu/cpu7/cache/index0/id | 1 + .../cpu/cpu7/cache/index0/shared_cpu_list | 2 +- .../cpu/cpu7/cache/index0/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu7/cache/index1/id | 1 + .../cpu/cpu7/cache/index1/shared_cpu_list | 2 +- .../cpu/cpu7/cache/index1/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu7/cache/index2/id | 1 + .../cpu/cpu7/cache/index2/shared_cpu_list | 2 +- .../cpu/cpu7/cache/index2/shared_cpu_map | 2 +- .../linux-caches/cpu/cpu7/cache/index3/id | 1 + tests/vircaps2xmldata/linux-resctrl/resctrl/cpus | 1 + .../linux-resctrl/resctrl/info/L3/cbm_mask | 1 + .../linux-resctrl/resctrl/info/L3/min_cbm_bits | 1 + .../linux-resctrl/resctrl/info/L3/num_closids | 1 + .../linux-resctrl/resctrl/manualres/cpus | 1 + .../linux-resctrl/resctrl/manualres/schemata | 1 + .../linux-resctrl/resctrl/manualres/tasks | 0 .../vircaps2xmldata/linux-resctrl/resctrl/schemata | 1 + tests/vircaps2xmldata/linux-resctrl/resctrl/tasks | 0 .../linux-resctrl/system/cpu/cpu0/cache/index0/id | 1 + .../system/cpu/cpu0/cache/index0/level | 1 + .../system/cpu/cpu0/cache/index0/shared_cpu_list | 1 + .../system/cpu/cpu0/cache/index0/shared_cpu_map | 1 + .../system/cpu/cpu0/cache/index0/size | 1 + .../system/cpu/cpu0/cache/index0/type | 1 + .../linux-resctrl/system/cpu/cpu0/cache/index1/id | 1 + .../system/cpu/cpu0/cache/index1/level | 1 + .../system/cpu/cpu0/cache/index1/shared_cpu_list | 1 + .../system/cpu/cpu0/cache/index1/shared_cpu_map | 1 + .../system/cpu/cpu0/cache/index1/size | 1 + .../system/cpu/cpu0/cache/index1/type | 1 + .../linux-resctrl/system/cpu/cpu0/cache/index2/id | 1 + .../system/cpu/cpu0/cache/index2/level | 1 + .../system/cpu/cpu0/cache/index2/shared_cpu_list | 1 + .../system/cpu/cpu0/cache/index2/shared_cpu_map | 1 + .../system/cpu/cpu0/cache/index2/size | 1 + .../system/cpu/cpu0/cache/index2/type | 1 + .../linux-resctrl/system/cpu/cpu0/cache/index3/id | 1 + .../system/cpu/cpu0/cache/index3/level | 1 + .../system/cpu/cpu0/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu0/cache/index3/shared_cpu_map | 1 + .../system/cpu/cpu0/cache/index3/size | 1 + .../system/cpu/cpu0/cache/index3/type | 1 + .../linux-resctrl/system/cpu/cpu0/online | 1 + .../linux-resctrl/system/cpu/cpu0/topology/core_id | 1 + .../system/cpu/cpu0/topology/core_siblings | 1 + .../system/cpu/cpu0/topology/core_siblings_list | 1 + .../system/cpu/cpu0/topology/physical_package_id | 1 + .../system/cpu/cpu0/topology/thread_siblings | 1 + .../system/cpu/cpu0/topology/thread_siblings_list | 1 + .../linux-resctrl/system/cpu/cpu1/cache/index0/id | 1 + .../system/cpu/cpu1/cache/index0/level | 1 + .../system/cpu/cpu1/cache/index0/shared_cpu_list | 1 + .../system/cpu/cpu1/cache/index0/shared_cpu_map | 1 + .../system/cpu/cpu1/cache/index0/size | 1 + .../system/cpu/cpu1/cache/index0/type | 1 + .../linux-resctrl/system/cpu/cpu1/cache/index1/id | 1 + .../system/cpu/cpu1/cache/index1/level | 1 + .../system/cpu/cpu1/cache/index1/shared_cpu_list | 1 + .../system/cpu/cpu1/cache/index1/shared_cpu_map | 1 + .../system/cpu/cpu1/cache/index1/size | 1 + .../system/cpu/cpu1/cache/index1/type | 1 + .../linux-resctrl/system/cpu/cpu1/cache/index2/id | 1 + .../system/cpu/cpu1/cache/index2/level | 1 + .../system/cpu/cpu1/cache/index2/shared_cpu_list | 1 + .../system/cpu/cpu1/cache/index2/shared_cpu_map | 1 + .../system/cpu/cpu1/cache/index2/size | 1 + .../system/cpu/cpu1/cache/index2/type | 1 + .../linux-resctrl/system/cpu/cpu1/cache/index3/id | 1 + .../system/cpu/cpu1/cache/index3/level | 1 + .../system/cpu/cpu1/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu1/cache/index3/shared_cpu_map | 1 + .../system/cpu/cpu1/cache/index3/size | 1 + .../system/cpu/cpu1/cache/index3/type | 1 + .../linux-resctrl/system/cpu/cpu1/online | 1 + .../linux-resctrl/system/cpu/cpu1/topology/core_id | 1 + .../system/cpu/cpu1/topology/core_siblings | 1 + .../system/cpu/cpu1/topology/core_siblings_list | 1 + .../system/cpu/cpu1/topology/physical_package_id | 1 + .../system/cpu/cpu1/topology/thread_siblings | 1 + .../system/cpu/cpu1/topology/thread_siblings_list | 1 + .../linux-resctrl/system/cpu/cpu10/cache/index0/id | 1 + .../system/cpu/cpu10/cache/index0/level | 1 + .../system/cpu/cpu10/cache/index0/shared_cpu_list | 1 + .../system/cpu/cpu10/cache/index0/shared_cpu_map | 1 + .../system/cpu/cpu10/cache/index0/size | 1 + .../system/cpu/cpu10/cache/index0/type | 1 + .../linux-resctrl/system/cpu/cpu10/cache/index1/id | 1 + .../system/cpu/cpu10/cache/index1/level | 1 + .../system/cpu/cpu10/cache/index1/shared_cpu_list | 1 + .../system/cpu/cpu10/cache/index1/shared_cpu_map | 1 + .../system/cpu/cpu10/cache/index1/size | 1 + .../system/cpu/cpu10/cache/index1/type | 1 + .../linux-resctrl/system/cpu/cpu10/cache/index2/id | 1 + .../system/cpu/cpu10/cache/index2/level | 1 + .../system/cpu/cpu10/cache/index2/shared_cpu_list | 1 + .../system/cpu/cpu10/cache/index2/shared_cpu_map | 1 + .../system/cpu/cpu10/cache/index2/size | 1 + .../system/cpu/cpu10/cache/index2/type | 1 + .../linux-resctrl/system/cpu/cpu10/cache/index3/id | 1 + .../system/cpu/cpu10/cache/index3/level | 1 + .../system/cpu/cpu10/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu10/cache/index3/shared_cpu_map | 1 + .../system/cpu/cpu10/cache/index3/size | 1 + .../system/cpu/cpu10/cache/index3/type | 1 + .../linux-resctrl/system/cpu/cpu10/online | 1 + .../system/cpu/cpu10/topology/core_id | 1 + .../system/cpu/cpu10/topology/core_siblings | 1 + .../system/cpu/cpu10/topology/core_siblings_list | 1 + .../system/cpu/cpu10/topology/physical_package_id | 1 + .../system/cpu/cpu10/topology/thread_siblings | 1 + .../system/cpu/cpu10/topology/thread_siblings_list | 1 + .../linux-resctrl/system/cpu/cpu11/cache/index0/id | 1 + .../system/cpu/cpu11/cache/index0/level | 1 + .../system/cpu/cpu11/cache/index0/shared_cpu_list} | 0 .../system/cpu/cpu11/cache/index0/shared_cpu_map | 1 + .../system/cpu/cpu11/cache/index0/size | 1 + .../system/cpu/cpu11/cache/index0/type | 1 + .../linux-resctrl/system/cpu/cpu11/cache/index1/id | 1 + .../system/cpu/cpu11/cache/index1/level | 1 + .../system/cpu/cpu11/cache/index1/shared_cpu_list} | 0 .../system/cpu/cpu11/cache/index1/shared_cpu_map | 1 + .../system/cpu/cpu11/cache/index1/size | 1 + .../system/cpu/cpu11/cache/index1/type | 1 + .../linux-resctrl/system/cpu/cpu11/cache/index2/id | 1 + .../system/cpu/cpu11/cache/index2/level | 1 + .../system/cpu/cpu11/cache/index2/shared_cpu_list} | 0 .../system/cpu/cpu11/cache/index2/shared_cpu_map | 1 + .../system/cpu/cpu11/cache/index2/size | 1 + .../system/cpu/cpu11/cache/index2/type | 1 + .../linux-resctrl/system/cpu/cpu11/cache/index3/id | 1 + .../system/cpu/cpu11/cache/index3/level | 1 + .../system/cpu/cpu11/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu11/cache/index3/shared_cpu_map | 1 + .../system/cpu/cpu11/cache/index3/size | 1 + .../system/cpu/cpu11/cache/index3/type | 1 + .../linux-resctrl/system/cpu/cpu11/online | 1 + .../system/cpu/cpu11/topology/core_id | 1 + .../system/cpu/cpu11/topology/core_siblings | 1 + .../system/cpu/cpu11/topology/core_siblings_list | 1 + .../system/cpu/cpu11/topology/physical_package_id | 1 + .../system/cpu/cpu11/topology/thread_siblings | 1 + .../cpu/cpu11/topology/thread_siblings_list} | 0 .../linux-resctrl/system/cpu/cpu2/cache/index0/id | 1 + .../system/cpu/cpu2/cache/index0/level | 1 + .../system/cpu/cpu2/cache/index0/shared_cpu_list | 1 + .../system/cpu/cpu2/cache/index0/shared_cpu_map | 1 + .../system/cpu/cpu2/cache/index0/size | 1 + .../system/cpu/cpu2/cache/index0/type | 1 + .../linux-resctrl/system/cpu/cpu2/cache/index1/id | 1 + .../system/cpu/cpu2/cache/index1/level | 1 + .../system/cpu/cpu2/cache/index1/shared_cpu_list | 1 + .../system/cpu/cpu2/cache/index1/shared_cpu_map | 1 + .../system/cpu/cpu2/cache/index1/size | 1 + .../system/cpu/cpu2/cache/index1/type | 1 + .../linux-resctrl/system/cpu/cpu2/cache/index2/id | 1 + .../system/cpu/cpu2/cache/index2/level | 1 + .../system/cpu/cpu2/cache/index2/shared_cpu_list | 1 + .../system/cpu/cpu2/cache/index2/shared_cpu_map | 1 + .../system/cpu/cpu2/cache/index2/size | 1 + .../system/cpu/cpu2/cache/index2/type | 1 + .../linux-resctrl/system/cpu/cpu2/cache/index3/id | 1 + .../system/cpu/cpu2/cache/index3/level | 1 + .../system/cpu/cpu2/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu2/cache/index3/shared_cpu_map | 1 + .../system/cpu/cpu2/cache/index3/size | 1 + .../system/cpu/cpu2/cache/index3/type | 1 + .../linux-resctrl/system/cpu/cpu2/online | 1 + .../linux-resctrl/system/cpu/cpu2/topology/core_id | 1 + .../system/cpu/cpu2/topology/core_siblings | 1 + .../system/cpu/cpu2/topology/core_siblings_list | 1 + .../system/cpu/cpu2/topology/physical_package_id | 1 + .../system/cpu/cpu2/topology/thread_siblings | 1 + .../system/cpu/cpu2/topology/thread_siblings_list | 1 + .../linux-resctrl/system/cpu/cpu3/cache/index0/id | 1 + .../system/cpu/cpu3/cache/index0/level | 1 + .../system/cpu/cpu3/cache/index0/shared_cpu_list | 1 + .../system/cpu/cpu3/cache/index0/shared_cpu_map | 1 + .../system/cpu/cpu3/cache/index0/size | 1 + .../system/cpu/cpu3/cache/index0/type | 1 + .../linux-resctrl/system/cpu/cpu3/cache/index1/id | 1 + .../system/cpu/cpu3/cache/index1/level | 1 + .../system/cpu/cpu3/cache/index1/shared_cpu_list | 1 + .../system/cpu/cpu3/cache/index1/shared_cpu_map | 1 + .../system/cpu/cpu3/cache/index1/size | 1 + .../system/cpu/cpu3/cache/index1/type | 1 + .../linux-resctrl/system/cpu/cpu3/cache/index2/id | 1 + .../system/cpu/cpu3/cache/index2/level | 1 + .../system/cpu/cpu3/cache/index2/shared_cpu_list | 1 + .../system/cpu/cpu3/cache/index2/shared_cpu_map | 1 + .../system/cpu/cpu3/cache/index2/size | 1 + .../system/cpu/cpu3/cache/index2/type | 1 + .../linux-resctrl/system/cpu/cpu3/cache/index3/id | 1 + .../system/cpu/cpu3/cache/index3/level | 1 + .../system/cpu/cpu3/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu3/cache/index3/shared_cpu_map | 1 + .../system/cpu/cpu3/cache/index3/size | 1 + .../system/cpu/cpu3/cache/index3/type | 1 + .../linux-resctrl/system/cpu/cpu3/online | 1 + .../linux-resctrl/system/cpu/cpu3/topology/core_id | 1 + .../system/cpu/cpu3/topology/core_siblings | 1 + .../system/cpu/cpu3/topology/core_siblings_list | 1 + .../system/cpu/cpu3/topology/physical_package_id | 1 + .../system/cpu/cpu3/topology/thread_siblings | 1 + .../system/cpu/cpu3/topology/thread_siblings_list | 1 + .../linux-resctrl/system/cpu/cpu4/cache/index0/id | 1 + .../system/cpu/cpu4/cache/index0/level | 1 + .../system/cpu/cpu4/cache/index0/shared_cpu_list | 1 + .../system/cpu/cpu4/cache/index0/shared_cpu_map | 1 + .../system/cpu/cpu4/cache/index0/size | 1 + .../system/cpu/cpu4/cache/index0/type | 1 + .../linux-resctrl/system/cpu/cpu4/cache/index1/id | 1 + .../system/cpu/cpu4/cache/index1/level | 1 + .../system/cpu/cpu4/cache/index1/shared_cpu_list | 1 + .../system/cpu/cpu4/cache/index1/shared_cpu_map | 1 + .../system/cpu/cpu4/cache/index1/size | 1 + .../system/cpu/cpu4/cache/index1/type | 1 + .../linux-resctrl/system/cpu/cpu4/cache/index2/id | 1 + .../system/cpu/cpu4/cache/index2/level | 1 + .../system/cpu/cpu4/cache/index2/shared_cpu_list | 1 + .../system/cpu/cpu4/cache/index2/shared_cpu_map | 1 + .../system/cpu/cpu4/cache/index2/size | 1 + .../system/cpu/cpu4/cache/index2/type | 1 + .../linux-resctrl/system/cpu/cpu4/cache/index3/id | 1 + .../system/cpu/cpu4/cache/index3/level | 1 + .../system/cpu/cpu4/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu4/cache/index3/shared_cpu_map | 1 + .../system/cpu/cpu4/cache/index3/size | 1 + .../system/cpu/cpu4/cache/index3/type | 1 + .../linux-resctrl/system/cpu/cpu4/online | 1 + .../linux-resctrl/system/cpu/cpu4/topology/core_id | 1 + .../system/cpu/cpu4/topology/core_siblings | 1 + .../system/cpu/cpu4/topology/core_siblings_list | 1 + .../system/cpu/cpu4/topology/physical_package_id | 1 + .../system/cpu/cpu4/topology/thread_siblings | 1 + .../system/cpu/cpu4/topology/thread_siblings_list | 1 + .../linux-resctrl/system/cpu/cpu5/cache/index0/id | 1 + .../system/cpu/cpu5/cache/index0/level | 1 + .../system/cpu/cpu5/cache/index0/shared_cpu_list | 1 + .../system/cpu/cpu5/cache/index0/shared_cpu_map | 1 + .../system/cpu/cpu5/cache/index0/size | 1 + .../system/cpu/cpu5/cache/index0/type | 1 + .../linux-resctrl/system/cpu/cpu5/cache/index1/id | 1 + .../system/cpu/cpu5/cache/index1/level | 1 + .../system/cpu/cpu5/cache/index1/shared_cpu_list | 1 + .../system/cpu/cpu5/cache/index1/shared_cpu_map | 1 + .../system/cpu/cpu5/cache/index1/size | 1 + .../system/cpu/cpu5/cache/index1/type | 1 + .../linux-resctrl/system/cpu/cpu5/cache/index2/id | 1 + .../system/cpu/cpu5/cache/index2/level | 1 + .../system/cpu/cpu5/cache/index2/shared_cpu_list | 1 + .../system/cpu/cpu5/cache/index2/shared_cpu_map | 1 + .../system/cpu/cpu5/cache/index2/size | 1 + .../system/cpu/cpu5/cache/index2/type | 1 + .../linux-resctrl/system/cpu/cpu5/cache/index3/id | 1 + .../system/cpu/cpu5/cache/index3/level | 1 + .../system/cpu/cpu5/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu5/cache/index3/shared_cpu_map | 1 + .../system/cpu/cpu5/cache/index3/size | 1 + .../system/cpu/cpu5/cache/index3/type | 1 + .../linux-resctrl/system/cpu/cpu5/online | 1 + .../linux-resctrl/system/cpu/cpu5/topology/core_id | 1 + .../system/cpu/cpu5/topology/core_siblings | 1 + .../system/cpu/cpu5/topology/core_siblings_list | 1 + .../system/cpu/cpu5/topology/physical_package_id | 1 + .../system/cpu/cpu5/topology/thread_siblings | 1 + .../system/cpu/cpu5/topology/thread_siblings_list | 1 + .../linux-resctrl/system/cpu/cpu6/cache/index0/id | 1 + .../system/cpu/cpu6/cache/index0/level | 1 + .../system/cpu/cpu6/cache/index0/shared_cpu_list | 1 + .../system/cpu/cpu6/cache/index0/shared_cpu_map | 1 + .../system/cpu/cpu6/cache/index0/size | 1 + .../system/cpu/cpu6/cache/index0/type | 1 + .../linux-resctrl/system/cpu/cpu6/cache/index1/id | 1 + .../system/cpu/cpu6/cache/index1/level | 1 + .../system/cpu/cpu6/cache/index1/shared_cpu_list | 1 + .../system/cpu/cpu6/cache/index1/shared_cpu_map | 1 + .../system/cpu/cpu6/cache/index1/size | 1 + .../system/cpu/cpu6/cache/index1/type | 1 + .../linux-resctrl/system/cpu/cpu6/cache/index2/id | 1 + .../system/cpu/cpu6/cache/index2/level | 1 + .../system/cpu/cpu6/cache/index2/shared_cpu_list | 1 + .../system/cpu/cpu6/cache/index2/shared_cpu_map | 1 + .../system/cpu/cpu6/cache/index2/size | 1 + .../system/cpu/cpu6/cache/index2/type | 1 + .../linux-resctrl/system/cpu/cpu6/cache/index3/id | 1 + .../system/cpu/cpu6/cache/index3/level | 1 + .../system/cpu/cpu6/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu6/cache/index3/shared_cpu_map | 1 + .../system/cpu/cpu6/cache/index3/size | 1 + .../system/cpu/cpu6/cache/index3/type | 1 + .../linux-resctrl/system/cpu/cpu6/online | 1 + .../linux-resctrl/system/cpu/cpu6/topology/core_id | 1 + .../system/cpu/cpu6/topology/core_siblings | 1 + .../system/cpu/cpu6/topology/core_siblings_list | 1 + .../system/cpu/cpu6/topology/physical_package_id | 1 + .../system/cpu/cpu6/topology/thread_siblings | 1 + .../system/cpu/cpu6/topology/thread_siblings_list | 1 + .../linux-resctrl/system/cpu/cpu7/cache/index0/id | 1 + .../system/cpu/cpu7/cache/index0/level | 1 + .../system/cpu/cpu7/cache/index0/shared_cpu_list | 1 + .../system/cpu/cpu7/cache/index0/shared_cpu_map | 1 + .../system/cpu/cpu7/cache/index0/size | 1 + .../system/cpu/cpu7/cache/index0/type | 1 + .../linux-resctrl/system/cpu/cpu7/cache/index1/id | 1 + .../system/cpu/cpu7/cache/index1/level | 1 + .../system/cpu/cpu7/cache/index1/shared_cpu_list | 1 + .../system/cpu/cpu7/cache/index1/shared_cpu_map | 1 + .../system/cpu/cpu7/cache/index1/size | 1 + .../system/cpu/cpu7/cache/index1/type | 1 + .../linux-resctrl/system/cpu/cpu7/cache/index2/id | 1 + .../system/cpu/cpu7/cache/index2/level | 1 + .../system/cpu/cpu7/cache/index2/shared_cpu_list | 1 + .../system/cpu/cpu7/cache/index2/shared_cpu_map | 1 + .../system/cpu/cpu7/cache/index2/size | 1 + .../system/cpu/cpu7/cache/index2/type | 1 + .../linux-resctrl/system/cpu/cpu7/cache/index3/id | 1 + .../system/cpu/cpu7/cache/index3/level | 1 + .../system/cpu/cpu7/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu7/cache/index3/shared_cpu_map | 1 + .../system/cpu/cpu7/cache/index3/size | 1 + .../system/cpu/cpu7/cache/index3/type | 1 + .../linux-resctrl/system/cpu/cpu7/online | 1 + .../linux-resctrl/system/cpu/cpu7/topology/core_id | 1 + .../system/cpu/cpu7/topology/core_siblings | 1 + .../system/cpu/cpu7/topology/core_siblings_list | 1 + .../system/cpu/cpu7/topology/physical_package_id | 1 + .../system/cpu/cpu7/topology/thread_siblings | 1 + .../system/cpu/cpu7/topology/thread_siblings_list | 1 + .../linux-resctrl/system/cpu/cpu8/cache/index0/id | 1 + .../system/cpu/cpu8/cache/index0/level | 1 + .../system/cpu/cpu8/cache/index0/shared_cpu_list | 1 + .../system/cpu/cpu8/cache/index0/shared_cpu_map | 1 + .../system/cpu/cpu8/cache/index0/size | 1 + .../system/cpu/cpu8/cache/index0/type | 1 + .../linux-resctrl/system/cpu/cpu8/cache/index1/id | 1 + .../system/cpu/cpu8/cache/index1/level | 1 + .../system/cpu/cpu8/cache/index1/shared_cpu_list | 1 + .../system/cpu/cpu8/cache/index1/shared_cpu_map | 1 + .../system/cpu/cpu8/cache/index1/size | 1 + .../system/cpu/cpu8/cache/index1/type | 1 + .../linux-resctrl/system/cpu/cpu8/cache/index2/id | 1 + .../system/cpu/cpu8/cache/index2/level | 1 + .../system/cpu/cpu8/cache/index2/shared_cpu_list | 1 + .../system/cpu/cpu8/cache/index2/shared_cpu_map | 1 + .../system/cpu/cpu8/cache/index2/size | 1 + .../system/cpu/cpu8/cache/index2/type | 1 + .../linux-resctrl/system/cpu/cpu8/cache/index3/id | 1 + .../system/cpu/cpu8/cache/index3/level | 1 + .../system/cpu/cpu8/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu8/cache/index3/shared_cpu_map | 1 + .../system/cpu/cpu8/cache/index3/size | 1 + .../system/cpu/cpu8/cache/index3/type | 1 + .../linux-resctrl/system/cpu/cpu8/online | 1 + .../linux-resctrl/system/cpu/cpu8/topology/core_id | 1 + .../system/cpu/cpu8/topology/core_siblings | 1 + .../system/cpu/cpu8/topology/core_siblings_list | 1 + .../system/cpu/cpu8/topology/physical_package_id | 1 + .../system/cpu/cpu8/topology/thread_siblings | 1 + .../system/cpu/cpu8/topology/thread_siblings_list | 1 + .../system/cpu/cpu9/cache/index0/id} | 0 .../system/cpu/cpu9/cache/index0/level | 1 + .../system/cpu/cpu9/cache/index0/shared_cpu_list | 1 + .../system/cpu/cpu9/cache/index0/shared_cpu_map | 1 + .../system/cpu/cpu9/cache/index0/size | 1 + .../system/cpu/cpu9/cache/index0/type | 1 + .../system/cpu/cpu9/cache/index1/id} | 0 .../system/cpu/cpu9/cache/index1/level | 1 + .../system/cpu/cpu9/cache/index1/shared_cpu_list | 1 + .../system/cpu/cpu9/cache/index1/shared_cpu_map | 1 + .../system/cpu/cpu9/cache/index1/size | 1 + .../system/cpu/cpu9/cache/index1/type | 1 + .../system/cpu/cpu9/cache/index2/id} | 0 .../system/cpu/cpu9/cache/index2/level | 1 + .../system/cpu/cpu9/cache/index2/shared_cpu_list | 1 + .../system/cpu/cpu9/cache/index2/shared_cpu_map | 1 + .../system/cpu/cpu9/cache/index2/size | 1 + .../system/cpu/cpu9/cache/index2/type | 1 + .../linux-resctrl/system/cpu/cpu9/cache/index3/id | 1 + .../system/cpu/cpu9/cache/index3/level | 1 + .../system/cpu/cpu9/cache/index3/shared_cpu_list | 1 + .../system/cpu/cpu9/cache/index3/shared_cpu_map | 1 + .../system/cpu/cpu9/cache/index3/size | 1 + .../system/cpu/cpu9/cache/index3/type | 1 + .../linux-resctrl/system/cpu/cpu9/online | 1 + .../linux-resctrl/system/cpu/cpu9/topology/core_id | 1 + .../system/cpu/cpu9/topology/core_siblings | 1 + .../system/cpu/cpu9/topology/core_siblings_list | 1 + .../system/cpu/cpu9/topology/physical_package_id | 1 + .../system/cpu/cpu9/topology/thread_siblings | 1 + .../system/cpu/cpu9/topology/thread_siblings_list | 1 + .../linux-resctrl/system/cpu/online | 1 + .../linux-resctrl/system/cpu/present | 1 + .../linux-resctrl/system/node/node0/cpu0 | 1 + .../linux-resctrl/system/node/node0/cpu1 | 1 + .../linux-resctrl/system/node/node0/cpu2 | 1 + .../linux-resctrl/system/node/node0/cpu3 | 1 + .../linux-resctrl/system/node/node0/cpu4 | 1 + .../linux-resctrl/system/node/node0/cpu5 | 1 + .../linux-resctrl/system/node/node0/cpulist | 1 + .../linux-resctrl/system/node/node0/cpumap | 1 + .../linux-resctrl/system/node/node0/distance | 1 + .../hugepages/hugepages-1048576kB/free_hugepages | 1 + .../hugepages/hugepages-1048576kB/nr_hugepages | 1 + .../hugepages-1048576kB/surplus_hugepages | 1 + .../hugepages/hugepages-2048kB/free_hugepages | 1 + .../node0/hugepages/hugepages-2048kB/nr_hugepages | 1 + .../hugepages/hugepages-2048kB/surplus_hugepages | 1 + .../linux-resctrl/system/node/node1/cpu10 | 1 + .../linux-resctrl/system/node/node1/cpu11 | 1 + .../linux-resctrl/system/node/node1/cpu6 | 1 + .../linux-resctrl/system/node/node1/cpu7 | 1 + .../linux-resctrl/system/node/node1/cpu8 | 1 + .../linux-resctrl/system/node/node1/cpu9 | 1 + .../linux-resctrl/system/node/node1/cpulist | 1 + .../linux-resctrl/system/node/node1/cpumap | 1 + .../linux-resctrl/system/node/node1/distance | 1 + .../hugepages/hugepages-1048576kB/free_hugepages | 1 + .../hugepages/hugepages-1048576kB/nr_hugepages | 1 + .../hugepages-1048576kB/surplus_hugepages | 1 + .../hugepages/hugepages-2048kB/free_hugepages | 1 + .../node1/hugepages/hugepages-2048kB/nr_hugepages | 1 + .../hugepages/hugepages-2048kB/surplus_hugepages | 1 + .../linux-resctrl/system/node/online | 1 + tests/vircaps2xmldata/vircaps-x86_64-caches.xml | 3 + tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 49 ++++ tests/vircaps2xmltest.c | 31 ++- tests/virfilewrapper.c | 281 +++++++++++++++++++++ src/util/virsysfspriv.h => tests/virfilewrapper.h | 19 +- tests/virhostcputest.c | 8 +- tests/virnumamock.c | 17 +- tests/virschematest.c | 3 +- 522 files changed, 1368 insertions(+), 455 deletions(-) delete mode 100644 src/util/virsysfs.c delete mode 100644 src/util/virsysfs.h create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/id create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/cpus create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/cbm_mask create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/min_cbm_bits create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/num_closids create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/manualres/cpus create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/manualres/schemata create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/manualres/tasks create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/schemata create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/tasks create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/online create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/thread_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/online create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/thread_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/online create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/thread_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/level copy tests/vircaps2xmldata/{linux-caches/cpu/cpu0/cache/index0/shared_cpu_map => linux-resctrl/system/cpu/cpu11/cache/index0/shared_cpu_list} (100%) create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/level copy tests/vircaps2xmldata/{linux-caches/cpu/cpu0/cache/index0/shared_cpu_map => linux-resctrl/system/cpu/cpu11/cache/index1/shared_cpu_list} (100%) create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/level copy tests/vircaps2xmldata/{linux-caches/cpu/cpu0/cache/index0/shared_cpu_map => linux-resctrl/system/cpu/cpu11/cache/index2/shared_cpu_list} (100%) create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/online create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/thread_siblings copy tests/vircaps2xmldata/{linux-caches/cpu/cpu0/cache/index0/shared_cpu_map => linux-resctrl/system/cpu/cpu11/topology/thread_siblings_list} (100%) create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/online create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/thread_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/online create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/thread_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/online create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/thread_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/online create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/thread_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/online create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/thread_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/online create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/thread_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/online create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/thread_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/thread_siblings_list copy tests/vircaps2xmldata/{linux-caches/cpu/cpu0/cache/index0/shared_cpu_map => linux-resctrl/system/cpu/cpu9/cache/index0/id} (100%) create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/type copy tests/vircaps2xmldata/{linux-caches/cpu/cpu0/cache/index0/shared_cpu_map => linux-resctrl/system/cpu/cpu9/cache/index1/id} (100%) create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/type copy tests/vircaps2xmldata/{linux-caches/cpu/cpu0/cache/index0/shared_cpu_map => linux-resctrl/system/cpu/cpu9/cache/index2/id} (100%) create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/level create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/size create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/type create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/online create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/thread_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/online create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/present create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu0 create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu1 create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu2 create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu3 create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu4 create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu5 create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpulist create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpumap create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node0/distance create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-1048576kB/free_hugepages create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-1048576kB/nr_hugepages create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-1048576kB/surplus_hugepages create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-2048kB/free_hugepages create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-2048kB/surplus_hugepages create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu10 create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu11 create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu6 create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu7 create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu8 create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu9 create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpulist create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpumap create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node1/distance create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-1048576kB/free_hugepages create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-1048576kB/nr_hugepages create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-1048576kB/surplus_hugepages create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-2048kB/free_hugepages create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-2048kB/nr_hugepages create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-2048kB/surplus_hugepages create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/online create mode 100644 tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml create mode 100644 tests/virfilewrapper.c rename src/util/virsysfspriv.h => tests/virfilewrapper.h (69%) -- 2.12.2

4 18

[libvirt] [PATCH] qemu: Fix persistent migration of transient domains
by Jiri Denemark 02 May '17

02 May '17

While fixing a bug with incorrectly freed memory in commit v3.1.0-399-g5498aa29a, I accidentally broke persistent migration of transient domains. Before adding qemuDomainDefCopy in the path, the code just took NULL from vm->newDef and used it as the persistent def, which resulted in no persistent XML being sent in the migration cookie. This scenario is perfectly valid and the destination correctly handles it by using the incoming live definition and storing it as the persistent one. After the mentioned commit libvirtd would just segfault in the described scenario. https://bugzilla.redhat.com/show_bug.cgi?id=1446205 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 30f98da1e..3c0d7e957 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3640,15 +3640,15 @@ qemuMigrationRun(virQEMUDriverPtr driver, if (flags & VIR_MIGRATE_PERSIST_DEST) { if (persist_xml) { - persistDef = qemuMigrationPrepareDef(driver, persist_xml, - NULL, NULL); - } else { - persistDef = qemuDomainDefCopy(driver, vm->newDef, - VIR_DOMAIN_XML_SECURE | - VIR_DOMAIN_XML_MIGRATABLE); + if (!(persistDef = qemuMigrationPrepareDef(driver, persist_xml, + NULL, NULL))) + goto cleanup; + } else if (vm->newDef) { + if (!(persistDef = qemuDomainDefCopy(driver, vm->newDef, + VIR_DOMAIN_XML_SECURE | + VIR_DOMAIN_XML_MIGRATABLE))) + goto cleanup; } - if (!persistDef) - goto cleanup; } mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, -- 2.12.2

2 1

[libvirt] [PATCH] Fix padding of encrypted data
by Daniel P. Berrange 02 May '17

02 May '17

If we are encoding a block of data that is 16 bytes in length, we cannot leave it as 16 bytes, we must pad it out to the next block boundary, 32 bytes. Without this padding, the decoder will incorrectly treat the last byte of plain text as the padding length, as it can't distinguish padded from non-padded data. The problem exhibited itself when using a 16 byte passphrase for a LUKS volume $ virsh secret-set-value 55806c7d-8e93-456f-829b-607d8c198367 \ $(echo -n 1234567812345678 | base64) Secret value set $ virsh start demo error: Failed to start domain demo error: internal error: process exited while connecting to monitor: >>>>>>>>>>Len 16 2017-05-02T10:35:40.016390Z qemu-system-x86_64: -object \ secret,id=virtio-disk1-luks-secret0,data=SEtNi5vDUeyseMKHwc1c1Q==,\ keyid=masterKey0,iv=zm7apUB1A6dPcH53VW960Q==,format=base64: \ Incorrect number of padding bytes (56) found on decrypted data Notice how the padding '56' corresponds to the ordinal value of the character '8'. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/vircrypto.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c index 8748e1c..48b04fc 100644 --- a/src/util/vircrypto.c +++ b/src/util/vircrypto.c @@ -152,8 +152,14 @@ virCryptoEncryptDataAESgnutls(gnutls_cipher_algorithm_t gnutls_enc_alg, uint8_t *ciphertext; size_t ciphertextlen; - /* Allocate a padded buffer, copy in the data */ - ciphertextlen = VIR_ROUND_UP(datalen, 16); + /* Allocate a padded buffer, copy in the data. + * + * NB, we must *always* have at least 1 byte of + * padding - we can't skip it on multiples of + * 16, otherwise decoder can't distinguish padded + * data from non-padded data. Hence datalen + 1 + */ + ciphertextlen = VIR_ROUND_UP(datalen + 1, 16); if (VIR_ALLOC_N(ciphertext, ciphertextlen) < 0) return -1; memcpy(ciphertext, data, datalen); -- 2.9.3

2 1

[libvirt] Symptoms of main loop slowing down in libvirtd
by Prerna 02 May '17

02 May '17

Hi all, On my host, I have been seeing instances of keepalive responses slow down intermittently when issuing bulk power offs. With some tips from Danpb on the channel, I was able to trace via systemtap that the main event loop would not run for about 6-9 seconds. This would stall keepalives and kill client connections. I was able to trace it to the fact that qemuProcessHandleEvent() needed the vm lock, and this was called from the main loop. I had hook scripts that slightly elongated the time the power off RPC completed and the subsequent keepalive delays were noticeable. I agree that the easiest solution is to unblock the Vm lock before hook scripts are activated. However, I was wondering why we contend on the per-Vm lock directly from the main loop at all ? Can we do this instead : have the main loop "park" events to a separate event queue, and then have a dedicated thread pool in the qemu driver pick these raw events and then try grabbing the per-vm lock for that VM ? That way, we can be sure that the main event loop is _never_ delayed irrespective of an RPC dragging on. If this sounds reasonable I will be happy to post the driver rewrite patches to that end. Regards, Prerna

3 7

[libvirt] [PATCH] qemu: Don't reset "events" migration capability
by Jiri Denemark 02 May '17

02 May '17

When creating v3.2.0-77-g8be3ccd04 commit, I completely forgot that one migration capability is very special. It's the "events" capability which tells QEMU to report "MIGRATION" events. Since libvirt always wants the events, it is enabled in qemuConnectMonitor and the rest of the code should not touch it. https://bugzilla.redhat.com/show_bug.cgi?id=1439841 https://bugzilla.redhat.com/show_bug.cgi?id=1441165 Messed-up-by: Jiri Denemark <jdenemar(a)redhat.com> Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b4507a3ae..30f98da1e 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5919,6 +5919,11 @@ qemuMigrationReset(virQEMUDriverPtr driver, goto cleanup; for (cap = 0; cap < QEMU_MONITOR_MIGRATION_CAPS_LAST; cap++) { + /* "events" capability is set (when supported) in qemuConnectMonitor + * and should never be cleared */ + if (cap == QEMU_MONITOR_MIGRATION_CAPS_EVENTS) + continue; + if (qemuMigrationSetOption(driver, vm, cap, false, job) < 0) goto cleanup; } -- 2.12.2

2 1