- Devel - libvirt List Archives

[PATCH] util: extend virHostCPUGetInfo() for FreeBSD
by Roman Bogorodskiy 09 Mar '26

09 Mar '26

Extend virHostCPUGetInfo() to report more data on FreeBSD, such as: - NUMA domain count - CPU core count - CPU threads per core count Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- src/util/virhostcpu.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 113aa6881e..7cecb4b2c8 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -1014,6 +1014,22 @@ virHostCPUGetInfo(virArch hostarch G_GNUC_UNUSED, *mhz = cpu_freq / 1000000; # endif +# ifdef __FreeBSD__ +# define FILL_DATA_SYSCTL(var, sysctl, error_msg) \ + do { \ + size_t _len = sizeof(*var); \ + if (sysctlbyname(sysctl, var, &_len, NULL, 0) < 0) { \ + virReportSystemError(errno, "%s", error_msg); \ + return -1; \ + } \ + } while (0) + + FILL_DATA_SYSCTL(nodes, "vm.ndomains", _("cannot obtain NUMA domain count")); + FILL_DATA_SYSCTL(cores, "kern.smp.cores", _("cannot obtain CPU core count")); + FILL_DATA_SYSCTL(threads, "kern.smp.threads_per_core", + _("cannot obtain CPU threads per core")); +# endif /* __FreeBSD__ */ + return 0; #else /* XXX Solaris will need an impl later if they port QEMU driver */ -- 2.52.0

2 1

[PATCH 0/3] docs: bhyve documentation updates
by Roman Bogorodskiy 09 Mar '26

09 Mar '26

Roman Bogorodskiy (3): docs: bhyve: document NUMA domains configuration docs: bhyve: fix typo in version number docs: bhyve: add arm64 guest example docs/drvbhyve.rst | 64 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) -- 2.52.0

2 4

[PATCH] qemu: processShutdownCompletedEvent: Remove inactive VM object after shutdown
by Peter Krempa 09 Mar '26

09 Mar '26

From: Peter Krempa <pkrempa(a)redhat.com> When the qemu process can't be successfully killed (e.g. when it's stuck in a long system call) libvirt creates a watch and waits for the monitor socket to go away before cleaning up the domain. The cleanup code in 'processShutdownCompletedEvent' called 'qemuProcessStop' but didn't call also 'qemuDomainRemoveInactive' which would break if a transient VM would undergo the delayed cleanup as we'd still have it's VM object around. Fixes: e62c26a20dced58ea342d9cb8f5e9164dc3bb023 Closes: https://gitlab.com/libvirt/libvirt/-/work_items/853 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9e4d0f8640..7d33477636 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4079,6 +4079,7 @@ processShutdownCompletedEvent(virDomainObj *vm) if (virDomainObjIsActive(vm)) { qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_UNKNOWN, VIR_ASYNC_JOB_NONE, 0); + qemuDomainRemoveInactive(vm, 0, false); } qemuProcessEndStopJob(vm); -- 2.53.0

2 1

Re: [PATCH v2 14/21] hw/core/qdev-properties: allow qdev properties accept flags
by Daniel P. Berrangé 09 Mar '26

09 Mar '26

