[PATCH 2/4] conf: domain: support for virtio packed option
Expose the virtio parameter for packed virtqueues as a optional libvirt XML
attribute to virtio-backed devices, e.g.:
<interface type='user'>
<mac address='00:11:22:33:44:55'/>
<model type='virtio'/>
<driver packed='on'/>
</interface>
If the attribute is omitted, the default value for this attribute is 'off' and
regular split virtqueues are used.
Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com>
Signed-off-by: Bjoern Walk <bwalk(a)linux.ibm.com>
---
docs/schemas/domaincommon.rng | 5 +++++
src/conf/domain_conf.c | 28 ++++++++++++++++++++++++++++
src/conf/domain_conf.h | 1 +
3 files changed, 34 insertions(+)
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index d79dee65..b6d7297b 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -5921,6 +5921,11 @@
<ref name="virOnOff"/>
</attribute>
</optional>
+ <optional>
+ <attribute name="packed">
+ <ref name="virOnOff"/>
+ </attribute>
+ </optional>
</define>
<define name="usbmaster">
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 27bc5a79..ca45a6a5 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1505,6 +1505,16 @@ virDomainVirtioOptionsParseXML(xmlNodePtr driver,
}
res->ats = val;
}
+ VIR_FREE(str);
+
+ if ((str = virXMLPropString(driver, "packed"))) {
+ if ((val = virTristateSwitchTypeFromString(str)) <= 0) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("invalid packed value"));
+ return -1;
+ }
+ res->packed = val;
+ }
return 0;
}
@@ -5084,6 +5094,12 @@ virDomainCheckVirtioOptions(virDomainVirtioOptionsPtr virtio)
"for virtio devices"));
return -1;
}
+ if (virtio->packed != VIR_TRISTATE_SWITCH_ABSENT) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("packed driver option is only supported "
+ "for virtio devices"));
+ return -1;
+ }
return 0;
}
@@ -7370,6 +7386,10 @@ virDomainVirtioOptionsFormat(virBufferPtr buf,
virBufferAsprintf(buf, " ats='%s'",
virTristateSwitchTypeToString(virtio->ats));
}
+ if (virtio->packed != VIR_TRISTATE_SWITCH_ABSENT) {
+ virBufferAsprintf(buf, " packed='%s'",
+ virTristateSwitchTypeToString(virtio->packed));
+ }
}
@@ -22392,6 +22412,14 @@ virDomainVirtioOptionsCheckABIStability(virDomainVirtioOptionsPtr
src,
virTristateSwitchTypeToString(src->ats));
return false;
}
+ if (src->packed != dst->packed) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("Target device packed option '%s' does not "
+ "match source '%s'"),
+ virTristateSwitchTypeToString(dst->packed),
+ virTristateSwitchTypeToString(src->packed));
+ return false;
+ }
return true;
}
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 33875d94..ef322593 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2404,6 +2404,7 @@ struct _virDomainVsockDef {
struct _virDomainVirtioOptions {
virTristateSwitch iommu;
virTristateSwitch ats;
+ virTristateSwitch packed;
};
/*
--
2.24.1