- Devel - libvirt List Archives

[PATCH 0/2] qemu: allow changing link state on vhostuser interfaces
by Laine Stump 07 Apr '26

07 Apr '26

(and a 2nd incidental patch to log an error and fail if someone tries to change the <backend type>) Laine Stump (2): qemu: log error on attempts to change backend type of live network interface qemu: allow update-device of vhostuser network devices src/qemu/qemu_hotplug.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) -- 2.53.0

2 5

[PATCH] virt-aa-helper: Prevent spurious denials for AoE disks
by PUSHKARAJ PATIL 07 Apr '26

07 Apr '26

virt-aa-helper calls virStorageSourceGetMetadata before adding a disk path to a domain's apparmor profile. This probes the device and may trigger an AppArmor denial when the disk is an AoE device under /dev/etherd/. The return value of virStorageSourceGetMetadata is not checked, so the denial has no functional impact but results in noisy dmesg logs. Allow read access to /dev/etherd/e*.* in the virt-aa-helper profile to avoid these spurious denials. Signed-off-by: PUSHKARAJ PATIL <pushkaraj.patil(a)in.ibm.com> --- src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in | 1 + 1 file changed, 1 insertion(+) diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in index e209a8bff7..80e9ef2b08 100644 --- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in +++ b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in @@ -73,6 +73,7 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper { /**.vhd r, /**.[iI][sS][oO] r, /**/disk{,.*} r, + /dev/etherd/e*.* r, include if exists <local/usr.lib.libvirt.virt-aa-helper> } -- 2.50.1 (Apple Git-155)

3 2

[PATCH v3] qemu: Store tapfd path in domstatus XML
by Wesley Hershberger 07 Apr '26

07 Apr '26

