- Devel - libvirt List Archives

[libvirt] More CI options
by Martin Kletzander 07 Jun '17

07 Jun '17

Since the addition of Travis CI builds, there is some more progress towards more testing. I was just wondering if anyone was thinking about (or is already working on) some settings for other CI environments as well. For example if configured AppVeyor, we could have MSVC builds as well. And there are more of those, I didn't compare all of them, but the more environments we have, the more build failures we might catch. Or even test failures, maybe. Martin

2 3

[libvirt] [PATCH 0/2] qemu: Allow block-copy for persistent VMs under same conditions as for transient
by Peter Krempa 07 Jun '17

07 Jun '17

Peter Krempa (2): qemu: Conditionally allow block-copy for persistent domains virsh: Add support for VIR_DOMAIN_BLOCK_COPY_TRANSIENT_JOB include/libvirt/libvirt-domain.h | 3 +++ src/libvirt-domain.c | 3 +++ src/qemu/qemu_driver.c | 9 ++++++--- tools/virsh-domain.c | 10 +++++++++- tools/virsh.pod | 4 ++++ 5 files changed, 25 insertions(+), 4 deletions(-) -- 2.12.2

2 4

[libvirt] [PATCH 00/15] Fix regression caused by recent CPU driver changes
by Jiri Denemark 07 Jun '17

07 Jun '17

https://bugzilla.redhat.com/show_bug.cgi?id=1441662 when I was enhancing libvirt's guest CPU configuration code to be able to really ensure stable guest CPU ABI, I added a new attribute //cpu/@check which is nicely backward compatible... an old libvirt will just ignore it. However, even if check='full' will be ignored, an old libvirt will still see the updated CPU definition (features added or removed by the hypervisor will be shown there). And because we need QEMU 2.9.0 to check what features are going to be added or removed before we actually start the domain, migrating such domain to an older libvirt or QEMU may fail if QEMU enables a feature which is not supported by the host CPU. Known features causing problems are, e.g., x2apic, hypervisor, and arat. To make things even worse, updating a CPU definition with the automatically added/removed features can be done since QEMU 1.5.0. Even save/restore or snapshot revert on a single host running new libvirt and QEMU < 2.9.0 is now affected by this regression. This series fixes the regression by storing the original guest CPU definition in migratable XML and sending the updated CPU in a side channel (a migration or save cookie). Jiri Denemark (15): conf: Make error reporting in virCPUDefIsEqual optional conf: Refactor virCPUDefParseXML conf: Make virDomainSnapshotDefFormat easier to read conf: Pass xmlopt to virDomainSnapshotDefFormat qemu: Rename xml_len in virQEMUSaveHeader as data_len qemu: Refactor save image header conf: Introduce virSaveCookie conf: Add save cookie callbacks to xmlopt qemu: Implement virSaveCookie object and callbacks qemu: Store save cookie in save images and snapshots qemu: Remember CPU def from domain start qemu: Report the original CPU in migratable xml qemu: Send updated CPU in migration cookie qemu: Store updated CPU in save cookie qemu: Use updated CPU when starting QEMU if possible docs/formatsnapshot.html.in | 6 + docs/schemas/domainsnapshot.rng | 7 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/bhyve/bhyve_domain.c | 2 +- src/conf/cpu_conf.c | 224 +++++++++++-------- src/conf/cpu_conf.h | 12 +- src/conf/domain_conf.c | 30 ++- src/conf/domain_conf.h | 7 +- src/conf/snapshot_conf.c | 40 +++- src/conf/snapshot_conf.h | 3 + src/conf/virsavecookie.c | 144 ++++++++++++ src/conf/virsavecookie.h | 62 +++++ src/cpu/cpu.c | 5 +- src/esx/esx_driver.c | 2 +- src/libvirt_private.syms | 10 + src/libxl/libxl_conf.c | 2 +- src/lxc/lxc_conf.c | 2 +- src/openvz/openvz_driver.c | 2 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_domain.c | 207 +++++++++++++++-- src/qemu/qemu_domain.h | 22 ++ src/qemu/qemu_driver.c | 459 ++++++++++++++++++++++++++------------ src/qemu/qemu_migration.c | 18 +- src/qemu/qemu_migration_cookie.c | 31 ++- src/qemu/qemu_migration_cookie.h | 5 + src/qemu/qemu_process.c | 37 ++- src/qemu/qemu_process.h | 2 + src/security/virt-aa-helper.c | 2 +- src/test/test_driver.c | 3 +- src/uml/uml_driver.c | 2 +- src/vbox/vbox_common.c | 6 +- src/vmware/vmware_driver.c | 3 +- src/vmx/vmx.c | 2 +- src/vz/vz_driver.c | 3 +- src/xen/xen_driver.c | 2 +- src/xenapi/xenapi_driver.c | 2 +- tests/bhyveargv2xmltest.c | 2 +- tests/cputest.c | 5 +- tests/domainsnapshotxml2xmltest.c | 1 + tests/testutils.c | 2 +- 43 files changed, 1069 insertions(+), 316 deletions(-) create mode 100644 src/conf/virsavecookie.c create mode 100644 src/conf/virsavecookie.h -- 2.13.0

2 30

[libvirt] [PATCH] qemu: Set operation on completed migration job
by Jiri Denemark 07 Jun '17

07 Jun '17

Without this patch libvirt would just report the operation of a completed job as "unknown" instead of "incoming migration". https://bugzilla.redhat.com/show_bug.cgi?id=1457052 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration_cookie.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index 12887892d..559b1f0c1 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -1292,6 +1292,7 @@ qemuMigrationEatCookie(virQEMUDriverPtr driver, int cookieinlen, unsigned int flags) { + qemuDomainObjPrivatePtr priv = dom->privateData; qemuMigrationCookiePtr mig = NULL; /* Parse & validate incoming cookie (if any) */ @@ -1340,6 +1341,9 @@ qemuMigrationEatCookie(virQEMUDriverPtr driver, } } + if (flags & QEMU_MIGRATION_COOKIE_STATS && mig->jobInfo) + mig->jobInfo->operation = priv->job.current->operation; + return mig; error: -- 2.13.0

2 1

[libvirt] [PATCH] qemu: Starting a domain with custom model and allowed-fallback failed when host lacks some CPU features
by Yi Wang 06 Jun '17

06 Jun '17

An attemp to start a domain requesting a custom CPU model, core2duo, for example, will fail if some feature that the model needs doesn't exist in that host, even though fallback attibute is set allow: "error: the CPU is incompatible with host CPU: Host CPU does not provide required features: monitor" Of course we can start that domain through forbidding that feature, but that may not be flexible. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/qemu/qemu_process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 32ba8e3..1bb65d3 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5324,7 +5324,8 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def, virCPUCompare(caps->host.arch, virQEMUCapsGetHostModel(qemuCaps, def->virtType, VIR_QEMU_CAPS_HOST_CPU_FULL), - def->cpu, true) < 0) + def->cpu, + def->cpu->fallback != VIR_CPU_FALLBACK_ALLOW) < 0) return -1; if (virCPUUpdate(def->os.arch, def->cpu, -- 1.8.3.1

3 3

[libvirt] [PATCH] docs: correct improper information about domain states in virsh manpage
by Laine Stump 06 Jun '17

06 Jun '17

Commit 24d4a0a1f removed the non-existent "dying" state from the list of possible domain states given in the virsh manpage, but didn't correct the count of states from 8 down to 7. This patch fixes that mismatch, while wording the sentence in a more readable/truthful manner. --- tools/virsh.pod | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index aee9646..611ea88 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -418,8 +418,9 @@ State is the run state (see below). B<STATES> -The State field lists 8 states for a domain, and which ones the -current domain is in. +The State field lists what state each domain is currently in. A domain +can be in one of the following seven possible states: + =over 4 -- 2.9.3

2 1

[libvirt] [libvirt-php PATCH] add API bindings for get/set network autostart
by Dawid Zamirski 06 Jun '17

06 Jun '17