On Wed, Feb 11, 2026 at 03:30:06PM +0800, Zhao Liu wrote: > On Tue, Feb 10, 2026 at 09:56:08AM +0000, Daniel P. Berrangé wrote: > > Date: Tue, 10 Feb 2026 09:56:08 +0000 > > From: "Daniel P. Berrangé" <berrange(a)redhat.com> > > Subject: Re: [PATCH v2 14/21] hw/core/qdev-properties: allow qdev > > properties accept flags > > > > On Tue, Feb 10, 2026 at 11:23:41AM +0800, Zhao Liu wrote: > > > Update qdev property interfaces (qdev_property_add_static() and > > > qdev_class_add_property()) to accept and pass 'ObjectPropertyFlags'. > > > This enables marking qdev properties with flags such as DEPRECATED or > > > INTERNAL. > > > > > > To facilitate this at the definition level, extend the boolean and > > > uint8_t property macros (as the examples) to accept variable arguments > > > (VA_ARGS). This allows callers to optionally specify flags in the > > > property definition. > > > > > > Example: > > > > > > DEFINE_PROP_UINT8("version", IOAPICCommonState, version, IOAPIC_VER_DEF, > > > .flags = OBJECT_PROPERTY_DEPRECATED), > > > > In other places where we track deprecation in QEMU, we have not used > > a boolean flag. Instead we have used a "const char *deprecation_note" > > internally, which lets us provide a user facing message, to be printed > > out in the warn_report, informing them what to do instead (either the > > feature is entirely removed, or there is a better alternative). IMHO > > we should be following the same pattern for properties, as it is much > > more user friendly than just printing a totally generic message > > "XXXX is deprecated, stop using it" > > Yes, rich deprecation hint is better. I think this still depends on > USER_SET - distinguish internal/external or not :-(. > > Since when we mark a property as deprecated, its code remains in the > code tree, and internal calls should not trigger warnings. Deprecation > hints are intended to reminder external users. This depends on where you put the deprecation check. IIUC, all the user facing codepaths for setting properties end up calling through object_set_properties_from_qdict, but internal codepaths don't use that. That method can check & emit the deprecation warnings, without us needing any explicit tracking of "user set" - the use context is derived from the codepath With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

4 8

[PATCH 0/4] qemuhotplugtest: Introduce interface-hostdev test case
by Michal Privoznik 09 Mar '26

09 Mar '26

Inspired by the following patch: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/YQHQ… Michal Prívozník (4): virpcimock: Create sriov_totalvfs file and virtfnN symlinks virpcimock: Create net/ subdir for devices virnetdevmock: Mock virNetDevSaveNetConfig() and virNetDevSetNetConfig() qemuhotplugtest: Introduce interface-hostdev test case src/util/virnetdev.h | 5 +- tests/qemuhotplugtest.c | 7 +- .../qemuhotplug-interface-hostdev.xml | 6 ++ ...emuhotplug-base-live+interface-hostdev.xml | 63 +++++++++++++++ tests/virnetdevmock.c | 22 ++++++ tests/virpcimock.c | 78 +++++++++++++++++-- 6 files changed, 171 insertions(+), 10 deletions(-) create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-interface-hostdev.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+interface-hostdev.xml -- 2.52.0

2 5

[PATCH 0/6] qemu: fix a passt bug, add a passt feature
by Laine Stump 09 Mar '26

09 Mar '26

The first patch cleans up a dangling socket that was hanging around after we finished using a passt process in vhostuser mode. The rest are to support specifying the default route for a passt interface with <route gateway='x.x.x.x'/> Laine Stump (6): qemu: delete passt "repair" socket when appropriate qemu: reorganize qemuValidateDomainDeviceDefNetwork() qemu: only limit IPv4 prefix for slirp util: make the route arg to virNetDevIPRouteGetPrefix const conf/util: fix non-specification of IP route destination address qemu: support setting default route for passt interfaces inside the guest src/conf/networkcommon_conf.c | 74 ++++++++------- src/conf/schemas/networkcommon.rng | 4 +- src/qemu/qemu_passt.c | 30 ++++++- src/qemu/qemu_validate.c | 140 +++++++++++++++++++---------- src/util/virnetdevip.c | 14 ++- src/util/virnetdevip.h | 2 +- 6 files changed, 170 insertions(+), 94 deletions(-) -- 2.52.0

3 17

[PULL v2 00/27] Misc patches queue
by Daniel P. Berrangé 07 Mar '26

07 Mar '26

The following changes since commit 3fb456e9a0e9eef6a71d9b49bfff596a0f0046e9: Merge tag 'pull-request-2026-03-02' of https://gitlab.com/thuth/qemu into staging (2026-03-02 14:01:46 +0000) are available in the Git repository at: https://gitlab.com/berrange/qemu tags/next-pr-pull-request for you to fetch changes up to ca61f91ef9b0d10333881fd0070303ea33cbc72e: util/oslib-posix: increase memprealloc thread count to 32 (2026-03-05 17:40:24 +0000) ---------------------------------------------------------------- * Increase pre-alloc max thread count to 32 * Fix checkpatch warning for new/removed files with --terse * Detect more GPL boilerplate in checkpatch * Fix lean of data in TLS/websock GSource cancellation * Tweak CPU docs for DiamondRapids * Unconditionally enable thread naming * Fix race setting thread naming on Win32 * Add API docs for logging APIs * Fix interleaved error/trace output * Fix missing error prefixes with warn_report * Add detailed error reporting for VNC passworrd changes * Refactoring of error_vprintf & related funcs ---------------------------------------------------------------- Daniel P. Berrangé (25): scripts: detect another GPL license boilerplate variant io: separate freeing of tasks from marking them as complete io: fix cleanup for TLS I/O source data on cancellation io: fix cleanup for websock I/O source data on cancellation docs: simplify DiamondRapids CPU docs qemu-options: remove extraneous [] around arg values include: define constant for early constructor priority monitor: initialize global data from a constructor system: unconditionally enable thread naming util: fix race setting thread name on Win32 util: expose qemu_thread_set_name audio: make jackaudio use qemu_thread_set_name util: set the name for the 'main' thread on Windows util: add API to fetch the current thread name util: introduce some API docs for logging APIs util: avoid repeated prefix on incremental qemu_log calls util/log: add missing error reporting in qemu_log_trylock_with_err ui: add proper error reporting for password changes ui: remove redundant use of error_printf_unless_qmp() monitor: remove redundant error_[v]printf_unless_qmp monitor: refactor error_vprintf() monitor: move error_vprintf back to error-report.c util: fix interleaving of error & trace output util: don't skip error prefixes when QMP is active util: fix interleaving of error prefixes Jon Kohler (1): util/oslib-posix: increase memprealloc thread count to 32 Markus Armbruster (1): scripts/checkpatch: Fix MAINTAINERS update warning with --terse audio/jackaudio.c | 28 +++++-- docs/about/deprecated.rst | 7 ++ docs/system/cpu-models-x86.rst.inc | 16 ++-- include/io/task.h | 29 +++++-- include/monitor/monitor.h | 3 - include/qemu/compiler.h | 8 ++ include/qemu/log-for-trace.h | 17 +++- include/qemu/log.h | 39 ++++++++++ include/qemu/thread.h | 3 +- include/ui/console.h | 2 +- include/ui/qemu-spice-module.h | 3 +- io/channel-tls.c | 64 ++++++++++----- io/channel-websock.c | 46 ++++++++--- io/task.c | 8 +- meson.build | 21 +++++ monitor/monitor.c | 51 +++--------- qemu-options.hx | 112 +++++++++++++-------------- rust/util/src/log.rs | 6 ++ scripts/checkpatch.pl | 11 +-- stubs/error-printf.c | 23 ------ stubs/meson.build | 1 - stubs/monitor-core.c | 19 ++++- system/vl.c | 12 +-- tests/functional/generic/test_vnc.py | 4 +- tests/unit/test-io-task.c | 26 +++++++ tests/unit/test-util-sockets.c | 1 + ui/spice-core.c | 25 ++++-- ui/spice-module.c | 7 +- ui/ui-qmp-cmds.c | 19 ++--- ui/vnc-stubs.c | 6 +- ui/vnc.c | 16 ++-- util/error-report.c | 92 +++++++++++++++++----- util/log.c | 50 +++++++----- util/oslib-posix.c | 2 +- util/qemu-thread-posix.c | 89 +++++++++++++++------ util/qemu-thread-win32.c | 87 ++++++++++++++------- 36 files changed, 631 insertions(+), 322 deletions(-) delete mode 100644 stubs/error-printf.c -- 2.53.0

3 29

[PATCH] test: Default to ROM type for loader
by Jim Fehlig 06 Mar '26

06 Mar '26

From: Jim Fehlig <jfehlig(a)suse.com> Commit 1504b7f687 moved the corresponding logic from the generic postparse code to drivers but failed to update the test driver, which causes failures in virt-manager's test suite. Fixes: 1504b7f687bdfc679377e605d076776b18533468 Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- As an alternative to this patch, we can consider reverting 1504b7f687 (and the subsequent bhyve fix) to avoid duplicating the logic. src/test/test_driver.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 1165689de7..536e291861 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -421,6 +421,22 @@ testDomainDevicesDefPostParse(virDomainDeviceDef *dev G_GNUC_UNUSED, } +static int +testDomainDefPostParse(virDomainDef *def, + unsigned int parseFlags G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED, + void *parseOpaque G_GNUC_UNUSED) +{ + if (def->os.loader && + def->os.loader->path && + !def->os.loader->type) { + def->os.loader->type = VIR_DOMAIN_LOADER_TYPE_ROM; + } + + return 0; +} + + static void testDomainObjPrivateFree(void *data) { @@ -448,6 +464,7 @@ testDriverNew(void) VIR_DOMAIN_DEF_FEATURE_FW_AUTOSELECT | VIR_DOMAIN_DEF_FEATURE_NET_MODEL_STRING, .devicesPostParseCallback = testDomainDevicesDefPostParse, + .domainPostParseCallback = testDomainDefPostParse, .defArch = VIR_ARCH_I686, }; virDomainXMLPrivateDataCallbacks privatecb = { -- 2.51.0

2 1

[PATCH 1/2] hyperv: fix flags passed to virDomainDefParseString()
by Jonathon Jongsma 06 Mar '26

06 Mar '26

This function expects flags that are bitwise-or values of the VIR_DOMAIN_DEF_PARSE_* constants, but we were passing two flags that were not part of this flag set: - 1 < VIR_DOMAIN_VIRT_HYPERV - VIR_DOMAIN_XML_INACTIVE Replace VIR_DOMAIN_XML_INACTIVE with VIR_DOMAIN_DEF_PARSE_INACTIVE (which fortunately happens to be the exact same value). Remove flag "1 < VIR_DOMAIN_VIRT_HYPERV", which turns out to the the same value as the flag VIR_DOMAIN_DEF_PARSE_ABI_UPDATE_MIGRATION, which seems unnecessary and undesirable here. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/hyperv/hyperv_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index b01b4919fe..8832769c7b 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -2937,7 +2937,7 @@ hypervDomainDefineXML(virConnectPtr conn, const char *xml) /* parse xml */ def = virDomainDefParseString(xml, priv->xmlopt, NULL, - 1 << VIR_DOMAIN_VIRT_HYPERV | VIR_DOMAIN_XML_INACTIVE); + VIR_DOMAIN_DEF_PARSE_INACTIVE); if (!def) goto error; -- 2.53.0