Introduce a read-only `tapfd` element for direct interfaces (macvtap), which contains the path to the backing tapfd for that interface (e.g. `/dev/tapXX`). The element is only included when the domain is being formatted for internal consumption (VIR_DOMAIN_DEF_FORMAT_STATUS) and is not accepted in user-provided XML (!VIR_DOMAIN_DEF_PARSE_INACTIVE). This is used by the AppArmor security driver when re-generating profiles. Partial-Resolves: https://gitlab.com/libvirt/libvirt/-/issues/692 Bug-Ubuntu: https://bugs.launchpad.net/bugs/2126574 Signed-off-by: Wesley Hershberger <wesley.hershberger(a)canonical.com> --- Resending this patch as I've not recieved a response on my previous submission. Fixed the bug URL in the commit message as I missed that feedback item on my last mail. This submission is a partial revision of a previous series with a fix for the macvtap component of gitlab#692 [1][2]. I haven't had bandwidth to resolve the blockcommit component since the complexity there is somewhat higher (and is also lower priority for us). I kept the separate `tapfd` element rather than reusing the existing `backend` element (virDomainNetBackend.tap) to avoid making a user-visible change [3]. I'd be happy to use the existing field instead if you think that would make more sense. I opted not to introduce/modify a security driver API for FD+path as the patch here is sufficient to resolve the bug, but would be willing to do so if that would make this change more palatable. I've opened a MR to libvirt-tck with test cases that demonstrate the bugs that this fixes [4]. apparmor/110-macvtap.t passes with this patch applied. Thanks for the reviews and continued consideration. ~Wesley [1] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/UNNB… [2] https://gitlab.com/libvirt/libvirt/-/issues/692 [3] https://libvirt.org/formatdomain.html#setting-network-backend-specific-opti… [4] https://gitlab.com/libvirt/libvirt-tck/-/merge_requests/73 --- Changes in v3: - Fix buglink in commit message - Link to v2: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/IPEB… Changes in v2: - Drop `virt-aa-helper: Ask for no deny rule...` as it was applied - Drop `qemu: Store blockcommit permissions...` due to unresolved concerns - Pass tapfd path through netdef instead of resolving from fd - Link to v1: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/UNNB… --- src/conf/domain_conf.c | 8 ++++++++ src/conf/domain_conf.h | 1 + src/hypervisor/domain_interface.c | 2 +- src/lxc/lxc_process.c | 1 + src/qemu/qemu_interface.c | 1 + src/security/security_apparmor.c | 1 + src/security/virt-aa-helper.c | 5 +++++ src/util/virnetdevmacvlan.c | 18 +++++++++++------- src/util/virnetdevmacvlan.h | 4 +++- 9 files changed, 32 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 03a05366e1..9714a1e141 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2971,6 +2971,7 @@ virDomainNetDefFree(virDomainNetDef *def) g_free(def->virtio); g_free(def->coalesce); g_free(def->sourceDev); + g_free(def->tapfdpath); virNetDevIPInfoClear(&def->guestIP); virNetDevIPInfoClear(&def->hostIP); @@ -10634,6 +10635,10 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, return NULL; } + if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)) { + def->tapfdpath = virXPathString("string(./tapfd/@path)", ctxt); + } + if (virNetworkPortOptionsParseXML(ctxt, &def->isolatedPort) < 0) return NULL; @@ -26004,6 +26009,9 @@ virDomainNetDefFormat(virBuffer *buf, if (def->mtu) virBufferAsprintf(buf, "<mtu size='%u'/>\n", def->mtu); + if (def->tapfdpath && (flags & VIR_DOMAIN_DEF_FORMAT_STATUS)) + virBufferAsprintf(buf, "<tapfd path='%s'/>\n", def->tapfdpath); + virDomainNetDefCoalesceFormatXML(buf, def->coalesce); virDomainDeviceInfoFormat(buf, &def->info, flags | VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e63230beec..3bb4de6274 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1212,6 +1212,7 @@ struct _virDomainNetDef { char *downscript; char *domain_name; /* backend domain name */ char *ifname; /* interface name on the host (<target dev='x'/>) */ + char *tapfdpath; /* Path in /dev for macvtap (<tapfd path="/dev/tapXX">) */ virTristateBool managed_tap; virNetDevIPInfo hostIP; char *ifname_guest_actual; diff --git a/src/hypervisor/domain_interface.c b/src/hypervisor/domain_interface.c index 5bc698d272..37e3d453a0 100644 --- a/src/hypervisor/domain_interface.c +++ b/src/hypervisor/domain_interface.c @@ -111,7 +111,7 @@ virDomainInterfaceEthernetConnect(virDomainDef *def, if (virNetDevMacVLanIsMacvtap(net->ifname)) { auditdev = net->ifname; - if (virNetDevMacVLanTapOpen(net->ifname, tapfd, tapfdSize) < 0) + if (virNetDevMacVLanTapOpen(net->ifname, tapfd, tapfdSize, &net->tapfdpath) < 0) goto cleanup; if (virNetDevMacVLanTapSetup(tapfd, tapfdSize, virDomainInterfaceIsVnetCompatModel(net)) < 0) { diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 1bca9e8dae..c731b28871 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -379,6 +379,7 @@ virLXCProcessSetupInterfaceDirect(virLXCDriver *driver, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, cfg->stateDir, NULL, 0, + &net->tapfdpath, macvlan_create_flags) < 0) return NULL; diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 23a23d201a..edc53d53b3 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -81,6 +81,7 @@ qemuInterfaceDirectConnect(virDomainDef *def, &res_ifname, vmop, cfg->stateDir, tapfd, tapfdSize, + &net->tapfdpath, macvlan_create_flags) < 0) goto cleanup; diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 40f13ec1a5..3ff80e1dc9 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -156,6 +156,7 @@ load_profile(virSecurityManager *mgr G_GNUC_UNUSED, if (virDomainDefFormatInternal(def, NULL, &buf, VIR_DOMAIN_DEF_FORMAT_SECURE | + VIR_DOMAIN_DEF_FORMAT_STATUS | VIR_DOMAIN_DEF_FORMAT_VOLUME_TRANSLATED) < 0) return -1; diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index e932e79dab..60e03c2ce8 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1192,6 +1192,11 @@ get_files(vahControl * ctl) vhu->type) != 0) return -1; } + + if (net->tapfdpath) { + if (vah_add_file(&buf, net->tapfdpath, "rwk") != 0) + return -1; + } } for (i = 0; i < ctl->def->nmems; i++) { diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index cde9d70eef..fcf63e08ff 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -152,24 +152,24 @@ int virNetDevMacVLanDelete(const char *ifname) int virNetDevMacVLanTapOpen(const char *ifname, int *tapfd, - size_t tapfdSize) + size_t tapfdSize, + char **tapname) { int retries = 10; int ret = -1; int ifindex; size_t i = 0; - g_autofree char *tapname = NULL; if (virNetDevGetIndex(ifname, &ifindex) < 0) return -1; - tapname = g_strdup_printf("/dev/tap%d", ifindex); + *tapname = g_strdup_printf("/dev/tap%d", ifindex); for (i = 0; i < tapfdSize; i++) { int fd = -1; while (fd < 0) { - if ((fd = open(tapname, O_RDWR)) >= 0) { + if ((fd = open(*tapname, O_RDWR)) >= 0) { tapfd[i] = fd; } else if (retries-- > 0) { /* may need to wait for udev to be done */ @@ -178,7 +178,7 @@ virNetDevMacVLanTapOpen(const char *ifname, /* However, if haven't succeeded, quit. */ virReportSystemError(errno, _("cannot open macvtap tap device %1$s"), - tapname); + *tapname); goto cleanup; } } @@ -188,6 +188,7 @@ virNetDevMacVLanTapOpen(const char *ifname, cleanup: if (ret < 0) { + g_free(*tapname); while (i--) VIR_FORCE_CLOSE(tapfd[i]); } @@ -659,6 +660,7 @@ virNetDevMacVLanCreateWithVPortProfile(const char *ifnameRequested, char *stateDir, int *tapfd, size_t tapfdSize, + char **tapfdpath, unsigned int flags) { g_autofree char *ifname = NULL; @@ -729,7 +731,7 @@ virNetDevMacVLanCreateWithVPortProfile(const char *ifnameRequested, } if (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) { - if (virNetDevMacVLanTapOpen(ifname, tapfd, tapfdSize) < 0) + if (virNetDevMacVLanTapOpen(ifname, tapfd, tapfdSize, tapfdpath) < 0) goto disassociate_exit; if (virNetDevMacVLanTapSetup(tapfd, tapfdSize, vnet_hdr) < 0) @@ -888,7 +890,8 @@ int virNetDevMacVLanDelete(const char *ifname G_GNUC_UNUSED) int virNetDevMacVLanTapOpen(const char *ifname G_GNUC_UNUSED, int *tapfd G_GNUC_UNUSED, - size_t tapfdSize G_GNUC_UNUSED) + size_t tapfdSize G_GNUC_UNUSED, + char **tapname G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot create macvlan devices on this platform")); @@ -917,6 +920,7 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *ifname G_GNUC_UNUSED, char *stateDir G_GNUC_UNUSED, int *tapfd G_GNUC_UNUSED, size_t tapfdSize G_GNUC_UNUSED, + char **tapfdpath G_GNUC_UNUSED, unsigned int unused_flags G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 31e4804cdc..7424b87965 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -72,13 +72,15 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *ifname, char *stateDir, int *tapfd, size_t tapfdSize, + char **tapfdpath, unsigned int flags) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(6) ATTRIBUTE_NONNULL(8) ATTRIBUTE_NONNULL(10) G_GNUC_WARN_UNUSED_RESULT; int virNetDevMacVLanTapOpen(const char *ifname, int *tapfd, - size_t tapfdSize) + size_t tapfdSize, + char **tapname) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; --- base-commit: 54f5032e576a886cfb8232abbfa08a2f6e9f9962 change-id: 20260105-apparmor-races-d03238ee4d93 Best regards, -- Wesley Hershberger <wesley.hershberger(a)canonical.com>

