- Devel - libvirt List Archives

[PATCH] virStorageSourceClear: Unref @vhostuser
by Michal Privoznik 10 Feb '21

10 Feb '21

The @vhostuser member of virStorageSource structure is allocated during parsing in virDomainDiskSourceVHostUserParse() but never freed leading to a memleak. Since the member is an object it has to be unrefed instead of g_free()-d. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/storage_source_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/storage_source_conf.c b/src/conf/storage_source_conf.c index 7706bbd8da..67c3aedefb 100644 --- a/src/conf/storage_source_conf.c +++ b/src/conf/storage_source_conf.c @@ -1125,6 +1125,7 @@ virStorageSourceClear(virStorageSourcePtr def) virStorageEncryptionFree(def->encryption); virStoragePRDefFree(def->pr); virStorageSourceNVMeDefFree(def->nvme); + virObjectUnref(def->vhostuser); virStorageSourceSeclabelsClear(def); virStoragePermsFree(def->perms); VIR_FREE(def->timestamps); -- 2.26.2

2 1

[libvirt PATCH] tests: Only mock $INODE64 symbols on x86_64 macOS
by Andrea Bolognani 10 Feb '21

10 Feb '21

The version of macOS running on Apple Silicon doesn't need to concern itself with backwards compatibility with 32-bit applications, and so it could jettison all the symbol aliasing shenanigans involved. https://gitlab.com/libvirt/libvirt/-/issues/121 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tests/virfilewrapper.c | 2 +- tests/virmockstathelpers.c | 4 ++-- tests/virpcimock.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c index ca2356b5c9..1369cfb766 100644 --- a/tests/virfilewrapper.c +++ b/tests/virfilewrapper.c @@ -56,7 +56,7 @@ static void init_syms(void) VIR_MOCK_REAL_INIT(access); VIR_MOCK_REAL_INIT(mkdir); VIR_MOCK_REAL_INIT(open); -# ifdef __APPLE__ +# if defined(__APPLE__) && defined(__x86_64__) VIR_MOCK_REAL_INIT_ALIASED(opendir, "opendir$INODE64"); # else VIR_MOCK_REAL_INIT(opendir); diff --git a/tests/virmockstathelpers.c b/tests/virmockstathelpers.c index 830dfe1085..9344345baa 100644 --- a/tests/virmockstathelpers.c +++ b/tests/virmockstathelpers.c @@ -161,7 +161,7 @@ static void virMockStatInit(void) debug = getenv("VIR_MOCK_STAT_DEBUG"); #ifdef MOCK_STAT -# ifdef __APPLE__ +# if defined(__APPLE__) && defined(__x86_64__) VIR_MOCK_REAL_INIT_ALIASED(stat, "stat$INODE64"); # else VIR_MOCK_REAL_INIT(stat); @@ -181,7 +181,7 @@ static void virMockStatInit(void) fdebug("real __xstat64 %p\n", real___xstat64); #endif #ifdef MOCK_LSTAT -# ifdef __APPLE__ +# if defined(__APPLE__) && defined(__x86_64__) VIR_MOCK_REAL_INIT_ALIASED(lstat, "lstat$INODE64"); # else VIR_MOCK_REAL_INIT(lstat); diff --git a/tests/virpcimock.c b/tests/virpcimock.c index f6280fc8b5..d1c6220c57 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -936,7 +936,7 @@ init_syms(void) VIR_MOCK_REAL_INIT(__open_2); # endif /* ! __GLIBC__ */ VIR_MOCK_REAL_INIT(close); -# ifdef __APPLE__ +# if defined(__APPLE__) && defined(__x86_64__) VIR_MOCK_REAL_INIT_ALIASED(opendir, "opendir$INODE64"); # else VIR_MOCK_REAL_INIT(opendir); -- 2.26.2

2 1

tpm-tis device for ARM virt
by Jim Fehlig 10 Feb '21

10 Feb '21

Hi All, I received a private bug report that starting a VM with swtpm device fails with qemu-system-aarch64. The VM config has <tpm model='tpm-tis'> <backend type='emulator' version='2.0'/> </tpm> QEMU reports the following error error: internal error: process exited while connecting to monitor: 2021-02-07T05:15:35.378927Z qemu-system-aarch64: -device tpm-tis,tpmdev=tpm-tpm0,id=tpm0: 'tpm-tis' is not a valid device model name Indeed it appears the device name is 'tpm-tis-device' [1][2] for ARM virt. The similar yet different device naming between x86 and ARM is unfortunate. IIUC, the devices are the same between the architectures, i.e. they both emulate a TPM device conforming to the TIS spec. If so, adding a 'tpm-tis-device' to virDomainTPMModel seems redundant. I assume the naming difference should be handled internally, e.g. something like the below patch to qemuBuildTPMDevStr? I can send a proper patch if this is an acceptable approach. Regards, Jim [1] https://qemu.readthedocs.io/en/latest/specs/tpm.html [2] https://github.com/qemu/qemu/commit/c294ac327ca99342b90bd3a83d2cef9b447afaa7 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 92036d26c0..5154611ccd 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9198,6 +9198,9 @@ qemuBuildTPMDevStr(const virDomainDef *def, g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; const char *model = virDomainTPMModelTypeToString(tpm->model); + if (tpm->model == VIR_DOMAIN_TPM_MODEL_TIS && def->os.arch == VIR_ARCH_AARCH64) + model = "tpm-tis-device"; + virBufferAsprintf(&buf, "%s,tpmdev=tpm-%s,id=%s", model, tpm->info.alias, tpm->info.alias);

2 2

[PATCH] Rework qemuMigrationDstPrecreateDisk()
by Yi Li 10 Feb '21

10 Feb '21

'conn' vairable which are used only inside the func. Let's declare inside the func body to make that obvious. Use g_autofree to allow removal of 'cleanup:' and the 'ret' variable. Signed-off-by: Yi Li <yili(a)winhong.com> --- src/qemu/qemu_migration.c | 68 +++++++++++++++------------------------ 1 file changed, 26 insertions(+), 42 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index f44d31c971..6bb0677f86 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -169,15 +169,15 @@ qemuMigrationSrcRestoreDomainState(virQEMUDriverPtr driver, virDomainObjPtr vm) static int -qemuMigrationDstPrecreateDisk(virConnectPtr *conn, - virDomainDiskDefPtr disk, +qemuMigrationDstPrecreateDisk(virDomainDiskDefPtr disk, unsigned long long capacity) { - int ret = -1; - virStoragePoolPtr pool = NULL; - virStorageVolPtr vol = NULL; - char *volName = NULL, *basePath = NULL; - char *volStr = NULL; + g_autoptr(virConnect) conn = NULL; + g_autoptr(virStoragePool) pool = NULL; + g_autoptr(virStorageVol) vol = NULL; + char *volName = NULL; + g_autofree char *basePath = NULL; + g_autofree char *volStr = NULL; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; const char *format = NULL; unsigned int flags = 0; @@ -198,32 +198,28 @@ qemuMigrationDstPrecreateDisk(virConnectPtr *conn, virReportError(VIR_ERR_INVALID_ARG, _("malformed disk path: %s"), disk->src->path); - goto cleanup; + return -1; } *volName = '\0'; volName++; - if (!*conn) { - if (!(*conn = virGetConnectStorage())) - goto cleanup; - } + if (!(conn = virGetConnectStorage())) + return -1; - if (!(pool = virStoragePoolLookupByTargetPath(*conn, basePath))) - goto cleanup; + if (!(pool = virStoragePoolLookupByTargetPath(conn, basePath))) + return -1; format = virStorageFileFormatTypeToString(disk->src->format); if (disk->src->format == VIR_STORAGE_FILE_QCOW2) flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA; break; case VIR_STORAGE_TYPE_VOLUME: - if (!*conn) { - if (!(*conn = virGetConnectStorage())) - goto cleanup; - } + if (!(conn = virGetConnectStorage())) + return -1; - if (!(pool = virStoragePoolLookupByName(*conn, disk->src->srcpool->pool))) - goto cleanup; + if (!(pool = virStoragePoolLookupByName(conn, disk->src->srcpool->pool))) + return -1; format = virStorageFileFormatTypeToString(disk->src->format); volName = disk->src->srcpool->volume; if (disk->src->format == VIR_STORAGE_FILE_QCOW2) @@ -245,13 +241,13 @@ qemuMigrationDstPrecreateDisk(virConnectPtr *conn, _("cannot precreate storage for disk type '%s'"), virStorageTypeToString(disk->src->type)); goto cleanup; + return -1; } if ((vol = virStorageVolLookupByName(pool, volName))) { VIR_DEBUG("Skipping creation of already existing volume of name '%s'", volName); - ret = 0; - goto cleanup; + return 0; } virBufferAddLit(&buf, "<volume>\n"); @@ -269,19 +265,13 @@ qemuMigrationDstPrecreateDisk(virConnectPtr *conn, if (!(volStr = virBufferContentAndReset(&buf))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unable to create volume XML")); - goto cleanup; + return -1; } if (!(vol = virStorageVolCreateXML(pool, volStr, flags))) - goto cleanup; + return -1; - ret = 0; - cleanup: - VIR_FREE(basePath); - VIR_FREE(volStr); - virObjectUnref(vol); - virObjectUnref(pool); - return ret; + return 0; } static bool @@ -313,9 +303,7 @@ qemuMigrationDstPrecreateStorage(virDomainObjPtr vm, const char **migrate_disks, bool incremental) { - int ret = -1; size_t i = 0; - virConnectPtr conn = NULL; if (!nbd || !nbd->ndisks) return 0; @@ -332,7 +320,7 @@ qemuMigrationDstPrecreateStorage(virDomainObjPtr vm, virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to find disk by target: %s"), nbd->disks[i].target); - goto cleanup; + return -1; } if (disk->src->type == VIR_STORAGE_TYPE_NVME) { @@ -352,20 +340,16 @@ qemuMigrationDstPrecreateStorage(virDomainObjPtr vm, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("pre-creation of storage targets for incremental " "storage migration is not supported")); - goto cleanup; + return -1; } VIR_DEBUG("Proceeding with disk source %s", NULLSTR(diskSrcPath)); - if (qemuMigrationDstPrecreateDisk(&conn, - disk, nbd->disks[i].capacity) < 0) - goto cleanup; + if (qemuMigrationDstPrecreateDisk(disk, nbd->disks[i].capacity) < 0) + return -1; } - ret = 0; - cleanup: - virObjectUnref(conn); - return ret; + return 0; } -- 2.25.3

