52e9a4d1d4
- vdpa: support vdpa device migrate - vdpa: support vdpa device hot plug/unplug - vdpa: Introduce the new device type vdpa to hostdev - node_device: fix leak of DIR* - Include vdpa devices in node device list - lxc: fix lxcContainerMountAllFS() DEREF_BEFORE_CHECK - qemu: Return perf status that affect next boot for shutoff domains While we set up perf events for a shutoff domain and check the settings, All of perf events are reported as 'disabled', unless we add --config, This is redundant for a shutoff domain. - tests: upstream Fixing compiler warning in cputest - qemu_migration_cookie: Rename ret in qemuDomainExtractTLSSubject - virrandom: Fix printf format string in virRandomGenerateWWN() - fix the issue of errors when saving after 'virsh edit' - Use (un)signed printf specifiers correctly - admin: fix leak of typed parameters on error - esx: call freeaddrinfo earlier in esxUtil_ResolveHostname Call freeaddrinfo() as soon as @result is not needed anymore, i.e. right after getnameinfo(); this avoids calling freeaddrinfo() in two branches. - qemu: Fix incorrect command name in error messages Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
From a538fbbfb2d12de1b3c33db7c7f25a133a4e94df Mon Sep 17 00:00:00 2001
|
|
From: Xu Zheng <xuzheng_yewu@cmss.chinamobile.com>
|
|
Date: Wed, 2 Aug 2023 16:56:49 +0800
|
|
Subject: [PATCH] qemu: Fix incorrect command name in error messages
|
|
|
|
cherry-pick from 194cfb44e77ce25d99240f24321559f569251e68
|
|
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
Signed-off-by: Xu Zheng <xuzheng_yewu@cmss.chinamobile.com>
|
|
---
|
|
src/qemu/qemu_monitor_json.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
|
|
index afd826bc2f..8f040bbe59 100644
|
|
--- a/src/qemu/qemu_monitor_json.c
|
|
+++ b/src/qemu/qemu_monitor_json.c
|
|
@@ -5665,7 +5665,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon,
|
|
if (virJSONValueObjectHasKey(child, "numa-mem-supported")) {
|
|
if (virJSONValueObjectGetBoolean(child, "numa-mem-supported", &info->numaMemSupported) < 0) {
|
|
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
- _("qemu-machines reply has malformed "
|
|
+ _("query-machines reply has malformed "
|
|
"'numa-mem-supported' data"));
|
|
goto cleanup;
|
|
}
|
|
--
|
|
2.27.0
|
|
|