2 3

[PATCH] qemu: migration: Call hook script on source host at migration start
by Guy Godfroy 07 Apr '26

07 Apr '26

Currently, the qemu hook script with the "migrate" operation is only called on the destination host at the beginning of incoming migration. This makes it impossible for the source host to prepare for migration, for example to change storage locks from exclusive to shared mode when using shared LVM storage with lvmlockd. Add a hook call on the source host at the beginning of outgoing migration. The hook is called with "source" as the extra argument to distinguish it from the destination hook which uses "-". The same change is also applied to the libxl driver for consistency. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/37 Signed-off-by: Guy Godfroy <guy.godfroy(a)gugod.fr> --- docs/hooks.rst | 36 ++++++++++++++++++++++++++++++++---- src/libxl/libxl_migration.c | 17 +++++++++++++++++ src/qemu/qemu_migration.c | 17 +++++++++++++++++ 3 files changed, 66 insertions(+), 4 deletions(-) diff --git a/docs/hooks.rst b/docs/hooks.rst index e1745b8cc7..4c7cac56ba 100644 --- a/docs/hooks.rst +++ b/docs/hooks.rst @@ -244,7 +244,7 @@ operation. There is no specific operation to indicate a "restart" is occurring. - :since:`Since 0.9.11`, the qemu hook script is also called at the beginning - of incoming migration. It is called as: + of incoming migration on the **destination** host. It is called as: :: @@ -257,6 +257,18 @@ operation. There is no specific operation to indicate a "restart" is occurring. is not valid, incoming migration will be canceled. This hook may be used, e.g., to change location of disk images for incoming domains. +- :since:`Since 12.1.0`, the qemu hook script is also called at the beginning + of outgoing migration on the **source** host. It is called as: + + :: + + /etc/libvirt/hooks/qemu guest_name migrate begin source + + with domain XML sent to standard input of the script. Unlike the destination + hook, this script does not act as a filter and any output is ignored. If the + script returns failure, the migration will be canceled. This hook may be used, + e.g., to change storage lock mode from exclusive to shared before migration. + - :since:`Since 1.2.9`, the qemu hook script is also called when restoring a saved image either via the API or automatically when restoring a managed save machine. It is called as: @@ -417,7 +429,7 @@ operation. There is no specific operation to indicate a "restart" is occurring. /etc/libvirt/hooks/libxl guest_name release end - - :since:`Since 2.1.0`, the libxl hook script is also called at the beginning - of incoming migration. It is called as: + of incoming migration on the **destination** host. It is called as: :: @@ -430,6 +442,18 @@ operation. There is no specific operation to indicate a "restart" is occurring. is not valid, incoming migration will be canceled. This hook may be used, e.g., to change location of disk images for incoming domains. +- :since:`Since 12.1.0`, the libxl hook script is also called at the beginning + of outgoing migration on the **source** host. It is called as: + + :: + + /etc/libvirt/hooks/libxl guest_name migrate begin source + + with domain XML sent to standard input of the script. Unlike the destination + hook, this script does not act as a filter and any output is ignored. If the + script returns failure, the migration will be canceled. This hook may be used, + e.g., to change storage lock mode from exclusive to shared before migration. + - :since:`Since 6.5.0`, you can also place several hook scripts in the directory ``/etc/libvirt/hooks/libxl.d/``. They are executed in alphabetical order after main script. In this case each script also acts as filter and can @@ -566,10 +590,14 @@ Migration of a QEMU guest involves running hook scripts on both the source and destination hosts: #. At the beginning of the migration, the *qemu* hook script on the - **destination** host is executed with the "migrate" operation. + **source** host is executed with the "migrate" operation and "source" + as the extra argument (:since:`since 12.1.0`). This allows the source + host to prepare for migration, e.g., changing storage locks. +#. Then, the *qemu* hook script on the **destination** host is executed + with the "migrate" operation. #. Before QEMU process is spawned, the two operations ("prepare" and "start") called for domain start are executed on **destination** host. -#. If both of these hook script executions exit successfully (exit status 0), +#. If all of these hook script executions exit successfully (exit status 0), the migration continues. Any other exit code indicates failure, and the migration is aborted. #. The QEMU guest is then migrated to the destination host. diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index f5dee7627b..76f3c7ceb7 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -411,6 +411,23 @@ libxlDomainMigrationSrcBegin(virConnectPtr conn, if (!libxlDomainMigrationIsAllowed(def)) goto endjob; + /* Call hook to allow source host to prepare for migration */ + if (virHookPresent(VIR_HOOK_DRIVER_LIBXL)) { + g_autofree char *hookxml = NULL; + int hookret; + + if (!(hookxml = virDomainDefFormat(def, driver->xmlopt, + VIR_DOMAIN_DEF_FORMAT_SECURE))) + goto endjob; + + hookret = virHookCall(VIR_HOOK_DRIVER_LIBXL, def->name, + VIR_HOOK_LIBXL_OP_MIGRATE, VIR_HOOK_SUBOP_BEGIN, + "source", hookxml, NULL); + + if (hookret < 0) + goto endjob; + } + xml = virDomainDefFormat(def, driver->xmlopt, VIR_DOMAIN_DEF_FORMAT_SECURE); /* Valid xml means success! EndJob in the confirm phase */ if (xml) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 6dd022163b..60e370319c 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2791,6 +2791,23 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver, if (!qemuMigrationSrcIsAllowed(vm, true, vm->job->asyncJob, flags)) return NULL; + /* Call hook to allow source host to prepare for migration */ + if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { + g_autofree char *xml = NULL; + int hookret; + + if (!(xml = qemuDomainDefFormatLive(driver, priv->qemuCaps, vm->def, + priv->origCPU, false, true))) + return NULL; + + hookret = virHookCall(VIR_HOOK_DRIVER_QEMU, vm->def->name, + VIR_HOOK_QEMU_OP_MIGRATE, VIR_HOOK_SUBOP_BEGIN, + "source", xml, NULL); + + if (hookret < 0) + return NULL; + } + if (!(flags & (VIR_MIGRATE_UNSAFE | VIR_MIGRATE_OFFLINE)) && !qemuMigrationSrcIsSafe(vm, migrate_disks, flags)) return NULL; -- 2.34.1