2 1

[PATCH] build: Fix generation of virtproxyd socket files
by Jim Fehlig 10 Feb '21

10 Feb '21

The various virtproxyd socket files are generated with invalid syntax, e.g. from virtproxyd.socket [Unit] Description=Libvirt proxy local socket Before=virtproxyd.service libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket Note the missing 'Conflicts=' in the last line. Fix it by prepending 'Conflicts=' to libvirtd_socket_conflicts when adding virtproxyd to virt_daemon_units. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/remote/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/meson.build b/src/remote/meson.build index 9ad2f6ab1c..0a188268b5 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -230,7 +230,7 @@ if conf.has('WITH_REMOTE') 'name': 'Libvirt proxy', 'sockprefix': 'libvirt', 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ], - 'deps': libvirtd_socket_conflicts, + 'deps': 'Conflicts=' + libvirtd_socket_conflicts, } openrc_init_files += { -- 2.29.2

2 1

generation of virtproxd socket files
by Jim Fehlig 10 Feb '21

10 Feb '21

Hi All, I received a report [1] and verified that virtproxyd*.socket files have broken syntax. E.g. from virtproxyd.socket [Unit] Description=Libvirt proxy local socket Before=virtproxyd.service libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket virtproxyd.socket should 'Conflicts' with the libvirtd sockets. I suspect this regressed in the switch to meson. I checked a libvirt 6.0.0 installation and indeed it has Conflicts=libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket I blame it on Monday and my mind stuck in the weekend, but I spent too much time trying to figure out how those socket files are generated before writing this mail. It would be much appreciated if someone can give me a nudge in the right direction :-). Regards, Jim [1] https://bugzilla.opensuse.org/show_bug.cgi?id=1181838

4 4

[PATCH 0/2] Fix two memleaks in virQEMUCapsLoadMachines()
by Michal Privoznik 10 Feb '21

10 Feb '21

*** BLURB HERE *** Michal Prívozník (2): qemu_capabilities: Don't leak @str in virQEMUCapsLoadMachines() qemu_capabilities: Parse "deprecated" in virQEMUCapsLoadMachines() properly src/qemu/qemu_capabilities.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 2.26.2

3 4

[libvirt PATCH 0/9] fix cgroups on systemd hosts
by Pavel Hrdina 10 Feb '21

10 Feb '21

When running on host with systemd there is an ownership issue of the root VM cgroup. When it is created for us by systemd using machined the owner of the root VM cgroup is systemd and we should not touch any of the files as systemd can and will modify any values configured there. Basically we had the issue since introduction of machined support in libvirt 1.1.1 back in 2013. With systemd implementing more cgroup APIs the `systemctl daemon-reload` would change more values configured by libvirt. The solution to the issue is to use systemd DBus APIs to configure cgroups but unfortunately they don't cover everything that libvirt needs. For that reason we will use systemd DBus APIs only for values that affect sibling cgroups where the resources are distributed proportionally, such as blkio.weight or cpu.shares. For the remaining resources we will keep the current code where we work with the files directly but we move everything into a child cgroup of the VM root cgroup where we are free to do whatever we like including thread configuration. Pavel Hrdina (9): virsystemd: export virSystemdHasMachined virsystemd: introduce virSystemdGetMachineByPID virsystemd: introduce virSystemdGetMachineUnitByPID vircgroup: use DBus call to systemd for some APIs vircgroupv1: refactor virCgroupV1DetectPlacement vircgroupv2: move task into cgroup before enabling controllers vircgroup: introduce virCgroupV1Exists and virCgroupV2Exists vircgroup: introduce nested cgroup to properly work with systemd tests: add cgroup nested tests docs/cgroups.html.in | 29 +- src/libvirt_private.syms | 2 + src/util/vircgroup.c | 300 ++++++++++++++---- src/util/vircgroupbackend.h | 5 + src/util/vircgrouppriv.h | 10 + src/util/vircgroupv1.c | 122 +++++-- src/util/vircgroupv2.c | 82 ++++- src/util/virsystemd.c | 105 +++++- src/util/virsystemd.h | 4 + tests/vircgroupdata/systemd-legacy.cgroups | 12 + tests/vircgroupdata/systemd-legacy.mounts | 11 + .../vircgroupdata/systemd-legacy.self.cgroup | 11 + tests/vircgroupdata/systemd-unified.cgroups | 13 + tests/vircgroupdata/systemd-unified.mounts | 1 + .../vircgroupdata/systemd-unified.self.cgroup | 1 + tests/vircgrouptest.c | 72 +++++ tests/virsystemdtest.c | 39 ++- 17 files changed, 687 insertions(+), 132 deletions(-) create mode 100644 tests/vircgroupdata/systemd-legacy.cgroups create mode 100644 tests/vircgroupdata/systemd-legacy.mounts create mode 100644 tests/vircgroupdata/systemd-legacy.self.cgroup create mode 100644 tests/vircgroupdata/systemd-unified.cgroups create mode 100644 tests/vircgroupdata/systemd-unified.mounts create mode 100644 tests/vircgroupdata/systemd-unified.self.cgroup -- 2.29.2

2 10

[PATCH 00/40] Replace various string helpers (and fixes for surrounding code)
by Peter Krempa 09 Feb '21

09 Feb '21

