+ The optional iothreadpin element specifies which of host
+ physical CPUs the IOThreads will be pinned to. If this is omitted
+ and attribute cpuset of element vcpu is
+ not specified, the IOThreads are pinned to all the physical CPUs
+ by default. There are two required attributes, the attribute
+ iothread specifies the IOThread id and the attribute
+ cpuset specifying which physical CPUs to pin to. The
+ iothread value begins at "1" through the number of
+ iothreads
+ allocated to the domain. A value of "0" is not permitted.
+ NB, iothreadpin is not allowed if attribute
+ placement of element vcpu is "auto".
+ Since 1.2.9
+
shares
The optional shares element specifies the proportional
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 6ae940ad26..9d3775d37c 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -810,6 +810,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 44db5d802a..9cb3ebd5d6 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2170,6 +2170,9 @@ void virDomainDefFree(virDomainDefPtr def)
virDomainVcpuPinDefFree(def->cputune.emulatorpin);
+ virDomainVcpuPinDefArrayFree(def->cputune.iothreadspin,
+ def->cputune.niothreadspin);
+
virDomainNumatuneFree(def->numatune);
virSysinfoDefFree(def->sysinfo);
@@ -11464,6 +11467,9 @@ virDomainPanicDefParseXML(xmlNodePtr node)
* and emulatorpin has the form of
*
*
+ * and an iothreadspin has the form
+ *
+ *
* A vcpuid of -1 is valid and only valid for emulatorpin. So callers
* have to check the returned cpuid for validity.
*/
@@ -11471,11 +11477,13 @@ static virDomainVcpuPinDefPtr
virDomainVcpuPinDefParseXML(xmlNodePtr node,
xmlXPathContextPtr ctxt,
int maxvcpus,
- bool emulator)
+ bool emulator,
+ bool iothreads)
{
virDomainVcpuPinDefPtr def;
xmlNodePtr oldnode = ctxt->node;
int vcpuid = -1;
+ unsigned int iothreadid;
char *tmp = NULL;
int ret;
@@ -11484,7 +11492,7 @@ virDomainVcpuPinDefParseXML(xmlNodePtr node,
ctxt->node = node;
- if (!emulator) {
+ if (!emulator && !iothreads) {
ret = virXPathInt("string(./@vcpu)", ctxt, &vcpuid);
if ((ret == -2) || (vcpuid < -1)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -11505,10 +11513,41 @@ virDomainVcpuPinDefParseXML(xmlNodePtr node,
def->vcpuid = vcpuid;
}
+ if (iothreads && (tmp = virXPathString("string(./@iothread)", ctxt))) {
+ if (virStrToLong_uip(tmp, NULL, 10, &iothreadid) < 0) {
+ virReportError(VIR_ERR_XML_ERROR,
+ _("invalid setting for iothread '%s'"), tmp);
+ goto error;
+ }
+ VIR_FREE(tmp);
+
+ if (iothreadid == 0) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("zero is an invalid iothread id value"));
+ goto error;
+ }
+
+ /* NB: maxvcpus is actually def->iothreads
+ * IOThreads are numbered "iothread1...iothread", where
+ * "n" is the iothreads value
+ */
+ if (iothreadid > maxvcpus) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("iothread id must not exceed iothreads"));
+ goto error;
+ }
+
+ /* Rather than creating our own structure we are reusing the vCPU */
+ def->vcpuid = iothreadid;
+ }
+
if (!(tmp = virXMLPropString(node, "cpuset"))) {
if (emulator)
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("missing cpuset for emulatorpin"));
+ else if (iothreads)
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("missing cpuset for iothreadpin"));
else
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("missing cpuset for vcpupin"));
@@ -12187,7 +12226,7 @@ virDomainDefParseXML(xmlDocPtr xml,
for (i = 0; i < n; i++) {
virDomainVcpuPinDefPtr vcpupin = NULL;
vcpupin = virDomainVcpuPinDefParseXML(nodes[i], ctxt,
- def->maxvcpus, false);
+ def->maxvcpus, false, false);
if (!vcpupin)
goto error;
@@ -12262,8 +12301,9 @@ virDomainDefParseXML(xmlDocPtr xml,
goto error;
}
- def->cputune.emulatorpin = virDomainVcpuPinDefParseXML(nodes[0], ctxt,
- 0, true);
+ def->cputune.emulatorpin = virDomainVcpuPinDefParseXML(nodes[0],
+ ctxt, 0,
+ true, false);
if (!def->cputune.emulatorpin)
goto error;
@@ -12273,6 +12313,49 @@ virDomainDefParseXML(xmlDocPtr xml,
}
VIR_FREE(nodes);
+
+ if ((n = virXPathNodeSet("./cputune/iothreadpin", ctxt, &nodes)) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("cannot extract iothreadpin nodes"));
+ goto error;
+ }
+
+ /* Ignore iothreadpin if placement is "auto", they
+ * conflict with each other, and placement can't be
+ * simply ignored, as 's placement defaults to it.
+ */
+ if (n) {
+ if (def->placement_mode != VIR_DOMAIN_CPU_PLACEMENT_MODE_AUTO) {
+ if (VIR_ALLOC_N(def->cputune.iothreadspin, n) < 0)
+ goto error;
+
+ for (i = 0; i < n; i++) {
+ virDomainVcpuPinDefPtr iothreadpin = NULL;
+ iothreadpin = virDomainVcpuPinDefParseXML(nodes[i], ctxt,
+ def->iothreads,
+ false, true);
+ if (!iothreadpin)
+ goto error;
+
+ if (virDomainVcpuPinIsDuplicate(def->cputune.iothreadspin,
+ def->cputune.niothreadspin,
+ iothreadpin->vcpuid)) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("duplicate iothreadpin for same iothread"));
+ virDomainVcpuPinDefFree(iothreadpin);
+ goto error;
+ }
+
+ def->cputune.iothreadspin[def->cputune.niothreadspin++] =
+ iothreadpin;
+ }
+ } else {
+ VIR_WARN("Ignore iothreadpin for placement is 'auto'");
+ }
+ }
+ VIR_FREE(nodes);
+
+
/* analysis of cpu handling */
if ((node = virXPathNode("./cpu[1]", ctxt)) != NULL) {
xmlNodePtr oldnode = ctxt->node;
@@ -17958,6 +18041,7 @@ virDomainDefFormatInternal(virDomainDefPtr def,
int n;
size_t i;
bool blkio = false;
+ bool cputune = false;
virCheckFlags(DUMPXML_FLAGS |
VIR_DOMAIN_XML_INTERNAL_STATUS |
@@ -18149,8 +18233,11 @@ virDomainDefFormatInternal(virDomainDefPtr def,
(def->cputune.nvcpupin && !virDomainIsAllVcpupinInherited(def)) ||
def->cputune.period || def->cputune.quota ||
def->cputune.emulatorpin ||
- def->cputune.emulator_period || def->cputune.emulator_quota)
+ def->cputune.emulator_period || def->cputune.emulator_quota ||
+ def->cputune.niothreadspin) {
virBufferAddLit(buf, "\n");
+ cputune = true;
+ }
virBufferAdjustIndent(buf, 2);
if (def->cputune.sharesSpecified)
@@ -18201,12 +18288,27 @@ virDomainDefFormatInternal(virDomainDefPtr def,
virBufferAsprintf(buf, "cpuset='%s'/>\n", cpumask);
VIR_FREE(cpumask);
}
+
+ for (i = 0; i < def->cputune.niothreadspin; i++) {
+ char *cpumask;
+ /* Ignore the iothreadpin which inherit from "cpuset of "." */
+ if (def->cpumask &&
+ virBitmapEqual(def->cpumask,
+ def->cputune.iothreadspin[i]->cpumask))
+ continue;
+
+ virBufferAsprintf(buf, "cputune.iothreadspin[i]->vcpuid);
+
+ if (!(cpumask = virBitmapFormat(def->cputune.iothreadspin[i]->cpumask)))
+ goto error;
+
+ virBufferAsprintf(buf, "cpuset='%s'/>\n", cpumask);
+ VIR_FREE(cpumask);
+ }
+
virBufferAdjustIndent(buf, -2);
- if (def->cputune.sharesSpecified ||
- (def->cputune.nvcpupin && !virDomainIsAllVcpupinInherited(def)) ||
- def->cputune.period || def->cputune.quota ||
- def->cputune.emulatorpin ||
- def->cputune.emulator_period || def->cputune.emulator_quota)
+ if (cputune)
virBufferAddLit(buf, "\n");
if (virDomainNumatuneFormatXML(buf, def->numatune) < 0)
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index efae2f5ee9..0862bd7e9b 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1949,6 +1949,8 @@ struct _virDomainDef {
size_t nvcpupin;
virDomainVcpuPinDefPtr *vcpupin;
virDomainVcpuPinDefPtr emulatorpin;
+ size_t niothreadspin;
+ virDomainVcpuPinDefPtr *iothreadspin;
} cputune;
virDomainNumatunePtr numatune;
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreads.xml b/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreads.xml
new file mode 100644
index 0000000000..435d0ae702
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune-iothreads.xml
@@ -0,0 +1,38 @@
+
+ QEMUGuest1
+ c7a5fdbd-edaf-9455-926a-d65c16db1809
+ 219136
+ 219136
+ 2
+ 2
+
+ 2048
+ 1000000
+ -1
+
+
+
+
+
+
+
+ hvm
+
+
+
+ destroy
+ restart
+ destroy
+
+ /usr/bin/qemu
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 34cdb97841..d269fb3332 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -302,6 +302,7 @@ mymain(void)
DO_TEST("smp");
DO_TEST("iothreads");
+ DO_TEST("cputune-iothreads");
DO_TEST("iothreads-disk");
DO_TEST("lease");
DO_TEST("event_idx");