4 18

[PATCH] qemu: conf: reuse cfg->stateDir when setting cfg->swtpmStateDir
by Cole Robinson 07 Apr '26

07 Apr '26

Use cfg->stateDir rather than duplicating it Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index b2ced2baf0..f2f9cc8a21 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -181,7 +181,7 @@ virQEMUDriverConfig *virQEMUDriverConfigNew(bool privileged, cfg->configBaseDir = g_strdup(SYSCONFDIR "/libvirt"); cfg->stateDir = g_strdup_printf("%s/libvirt/qemu", RUNSTATEDIR); - cfg->swtpmStateDir = g_strdup_printf("%s/libvirt/qemu/swtpm", RUNSTATEDIR); + cfg->swtpmStateDir = g_strdup_printf("%s/swtpm", cfg->stateDir); cfg->channelTargetDir = g_strdup_printf("%s/channel", cfg->stateDir); cfg->cacheDir = g_strdup_printf("%s/cache/libvirt/qemu", LOCALSTATEDIR); -- 2.53.0

2 1

[PATCH] hyperv: Implement virDomainGetGuestInfo()
by Michal Privoznik 06 Apr '26

06 Apr '26

From: Michal Privoznik <mprivozn(a)redhat.com> The hyperv hypervisor also has guest agent, in fact multiple ones [1][2]. The first one, KVP, is for storing Key-Value Pairs and in fact it's already used by our hyperv driver when querying domifaddr (see v12.1.0-rc1~148 for more info). Anyhow, the KVP service is capable of more, it can provide guest OS info, guest FQDN and others. These informations are exposed via GuestIntrinsicExchangeItems member of the Msvm_KvpExchangeComponent struct [3]. You may have noticed the member is an array of strings, well those strings are in fact XML documents. For instance: <INSTANCE CLASSNAME="Msvm_KvpExchangeDataItem"> <PROPERTY NAME="Caption" TYPE="string"/> <PROPERTY NAME="Data" TYPE="string"> <VALUE>6.12.61-1-lts</VALUE> </PROPERTY> <PROPERTY NAME="Description" TYPE="string"/> <PROPERTY NAME="ElementName" TYPE="string"/> <PROPERTY NAME="InstanceID" TYPE="string"/> <PROPERTY NAME="Name" TYPE="string"> <VALUE>OSBuildNumber</VALUE> </PROPERTY> <PROPERTY NAME="Source" TYPE="uint16"> <VALUE>2</VALUE> </PROPERTY> </INSTANCE> This is a bit messy to work with, because it's not like in QEMU's world where each type of guest info (virDomainGuestInfoTypes) corresponds 1:1 to a guest agent command. Hence the lookupTable in hypervGetServicesProcessOne(). NB, the original jira issue asks for exposing plain fact whether KVP daemon is running inside the guest and this commit implements seemingly different feature. Well, thing is, in case of QEMU there's a domain XML part where guest agent is configured and where we expose whether there's somebody listening inside the guest. But in case of hyperv there's no <channel/> to be configured as communication with KVP daemon happens through vmbus [4]. Users are advised to call the virDomainGetGuestInfo() API with non-zero 'types' argument and if they get an error with VIR_ERR_AGENT_UNRESPONSIVE code then the KVP daemon is not running. 1: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/too… 2: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/too… 3: https://learn.microsoft.com/en-us/windows/win32/hyperv_v2/msvm-kvpexchangec… 4: https://docs.kernel.org/virt/hyperv/vmbus.html Resolves: https://redhat.atlassian.net/browse/RHEL-147661 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/hyperv/hyperv_driver.c | 262 ++++++++++++++++++++++++++ src/hyperv/hyperv_wmi_generator.input | 43 +++++ 2 files changed, 305 insertions(+) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 18e06f0e2a..7ad80bc8ec 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -4379,6 +4379,267 @@ hypervDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, } +static int +hypervGetServicesProcessOne(const char *xmlStr, + unsigned int supportedTypes, + unsigned int *processedTypes, + virTypedParamList *ifaceAddrList, + virTypedParamList *list) +{ + g_autoptr(xmlDoc) xml = NULL; + g_autoptr(xmlXPathContext) ctxt = NULL; + g_autofree char *name = NULL; + g_autofree char *val = NULL; + const struct { + const char *name; + const char *key; + unsigned int type; + } lookupTable[] = { + { "FullyQualifiedDomainName", VIR_DOMAIN_GUEST_INFO_HOSTNAME_HOSTNAME, + VIR_DOMAIN_GUEST_INFO_HOSTNAME }, + { "OSBuildNumber", VIR_DOMAIN_GUEST_INFO_OS_KERNEL_RELEASE, + VIR_DOMAIN_GUEST_INFO_OS }, + { "OSName", VIR_DOMAIN_GUEST_INFO_OS_NAME, + VIR_DOMAIN_GUEST_INFO_OS}, + { "OSVersion", VIR_DOMAIN_GUEST_INFO_OS_VERSION, + VIR_DOMAIN_GUEST_INFO_OS}, + { "OSMajorVersion", VIR_DOMAIN_GUEST_INFO_OS_VERSION_ID, + VIR_DOMAIN_GUEST_INFO_OS}, + { "ProcessorArchitecture", VIR_DOMAIN_GUEST_INFO_OS_MACHINE, + VIR_DOMAIN_GUEST_INFO_OS}, + }; + size_t i; + + VIR_DEBUG("xmlStr=%s", xmlStr); + + if (!(xml = virXMLParseStringCtxt(xmlStr, _("guest intrinsic exchange data"), &ctxt))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("cannot parse guest intrinsic exchange data")); + return -1; + } + + name = virXPathString("string(//INSTANCE/PROPERTY[@NAME='Name']/VALUE/text())", ctxt); + if (!name) { + VIR_DEBUG("Skipping unexpected guest intrinsic XML (no name): %s", xmlStr); + return 0; + } + + val = virXPathString("string(//INSTANCE/PROPERTY[@NAME='Data']/VALUE/text())", ctxt); + if (!val) { + VIR_DEBUG("Skipping unexpected guest intrinsic XML (no value): %s", xmlStr); + return 0; + } + + for (i = 0; i < G_N_ELEMENTS(lookupTable); i++) { + if (supportedTypes & lookupTable[i].type && + STREQ(name, lookupTable[i].name)) { + virTypedParamListAddString(list, val, "%s", lookupTable[i].key); + *processedTypes |= lookupTable[i].type; + return 1; + } + } + + if (supportedTypes & VIR_DOMAIN_GUEST_INFO_INTERFACES && + (STREQ(name, "NetworkAddressIPv4") || STREQ(name, "NetworkAddressIPv6"))) { + g_auto(GStrv) tmp = NULL; + unsigned int newAddrCount = 0; + size_t addrIndex = 0; + const char *addrType = "ipv4"; + + if (STREQ(name, "NetworkAddressIPv6")) + addrType = "ipv6"; + + if (virTypedParamListFetch(ifaceAddrList, NULL, &addrIndex) < 0) + return -1; + + /* Per Microsoft docs: + * - NetworkAddressIPv4 + * A string that contains a semicolon-delimited list of the IPv4 + * addresses currently assigned to the guest virtual machine. + * - NetworkAddressIPv6 + * A string that contains a semicolon-delimited list of the IPv6 + * addresses currently assigned to the guest virtual machine. + */ + + tmp = g_strsplit(val, ";", 0); + newAddrCount = g_strv_length(tmp); + + for (i = 0; i < newAddrCount; i++) { + virTypedParamListAddString(ifaceAddrList, addrType, + VIR_DOMAIN_GUEST_INFO_IF_PREFIX "0" VIR_DOMAIN_GUEST_INFO_IF_SUFFIX_ADDR_PREFIX "%zu" VIR_DOMAIN_GUEST_INFO_IF_SUFFIX_ADDR_SUFFIX_TYPE, + addrIndex + i); + virTypedParamListAddString(ifaceAddrList, tmp[i], + VIR_DOMAIN_GUEST_INFO_IF_PREFIX "0" VIR_DOMAIN_GUEST_INFO_IF_SUFFIX_ADDR_PREFIX "%zu" VIR_DOMAIN_GUEST_INFO_IF_SUFFIX_ADDR_SUFFIX_ADDR, + addrIndex + i); + *processedTypes |= VIR_DOMAIN_GUEST_INFO_INTERFACES; + } + + return 1; + } + + return 0; +} + + +static int +hypervDomainGetGuestInfoImpl(hypervPrivate *priv, + const char *uuid, + unsigned int supportedTypes, + bool reportUnsupported, + virTypedParamList *list) +{ + g_autoptr(Msvm_KvpExchangeComponent) kvpList = NULL; + Msvm_KvpExchangeComponent_Data *data = NULL; + g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER; + g_autoptr(virTypedParamList) ifaceAddrList = virTypedParamListNew(); + unsigned int processedTypes = 0; + size_t nIfaceAddresses = 0; + size_t i; + + virBufferEscapeSQL(&query, + MSVM_KVPEXCHANGECOMPONENT_WQL_SELECT + "WHERE SystemName = '%s'", + uuid); + + if (hypervGetWmiClass(Msvm_KvpExchangeComponent, &kvpList) < 0) + return -1; + + if (!kvpList) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Empty reply from guest. Maybe KVP service is not running?")); + return -1; + } + + data = kvpList->data; + + for (i = 0; i < data->GuestIntrinsicExchangeItems.count; i++) { + const char *xml = ((const char **)data->GuestIntrinsicExchangeItems.data)[i]; + + if (hypervGetServicesProcessOne(xml, supportedTypes, + &processedTypes, ifaceAddrList, list) < 0) { + return -1; + } + } + + if (virTypedParamListFetch(ifaceAddrList, NULL, &nIfaceAddresses) < 0) + return -1; + + if (nIfaceAddresses > 0) { + virTypedParamListAddUInt(list, 1, VIR_DOMAIN_GUEST_INFO_IF_COUNT); + virTypedParamListAddUInt(list, nIfaceAddresses, + VIR_DOMAIN_GUEST_INFO_IF_PREFIX "0" VIR_DOMAIN_GUEST_INFO_IF_SUFFIX_ADDR_COUNT); + virTypedParamListConcat(list, &ifaceAddrList); + } + + if (processedTypes != supportedTypes && + reportUnsupported) { + uint16_t status = ((uint16_t *)kvpList->data->OperationalStatus.data)[0]; + + /* Per Microsoft doc, the status value can be: + * 2 - OK, + * 3 - Degraded, + * 7 - Non-recoverable error, + * 12 - No contact, + * 13 - Lost communication. + */ + switch (status) { + case 3: + virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", + _("Unable to fetch all requested information. Data Exchange service (KVP) is degraded")); + break; + case 7: + virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", + _("Unable to fetch all requested information. Data Exchange service (KVP) encountered a non-recoverable error")); + break; + case 12: + case 13: + virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", + _("Unable to fetch all requested information. Data Exchange service (KVP) is not running")); + break; + default: + virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", + _("Unable to fetch all requested information")); + break; + } + return -1; + } + + return 0; +} + + +static int +hypervDomainGetGuestInfoCheckSupport(unsigned int types, + unsigned int *supportedTypes) +{ + const unsigned int hypervSupportedTypes = + VIR_DOMAIN_GUEST_INFO_OS | + VIR_DOMAIN_GUEST_INFO_HOSTNAME | + VIR_DOMAIN_GUEST_INFO_INTERFACES; + + if (types == 0) { + *supportedTypes = hypervSupportedTypes; + return 0; + } + + *supportedTypes = types & hypervSupportedTypes; + + if (types != *supportedTypes) { + virReportError(VIR_ERR_INVALID_ARG, + _("unsupported guest information types '0x%1$x'"), + types & ~hypervSupportedTypes); + return -1; + } + + return 0; +} + + +static int +hypervDomainGetGuestInfo(virDomainPtr domain, + unsigned int types, + virTypedParameterPtr *params, + int *nparams, + unsigned int flags) +{ + hypervPrivate *priv = NULL; + char uuid_string[VIR_UUID_STRING_BUFLEN]; + unsigned int supportedTypes = 0; + bool reportUnsupported = types != 0; + g_autoptr(Msvm_ComputerSystem) computerSystem = NULL; + g_autoptr(virTypedParamList) list = virTypedParamListNew(); + + virCheckFlags(0, -1); + + if (hypervDomainGetGuestInfoCheckSupport(types, &supportedTypes) < 0) + return -1; + + if (hypervMsvmComputerSystemFromDomain(domain, &computerSystem) < 0) + return -1; + + if (!hypervIsMsvmComputerSystemActive(computerSystem, NULL)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not running")); + + return -1; + } + + priv = domain->conn->privateData; + virUUIDFormat(domain->uuid, uuid_string); + + if (hypervDomainGetGuestInfoImpl(priv, + uuid_string, supportedTypes, + reportUnsupported, list) < 0) { + return -1; + } + + if (virTypedParamListSteal(list, params, nparams) < 0) + return -1; + + return 0; +} + + static virHypervisorDriver hypervHypervisorDriver = { .name = "Hyper-V", .connectOpen = hypervConnectOpen, /* 0.9.5 */ @@ -4452,6 +4713,7 @@ static virHypervisorDriver hypervHypervisorDriver = { .domainHasCurrentSnapshot = hypervDomainHasCurrentSnapshot, /* 12.2.0 */ .domainSnapshotCurrent = hypervDomainSnapshotCurrent, /* 12.2.0 */ .domainSnapshotGetParent = hypervDomainSnapshotGetParent, /* 12.2.0 */ + .domainGetGuestInfo = hypervDomainGetGuestInfo, /* 12.3.0 */ }; diff --git a/src/hyperv/hyperv_wmi_generator.input b/src/hyperv/hyperv_wmi_generator.input index b3cd9d19fb..1f8d4258e1 100644 --- a/src/hyperv/hyperv_wmi_generator.input +++ b/src/hyperv/hyperv_wmi_generator.input @@ -1261,3 +1261,46 @@ class Msvm_SecuritySettingData boolean EncryptStateAndVmMigrationTraffic boolean VirtualizationBasedSecurityOptOut end + +class Msvm_KvpExchangeComponent + string InstanceID + string Caption + string Description + string ElementName + datetime InstallDate + string Name + uint16 OperationalStatus[] + string StatusDescriptions[] + string Status + uint16 HealthState + uint16 CommunicationStatus + uint16 DetailedStatus + uint16 OperatingStatus + uint16 PrimaryStatus + uint16 EnabledState + string OtherEnabledState + uint16 RequestedState + uint16 EnabledDefault + datetime TimeOfLastStateChange + uint16 AvailableRequestedStates[] + uint16 TransitioningToState + string SystemCreationClassName + string SystemName + string CreationClassName + string DeviceID + boolean PowerManagementSupported + uint16 PowerManagementCapabilities[] + uint16 Availability + uint16 StatusInfo + uint32 LastErrorCode + string ErrorDescription + boolean ErrorCleared + string OtherIdentifyingInfo[] + uint64 PowerOnHours + uint64 TotalPowerOnHours + string IdentifyingDescriptions[] + uint16 AdditionalAvailability[] + uint64 MaxQuiesceTime + string GuestExchangeItems[] + string GuestIntrinsicExchangeItems[] +end -- 2.52.0

2 1

[PATCH] remote: Move secrets encryption dependency to a systemd drop-in
by Arun Menon 06 Apr '26

06 Apr '26

From: Arun Menon <armenon(a)redhat.com> The monolithic libvirtd.service currently has a dependency on virt-secret-init-encryption.service. This causes libvirtd to fail to start on systems where the secret driver is not installed or enabled, as systemd cannot satisfy the Requires= / After= units or the LoadCredentialEncrypted= path. See below, Requires=virt-secret-init-encryption.service After=virt-secret-init-encryption.service LoadCredentialEncrypted=secrets-encryption-key:@localstatedir@/lib/libvirt/secrets/secrets-encryption-key This patch decouples the secrets encryption logic from the main libvirtd service file. It is moved into a new systemd drop-in (50-libvirtd-secret.conf) which is only installed when libvirt is built with secret driver support. The override snippet is added to the daemon-driver-secret package. Fixes: 97758bc9a0b1fccf8c0009308658f1204b113b89 Signed-off-by: Arun Menon <armenon(a)redhat.com> Fix-Suggested-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 2 ++ src/remote/libvirtd-secret.conf.in | 7 +++++++ src/remote/libvirtd.service.in | 4 ---- src/remote/meson.build | 15 +++++++++++++++ 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 src/remote/libvirtd-secret.conf.in diff --git a/libvirt.spec.in b/libvirt.spec.in index 00316a03f2..d840c829d1 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2259,6 +2259,8 @@ exit 0 %{_unitdir}/virtsecretd.socket %{_unitdir}/virtsecretd-ro.socket %{_unitdir}/virtsecretd-admin.socket +%dir %attr(0700, root, root) %{_unitdir}/libvirtd.service.d/ +%{_unitdir}/libvirtd.service.d/50-libvirtd-secret.conf %attr(0755, root, root) %{_sbindir}/virtsecretd %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/secrets/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/secrets/ diff --git a/src/remote/libvirtd-secret.conf.in b/src/remote/libvirtd-secret.conf.in new file mode 100644 index 0000000000..d64a6cf63e --- /dev/null +++ b/src/remote/libvirtd-secret.conf.in @@ -0,0 +1,7 @@ +[Unit] +Requires=@service@ +After=@service@ + +[Service] +Environment=SECRETS_ENCRYPTION_KEY=%d/secrets-encryption-key +LoadCredentialEncrypted=secrets-encryption-key:@localstatedir@/lib/libvirt/secrets/secrets-encryption-key diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in index 7965010a0a..b0a062e885 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in @@ -12,8 +12,6 @@ After=libvirtd.socket After=libvirtd-ro.socket After=libvirtd-admin.socket Requires=virtlogd.socket -Requires=virt-secret-init-encryption.service -After=virt-secret-init-encryption.service Wants=virtlockd.socket After=virtlogd.socket After=virtlockd.socket @@ -31,8 +29,6 @@ Conflicts=xendomains.service Type=notify-reload Environment=LIBVIRTD_ARGS="--timeout 120" EnvironmentFile=-@initconfdir@/libvirtd -Environment=SECRETS_ENCRYPTION_KEY=%d/secrets-encryption-key -LoadCredentialEncrypted=secrets-encryption-key:@localstatedir@/lib/libvirt/secrets/secrets-encryption-key ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS ExecReload=/bin/kill -HUP $MAINPID KillMode=process diff --git a/src/remote/meson.build b/src/remote/meson.build index e503263266..f1c521444f 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -343,4 +343,19 @@ if conf.has('WITH_SASL') ) endif +# The monolithic libvirt daemon only attempts to load the +# secrets encryption credentials if the secret driver is enabled +if conf.has('WITH_SECRETS') + secret_dropin_conf = configuration_data() + secret_dropin_conf.set('service', 'virt-secret-init-encryption.service') + secret_dropin_conf.set('localstatedir', localstatedir) + + configure_file( + input: 'libvirtd-secret.conf.in', + output: '50-libvirtd-secret.conf', + configuration: secret_dropin_conf, + install_dir: unitdir / 'libvirtd.service.d' + ) +endif + remote_inc_dir = include_directories('.') -- 2.53.0