This series mainly focuses on removal of virStringListAdd which tries to promote the use of a string list without counter variable as a dynamic array. This means that every operation counts the number of elements and when used in a loop resutls in O(n^2) algorithms. To discourage it's future buggy use remove the helpers completely. The end of the series then replaces some libvirt helpers for string lists by the glib equivalents. Patches: 1-3,18,24-25,28: cleanups 4-6: fix buggy iteration and memory handling in qemuNamespaceUnlinkPaths 7: helpers for easy use of GSList + char * 8-17,19-20: Don't use virStringListAdd inside of loops and prepare for removal 21: Remove virStringListAdd and virStringListRemove 22-23: Open-code and remove virStringListGetFirstWithPrefix 26-27: Replace virStringListHasString by g_strv_contains 29-34: Preparation and removal of virStringListLength (mostly inefficient iteration) 35-37,40: Replace/reimplement virStringSplit(Count) by g_strsplit 38-39: Replace virStringListJoin by g_strjoinv Peter Krempa (40): qemuMonitorJSONObjectProperty: Make 'str' member const util: virmacmap: Use g_autofree for virJSONValue util: macmap: Remove unused cleanup labels and 'ret' variables qemuDomainGetPreservedMounts: Refactor to return NULL-terminated string lists qemuNamespaceUnlinkPaths: Fix wrong use of iterator variable qemuNamespaceUnlinkPaths: Fix inconsistent cleanup handling util: Add helpers for auto-freeing GSList filled with strings qemu: namespace: Don't use 'virStringListAdd' inside loops virHookCall: Don't use 'virStringListAdd' to construct list in loop qemuInteropFetchConfigs: Don't use 'virStringListAdd' to construct list virCPUDefCheckFeatures: Don't use 'virStringListAdd' to construct list x86ModelParseFeatures: Don't construct list using 'virStringListAdd' virResctrlInfoGetMonitorPrefix: Don't use 'virStringListAdd' to construct list virResctrlMonitorGetStats: Don't use 'virStringListAdd' qemu: Convert 'priv->dbusVMStateIds' to a GSList util: macmap: Convert to use GSList for storing macs instead of string lists xenParseXLNamespaceData: Pre-calculate the length of array virfirewalltest: Shuffle the code around to remove a loop virfirewalltest: Avoid use of 'virStringListAdd' qemusecuritytest: Store 'notRestored' files in a hash table util: virstring: Remove virStringListAdd and virStringListRemove virCgroupGetValueForBlkDev: Rewrite lookup of returned string virStringListGetFirstWithPrefix: Remove unused helper vz: Replace virStringSplitCount(, , , NULL) with virStringSplit qemuProcessUpdateDevices: Refactor cleanup and memory handling Replace virStringListHasString by g_strv_contains util: virstring: Remove virStringListHasString virStorageBackendSheepdogAddVolume: Clean up memory handling qemufirmwaretest: Base iteration on string lists qemuvhostusertest: Base iteration on string lists Replace virStringListLength where actual lenght is not needed virPolkitCheckAuth: Avoid virStringListLength in loop condition Replace virStringListLength by g_strv_length util: virstring: Remove virStringListLength Replace virStringSplit with g_strsplit util: virstring: Remove virStringSplit virStringSplitCount: Reimplement using g_strsplit and g_strv_length Replace virStringListJoin by g_strjoinv util: virstring: Remove virStringListJoin virstringtest: Remove testing of virStringSplitCount src/bhyve/bhyve_command.c | 2 +- src/bhyve/bhyve_parse_command.c | 4 +- src/conf/cpu_conf.c | 14 +- src/conf/storage_conf.c | 2 +- src/cpu/cpu_arm.c | 2 +- src/cpu/cpu_x86.c | 8 +- src/libvirt_private.syms | 11 +- src/libxl/libxl_conf.c | 8 +- src/libxl/xen_common.c | 8 +- src/libxl/xen_xl.c | 49 +-- src/lxc/lxc_native.c | 14 +- src/qemu/qemu_capabilities.c | 8 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_conf.c | 4 +- src/qemu/qemu_dbus.c | 19 +- src/qemu/qemu_dbus.h | 2 +- src/qemu/qemu_domain.c | 4 +- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_firmware.c | 5 +- src/qemu/qemu_interop_config.c | 13 +- src/qemu/qemu_migration.c | 10 +- src/qemu/qemu_monitor.c | 19 +- src/qemu/qemu_monitor.h | 2 +- src/qemu/qemu_monitor_json.c | 5 +- src/qemu/qemu_monitor_json.h | 4 +- src/qemu/qemu_namespace.c | 283 +++++++++--------- src/qemu/qemu_process.c | 37 +-- src/qemu/qemu_qapi.c | 2 +- src/qemu/qemu_slirp.c | 7 +- src/qemu/qemu_vhost_user.c | 4 +- src/rpc/virnetsocket.c | 4 +- src/storage/storage_backend_sheepdog.c | 15 +- src/storage/storage_backend_zfs.c | 6 +- .../storage_source_backingstore.c | 8 +- src/util/meson.build | 1 + src/util/vircgroup.c | 26 +- src/util/vircgroupv2.c | 2 +- src/util/vircommand.c | 2 +- src/util/virdevmapper.c | 2 +- src/util/virfile.c | 2 +- src/util/virfirewall.c | 2 +- src/util/virfirmware.c | 4 +- src/util/virglibutil.c | 27 ++ src/util/virglibutil.h | 28 ++ src/util/virhook.c | 15 +- src/util/virmacmap.c | 175 ++++++----- src/util/virmacmap.h | 6 +- src/util/virpolkit.c | 13 +- src/util/virprocess.c | 5 +- src/util/virresctrl.c | 17 +- src/util/virstring.c | 226 +------------- src/util/virstring.h | 24 +- src/vz/vz_sdk.c | 2 +- tests/qemufirmwaretest.c | 24 +- tests/qemumonitorjsontest.c | 6 +- tests/qemusecuritymock.c | 19 +- tests/qemusecuritytest.c | 14 +- tests/qemusecuritytest.h | 4 +- tests/qemuvhostusertest.c | 24 +- tests/qemuxml2argvtest.c | 2 +- tests/vboxsnapshotxmltest.c | 2 +- tests/virconftest.c | 4 +- tests/virfirewalltest.c | 30 +- tests/virmacmaptest.c | 21 +- tests/virstringtest.c | 211 +------------ tools/virsh-completer.c | 7 +- tools/virsh-domain.c | 14 +- tools/virsh-host.c | 4 +- tools/virt-login-shell-helper.c | 2 +- tools/vsh.c | 2 +- 71 files changed, 595 insertions(+), 965 deletions(-) create mode 100644 src/util/virglibutil.c create mode 100644 src/util/virglibutil.h -- 2.29.2

3 52

[PATCH v2 00/13] Introduce virtio-mem <memory/> model
by Michal Privoznik 09 Feb '21

09 Feb '21

v2 of: https://listman.redhat.com/archives/libvir-list/2021-January/msg00965.html diff to v1: - Rebased onto current master - Introduced new MEMORY_DEVICE_SIZE_CHANGE event - Forbade using virtio-mem among with memballoon - Wrote kbase article - Hopefully, worked in all Peter's review suggestions New patches in this series: 02, 03, 09, 13. The rest was more or less okay. Daniel ACKed it. I will amend his tag to respective commit message before pushing. Michal Prívozník (13): virhostmem: Introduce virHostMemGetTHPSize() qemu_process: Deduplicate code in qemuProcessNeedHugepagesPath() qemu_process: Drop needless check in qemuProcessNeedMemoryBackingPath() qemu_capabilities: Introduce QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI conf: Introduce virtio-mem <memory/> model qemu: Build command line for virtio-mem qemu: Wire up <memory/> live update qemu: Wire up MEMORY_DEVICE_SIZE_CHANGE event Introduce MEMORY_DEVICE_SIZE_CHANGE event qemu: Refresh the actual size of virtio-mem on monitor reconnect virsh: Introduce update-memory command news: document recent virtio memory addition kbase: Document virtio-mem NEWS.rst | 7 + docs/formatdomain.rst | 58 ++++- docs/kbase/index.rst | 4 + docs/kbase/memorydevices.rst | 160 ++++++++++++++ docs/kbase/meson.build | 1 + docs/manpages/virsh.rst | 30 +++ docs/schemas/domaincommon.rng | 16 ++ examples/c/misc/event-test.c | 17 ++ include/libvirt/libvirt-domain.h | 23 ++ src/conf/domain_conf.c | 115 +++++++++- src/conf/domain_conf.h | 15 ++ src/conf/domain_event.c | 84 +++++++ src/conf/domain_event.h | 10 + src/conf/domain_validate.c | 39 ++++ src/libvirt_private.syms | 5 + src/qemu/qemu_alias.c | 10 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 +- src/qemu/qemu_domain.c | 67 +++++- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_domain_address.c | 38 +++- src/qemu/qemu_driver.c | 209 +++++++++++++++++- src/qemu/qemu_hotplug.c | 18 ++ src/qemu/qemu_hotplug.h | 5 + src/qemu/qemu_monitor.c | 37 ++++ src/qemu/qemu_monitor.h | 27 +++ src/qemu/qemu_monitor_json.c | 95 ++++++-- src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_process.c | 101 +++++++-- src/qemu/qemu_validate.c | 22 +- src/remote/remote_daemon_dispatch.c | 30 +++ src/remote/remote_driver.c | 32 +++ src/remote/remote_protocol.x | 15 +- src/remote_protocol-structs | 7 + src/security/security_apparmor.c | 1 + src/security/security_dac.c | 2 + src/security/security_selinux.c | 2 + src/util/virhostmem.c | 63 ++++++ src/util/virhostmem.h | 3 + tests/domaincapsmock.c | 9 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + ...mory-hotplug-virtio-mem.x86_64-latest.args | 48 ++++ .../memory-hotplug-virtio-mem.xml | 64 ++++++ tests/qemuxml2argvtest.c | 1 + ...emory-hotplug-virtio-mem.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + tools/virsh-domain.c | 170 ++++++++++++++ 50 files changed, 1619 insertions(+), 68 deletions(-) create mode 100644 docs/kbase/memorydevices.rst create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml create mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-virtio-mem.x86_64-latest.xml -- 2.26.2

1 13

[PATCH 0/4] tests: qemu: Update test data after dropping old machine types
by Peter Krempa 09 Feb '21

09 Feb '21

