diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 1ed969ac3e..adfdd7b7a5 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -1336,6 +1336,7 @@ following collection of elements. :since:`Since 0.7.5`
Intel
+
...
@@ -1352,6 +1353,7 @@ following collection of elements. :since:`Since 0.7.5`
+
...
@@ -1600,6 +1602,27 @@ In case no restrictions need to be put on CPU model and its features, a simpler
The virtual CPU will report no CPU cache of the specified level (or no
cache at all if the ``level`` attribute is missing).
+``maxphysaddr``
+ :since:`Since 8.7.0` the ``maxphysaddr`` element describes the virtual CPU
+ address size in bits. The hypervisor default is used if the element is missing.
+
+ ``mode``
+ This mandatory attribute specifies how the address size is presented. The
+ follow modes are supported:
+
+ ``passthrough``
+ The number of physical address bits reported by the host CPU will be
+ passed through to the virtual CPUs
+ ``emulate``
+ The hypervisor will define a specific value for the number of bits
+ of physical addresses via the ``bits`` attribute, which is mandatory.
+ The number of bits cannot exceed the number of physical address bits
+ supported by the hypervisor.
+
+ ``bits``
+ The ``bits`` attribute is mandatory if the ``mode`` attribute is set to
+ ``emulate`` and specifies the virtual CPU address size in bits.
+
Guest NUMA topology can be specified using the ``numa`` element. :since:`Since
0.9.8`
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 8d80bbd842..fdbb564cc8 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -82,6 +82,12 @@ VIR_ENUM_IMPL(virCPUCacheMode,
"disable",
);
+VIR_ENUM_IMPL(virCPUMaxPhysAddrMode,
+ VIR_CPU_MAX_PHYS_ADDR_MODE_LAST,
+ "emulate",
+ "passthrough",
+);
+
virCPUDef *virCPUDefNew(void)
{
@@ -127,6 +133,7 @@ virCPUDefFree(virCPUDef *def)
if (g_atomic_int_dec_and_test(&def->refs)) {
virCPUDefFreeModel(def);
g_free(def->cache);
+ g_free(def->addr);
g_free(def->tsc);
g_free(def);
}
@@ -252,6 +259,11 @@ virCPUDefCopyWithoutModel(const virCPUDef *cpu)
*copy->cache = *cpu->cache;
}
+ if (cpu->addr) {
+ copy->addr = g_new0(virCPUMaxPhysAddrDef, 1);
+ *copy->addr = *cpu->addr;
+ }
+
if (cpu->tsc) {
copy->tsc = g_new0(virHostCPUTscInfo, 1);
*copy->tsc = *cpu->tsc;
@@ -322,6 +334,7 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
g_autoptr(virCPUDef) def = NULL;
g_autofree xmlNodePtr *nodes = NULL;
xmlNodePtr topology = NULL;
+ xmlNodePtr maxphysaddrNode = NULL;
VIR_XPATH_NODE_AUTORESTORE(ctxt)
int n;
int rv;
@@ -644,6 +657,21 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
def->cache->mode = mode;
}
+ if ((maxphysaddrNode = virXPathNode("./maxphysaddr[1]", ctxt))) {
+ def->addr = g_new0(virCPUMaxPhysAddrDef, 1);
+
+ if (virXMLPropEnum(maxphysaddrNode, "mode",
+ virCPUMaxPhysAddrModeTypeFromString,
+ VIR_XML_PROP_REQUIRED,
+ &def->addr->mode) < 0)
+ return -1;
+
+ if (virXMLPropInt(maxphysaddrNode, "bits", 10,
+ VIR_XML_PROP_NONNEGATIVE,
+ &def->addr->bits, -1) < 0)
+ return -1;
+ }
+
*cpu = g_steal_pointer(&def);
return 0;
}
@@ -811,6 +839,15 @@ virCPUDefFormatBuf(virBuffer *buf,
virBufferAddLit(buf, "/>\n");
}
+ if (def->addr) {
+ virBufferAddLit(buf, "addr->mode));
+ if (def->addr->bits != -1)
+ virBufferAsprintf(buf, " bits='%d'", def->addr->bits);
+ virBufferAddLit(buf, "/>\n");
+ }
+
for (i = 0; i < def->nfeatures; i++) {
virCPUFeatureDef *feature = def->features + i;
@@ -1073,6 +1110,15 @@ virCPUDefIsEqual(virCPUDef *src,
return false;
}
+ if ((src->addr && !dst->addr) ||
+ (!src->addr && dst->addr) ||
+ (src->addr && dst->addr &&
+ (src->addr->mode != dst->addr->mode ||
+ src->addr->bits != dst->addr->bits))) {
+ MISMATCH("%s", _("Target CPU maxphysaddr does not match source"));
+ return false;
+ }
+
if (src->nfeatures != dst->nfeatures) {
MISMATCH(_("Target CPU feature count %zu does not match source %zu"),
dst->nfeatures, src->nfeatures);
diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index 5d2980edbd..113d349708 100644
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -116,6 +116,22 @@ struct _virCPUCacheDef {
};
+typedef enum {
+ VIR_CPU_MAX_PHYS_ADDR_MODE_EMULATE,
+ VIR_CPU_MAX_PHYS_ADDR_MODE_PASSTHROUGH,
+
+ VIR_CPU_MAX_PHYS_ADDR_MODE_LAST
+} virCPUMaxPhysAddrMode;
+
+VIR_ENUM_DECL(virCPUMaxPhysAddrMode);
+
+typedef struct _virCPUMaxPhysAddrDef virCPUMaxPhysAddrDef;
+struct _virCPUMaxPhysAddrDef {
+ int bits; /* -1 for unspecified */
+ virCPUMaxPhysAddrMode mode;
+};
+
+
typedef struct _virCPUDef virCPUDef;
struct _virCPUDef {
int refs;
@@ -140,6 +156,7 @@ struct _virCPUDef {
size_t nfeatures_max;
virCPUFeatureDef *features;
virCPUCacheDef *cache;
+ virCPUMaxPhysAddrDef *addr;
virHostCPUTscInfo *tsc;
virTristateSwitch migratable; /* for host-passthrough mode */
};
diff --git a/src/conf/schemas/cputypes.rng b/src/conf/schemas/cputypes.rng
index 122880fb2e..4ae386c3c0 100644
--- a/src/conf/schemas/cputypes.rng
+++ b/src/conf/schemas/cputypes.rng
@@ -305,6 +305,22 @@
+
+
+
+
+ emulate
+ passthrough
+
+
+
+
+