2 2

[PATCH] qemu: virtiofs: remove unused qemuVirtioFSCreateSocketFilename
by Cole Robinson 02 Apr '26

02 Apr '26

Replaced by qemuDomainGetVHostUserFSSocketPath in e7801a490c Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- Pushed as trivial. src/qemu/qemu_virtiofs.c | 10 ---------- src/qemu/qemu_virtiofs.h | 3 --- 2 files changed, 13 deletions(-) diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c index d192f5ec3c..91d58703f1 100644 --- a/src/qemu/qemu_virtiofs.c +++ b/src/qemu/qemu_virtiofs.c @@ -65,16 +65,6 @@ qemuVirtioFSCreatePidFilename(virDomainObj *vm, } -char * -qemuVirtioFSCreateSocketFilename(virDomainObj *vm, - const char *alias) -{ - qemuDomainObjPrivate *priv = vm->privateData; - - return virFileBuildPath(priv->libDir, alias, "-fs.sock"); -} - - static int qemuVirtioFSOpenChardev(virQEMUDriver *driver, virDomainObj *vm, diff --git a/src/qemu/qemu_virtiofs.h b/src/qemu/qemu_virtiofs.h index 6867f89929..0a6130bfa9 100644 --- a/src/qemu/qemu_virtiofs.h +++ b/src/qemu/qemu_virtiofs.h @@ -22,9 +22,6 @@ char * qemuVirtioFSCreatePidFilename(virDomainObj *vm, const char *alias); -char * -qemuVirtioFSCreateSocketFilename(virDomainObj *vm, - const char *alias); virCommand * qemuVirtioFSBuildCommandLine(virQEMUDriverConfig *cfg, -- 2.53.0

1 0

Re: [PATCH v3 07/11] ui/dbus: run without Audio interface when audio is disabled
by Markus Armbruster 01 Apr '26

01 Apr '26

Sergei Heifetz <heifetz(a)yandex-team.com> writes: > D-Bus display can be used even when QEMU is configured with > `--disable-audio`. In that case, audio interface will not be available > on `/org/qemu/Display1/Audio`. > > (The current handling of the situation when audio is enabled but > no D-Bus-compatible audio backend is available is different and > hasn’t been changed.) > > Signed-off-by: Sergei Heifetz <heifetz(a)yandex-team.com> > --- > qapi/ui.json | 2 +- > qemu-options.hx | 4 ++++ > ui/dbus.c | 8 ++++++++ > 3 files changed, 13 insertions(+), 1 deletion(-) > > diff --git a/qapi/ui.json b/qapi/ui.json > index e3da77632a8..62eb05c6091 100644 > --- a/qapi/ui.json > +++ b/qapi/ui.json > @@ -1385,7 +1385,7 @@ > 'data' : { '*rendernode' : 'str', > '*addr': 'str', > '*p2p': 'bool', > - '*audiodev': 'str' } } > + '*audiodev': { 'type': 'str', 'if': 'CONFIG_AUDIO' } } } Is this a compatibility break? DisplayDBus is only used in DisplayOptions, which is only used as return type of query-display-options in the QAPI schema. However, vl.c also uses it to parse -display. Removing parameter @audiodev from -display is technically a compatibility break. However, we're removing an optional paramater that would always be rejected when present: it has no valid value, because there are no audiodevs. Removal from query-display-options is similar: it could not be present. Removal affects introspection, which could conceivably confuse client. I don't expect such trouble here, because @audiodev always existed, i.e. there's no real reason to look for it in introspection. I think we're okay. I'm cc'ing the libvirt list just in case. Do we need a release note? Do we need an entry in docs/about/removed-features.rst? Feels a bit odd; we're not removing a feature, we're adding one, namely "can compile out audio". > > ## > # @DisplayGLMode: > diff --git a/qemu-options.hx b/qemu-options.hx > index 29dc865820a..20d15c0004f 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -2232,6 +2232,10 @@ SRST > If no audio backend is specified and the dbus display backend is > specified, the dbus audio backend is used by default. > > + (If audio is disabled at compile time via the ``--disable-audio`` option, > + no audio backend is used, and none of the audio-related D-Bus interfaces > + are exported.) > + Well, audio is either compiled in or it isn't. If it's compiled in, then why tell the user how things behave when it's not? If it's not compiled in, then why document stuff that doesn't work? How much of -audiodev still works then? -audiodev none? Anything else? > The connection is registered with the "org.qemu" name (and queued when > already owned). > [...]