2 2

[PATCH] bhyve: support NUMA configuration for domains
by Roman Bogorodskiy 06 Mar '26

06 Mar '26

Bhyve supports NUMA domains configuration using the '-n' command line argument: -n id,size,cpus[,domain_policy] Here, "id" is a numeric NUMA domain id, "size" is the total VM memory size with units format similar to the "-m" switch, "cpus" is a cpuset, and "domain_policy" is an optional domainset(9) memory allocation policy. The "domain_policy" is currently not used by the libvirt driver. This argument is repeated for every NUMA domain to be configured, e.g.: bhyve \ ... -n id=0,size=107,cpus=0-3 -n id=1,size=107,cpus=4-7 To support that: * Add a corresponding capability; it is considered supported if the bhyve binary has the '-n' command line switch. * Generate command line arguments for NUMA from <cpu><numa>..</numa></cpu> domain configuration. Additionally, validate that: * NUMA domains can be only configured with the UEFI loaders. * No more than 8 domains configured per VM as limited by bhyve. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- src/bhyve/bhyve_capabilities.c | 3 ++ src/bhyve/bhyve_capabilities.h | 1 + src/bhyve/bhyve_command.c | 26 ++++++++++++ src/bhyve/bhyve_domain.c | 19 +++++++++ .../bhyvexml2argv-numa-empty-cpuset.xml | 29 +++++++++++++ .../bhyvexml2argv-numa-too-many-domains.xml | 36 ++++++++++++++++ .../x86_64/bhyvexml2argv-numa.args | 14 +++++++ .../x86_64/bhyvexml2argv-numa.ldargs | 1 + .../x86_64/bhyvexml2argv-numa.xml | 29 +++++++++++++ tests/bhyvexml2argvtest.c | 10 ++++- .../x86_64/bhyvexml2xmlout-numa.xml | 42 +++++++++++++++++++ tests/bhyvexml2xmltest.c | 1 + 12 files changed, 210 insertions(+), 1 deletion(-) create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-numa-empty-cpuset.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-numa-too-many-domains.xml create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-numa.args create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-numa.ldargs create mode 100644 tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-numa.xml create mode 100644 tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-numa.xml diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index d2a48ed30c..c3fb88fe9f 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -258,6 +258,9 @@ bhyveProbeCapsFromHelp(unsigned int *caps, char *binary) if (strstr(help, "-A:") != NULL) *caps |= BHYVE_CAP_ACPI; + if (strstr(help, "-n:") != NULL) + *caps |= BHYVE_CAP_NUMA; + return 0; } diff --git a/src/bhyve/bhyve_capabilities.h b/src/bhyve/bhyve_capabilities.h index d5346df7ba..31fd9ab86a 100644 --- a/src/bhyve/bhyve_capabilities.h +++ b/src/bhyve/bhyve_capabilities.h @@ -56,6 +56,7 @@ typedef enum { BHYVE_CAP_VIRTIO_RND = 1 << 10, BHYVE_CAP_NVME = 1 << 11, BHYVE_CAP_ACPI = 1 << 12, + BHYVE_CAP_NUMA = 1 << 13, } virBhyveCapsFlags; int virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps); diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 37618812bc..931d7dd551 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -905,6 +905,7 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver, virDomainDef *def, unsigned nusbcontrollers = 0; unsigned nisacontrollers = 0; unsigned nvcpus = virDomainDefGetVcpus(def); + size_t ncells = virDomainNumaGetNodeCount(def->numa); /* CPUs */ virCommandAddArg(cmd, "-c"); @@ -955,6 +956,31 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver, virDomainDef *def, } } + /* NUMA */ + if (ncells) { + if (!(bhyveDriverGetBhyveCaps(driver) & BHYVE_CAP_NUMA)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Installed bhyve binary does not support NUMA configuration")); + return NULL; + } + + if (def->os.bootloader || !def->os.loader) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("NUMA configuration is only supported when booting using UEFI")); + return NULL; + } + + for (i = 0; i < ncells; i++) { + unsigned long long memSize = virDomainNumaGetNodeMemorySize(def->numa, i); + virBitmap *cpus = virDomainNumaGetNodeCpumask(def->numa, i); + g_autofree char *cpumask = virBitmapFormat(cpus); + + virCommandAddArg(cmd, "-n"); + virCommandAddArgFormat(cmd, "id=%zu,size=%llu,cpus=%s", i, VIR_DIV_UP(memSize, 1024), + cpumask); + } + } + /* Memory */ virCommandAddArg(cmd, "-m"); virCommandAddArgFormat(cmd, "%llu", diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index 85960c6e12..4594d7673f 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -411,6 +411,7 @@ bhyveDomainDefValidate(const virDomainDef *def, void *parseOpaque G_GNUC_UNUSED) { size_t i; + size_t ncells; virStorageSource *src = NULL; g_autoptr(GHashTable) nvme_controllers = g_hash_table_new(g_direct_hash, g_direct_equal); @@ -445,6 +446,24 @@ bhyveDomainDefValidate(const virDomainDef *def, return -1; } + ncells = virDomainNumaGetNodeCount(def->numa); + if (ncells) { + if (ncells > 8) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only up to 8 NUMA domains are supported")); + return -1; + } + + for (i = 0; i < ncells; i++) { + if (!virDomainNumaGetNodeCpumask(def->numa, i)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("NUMA domain id %1$zu: empty cpusets are not allowed"), + i); + return -1; + } + } + } + if (!def->os.loader) return 0; diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-numa-empty-cpuset.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-numa-empty-cpuset.xml new file mode 100644 index 0000000000..9a5fc282ba --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-numa-empty-cpuset.xml @@ -0,0 +1,29 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>8</vcpu> + <os firmware='efi'> + <type>hvm</type> + </os> + <cpu> + <numa> + <cell id='0' cpus='0-3' memory='109568' unit='KiB'/> + <cell id='1' memory='109568' unit='KiB'/> + </numa> + </cpu> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <mac address='52:54:00:b9:94:02'/> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-numa-too-many-domains.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-numa-too-many-domains.xml new file mode 100644 index 0000000000..bcabe5cd85 --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-numa-too-many-domains.xml @@ -0,0 +1,36 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>876544</memory> + <vcpu>9</vcpu> + <os firmware='efi'> + <type>hvm</type> + </os> + <cpu> + <numa> + <cell id='0' cpus='0' memory='109568' unit='KiB'/> + <cell id='1' cpus='1' memory='109568' unit='KiB'/> + <cell id='2' cpus='2' memory='109568' unit='KiB'/> + <cell id='3' cpus='3' memory='109568' unit='KiB'/> + <cell id='4' cpus='4' memory='109568' unit='KiB'/> + <cell id='5' cpus='5' memory='109568' unit='KiB'/> + <cell id='6' cpus='6' memory='109568' unit='KiB'/> + <cell id='7' cpus='7' memory='109568' unit='KiB'/> + <cell id='8' cpus='8' memory='109568' unit='KiB'/> + </numa> + </cpu> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <mac address='52:54:00:b9:94:02'/> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-numa.args b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-numa.args new file mode 100644 index 0000000000..15efd1c357 --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-numa.args @@ -0,0 +1,14 @@ +bhyve \ +-c 8 \ +-n id=0,size=107,cpus=0-3 \ +-n id=1,size=107,cpus=4-7 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-l bootrom,fakefirmwaredir/BHYVE_UEFI.fd,fakenvramdir/bhyve_VARS.fd \ +-s 1:0,lpc \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \ +bhyve diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-numa.ldargs b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-numa.ldargs new file mode 100644 index 0000000000..421376db9e --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-numa.ldargs @@ -0,0 +1 @@ +dummy diff --git a/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-numa.xml b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-numa.xml new file mode 100644 index 0000000000..8a0da7830d --- /dev/null +++ b/tests/bhyvexml2argvdata/x86_64/bhyvexml2argv-numa.xml @@ -0,0 +1,29 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>8</vcpu> + <os firmware='efi'> + <type>hvm</type> + </os> + <cpu> + <numa> + <cell id='0' cpus='0-3' memory='109568' unit='KiB'/> + <cell id='1' cpus='4-7' memory='109568' unit='KiB'/> + </numa> + </cpu> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <mac address='52:54:00:b9:94:02'/> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 2330e70bbf..b7749fec6f 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -202,7 +202,7 @@ mymain(void) BHYVE_CAP_FBUF | BHYVE_CAP_XHCI | \ BHYVE_CAP_CPUTOPOLOGY | BHYVE_CAP_SOUND_HDA | \ BHYVE_CAP_VNC_PASSWORD | BHYVE_CAP_VIRTIO_9P | \ - BHYVE_CAP_NVME; + BHYVE_CAP_NVME | BHYVE_CAP_NUMA; DO_TEST("base"); DO_TEST("wired"); @@ -254,6 +254,11 @@ mymain(void) DO_TEST("isa-controller"); DO_TEST_FAILURE("isa-multiple-controllers"); DO_TEST("firmware-efi"); + DO_TEST("numa"); + DO_TEST_FAILURE("numa-empty-cpuset"); + DO_TEST_FAILURE("numa-too-many-domains"); + driver.bhyvecaps &= ~BHYVE_CAP_NUMA; + DO_TEST_FAILURE("numa"); fakefirmwaredir = g_steal_pointer(&driver.config->firmwareDir); driver.config->firmwareDir = g_steal_pointer(&fakefirmwareemptydir); DO_TEST_PREPARE_ERROR("firmware-efi"); @@ -345,10 +350,13 @@ mymain(void) driver.caps = virBhyveCapsBuild(); /* bhyve does not support UTC clock on ARM */ driver.bhyvecaps ^= BHYVE_CAP_RTC_UTC; + /* bhyve does not support NUMA on ARM */ + driver.bhyvecaps &= ~BHYVE_CAP_NUMA; DO_TEST("base"); DO_TEST("console"); DO_TEST("bootloader"); + DO_TEST_FAILURE("numa"); virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); diff --git a/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-numa.xml b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-numa.xml new file mode 100644 index 0000000000..ecc147db78 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/x86_64/bhyvexml2xmlout-numa.xml @@ -0,0 +1,42 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>8</vcpu> + <os firmware='efi'> + <type arch='x86_64'>hvm</type> + <boot dev='hd'/> + </os> + <cpu> + <numa> + <cell id='0' cpus='0-3' memory='109568' unit='KiB'/> + <cell id='1' cpus='4-7' memory='109568' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <controller type='isa' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> + </controller> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <interface type='bridge'> + <mac address='52:54:00:b9:94:02'/> + <source bridge='virbr0'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 7f9de2bc36..950aaea672 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -132,6 +132,7 @@ mymain(void) DO_TEST_DIFFERENT("passthru-multiple-devs"); DO_TEST_DIFFERENT("slirp"); DO_TEST_DIFFERENT("virtio-scsi"); + DO_TEST_DIFFERENT("numa"); /* Address allocation tests */ DO_TEST_DIFFERENT("addr-single-sata-disk"); -- 2.52.0

2 1