39a0a891d8
- vdpa: move memory listener to the realize stage - vdpa: implement vdpa device migration - vhost: implement post resume bh - vhost: implement migration state notifier for vdpa device - vhost: implement savevm_hanlder for vdpa device - vhost: implement vhost_vdpa_device_suspend/resume - vhost: implement vhost-vdpa suspend/resume - vhost: add vhost_dev_suspend/resume_op - vhost: introduce bytemap for vhost backend logging - vhost-vdpa: add migration log ops for VhostOps - vhost-vdpa: add VHOST_BACKEND_F_BYTEMAPLOG - vhost: fix null pointer access - ui/gtk: prevent ui lock up when dpy_gl_update called again before current draw event occurs - hw/usb: dev-mtp: Use g_mkdir() - target/ppc/cpu-models: Remove the "default" CPU alias - hw/intc/arm_gicv3: ICC_PMR_EL1 high bits should be RAZ - Fixed a QEMU hang when guest poweroff in COLO mode - migration/colo: More accurate update checkpoint time - scripts/entitlement.sh: Use backward-compatible cp flags - block/nvme: fix infinite loop in nvme_free_req_queue_cb() - hw/net: npcm7xx_emc fix missing queue_flush - Add dummy Aspeed AST2600 Display Port MCU (DPMCU) - hw/arm: ast2600: Fix address mapping of second SPI controller - vhost-user-blk: reconnect on any error during realize - vhost-user-blk: propagate error return from generic vhost - hw/riscv: boot: Reduce FDT address alignment constraints - Revert "hw/virtio/virtio-iommu-pci: Enforce the device is plugged on the root bus" - Fix STM32F2XX USART data register readout - block: use 'unsigned' for in_flight field on driver state - sphinx: change default language to 'en' - tests/qtest: Fix two format strings - trivial typos: namesapce - hw/ide/atapi.c: Correct typos (CD-CDROM -> CD-ROM) - hw/virtio/virtio-iommu-pci: Enforce the device is plugged on the root bus - hw/display/next-fb: Fix comment typo - xen/pass-through: merge emulated bits correctly mainline inclusion commit be9c61da9fc57eb7d293f380d0805ca6f46c2657 category: bugfix - tests/qtest/migration-test.c: spelling fix: bandwith - target/i386/cpu: Improve error message for property "vendor" - balloon: Fix a misleading error message - target/arm: Don't set syndrome ISS for loads and stores with writeback mainline inclusion commit 53ae2fdef1f5661cbaa2ea571c517f98e6041cb8 category: bugfix - disas/hppa: Show hexcode of instruction along with disassembly - tcg/loongarch64: Fix tcg_out_mov() Aborted - ui/qmp-cmds: Improve two error messages - qga: Improve guest-exec-status error message - hmp: Improve sync-profile error message - spapr/pci: Correct "does not support hotplugging error messages - xen/pass-through: don't create needless register group mainline inclusion commit c0e86b7624cb9d6db03e0d48cf82659e5b89a6a6 category: bugfix Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
69 lines
2.3 KiB
Diff
69 lines
2.3 KiB
Diff
From 0425d773b3fa0da62be489ae6c76d1805f28f388 Mon Sep 17 00:00:00 2001
|
|
From: boringandboring <wangjinlei_yewu@cmss.chinamobile.com>
|
|
Date: Mon, 27 Nov 2023 15:47:21 +0800
|
|
Subject: [PATCH] ui/qmp-cmds: Improve two error messages
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
cherry picked from 517b0220efd421acf885eed109571a61e95b192a
|
|
|
|
set_password with "protocol": "vnc" supports only "connected": "keep".
|
|
Any other value is rejected with
|
|
|
|
Invalid parameter 'connected'
|
|
|
|
Improve this to
|
|
|
|
parameter 'connected' must be 'keep' when 'protocol' is 'vnc'
|
|
|
|
client_migrate_info requires "port" or "tls-port". When both are
|
|
missing, it fails with
|
|
|
|
Parameter 'port/tls-port' is missing
|
|
|
|
Improve this to
|
|
|
|
parameter 'port' or 'tls-port' is required
|
|
|
|
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
Message-ID: <20231031111059.3407803-5-armbru@redhat.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
|
|
Signed-off-by: boringandboring <wangjinlei_yewu@cmss.chinamobile.com>
|
|
---
|
|
monitor/misc.c | 2 +-
|
|
monitor/qmp-cmds.c | 3 ++-
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/monitor/misc.c b/monitor/misc.c
|
|
index a3a6e47844..25a23e2290 100644
|
|
--- a/monitor/misc.c
|
|
+++ b/monitor/misc.c
|
|
@@ -397,7 +397,7 @@ void qmp_client_migrate_info(const char *protocol, const char *hostname,
|
|
}
|
|
|
|
if (!has_port && !has_tls_port) {
|
|
- error_setg(errp, QERR_MISSING_PARAMETER, "port/tls-port");
|
|
+ error_setg(errp, "parameter 'port' or 'tls-port' is required");
|
|
return;
|
|
}
|
|
|
|
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
|
|
index d71beace6a..b44cca8234 100644
|
|
--- a/monitor/qmp-cmds.c
|
|
+++ b/monitor/qmp-cmds.c
|
|
@@ -199,7 +199,8 @@ void qmp_set_password(const char *protocol, const char *password,
|
|
} else if (strcmp(protocol, "vnc") == 0) {
|
|
if (fail_if_connected || disconnect_if_connected) {
|
|
/* vnc supports "connected=keep" only */
|
|
- error_setg(errp, QERR_INVALID_PARAMETER, "connected");
|
|
+ error_setg(errp, "parameter 'connected' must be 'keep'"
|
|
+ " when 'protocol' is 'vnc'");
|
|
return;
|
|
}
|
|
/* Note that setting an empty password will not disable login through
|
|
--
|
|
2.27.0
|
|
|