- Devel - libvirt List Archives

[libvirt] Cannot enumerate physical devices with libvirt 0.7.6
by Frédéric Grelot 15 Feb '10

15 Feb '10

Hi all, I often update my F12 box with the rawvirt repository, which just installed libvirt 0.7.6. Since that, I cannot enumerate physical devices (and thus get a beautiful error when I start one of my vms that should use a USB device). I don't think I changed anything else on that box, and, of course, I already restarted the libvirt daemon. I haven't restarted the server itself, because it is currently used, but I could do it if necessary... I make good use of the qemu hypervisor, and I'm looking forward to solve this issue! Frederic. # libvirtd --version libvirtd (libvirt) 0.7.6 # virsh --version 0.7.6 # virsh nodedev-list error :Failed to count node devices error :this function is not supported by the hypervisor: virNodeNumOfDevices

2 1

[libvirt] [PATCH] Convert virSecurityReportError into a macro
by Matthias Bolte 15 Feb '10

15 Feb '10

--- src/security/security_driver.c | 18 ------------------ src/security/security_driver.h | 6 +++--- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/security/security_driver.c b/src/security/security_driver.c index 27945a6..4c98190 100644 --- a/src/security/security_driver.c +++ b/src/security/security_driver.c @@ -90,24 +90,6 @@ virSecurityDriverStartup(virSecurityDriverPtr *drv, return -2; } -void -virSecurityReportError(int code, const char *fmt, ...) -{ - va_list args; - char errorMessage[1024]; - - if (fmt) { - va_start(args, fmt); - vsnprintf(errorMessage, sizeof(errorMessage) - 1, fmt, args); - va_end(args); - } else - errorMessage[0] = '\0'; - - virRaiseError(NULL, NULL, NULL, VIR_FROM_SECURITY, code, - VIR_ERR_ERROR, NULL, NULL, NULL, -1, -1, "%s", - errorMessage); -} - /* * Helpers */ diff --git a/src/security/security_driver.h b/src/security/security_driver.h index 8860d81..15671b3 100644 --- a/src/security/security_driver.h +++ b/src/security/security_driver.h @@ -88,9 +88,9 @@ int virSecurityDriverStartup(virSecurityDriverPtr *drv, int virSecurityDriverVerify(virDomainDefPtr def); -void -virSecurityReportError(int code, const char *fmt, ...) - ATTRIBUTE_FMT_PRINTF(2, 3); +#define virSecurityReportError(code, fmt...) \ + virReportErrorHelper(NULL, VIR_FROM_SECURITY, code, __FILE__, \ + __FUNCTION__, __LINE__, fmt) /* Helpers */ void virSecurityDriverInit(virSecurityDriverPtr drv); -- 1.6.3.3

2 2

[libvirt] How to shut down every VM when libvirt is stopped
by Laurent Léonard 13 Feb '10

13 Feb '10

Hi, With libvirt 0.4.6 for example, the behaviour when we stopped libvirt was to shut down every VM. That was a problem in many cases (upgrades, etc.) but that behaviour was very useful with high avalability systems like Heartbeat. With an Hearbeat + DRBD system, if the libvirt service is stopped by Heartbeat, every VM should be stopped too. Otherwise we will experience problems and disk corruption. Is there any way to configure libvirt to have that old behaviour ? Or do I have to shut down/kill every VM in the stop target in the init script ? Thank you, -- Laurent Léonard

1 0

[libvirt] [PATCH] Add persistence of PCI addresses to QEMU
by Daniel P. Berrange 12 Feb '10

12 Feb '10

Current PCI addresses are allocated at time of VM startup. To make them truely persistent, it is neccessary to do this at time of virDomainDefine/virDomainCreate. The code in qemuStartVMDaemon still remains in order to cope with upgrades from older libvirt releases * src/qemu/qemu_driver.c: Rename existing qemuAssignPCIAddresses to qemuDetectPCIAddresses. Add new qemuAssignPCIAddresses which does auto-allocation upfront. Call qemuAssignPCIAddresses from qemuDomainDefine and qemuDomainCreate to assign PCI addresses that can then be persisted. Don't clear PCI addresses at shutdown if they are intended to be persistent --- src/qemu/qemu_driver.c | 84 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 79 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 03d0f5f..69187fc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -95,6 +95,7 @@ struct _qemuDomainObjPrivate { int *vcpupids; qemuDomainPCIAddressSetPtr pciaddrs; + int persistentAddrs; }; static int qemudShutdown(void); @@ -857,6 +858,7 @@ qemuReconnectDomain(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaq virDomainObjPtr obj = payload; struct qemud_driver *driver = opaque; qemuDomainObjPrivatePtr priv; + unsigned long long qemuCmdFlags; virDomainObjLock(obj); @@ -872,6 +874,15 @@ qemuReconnectDomain(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaq goto error; } + /* XXX we should be persisting the original flags in the XML + * not re-detecting them, since the binary may have changed + * since launch time */ + if (qemudExtractVersionInfo(obj->def->emulator, + NULL, + &qemuCmdFlags) >= 0 && + (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) + priv->persistentAddrs = 1; + if (!(priv->pciaddrs = qemuDomainPCIAddressSetCreate(obj->def))) goto error; @@ -1976,7 +1987,7 @@ qemuGetPCIWatchdogVendorProduct(virDomainWatchdogDefPtr def, * some static addrs on CLI. Have to check that... */ static int -qemuAssignPCIAddresses(virDomainObjPtr vm, +qemuDetectPCIAddresses(virDomainObjPtr vm, qemuMonitorPCIAddress *addrs, int naddrs) { @@ -2098,7 +2109,7 @@ qemuInitPCIAddresses(struct qemud_driver *driver, &addrs); qemuDomainObjExitMonitorWithDriver(driver, vm); - ret = qemuAssignPCIAddresses(vm, addrs, naddrs); + ret = qemuDetectPCIAddresses(vm, addrs, naddrs); VIR_FREE(addrs); @@ -2141,6 +2152,44 @@ static int qemudNextFreeVNCPort(struct qemud_driver *driver ATTRIBUTE_UNUSED) { return -1; } + +static int +qemuAssignPCIAddresses(virDomainDefPtr def) +{ + int ret = -1; + unsigned long long qemuCmdFlags = 0; + qemuDomainPCIAddressSetPtr addrs = NULL; + struct stat sb; + + if (stat(def->emulator, &sb) < 0) { + virReportSystemError(errno, + _("Cannot find QEMU binary %s"), + def->emulator); + goto cleanup; + } + + if (qemudExtractVersionInfo(def->emulator, + NULL, + &qemuCmdFlags) < 0) + goto cleanup; + + if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) { + if (!(addrs = qemuDomainPCIAddressSetCreate(def))) + goto cleanup; + + if (qemuAssignDevicePCISlots(def, addrs) < 0) + goto cleanup; + } + + ret = 0; + +cleanup: + qemuDomainPCIAddressSetFree(addrs); + + return ret; +} + + static pciDeviceList * qemuGetPciHostDeviceList(virDomainDefPtr def) { @@ -2662,7 +2711,15 @@ static int qemudStartVMDaemon(virConnectPtr conn, goto cleanup; } + /* + * Normally PCI addresses are assigned inhe virDomainCreate + * or virDomainDefine methods. We might still need to assign + * some here to cope with the question of upgrades. Regardless + * we also need to populate the PCi address set cache for later + * use in hotplug + */ if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) { + /* Populate cache with current addresses */ if (priv->pciaddrs) { qemuDomainPCIAddressSetFree(priv->pciaddrs); priv->pciaddrs = NULL; @@ -2670,8 +2727,14 @@ static int qemudStartVMDaemon(virConnectPtr conn, if (!(priv->pciaddrs = qemuDomainPCIAddressSetCreate(vm->def))) goto cleanup; + + /* Assign any remaining addresses */ if (qemuAssignDevicePCISlots(vm->def, priv->pciaddrs) < 0) goto cleanup; + + priv->persistentAddrs = 1; + } else { + priv->persistentAddrs = 0; } vm->def->id = driver->nextvmid++; @@ -2903,10 +2966,12 @@ static void qemudShutdownVMDaemon(struct qemud_driver *driver, VIR_FREE(vm->def->seclabel.imagelabel); } - virDomainDefClearPCIAddresses(vm->def); virDomainDefClearDeviceAliases(vm->def); - qemuDomainPCIAddressSetFree(priv->pciaddrs); - priv->pciaddrs = NULL; + if (!priv->persistentAddrs) { + virDomainDefClearPCIAddresses(vm->def); + qemuDomainPCIAddressSetFree(priv->pciaddrs); + priv->pciaddrs = NULL; + } qemuDomainReAttachHostDevices(driver, vm->def); @@ -3352,6 +3417,12 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml, if (virDomainObjIsDuplicate(&driver->domains, def, 1) < 0) goto cleanup; + if (qemudCanonicalizeMachine(driver, def) < 0) + goto cleanup; + + if (qemuAssignPCIAddresses(def) < 0) + goto cleanup; + if (!(vm = virDomainAssignDef(driver->caps, &driver->domains, def))) @@ -5049,6 +5120,9 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml) { if (qemudCanonicalizeMachine(driver, def) < 0) goto cleanup; + if (qemuAssignPCIAddresses(def) < 0) + goto cleanup; + if (!(vm = virDomainAssignDef(driver->caps, &driver->domains, def))) { -- 1.6.5.2

2 3

[libvirt] [PATCH] Fix compliation of AppArmor related code
by Matthias Bolte 12 Feb '10

12 Feb '10

Broken by the latest commits to remove the virConnectPtr parameter from internal functions. I just pushed this one, as it is an obvious fix. --- src/security/security_apparmor.c | 4 ++-- src/security/virt-aa-helper.c | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 23f40f8..db04d5c 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -262,7 +262,7 @@ use_apparmor(void) char *libvirt_daemon = NULL; if (virFileResolveLink("/proc/self/exe", &libvirt_daemon) < 0) { - virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR, + virSecurityReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("could not find libvirtd")); return rc; } @@ -295,7 +295,7 @@ AppArmorSecurityDriverProbe(void) } if (!virFileExists(template)) { - virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR, + virSecurityReportError(VIR_ERR_INTERNAL_ERROR, _("template \'%s\' does not exist"), template); goto clean; } diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 619c8c3..066e18b 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -690,7 +690,7 @@ get_definition(vahControl * ctl, const char *xmlStr) goto exit; } - ctl->def = virDomainDefParseString(NULL, ctl->caps, xmlStr, 0); + ctl->def = virDomainDefParseString(ctl->caps, xmlStr, 0); if (ctl->def == NULL) { vah_error(ctl, 0, "could not parse XML"); goto exit; @@ -767,8 +767,7 @@ vah_add_file(virBufferPtr buf, const char *path, const char *perms) } static int -file_iterate_cb(virConnectPtr conn ATTRIBUTE_UNUSED, - usbDevice *dev ATTRIBUTE_UNUSED, +file_iterate_cb(usbDevice *dev ATTRIBUTE_UNUSED, const char *file, void *opaque) { virBufferPtr buf = opaque; @@ -844,8 +843,7 @@ get_files(vahControl * ctl) if (usb == NULL) continue; - rc = usbDeviceFileIterate(NULL, usb, - file_iterate_cb, &buf); + rc = usbDeviceFileIterate(usb, file_iterate_cb, &buf); usbFreeDevice(usb); if (rc != 0) goto clean; -- 1.6.3.3

2 1

[libvirt] dname parameter ignored in qemudDomainMigratePrepareTunnel{, 2}
by Jim Meyering 11 Feb '10

11 Feb '10

clang warned about a dead-store in src/qemu/qemu_driver.c, since dname is never used thereafter: http://libvirt.org/git/?p=libvirt.git;a=blob;f=src/qemu/qemu_driver.c;h=0d7… /* Target domain name, maybe renamed. */ dname = dname ? dname : def->name; That stmt was initially added with a following use, if (!vm) vm = virDomainFindByName(&driver->domains, dname); But the use was removed by this commit, rendering the store "dead", and the dname parameter effectively unused: http://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=c26cb9234f4b9fa46d7caa… The same thing happened in both qemudDomainMigratePrepareTunnel and qemudDomainMigratePrepareTunnel2 Shouldn't they be doing something like this instead? if (dname) def->name = dname; But def->name is already allocated. Better free it first. And is dname "known" to be allocated from the heap? That's not clear from the little documentation I've read so far, so I've strdup'd it below: Here's a possible patch: >From b51a39aed62ee5c8db733cecfe6eef0c34a7f989 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 11 Feb 2010 16:46:21 +0100 Subject: [PATCH] qemu_driver.c: honor dname parameter once again Since c26cb9234f4b9fa46d7caa3385ae36704167c53f, the dname parameter has been ignored by these two functions. Use it. * src/qemu/qemu_driver.c (qemudDomainMigratePrepareTunnel): Honor dname parameter once again. (qemudDomainMigratePrepare2): Likewise. --- src/qemu/qemu_driver.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0d77d57..9ff712c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7434,7 +7434,12 @@ qemudDomainMigratePrepareTunnel(virConnectPtr dconn, } /* Target domain name, maybe renamed. */ - dname = dname ? dname : def->name; + if (dname) { + VIR_FREE(def->name); + def->name = strdup(dname); + if (def->name == NULL) + goto cleanup; + } if (virDomainObjIsDuplicate(&driver->domains, def, 1) < 0) goto cleanup; @@ -7660,7 +7665,12 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, } /* Target domain name, maybe renamed. */ - dname = dname ? dname : def->name; + if (dname) { + VIR_FREE(def->name); + def->name = strdup(dname); + if (def->name == NULL) + goto cleanup; + } if (virDomainObjIsDuplicate(&driver->domains, def, 1) < 0) goto cleanup; -- 1.7.0.rc2.170.gbc565

2 2

[libvirt] [PATCH] Mark all error messages for translation
by Jiri Denemark 11 Feb '10

11 Feb '10

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/storage_conf.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index eb1c9d9..2352637 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1464,7 +1464,7 @@ virStoragePoolObjLoad(virStoragePoolObjListPtr pools, if (!virFileMatchesNameSuffix(file, def->name, ".xml")) { virStorageReportError(VIR_ERR_INVALID_STORAGE_POOL, - "Storage pool config filename '%s' does not match pool name '%s'", + _("Storage pool config filename '%s' does not match pool name '%s'"), path, def->name); virStoragePoolDefFree(def); return NULL; @@ -1524,7 +1524,7 @@ virStoragePoolLoadAllConfigs(virStoragePoolObjListPtr pools, if (virFileBuildPath(configDir, entry->d_name, NULL, path, PATH_MAX) < 0) { virStorageReportError(VIR_ERR_INTERNAL_ERROR, - "Config filename '%s/%s' is too long", + _("Config filename '%s/%s' is too long"), configDir, entry->d_name); continue; } @@ -1532,7 +1532,7 @@ virStoragePoolLoadAllConfigs(virStoragePoolObjListPtr pools, if (virFileBuildPath(autostartDir, entry->d_name, NULL, autostartLink, PATH_MAX) < 0) { virStorageReportError(VIR_ERR_INTERNAL_ERROR, - "Autostart link path '%s/%s' is too long", + _("Autostart link path '%s/%s' is too long"), autostartDir, entry->d_name); continue; } -- 1.6.6.1

2 2

[libvirt] [PATCH] remote_driver.c: avoid leak on OOM error path
by Jim Meyering 11 Feb '10

11 Feb '10

Any "goto out_of_memory" taken between the vars = qparam_query_parse (query) allocation and the free_qparam_set call would result in a leak. Here's the fix: >From a3a21142e40962c960eae882ac9edcc3bd17cb8b Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 11 Feb 2010 12:51:31 +0100 Subject: [PATCH] remote_driver.c: avoid leak on OOM error path * src/remote/remote_driver.c (doRemoteOpen): Don't leak a qparam_set buffer upon OOM error. --- src/remote/remote_driver.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index e17db3d..cc543fc 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2,7 +2,7 @@ * remote_internal.c: driver to provide access to libvirtd running * on a remote machine * - * Copyright (C) 2007-2009 Red Hat, Inc. + * Copyright (C) 2007-2010 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -370,6 +370,7 @@ doRemoteOpen (virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags) { + struct qparam_set *vars = NULL; int wakeupFD[2] = { -1, -1 }; char *transport_str = NULL; enum { @@ -458,7 +459,6 @@ doRemoteOpen (virConnectPtr conn, * feasibly it might contain variables needed by the real driver, * although that won't be the case for now). */ - struct qparam_set *vars; struct qparam *var; int i; char *query; @@ -551,6 +551,7 @@ doRemoteOpen (virConnectPtr conn, } free_qparam_set (vars); + vars = NULL; } else { /* Probe URI server side */ name = strdup(""); @@ -933,6 +934,8 @@ doRemoteOpen (virConnectPtr conn, out_of_memory: virReportOOMError(); + if (vars) + free_qparam_set (vars); failed: /* Close the socket if we failed. */ -- 1.7.0.rc2.170.gbc565

2 2

[libvirt] [PATCH] Swap position of nmodels and models parameters in cpuDecode()
by Jiri Denemark 11 Feb '10

11 Feb '10

All other libvirt functions use array first and then number of elements in that array. Let's make cpuDecode follow this rule. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu.c | 6 +++--- src/cpu/cpu.h | 8 ++++---- src/cpu/cpu_x86.c | 4 ++-- src/qemu/qemu_conf.c | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index ae8d37d..e9ecc98 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -119,8 +119,8 @@ cpuCompare(virCPUDefPtr host, int cpuDecode(virCPUDefPtr cpu, const union cpuData *data, - unsigned int nmodels, - const char **models) + const char **models, + unsigned int nmodels) { struct cpuArchDriver *driver; @@ -146,7 +146,7 @@ cpuDecode(virCPUDefPtr cpu, return -1; } - return driver->decode(cpu, data, nmodels, models); + return driver->decode(cpu, data, models, nmodels); } diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 1e04993..7ee0ce6 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -48,8 +48,8 @@ typedef virCPUCompareResult typedef int (*cpuArchDecode) (virCPUDefPtr cpu, const union cpuData *data, - unsigned int nmodels, - const char **models); + const char **models, + unsigned int nmodels); typedef int (*cpuArchEncode) (const virCPUDefPtr cpu, @@ -95,8 +95,8 @@ cpuCompare (virCPUDefPtr host, extern int cpuDecode (virCPUDefPtr cpu, const union cpuData *data, - unsigned int nmodels, - const char **models); + const char **models, + unsigned int nmodels); extern int cpuEncode (const char *arch, diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 7ae7fbf..c6ed078 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -940,8 +940,8 @@ x86GuestData(virCPUDefPtr host, static int x86Decode(virCPUDefPtr cpu, const union cpuData *data, - unsigned int nmodels, - const char **models) + const char **models, + unsigned int nmodels) { int ret = -1; struct x86_map *map; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 3988582..ca32dc0 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1016,7 +1016,7 @@ qemudCapsInitCPU(virCapsPtr caps, cpu->threads = nodeinfo.threads; if (!(data = cpuNodeData(arch)) - || cpuDecode(cpu, data, 0, NULL) < 0) + || cpuDecode(cpu, data, NULL, 0) < 0) goto error; caps->host.cpu = cpu; @@ -2959,7 +2959,7 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, if (VIR_ALLOC(guest) < 0 || !(guest->arch = strdup(ut->machine))) goto no_memory; - if (cpuDecode(guest, data, ncpus, cpus) < 0) + if (cpuDecode(guest, data, cpus, ncpus) < 0) goto cleanup; virBufferVSprintf(&buf, "%s", guest->model); -- 1.6.6.1

2 2

[libvirt] [PATCH] Fix <cpu> element in domain XML schema
by Jiri Denemark 11 Feb '10

11 Feb '10

The current schema is more permissive than the XML parsing code in libvirt. Precisely, 'match' attribute is optional in schema while in reality its use is bound to <model> element: - <cpu> element without 'match' attribute is allowed only if <topology> element is the only child element of <cpu> - <cpu> element with 'match' attribute requires <model> element to be present; <topology> and <feature> elements are optional Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- docs/schemas/domain.rng | 109 +++++++++++++++++++++++++++-------------------- 1 files changed, 63 insertions(+), 46 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index bb6d00d..c913a50 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1313,52 +1313,69 @@ --> <define name="cpu"> <element name="cpu"> - <optional> - <attribute name="match"> - <choice> - <value>minimum</value> - <value>exact</value> - <value>strict</value> - </choice> - </attribute> - </optional> - <interleave> - <optional> - <element name="model"> - <text/> - </element> - </optional> - <optional> - <element name="topology"> - <attribute name="sockets"> - <ref name="positiveInteger"/> - </attribute> - <attribute name="cores"> - <ref name="positiveInteger"/> - </attribute> - <attribute name="threads"> - <ref name="positiveInteger"/> - </attribute> - </element> - </optional> - <zeroOrMore> - <element name="feature"> - <attribute name="policy"> - <choice> - <value>force</value> - <value>require</value> - <value>optional</value> - <value>disable</value> - <value>forbid</value> - </choice> - </attribute> - <attribute name="name"> - <ref name="featureName"/> - </attribute> - <empty/> - </element> - </zeroOrMore> - </interleave> + <choice> + <ref name="cpuTopology"/> + <group> + <ref name="cpuMatch"/> + <interleave> + <ref name="cpuModel"/> + <optional> + <ref name="cpuTopology"/> + </optional> + <zeroOrMore> + <ref name="cpuFeature"/> + </zeroOrMore> + </interleave> + </group> + </choice> + </element> + </define> + + <define name="cpuMatch"> + <attribute name="match"> + <choice> + <value>minimum</value> + <value>exact</value> + <value>strict</value> + </choice> + </attribute> + </define> + + <define name="cpuModel"> + <element name="model"> + <text/> + </element> + </define> + + <define name="cpuFeature"> + <element name="feature"> + <attribute name="policy"> + <choice> + <value>force</value> + <value>require</value> + <value>optional</value> + <value>disable</value> + <value>forbid</value> + </choice> + </attribute> + <attribute name="name"> + <ref name="featureName"/> + </attribute> + <empty/> + </element> + </define> + + <define name="cpuTopology"> + <element name="topology"> + <attribute name="sockets"> + <ref name="positiveInteger"/> + </attribute> + <attribute name="cores"> + <ref name="positiveInteger"/> + </attribute> + <attribute name="threads"> + <ref name="positiveInteger"/> + </attribute> </element> </define> -- 1.6.6.1

2 2