qemu dropped pc-1.0/pc-1.1/pc-1.2 for the upcoming release, fix some tests and update the data. The two other disk test updates bump the oldest qemu machine type in the _LATEST tests to 2.9, which should be okay for some time. Peter Krempa (4): qemuxml2argvdata: disk-cdrom-network: Remove specific machine type qemuxml2argvdata: disk-cache: Remove specific machine type qemuxml2argvdata: luks-disks-source-qcow2: Remove specific machine type qemucapabilitiesdata: Update 6.0.0 x86_64 capability test data .../caps_6.0.0.x86_64.replies | 2485 +++++++++-------- .../caps_6.0.0.x86_64.xml | 10 +- .../disk-cache.x86_64-2.12.0.args | 2 +- .../disk-cache.x86_64-2.6.0.args | 2 +- .../disk-cache.x86_64-2.7.0.args | 2 +- .../disk-cache.x86_64-latest.args | 3 +- tests/qemuxml2argvdata/disk-cache.xml | 2 +- .../qemuxml2argvdata/disk-cdrom-network.args | 2 +- .../disk-cdrom-network.x86_64-2.12.0.args | 2 +- .../disk-cdrom-network.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-cdrom-network.xml | 2 +- .../luks-disks-source-qcow2.args | 2 +- ...luks-disks-source-qcow2.x86_64-latest.args | 3 +- .../luks-disks-source-qcow2.xml | 2 +- .../disk-cache.x86_64-2.12.0.xml | 2 +- .../disk-cache.x86_64-2.6.0.xml | 2 +- .../disk-cache.x86_64-2.7.0.xml | 2 +- .../disk-cache.x86_64-latest.xml | 2 +- .../luks-disks-source-qcow2.x86_64-latest.xml | 2 +- 19 files changed, 1281 insertions(+), 1250 deletions(-) -- 2.29.2

2 6

[libvirt PATCH] gitlab: Fix build container dependencies for build jobs
by Andrea Bolognani 09 Feb '21

09 Feb '21

A couple of these were wrong, resulting in the build job not waiting for the correct container to be built before starting. Fixes: 77296c807b18d22286be4b0ba5595d13103910a1 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- "How did this get past review?" O:-) Pushed as trivial. .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5221e8b5b6..5779b1b8b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -486,7 +486,7 @@ mipsel-debian-10: s390x-debian-sid: extends: .cross_build_job needs: - - s390x-debian-10-container + - s390x-debian-sid-container variables: NAME: debian-sid CROSS: s390x @@ -502,7 +502,7 @@ i686-debian-sid: ppc64le-debian-sid: extends: .cross_build_job needs: - - ppc64le-debian-10-container + - ppc64le-debian-sid-container variables: NAME: debian-sid CROSS: ppc64le -- 2.26.2

1 0

[PATCH] rpc: avoid crash when system time jump back
by BiaoxiangYe 09 Feb '21

09 Feb '21

From: BiaoXiang Ye <yebiaoxiang(a)huawei.com> Setting the system time backward would lead to a multiplication overflow in function virKeepAliveStart. FunctionvirKeepAliveTimerInternal got the same bug too. Backtrace below: #0 0x0000ffffae898470 in raise () from /usr/lib64/libc.so.6 #1 0x0000ffffae89981c in abort () from /usr/lib64/libc.so.6 #2 0x0000ffffaf9a36a8 in __mulvsi3 () from /usr/lib64/libvirt.so.0 #3 0x0000ffffaf8fd9e8 in virKeepAliveStart (ka=0xaaaaf954ce10, interval=interval@entry=0, count=count@entry=0) at ../../src/rpc/virkeepalive.c:283 #4 0x0000ffffaf908560 in virNetServerClientStartKeepAlive (client=0xaaaaf954cbe0) at ../../src/rpc/virnetserverclient.c:1628 #5 0x0000aaaac57eb6dc in remoteDispatchConnectSupportsFeature (server=0xaaaaf95309d0, msg=0xaaaaf9549d90, ret=0xffff8c007fc0, args=0xffff8c002e70, rerr=0xffff9ea054a0, client=0xaaaaf954cbe0) at ../../src/remote/remote_daemon_dispatch.c:5063 #6 remoteDispatchConnectSupportsFeatureHelper (server=0xaaaaf95309d0, client=0xaaaaf954cbe0, msg=0xaaaaf9549d90, rerr=0xffff9ea054a0, args=0xffff8c002e70, ret=0xffff8c007fc0) at ./remote/remote_daemon_dispatch_stubs.h:3503 #7 0x0000ffffaf9053a4 in virNetServerProgramDispatchCall(msg=0xaaaaf9549d90, client=0xaaaaf954cbe0, server=0x0, prog=0xaaaaf953a170) at ../../src/rpc/virnetserverprogram.c:451 #8 virNetServerProgramDispatch (prog=0xaaaaf953a170, server=0x0, server@entry=0xaaaaf95309d0, client=0xaaaaf954cbe0, msg=0xaaaaf9549d90) at ../../src/rpc/virnetserverprogram.c:306 #9 0x0000ffffaf90a6bc in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0xaaaaf95309d0) at ../../src/rpc/virnetserver.c:137 #10 virNetServerHandleJob (jobOpaque=0xaaaaf950df80, opaque=0xaaaaf95309d0) at ../../src/rpc/virnetserver.c:154 #11 0x0000ffffaf812e14 in virThreadPoolWorker (opaque=<optimized out>) at ../../src/util/virthreadpool.c:163 #12 0x0000ffffaf81237c in virThreadHelper (data=<optimized out>) at ../../src/util/virthread.c:246 #13 0x0000ffffaea327ac in ?? () from /usr/lib64/libpthread.so.0 #14 0x0000ffffae93747c in ?? () from /usr/lib64/libc.so.6 (gdb) frame 3 #3 0x0000ffffaf8fd9e8 in virKeepAliveStart (ka=0xaaaaf954ce10, interval=interval@entry=0, count=count@entry=0) at ../../src/rpc/virkeepalive.c:283 283 timeout = ka->interval - delay; (gdb) list 278 now = time(NULL); 279 delay = now - ka->lastPacketReceived; <='delay' got a negative value 280 if (delay > ka->interval) 281 timeout = 0; 282 else 283 timeout = ka->interval - delay; 284 ka->intervalStart = now - (ka->interval - timeout); 285 ka->timer = virEventAddTimeout(timeout * 1000, virKeepAliveTimer, <= multiplication overflow 286 ka, virObjectFreeCallback); 287 if (ka->timer < 0) (gdb) p now $2 = 18288001 (gdb) p ka->lastPacketReceived $3 = 1609430405 Signed-off-by: BiaoXiang Ye <yebiaoxiang(a)huawei.com> --- src/rpc/virkeepalive.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c index 860b91b6b1..e662484ea6 100644 --- a/src/rpc/virkeepalive.c +++ b/src/rpc/virkeepalive.c @@ -119,12 +119,25 @@ virKeepAliveTimerInternal(virKeepAlivePtr ka, if (ka->interval <= 0 || ka->intervalStart == 0) return false; + if (now < ka->intervalStart) { + VIR_WARN("system time jump back detected. now=%ld," + " intervalStart=%ld", + now, ka->intervalStart); + ka->intervalStart = now; + } + if (now - ka->intervalStart < ka->interval) { timeval = ka->interval - (now - ka->intervalStart); virEventUpdateTimeout(ka->timer, timeval * 1000); return false; } + if (now < ka->lastPacketReceived) { + VIR_WARN("system time jump back detected. now=%ld," + " lastPacketReceived=%ld", + now, ka->lastPacketReceived); + ka->lastPacketReceived = now; + } timeval = now - ka->lastPacketReceived; PROBE(RPC_KEEPALIVE_TIMEOUT, "ka=%p client=%p countToDeath=%d idle=%d", @@ -271,6 +284,13 @@ virKeepAliveStart(virKeepAlivePtr ka, ka, ka->client, interval, count); now = time(NULL); + if (now < ka->lastPacketReceived) { + VIR_WARN("system time jump back detected. now=%ld," + " lastPacketReceived=%ld", + now, ka->lastPacketReceived); + ka->lastPacketReceived = now; + } + delay = now - ka->lastPacketReceived; if (delay > ka->interval) timeout = 0; -- 2.23.0

3 2

[PATCH] qemu: Release <memory/> device address on failed hotplug
by Michal Privoznik 09 Feb '21

09 Feb '21