3 4

Re: [PATCH RFC 02/12] migration/qapi: Rename MigrationStats to MigrationRAMStats
by Markus Armbruster 01 Apr '26

01 Apr '26

Cc: correct libvirt list address Peter Xu <peterx(a)redhat.com> writes: > This stats is only about RAM, so make it accurate. This paves way for > statistics for all devices. > > Note that even if this is part of qapi/, this should not be part of ABI of docs/devel/qapi-code-gen.rst section "Compatibility considerations": Since type names are not visible in the Client JSON Protocol, types may be freely renamed. Even certain refactorings are invisible, such as splitting members from one type into a common base type. So, s/should not be/is not/. > at least query-migrate, because the structure is not changed, and this > stats is always reported only under the "ram" section. Why "at least query-migrate"? Do you have other interfaces in mind, or are you just hedging? > Cc: Daniel P. Berrangé <berrange(a)redhat.com> > Cc: Markus Armbruster <armbru(a)redhat.com> > Cc: Libvirt Mailing List <libvir-list(a)redhat.com> > Signed-off-by: Peter Xu <peterx(a)redhat.com> > --- > docs/about/removed-features.rst | 2 +- > qapi/migration.json | 8 ++++---- > migration/migration-stats.h | 2 +- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst > index 6f4447993c..7c4f4325f7 100644 > --- a/docs/about/removed-features.rst > +++ b/docs/about/removed-features.rst > @@ -699,7 +699,7 @@ was superseded by ``sections``. > ``query-migrate`` return value member ``skipped`` (removed in 9.1) > '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' > > -Member ``skipped`` of the ``MigrationStats`` struct hasn't been used > +Member ``skipped`` of the ``MigrationRAMStats`` struct hasn't been used > for more than 10 years. Removed with no replacement. Could simply use "of the return value". But this is fine, too. > > ``migrate`` command option ``inc`` (removed in 9.1) > diff --git a/qapi/migration.json b/qapi/migration.json > index 7134d4ce47..cfc6ccee26 100644 > --- a/qapi/migration.json > +++ b/qapi/migration.json > @@ -12,7 +12,7 @@ > { 'include': 'sockets.json' } > > ## > -# @MigrationStats: > +# @MigrationRAMStats: > # > # Detailed migration status. > # > @@ -64,7 +64,7 @@ > # > # Since: 0.14 > ## > -{ 'struct': 'MigrationStats', > +{ 'struct': 'MigrationRAMStats', > 'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' , > 'duplicate': 'int', > 'normal': 'int', > @@ -209,7 +209,7 @@ > # If this field is not returned, no migration process has been > # initiated > # > -# @ram: `MigrationStats` containing detailed migration status, only > +# @ram: `MigrationRAMStats` containing detailed migration status, only > # returned if status is 'active' or 'completed'(since 1.2) This gets rendered like * ram (MigrationStats, *optional*) -- MigrationStats containing detailed migration status, only returned if status is 'active' or 'completed'(since 1.2) Recommend to rephrase to avoid the repetition. Maybe # @ram: Detailed migration RAM status, only returned if status is # 'active' or 'completed' (since 1.2) Also consider replacing "status" by "statistics". > # > # @xbzrle-cache: `XBZRLECacheStats` containing detailed XBZRLE > @@ -309,7 +309,7 @@ > # Since: 0.14 > ## > { 'struct': 'MigrationInfo', > - 'data': {'*status': 'MigrationStatus', '*ram': 'MigrationStats', > + 'data': {'*status': 'MigrationStatus', '*ram': 'MigrationRAMStats', > '*vfio': 'VfioStats', > '*xbzrle-cache': 'XBZRLECacheStats', > '*total-time': 'int', > diff --git a/migration/migration-stats.h b/migration/migration-stats.h > index c0f50144c9..1153520f7a 100644 > --- a/migration/migration-stats.h > +++ b/migration/migration-stats.h > @@ -27,7 +27,7 @@ > > /* > * These are the ram migration statistic counters. It is loosely > - * based on MigrationStats. > + * based on MigrationRAMStats. > */ > typedef struct { > /* Only minor issues, and none added by this patch, so Acked-by: Markus Armbruster <armbru(a)redhat.com>

2 2