Aside from that: * fix arginfo_libvirt_conn_flags - it has 2 args not 1 * get rid arginfo_libvirt_domain_set_autostart and use arginfo_libvirt_conn_flags instead as it's the same. --- src/libvirt-php.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++------- src/libvirt-php.h | 2 ++ 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 99d6397..c2ab0da 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -284,7 +284,7 @@ ZEND_ARG_INFO(0, conn) ZEND_ARG_INFO(0, to) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_conn_flags, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_conn_flags, 0, 0, 2) ZEND_ARG_INFO(0, conn) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() @@ -399,11 +399,6 @@ ZEND_ARG_INFO(0, res) ZEND_ARG_INFO(0, mac) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_set_autostart, 0, 0, 2) -ZEND_ARG_INFO(0, conn) -ZEND_ARG_INFO(0, flags) -ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_get_metadata, 0, 0, 4) ZEND_ARG_INFO(0, conn) ZEND_ARG_INFO(0, type) @@ -662,7 +657,7 @@ static zend_function_entry libvirt_functions[] = { PHP_FE(libvirt_domain_get_block_info, arginfo_libvirt_domain_get_block_info) PHP_FE(libvirt_domain_get_network_info, arginfo_libvirt_domain_get_network_info) PHP_FE(libvirt_domain_get_autostart, arginfo_libvirt_conn) - PHP_FE(libvirt_domain_set_autostart, arginfo_libvirt_domain_set_autostart) + PHP_FE(libvirt_domain_set_autostart, arginfo_libvirt_conn_flags) PHP_FE(libvirt_domain_get_metadata, arginfo_libvirt_domain_get_metadata) PHP_FE(libvirt_domain_set_metadata, arginfo_libvirt_domain_set_metadata) PHP_FE(libvirt_domain_is_active, arginfo_libvirt_conn) @@ -724,6 +719,8 @@ static zend_function_entry libvirt_functions[] = { PHP_FE(libvirt_network_get_uuid_string, arginfo_libvirt_conn) PHP_FE(libvirt_network_get_uuid, arginfo_libvirt_conn) PHP_FE(libvirt_network_get_name, arginfo_libvirt_conn) + PHP_FE(libvirt_network_get_autostart, arginfo_libvirt_conn) + PHP_FE(libvirt_network_set_autostart, arginfo_libvirt_conn_flags) /* Node functions */ PHP_FE(libvirt_node_get_info, arginfo_libvirt_conn) PHP_FE(libvirt_node_get_cpu_stats, arginfo_libvirt_conn_optcpunr) @@ -10002,6 +9999,49 @@ PHP_FUNCTION(libvirt_network_get_name) } /* + * Function name: libvirt_network_get_autostart + * Since version: 0.5.4 + * Description: Function is getting the autostart value for the network + * Arguments: @res [resource]: libvirt network resource + * Returns: autostart value or -1 on error + */ +PHP_FUNCTION(libvirt_network_get_autostart) +{ + php_libvirt_network *network = NULL; + zval *znetwork; + int autostart; + + GET_NETWORK_FROM_ARGS("r", &znetwork); + + if (virNetworkGetAutostart(network->network, &autostart) != 0) + RETURN_LONG(-1); + + RETURN_LONG((long) autostart); +} + +/* + * Function name: libvirt_network_set_autostart + * Since version: 0.5.4 + * Description: Function is setting the autostart value for the network + * Arguments: @res [resource]: libvirt network resource + * @flags [int]: flag to enable/disable autostart + * Returns: TRUE on success, FALSE on error + */ +PHP_FUNCTION(libvirt_network_set_autostart) +{ + php_libvirt_network *network = NULL; + zval *znetwork; + zend_long autostart = 0; + + GET_NETWORK_FROM_ARGS("rl", &znetwork, &autostart); + + if (virNetworkSetAutostart(network->network, autostart) < 0) + RETURN_FALSE; + + RETURN_TRUE; +} + +/* * Function name: libvirt_version * Since version: 0.4.1(-1) * Description: Function is used to get libvirt, driver and libvirt-php version numbers. Can be used for information purposes, for version checking please use libvirt_check_version() defined below diff --git a/src/libvirt-php.h b/src/libvirt-php.h index f87d180..f9dec09 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -423,6 +423,8 @@ PHP_FUNCTION(libvirt_network_set_active); PHP_FUNCTION(libvirt_network_get_uuid_string); PHP_FUNCTION(libvirt_network_get_uuid); PHP_FUNCTION(libvirt_network_get_name); +PHP_FUNCTION(libvirt_network_get_autostart); +PHP_FUNCTION(libvirt_network_set_autostart); /* Nodedev functions */ PHP_FUNCTION(libvirt_nodedev_get); PHP_FUNCTION(libvirt_nodedev_capabilities); -- 2.13.0

3 2

[libvirt] [PATCH] lxc: add possibility to define init uid/gid
by Cédric Bosdonnat 06 Jun '17

06 Jun '17