A few commits back I've introduced new 'virtio-pmem' <memory/> device. Since it's virtio it goes onto PCI bus. Therefore, on hotplug new PCI address is generated (or provided one is reserved). However, if hotplug fails (for whatever reason) the address needs to be released. This is different to 'dimm' type of address because for that type we don't keep a map of used slots rather generate one on each address assign request. The map is then thrown away. But for PCI addresses we keep internal state and thus has to keep it updated. Therefore, this new qemuDomainReleaseMemoryDeviceSlot() function is NOP for those models which use 'dimm' address type ('dimm' and 'nvdimm'). While I'm at it, let's release the address in case of hot unplug. Not that is supported (any such attempt fails with the following error: "virtio based memory devices cannot be unplugged" But if QEMU ever implements hot unplug then we don't have to remember to fix our code. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain_address.c | 23 +++++++++++++++++++++++ src/qemu/qemu_domain_address.h | 3 +++ src/qemu/qemu_hotplug.c | 6 ++++++ 3 files changed, 32 insertions(+) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 1171dc5b14..68dbf9e95b 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -3122,6 +3122,29 @@ qemuDomainAssignMemoryDeviceSlot(virQEMUDriverPtr driver, } +void +qemuDomainReleaseMemoryDeviceSlot(virDomainObjPtr vm, + virDomainMemoryDefPtr mem) +{ + switch (mem->model) { + case VIR_DOMAIN_MEMORY_MODEL_DIMM: + case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: + /* We don't need to release anything. Slot map is not + * kept around. It's constructed every time when + * assigning new slot. */ + break; + + case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: + qemuDomainReleaseDeviceAddress(vm, &mem->info); + break; + + case VIR_DOMAIN_MEMORY_MODEL_NONE: + case VIR_DOMAIN_MEMORY_MODEL_LAST: + break; + } +} + + static int qemuDomainAssignMemorySlots(virDomainDefPtr def) { diff --git a/src/qemu/qemu_domain_address.h b/src/qemu/qemu_domain_address.h index 20a46160d5..bfd56e163e 100644 --- a/src/qemu/qemu_domain_address.h +++ b/src/qemu/qemu_domain_address.h @@ -60,6 +60,9 @@ int qemuDomainAssignMemoryDeviceSlot(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainMemoryDefPtr mem); +void qemuDomainReleaseMemoryDeviceSlot(virDomainObjPtr vm, + virDomainMemoryDefPtr mem); + int qemuDomainEnsureVirtioAddress(bool *releaseAddr, virDomainObjPtr vm, virDomainDeviceDefPtr dev, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 94c3df6368..dc2b46057c 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2400,6 +2400,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, g_autofree char *devstr = NULL; g_autofree char *objalias = NULL; bool objAdded = false; + bool releaseaddr = false; bool teardownlabel = false; bool teardowncgroup = false; bool teardowndevice = false; @@ -2416,6 +2417,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, if (qemuDomainAssignMemoryDeviceSlot(driver, vm, mem) < 0) goto cleanup; + releaseaddr = true; /* in cases where we are using a VM with aliases generated according to the * index of the memory device we need to keep continue using that scheme */ @@ -2492,6 +2494,8 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, if (teardowndevice && qemuDomainNamespaceTeardownMemory(vm, mem) < 0) VIR_WARN("Unable to remove memory device from /dev"); + if (releaseaddr) + qemuDomainReleaseMemoryDeviceSlot(vm, mem); } virJSONValueFree(props); @@ -4457,6 +4461,8 @@ qemuDomainRemoveMemoryDevice(virQEMUDriverPtr driver, if (qemuProcessDestroyMemoryBackingPath(driver, vm, mem) < 0) VIR_WARN("Unable to destroy memory backing path"); + qemuDomainReleaseMemoryDeviceSlot(vm, mem); + virDomainMemoryDefFree(mem); /* fix the balloon size */ -- 2.26.2

2 1

[libvirt PATCH] conf: allow virtio driver attributes for vhostuser disk
by Pavel Hrdina 08 Feb '21

08 Feb '21

All of these options are actually supported by vhostuser disk so we should allow them to be usable. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/domain_validate.c | 20 ------------------- .../disk-vhostuser.x86_64-latest.args | 4 ++-- tests/qemuxml2argvdata/disk-vhostuser.xml | 2 +- .../disk-vhostuser.x86_64-latest.xml | 2 +- 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 222a9386f6..6b3e892332 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -322,26 +322,6 @@ virDomainDiskVhostUserValidate(const virDomainDiskDef *disk) /* Unsupported driver elements */ - if (disk->virtio) { - if (disk->virtio->iommu != VIR_TRISTATE_SWITCH_ABSENT) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("iommu is not supported with vhostuser disk")); - return -1; - } - - if (disk->virtio->ats != VIR_TRISTATE_SWITCH_ABSENT) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("ats is not supported with vhostuser disk")); - return -1; - } - - if (disk->virtio->packed != VIR_TRISTATE_SWITCH_ABSENT) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("packed is not supported with vhostuser disk")); - return -1; - } - } - if (disk->src->metadataCacheMaxSize > 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("metadata_cache is not supported with vhostuser disk")); diff --git a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args index b24b2c0b4f..30acd7c78b 100644 --- a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args @@ -33,8 +33,8 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device vhost-user-blk-pci,bus=pci.0,addr=0x2,chardev=chr-vu-virtio-disk0,\ id=virtio-disk0,bootindex=1 \ -chardev socket,id=chr-vu-virtio-disk1,path=/tmp/vhost1.sock,reconnect=10 \ --device vhost-user-blk-pci,bus=pci.0,addr=0x3,chardev=chr-vu-virtio-disk1,\ -id=virtio-disk1 \ +-device vhost-user-blk-pci,iommu_platform=on,ats=on,packed=on,bus=pci.0,\ +addr=0x3,chardev=chr-vu-virtio-disk1,id=virtio-disk1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/disk-vhostuser.xml b/tests/qemuxml2argvdata/disk-vhostuser.xml index c96ef9119c..cbe2804e39 100644 --- a/tests/qemuxml2argvdata/disk-vhostuser.xml +++ b/tests/qemuxml2argvdata/disk-vhostuser.xml @@ -20,7 +20,7 @@ <boot order='1'/> </disk> <disk type='vhostuser' device='disk'> - <driver name='qemu' type='raw'/> + <driver name='qemu' type='raw' iommu='on' ats='on' packed='on'/> <source type='unix' path='/tmp/vhost1.sock'> <reconnect enabled='yes' timeout='10'/> </source> diff --git a/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml index 9712dc0b12..87f5ec46ac 100644 --- a/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml @@ -28,7 +28,7 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </disk> <disk type='vhostuser' device='disk' snapshot='no'> - <driver name='qemu' type='raw'/> + <driver name='qemu' type='raw' iommu='on' ats='on' packed='on'/> <source type='unix' path='/tmp/vhost1.sock'> <reconnect enabled='yes' timeout='10'/> </source> -- 2.29.2

3 3

[PATCH] bhyve: auto allocate nmdm console paths
by Roman Bogorodskiy 08 Feb '21

08 Feb '21

