diff --git a/docs/formatcaps.rst b/docs/formatcaps.rst index 3cccf70882655473172282e8457d034b8391a9ae..f37532296fb94fe58f56c81a8d95e32ec7bb309b 100644 --- a/docs/formatcaps.rst +++ b/docs/formatcaps.rst @@ -37,6 +37,12 @@ The ```` element consists of the following child elements: The host UUID. ``cpu`` The host CPU architecture and features. + + Note that, while this element contains a ``topology`` sub-element, + the information contained therein is farily high-level and likely + not very useful when it comes to optimizing guest vCPU placement. + Look into the ``topology`` *element*, described below, for more + detailed information. ``power_management`` whether host is capable of memory suspend, disk hibernation, or hybrid suspend. @@ -44,12 +50,48 @@ The ```` element consists of the following child elements: This element exposes information on the hypervisor's migration capabilities, like live migration, supported URI transports, and so on. ``topology`` - This element embodies the host internal topology. Management applications may - want to learn this information when orchestrating new guests - e.g. due to - reduce inter-NUMA node transfers. Note that the ``sockets`` value reported - here is per-NUMA-node; this is in contrast to the value given in domain - definitions, which is interpreted as a total number of sockets for the - domain. + This element describes the host CPU topology in detail. + + Management applications may want to use this information when defining new + guests: for example, in order to ensure that all vCPUs are scheduled on + CPUs that are in the same NUMA node or even CPU core. + + The ``cells`` sub-element contains a list of NUMA nodes, each one + represented by a single ``cell`` element. Within each ``cell``, a ``cpus`` + sub-element contains a list of logical CPUs, each one represented by a + single ``cpu`` element. In both cases, the ``num`` attribute of the + top-level element contains the number of children. + + Each ``cpu`` element contains the following attributes: + + ``id`` + CPU identifier. Can be used to refer to it in the context of + `CPU tuning `__. + + ``socket_id`` + Identifier for the physical package the CPU is in. + + ``die_id`` + Identifier for the die the CPU is in. + + Note that not all architectures support CPU dies: if the current + architecture doesn't, the value will be 0 for all CPUs. + + ``cluster_id`` + Identifier for the cluster the CPU is in. + + Note that not all architectures support CPU clusters: if the current + architecture doesn't, the value will be 0 for all CPUs. + + ``core_id`` + Identifier for the core the CPU is in. + + ``siblings`` + List of CPUs that are in the same core. + + The list will include the current CPU, plus all other CPUs that have the + same values for ``socket_id``, ``die_id``, ``cluster_id`` and ``core_id``. + ``secmodel`` To find out default security labels for different security models you need to parse this element. In contrast with the former elements, this is repeated @@ -160,7 +202,7 @@ capabilities enabled in the chip and BIOS you will see: - + @@ -225,14 +267,14 @@ capabilities enabled in the chip and BIOS you will see: - - - - - - - - + + + + + + + + diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index c5c069e6df720c0a90b06cc86a94315061570289..c5c71f6f47846c8d4053ca61dd215e8116155fd1 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -1377,7 +1377,7 @@ following collection of elements. :since:`Since 0.7.5` core2duo Intel - + @@ -1388,7 +1388,7 @@ following collection of elements. :since:`Since 0.7.5` - + ... @@ -1414,7 +1414,7 @@ In case no restrictions need to be put on CPU model and its features, a simpler ... - + ... @@ -1578,14 +1578,20 @@ In case no restrictions need to be put on CPU model and its features, a simpler supported vendors can be found in ``cpu_map/*_vendors.xml``. ``topology`` The ``topology`` element specifies requested topology of virtual CPU provided - to the guest. Four attributes, ``sockets``, ``dies``, ``cores``, and - ``threads``, accept non-zero positive integer values. They refer to the - total number of CPU sockets, number of dies per socket, number of cores per - die, and number of threads per core, respectively. The ``dies`` attribute is - optional and will default to 1 if omitted, while the other attributes are all - mandatory. Hypervisors may require that the maximum number of vCPUs specified + to the guest. + Its attributes ``sockets``, ``dies`` (:since:`Since 6.1.0`), ``clusters`` + (:since:`Since 10.1.0`), ``cores``, and ``threads`` accept non-zero positive + integer values. + They refer to the total number of CPU sockets, number of dies per socket, + number of clusters per die, number of cores per cluster, and number of + threads per core, respectively. + The ``dies`` and ``clusters`` attributes are optional and will default to 1 + if omitted, while the other attributes are all mandatory. + Hypervisors may require that the maximum number of vCPUs specified by the ``cpus`` element equals to the number of vcpus resulting from the topology. + Moreover, not all architectures and machine types support specifying a value + other than 1 for all attributes. ``feature`` The ``cpu`` element can contain zero or more ``feature`` elements used to fine-tune features provided by the selected CPU model. The list of known diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 5b388c7a8f96c1bb5a4c357c59bb6ba4019175fc..d05b01ae5d13bd866b9e41334e2fdd483606a0d1 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -672,6 +672,11 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver, virDomainDef *def, _("Only 1 die per socket is supported")); return NULL; } + if (def->cpu->clusters != 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only 1 cluster per die is supported")); + return NULL; + } if (nvcpus != def->cpu->sockets * def->cpu->cores * def->cpu->threads) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Invalid CPU topology: total number of vCPUs must equal the product of sockets, cores, and threads")); diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 32badee7b3da9ed6e4be3590c0dfe461cc66e61a..02298e40a310aa0754e65800cdfa9c25a421a76b 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -811,9 +811,10 @@ virCapsHostNUMACellCPUFormat(virBuffer *buf, return -1; virBufferAsprintf(&childBuf, - " socket_id='%d' die_id='%d' core_id='%d' siblings='%s'", + " socket_id='%d' die_id='%d' cluster_id='%d' core_id='%d' siblings='%s'", cpus[j].socket_id, cpus[j].die_id, + cpus[j].cluster_id, cpus[j].core_id, siblings); } @@ -1453,6 +1454,7 @@ virCapabilitiesFillCPUInfo(int cpu_id G_GNUC_UNUSED, if (virHostCPUGetSocket(cpu_id, &cpu->socket_id) < 0 || virHostCPUGetDie(cpu_id, &cpu->die_id) < 0 || + virHostCPUGetCluster(cpu_id, &cpu->cluster_id) < 0 || virHostCPUGetCore(cpu_id, &cpu->core_id) < 0) return -1; @@ -1712,6 +1714,7 @@ virCapabilitiesHostNUMAInitFake(virCapsHostNUMA *caps) if (tmp) { cpus[cid].id = id; cpus[cid].die_id = 0; + cpus[cid].cluster_id = 0; cpus[cid].socket_id = s; cpus[cid].core_id = c; cpus[cid].siblings = virBitmapNewCopy(siblings); diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 9eaf6e280798ca530a9581d9169264033e14a7b1..52e395de145101c7cdc6c994225ef494cb050090 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -89,6 +89,7 @@ struct _virCapsHostNUMACellCPU { unsigned int id; unsigned int socket_id; unsigned int die_id; + unsigned int cluster_id; unsigned int core_id; virBitmap *siblings; }; diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 7abe489733d9c3e873f0a88e9ed552251e27cc17..6e6e1b9a89768b01ea5ecae2b06807ccff62e5d7 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -241,6 +241,7 @@ virCPUDefCopyWithoutModel(const virCPUDef *cpu) copy->fallback = cpu->fallback; copy->sockets = cpu->sockets; copy->dies = cpu->dies; + copy->clusters = cpu->clusters; copy->cores = cpu->cores; copy->threads = cpu->threads; copy->arch = cpu->arch; @@ -572,6 +573,12 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt, return -1; } + if (virXMLPropUIntDefault(topology, "clusters", 10, + VIR_XML_PROP_NONZERO, + &def->clusters, 1) < 0) { + return -1; + } + if (virXMLPropUInt(topology, "cores", 10, VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO, &def->cores) < 0) { @@ -827,10 +834,11 @@ virCPUDefFormatBuf(virBuffer *buf, virBufferAddLit(buf, "/>\n"); } - if (def->sockets && def->dies && def->cores && def->threads) { + if (def->sockets && def->dies && def->clusters && def->cores && def->threads) { virBufferAddLit(buf, "sockets); virBufferAsprintf(buf, " dies='%u'", def->dies); + virBufferAsprintf(buf, " clusters='%u'", def->clusters); virBufferAsprintf(buf, " cores='%u'", def->cores); virBufferAsprintf(buf, " threads='%u'", def->threads); virBufferAddLit(buf, "/>\n"); @@ -1106,6 +1114,12 @@ virCPUDefIsEqual(virCPUDef *src, return false; } + if (src->clusters != dst->clusters) { + MISMATCH(_("Target CPU clusters %1$d does not match source %2$d"), + dst->clusters, src->clusters); + return false; + } + if (src->cores != dst->cores) { MISMATCH(_("Target CPU cores %1$d does not match source %2$d"), dst->cores, src->cores); diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index 3e4c53675c8610bcc292c27e3b41b0cf78241426..2694022fed1e3ab15e5f83572b5a466f74c3711c 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -148,6 +148,7 @@ struct _virCPUDef { unsigned int microcodeVersion; unsigned int sockets; unsigned int dies; + unsigned int clusters; unsigned int cores; unsigned int threads; unsigned int sigFamily; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index dd0a8d87a1a4a0541cf0e35d9c3185bc29205610..1996d49216bebaaf7b6b0102eea3f4e59761e990 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2332,6 +2332,7 @@ virDomainDefGetVcpusTopology(const virDomainDef *def, /* multiplication of 32bit numbers fits into a 64bit variable */ if ((tmp *= def->cpu->dies) > UINT_MAX || + (tmp *= def->cpu->clusters) > UINT_MAX || (tmp *= def->cpu->cores) > UINT_MAX || (tmp *= def->cpu->threads) > UINT_MAX) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/src/conf/schemas/capability.rng b/src/conf/schemas/capability.rng index b1968df258565018066969943da5a4bc17f38459..a1606941e753711b1ff31f8a2eee58b545cd2565 100644 --- a/src/conf/schemas/capability.rng +++ b/src/conf/schemas/capability.rng @@ -201,6 +201,9 @@ + + + diff --git a/src/conf/schemas/cputypes.rng b/src/conf/schemas/cputypes.rng index db1aa571582079a2680dc543e70f218fcda43b36..3a8910e09f2df924148730ead7de8967477718ab 100644 --- a/src/conf/schemas/cputypes.rng +++ b/src/conf/schemas/cputypes.rng @@ -92,6 +92,11 @@ + + + + + diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 1e7c879ca5f2184aeb052dd970265d80201685b8..33701811fb97b1a9dc14c288933943086a7d1d3b 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -437,6 +437,7 @@ virCPUGetHost(virArch arch, if (nodeInfo) { cpu->sockets = nodeInfo->sockets; cpu->dies = 1; + cpu->clusters = 1; cpu->cores = nodeInfo->cores; cpu->threads = nodeInfo->threads; } diff --git a/src/libvirt_linux.syms b/src/libvirt_linux.syms index 55649ae39cecbc407b428ce8afd049deadbb6e2c..004cbfee97302cb637ede7902d2a2480f755a24b 100644 --- a/src/libvirt_linux.syms +++ b/src/libvirt_linux.syms @@ -3,6 +3,7 @@ # # util/virhostcpu.h +virHostCPUGetCluster; virHostCPUGetCore; virHostCPUGetDie; virHostCPUGetInfoPopulateLinux; diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 177e8b988e77b4b863cb2ec13895466a9bd1e86f..c3736bd0a9a856179d26fe1dcf0d28f0abf7c319 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -159,6 +159,7 @@ libxlCapsInitCPU(virCaps *caps, libxl_physinfo *phy_info) cpu->cores = phy_info->cores_per_socket; cpu->threads = phy_info->threads_per_core; cpu->dies = 1; + cpu->clusters = 1; cpu->sockets = phy_info->nr_cpus / (cpu->cores * cpu->threads); if (!(data = libxlCapsNodeData(cpu, phy_info->hw_cap)) || diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c69625e49beb56579753f532bab6be02daaadb41..bcb88e33599b43392d142750c158167e5d97307c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -699,6 +699,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "run-with.async-teardown", /* QEMU_CAPS_RUN_WITH_ASYNC_TEARDOWN */ "virtio-blk-vhost-vdpa", /* QEMU_CAPS_DEVICE_VIRTIO_BLK_VHOST_VDPA */ "machine.virt.aia", /* QEMU_CAPS_MACHINE_VIRT_AIA */ + "smp-clusters", /* QEMU_CAPS_SMP_CLUSTERS */ ); @@ -1552,6 +1553,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = { { "query-display-options/ret-type/+sdl", QEMU_CAPS_SDL }, { "query-display-options/ret-type/+egl-headless", QEMU_CAPS_EGL_HEADLESS }, { "query-hotpluggable-cpus/ret-type/props/die-id", QEMU_CAPS_SMP_DIES }, + { "query-hotpluggable-cpus/ret-type/props/cluster-id", QEMU_CAPS_SMP_CLUSTERS }, { "query-named-block-nodes/arg-type/flat", QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT }, { "screendump/arg-type/device", QEMU_CAPS_SCREENDUMP_DEVICE }, { "set-numa-node/arg-type/+hmat-lb", QEMU_CAPS_NUMA_HMAT }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index e6d4aef2a70d7a203f9c96af338e875862bebdff..f76bb6e3989c32e49f1799051d63b86b1b3c1e22 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -678,6 +678,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_RUN_WITH_ASYNC_TEARDOWN, /* asynchronous teardown -run-with async-teardown=on|off */ QEMU_CAPS_DEVICE_VIRTIO_BLK_VHOST_VDPA, /* virtio-blk-vhost-vdpa block driver */ QEMU_CAPS_MACHINE_VIRT_AIA, /* -machine virt,aia=(none|aplic|aplic-imsic), RISC-V only */ + QEMU_CAPS_SMP_CLUSTERS, /* -smp clusters= */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8360cdb52f96ac69bf24eac4f8f5a38a8d53ae3a..57a0cf18cc682671a2e5d6780a2f66fe0a19b1fb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7190,9 +7190,17 @@ qemuBuildSmpCommandLine(virCommand *cmd, _("Only 1 die per socket is supported")); return -1; } + if (def->cpu->clusters != 1 && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_CLUSTERS)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only 1 cluster per die is supported")); + return -1; + } virBufferAsprintf(&buf, ",sockets=%u", def->cpu->sockets); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_DIES)) virBufferAsprintf(&buf, ",dies=%u", def->cpu->dies); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_CLUSTERS)) + virBufferAsprintf(&buf, ",clusters=%u", def->cpu->clusters); virBufferAsprintf(&buf, ",cores=%u", def->cpu->cores); virBufferAsprintf(&buf, ",threads=%u", def->cpu->threads); } else { diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 5fb3c67f5302e5acf9a6f3f21afa1fd8dab68212..595fcfb5191940984498c1f46f0b76173ef32666 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9935,11 +9935,12 @@ qemuDomainRefreshVcpuInfo(virDomainObj *vm, if (validTIDs) VIR_DEBUG("vCPU[%zu] PID %llu is valid " - "(node=%d socket=%d die=%d core=%d thread=%d)", + "(node=%d socket=%d die=%d cluster=%d core=%d thread=%d)", i, (unsigned long long)info[i].tid, info[i].node_id, info[i].socket_id, info[i].die_id, + info[i].cluster_id, info[i].core_id, info[i].thread_id); } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index ec586b9036bcb6e8c69046ae38c8fdece18775d0..3b864926f25a0bb2abfa7cf12b45f5fd0b4b4386 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1501,6 +1501,7 @@ qemuMonitorCPUInfoClear(qemuMonitorCPUInfo *cpus, cpus[i].qemu_id = -1; cpus[i].socket_id = -1; cpus[i].die_id = -1; + cpus[i].cluster_id = -1; cpus[i].core_id = -1; cpus[i].thread_id = -1; cpus[i].node_id = -1; @@ -1658,6 +1659,7 @@ qemuMonitorGetCPUInfoHotplug(struct qemuMonitorQueryHotpluggableCpusEntry *hotpl !vcpus[mainvcpu].online; vcpus[mainvcpu].socket_id = hotplugvcpus[i].socket_id; vcpus[mainvcpu].die_id = hotplugvcpus[i].die_id; + vcpus[mainvcpu].cluster_id = hotplugvcpus[i].cluster_id; vcpus[mainvcpu].core_id = hotplugvcpus[i].core_id; vcpus[mainvcpu].thread_id = hotplugvcpus[i].thread_id; vcpus[mainvcpu].node_id = hotplugvcpus[i].node_id; diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index c4af9b407d2d57aaa3ea0d9674d0c32193b07612..981c609e9f404070dd4eb5758fc0930981740b77 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -590,6 +590,7 @@ struct qemuMonitorQueryHotpluggableCpusEntry { int node_id; int socket_id; int die_id; + int cluster_id; int core_id; int thread_id; @@ -613,6 +614,7 @@ struct _qemuMonitorCPUInfo { * all entries are -1 */ int socket_id; int die_id; + int cluster_id; int core_id; int thread_id; int node_id; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index a9133793f6a06c24c05829487a7751ea13c9089e..bfd9660ba6ee644b3db9650ebfaf4b78c6e00263 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -7576,12 +7576,14 @@ qemuMonitorJSONProcessHotpluggableCpusReply(virJSONValue *vcpu, entry->node_id = -1; entry->socket_id = -1; entry->die_id = -1; + entry->cluster_id = -1; entry->core_id = -1; entry->thread_id = -1; ignore_value(virJSONValueObjectGetNumberInt(props, "node-id", &entry->node_id)); ignore_value(virJSONValueObjectGetNumberInt(props, "socket-id", &entry->socket_id)); ignore_value(virJSONValueObjectGetNumberInt(props, "die-id", &entry->die_id)); + ignore_value(virJSONValueObjectGetNumberInt(props, "cluster-id", &entry->cluster_id)); ignore_value(virJSONValueObjectGetNumberInt(props, "core-id", &entry->core_id)); ignore_value(virJSONValueObjectGetNumberInt(props, "thread-id", &entry->thread_id)); @@ -7619,6 +7621,9 @@ qemuMonitorQueryHotpluggableCpusEntrySort(const void *p1, if (a->die_id != b->die_id) return a->die_id - b->die_id; + if (a->cluster_id != b->cluster_id) + return a->cluster_id - b->cluster_id; + if (a->core_id != b->core_id) return a->core_id - b->core_id; diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index cf3a96782238deca7782ba4eff6bfcb7b36d6c9b..01de69c0d17753c07139b79d07ec99fd3d9a7402 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -232,6 +232,28 @@ virHostCPUGetDie(unsigned int cpu, unsigned int *die) return 0; } +int +virHostCPUGetCluster(unsigned int cpu, unsigned int *cluster) +{ + int cluster_id; + int ret = virFileReadValueInt(&cluster_id, + "%s/cpu/cpu%u/topology/cluster_id", + SYSFS_SYSTEM_PATH, cpu); + + if (ret == -1) + return -1; + + /* If the file doesn't exists (old kernel) or the value contained + * in it is -1 (architecture without CPU clusters), report 0 to + * indicate the lack of information */ + if (ret == -2 || cluster_id < 0) + cluster_id = 0; + + *cluster = cluster_id; + + return 0; +} + int virHostCPUGetCore(unsigned int cpu, unsigned int *core) { diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h index 5f0d43e069362973d4e22cbd920518bfb81a6359..d7e09bff229522d038247e88f0759d79a4b267bf 100644 --- a/src/util/virhostcpu.h +++ b/src/util/virhostcpu.h @@ -68,6 +68,7 @@ int virHostCPUStatsAssign(virNodeCPUStatsPtr param, #ifdef __linux__ int virHostCPUGetSocket(unsigned int cpu, unsigned int *socket); int virHostCPUGetDie(unsigned int cpu, unsigned int *die); +int virHostCPUGetCluster(unsigned int cpu, unsigned int *cluster); int virHostCPUGetCore(unsigned int cpu, unsigned int *core); virBitmap *virHostCPUGetSiblingsList(unsigned int cpu); diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 26b89776e1a8756aa81f5531e8225054ea518191..4ac2320251e4d52f45d10f1709c99df6f06fea3a 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1583,6 +1583,7 @@ virVMXParseConfig(virVMXContext *ctx, goto cleanup; } cpu->dies = 1; + cpu->clusters = 1; cpu->cores = coresPerSocket; cpu->threads = 1; @@ -3377,6 +3378,12 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOption *xmlopt, virDomainDef goto cleanup; } + if (def->cpu->clusters != 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only 1 cluster per die is supported")); + goto cleanup; + } + calculated_vcpus = def->cpu->sockets * def->cpu->cores; if (calculated_vcpus != maxvcpus) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/tests/capabilityschemadata/caps-qemu-kvm.xml b/tests/capabilityschemadata/caps-qemu-kvm.xml index acdbb362ccc949f2c3816057253d0ddca2c9cbbb..317fa0885f749406161890c192d70f9c6e3effbf 100644 --- a/tests/capabilityschemadata/caps-qemu-kvm.xml +++ b/tests/capabilityschemadata/caps-qemu-kvm.xml @@ -64,14 +64,14 @@ - - - - - - - - + + + + + + + + @@ -84,14 +84,14 @@ - - - - - - - - + + + + + + + + diff --git a/tests/cputestdata/x86_64-host+guest,model486-result.xml b/tests/cputestdata/x86_64-host+guest,model486-result.xml index ea8e2d3a48cd4de214afad6f435b47f10451a084..b533f22b88005d8014e6291682057eb23300d5a5 100644 --- a/tests/cputestdata/x86_64-host+guest,model486-result.xml +++ b/tests/cputestdata/x86_64-host+guest,model486-result.xml @@ -1,6 +1,6 @@ 486 - + diff --git a/tests/cputestdata/x86_64-host+guest,models-result.xml b/tests/cputestdata/x86_64-host+guest,models-result.xml index 42664a48b4db61751fdb485e9a43b03a8bc48eb5..e975d9bc18125661e95492d019882578e4ef354c 100644 --- a/tests/cputestdata/x86_64-host+guest,models-result.xml +++ b/tests/cputestdata/x86_64-host+guest,models-result.xml @@ -1,6 +1,6 @@ qemu64 - + diff --git a/tests/cputestdata/x86_64-host+guest-result.xml b/tests/cputestdata/x86_64-host+guest-result.xml index 28e3152cbfa04792ae5c35c04f227b6c97d049c6..cf41b3f872188f75cce3e8246432062c837410f8 100644 --- a/tests/cputestdata/x86_64-host+guest-result.xml +++ b/tests/cputestdata/x86_64-host+guest-result.xml @@ -1,6 +1,6 @@ Penryn - + diff --git a/tests/cputestdata/x86_64-host+guest.xml b/tests/cputestdata/x86_64-host+guest.xml index 28e3152cbfa04792ae5c35c04f227b6c97d049c6..cf41b3f872188f75cce3e8246432062c837410f8 100644 --- a/tests/cputestdata/x86_64-host+guest.xml +++ b/tests/cputestdata/x86_64-host+guest.xml @@ -1,6 +1,6 @@ Penryn - + diff --git a/tests/cputestdata/x86_64-host+host-model-nofallback.xml b/tests/cputestdata/x86_64-host+host-model-nofallback.xml index 16d6e1daf2dac3fa36fdc37da38d588f9f7c86d7..881eea7bd0be1fb66b2875b59975f1731a298d15 100644 --- a/tests/cputestdata/x86_64-host+host-model-nofallback.xml +++ b/tests/cputestdata/x86_64-host+host-model-nofallback.xml @@ -1,7 +1,7 @@ Penryn Intel - + diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml index 8eda6684a01029482e43a6a26461e5bab3f399de..67994c62cc5a69cbdde67e4a55bd8d36e0fece2a 100644 --- a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml +++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml @@ -1,6 +1,6 @@ Haswell - + diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml index cb02449d609dae74df3139cd297220c84806187e..4804c0b818c2797ace8709389df52a821cda1ce4 100644 --- a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml +++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml @@ -1,6 +1,6 @@ Haswell - + diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml index 7ee926aba8dc5c1a71a560866a8d4ddd1edf70ae..c21b331248010b757ac9d9dbea56394f3c4c5b88 100644 --- a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml +++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml @@ -1,4 +1,4 @@ Haswell-noTSX - + diff --git a/tests/cputestdata/x86_64-host-worse+guest-result.xml b/tests/cputestdata/x86_64-host-worse+guest-result.xml index 9d54c66a8fbb957580a3d755e5f7a0a205c33079..712c3ad341dc6253055d98593576d86fa416266b 100644 --- a/tests/cputestdata/x86_64-host-worse+guest-result.xml +++ b/tests/cputestdata/x86_64-host-worse+guest-result.xml @@ -1,6 +1,6 @@ Penryn - + diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml index 4315241d1d460ebaeacbe075a3b4f01a8e711268..536524cf18eac77e9831f5b96588ab6600df5050 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -154,6 +154,7 @@ + 7001000 42900244 v7.1.0 diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml index bd84750dc5c7a22b4b404df17ea40f9f01f2df48..58e1111982d870216164b356ceb37a88dd79f4ef 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -188,6 +188,7 @@ + 7001000 43100244 v7.1.0 diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml index a1fc44141270e2af9938d4335ee13fc51ce8c035..127b8ee4c2e2edf456b5cd950da4d9941569f684 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -149,6 +149,7 @@ + 7002000 0 qemu-7.2.0-6.fc37 diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index 06a01a2c4cca4b08d982e2d7a72b24b4fc4eaa9b..a30ec3c164302f3f35bf7c131914af12a12e1fcd 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -192,6 +192,7 @@ + 7002000 43100245 v7.2.0 diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml index 8ac1529c300383930d4cf28f0497d5a92188b97d..24ac7b8f6e80c112125813c15637a9a1ca611cb5 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -192,6 +192,7 @@ + 7002000 43100245 v7.2.0 diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml index 13f85eb447dc54c60e0be87c11af3fb7d07e8ac8..2478081bfb2c1837b93e96ce15b721487dc3133a 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml @@ -139,6 +139,7 @@ + 7002050 0 v7.2.0-333-g222059a0fc diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml index c2fa8eb02840685a6bbeb1aa9656b6daca3d4c9d..85869f6b5d3bbb1b83d14ef9adfb33a1c5b09a2b 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -196,6 +196,7 @@ + 8000000 43100244 v8.0.0 diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml index 427ee9d5c7b7f2d8ee0412d319b9653a16be3c0f..19422f08fad8196edb6021a7e9238b1d9a8fe836 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml @@ -112,6 +112,7 @@ + 8000050 39100245 v8.0.0-1270-g1c12355b diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index d266dd0f31cfb55bd97dfe6e725e30eb7120819d..0caee53550c98a07a33578f88ec97b36e5d1ea3a 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -198,6 +198,7 @@ + 8001000 43100245 v8.1.0 diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml index ef3bd1459778e9c345a6cabe4e7265f5032d8c50..08967e9a8fb2bf722cc7c497957636bdde2f8a77 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml @@ -199,6 +199,7 @@ + 8001050 43100246 v8.1.0-3111-gad6ef0a42e diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml index ad11b2f8a613b6b9301bc3bfc310d248e357aa1c..1a0d28257ee17ab0ab90a4837238c436c65206fb 100644 --- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml +++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml @@ -44,7 +44,7 @@ POWER9 - + destroy diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml index 2a3b4a495fd856d2ba618f24646228fb186281c0..b127883b362344db7b88cb87daf8d3de9e0191dd 100644 --- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml +++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml @@ -44,7 +44,7 @@ POWER9 - + destroy diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml index 34aec9b96557243449f930765a02b24735905a2e..29f1a5ac45dcfbd2307f423f9338275e974c6402 100644 --- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml +++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml @@ -44,7 +44,7 @@ POWER9 - + destroy diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml index 5ce2cfd0b0df4774dd49fb8d87f8723f387f251e..76a85ac9f05ad60e5cf2c398b7aaa3edd73b57ef 100644 --- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml +++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml @@ -44,7 +44,7 @@ POWER9 - + destroy diff --git a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml index 8d52ffedb4b109fcfe6aee7ea4d3f35cee2a0733..bec46987ff853b36e142772ab639f6281c2c71be 100644 --- a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml +++ b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml @@ -20,7 +20,7 @@ qemu64 - + destroy diff --git a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml index f416397e33cd4d9b079dbeedd67e1bfd119db224..be9769c686cd2bc0c86d91de068545abcc04d902 100644 --- a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml +++ b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml @@ -20,7 +20,7 @@ qemu64 - + destroy diff --git a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml index 0bd2af8e43c2e6df2018036c6175b71eb990d507..539f607818cd6a3ba1c95a3f63961f60883c97a9 100644 --- a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml +++ b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml @@ -20,7 +20,7 @@ qemu64 - + destroy diff --git a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml index b31e6ebe5521c066bbc2df78b224fa0e889e525c..acbdd3cfd5dd4c59c5acd4edc571fd97428cd23a 100644 --- a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml +++ b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml @@ -20,7 +20,7 @@ qemu64 - + destroy diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout+graphics-spice-timeout-password.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout+graphics-spice-timeout-password.xml index 03964ad01ce26714983645735676acd8f857180f..ee53339338b961dbed5367c63d2ea41ea767149a 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout+graphics-spice-timeout-password.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout+graphics-spice-timeout-password.xml @@ -18,7 +18,7 @@ core2duo Intel - + diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml index e6b0cc833aabfffe9c7949e8e6f3a558ffb65062..eb9b902fc5f237236effc5d820add54847da8c54 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml @@ -18,7 +18,7 @@ core2duo Intel - + diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-cpus.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-cpus.json new file mode 100644 index 0000000000000000000000000000000000000000..817f65d109336c3df8413a4b7c0ffd47deb244f4 --- /dev/null +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-cpus.json @@ -0,0 +1,88 @@ +{ + "return": [ + { + "thread-id": 284700, + "props": { + "core-id": 0, + "thread-id": 0, + "socket-id": 0, + "cluster-id": 0 + }, + "qom-path": "/machine/unattached/device[0]", + "cpu-index": 0, + "target": "aarch64" + }, + { + "thread-id": 284701, + "props": { + "core-id": 0, + "thread-id": 1, + "socket-id": 0, + "cluster-id": 0 + }, + "qom-path": "/machine/unattached/device[1]", + "cpu-index": 1, + "target": "aarch64" + }, + { + "thread-id": 284702, + "props": { + "core-id": 1, + "thread-id": 0, + "socket-id": 0, + "cluster-id": 0 + }, + "qom-path": "/machine/unattached/device[2]", + "cpu-index": 2, + "target": "aarch64" + }, + { + "thread-id": 284703, + "props": { + "core-id": 1, + "thread-id": 1, + "socket-id": 0, + "cluster-id": 0 + }, + "qom-path": "/machine/unattached/device[3]", + "cpu-index": 3, + "target": "aarch64" + }, + { + "thread-id": 284704, + "props": { + "core-id": 0, + "thread-id": 0, + "socket-id": 0, + "cluster-id": 1 + }, + "qom-path": "/machine/unattached/device[4]", + "cpu-index": 4, + "target": "aarch64" + }, + { + "thread-id": 284705, + "props": { + "core-id": 0, + "thread-id": 1, + "socket-id": 0, + "cluster-id": 1 + }, + "qom-path": "/machine/unattached/device[5]", + "cpu-index": 5, + "target": "aarch64" + }, + { + "thread-id": 284706, + "props": { + "core-id": 1, + "thread-id": 0, + "socket-id": 0, + "cluster-id": 1 + }, + "qom-path": "/machine/unattached/device[6]", + "cpu-index": 6, + "target": "aarch64" + } + ] +} diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-hotplug.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-hotplug.json new file mode 100644 index 0000000000000000000000000000000000000000..7ae30bf1110487e85d131b39927074d5b60d0d28 --- /dev/null +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-hotplug.json @@ -0,0 +1,171 @@ +{ + "return": [ + { + "props": { + "core-id": 1, + "thread-id": 1, + "socket-id": 1, + "cluster-id": 1 + }, + "vcpus-count": 1, + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 1, + "thread-id": 0, + "socket-id": 1, + "cluster-id": 1 + }, + "vcpus-count": 1, + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 0, + "thread-id": 1, + "socket-id": 1, + "cluster-id": 1 + }, + "vcpus-count": 1, + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 0, + "thread-id": 0, + "socket-id": 1, + "cluster-id": 1 + }, + "vcpus-count": 1, + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 1, + "thread-id": 1, + "socket-id": 1, + "cluster-id": 0 + }, + "vcpus-count": 1, + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 1, + "thread-id": 0, + "socket-id": 1, + "cluster-id": 0 + }, + "vcpus-count": 1, + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 0, + "thread-id": 1, + "socket-id": 1, + "cluster-id": 0 + }, + "vcpus-count": 1, + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 0, + "thread-id": 0, + "socket-id": 1, + "cluster-id": 0 + }, + "vcpus-count": 1, + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 1, + "thread-id": 1, + "socket-id": 0, + "cluster-id": 1 + }, + "vcpus-count": 1, + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 1, + "thread-id": 0, + "socket-id": 0, + "cluster-id": 1 + }, + "vcpus-count": 1, + "qom-path": "/machine/unattached/device[6]", + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 0, + "thread-id": 1, + "socket-id": 0, + "cluster-id": 1 + }, + "vcpus-count": 1, + "qom-path": "/machine/unattached/device[5]", + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 0, + "thread-id": 0, + "socket-id": 0, + "cluster-id": 1 + }, + "vcpus-count": 1, + "qom-path": "/machine/unattached/device[4]", + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 1, + "thread-id": 1, + "socket-id": 0, + "cluster-id": 0 + }, + "vcpus-count": 1, + "qom-path": "/machine/unattached/device[3]", + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 1, + "thread-id": 0, + "socket-id": 0, + "cluster-id": 0 + }, + "vcpus-count": 1, + "qom-path": "/machine/unattached/device[2]", + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 0, + "thread-id": 1, + "socket-id": 0, + "cluster-id": 0 + }, + "vcpus-count": 1, + "qom-path": "/machine/unattached/device[1]", + "type": "host-arm-cpu" + }, + { + "props": { + "core-id": 0, + "thread-id": 0, + "socket-id": 0, + "cluster-id": 0 + }, + "vcpus-count": 1, + "qom-path": "/machine/unattached/device[0]", + "type": "host-arm-cpu" + } + ] +} diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters.data b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters.data new file mode 100644 index 0000000000000000000000000000000000000000..87e927e7a8b4bf08f0de86edcefc99a9460a64a3 --- /dev/null +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters.data @@ -0,0 +1,108 @@ +[vcpu libvirt-id='0'] + online=yes + hotpluggable=no + thread-id='284700' + enable-id='1' + query-cpus-id='0' + type='host-arm-cpu' + qom_path='/machine/unattached/device[0]' + topology: socket='0' cluster_id='0' core='0' thread='0' vcpus='1' +[vcpu libvirt-id='1'] + online=yes + hotpluggable=no + thread-id='284701' + enable-id='2' + query-cpus-id='1' + type='host-arm-cpu' + qom_path='/machine/unattached/device[1]' + topology: socket='0' cluster_id='0' core='0' thread='1' vcpus='1' +[vcpu libvirt-id='2'] + online=yes + hotpluggable=no + thread-id='284702' + enable-id='3' + query-cpus-id='2' + type='host-arm-cpu' + qom_path='/machine/unattached/device[2]' + topology: socket='0' cluster_id='0' core='1' thread='0' vcpus='1' +[vcpu libvirt-id='3'] + online=yes + hotpluggable=no + thread-id='284703' + enable-id='4' + query-cpus-id='3' + type='host-arm-cpu' + qom_path='/machine/unattached/device[3]' + topology: socket='0' cluster_id='0' core='1' thread='1' vcpus='1' +[vcpu libvirt-id='4'] + online=yes + hotpluggable=no + thread-id='284704' + enable-id='5' + query-cpus-id='4' + type='host-arm-cpu' + qom_path='/machine/unattached/device[4]' + topology: socket='0' cluster_id='1' core='0' thread='0' vcpus='1' +[vcpu libvirt-id='5'] + online=yes + hotpluggable=no + thread-id='284705' + enable-id='6' + query-cpus-id='5' + type='host-arm-cpu' + qom_path='/machine/unattached/device[5]' + topology: socket='0' cluster_id='1' core='0' thread='1' vcpus='1' +[vcpu libvirt-id='6'] + online=yes + hotpluggable=no + thread-id='284706' + enable-id='7' + query-cpus-id='6' + type='host-arm-cpu' + qom_path='/machine/unattached/device[6]' + topology: socket='0' cluster_id='1' core='1' thread='0' vcpus='1' +[vcpu libvirt-id='7'] + online=no + hotpluggable=yes + type='host-arm-cpu' + topology: socket='0' cluster_id='1' core='1' thread='1' vcpus='1' +[vcpu libvirt-id='8'] + online=no + hotpluggable=yes + type='host-arm-cpu' + topology: socket='1' cluster_id='0' core='0' thread='0' vcpus='1' +[vcpu libvirt-id='9'] + online=no + hotpluggable=yes + type='host-arm-cpu' + topology: socket='1' cluster_id='0' core='0' thread='1' vcpus='1' +[vcpu libvirt-id='10'] + online=no + hotpluggable=yes + type='host-arm-cpu' + topology: socket='1' cluster_id='0' core='1' thread='0' vcpus='1' +[vcpu libvirt-id='11'] + online=no + hotpluggable=yes + type='host-arm-cpu' + topology: socket='1' cluster_id='0' core='1' thread='1' vcpus='1' +[vcpu libvirt-id='12'] + online=no + hotpluggable=yes + type='host-arm-cpu' + topology: socket='1' cluster_id='1' core='0' thread='0' vcpus='1' +[vcpu libvirt-id='13'] + online=no + hotpluggable=yes + type='host-arm-cpu' + topology: socket='1' cluster_id='1' core='0' thread='1' vcpus='1' +[vcpu libvirt-id='14'] + online=no + hotpluggable=yes + type='host-arm-cpu' + topology: socket='1' cluster_id='1' core='1' thread='0' vcpus='1' +[vcpu libvirt-id='15'] + online=no + hotpluggable=yes + type='host-arm-cpu' + topology: socket='1' cluster_id='1' core='1' thread='1' vcpus='1' diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index d9ebb429e71f5db5f4b8e03e03f448bb77a1f93c..45cee237981973379361e1d6b6f49a03fe1da3a0 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2262,13 +2262,16 @@ testQemuMonitorCPUInfoFormat(qemuMonitorCPUInfo *vcpus, if (vcpu->qom_path) virBufferAsprintf(&buf, "qom_path='%s'\n", vcpu->qom_path); - if (vcpu->socket_id != -1 || vcpu->core_id != -1 || + if (vcpu->socket_id != -1 || vcpu->die_id != -1 || + vcpu->cluster_id != -1 || vcpu->core_id != -1 || vcpu->thread_id != -1 || vcpu->vcpus != 0) { virBufferAddLit(&buf, "topology:"); if (vcpu->socket_id != -1) virBufferAsprintf(&buf, " socket='%d'", vcpu->socket_id); if (vcpu->die_id != -1) virBufferAsprintf(&buf, " die='%d'", vcpu->die_id); + if (vcpu->cluster_id != -1) + virBufferAsprintf(&buf, " cluster_id='%d'", vcpu->cluster_id); if (vcpu->core_id != -1) virBufferAsprintf(&buf, " core='%d'", vcpu->core_id); if (vcpu->thread_id != -1) @@ -2919,6 +2922,10 @@ mymain(void) DO_TEST_CPU_INFO("ppc64-hotplug-4", 24); DO_TEST_CPU_INFO("ppc64-no-threads", 16); + /* aarch64 doesn't support CPU hotplug yet, so the data used in + * this test is partially synthetic */ + DO_TEST_CPU_INFO("aarch64-clusters", 16); + DO_TEST_CPU_INFO("s390", 2); diff --git a/tests/qemuxml2argvdata/cpu-hotplug-startup.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-hotplug-startup.x86_64-latest.args index 009c08d71afc53da7d48a58040c7bd1edc4de79d..af1b464104c07726e21d5c98e6dfa626144eaf46 100644 --- a/tests/qemuxml2argvdata/cpu-hotplug-startup.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-hotplug-startup.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ --smp 1,maxcpus=6,sockets=3,dies=1,cores=2,threads=1 \ +-smp 1,maxcpus=6,sockets=3,dies=1,clusters=1,cores=2,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args index 3b12934425b7e100843eb2696727877b6be6b16f..22fca082a8a57b390b4385eb746acc715d6e23fe 100644 --- a/tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,dies=1,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ -numa node,nodeid=0,cpus=0-3,cpus=8-11,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args new file mode 100644 index 0000000000000000000000000000000000000000..bc4a6ad5f373f1db1dde7c5819cce6ff379117d7 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args @@ -0,0 +1,38 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,acpi=off \ +-accel tcg \ +-cpu qemu64 \ +-m size=328704k \ +-overcommit mem-lock=off \ +-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ +-numa node,nodeid=0,cpus=0-5,memdev=ram-node0 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ +-numa node,nodeid=1,cpus=11-15,memdev=ram-node1 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":112197632}' \ +-numa node,nodeid=2,cpus=6-10,memdev=ram-node2 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args index 0c9ec88b8bdc4f46f9f5ea0366147903e1b70a09..1e486b1bbc89b58ca75f59929ff9646bbe42c659 100644 --- a/tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,dies=1,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0","share":true,"size":112197632}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node1","share":false,"size":112197632}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.args index 31a61f023eb9a5a83e0a718ecd5fa6e717ef8b12..59372c4ab9e186cb4729dd3d8cd329ad33cc15ec 100644 --- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,dies=1,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args index 31a61f023eb9a5a83e0a718ecd5fa6e717ef8b12..59372c4ab9e186cb4729dd3d8cd329ad33cc15ec 100644 --- a/tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,dies=1,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ diff --git a/tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args index 31a61f023eb9a5a83e0a718ecd5fa6e717ef8b12..59372c4ab9e186cb4729dd3d8cd329ad33cc15ec 100644 --- a/tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,dies=1,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ diff --git a/tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args index 009c08d71afc53da7d48a58040c7bd1edc4de79d..af1b464104c07726e21d5c98e6dfa626144eaf46 100644 --- a/tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ --smp 1,maxcpus=6,sockets=3,dies=1,cores=2,threads=1 \ +-smp 1,maxcpus=6,sockets=3,dies=1,clusters=1,cores=2,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args index 7ba175fa80184104aa32204dc9a3be013f441f81..8560eb612694941585027ffa42713b8ec8237698 100644 --- a/tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ --smp 6,sockets=1,dies=1,cores=2,threads=3 \ +-smp 6,sockets=1,dies=1,clusters=1,cores=2,threads=3 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args index c11b4cd307f1069edff1d068bc39f134b81ff641..3878c558b846eb7223bff68c687e866bbd3f538e 100644 --- a/tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ --smp 6,sockets=3,dies=1,cores=2,threads=1 \ +-smp 6,sockets=3,dies=1,clusters=1,cores=2,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args index d0e31ba2b583aa7da46ab96064b421572af6514f..8720038c0d6ed4c248a26eda477ae0ce363bc955 100644 --- a/tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ --smp 1,maxcpus=6,sockets=1,dies=3,cores=2,threads=1 \ +-smp 1,maxcpus=6,sockets=1,dies=3,clusters=1,cores=2,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args index 58b3c7b544f5ddabc4b516022eb5d7c883cde64a..1bd75a85a6940d804ff4af161173bb6afbc3af3b 100644 --- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \ -m size=14680064k \ -object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/pc.ram","share":true,"x-use-canonical-path-for-ramblock-id":false,"prealloc":true,"size":15032385536}' \ -overcommit mem-lock=off \ --smp 8,sockets=8,dies=1,cores=1,threads=1 \ +-smp 8,sockets=8,dies=1,clusters=1,cores=1,threads=1 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml index 2090bb82885a30ad08e7f9f7553875c04a8141de..92f418fb8802ae035846371fd951257aa65d5ebd 100644 --- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml +++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml @@ -15,7 +15,7 @@ qemu64 - + destroy diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args b/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args index 21f9a165407349254001b5229aa8c4667a418f8d..17ef5064311c806677645b4b740b67e7743ac622 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \ -cpu qemu64 \ -m size=14680064k \ -overcommit mem-lock=off \ --smp 8,sockets=1,dies=1,cores=8,threads=1 \ +-smp 8,sockets=1,dies=1,clusters=1,cores=8,threads=1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0","share":true,"prealloc":true,"size":15032385536}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml index 2f94690656ea7b72354768d3ea42c63f983be953..543509d832ca497de6c9ebf09d65a11080a1aed6 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml @@ -15,7 +15,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args b/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args index 3bf16f9cafb6b29123e7deaa71b723e8bca4bb5b..b247231b85ed39af1abf36370bd7fd84303b82a3 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \ -cpu qemu64 \ -m size=29360128k \ -overcommit mem-lock=off \ --smp 20,sockets=1,dies=1,cores=20,threads=1 \ +-smp 20,sockets=1,dies=1,clusters=1,cores=20,threads=1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0","share":false,"prealloc":true,"size":15032385536}' \ -numa node,nodeid=0,cpus=0-7,cpus=16-19,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1","share":true,"prealloc":true,"size":15032385536}' \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml index 3a4e9b478ef3eb8cd3a98570fe1dd7a185aadc28..d3b98da3c6ddc118342bd958d9c37a62f222ce24 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml @@ -15,7 +15,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args b/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args index 3153e22d561b7350b1079c28e17284b7387c2064..9e94209499f6f3c37cde7ab75073e7c7aeeb101a 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \ -cpu qemu64 \ -m size=44040192k \ -overcommit mem-lock=off \ --smp 32,sockets=1,dies=1,cores=32,threads=1 \ +-smp 32,sockets=1,dies=1,clusters=1,cores=32,threads=1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0","share":true,"prealloc":true,"size":15032385536}' \ -numa node,nodeid=0,cpus=0-1,cpus=6-31,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1","share":true,"prealloc":true,"size":15032385536}' \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml index 0f7f74283b7b63f7fcfe1a2e20019cdd6effe9d1..459d1b9d1d89cc0b3f0432d149f37a63374ec9be 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml @@ -15,7 +15,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args index fa376accb5ba49fe45c8a2e982c2ff84424ca78b..f30db0ad099f9648aadf081bd3af301064092fa6 100644 --- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=1048576k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"size":1073741824}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.xml b/tests/qemuxml2argvdata/hugepages-nvdimm.xml index 1a1500895bcec8610b5bf036132253def54010ef..b786b0d3ddb9ae5a27f3cbb6ccfe98a44402bbc4 100644 --- a/tests/qemuxml2argvdata/hugepages-nvdimm.xml +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.xml @@ -17,7 +17,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args index 55969eb2fd3a0d139f712ae07d12c52275f11b8c..f850d7be607709c22755fbf0a197eabb8ea93b1a 100644 --- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \ -cpu qemu64 \ -m size=14680064k \ -overcommit mem-lock=off \ --smp 8,sockets=1,dies=1,cores=8,threads=1 \ +-smp 8,sockets=1,dies=1,clusters=1,cores=8,threads=1 \ -object '{"qom-type":"thread-context","id":"tc-ram-node0","node-affinity":[3]}' \ -object '{"qom-type":"memory-backend-memfd","id":"ram-node0","hugetlb":true,"hugetlbsize":2097152,"share":true,"prealloc":true,"size":15032385536,"host-nodes":[3],"policy":"preferred","prealloc-context":"tc-ram-node0"}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml index 238d4c6b529795a133ee1a939bd4fa163069e2f9..a70bd53134932d14557d4c5fad222fbf93acf030 100644 --- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml +++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml @@ -19,7 +19,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args index 1ef2d69fcb06518510e2627a1852c03a2d3a85c8..dbe2b82a56dabd5bcd50e15457786e537149c30b 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \ -cpu qemu64 \ -m size=14680064k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 8,sockets=1,dies=1,cores=8,threads=1 \ +-smp 8,sockets=1,dies=1,clusters=1,cores=8,threads=1 \ -object '{"qom-type":"thread-context","id":"tc-ram-node0","node-affinity":[3]}' \ -object '{"qom-type":"memory-backend-memfd","id":"ram-node0","hugetlb":true,"hugetlbsize":2097152,"share":true,"prealloc":true,"prealloc-threads":8,"size":15032385536,"host-nodes":[3],"policy":"preferred","prealloc-context":"tc-ram-node0"}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.xml b/tests/qemuxml2argvdata/memfd-memory-numa.xml index 1ac87e3aef4c84d8a2038365dae5ec64ac18dabb..0c5d7ba4ef6a005783a57a77a22e68fde0206f18 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.xml +++ b/tests/qemuxml2argvdata/memfd-memory-numa.xml @@ -22,7 +22,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args index 6ae1fd1b989c4c047057449c808cd96e1ae6edeb..c15fe191de219121964809aadd052ec297122469 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args index 71817da309f9a590033a5e25a5ad9c76db00cd29..a729930db2a85e0125f4038de256252c6c94f36a 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args index ad1dad01acaf6b315fe3171d358b30d5f7a16887..f1f2f93a11281304be60668c0e3dbbc9682578e8 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=2095104k,slots=2,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args index f09ae2292792943d6f4065ad4fdad42da16ae456..d53732b39ea20efab8d1f95cfa86de732687f55f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml index bee0346acad2497e6c868d467c03452761990240..84baf82bf592bc9b2ca1d3a85bdd79fa8de39660 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml @@ -15,7 +15,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args index 6cfe4b8263d4e2a4bbe640c57f658bbd1248eef2..cba467d9d3fef5000b854efa0f38e3d1c584d9b4 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml index decf87db63f7cdf1a87a7ffbf48b4545bdd154e0..664418e80507320551593c72124a1d91328e2424 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml @@ -15,7 +15,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args index 4041c15b2be9ccdcbac98ce52b78615f06a2cf82..2ad23a02249fc9c50321a5bdad2e759b0a4d0aaf 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml index 8a0dab390840365bc1da41f855fe6435a9e3599a..f998f7f276d36ae86b1ef549b407dc6695078f52 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml @@ -15,7 +15,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args index 3547e96c0091b85b09663bd6fa1229374ca22634..ac5ca187b10a98e00f33b7164d76958cb4445446 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml index a712adfe1e2b16809d3ed705695df1b407c58aff..d66481fd35fefbc33e19cee887bd6b2750bc034c 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml @@ -15,7 +15,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args index 9b57518fca9573071f787aa1b587a27b059e32cb..c2c1623d9f52a77b1aa8181ce34e62e22c77f681 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu POWER9 \ -m size=1048576k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":1073741824}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args index 9b57518fca9573071f787aa1b587a27b059e32cb..c2c1623d9f52a77b1aa8181ce34e62e22c77f681 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu POWER9 \ -m size=1048576k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":1073741824}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args index 17bacfb2f6706366af4baf54de2cd48b44ca26f6..8af4673841ed569518ff5e6cf166c86c960a3750 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml index 57629ccb8cf449819056c2a1d4abfcc6795d27b8..56d6b7b71231c17e5cf6069ed6a2fe37ede4276d 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml @@ -15,7 +15,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args index 1321e5556e54a3548c18155d2342dcd1cb65b558..6531caa908620919e953c66a5493a7eff4879002 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=1048576k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":1073741824}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml index 865ddcf0ea2852adea8b0d142bd5c4753fe3a1ee..ff6e3b7b0ffb9632718c071c863a7ba93dce066f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml @@ -15,7 +15,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args index 607ce9b0e884827f6af668f080f95c31d8db4689..dbe96ae21d795269036beb42cac618a046118ee5 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=2095104k,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml index c578209d8a1cf1d5f1db19b9b5c459eacf6be627..52fa6b14e9173edb1c14b36e6d392a8a05533cd4 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml @@ -11,7 +11,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args index 9bbde420a965a4f572b7121cd5e77d6bad712d3e..df7b7f80a9eec20fc5f127fab0ddede99011b5d7 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=2095104k,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml index a8b22dd3c5eb53aa6f157f3339c17d042eaf2a8c..2786a739add78dcc37fcd6d76f86c0066c77c45f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml @@ -11,7 +11,7 @@ qemu64 - + diff --git a/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args index 53f0fbc68fb884d644e8219a2fa896dd0613dc67..d04d9d73e9b543cc1d12df6448e06bd96ee83a91 100644 --- a/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu qemu64 \ -m size=219136k,slots=16,maxmem=1099511627776k \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args index d4238f3d9e23b3c08fa6501da4958380d016112d..138c8255f79c522ab8c6a410bdb8dc83fda9ab6a 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args index d4238f3d9e23b3c08fa6501da4958380d016112d..138c8255f79c522ab8c6a410bdb8dc83fda9ab6a 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.x86_64-latest.args b/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.x86_64-latest.args new file mode 100644 index 0000000000000000000000000000000000000000..f13f04c9d461d15b8b7b8c627f02fd1f8119aa5d --- /dev/null +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.x86_64-latest.args @@ -0,0 +1,36 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-accel tcg \ +-cpu qemu64 \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"bind"}' \ +-overcommit mem-lock=off \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args index 9ddfb286b5f3463398476fd91b6dd7bb035d741f..f1c49619db666dce730d401299b1a9075227c714 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0],"policy":"interleave"}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args index d4238f3d9e23b3c08fa6501da4958380d016112d..138c8255f79c522ab8c6a410bdb8dc83fda9ab6a 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.x86_64-latest.args b/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.x86_64-latest.args new file mode 100644 index 0000000000000000000000000000000000000000..76ca5c4bea6401d827d58e7f317fb4ade93a0319 --- /dev/null +++ b/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.x86_64-latest.args @@ -0,0 +1,36 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-accel tcg \ +-cpu qemu64 \ +-m size=219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=off \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/numad.x86_64-latest.args b/tests/qemuxml2argvdata/numad.x86_64-latest.args index d4238f3d9e23b3c08fa6501da4958380d016112d..138c8255f79c522ab8c6a410bdb8dc83fda9ab6a 100644 --- a/tests/qemuxml2argvdata/numad.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numad.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"interleave"}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args index 57a2b893f15661fc8fc5a0fa3786825377036efe..e35471d91b23698bbde0bba88f99b745381f9ba7 100644 --- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -m size=219136k \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"preferred"}' \ -overcommit mem-lock=off \ --smp 2,sockets=2,dies=1,cores=1,threads=1 \ +-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ diff --git a/tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args b/tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args index bf553a8e32b50fad0b97635e7cc4dd1c2a38800d..d3960731be1a9b3ceca2af6ef242ced10e297847 100644 --- a/tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-expander-test/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,dies=1,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args b/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args index 3fb86c29c2fb7de1d54c2771ce5e4c9981c62baf..b179fadc27d61842caa9db1ea59d72388a85dd07 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/.config \ -cpu qemu64 \ -m size=219136k \ -overcommit mem-lock=off \ --smp 16,sockets=2,dies=1,cores=4,threads=2 \ +-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \ diff --git a/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args b/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args index 7ffcb1d8c598b82944e53448f4928bcd43344e10..942540a296c0280dc46269d1d9634ff58a7abcfd 100644 --- a/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args @@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -cpu POWER9 \ -m size=2097152k \ -overcommit mem-lock=off \ --smp 8,sockets=2,dies=1,cores=1,threads=4 \ +-smp 8,sockets=2,dies=1,clusters=1,cores=1,threads=4 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":1073741824,"host-nodes":[1],"policy":"bind"}' \ -numa node,nodeid=0,cpus=0-3,memdev=ram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":1073741824,"host-nodes":[2],"policy":"bind"}' \ diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml index fa2ec31463fd77000e8d4a50cc86f42d119e4f3c..4f33094949377295cb7986d92497ad6f0a9579c8 100644 --- a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml @@ -10,7 +10,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml index 1b4d0bfa6793c35e24abb8cbf31224135b191a69..75dcb8c9e289a9df52ec1bb203cc13ee72f3ac0c 100644 --- a/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml @@ -10,7 +10,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml index 47ed9efd69b8a4fddcc5c0059309f13f5a5ee15e..c45e29592133c240b6b99bac8f46fe90abacb089 100644 --- a/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml @@ -10,7 +10,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml index 57bbacdff09d4a46a3334d6ac10f6296d75f1f2d..663d137ff5f2d319fc9cfd5f8cffecad6f0f6a85 100644 --- a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml @@ -10,7 +10,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml index 57bbacdff09d4a46a3334d6ac10f6296d75f1f2d..663d137ff5f2d319fc9cfd5f8cffecad6f0f6a85 100644 --- a/tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml @@ -10,7 +10,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml index 57bbacdff09d4a46a3334d6ac10f6296d75f1f2d..663d137ff5f2d319fc9cfd5f8cffecad6f0f6a85 100644 --- a/tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml @@ -10,7 +10,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml index 0a32d5491abde6d189e9d2c96d3be6e90c56531d..38b41e67192e9921575092583d9657deaffcdf4a 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml @@ -11,7 +11,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml index 7c1b7b2c5d35ec1bf5230f7fe309c63513ab428a..7f0dc85c0e74954284f68be1168d4cf99adb8da4 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml @@ -15,7 +15,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-multiple.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-multiple.x86_64-latest.xml index 42b0f7b8801e5b6838ffa7f0d68af743791d70bd..b3306fb56977d27746da510223b111c105873561 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-multiple.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-multiple.x86_64-latest.xml @@ -11,7 +11,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml index ae157c4849055d5996db43fdfad0f55d2bffa4b8..4cc0c674df262afa7a034e910e395beab50f8367 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml @@ -11,7 +11,7 @@ POWER9 - + diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml index 3c1cbc731d8b538b40ca0f2732b634c8f03b8235..a5c26e3c5b073580a94e13d5ee271b14f3d85a00 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml @@ -11,7 +11,7 @@ POWER9 - + diff --git a/tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml index 083102e8d67f252381d312b2a19aa6f82a99414d..697819387f13216c23d1c835c32b03995af9930e 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml @@ -11,7 +11,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml index 2d04bc23c201e9df39bfdff9bd0823b243df60eb..6068a7646421bdbfdce2e32a7f9bae04ad567737 100644 --- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml @@ -13,7 +13,7 @@ qemu64 - + destroy diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml index 80f7284126a5e408ffddaca2181a645b10fd9758..6c558526e9c5135a046ecb0a73eabd3a832f59a8 100644 --- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml @@ -13,7 +13,7 @@ qemu64 - + destroy diff --git a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml index 724209f6e301da1afc30cdf36b1d8fe79ed39d44..6e1fecb488de6d3540e9412c390ee5f5f526bfbb 100644 --- a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml @@ -13,7 +13,7 @@ qemu64 - + destroy diff --git a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.xml b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.xml index 2a4ee0d49685bf58c9959bc3214b0de1bbea5ca1..c42d7066f9615ef6039b745609dd5e99dfbf68ac 100644 --- a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.xml @@ -10,7 +10,7 @@ qemu64 - + destroy diff --git a/tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml b/tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml index b63c8c145a6ae29113bfbb7ab4c6221b3818220e..2a6c329a40e79813f40d95bb73bef37b75e76e42 100644 --- a/tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml @@ -10,7 +10,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml b/tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml index a441be8ebe6ec85058bdf0694b3bf90c04bd633b..99612740b2bb6b9bbd34ae2464950476d5544c96 100644 --- a/tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml @@ -10,7 +10,7 @@ qemu64 - + diff --git a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml index 59015846fb3265193561b9939d3926d378da48fd..0a044f50b00a5cb4d8eca32a85798ecd5c2610c4 100644 --- a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml +++ b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml @@ -14,7 +14,7 @@ POWER9 - + diff --git a/tests/vircaps2xmldata/linux-basic-clusters/system/cpu b/tests/vircaps2xmldata/linux-basic-clusters/system/cpu new file mode 120000 index 0000000000000000000000000000000000000000..f7354e3525de95b9accf75f1ee0989bdc9458454 --- /dev/null +++ b/tests/vircaps2xmldata/linux-basic-clusters/system/cpu @@ -0,0 +1 @@ +../../../virhostcpudata/linux-with-clusters/cpu \ No newline at end of file diff --git a/tests/vircaps2xmldata/linux-basic-clusters/system/node b/tests/vircaps2xmldata/linux-basic-clusters/system/node new file mode 120000 index 0000000000000000000000000000000000000000..57b972ce902789fdd24b310dc5b7e08044023646 --- /dev/null +++ b/tests/vircaps2xmldata/linux-basic-clusters/system/node @@ -0,0 +1 @@ +../../../virhostcpudata/linux-with-clusters/node \ No newline at end of file diff --git a/tests/vircaps2xmldata/vircaps-aarch64-basic-clusters.xml b/tests/vircaps2xmldata/vircaps-aarch64-basic-clusters.xml new file mode 100644 index 0000000000000000000000000000000000000000..b37c8e7a20fcb9bd1540c47148da3e22ead4e5d7 --- /dev/null +++ b/tests/vircaps2xmldata/vircaps-aarch64-basic-clusters.xml @@ -0,0 +1,39 @@ + + + + + aarch64 + + + + + + + 1048576 + 2048 + 4096 + 6144 + + + + + + + + + 2097152 + 4096 + 6144 + 8192 + + + + + + + + + + + + diff --git a/tests/vircaps2xmldata/vircaps-aarch64-basic.xml b/tests/vircaps2xmldata/vircaps-aarch64-basic.xml index 0a04052c4094c0d7b882578caceb44d4ea663fba..5533ae0586c22e952c4d1d13d9d9ea9812e2c04d 100644 --- a/tests/vircaps2xmldata/vircaps-aarch64-basic.xml +++ b/tests/vircaps2xmldata/vircaps-aarch64-basic.xml @@ -16,10 +16,10 @@ 4096 6144 - - - - + + + + @@ -28,10 +28,10 @@ 6144 8192 - - - - + + + + @@ -40,10 +40,10 @@ 8192 10240 - - - - + + + + @@ -52,10 +52,10 @@ 10240 12288 - - - - + + + + diff --git a/tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml b/tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml index 8a3ca2d13c7b43fb9b0673628889961e761bb8cd..c86dc4defc58295f72cc8db652473062fcf57277 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml @@ -14,18 +14,18 @@ 4096 6144 - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/tests/vircaps2xmldata/vircaps-x86_64-basic.xml b/tests/vircaps2xmldata/vircaps-x86_64-basic.xml index 4da09f889c10fbf7b424254764921fdeffdddbba..9ae155d5714eb1c6b897da44112b7dabdeae9135 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-basic.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-basic.xml @@ -14,10 +14,10 @@ 4096 6144 - - - - + + + + @@ -26,10 +26,10 @@ 6144 8192 - - - - + + + + @@ -38,10 +38,10 @@ 8192 10240 - - - - + + + + @@ -50,10 +50,10 @@ 10240 12288 - - - - + + + + diff --git a/tests/vircaps2xmldata/vircaps-x86_64-caches.xml b/tests/vircaps2xmldata/vircaps-x86_64-caches.xml index 28f00c0a90fff4ec8df9bfd97906645a1ed25ecd..05b33147b70bbd4e64a833b912cf9ac60f6526d3 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-caches.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-caches.xml @@ -17,14 +17,14 @@ 4096 6144 - - - - - - - - + + + + + + + + diff --git a/tests/vircaps2xmldata/vircaps-x86_64-hmat.xml b/tests/vircaps2xmldata/vircaps-x86_64-hmat.xml index 6fe5751666b7532ed71f4c240054009a383450c7..2b97354bf38d32a1bd4e3ab250646393ca31230d 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-hmat.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-hmat.xml @@ -25,30 +25,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml index ee26fe94649c92658628a0413f6e5bd625364290..167b217d8e45ebdb5d69a264ffb96f6b49c4eed1 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml @@ -17,12 +17,12 @@ 4096 6144 - - - - - - + + + + + + @@ -31,12 +31,12 @@ 6144 8192 - - - - - - + + + + + + diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cmt.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cmt.xml index acdd97ec5802ac2570c51609f038ad7ebd78f888..311bb58e6a6ba1db72a77f3b008fd44a831ad565 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cmt.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cmt.xml @@ -17,12 +17,12 @@ 4096 6144 - - - - - - + + + + + + @@ -31,12 +31,12 @@ 6144 8192 - - - - - - + + + + + + diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml index 1327d85c9815889b9039673a29934b0e66fc6368..d85407f0b10d69b08d19addb23a400647934092d 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml @@ -17,12 +17,12 @@ 4096 6144 - - - - - - + + + + + + @@ -31,12 +31,12 @@ 6144 8192 - - - - - - + + + + + + diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml index 6769bd0591a216aa5ce756419a53090a848a280b..eb53eb2142faa2ea4118978502fe203144ec0458 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml @@ -17,7 +17,7 @@ 4096 6144 - + diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml index bc524809056915144c1da5d1b9c499d27b5ac567..38ea0bdc27dc8995d014f9683a82d778820664ae 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml @@ -17,7 +17,7 @@ 4096 6144 - + diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml index b638bbd1c96d074318dff0d900648ad96ac5f904..fd854ee91e018b64bd6e24202d812d238da27c23 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml @@ -17,12 +17,12 @@ 4096 6144 - - - - - - + + + + + + @@ -31,12 +31,12 @@ 6144 8192 - - - - - - + + + + + + diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index 26a512e87f8491e510539dea78c7452e51948d36..2fdf694640a524a4ace22343a1a4006f11b38867 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -93,6 +93,7 @@ mymain(void) DO_TEST_FULL("basic", VIR_ARCH_X86_64, false, false); DO_TEST_FULL("basic", VIR_ARCH_AARCH64, true, false); DO_TEST_FULL("basic-dies", VIR_ARCH_X86_64, false, false); + DO_TEST_FULL("basic-clusters", VIR_ARCH_AARCH64, false, false); DO_TEST_FULL("caches", VIR_ARCH_X86_64, true, true); diff --git a/tests/virhostcpudata/linux-aarch64-with-clusters.cpuinfo b/tests/virhostcpudata/linux-aarch64-with-clusters.cpuinfo new file mode 100644 index 0000000000000000000000000000000000000000..94030201d2ddae9ebf4855e403f54c0c14b079fc --- /dev/null +++ b/tests/virhostcpudata/linux-aarch64-with-clusters.cpuinfo @@ -0,0 +1,72 @@ +processor : 0 +BogoMIPS : 400.00 +Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm +CPU implementer : 0x43 +CPU architecture: 8 +CPU variant : 0x1 +CPU part : 0x0af +CPU revision : 1 + +processor : 1 +BogoMIPS : 400.00 +Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm +CPU implementer : 0x43 +CPU architecture: 8 +CPU variant : 0x1 +CPU part : 0x0af +CPU revision : 1 + +processor : 2 +BogoMIPS : 400.00 +Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm +CPU implementer : 0x43 +CPU architecture: 8 +CPU variant : 0x1 +CPU part : 0x0af +CPU revision : 1 + +processor : 3 +BogoMIPS : 400.00 +Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm +CPU implementer : 0x43 +CPU architecture: 8 +CPU variant : 0x1 +CPU part : 0x0af +CPU revision : 1 + +processor : 4 +BogoMIPS : 400.00 +Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm +CPU implementer : 0x43 +CPU architecture: 8 +CPU variant : 0x1 +CPU part : 0x0af +CPU revision : 1 + +processor : 5 +BogoMIPS : 400.00 +Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm +CPU implementer : 0x43 +CPU architecture: 8 +CPU variant : 0x1 +CPU part : 0x0af +CPU revision : 1 + +processor : 6 +BogoMIPS : 400.00 +Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm +CPU implementer : 0x43 +CPU architecture: 8 +CPU variant : 0x1 +CPU part : 0x0af +CPU revision : 1 + +processor : 7 +BogoMIPS : 400.00 +Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm +CPU implementer : 0x43 +CPU architecture: 8 +CPU variant : 0x1 +CPU part : 0x0af +CPU revision : 1 + diff --git a/tests/virhostcpudata/linux-aarch64-with-clusters.expected b/tests/virhostcpudata/linux-aarch64-with-clusters.expected new file mode 100644 index 0000000000000000000000000000000000000000..bf350bd40bcef2d1019a13d9ac374f4a1a18b0fa --- /dev/null +++ b/tests/virhostcpudata/linux-aarch64-with-clusters.expected @@ -0,0 +1 @@ +CPUs: 8/8, MHz: 0, Nodes: 2, Sockets: 1, Cores: 2, Threads: 2 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/cluster_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/cluster_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..8b0fab869c1d36fcc3c0dc686412f10644aef53a --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/cluster_cpus_list @@ -0,0 +1 @@ +0-1 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/cluster_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/cluster_id new file mode 100644 index 0000000000000000000000000000000000000000..573541ac9702dd3969c9bc859d2b91ec1f7e6e56 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/cluster_id @@ -0,0 +1 @@ +0 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..8b0fab869c1d36fcc3c0dc686412f10644aef53a --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_cpus_list @@ -0,0 +1 @@ +0-1 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_id new file mode 100644 index 0000000000000000000000000000000000000000..573541ac9702dd3969c9bc859d2b91ec1f7e6e56 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_siblings_list new file mode 100644 index 0000000000000000000000000000000000000000..40c7bb2f1a2a567414e19fd9258af21bd41a5c9b --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_siblings_list @@ -0,0 +1 @@ +0-3 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/package_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/package_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..40c7bb2f1a2a567414e19fd9258af21bd41a5c9b --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/package_cpus_list @@ -0,0 +1 @@ +0-3 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/physical_package_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/physical_package_id new file mode 100644 index 0000000000000000000000000000000000000000..7facc89938bbc5635e3d36ffa56b4c85e9b07db8 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/physical_package_id @@ -0,0 +1 @@ +36 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/thread_siblings_list new file mode 100644 index 0000000000000000000000000000000000000000..8b0fab869c1d36fcc3c0dc686412f10644aef53a --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/thread_siblings_list @@ -0,0 +1 @@ +0-1 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/cluster_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/cluster_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..8b0fab869c1d36fcc3c0dc686412f10644aef53a --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/cluster_cpus_list @@ -0,0 +1 @@ +0-1 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/cluster_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/cluster_id new file mode 100644 index 0000000000000000000000000000000000000000..573541ac9702dd3969c9bc859d2b91ec1f7e6e56 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/cluster_id @@ -0,0 +1 @@ +0 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..8b0fab869c1d36fcc3c0dc686412f10644aef53a --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_cpus_list @@ -0,0 +1 @@ +0-1 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_id new file mode 100644 index 0000000000000000000000000000000000000000..573541ac9702dd3969c9bc859d2b91ec1f7e6e56 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_siblings_list new file mode 100644 index 0000000000000000000000000000000000000000..40c7bb2f1a2a567414e19fd9258af21bd41a5c9b --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_siblings_list @@ -0,0 +1 @@ +0-3 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/package_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/package_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..40c7bb2f1a2a567414e19fd9258af21bd41a5c9b --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/package_cpus_list @@ -0,0 +1 @@ +0-3 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/physical_package_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/physical_package_id new file mode 100644 index 0000000000000000000000000000000000000000..7facc89938bbc5635e3d36ffa56b4c85e9b07db8 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/physical_package_id @@ -0,0 +1 @@ +36 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/thread_siblings_list new file mode 100644 index 0000000000000000000000000000000000000000..8b0fab869c1d36fcc3c0dc686412f10644aef53a --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/thread_siblings_list @@ -0,0 +1 @@ +0-1 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/cluster_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/cluster_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..7a9857542a651db0ddbc40bf990e057a6748548e --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/cluster_cpus_list @@ -0,0 +1 @@ +2-3 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/cluster_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/cluster_id new file mode 100644 index 0000000000000000000000000000000000000000..d00491fd7e5bb6fa28c517a0bb32b8b506539d4d --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/cluster_id @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..7a9857542a651db0ddbc40bf990e057a6748548e --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_cpus_list @@ -0,0 +1 @@ +2-3 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_id new file mode 100644 index 0000000000000000000000000000000000000000..d00491fd7e5bb6fa28c517a0bb32b8b506539d4d --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_id @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_siblings_list new file mode 100644 index 0000000000000000000000000000000000000000..40c7bb2f1a2a567414e19fd9258af21bd41a5c9b --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_siblings_list @@ -0,0 +1 @@ +0-3 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/package_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/package_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..40c7bb2f1a2a567414e19fd9258af21bd41a5c9b --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/package_cpus_list @@ -0,0 +1 @@ +0-3 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/physical_package_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/physical_package_id new file mode 100644 index 0000000000000000000000000000000000000000..7facc89938bbc5635e3d36ffa56b4c85e9b07db8 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/physical_package_id @@ -0,0 +1 @@ +36 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/thread_siblings_list new file mode 100644 index 0000000000000000000000000000000000000000..7a9857542a651db0ddbc40bf990e057a6748548e --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/thread_siblings_list @@ -0,0 +1 @@ +2-3 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/cluster_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/cluster_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..7a9857542a651db0ddbc40bf990e057a6748548e --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/cluster_cpus_list @@ -0,0 +1 @@ +2-3 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/cluster_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/cluster_id new file mode 100644 index 0000000000000000000000000000000000000000..d00491fd7e5bb6fa28c517a0bb32b8b506539d4d --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/cluster_id @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..7a9857542a651db0ddbc40bf990e057a6748548e --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_cpus_list @@ -0,0 +1 @@ +2-3 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_id new file mode 100644 index 0000000000000000000000000000000000000000..d00491fd7e5bb6fa28c517a0bb32b8b506539d4d --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_id @@ -0,0 +1 @@ +1 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_siblings_list new file mode 100644 index 0000000000000000000000000000000000000000..40c7bb2f1a2a567414e19fd9258af21bd41a5c9b --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_siblings_list @@ -0,0 +1 @@ +0-3 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/package_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/package_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..40c7bb2f1a2a567414e19fd9258af21bd41a5c9b --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/package_cpus_list @@ -0,0 +1 @@ +0-3 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/physical_package_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/physical_package_id new file mode 100644 index 0000000000000000000000000000000000000000..7facc89938bbc5635e3d36ffa56b4c85e9b07db8 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/physical_package_id @@ -0,0 +1 @@ +36 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/thread_siblings_list new file mode 100644 index 0000000000000000000000000000000000000000..7a9857542a651db0ddbc40bf990e057a6748548e --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/thread_siblings_list @@ -0,0 +1 @@ +2-3 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/cluster_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/cluster_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..e66d883ade72c011f108dcc6a07640e48d43b613 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/cluster_cpus_list @@ -0,0 +1 @@ +4-5 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/cluster_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/cluster_id new file mode 100644 index 0000000000000000000000000000000000000000..9183bf03fccab013c0805dd51f7ea97bbb86de5d --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/cluster_id @@ -0,0 +1 @@ +256 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..e66d883ade72c011f108dcc6a07640e48d43b613 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_cpus_list @@ -0,0 +1 @@ +4-5 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_id new file mode 100644 index 0000000000000000000000000000000000000000..9183bf03fccab013c0805dd51f7ea97bbb86de5d --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_id @@ -0,0 +1 @@ +256 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_siblings_list new file mode 100644 index 0000000000000000000000000000000000000000..93fccd3cc623a8fee8559a20b21b2d6d624fc560 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_siblings_list @@ -0,0 +1 @@ +4-7 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/package_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/package_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..93fccd3cc623a8fee8559a20b21b2d6d624fc560 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/package_cpus_list @@ -0,0 +1 @@ +4-7 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/physical_package_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/physical_package_id new file mode 100644 index 0000000000000000000000000000000000000000..58cecca290a3c91955f34d3e00f9a21b1bc746cc --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/physical_package_id @@ -0,0 +1 @@ +3180 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/thread_siblings_list new file mode 100644 index 0000000000000000000000000000000000000000..e66d883ade72c011f108dcc6a07640e48d43b613 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/thread_siblings_list @@ -0,0 +1 @@ +4-5 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/cluster_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/cluster_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..e66d883ade72c011f108dcc6a07640e48d43b613 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/cluster_cpus_list @@ -0,0 +1 @@ +4-5 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/cluster_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/cluster_id new file mode 100644 index 0000000000000000000000000000000000000000..9183bf03fccab013c0805dd51f7ea97bbb86de5d --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/cluster_id @@ -0,0 +1 @@ +256 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..e66d883ade72c011f108dcc6a07640e48d43b613 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_cpus_list @@ -0,0 +1 @@ +4-5 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_id new file mode 100644 index 0000000000000000000000000000000000000000..9183bf03fccab013c0805dd51f7ea97bbb86de5d --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_id @@ -0,0 +1 @@ +256 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_siblings_list new file mode 100644 index 0000000000000000000000000000000000000000..93fccd3cc623a8fee8559a20b21b2d6d624fc560 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_siblings_list @@ -0,0 +1 @@ +4-7 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/package_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/package_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..93fccd3cc623a8fee8559a20b21b2d6d624fc560 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/package_cpus_list @@ -0,0 +1 @@ +4-7 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/physical_package_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/physical_package_id new file mode 100644 index 0000000000000000000000000000000000000000..58cecca290a3c91955f34d3e00f9a21b1bc746cc --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/physical_package_id @@ -0,0 +1 @@ +3180 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/thread_siblings_list new file mode 100644 index 0000000000000000000000000000000000000000..e66d883ade72c011f108dcc6a07640e48d43b613 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/thread_siblings_list @@ -0,0 +1 @@ +4-5 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/cluster_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/cluster_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..fdd9f375177b027e90ece8f9913113173bb9357a --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/cluster_cpus_list @@ -0,0 +1 @@ +6-7 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/cluster_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/cluster_id new file mode 100644 index 0000000000000000000000000000000000000000..a700e7999761546b8bd39c1b1bb1c43f67eb1afa --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/cluster_id @@ -0,0 +1 @@ +257 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..fdd9f375177b027e90ece8f9913113173bb9357a --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_cpus_list @@ -0,0 +1 @@ +6-7 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_id new file mode 100644 index 0000000000000000000000000000000000000000..a700e7999761546b8bd39c1b1bb1c43f67eb1afa --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_id @@ -0,0 +1 @@ +257 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_siblings_list new file mode 100644 index 0000000000000000000000000000000000000000..93fccd3cc623a8fee8559a20b21b2d6d624fc560 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_siblings_list @@ -0,0 +1 @@ +4-7 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/package_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/package_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..93fccd3cc623a8fee8559a20b21b2d6d624fc560 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/package_cpus_list @@ -0,0 +1 @@ +4-7 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/physical_package_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/physical_package_id new file mode 100644 index 0000000000000000000000000000000000000000..58cecca290a3c91955f34d3e00f9a21b1bc746cc --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/physical_package_id @@ -0,0 +1 @@ +3180 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/thread_siblings_list new file mode 100644 index 0000000000000000000000000000000000000000..fdd9f375177b027e90ece8f9913113173bb9357a --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/thread_siblings_list @@ -0,0 +1 @@ +6-7 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/cluster_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/cluster_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..fdd9f375177b027e90ece8f9913113173bb9357a --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/cluster_cpus_list @@ -0,0 +1 @@ +6-7 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/cluster_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/cluster_id new file mode 100644 index 0000000000000000000000000000000000000000..a700e7999761546b8bd39c1b1bb1c43f67eb1afa --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/cluster_id @@ -0,0 +1 @@ +257 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..fdd9f375177b027e90ece8f9913113173bb9357a --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_cpus_list @@ -0,0 +1 @@ +6-7 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_id new file mode 100644 index 0000000000000000000000000000000000000000..a700e7999761546b8bd39c1b1bb1c43f67eb1afa --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_id @@ -0,0 +1 @@ +257 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_siblings_list new file mode 100644 index 0000000000000000000000000000000000000000..93fccd3cc623a8fee8559a20b21b2d6d624fc560 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_siblings_list @@ -0,0 +1 @@ +4-7 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/package_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/package_cpus_list new file mode 100644 index 0000000000000000000000000000000000000000..93fccd3cc623a8fee8559a20b21b2d6d624fc560 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/package_cpus_list @@ -0,0 +1 @@ +4-7 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/physical_package_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/physical_package_id new file mode 100644 index 0000000000000000000000000000000000000000..58cecca290a3c91955f34d3e00f9a21b1bc746cc --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/physical_package_id @@ -0,0 +1 @@ +3180 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/thread_siblings_list new file mode 100644 index 0000000000000000000000000000000000000000..fdd9f375177b027e90ece8f9913113173bb9357a --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/thread_siblings_list @@ -0,0 +1 @@ +6-7 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/online b/tests/virhostcpudata/linux-with-clusters/cpu/online new file mode 100644 index 0000000000000000000000000000000000000000..5f4593c34a37a13f42f316e95a924515638c7121 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/online @@ -0,0 +1 @@ +0-223 diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/present b/tests/virhostcpudata/linux-with-clusters/cpu/present new file mode 100644 index 0000000000000000000000000000000000000000..5f4593c34a37a13f42f316e95a924515638c7121 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/cpu/present @@ -0,0 +1 @@ +0-223 diff --git a/tests/virhostcpudata/linux-with-clusters/node/node0/cpu0 b/tests/virhostcpudata/linux-with-clusters/node/node0/cpu0 new file mode 120000 index 0000000000000000000000000000000000000000..c841bea28b2b236fb3ca1ea068a6d18354043340 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/node/node0/cpu0 @@ -0,0 +1 @@ +../../cpu/cpu0 \ No newline at end of file diff --git a/tests/virhostcpudata/linux-with-clusters/node/node0/cpu1 b/tests/virhostcpudata/linux-with-clusters/node/node0/cpu1 new file mode 120000 index 0000000000000000000000000000000000000000..5f4536279e70e84b9613c0b9007bb7c60599f059 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/node/node0/cpu1 @@ -0,0 +1 @@ +../../cpu/cpu1 \ No newline at end of file diff --git a/tests/virhostcpudata/linux-with-clusters/node/node0/cpu2 b/tests/virhostcpudata/linux-with-clusters/node/node0/cpu2 new file mode 120000 index 0000000000000000000000000000000000000000..2dcca332cecbe2516b995bd0e60303ce1a3e4146 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/node/node0/cpu2 @@ -0,0 +1 @@ +../../cpu/cpu2 \ No newline at end of file diff --git a/tests/virhostcpudata/linux-with-clusters/node/node0/cpu3 b/tests/virhostcpudata/linux-with-clusters/node/node0/cpu3 new file mode 120000 index 0000000000000000000000000000000000000000..c7690e5aa678f17a10c7a1dd968f36c568f61ee4 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/node/node0/cpu3 @@ -0,0 +1 @@ +../../cpu/cpu3 \ No newline at end of file diff --git a/tests/virhostcpudata/linux-with-clusters/node/node0/cpulist b/tests/virhostcpudata/linux-with-clusters/node/node0/cpulist new file mode 100644 index 0000000000000000000000000000000000000000..40c7bb2f1a2a567414e19fd9258af21bd41a5c9b --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/node/node0/cpulist @@ -0,0 +1 @@ +0-3 diff --git a/tests/virhostcpudata/linux-with-clusters/node/node1/cpu4 b/tests/virhostcpudata/linux-with-clusters/node/node1/cpu4 new file mode 120000 index 0000000000000000000000000000000000000000..9e77a64eb4c8b5145fa3414b2772a0acc3bca9af --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/node/node1/cpu4 @@ -0,0 +1 @@ +../../cpu/cpu4 \ No newline at end of file diff --git a/tests/virhostcpudata/linux-with-clusters/node/node1/cpu5 b/tests/virhostcpudata/linux-with-clusters/node/node1/cpu5 new file mode 120000 index 0000000000000000000000000000000000000000..cc07c3b97bfe85eb83f0fc665b3e47606d726a6c --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/node/node1/cpu5 @@ -0,0 +1 @@ +../../cpu/cpu5 \ No newline at end of file diff --git a/tests/virhostcpudata/linux-with-clusters/node/node1/cpu6 b/tests/virhostcpudata/linux-with-clusters/node/node1/cpu6 new file mode 120000 index 0000000000000000000000000000000000000000..2e7576354f936a6934c93a2d7e6b2956b7afb278 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/node/node1/cpu6 @@ -0,0 +1 @@ +../../cpu/cpu6 \ No newline at end of file diff --git a/tests/virhostcpudata/linux-with-clusters/node/node1/cpu7 b/tests/virhostcpudata/linux-with-clusters/node/node1/cpu7 new file mode 120000 index 0000000000000000000000000000000000000000..09e3f79b43d1acb9fbbd6a7625b1a83296d83c8f --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/node/node1/cpu7 @@ -0,0 +1 @@ +../../cpu/cpu7 \ No newline at end of file diff --git a/tests/virhostcpudata/linux-with-clusters/node/node1/cpulist b/tests/virhostcpudata/linux-with-clusters/node/node1/cpulist new file mode 100644 index 0000000000000000000000000000000000000000..93fccd3cc623a8fee8559a20b21b2d6d624fc560 --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/node/node1/cpulist @@ -0,0 +1 @@ +4-7 diff --git a/tests/virhostcpudata/linux-with-clusters/node/online b/tests/virhostcpudata/linux-with-clusters/node/online new file mode 100644 index 0000000000000000000000000000000000000000..8b0fab869c1d36fcc3c0dc686412f10644aef53a --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/node/online @@ -0,0 +1 @@ +0-1 diff --git a/tests/virhostcpudata/linux-with-clusters/node/possible b/tests/virhostcpudata/linux-with-clusters/node/possible new file mode 100644 index 0000000000000000000000000000000000000000..8b0fab869c1d36fcc3c0dc686412f10644aef53a --- /dev/null +++ b/tests/virhostcpudata/linux-with-clusters/node/possible @@ -0,0 +1 @@ +0-1 diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c index 09900138789467527908257b027f951d0b6c8865..cf310cb4cec4c69376036ba230deccc5d8842aaf 100644 --- a/tests/virhostcputest.c +++ b/tests/virhostcputest.c @@ -273,6 +273,7 @@ mymain(void) {"subcores3", VIR_ARCH_PPC64}, {"with-frequency", VIR_ARCH_S390X}, {"with-die", VIR_ARCH_X86_64}, + {"with-clusters", VIR_ARCH_AARCH64}, }; if (virInitialize() < 0) diff --git a/tests/vmx2xmldata/esx-in-the-wild-10.xml b/tests/vmx2xmldata/esx-in-the-wild-10.xml index 47ed637920a66cf235751755022d61d7a28b2b4c..78129682bd89536102aec4755fd1525350e27380 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-10.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-10.xml @@ -12,7 +12,7 @@ hvm - + destroy diff --git a/tests/vmx2xmldata/esx-in-the-wild-8.xml b/tests/vmx2xmldata/esx-in-the-wild-8.xml index 0eea610709514f0dbe847ab55599e67272d3b306..47d22ced2ad0b3e3c450f4e32072c8d10c6455cb 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-8.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-8.xml @@ -11,7 +11,7 @@ hvm - + destroy diff --git a/tests/vmx2xmldata/esx-in-the-wild-9.xml b/tests/vmx2xmldata/esx-in-the-wild-9.xml index 66eca400dd6eb1a1245bebf2d15f9cd83b897b25..ee6be2527fd9a00865afd7e911c99c8ab80a05f0 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-9.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-9.xml @@ -12,7 +12,7 @@ hvm - + destroy