Users may want to run the init command of a container as a special user / group. Allow doing it using <inituser uid=""/> and <initgroup gid=""/> elements. --- docs/formatdomain.html.in | 6 ++++++ docs/schemas/domaincommon.rng | 12 ++++++++++++ src/conf/domain_conf.c | 19 +++++++++++++++++++ src/conf/domain_conf.h | 2 ++ src/lxc/lxc_container.c | 13 +++++++++++++ tests/lxcxml2xmldata/lxc-inituser.xml | 31 +++++++++++++++++++++++++++++++ tests/lxcxml2xmltest.c | 1 + 7 files changed, 84 insertions(+) create mode 100644 tests/lxcxml2xmldata/lxc-inituser.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 7627fd0d0..85d5f4539 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -334,6 +334,10 @@ To set a custom work directory for the init, use the <code>initdir</code> element. + + To run the init command as a given user or group, use the <code>inituser</code> + or <code>initgroup</code> elements respectively. + <pre> <os> @@ -343,6 +347,8 @@ <initarg>emergency.service</initarg> <initenv name='MYENV'>some value</initenv> <initdir>/my/custom/cwd</initdir> + <inituser uid="1000"/> + <initgroup gid="1000"/> </os> </pre> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 5a4c4ecf1..385e937e9 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -400,6 +400,18 @@ <ref name="absFilePath"/> </element> </optional> + <optional> + <element name="inituser"> + <attribute name="uid"> + <ref name="unsignedInt"/> + </attribute> + </element> + <element name="initgroup"> + <attribute name="gid"> + <ref name="unsignedInt"/> + </attribute> + </element> + </optional> </interleave> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3c2a81f52..21bb104a9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16806,6 +16806,18 @@ virDomainDefParseBootOptions(virDomainDefPtr def, def->os.cmdline = virXPathString("string(./os/cmdline[1])", ctxt); def->os.initdir = virXPathString("string(./os/initdir[1])", ctxt); + if (virXPathUInt("string(./os/inituser[1]/@uid)", ctxt, &def->os.inituid) == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Failed to parse inituser uid")); + goto error; + } + + if (virXPathUInt("string(./os/initgroup[1]/@gid)", ctxt, &def->os.initgid) == -2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Failed to parse initgroup gid")); + goto error; + } + if ((n = virXPathNodeSet("./os/initarg", ctxt, &nodes)) < 0) goto error; @@ -24593,6 +24605,13 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (def->os.initdir) virBufferEscapeString(buf, "<initdir>%s</initdir>\n", def->os.initdir); + if (def->os.inituid) + virBufferAsprintf(buf, "<inituser uid='%u'/>\n", + def->os.inituid); + if (def->os.initgid) + virBufferAsprintf(buf, "<initgroup gid='%u'/>\n", + def->os.initgid); + if (def->os.loader) virDomainLoaderDefFormat(buf, def->os.loader); virBufferEscapeString(buf, "<kernel>%s</kernel>\n", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index d6b8429c3..6e1997324 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1842,6 +1842,8 @@ struct _virDomainOSDef { char **initargv; virDomainOSEnvPtr *initenv; char *initdir; + uid_t inituid; + gid_t initgid; char *kernel; char *initrd; char *cmdline; diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 8d8e1a735..42bcd25c4 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -247,6 +247,10 @@ static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef, virCommandAddEnvPair(cmd, "LIBVIRT_LXC_CMDLINE", vmDef->os.cmdline); if (vmDef->os.initdir) virCommandSetWorkingDirectory(cmd, vmDef->os.initdir); + if (vmDef->os.inituid) + virCommandSetUID(cmd, vmDef->os.inituid); + if (vmDef->os.initgid) + virCommandSetGID(cmd, vmDef->os.initgid); for (i = 0; vmDef->os.initenv[i]; i++) { virCommandAddEnvPair(cmd, vmDef->os.initenv[i]->name, @@ -2192,6 +2196,15 @@ static int lxcContainerChild(void *data) goto cleanup; } + /* Change the newly created tty owner to the inituid for + * shells to have job control */ + if (vmDef->os.inituid && chown(ttyPath, vmDef->os.inituid, -1) < 0) { + virReportSystemError(errno, + _("Failed to change ownership of tty %s"), + ttyPath); + goto cleanup; + } + if (lxcContainerResolveAllSymlinks(vmDef) < 0) goto cleanup; diff --git a/tests/lxcxml2xmldata/lxc-inituser.xml b/tests/lxcxml2xmldata/lxc-inituser.xml new file mode 100644 index 000000000..61b5db4af --- /dev/null +++ b/tests/lxcxml2xmldata/lxc-inituser.xml @@ -0,0 +1,31 @@ +<domain type='lxc'> + <name>jessie</name> + <uuid>e21987a5-e98e-9c99-0e35-803e4d9ad1fe</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <resource> + <partition>/machine</partition> + </resource> + <os> + <type arch='x86_64'>exe</type> + <init>/sbin/sh</init> + <inituser uid='1000'/> + <initgroup gid='1234'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/mach/jessie'/> + <target dir='/'/> + </filesystem> + <console type='pty'> + <target type='lxc' port='0'/> + </console> + </devices> + <seclabel type='none'/> +</domain> diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index c81b0eace..9b9314cf8 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -100,6 +100,7 @@ mymain(void) VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS); DO_TEST("initenv"); DO_TEST("initdir"); + DO_TEST("inituser"); virObjectUnref(caps); virObjectUnref(xmlopt); -- 2.12.2

1 0

[libvirt] [PATCH 0/2] Set lxc container working directory
by Cédric Bosdonnat 06 Jun '17

06 Jun '17

Hi all, Here is a resubmit with: * virExec() call orders preserved while still sharing code with virCommandExec() * Cleanup in the last patch Cédric Bosdonnat (2): util: share code between virExec and virCommandExec lxc: allow user to specify command working directory docs/formatdomain.html.in | 5 +++ docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 5 +++ src/conf/domain_conf.h | 1 + src/lxc/lxc_container.c | 2 ++ src/util/vircommand.c | 69 +++++++++++++++++++++--------------- tests/lxcxml2xmldata/lxc-initdir.xml | 30 ++++++++++++++++ tests/lxcxml2xmltest.c | 1 + 8 files changed, 89 insertions(+), 29 deletions(-) create mode 100644 tests/lxcxml2xmldata/lxc-initdir.xml -- 2.12.2

1 2

[libvirt] [PATCH] qemu: process: Save vcpu ordering information on reconnect
by Peter Krempa 06 Jun '17

06 Jun '17

vCPU ordering information would not be updated if a vCPU emerged or disappeared during the time libvirtd is not running. This allowed to create invalid configuration like: [...] <vcpu id='56' enabled='yes' hotpluggable='yes' order='57'/> <vcpu id='57' enabled='yes' hotpluggable='yes' order='58'/> <vcpu id='58' enabled='yes' hotpluggable='yes'/> Call the function that records the information on reconnect. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1451251 --- src/qemu/qemu_process.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index be031b56b..32ba8e373 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3492,6 +3492,8 @@ qemuProcessReconnect(void *opaque) if (qemuDomainRefreshVcpuInfo(driver, obj, QEMU_ASYNC_JOB_NONE, true) < 0) goto error; + qemuDomainVcpuPersistOrder(obj->def); + if (qemuSecurityReserveLabel(driver->securityManager, obj->def, obj->pid) < 0) goto error; -- 2.12.2

2 1

[libvirt] libvirt builds failing on fedora-rawhide
by Yash Mankad 06 Jun '17

06 Jun '17

Hi, The libvirt-master-build on ci.c.o seems to be failing on the fedora-rawhide slave since Friday. This seems to be the commit/build that is causing it to fail. Commit ed914284ba74afb7dd16dcb623073bb1a1d5cd21 by pkrempa https://ci.centos.org/job/libvirt-master-build/systems=libvirt-fedora-rawhi… Thanks, Yash

4 3

[libvirt] [PATCH] Report more correct information for cache control
by Martin Kletzander 06 Jun '17

06 Jun '17

On some platforms the number of bits in the cbm_mask might not be divisible by 4 (and not even by 2), so we need to properly count the bits. Similar file, min_cbm_bits, is properly parsed and used, but if the number is greater than one, we lose the information about granularity when reporting the data in capabilities. For that matter always report granularity, but if it is not the same as the minimum, add that information in there as well. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/schemas/capability.rng | 7 ++++- src/conf/capabilities.c | 34 ++++++++++++++++++---- src/conf/capabilities.h | 1 + .../linux-resctrl-skx/resctrl/info/L3/cbm_mask | 1 + .../linux-resctrl-skx/resctrl/info/L3/min_cbm_bits | 1 + .../linux-resctrl-skx/resctrl/info/L3/num_closids | 1 + .../linux-resctrl-skx/resctrl/schemata | 1 + .../system/cpu/cpu0/cache/index0/id | 1 + .../system/cpu/cpu0/cache/index0/level | 1 + .../system/cpu/cpu0/cache/index0/shared_cpu_list | 1 + .../system/cpu/cpu0/cache/index0/shared_cpu_map | 1 + .../system/cpu/cpu0/cache/index0/size | 1 + .../system/cpu/cpu0/cache/index0/type | 1 + .../linux-resctrl-skx/system/cpu/cpu0/online | 1 + .../system/cpu/cpu0/topology/core_id | 1 + .../system/cpu/cpu0/topology/core_siblings | 1 + .../system/cpu/cpu0/topology/core_siblings_list | 1 + .../system/cpu/cpu0/topology/physical_package_id | 1 + .../system/cpu/cpu0/topology/thread_siblings | 1 + .../system/cpu/cpu0/topology/thread_siblings_list | 1 + .../linux-resctrl-skx/system/cpu/online | 1 + .../linux-resctrl-skx/system/cpu/present | 1 + .../linux-resctrl-skx/system/node/node0/cpu0 | 1 + .../linux-resctrl-skx/system/node/node0/cpulist | 1 + .../linux-resctrl-skx/system/node/node0/cpumap | 1 + .../linux-resctrl-skx/system/node/node0/distance | 1 + .../linux-resctrl-skx/system/node/online | 1 + .../vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml | 8 ++--- .../vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml | 31 ++++++++++++++++++++ tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 4 +-- tests/vircaps2xmltest.c | 1 + 31 files changed, 97 insertions(+), 13 deletions(-) create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/cbm_mask create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/min_cbm_bits create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/num_closids create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/resctrl/schemata create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/id create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/level create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/shared_cpu_list create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/shared_cpu_map create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/size create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/type create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/online create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_id create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/physical_package_id create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings_list create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/online create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/present create mode 120000 tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpu0 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpulist create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpumap create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/distance create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/node/online create mode 100644 tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index e5cbfa362ec0..071090c2d991 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -273,9 +273,14 @@ </attribute> <zeroOrMore> <element name='control'> - <attribute name='min'> + <attribute name='granularity'> <ref name='unsignedInt'/> </attribute> + <optional> + <attribute name='min'> + <ref name='unsignedInt'/> + </attribute> + </optional> <attribute name='unit'> <ref name='unit'/> </attribute> diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 3becc7e18c62..0f99f3096292 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -31,6 +31,7 @@ #include <unistd.h> #include "capabilities.h" +#include "c-ctype.h" #include "count-one-bits.h" #include "cpu_conf.h" #include "domain_conf.h" @@ -906,11 +907,24 @@ virCapabilitiesFormatCaches(virBufferPtr buf, virBufferAdjustIndent(&controlBuf, indent + 4); for (j = 0; j < bank->ncontrols; j++) { - bool min_kilos = !(bank->controls[j]->min % 1024); + bool min_kilos = !(bank->controls[j]->granularity % 1024); + + /* Only use KiB if both values are divisible */ + if (bank->controls[j]->min) + min_kilos = min_kilos && !(bank->controls[j]->min % 1024); + + virBufferAsprintf(&controlBuf, + "<control granularity='%llu'", + bank->controls[j]->granularity >> (min_kilos * 10)); + + if (bank->controls[j]->min) { + virBufferAsprintf(&controlBuf, + " min='%llu'", + bank->controls[j]->min >> (min_kilos * 10)); + } + virBufferAsprintf(&controlBuf, - "<control min='%llu' unit='%s' " - "type='%s' maxAllocs='%u'/>\n", - bank->controls[j]->min >> (min_kilos * 10), + " unit='%s' type='%s' maxAllocs='%u'/>\n", min_kilos ? "KiB" : "B", virCacheTypeToString(bank->controls[j]->scope), bank->controls[j]->max_allocation); @@ -1598,9 +1612,11 @@ virCapabilitiesGetCacheControl(virCapsHostCacheBankPtr bank, virCacheType scope) { int ret = -1; + char *tmp = NULL; char *path = NULL; char *cbm_mask = NULL; char *type_upper = NULL; + unsigned int bits = 0; unsigned int min_cbm_bits = 0; virCapsHostCacheControlPtr control; @@ -1632,8 +1648,14 @@ virCapabilitiesGetCacheControl(virCapsHostCacheBankPtr bank, virStringTrimOptionalNewline(cbm_mask); - /* cbm_mask: cache bit mask, it's in hex, eg: fffff */ - control->min = min_cbm_bits * bank->size / (strlen(cbm_mask) * 4); + for (tmp = cbm_mask; *tmp != '\0'; tmp++) { + if (c_isxdigit(*tmp)) + bits += count_one_bits(virHexToBin(*tmp)); + } + + control->granularity = bank->size / bits; + if (min_cbm_bits != 1) + control->min = min_cbm_bits * control->granularity; control->scope = scope; diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index ee87d598ef66..d4753db0beec 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -152,6 +152,7 @@ typedef struct _virCapsHostCacheControl virCapsHostCacheControl; typedef virCapsHostCacheControl *virCapsHostCacheControlPtr; struct _virCapsHostCacheControl { unsigned long long min; /* minimum cache control size in B */ + unsigned long long granularity; /* minimum increase step for min in B */ virCacheType scope; /* data, code or both */ unsigned int max_allocation; /* max number of supported allocations */ }; diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/cbm_mask b/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/cbm_mask new file mode 100644 index 000000000000..d482bbb26931 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/cbm_mask @@ -0,0 +1 @@ +7ff diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/min_cbm_bits b/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/min_cbm_bits new file mode 100644 index 000000000000..d00491fd7e5b --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/min_cbm_bits @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/num_closids b/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/num_closids new file mode 100644 index 000000000000..b6a7d89c68e0 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/info/L3/num_closids @@ -0,0 +1 @@ +16 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/schemata b/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/schemata new file mode 100644 index 000000000000..4a4913735386 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/resctrl/schemata @@ -0,0 +1 @@ +L3:0=7ff;1=7ff diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/id b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/id new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/level b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/level new file mode 100644 index 000000000000..00750edc07d6 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/level @@ -0,0 +1 @@ +3 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/shared_cpu_list new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/shared_cpu_list @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/shared_cpu_map new file mode 100644 index 000000000000..5325a8dff751 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/shared_cpu_map @@ -0,0 +1 @@ +001 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/size b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/size new file mode 100644 index 000000000000..24a7d60e7fb9 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/size @@ -0,0 +1 @@ +11264K diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/type b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/type new file mode 100644 index 000000000000..e4fd9dccda2c --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/cache/index0/type @@ -0,0 +1 @@ +Unified diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/online b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/online new file mode 100644 index 000000000000..d00491fd7e5b --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/online @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_id b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_id new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings new file mode 100644 index 000000000000..5325a8dff751 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings @@ -0,0 +1 @@ +001 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings_list b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings_list new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings_list @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/physical_package_id b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/physical_package_id new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings new file mode 100644 index 000000000000..5325a8dff751 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings @@ -0,0 +1 @@ +001 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings_list new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings_list @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/online b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/online new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/online @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/present b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/present new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/present @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpu0 b/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpu0 new file mode 120000 index 000000000000..c841bea28b2b --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpu0 @@ -0,0 +1 @@ +../../cpu/cpu0 \ No newline at end of file diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpulist b/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpulist new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpulist @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpumap b/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpumap new file mode 100644 index 000000000000..5325a8dff751 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/cpumap @@ -0,0 +1 @@ +001 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/distance b/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/distance new file mode 100644 index 000000000000..f599e28b8ab0 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/node/node0/distance @@ -0,0 +1 @@ +10 diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/node/online b/tests/vircaps2xmldata/linux-resctrl-skx/system/node/online new file mode 100644 index 000000000000..573541ac9702 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-skx/system/node/online @@ -0,0 +1 @@ +0 diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml index 49aa0b98ca88..7361537bfb56 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml @@ -42,12 +42,12 @@ </topology> <cache> <bank id='0' level='3' type='both' size='15360' unit='KiB' cpus='0-5'> - <control min='768' unit='KiB' type='code' maxAllocs='8'/> - <control min='768' unit='KiB' type='data' maxAllocs='8'/> + <control granularity='768' unit='KiB' type='code' maxAllocs='8'/> + <control granularity='768' unit='KiB' type='data' maxAllocs='8'/> </bank> <bank id='1' level='3' type='both' size='15360' unit='KiB' cpus='6-11'> - <control min='768' unit='KiB' type='code' maxAllocs='8'/> - <control min='768' unit='KiB' type='data' maxAllocs='8'/> + <control granularity='768' unit='KiB' type='code' maxAllocs='8'/> + <control granularity='768' unit='KiB' type='data' maxAllocs='8'/> </bank> </cache> </host> diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml new file mode 100644 index 000000000000..f582581148f7 --- /dev/null +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml @@ -0,0 +1,31 @@ +<capabilities> + + <host> + <cpu> + <arch>x86_64</arch> + </cpu> + <power_management/> + <migration_features> + <live/> + </migration_features> + <topology> + <cells num='1'> + <cell id='0'> + <memory unit='KiB'>1048576</memory> + <pages unit='KiB' size='4'>2048</pages> + <pages unit='KiB' size='2048'>4096</pages> + <pages unit='KiB' size='1048576'>6144</pages> + <cpus num='1'> + <cpu id='0' socket_id='0' core_id='0' siblings='0'/> + </cpus> + </cell> + </cells> + </topology> + <cache> + <bank id='0' level='3' type='both' size='11264' unit='KiB' cpus='0'> + <control granularity='1024' unit='KiB' type='both' maxAllocs='16'/> + </bank> + </cache> + </host> + +</capabilities> diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml index cb78b4ab788d..eb02ad3322a2 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml @@ -42,10 +42,10 @@ </topology> <cache> <bank id='0' level='3' type='both' size='15360' unit='KiB' cpus='0-5'> - <control min='1536' unit='KiB' type='both' maxAllocs='4'/> + <control granularity='768' min='1536' unit='KiB' type='both' maxAllocs='4'/> </bank> <bank id='1' level='3' type='both' size='15360' unit='KiB' cpus='6-11'> - <control min='1536' unit='KiB' type='both' maxAllocs='4'/> + <control granularity='768' min='1536' unit='KiB' type='both' maxAllocs='4'/> </bank> </cache> </host> diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index ae1cd521111e..c0a67858fec3 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -120,6 +120,7 @@ mymain(void) DO_TEST_FULL("resctrl", VIR_ARCH_X86_64, true, true, true); DO_TEST_FULL("resctrl-cdp", VIR_ARCH_X86_64, true, true, true); + DO_TEST_FULL("resctrl-skx", VIR_ARCH_X86_64, true, true, true); return ret; } -- 2.13.0

2 2

[libvirt] [PATCH] lxc: allow defining environment variables
by Cédric Bosdonnat 06 Jun '17

06 Jun '17

When running an application container, setting environment variables could be important. The newly introduced <initenv> tag in domain configuration will allow setting environment variables to the init program. --- docs/formatdomain.html.in | 5 +++++ docs/schemas/domaincommon.rng | 10 ++++++++++ src/conf/domain_conf.c | 38 ++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 8 ++++++++ src/lxc/lxc_container.c | 5 +++++ tests/lxcxml2xmldata/lxc-initenv.xml | 30 ++++++++++++++++++++++++++++ tests/lxcxml2xmltest.c | 1 + 7 files changed, 97 insertions(+) create mode 100644 tests/lxcxml2xmldata/lxc-initenv.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 07208eef8..8da50875b 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -326,6 +326,10 @@ element, if set will be used to provide an equivalent to <code>/proc/cmdline</code> but will not affect init argv. + + To set environment variables, use the <code>initenv</code> element, one + for each variable. + <pre> <os> @@ -333,6 +337,7 @@ <init>/bin/systemd</init> <initarg>--unit</initarg> <initarg>emergency.service</initarg> + <initenv name='MYENV'>some value</initenv> </os> </pre> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4d9f8d1a2..695214816 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -385,6 +385,16 @@ <text/> </element> </zeroOrMore> + <zeroOrMore> + <element name="initenv"> + <attribute name="name"> + <data type='string'> + <param name='pattern'>[a-zA-Z_]+[a-zA-Z0-9_]*</param> + </data> + </attribute> + <text/> + </element> + </zeroOrMore> </interleave> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c7e20b8ba..89c803047 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2799,6 +2799,9 @@ void virDomainDefFree(virDomainDefPtr def) for (i = 0; def->os.initargv && def->os.initargv[i]; i++) VIR_FREE(def->os.initargv[i]); VIR_FREE(def->os.initargv); + for (i = 0; def->os.initenv && def->os.initenv[i]; i++) + VIR_FREE(def->os.initenv[i]); + VIR_FREE(def->os.initenv); VIR_FREE(def->os.kernel); VIR_FREE(def->os.initrd); VIR_FREE(def->os.cmdline); @@ -16776,6 +16779,7 @@ virDomainDefParseBootOptions(virDomainDefPtr def, xmlNodePtr *nodes = NULL; xmlNodePtr oldnode; char *tmp = NULL; + char *name = NULL; int ret = -1; size_t i; int n; @@ -16811,6 +16815,37 @@ virDomainDefParseBootOptions(virDomainDefPtr def, } def->os.initargv[n] = NULL; VIR_FREE(nodes); + + if ((n = virXPathNodeSet("./os/initenv", ctxt, &nodes)) < 0) + goto error; + + if (VIR_ALLOC_N(def->os.initenv, n+1) < 0) + goto error; + for (i = 0; i < n; i++) { + if (!(name = virXMLPropString(nodes[i], "name"))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("No name supplied for <initenv> element")); + goto error; + } + + if (!nodes[i]->children || + !nodes[i]->children->content) { + virReportError(VIR_ERR_XML_ERROR, + _("No value supplied for <initenv name='%s'> element"), + name); + goto error; + } + + if (VIR_ALLOC(def->os.initenv[i]) < 0) + goto error; + + def->os.initenv[i]->name = name; + if (VIR_STRDUP(def->os.initenv[i]->value, + (const char*) nodes[i]->children->content) < 0) + goto error; + } + def->os.initenv[n] = NULL; + VIR_FREE(nodes); } if (def->os.type == VIR_DOMAIN_OSTYPE_XEN || @@ -24524,6 +24559,9 @@ virDomainDefFormatInternal(virDomainDefPtr def, for (i = 0; def->os.initargv && def->os.initargv[i]; i++) virBufferEscapeString(buf, "<initarg>%s</initarg>\n", def->os.initargv[i]); + for (i = 0; def->os.initenv && def->os.initenv[i]; i++) + virBufferAsprintf(buf, "<initenv name='%s'>%s</initenv>\n", + def->os.initenv[i]->name, def->os.initenv[i]->value); if (def->os.loader) virDomainLoaderDefFormat(buf, def->os.loader); virBufferEscapeString(buf, "<kernel>%s</kernel>\n", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 83e067269..03153b972 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1820,6 +1820,13 @@ typedef enum { VIR_ENUM_DECL(virDomainIOAPIC); /* Operating system configuration data & machine / arch */ +typedef struct _virDomainOSEnv virDomainOSEnv; +typedef virDomainOSEnv *virDomainOSEnvPtr; +struct _virDomainOSEnv { + char *name; + char *value; +}; + typedef struct _virDomainOSDef virDomainOSDef; typedef virDomainOSDef *virDomainOSDefPtr; struct _virDomainOSDef { @@ -1833,6 +1840,7 @@ struct _virDomainOSDef { bool bm_timeout_set; char *init; char **initargv; + virDomainOSEnvPtr *initenv; char *kernel; char *initrd; char *cmdline; diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index af02b5460..ffafc39d7 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -246,6 +246,11 @@ static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef, if (vmDef->os.cmdline) virCommandAddEnvPair(cmd, "LIBVIRT_LXC_CMDLINE", vmDef->os.cmdline); + for (i = 0; vmDef->os.initenv[i]; i++) { + virCommandAddEnvPair(cmd, vmDef->os.initenv[i]->name, + vmDef->os.initenv[i]->value); + } + virBufferFreeAndReset(&buf); return cmd; } diff --git a/tests/lxcxml2xmldata/lxc-initenv.xml b/tests/lxcxml2xmldata/lxc-initenv.xml new file mode 100644 index 000000000..933d836a2 --- /dev/null +++ b/tests/lxcxml2xmldata/lxc-initenv.xml @@ -0,0 +1,30 @@ +<domain type='lxc'> + <name>jessie</name> + <uuid>e21987a5-e98e-9c99-0e35-803e4d9ad1fe</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <resource> + <partition>/machine</partition> + </resource> + <os> + <type arch='x86_64'>exe</type> + <init>/sbin/sh</init> + <initenv name='FOO'>bar</initenv> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/mach/jessie'/> + <target dir='/'/> + </filesystem> + <console type='pty'> + <target type='lxc' port='0'/> + </console> + </devices> + <seclabel type='none'/> +</domain> diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index 226a73d27..2a24b60b3 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -98,6 +98,7 @@ mymain(void) DO_TEST("ethernet-hostip"); DO_TEST_FULL("filesystem-root", 0, false, VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS); + DO_TEST("initenv"); virObjectUnref(caps); virObjectUnref(xmlopt); -- 2.12.2

3 2

[libvirt] [PATCH 0/2] Set lxc container working directory
by Cédric Bosdonnat 06 Jun '17

06 Jun '17

Hi all, To get lxc containers set the workng directory I had to refactor virExec and virCommandExec to share some more code. Cédric Bosdonnat (2): util: share code between virExec and virCommandExec lxc: allow user to specify command working directory docs/formatdomain.html.in | 5 ++ docs/schemas/domaincommon.rng | 5 ++ src/conf/domain_conf.c | 5 ++ src/conf/domain_conf.h | 1 + src/lxc/lxc_container.c | 4 +- src/util/vircommand.c | 92 +++++++++++++++++------------------- tests/lxcxml2xmldata/lxc-initdir.xml | 30 ++++++++++++ tests/lxcxml2xmltest.c | 1 + 8 files changed, 93 insertions(+), 50 deletions(-) create mode 100644 tests/lxcxml2xmldata/lxc-initdir.xml -- 2.12.2

3 5

[libvirt] [ISSUE go-xml] go-xml does NOT support DomainDisk marshal
by ZhenweiPi 06 Jun '17

06 Jun '17

Hi, In the case of disk hot-plug, we need a xml like this : /<disk type="file" device="disk">// // <driver name="qemu" type="qcow2"/>// // <source file="/root/vda.qcow2"/>// // <target dev="vda" bus="virtio"/>// // <address type='pci' domain='0x0000' bus='1' slot='20' function='0x0'/>// //</disk>/ For now, go-xml does not support DomainDisk marshal. Any good idea ?

2 2

[libvirt] [PATCH v4 0/3] Multiple cleanups within interfaceobj and interface driver
by John Ferlan 05 Jun '17

05 Jun '17

v3: https://www.redhat.com/archives/libvir-list/2017-May/msg01161.html NB: The first 7 patches from v3 were pushed since they were ACK'd. Difference in v4: Patch 1 was essentially ACK'd, but I chose to hold onto it to show the context Patch 2 is the new patch/context - move the @def processing into ObjNew Patch 3 is mostly unchanged; however, I realized during processing of the other code that with the model chosen in virInterfaceObjListAssignDef to return an object that has had both the @lock and @ref incremented so that callers can use the EndAPI to effectively Unlock and Unref that means when calling virInterfaceObjListRemove all that's done is a single Unlock/Unref leaving the object with still 1 reference (and undeleted). That means the caller (testInterfaceUndefine) must make that Unref call of the object. This is no different than how Domain's work, although it's a bit more obtuse there because callers of domain add will make that "second" reference to the object and my goal in this is to be a bit more obvious... The easier way to think about this is for objects only in one list, when leaving the Add/Assign API's, there are 2 Refs and 1 Lock on the object. For objects in 2 lists, there are 3 Refs and 1 Lock. Each caller always calls EndAPI dropping a Ref and the Lock. When it's time to Remove the object, a Find is done - which increments a Ref and Lock and then the Remove API called. The Remove API will effectively Unref for the object in a list (once or twice) and return the Unlocked object w/ 1 Ref. John Ferlan (3): interface: Introduce virInterfaceObjNew interface: Consume @def in virInterfaceObjNew interface: Convert virInterfaceObj to use virObjectLockable po/POTFILES.in | 1 - src/conf/virinterfaceobj.c | 108 +++++++++++++++++++++++++++------------------ src/conf/virinterfaceobj.h | 9 ++-- src/libvirt_private.syms | 3 +- src/test/test_driver.c | 16 +++---- 5 files changed, 77 insertions(+), 60 deletions(-) -- 2.9.4

2 6

[libvirt] [PATCH] audit: Fix the output message for shmem
by Martin Kletzander 05 Jun '17

05 Jun '17

After some discussion on and off the linux-audit mailing list, we should use different fields for the audit messages. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1218603 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/conf/domain_audit.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 2d9ff5e3ffea..1e667af73c4f 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -983,15 +983,13 @@ virDomainAuditShmem(virDomainObjPtr vm, char uuidstr[VIR_UUID_STRING_BUFLEN]; char *vmname = virAuditEncode("vm", vm->def->name); const char *srcpath = virDomainAuditChardevPath(&def->server.chr); - char *src = virAuditEncode("server", VIR_AUDIT_STR(srcpath)); - char *shmem = virAuditEncode("shmem", VIR_AUDIT_STR(def->name)); const char *virt = virDomainVirtTypeToString(vm->def->virtType); - char *size = NULL; + char *shmpath = NULL; virUUIDFormat(vm->def->uuid, uuidstr); - if (!vmname || !src || !shmem || - virAsprintfQuiet(&size, "%llu", def->size) < 0) { + if (!vmname || + virAsprintfQuiet(&shmpath, "/dev/shm/%s", def->name) < 0) { VIR_WARN("OOM while encoding audit message"); goto cleanup; } @@ -1002,14 +1000,18 @@ virDomainAuditShmem(virDomainObjPtr vm, virt = "?"; } - VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, - "virt=%s resrc=shmem reason=%s %s uuid=%s size=%s %s %s", - virt, reason, vmname, uuidstr, size, shmem, src); + if (def->server.enabled) { + VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, + "virt=%s resrc=ivshmem-socket reason=%s %s uuid=%s path=%s", + virt, reason, vmname, uuidstr, VIR_AUDIT_STR(srcpath)); + } else { + VIR_AUDIT(VIR_AUDIT_RECORD_RESOURCE, success, + "virt=%s resrc=shmem reason=%s %s uuid=%s size=%llu path=%s", + virt, reason, vmname, uuidstr, def->size, VIR_AUDIT_STR(shmpath)); + } cleanup: VIR_FREE(vmname); - VIR_FREE(src); - VIR_FREE(size); - VIR_FREE(shmem); + VIR_FREE(shmpath); return; } -- 2.13.0

2 2

[libvirt] [PATCH] Capabilities: add step to cache control
by Eli Qiao 05 Jun '17

05 Jun '17

This patch adds cache control step size under control tag. step is calculated by total_cache_size / cbm_length. This will be needed while later doing cache allocation to calculate cbm bits. Besides, count host's cbm length by counting bit instead of checking cbm_mask length, along with test case updated. Signed-off-by: Eli Qiao <qiaoliyong(a)gmail.com> --- docs/schemas/capability.rng | 3 +++ src/conf/capabilities.c | 19 ++++++++++++++++--- src/conf/capabilities.h | 1 + .../linux-resctrl/resctrl/info/L3/cbm_mask | 2 +- .../linux-resctrl/resctrl/info/L3/min_cbm_bits | 2 +- .../linux-resctrl/resctrl/info/L3/num_closids | 2 +- tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml | 8 ++++---- tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 4 ++-- 8 files changed, 29 insertions(+), 12 deletions(-) diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index e5cbfa3..6be7ac9 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -276,6 +276,9 @@ <attribute name='min'> <ref name='unsignedInt'/> </attribute> + <attribute name='step'> + <ref name='unsignedInt'/> + </attribute> <attribute name='unit'> <ref name='unit'/> </attribute> diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 3becc7e..d1266e6 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -908,9 +908,10 @@ virCapabilitiesFormatCaches(virBufferPtr buf, for (j = 0; j < bank->ncontrols; j++) { bool min_kilos = !(bank->controls[j]->min % 1024); virBufferAsprintf(&controlBuf, - "<control min='%llu' unit='%s' " + "<control min='%llu' step='%llu' unit='%s' " "type='%s' maxAllocs='%u'/>\n", bank->controls[j]->min >> (min_kilos * 10), + bank->controls[j]->step >> (min_kilos * 10), min_kilos ? "KiB" : "B", virCacheTypeToString(bank->controls[j]->scope), bank->controls[j]->max_allocation); @@ -1602,6 +1603,8 @@ virCapabilitiesGetCacheControl(virCapsHostCacheBankPtr bank, char *cbm_mask = NULL; char *type_upper = NULL; unsigned int min_cbm_bits = 0; + unsigned int cbm_mask_val = 0; + unsigned int cbm_mask_len = 0; virCapsHostCacheControlPtr control; if (VIR_ALLOC(control) < 0) @@ -1632,8 +1635,18 @@ virCapabilitiesGetCacheControl(virCapsHostCacheBankPtr bank, virStringTrimOptionalNewline(cbm_mask); - /* cbm_mask: cache bit mask, it's in hex, eg: fffff */ - control->min = min_cbm_bits * bank->size / (strlen(cbm_mask) * 4); + /* cbm_mask: cache bit mask, it's in hex, e.g. fffff or 7ff */ + if (virStrToLong_uip(cbm_mask, NULL, 16, &cbm_mask_val) < 0) + goto cleanup; + + while (cbm_mask_val & 0x1) { + cbm_mask_val = cbm_mask_val >> 1; + cbm_mask_len ++; + } + + control->step = bank->size / cbm_mask_len; + + control->min = min_cbm_bits * control->step; control->scope = scope; diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index ee87d59..2cc9bdc 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -152,6 +152,7 @@ typedef struct _virCapsHostCacheControl virCapsHostCacheControl; typedef virCapsHostCacheControl *virCapsHostCacheControlPtr; struct _virCapsHostCacheControl { unsigned long long min; /* minimum cache control size in B */ + unsigned long long step; /* cache control step size in B */ virCacheType scope; /* data, code or both */ unsigned int max_allocation; /* max number of supported allocations */ }; diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/cbm_mask b/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/cbm_mask index 78031da..d482bbb 100644 --- a/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/cbm_mask +++ b/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/cbm_mask @@ -1 +1 @@ -fffff +7ff diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/min_cbm_bits b/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/min_cbm_bits index 0cfbf08..d00491f 100644 --- a/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/min_cbm_bits +++ b/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/min_cbm_bits @@ -1 +1 @@ -2 +1 diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/num_closids b/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/num_closids index b8626c4..b6a7d89 100644 --- a/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/num_closids +++ b/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/num_closids @@ -1 +1 @@ -4 +16 diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml index 49aa0b9..98893b6 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml @@ -42,12 +42,12 @@ </topology> <cache> <bank id='0' level='3' type='both' size='15360' unit='KiB' cpus='0-5'> - <control min='768' unit='KiB' type='code' maxAllocs='8'/> - <control min='768' unit='KiB' type='data' maxAllocs='8'/> + <control min='768' step='768' unit='KiB' type='code' maxAllocs='8'/> + <control min='768' step='768' unit='KiB' type='data' maxAllocs='8'/> </bank> <bank id='1' level='3' type='both' size='15360' unit='KiB' cpus='6-11'> - <control min='768' unit='KiB' type='code' maxAllocs='8'/> - <control min='768' unit='KiB' type='data' maxAllocs='8'/> + <control min='768' step='768' unit='KiB' type='code' maxAllocs='8'/> + <control min='768' step='768' unit='KiB' type='data' maxAllocs='8'/> </bank> </cache> </host> diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml index cb78b4a..b54f08e 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml @@ -42,10 +42,10 @@ </topology> <cache> <bank id='0' level='3' type='both' size='15360' unit='KiB' cpus='0-5'> - <control min='1536' unit='KiB' type='both' maxAllocs='4'/> + <control min='1429876' step='1429876' unit='B' type='both' maxAllocs='16'/> </bank> <bank id='1' level='3' type='both' size='15360' unit='KiB' cpus='6-11'> - <control min='1536' unit='KiB' type='both' maxAllocs='4'/> + <control min='1429876' step='1429876' unit='B' type='both' maxAllocs='16'/> </bank> </cache> </host> -- 1.9.1

2 1

[libvirt] [PATCH go-xml] add emulator supported
by zhenwei.pi 05 Jun '17

05 Jun '17

--- domain.go | 1 + domain_test.go | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/domain.go b/domain.go index dcb8f65..723e761 100644 --- a/domain.go +++ b/domain.go @@ -307,6 +307,7 @@ type DomainDeviceList struct { Channels []DomainChardev `xml:"channel"` MemBalloon *DomainMemBalloon `xml:"memballoon"` Sounds []DomainSound `xml:"sound"` + Emulator string `xml:"emulator,omitempty"` } type DomainMemory struct { diff --git a/domain_test.go b/domain_test.go index 632b714..9efbd6b 100644 --- a/domain_test.go +++ b/domain_test.go @@ -572,6 +572,9 @@ var domainTestData = []struct { DomainCPUFeature{Policy: "disable", Name: "lahf_lm"}, }, }, + Devices: &DomainDeviceList{ + Emulator: "/bin/qemu-kvm", + }, }, Expected: []string{ `<domain type="kvm">`, @@ -582,6 +585,9 @@ var domainTestData = []struct { ` <topology sockets="1" cores="2" threads="1"></topology>`, ` <feature policy="disable" name="lahf_lm"></feature>`, ` </cpu>`, + ` <devices>`, + ` <emulator>/bin/qemu-kvm</emulator>`, + ` </devices>`, `</domain>`, }, }, -- 2.7.4

2 1

[libvirt] [PATCH] Reset the whole stack in testutils
by Martin Kletzander 05 Jun '17

05 Jun '17

The memset() was resetting only 30 bytes in the array (size of the array), but it is array of pointers. Since it is a static array, let's just reset it by its size. Found by gcc-7.1: testutils.c: In function 'virTestRun': testutils.c:243:13: error: 'memset' used with length equal to number of elements without multiplication by element size [-Werror=memset-elt-size] memset(testAllocStack, 0, ARRAY_CARDINALITY(testAllocStack)); ^~~~~~ Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial an also under the build-breaker rule. I'm still getting one more error in config.h that probably needs fixing in autoconf: ../config.h:2994:48: warning: this use of "defined" may not be portable [-Wexpansion-to-defined] || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ Let me know if you know how I could help with that. tests/testutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testutils.c b/tests/testutils.c index 4fb2338bb1de..4b8cf79ef939 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -240,7 +240,7 @@ virTestRun(const char *title, for (i = start; i < end; i++) { bool missingFail = false; # ifdef TEST_OOM_TRACE - memset(testAllocStack, 0, ARRAY_CARDINALITY(testAllocStack)); + memset(testAllocStack, 0, sizeof(testAllocStack)); ntestAllocStack = 0; # endif virAllocTestOOM(i + 1, 1); -- 2.13.0

2 2

[libvirt] libvirt-tck failures after sparse stream support
by Jim Fehlig 05 Jun '17

05 Jun '17

Hi Michal, I noticed some of the libvirt-tck tests fail with 3.4.0 RC2. I bisected the failure to commit 07c2399c01. The failing tests are 400-vol-download.t, 405-vol-download-all.t, and 410-vol-download-nonblock.t. Looking at the tests, they all create a pool and vol, write some data to the vol, create an MD5 digest of a subset of vol data, download the subset of the vol, and finally compare MD5 digest of dowloaded vol vs original. If the digests are different the test fails. For reference, here is the first test http://libvirt.org/git/?p=libvirt-tck.git;a=blob;f=scripts/storage/400-vol-… All three tests randomly fail with commit 07c2399c01. When the tests fail, it is always the case that 'length' was > 0. I.e. I have not seen the tests fail with offset=0, length=0 or offset=1024*1024, length=0. Regards, Jim

2 1

[libvirt] FYI build currently broken w/ glibc >= 2.25.90
by Daniel P. Berrange 05 Jun '17

05 Jun '17

FYI, there is currently a bug in gnulib that is breaking build for anything with glibc >= 2.25.90 (aka current Fedora 27 rawhide) http://lists.gnu.org/archive/html/bug-gnulib/2017-06/msg00003.html Hopefully gnulib will accept my proposed fix soon... Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

1 0

[libvirt] [PATCH] bhyveargv2xmltest: Fix call of virDomainDefCheckABIStability
by Michal Privoznik 05 Jun '17

05 Jun '17

In 4f0aeed I've expanded the list of arguments for virDomainDefCheckABIStability() but I forgot to fix bhyveargv2xmltest. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial and build-breaker rules. tests/bhyveargv2xmltest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bhyveargv2xmltest.c b/tests/bhyveargv2xmltest.c index bde7d0e05..9db3750ac 100644 --- a/tests/bhyveargv2xmltest.c +++ b/tests/bhyveargv2xmltest.c @@ -74,7 +74,7 @@ testCompareXMLToArgvFiles(const char *xmlfile, } } - if (vmdef && !virDomainDefCheckABIStability(vmdef, vmdef)) { + if (vmdef && !virDomainDefCheckABIStability(vmdef, vmdef, driver.xmlopt)) { VIR_TEST_DEBUG("ABI stability check failed on %s", xmlfile); goto fail; } -- 2.13.0

1 0

[libvirt] [PATCH 0/3] Behave better for users of virStream
by Martin Kletzander 05 Jun '17

05 Jun '17

So I was playing with one program and I was getting weird behaviour. It was also mentioned on the list by someone for some other client they were writing. I found out what we were both missing was callback removal before/after finish/abort was called. The problem is that was not intuitive at all. In the docs we only have an example for blocking streams, there is no mention of the callbacks and the behaviour that libvirt has. I first wanted to fix the documentation, but then I realized it should never make sense to have a callback after stream has ended, so why not behave nicely for callers. Since they should be removing the callback right before the finish, there shouldn't even be any error message after they upgrade. To be even nicer we could make RemoveCallback() not fail when there is no callback registered (like DomainSuspend() when the domain is already suspended). Martin Kletzander (3): Make virNetClientStreamEventRemoveCallback's errors optional remote: Consolidate remoteStream{Abort,Finish} functions virStream: Remove callbacks on Abort/Finish src/remote/remote_driver.c | 42 +++++++++++------------------------------- src/rpc/virnetclientstream.c | 10 +++++++--- src/rpc/virnetclientstream.h | 3 ++- src/util/virfdstream.c | 12 ++++++++++++ 4 files changed, 32 insertions(+), 35 deletions(-) -- 2.13.0

3 10

[libvirt] [V4 RESEND PATCH] Expose resource control capabilites on cache bank
by taget 05 Jun '17

05 Jun '17

From: Eli Qiao <liyong.qiao(a)intel.com> * This patch amends the cache bank capability as follow: <cache> <bank id='0' level='3' type='unified' size='15360' unit='KiB' cpus='0-5'> <control min='768' unit='KiB' scope='both' max_allocation='4'/> </bank> <bank id='1' level='3' type='unified' size='15360' unit='KiB' cpus='6-11'> <control min='768' unit='KiB' scope='both' max_allocation='4'/> </bank> </cache> For CDP enabled on x86 arch, we will have: <cache> <bank id='0' level='3' type='unified' size='15360' unit='KiB' cpus='0-5'> <control min='768' unit='KiB' scope='code' max_allocation='4'/> <control min='768' unit='KiB' scope='data' max_allocation='4'/> </bank> ... * Added a new testdata directory `linux-resctrl-cdp` to test CDP enabled case. * Along with vircaps2xmltest case updated. P.S. here the scope is from /sys/fs/resctrl/info/L3{"" "code" "data"}, I keep it capital upper as I need to use a macro to convert from enum to string easily. Signed-off-by: Eli Qiao <liyong.qiao(a)intel.com> --- docs/schemas/capability.rng | 20 ++++ src/conf/capabilities.c | 133 ++++++++++++++++++++- src/conf/capabilities.h | 10 ++ .../vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus | 1 + .../linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask | 1 + .../resctrl/info/L3CODE/min_cbm_bits | 1 + .../resctrl/info/L3CODE/num_closids | 1 + .../linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask | 1 + .../resctrl/info/L3DATA/min_cbm_bits | 1 + .../resctrl/info/L3DATA/num_closids | 1 + .../linux-resctrl-cdp/resctrl/manualres/cpus | 1 + .../linux-resctrl-cdp/resctrl/manualres/schemata | 2 + .../linux-resctrl-cdp/resctrl/manualres/tasks | 0 .../linux-resctrl-cdp/resctrl/schemata | 2 + .../linux-resctrl-cdp/resctrl/tasks | 0 tests/vircaps2xmldata/linux-resctrl-cdp/system | 1 + .../vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml | 55 +++++++++ tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 8 +- tests/vircaps2xmltest.c | 8 ++ 19 files changed, 244 insertions(+), 3 deletions(-) create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/num_closids create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/min_cbm_bits create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/num_closids create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/cpus create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/schemata create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/tasks create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks create mode 120000 tests/vircaps2xmldata/linux-resctrl-cdp/system create mode 100644 tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index 26f0aa2..927fc18 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -277,6 +277,26 @@ <attribute name='cpus'> <ref name='cpuset'/> </attribute> + <zeroOrMore> + <element name='control'> + <attribute name='min'> + <ref name='unsignedInt'/> + </attribute> + <attribute name='unit'> + <ref name='unit'/> + </attribute> + <attribute name='scope'> + <choice> + <value>both</value> + <value>code</value> + <value>data</value> + </choice> + </attribute> + <attribute name='max_allocation'> + <ref name='unsignedInt'/> + </attribute> + </element> + </zeroOrMore> </element> </oneOrMore> </element> diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index d699b08..c4a1fdf 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -51,6 +51,7 @@ #define VIR_FROM_THIS VIR_FROM_CAPABILITIES #define SYSFS_SYSTEM_PATH "/sys/devices/system" +#define SYSFS_RESCTRL_PATH "/sys/fs/resctrl" VIR_LOG_INIT("conf.capabilities") @@ -872,6 +873,9 @@ virCapabilitiesFormatCaches(virBufferPtr buf, virCapsHostCacheBankPtr *caches) { size_t i = 0; + size_t j = 0; + int indent = virBufferGetIndent(buf, false); + virBuffer controlBuf = VIR_BUFFER_INITIALIZER; if (!ncaches) return 0; @@ -893,13 +897,35 @@ virCapabilitiesFormatCaches(virBufferPtr buf, */ virBufferAsprintf(buf, "<bank id='%u' level='%u' type='%s' " - "size='%llu' unit='%s' cpus='%s'/>\n", + "size='%llu' unit='%s' cpus='%s'", bank->id, bank->level, virCacheTypeToString(bank->type), bank->size >> (kilos * 10), kilos ? "KiB" : "B", cpus_str); + virBufferAdjustIndent(&controlBuf, indent + 4); + for (j = 0; j < bank->ncontrols; j++) { + bool min_kilos = !(bank->controls[j]->min % 1024); + virBufferAsprintf(&controlBuf, + "<control min='%llu' unit='%s' " + "scope='%s' max_allocation='%u'/>\n", + bank->controls[j]->min >> (min_kilos * 10), + min_kilos ? "KiB" : "B", + virCacheTypeToString(bank->controls[j]->scope), + bank->controls[j]->max_allocation); + } + + if (virBufferUse(&controlBuf)) { + virBufferAddLit(buf, ">\n"); + virBufferAddBuffer(buf, &controlBuf); + virBufferAddLit(buf, "</bank>\n"); + + } else { + virBufferAddLit(buf, "/>\n"); + } + + virBufferFreeAndReset(&controlBuf); VIR_FREE(cpus_str); } @@ -1519,13 +1545,102 @@ virCapsHostCacheBankEquals(virCapsHostCacheBankPtr a, void virCapsHostCacheBankFree(virCapsHostCacheBankPtr ptr) { + size_t i; + if (!ptr) return; virBitmapFree(ptr->cpus); + for (i = 0; i < ptr->ncontrols; i++) + VIR_FREE(ptr->controls[i]); + VIR_FREE(ptr->controls); VIR_FREE(ptr); } +/* test which TYPE of cache control supported + * -1: don't support + * 0: cat + * 1: cdp + */ +static int +virCapabilitiesGetCacheControlType(virCapsHostCacheBankPtr bank) +{ + int ret = -1; + char *path = NULL; + if (virAsprintf(&path, + SYSFS_RESCTRL_PATH "/info/L%u", + bank->level) < 0) + return -1; + + if (virFileExists(path)) { + ret = 0; + } else { + VIR_FREE(path); + /* for CDP enabled case, CODE and DATA will show together */ + if (virAsprintf(&path, + SYSFS_RESCTRL_PATH "/info/L%uCODE", + bank->level) < 0) + return -1; + if (virFileExists(path)) + ret = 1; + } + + VIR_FREE(path); + return ret; +} + +static int +virCapabilitiesGetCacheControl(virCapsHostCacheBankPtr bank, + virCacheType scope) +{ + int ret = -1; + char *path = NULL; + char *cbm_mask = NULL; + char *type_upper = NULL; + virCapsHostCacheControlPtr control; + + if (VIR_ALLOC(control) < 0) + goto cleanup; + + if ((scope > VIR_CACHE_TYPE_BOTH) + && (virStringToUpper(&type_upper, virCacheTypeToString(scope)) < 0)) + goto cleanup; + + if (virFileReadValueUint(&control->max_allocation, + SYSFS_RESCTRL_PATH "/info/L%u%s/num_closids", + bank->level, + type_upper ? type_upper : "") < 0) + goto cleanup; + + if (virFileReadValueString(&cbm_mask, + SYSFS_RESCTRL_PATH + "/info/L%u%s/cbm_mask", + bank->level, + type_upper ? type_upper: "") < 0) + goto cleanup; + + virStringTrimOptionalNewline(cbm_mask); + + /* cbm_mask: cache bit mask, it's in hex, eg: fffff */ + control->min = bank->size / (strlen(cbm_mask) * 4); + + control->scope = scope; + + if (VIR_APPEND_ELEMENT(bank->controls, + bank->ncontrols, + control) < 0) + goto cleanup; + + ret = 0; + + cleanup: + VIR_FREE(path); + VIR_FREE(cbm_mask); + VIR_FREE(type_upper); + VIR_FREE(control); + return ret; +} + int virCapabilitiesInitCaches(virCapsPtr caps) { @@ -1534,6 +1649,7 @@ virCapabilitiesInitCaches(virCapsPtr caps) ssize_t pos = -1; DIR *dirp = NULL; int ret = -1; + int typeret; char *path = NULL; char *type = NULL; struct dirent *ent = NULL; @@ -1607,12 +1723,27 @@ virCapabilitiesInitCaches(virCapsPtr caps) SYSFS_SYSTEM_PATH, pos, ent->d_name) < 0) goto cleanup; + typeret = virCapabilitiesGetCacheControlType(bank); + + if (typeret == 0) { + if (virCapabilitiesGetCacheControl(bank, + VIR_CACHE_TYPE_BOTH) < 0) + goto cleanup; + } else if (typeret == 1) { + if ((virCapabilitiesGetCacheControl(bank, + VIR_CACHE_TYPE_CODE) < 0) || + (virCapabilitiesGetCacheControl(bank, + VIR_CACHE_TYPE_DATA) < 0)) + goto cleanup; + } + kernel_type = virCacheKernelTypeFromString(type); if (kernel_type < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown cache type '%s'"), type); goto cleanup; } + bank->type = kernel_type; VIR_FREE(type); diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index a8cccf7..ee87d59 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -148,6 +148,14 @@ typedef enum { VIR_ENUM_DECL(virCache); +typedef struct _virCapsHostCacheControl virCapsHostCacheControl; +typedef virCapsHostCacheControl *virCapsHostCacheControlPtr; +struct _virCapsHostCacheControl { + unsigned long long min; /* minimum cache control size in B */ + virCacheType scope; /* data, code or both */ + unsigned int max_allocation; /* max number of supported allocations */ +}; + typedef struct _virCapsHostCacheBank virCapsHostCacheBank; typedef virCapsHostCacheBank *virCapsHostCacheBankPtr; struct _virCapsHostCacheBank { @@ -156,6 +164,8 @@ struct _virCapsHostCacheBank { unsigned long long size; /* B */ virCacheType type; /* Data, Instruction or Unified */ virBitmapPtr cpus; /* All CPUs that share this bank */ + size_t ncontrols; + virCapsHostCacheControlPtr *controls; }; typedef struct _virCapsHost virCapsHost; diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus new file mode 100644 index 0000000..b3a79aa --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus @@ -0,0 +1 @@ +ffffff,ffffffff,ffffffff diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask new file mode 100755 index 0000000..78031da --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask @@ -0,0 +1 @@ +fffff diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits new file mode 100755 index 0000000..d00491f --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/num_closids b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/num_closids new file mode 100755 index 0000000..45a4fb7 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/num_closids @@ -0,0 +1 @@ +8 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask new file mode 100755 index 0000000..78031da --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask @@ -0,0 +1 @@ +fffff diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/min_cbm_bits b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/min_cbm_bits new file mode 100755 index 0000000..d00491f --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/min_cbm_bits @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/num_closids b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/num_closids new file mode 100755 index 0000000..45a4fb7 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/num_closids @@ -0,0 +1 @@ +8 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/cpus b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/cpus new file mode 100644 index 0000000..ede4cc2 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/cpus @@ -0,0 +1 @@ +000000,00000000,00000000 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/schemata b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/schemata new file mode 100644 index 0000000..a0ef381 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/schemata @@ -0,0 +1,2 @@ +L3DATA:0=c0000;1=c0000 +L3CODE:0=30000;1=30000 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/tasks b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/tasks new file mode 100644 index 0000000..e69de29 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata new file mode 100644 index 0000000..89dc76b --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata @@ -0,0 +1,2 @@ +L3DATA:0=fffff;1=fffff +L3CODE:0=fffff;1=fffff diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks new file mode 100644 index 0000000..e69de29 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/system b/tests/vircaps2xmldata/linux-resctrl-cdp/system new file mode 120000 index 0000000..2f3a1d9 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/system @@ -0,0 +1 @@ +../linux-resctrl/system/ \ No newline at end of file diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml new file mode 100644 index 0000000..c9f460d --- /dev/null +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml @@ -0,0 +1,55 @@ +<capabilities> + + <host> + <cpu> + <arch>x86_64</arch> + </cpu> + <power_management/> + <migration_features> + <live/> + </migration_features> + <topology> + <cells num='2'> + <cell id='0'> + <memory unit='KiB'>1048576</memory> + <pages unit='KiB' size='4'>2048</pages> + <pages unit='KiB' size='2048'>4096</pages> + <pages unit='KiB' size='1048576'>6144</pages> + <cpus num='6'> + <cpu id='0' socket_id='0' core_id='0' siblings='0'/> + <cpu id='1' socket_id='0' core_id='1' siblings='1'/> + <cpu id='2' socket_id='0' core_id='2' siblings='2'/> + <cpu id='3' socket_id='0' core_id='3' siblings='3'/> + <cpu id='4' socket_id='0' core_id='4' siblings='4'/> + <cpu id='5' socket_id='0' core_id='5' siblings='5'/> + </cpus> + </cell> + <cell id='1'> + <memory unit='KiB'>2097152</memory> + <pages unit='KiB' size='4'>4096</pages> + <pages unit='KiB' size='2048'>6144</pages> + <pages unit='KiB' size='1048576'>8192</pages> + <cpus num='6'> + <cpu id='6' socket_id='1' core_id='0' siblings='6'/> + <cpu id='7' socket_id='1' core_id='1' siblings='7'/> + <cpu id='8' socket_id='1' core_id='2' siblings='8'/> + <cpu id='9' socket_id='1' core_id='3' siblings='9'/> + <cpu id='10' socket_id='1' core_id='4' siblings='10'/> + <cpu id='11' socket_id='1' core_id='5' siblings='11'/> + </cpus> + </cell> + </cells> + </topology> + <cache> + <bank id='0' level='3' type='both' size='15360' unit='KiB' cpus='0-5'> + <control min='768' unit='KiB' scope='code' max_allocation='8'/> + <control min='768' unit='KiB' scope='data' max_allocation='8'/> + </bank> + <bank id='1' level='3' type='both' size='15360' unit='KiB' cpus='6-11'> + <control min='768' unit='KiB' scope='code' max_allocation='8'/> + <control min='768' unit='KiB' scope='data' max_allocation='8'/> + </bank> + </cache> + </host> + +</capabilities> diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml index 6677791..04a5eb8 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml @@ -41,8 +41,12 @@ </cells> </topology> <cache> - <bank id='0' level='3' type='both' size='15360' unit='KiB' cpus='0-5'/> - <bank id='1' level='3' type='both' size='15360' unit='KiB' cpus='6-11'/> + <bank id='0' level='3' type='both' size='15360' unit='KiB' cpus='0-5'> + <control min='768' unit='KiB' scope='both' max_allocation='4'/> + </bank> + <bank id='1' level='3' type='both' size='15360' unit='KiB' cpus='6-11'> + <control min='768' unit='KiB' scope='both' max_allocation='4'/> + </bank> </cache> </host> diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index 137598e..ae1cd52 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -47,6 +47,7 @@ test_virCapabilities(const void *opaque) char *capsXML = NULL; char *path = NULL; char *dir = NULL; + char *resctrl = NULL; int ret = -1; /* @@ -58,7 +59,12 @@ test_virCapabilities(const void *opaque) data->resctrl ? "/system" : "") < 0) goto cleanup; + if (virAsprintf(&resctrl, "%s/vircaps2xmldata/linux-%s/resctrl", + abs_srcdir, data->filename) < 0) + goto cleanup; + virFileWrapperAddPrefix("/sys/devices/system", dir); + virFileWrapperAddPrefix("/sys/fs/resctrl", resctrl); caps = virCapabilitiesNew(data->arch, data->offlineMigrate, data->liveMigrate); if (!caps) @@ -84,6 +90,7 @@ test_virCapabilities(const void *opaque) cleanup: VIR_FREE(dir); + VIR_FREE(resctrl); VIR_FREE(path); VIR_FREE(capsXML); virObjectUnref(caps); @@ -112,6 +119,7 @@ mymain(void) DO_TEST("caches", VIR_ARCH_X86_64); DO_TEST_FULL("resctrl", VIR_ARCH_X86_64, true, true, true); + DO_TEST_FULL("resctrl-cdp", VIR_ARCH_X86_64, true, true, true); return ret; } -- 1.9.1

3 8