Currently, nmdm console device requires user to specify master and slave path attributes (such as /dev/nmdm0A and /dev/nmdm0B respectively). However, making user find a non-occupied device name might be not convenient, especially for the remote connections. Update the logic to make these attributes optional. In case if not specified, use /dev/nmdm$UUID[AB], where $UUID is a domain's UUID. With this schema it's unlikely nmdm device will clash with other domains or even other non-bhyve nmdm devices. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- src/bhyve/bhyve_domain.c | 14 ++++++ src/conf/domain_validate.c | 15 +++---- ...gv-console-master-slave-not-specified.args | 11 +++++ ...-console-master-slave-not-specified.ldargs | 3 ++ ...rgv-console-master-slave-not-specified.xml | 24 ++++++++++ tests/bhyvexml2argvtest.c | 1 + ...out-console-master-slave-not-specified.xml | 44 +++++++++++++++++++ tests/bhyvexml2xmltest.c | 1 + 8 files changed, 104 insertions(+), 9 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console-master-slave-not-specified.xml diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index 1d99ba6c96..8fbc554a0a 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -170,6 +170,20 @@ bhyveDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, dev->data.video->type = VIR_DOMAIN_VIDEO_TYPE_GOP; } + if (dev->type == VIR_DOMAIN_DEVICE_CHR && + dev->data.chr->source->type == VIR_DOMAIN_CHR_TYPE_NMDM) { + virDomainChrDefPtr chr = dev->data.chr; + + if (!chr->source->data.nmdm.master) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virUUIDFormat(def->uuid, uuidstr); + + chr->source->data.nmdm.master = g_strdup_printf("/dev/nmdm%sA", uuidstr); + chr->source->data.nmdm.slave = g_strdup_printf("/dev/nmdm%sB", uuidstr); + } + } + return 0; } diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 222a9386f6..de3661fa3d 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -579,17 +579,14 @@ virDomainChrSourceDefValidate(const virDomainChrSourceDef *src_def, break; case VIR_DOMAIN_CHR_TYPE_NMDM: - if (!src_def->data.nmdm.master) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Missing master path attribute for nmdm device")); - return -1; + if ((src_def->data.nmdm.master && !src_def->data.nmdm.slave) || + (!src_def->data.nmdm.master && src_def->data.nmdm.slave)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Should define both master and slave " + "path attributes for nmdm device")); + return -1; } - if (!src_def->data.nmdm.slave) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Missing slave path attribute for nmdm device")); - return -1; - } break; case VIR_DOMAIN_CHR_TYPE_TCP: diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.args b/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.args new file mode 100644 index 0000000000..b24918e7eb --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.args @@ -0,0 +1,11 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 1:0,lpc \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:b1:42:eb \ +-l com1,/dev/nmdmdf3be7e7-a104-11e3-aeb0-50e5492bd3dcA bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs new file mode 100644 index 0000000000..32538b558e --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs @@ -0,0 +1,3 @@ +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.xml new file mode 100644 index 0000000000..6e198a49d1 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.xml @@ -0,0 +1,24 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + </os> + <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:b1:42:eb'/> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <console type='nmdm'/> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index be816e554f..197334f9c4 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -177,6 +177,7 @@ mymain(void) DO_TEST("macaddr"); DO_TEST("serial"); DO_TEST("console"); + DO_TEST("console-master-slave-not-specified"); DO_TEST("grub-defaults"); DO_TEST("grub-bootorder"); DO_TEST("grub-bootorder2"); diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console-master-slave-not-specified.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console-master-slave-not-specified.xml new file mode 100644 index 0000000000..6a2f58a947 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console-master-slave-not-specified.xml @@ -0,0 +1,44 @@ +<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'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <boot dev='hd'/> + </os> + <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:b1:42:eb'/> + <source bridge='virbr0'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <serial type='nmdm'> + <source master='/dev/nmdmdf3be7e7-a104-11e3-aeb0-50e5492bd3dcA' slave='/dev/nmdmdf3be7e7-a104-11e3-aeb0-50e5492bd3dcB'/> + <target port='0'/> + </serial> + <console type='nmdm'> + <source master='/dev/nmdmdf3be7e7-a104-11e3-aeb0-50e5492bd3dcA' slave='/dev/nmdmdf3be7e7-a104-11e3-aeb0-50e5492bd3dcB'/> + <target type='serial' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index eb9b108704..428f1b47bb 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -88,6 +88,7 @@ mymain(void) DO_TEST_DIFFERENT("bhyveload-bootorder4"); DO_TEST_DIFFERENT("bhyveload-explicitargs"); DO_TEST_DIFFERENT("console"); + DO_TEST_DIFFERENT("console-master-slave-not-specified"); DO_TEST_DIFFERENT("custom-loader"); DO_TEST_DIFFERENT("disk-cdrom"); DO_TEST_DIFFERENT("disk-cdrom-grub"); -- 2.30.0

2 1

[libvirt PATCH 0/3] cpu: Fix build on some aarch64 platforms
by Andrea Bolognani 08 Feb '21

08 Feb '21

The current code was written under the assumption that any platform that supports aarch64 will have either getauxval() or elf_aux_info(), but that's not always true. Andrea Bolognani (3): cpu: Only include <sys/auxv.h> if available cpu: Only retrieve AT_HWCAP once cpu: Fix build on some aarch64 platforms meson.build | 1 + src/cpu/cpu_arm.c | 26 ++++++++++++-------------- 2 files changed, 13 insertions(+), 14 deletions(-) -- 2.26.2

2 5

[PATCH 0/4] Remove the deprecated pc-1.x machine types and related stuff
by Thomas Huth 06 Feb '21

06 Feb '21

The pc-1.x machine types have been deprecated since QEMU v5.0 already, and nobody complained, so they can now be removed. While we're at it, also remove some compatibility switches and related code that are now not necessary anymore after these machine types have been removed. (We could maybe even remove more stuff like the various host_features switches in the virtio devices, but they still might be useful in certain cases, so I decided not to remove them yet) Thomas Huth (4): hw/i386: Remove the deprecated pc-1.x machine types hw/block/fdc: Remove the check_media_rate property hw/virtio/virtio-balloon: Remove the "class" property hw/usb/bus: Remove the "full-path" property docs/system/deprecated.rst | 6 -- docs/system/removed-features.rst | 6 ++ hw/block/fdc.c | 17 +----- hw/i386/pc_piix.c | 94 -------------------------------- hw/usb/bus.c | 7 +-- hw/virtio/virtio-balloon-pci.c | 11 +--- include/hw/usb.h | 2 +- tests/qemu-iotests/172.out | 35 ------------ 8 files changed, 11 insertions(+), 167 deletions(-) -- 2.27.0

6 13

[PATCH] bhyve: relax emulator binary value check
by Roman Bogorodskiy 05 Feb '21

05 Feb '21

Currently, requesting domain capabilities fails when the specified emulator binary does not equal to "/usr/sbin/bhyve". Relax this check to allow any path with basename "bhyve", as it's a common case when binary is specified without an absolute path. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- I'm not sure how useful is this check in general: at this point we don't use the user specified emulator value anyway, just use BHYVE constant. Probably it would be better to just drop the entire "else" block? src/bhyve/bhyve_driver.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 78c3241293..277be8dbb0 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1647,11 +1647,14 @@ bhyveConnectGetDomainCapabilities(virConnectPtr conn, if (emulatorbin == NULL) { emulatorbin = "/usr/sbin/bhyve"; - } else if (STRNEQ(emulatorbin, "/usr/sbin/bhyve")) { - virReportError(VIR_ERR_INVALID_ARG, - _("unknown emulator binary: %s"), - emulatorbin); - goto cleanup; + } else { + g_autofree char *emulatorbasename = g_path_get_basename(emulatorbin); + if (STRNEQ(emulatorbasename, "bhyve")) { + virReportError(VIR_ERR_INVALID_ARG, + _("unknown emulator binary: %s"), + emulatorbin); + goto cleanup; + } } if (!(caps = virBhyveDomainCapsBuild(conn->privateData, emulatorbin, -- 2.30.0

2 2

[PATCH] docs: Add 'known_hosts_verify' parameter for libssh(2) connection uris
by Jakob Meng 05 Feb '21

05 Feb '21

Parameter 'known_hosts_verify' is supported for some time now, but it is not yet documented. Ref.: https://gitlab.com/libvirt/libvirt/-/blob/master/src/rpc/virnetsocket.c#L941 https://gitlab.com/libvirt/libvirt/-/blob/master/src/rpc/virnetsocket.c#L10… --- docs/uri.html.in | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/uri.html.in b/docs/uri.html.in index f96c2970a5..61917e77b4 100644 --- a/docs/uri.html.in +++ b/docs/uri.html.in @@ -421,6 +421,23 @@ Note that parameter values must be <td colspan="2"/> <td> Example: <code>known_hosts=/root/.ssh/known_hosts</code> </td> </tr> + <tr> + <td> + <code>known_hosts_verify</code> + </td> + <td> libssh2, libssh </td> + <td> + If set to <code>normal</code> (default), then the user will be + asked to accept new host keys. If set to <code>auto</code>, new + host keys will be auto-accepted, but existing host keys will + still be validated. If set to <code>ignore</code>, this disables + client's strict host key checking. + </td> + </tr> + <tr> + <td colspan="2"/> + <td> Example: <code>known_hosts_verify=ignore</code> </td> + </tr> <tr> <td> <code>sshauth</code> -- 2.20.1

4 4

[PULL v2 08/16] hw/i386: Remove the deprecated pc-1.x machine types
by Michael S. Tsirkin 05 Feb '21

05 Feb '21

From: Thomas Huth <thuth(a)redhat.com> They have been deprecated since QEMU v5.0, time to remove them now. Signed-off-by: Thomas Huth <thuth(a)redhat.com> Message-Id: <20210203171832.483176-2-thuth(a)redhat.com> Reviewed-by: Michael S. Tsirkin <mst(a)redhat.com> Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com> --- hw/i386/pc_piix.c | 94 -------------------------------- docs/system/deprecated.rst | 6 -- docs/system/removed-features.rst | 6 ++ 3 files changed, 6 insertions(+), 100 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 6188c3e97e..2904b40163 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -359,18 +359,6 @@ static void pc_compat_1_4_fn(MachineState *machine) pc_compat_1_5_fn(machine); } -static void pc_compat_1_3(MachineState *machine) -{ - pc_compat_1_4_fn(machine); -} - -/* PC compat function for pc-1.0 to pc-1.2 */ -static void pc_compat_1_2(MachineState *machine) -{ - pc_compat_1_3(machine); - x86_cpu_change_kvm_default("kvm-pv-eoi", NULL); -} - static void pc_init_isa(MachineState *machine) { pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, TYPE_I440FX_PCI_DEVICE); @@ -772,88 +760,6 @@ static void pc_i440fx_1_4_machine_options(MachineClass *m) DEFINE_I440FX_MACHINE(v1_4, "pc-i440fx-1.4", pc_compat_1_4_fn, pc_i440fx_1_4_machine_options); -static void pc_i440fx_1_3_machine_options(MachineClass *m) -{ - X86MachineClass *x86mc = X86_MACHINE_CLASS(m); - static GlobalProperty compat[] = { - PC_CPU_MODEL_IDS("1.3.0") - { "usb-tablet", "usb_version", "1" }, - { "virtio-net-pci", "ctrl_mac_addr", "off" }, - { "virtio-net-pci", "mq", "off" }, - { "e1000", "autonegotiation", "off" }, - }; - - pc_i440fx_1_4_machine_options(m); - m->hw_version = "1.3.0"; - m->deprecation_reason = "use a newer machine type instead"; - x86mc->compat_apic_id_mode = true; - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); -} - -DEFINE_I440FX_MACHINE(v1_3, "pc-1.3", pc_compat_1_3, - pc_i440fx_1_3_machine_options); - - -static void pc_i440fx_1_2_machine_options(MachineClass *m) -{ - static GlobalProperty compat[] = { - PC_CPU_MODEL_IDS("1.2.0") - { "nec-usb-xhci", "msi", "off" }, - { "nec-usb-xhci", "msix", "off" }, - { "qxl", "revision", "3" }, - { "qxl-vga", "revision", "3" }, - { "VGA", "mmio", "off" }, - }; - - pc_i440fx_1_3_machine_options(m); - m->hw_version = "1.2.0"; - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); -} - -DEFINE_I440FX_MACHINE(v1_2, "pc-1.2", pc_compat_1_2, - pc_i440fx_1_2_machine_options); - - -static void pc_i440fx_1_1_machine_options(MachineClass *m) -{ - static GlobalProperty compat[] = { - PC_CPU_MODEL_IDS("1.1.0") - { "virtio-scsi-pci", "hotplug", "off" }, - { "virtio-scsi-pci", "param_change", "off" }, - { "VGA", "vgamem_mb", "8" }, - { "vmware-svga", "vgamem_mb", "8" }, - { "qxl-vga", "vgamem_mb", "8" }, - { "qxl", "vgamem_mb", "8" }, - { "virtio-blk-pci", "config-wce", "off" }, - }; - - pc_i440fx_1_2_machine_options(m); - m->hw_version = "1.1.0"; - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); -} - -DEFINE_I440FX_MACHINE(v1_1, "pc-1.1", pc_compat_1_2, - pc_i440fx_1_1_machine_options); - -static void pc_i440fx_1_0_machine_options(MachineClass *m) -{ - static GlobalProperty compat[] = { - PC_CPU_MODEL_IDS("1.0") - { TYPE_ISA_FDC, "check_media_rate", "off" }, - { "virtio-balloon-pci", "class", stringify(PCI_CLASS_MEMORY_RAM) }, - { "apic-common", "vapic", "off" }, - { TYPE_USB_DEVICE, "full-path", "no" }, - }; - - pc_i440fx_1_1_machine_options(m); - m->hw_version = "1.0"; - compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); -} - -DEFINE_I440FX_MACHINE(v1_0, "pc-1.0", pc_compat_1_2, - pc_i440fx_1_0_machine_options); - - typedef struct { uint16_t gpu_device_id; uint16_t pch_device_id; diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 6ac757ed9f..2fcac7861e 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -322,12 +322,6 @@ The 'scsi-disk' device is deprecated. Users should use 'scsi-hd' or System emulator machines ------------------------ -``pc-1.0``, ``pc-1.1``, ``pc-1.2`` and ``pc-1.3`` (since 5.0) -''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -These machine types are very old and likely can not be used for live migration -from old QEMU versions anymore. A newer machine type should be used instead. - Raspberry Pi ``raspi2`` and ``raspi3`` machines (since 5.2) ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' diff --git a/docs/system/removed-features.rst b/docs/system/removed-features.rst index 88b81a6156..c8481cafbd 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -136,6 +136,12 @@ mips ``fulong2e`` machine alias (removed in 6.0) This machine has been renamed ``fuloong2e``. +``pc-1.0``, ``pc-1.1``, ``pc-1.2`` and ``pc-1.3`` (removed in 6.0) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +These machine types were very old and likely could not be used for live +migration from old QEMU versions anymore. Use a newer machine type instead. + Related binaries ---------------- -- MST

1 0

[libvirt PATCH 0/6] APIs for reporting tainting and deprecation messages
by Daniel P. Berrangé 05 Feb '21

05 Feb '21

This is a follow up to https://listman.redhat.com/archives/libvir-list/2021-January/msg00988.html I pushed the first non-API parts of that series already. This posting takes a different approach to the APIs. Instead of separte APIs for tainting and deprecations, there is now one API for reporting general informational messages. This is explicitly only targetted at humans. Daniel P. Berrangé (6): conf: record deprecation messages against the domain qemu: record deprecation messages against the domain src: define virDomainGetMessages API remote: add RPC support for the virDomainGetMessages API qemu: implement virDomainGetMessages API tools: report messages for 'dominfo' command include/libvirt/libvirt-domain.h | 9 +++++ src/conf/domain_conf.c | 45 ++++++++++++++++++++-- src/conf/domain_conf.h | 5 +++ src/driver-hypervisor.h | 6 +++ src/libvirt-domain.c | 54 ++++++++++++++++++++++++++ src/libvirt_private.syms | 3 ++ src/libvirt_public.syms | 5 +++ src/qemu/qemu_domain.c | 5 +++ src/qemu/qemu_domain.h | 3 ++ src/qemu/qemu_driver.c | 59 +++++++++++++++++++++++++++++ src/qemu/qemu_process.c | 5 +++ src/remote/remote_daemon_dispatch.c | 45 ++++++++++++++++++++++ src/remote/remote_driver.c | 44 +++++++++++++++++++++ src/remote/remote_protocol.x | 21 +++++++++- src/remote_protocol-structs | 11 ++++++ tools/virsh-domain-monitor.c | 13 +++++++ 16 files changed, 329 insertions(+), 4 deletions(-) -- 2.29.2

2 8

[PATCH 2/3] utils: Deprecate hex-with-suffix sizes
by Eric Blake 05 Feb '21

05 Feb '21

Supporting '0x20M' looks odd, particularly since we have an 'E' suffix that is ambiguous between a hex digit and the extremely large exibyte suffix, as well as a 'B' suffix for bytes. In practice, people using hex inputs are specifying values in bytes (and would have written 0x2000000, or possibly relied on default_suffix in the case of qemu_strtosz_MiB), and the use of scaling suffixes makes the most sense for inputs in decimal (where the user would write 32M). But rather than outright dropping support for hex-with-suffix, let's follow our deprecation policy. Sadly, since qemu_strtosz() does not have an Err** parameter, we pollute to stderr. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- docs/system/deprecated.rst | 8 ++++++++ util/cutils.c | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 6ac757ed9fa7..c404c3926e6f 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -146,6 +146,14 @@ library enabled as a cryptography provider. Neither the ``nettle`` library, or the built-in cryptography provider are supported on FIPS enabled hosts. +hexadecimal sizes with scaling multipliers (since 6.0) +'''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Input parameters that take a size value should only use a size suffix +(such as 'k' or 'M') when the base is written in decimal, and not when +the value is hexadecimal. That is, '0x20M' is deprecated, and should +be written either as '32M' or as '0x2000000'. + QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/util/cutils.c b/util/cutils.c index 0234763bd70b..75190565cbb5 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -264,7 +264,7 @@ static int do_strtosz(const char *nptr, const char **end, int retval; const char *endptr; unsigned char c; - bool mul_required = false; + bool mul_required = false, hex = false; uint64_t val; int64_t mul; double fraction = 0.0; @@ -309,6 +309,10 @@ static int do_strtosz(const char *nptr, const char **end, c = *endptr; mul = suffix_mul(c, unit); if (mul > 0) { + if (hex) { + fprintf(stderr, "Using a multiplier suffix on hex numbers " + "is deprecated: %s\n", nptr); + } endptr++; } else { mul = suffix_mul(default_suffix, unit); -- 2.30.0

4 6

[libvirt PATCH v3 00/21] Add support for persistent mediated devices
by Jonathon Jongsma 05 Feb '21

05 Feb '21

This patch series follows the previously-merged series which added support for transient mediated devices. This series expands mdev support to include persistent device definitions. Again, it relies on mdevctl as the backend. It follows the common libvirt pattern of APIs by adding the following new APIs for node devices: - virNodeDeviceDefineXML() - defines a persistent device - virNodeDeviceUndefine() - undefines a persistent device - virNodeDeviceCreate() - starts a previously-defined device It also adds virsh commands mapping to these new APIs: nodedev-define, nodedev-undefine, and nodedev-start. Since we rely on mdevctl for the definition of ediated devices, we need a way to stay up-to-date with devices that are defined by mdevctl (outside of libvirt). The method for staying up-to-date is currently a little bit crude due to the fact that mdevctl does not emit any events when new devices are added or removed. As a workaround, we create a file monitor for the mdevctl config directory and re-query mdevctl when we detect changes within that directory. In the future, mdevctl may introduce a more elegant solution. changes in v3: - streamlined tests -- removed some unnecessary duplication - split out patch to factor out node device name generation function - split nodeDeviceParseMdevctlChildDevice() into a separate function - added follow-up patch to remove space-padded alignment in header - refactored the mdevctl update handling significantly: - no longer a separate persistent thread that gets signaled by a timer - now piggybacks onto the existing udev thread and signals the thread in t= he same way that the udev event does. - Daniel suggested spawning a throw-away thread to handle mdevctl updates, but that introduces the complexity of possibly serializing multiple throw-away threads (e.g. if we get an 'created' event followed immediate= ly by a 'deleted' event, two threads may be spawned and we'd need to ensure they are properly ordered) - added virNodeDeviceObjListForEach() and virNodeDeviceObjListRemoveLocked() to simplify removing devices that are removed from mdevctl. - coding style fixes - NOTE: per Erik's request, I experimented with changing the way that mdevctl commands were generated and tested (e.g. introducing something like virMdevctlGetCommand(def, MDEVCTL_COMMAND_<SUBCOMMAND>, ...)), but it was too invasive and awkward and didn't seem worthwhile Changes in v2: - rebase to latest git master Jonathon Jongsma (21): tests: remove extra trailing semicolon nodedev: introduce concept of 'active' node devices nodedev: Add ability to filter by active state nodedev: expose internal helper for naming devices nodedev: add ability to list and parse defined mdevs nodedev: add STOPPED/STARTED lifecycle events nodedev: add mdevctl devices to node device list nodedev: add helper functions to remove node devices nodedev: handle mdevs that disappear from mdevctl nodedev: rename dataReady to udevReady nodedev: Refresh mdev devices when changes are detected api: add virNodeDeviceDefineXML() virsh: Add --active, --inactive, --all to nodedev-list virsh: add nodedev-define command nodedev: refactor tests to support mdev undefine api: add virNodeDeviceUndefine() virsh: Factor out function to find node device virsh: add nodedev-undefine command api: add virNodeDeviceCreate() virsh: add "nodedev-start" command libvirt-nodedev.h: remove space-padded alignment examples/c/misc/event-test.c | 4 + include/libvirt/libvirt-nodedev.h | 98 ++-- src/access/viraccessperm.c | 2 +- src/access/viraccessperm.h | 6 + src/conf/node_device_conf.h | 9 + src/conf/virnodedeviceobj.c | 132 ++++- src/conf/virnodedeviceobj.h | 19 + src/driver-nodedev.h | 14 + src/libvirt-nodedev.c | 115 ++++ src/libvirt_private.syms | 4 + src/libvirt_public.syms | 3 + src/node_device/node_device_driver.c | 538 +++++++++++++++++- src/node_device/node_device_driver.h | 38 ++ src/node_device/node_device_udev.c | 308 ++++++++-- src/remote/remote_driver.c | 3 + src/remote/remote_protocol.x | 40 +- src/remote_protocol-structs | 16 + src/rpc/gendispatch.pl | 1 + ...19_36ea_4111_8f0a_8c9a70e21366-define.argv | 1 + ...19_36ea_4111_8f0a_8c9a70e21366-define.json | 1 + ...39_495e_4243_ad9f_beb3f14c23d9-define.argv | 1 + ...39_495e_4243_ad9f_beb3f14c23d9-define.json | 1 + ...16_1ca8_49ac_b176_871d16c13076-define.argv | 1 + ...16_1ca8_49ac_b176_871d16c13076-define.json | 1 + tests/nodedevmdevctldata/mdevctl-create.argv | 1 + .../mdevctl-list-defined.argv | 1 + .../mdevctl-list-multiple.json | 59 ++ .../mdevctl-list-multiple.out.xml | 39 ++ tests/nodedevmdevctltest.c | 222 +++++++- tools/virsh-nodedev.c | 276 +++++++-- 30 files changed, 1765 insertions(+), 189 deletions(-) create mode 100644 tests/nodedevmdevctldata/mdev_d069d019_36ea_4111_8f0a_8c9= a70e21366-define.argv create mode 100644 tests/nodedevmdevctldata/mdev_d069d019_36ea_4111_8f0a_8c9= a70e21366-define.json create mode 100644 tests/nodedevmdevctldata/mdev_d2441d39_495e_4243_ad9f_beb= 3f14c23d9-define.argv create mode 100644 tests/nodedevmdevctldata/mdev_d2441d39_495e_4243_ad9f_beb= 3f14c23d9-define.json create mode 100644 tests/nodedevmdevctldata/mdev_fedc4916_1ca8_49ac_b176_871= d16c13076-define.argv create mode 100644 tests/nodedevmdevctldata/mdev_fedc4916_1ca8_49ac_b176_871= d16c13076-define.json create mode 100644 tests/nodedevmdevctldata/mdevctl-create.argv create mode 100644 tests/nodedevmdevctldata/mdevctl-list-defined.argv create mode 100644 tests/nodedevmdevctldata/mdevctl-list-multiple.json create mode 100644 tests/nodedevmdevctldata/mdevctl-list-multiple.out.xml --=20 2.26.2

7 64

[PATCH 00/10] Introduce virtio-mem <memory/> model
by Michal Privoznik 05 Feb '21

05 Feb '21

Technically, this is another version of: https://www.redhat.com/archives/libvir-list/2020-December/msg00199.html But since virtio-pmem part is pushed now, I've reworked virtio-mem a bit and sending it as a new series. For curious ones, David summarized behaviour well when implementing virtio-mem support in kernel: https://lwn.net/Articles/755423/ For less curious ones: # virsh update-memory $dom --requested-size 4G adds additional 4GiB of RAM to guest; # virsh update-memory $dom --requested-size 0 removes those 4GiB added earlier. Patches are also available on my GitLab: https://gitlab.com/MichalPrivoznik/libvirt/-/tree/virtio_mem_v3 Michal Prívozník (10): virhostmem: Introduce virHostMemGetTHPSize() qemu_capabilities: Introduce QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI conf: Introduce virtio-mem <memory/> model qemu: Build command line for virtio-mem qemu: Wire up <memory/> live update qemu: Wire up MEMORY_DEVICE_SIZE_CHANGE event qemu: Refresh the actual size of virtio-mem on monitor reconnect qemu: Recalculate balloon on MEMORY_DEVICE_SIZE_CHANGE event and reconnect virsh: Introduce update-memory command news: document recent virtio memory addition NEWS.rst | 7 + docs/formatdomain.rst | 42 +++- docs/manpages/virsh.rst | 31 +++ docs/schemas/domaincommon.rng | 16 ++ src/conf/domain_conf.c | 100 ++++++++- src/conf/domain_conf.h | 13 ++ src/conf/domain_validate.c | 39 ++++ src/libvirt_private.syms | 3 + src/qemu/qemu_alias.c | 10 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 +- src/qemu/qemu_domain.c | 50 ++++- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_domain_address.c | 37 ++- src/qemu/qemu_driver.c | 211 +++++++++++++++++- src/qemu/qemu_hotplug.c | 18 ++ src/qemu/qemu_hotplug.h | 5 + src/qemu/qemu_monitor.c | 37 +++ src/qemu/qemu_monitor.h | 27 +++ src/qemu/qemu_monitor_json.c | 94 ++++++-- src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_process.c | 101 ++++++++- src/qemu/qemu_validate.c | 8 + src/security/security_apparmor.c | 1 + src/security/security_dac.c | 2 + src/security/security_selinux.c | 2 + src/util/virhostmem.c | 63 ++++++ src/util/virhostmem.h | 3 + tests/domaincapsmock.c | 9 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + ...mory-hotplug-virtio-mem.x86_64-latest.args | 49 ++++ .../memory-hotplug-virtio-mem.xml | 66 ++++++ tests/qemuxml2argvtest.c | 1 + ...emory-hotplug-virtio-mem.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + tools/virsh-domain.c | 154 +++++++++++++ 38 files changed, 1165 insertions(+), 60 deletions(-) create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml create mode 120000 tests/qemuxml2xmloutdata/memory-hotplug-virtio-mem.x86_64-latest.xml -- 2.26.2

5 38