[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/21] qapi: Inline QERR_INVALID_PARAMETER_VALUE definition (cons
|
From: |
Philippe Mathieu-Daudé |
|
Subject: |
[PATCH 10/21] qapi: Inline QERR_INVALID_PARAMETER_VALUE definition (constant value) |
|
Date: |
Wed, 4 Oct 2023 19:31:45 +0200 |
Address the comment added in commit 4629ed1e98
("qerror: Finally unused, clean up"), from 2015:
/*
* These macros will go away, please don't use
* in new code, and do not add new ones!
*/
Mechanical transformation using the following
coccinelle semantic patch:
@match@
expression errp;
constant param;
constant value;
@@
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, param, value);
@script:python strformat depends on match@
param << match.param;
value << match.value;
fixedfmt; // new var
@@
fixedfmt = "\"Parameter '%s' expects %s\"" % (param[1:-1], value[1:-1])
coccinelle.fixedfmt = cocci.make_ident(fixedfmt)
@replace@
expression match.errp;
constant match.param;
constant match.value;
identifier strformat.fixedfmt;
@@
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, param, value);
+ error_setg(errp, fixedfmt);
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
backends/cryptodev-vhost-user.c | 4 +-
backends/rng-egd.c | 4 +-
backends/rng-random.c | 3 +-
block/quorum.c | 3 +-
blockdev.c | 9 ++--
blockjob.c | 3 +-
chardev/char.c | 3 +-
hw/usb/redirect.c | 4 +-
migration/migration.c | 4 +-
migration/options.c | 94 +++++++++++++--------------------
migration/page_cache.c | 8 +--
migration/ram.c | 4 +-
monitor/fds.c | 8 +--
monitor/qmp-cmds.c | 3 +-
net/filter-buffer.c | 3 +-
net/filter.c | 7 ++-
net/net.c | 9 ++--
qga/commands-win32.c | 4 +-
qom/object_interfaces.c | 2 +-
qom/qom-qmp-cmds.c | 7 ++-
softmmu/balloon.c | 2 +-
softmmu/cpus.c | 3 +-
softmmu/qdev-monitor.c | 11 ++--
ui/ui-qmp-cmds.c | 2 +-
util/qemu-option.c | 3 +-
25 files changed, 88 insertions(+), 119 deletions(-)
diff --git a/backends/cryptodev-vhost-user.c b/backends/cryptodev-vhost-user.c
index c3283ba84a..d93ccd5528 100644
--- a/backends/cryptodev-vhost-user.c
+++ b/backends/cryptodev-vhost-user.c
@@ -136,8 +136,8 @@ cryptodev_vhost_claim_chardev(CryptoDevBackendVhostUser *s,
Chardev *chr;
if (s->chr_name == NULL) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "chardev", "a valid character device");
+ error_setg(errp,
+ "Parameter 'chardev' expects a valid character device");
return NULL;
}
diff --git a/backends/rng-egd.c b/backends/rng-egd.c
index 684c3cf3d6..8f101afadc 100644
--- a/backends/rng-egd.c
+++ b/backends/rng-egd.c
@@ -90,8 +90,8 @@ static void rng_egd_opened(RngBackend *b, Error **errp)
Chardev *chr;
if (s->chr_name == NULL) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "chardev", "a valid character device");
+ error_setg(errp,
+ "Parameter 'chardev' expects a valid character device");
return;
}
diff --git a/backends/rng-random.c b/backends/rng-random.c
index 80eb5be138..9cb7d26cb5 100644
--- a/backends/rng-random.c
+++ b/backends/rng-random.c
@@ -72,8 +72,7 @@ static void rng_random_opened(RngBackend *b, Error **errp)
RngRandom *s = RNG_RANDOM(b);
if (s->filename == NULL) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "filename", "a valid filename");
+ error_setg(errp, "Parameter 'filename' expects a valid filename");
} else {
s->fd = qemu_open_old(s->filename, O_RDONLY | O_NONBLOCK);
if (s->fd == -1) {
diff --git a/block/quorum.c b/block/quorum.c
index 05220cab7f..8e9f279568 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -882,8 +882,7 @@ static int quorum_valid_threshold(int threshold, int
num_children, Error **errp)
{
if (threshold < 1) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "vote-threshold", "a value >= 1");
+ error_setg(errp, "Parameter 'vote-threshold' expects a value >= 1");
return -ERANGE;
}
diff --git a/blockdev.c b/blockdev.c
index da39da457e..ed90365329 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -2340,7 +2340,7 @@ void coroutine_fn qmp_block_resize(const char *device,
const char *node_name,
}
if (size < 0) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "size", "a >0 size");
+ error_setg(errp, "Parameter 'size' expects a >0 size");
return;
}
@@ -2905,13 +2905,12 @@ static void blockdev_mirror_common(const char *job_id,
BlockDriverState *bs,
}
if (granularity != 0 && (granularity < 512 || granularity > 1048576 * 64))
{
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "granularity",
- "a value in range [512B, 64MB]");
+ error_setg(errp,
+ "Parameter 'granularity' expects a value in range [512B,
64MB]");
return;
}
if (granularity & (granularity - 1)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "granularity",
- "a power of 2");
+ error_setg(errp, "Parameter 'granularity' expects a power of 2");
return;
}
diff --git a/blockjob.c b/blockjob.c
index 58c5d64539..f95f73244e 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -297,8 +297,7 @@ bool block_job_set_speed_locked(BlockJob *job, int64_t
speed, Error **errp)
return false;
}
if (speed < 0) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "speed",
- "a non-negative value");
+ error_setg(errp, "Parameter 'speed' expects a non-negative value");
return false;
}
diff --git a/chardev/char.c b/chardev/char.c
index 996a024c7a..447b4d9d06 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -517,8 +517,7 @@ static const ChardevClass *char_get_class(const char
*driver, Error **errp)
}
if (object_class_is_abstract(oc)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "driver",
- "an abstract device type");
+ error_setg(errp, "Parameter 'driver' expects an abstract device type");
return NULL;
}
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index c9893df867..ac6fa34ad1 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -1435,8 +1435,8 @@ static void usbredir_realize(USBDevice *udev, Error
**errp)
&dev->filter_rules,
&dev->filter_rules_count);
if (i) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "filter",
- "a usb device filter string");
+ error_setg(errp,
+ "Parameter 'filter' expects a usb device filter
string");
return;
}
}
diff --git a/migration/migration.c b/migration/migration.c
index 6d3cf5d5cd..b7f6818a15 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1703,8 +1703,8 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
} else if (strstart(uri, "fd:", &p)) {
fd_start_outgoing_migration(s, p, &local_err);
} else {
- error_setg(&local_err, QERR_INVALID_PARAMETER_VALUE, "uri",
- "a valid migration protocol");
+ error_setg(&local_err,
+ "Parameter 'uri' expects a valid migration protocol");
migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
MIGRATION_STATUS_FAILED);
block_cleanup_parameters();
diff --git a/migration/options.c b/migration/options.c
index 1d1e1321b0..3a2180b779 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -1002,137 +1002,121 @@ bool migrate_params_check(MigrationParameters
*params, Error **errp)
{
if (params->has_compress_level &&
(params->compress_level > 9)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "compress_level",
- "a value between 0 and 9");
+ error_setg(errp,
+ "Parameter 'compress_level' expects a value between 0 and
9");
return false;
}
if (params->has_compress_threads && (params->compress_threads < 1)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "compress_threads",
- "a value between 1 and 255");
+ error_setg(errp,
+ "Parameter 'compress_threads' expects a value between 1 and
255");
return false;
}
if (params->has_decompress_threads && (params->decompress_threads < 1)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "decompress_threads",
- "a value between 1 and 255");
+ error_setg(errp,
+ "Parameter 'decompress_threads' expects a value between 1
and 255");
return false;
}
if (params->has_throttle_trigger_threshold &&
(params->throttle_trigger_threshold < 1 ||
params->throttle_trigger_threshold > 100)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "throttle_trigger_threshold",
- "an integer in the range of 1 to 100");
+ error_setg(errp,
+ "Parameter 'throttle_trigger_threshold' expects an integer
in the range of 1 to 100");
return false;
}
if (params->has_cpu_throttle_initial &&
(params->cpu_throttle_initial < 1 ||
params->cpu_throttle_initial > 99)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "cpu_throttle_initial",
- "an integer in the range of 1 to 99");
+ error_setg(errp,
+ "Parameter 'cpu_throttle_initial' expects an integer in the
range of 1 to 99");
return false;
}
if (params->has_cpu_throttle_increment &&
(params->cpu_throttle_increment < 1 ||
params->cpu_throttle_increment > 99)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "cpu_throttle_increment",
- "an integer in the range of 1 to 99");
+ error_setg(errp,
+ "Parameter 'cpu_throttle_increment' expects an integer in
the range of 1 to 99");
return false;
}
if (params->has_max_bandwidth && (params->max_bandwidth > SIZE_MAX)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "max_bandwidth",
- "an integer in the range of 0 to "stringify(SIZE_MAX)
- " bytes/second");
+ error_setg(errp,"Parameter 'max_bandwidth' expects an integer in the
range of 0 to " stringify ( SIZE_MAX )
+ " bytes/second");
return false;
}
if (params->has_downtime_limit &&
(params->downtime_limit > MAX_MIGRATE_DOWNTIME)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "downtime_limit",
- "an integer in the range of 0 to "
- stringify(MAX_MIGRATE_DOWNTIME)" ms");
+ error_setg(errp,
+ "Parameter 'downtime_limit' expects an integer in the range
of 0 to " stringify ( MAX_MIGRATE_DOWNTIME ) " ms");
return false;
}
/* x_checkpoint_delay is now always positive */
if (params->has_multifd_channels && (params->multifd_channels < 1)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "multifd_channels",
- "a value between 1 and 255");
+ error_setg(errp,
+ "Parameter 'multifd_channels' expects a value between 1 and
255");
return false;
}
if (params->has_multifd_zlib_level &&
(params->multifd_zlib_level > 9)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "multifd_zlib_level",
- "a value between 0 and 9");
+ error_setg(errp,
+ "Parameter 'multifd_zlib_level' expects a value between 0
and 9");
return false;
}
if (params->has_multifd_zstd_level &&
(params->multifd_zstd_level > 20)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "multifd_zstd_level",
- "a value between 0 and 20");
+ error_setg(errp,
+ "Parameter 'multifd_zstd_level' expects a value between 0
and 20");
return false;
}
if (params->has_xbzrle_cache_size &&
(params->xbzrle_cache_size < qemu_target_page_size() ||
!is_power_of_2(params->xbzrle_cache_size))) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "xbzrle_cache_size",
- "a power of two no less than the target page size");
+ error_setg(errp,
+ "Parameter 'xbzrle_cache_size' expects a power of two no
less than the target page size");
return false;
}
if (params->has_max_cpu_throttle &&
(params->max_cpu_throttle < params->cpu_throttle_initial ||
params->max_cpu_throttle > 99)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "max_cpu_throttle",
- "an integer in the range of cpu_throttle_initial to 99");
+ error_setg(errp,
+ "Parameter 'max_cpu_throttle' expects an integer in the
range of cpu_throttle_initial to 99");
return false;
}
if (params->has_announce_initial &&
params->announce_initial > 100000) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "announce_initial",
- "a value between 0 and 100000");
+ error_setg(errp,
+ "Parameter 'announce_initial' expects a value between 0 and
100000");
return false;
}
if (params->has_announce_max &&
params->announce_max > 100000) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "announce_max",
- "a value between 0 and 100000");
+ error_setg(errp,
+ "Parameter 'announce_max' expects a value between 0 and
100000");
return false;
}
if (params->has_announce_rounds &&
params->announce_rounds > 1000) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "announce_rounds",
- "a value between 0 and 1000");
+ error_setg(errp,
+ "Parameter 'announce_rounds' expects a value between 0 and
1000");
return false;
}
if (params->has_announce_step &&
(params->announce_step < 1 ||
params->announce_step > 10000)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "announce_step",
- "a value between 0 and 10000");
+ error_setg(errp,
+ "Parameter 'announce_step' expects a value between 0 and
10000");
return false;
}
@@ -1155,17 +1139,15 @@ bool migrate_params_check(MigrationParameters *params,
Error **errp)
if (params->has_x_vcpu_dirty_limit_period &&
(params->x_vcpu_dirty_limit_period < 1 ||
params->x_vcpu_dirty_limit_period > 1000)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "x-vcpu-dirty-limit-period",
- "a value between 1 and 1000");
+ error_setg(errp,
+ "Parameter 'x-vcpu-dirty-limit-period' expects a value
between 1 and 1000");
return false;
}
if (params->has_vcpu_dirty_limit &&
(params->vcpu_dirty_limit < 1)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "vcpu_dirty_limit",
- "is invalid, it must greater then 1 MB/s");
+ error_setg(errp,
+ "Parameter 'vcpu_dirty_limit' expects is invalid, it must
greater then 1 MB/s");
return false;
}
diff --git a/migration/page_cache.c b/migration/page_cache.c
index 6d4f7a9bbc..d430ce742b 100644
--- a/migration/page_cache.c
+++ b/migration/page_cache.c
@@ -45,15 +45,15 @@ PageCache *cache_init(uint64_t new_size, size_t page_size,
Error **errp)
PageCache *cache;
if (new_size < page_size) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size",
- "is smaller than one target page size");
+ error_setg(errp,
+ "Parameter 'cache size' expects is smaller than one target
page size");
return NULL;
}
/* round down to the nearest power of 2 */
if (!is_power_of_2(num_pages)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size",
- "is not a power of two number of pages");
+ error_setg(errp,
+ "Parameter 'cache size' expects is not a power of two
number of pages");
return NULL;
}
diff --git a/migration/ram.c b/migration/ram.c
index e4bfd39f08..0a4a0d7a0e 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -165,8 +165,8 @@ int xbzrle_cache_resize(uint64_t new_size, Error **errp)
/* Check for truncation */
if (new_size != (size_t)new_size) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cache size",
- "exceeding address space");
+ error_setg(errp,
+ "Parameter 'cache size' expects exceeding address space");
return -1;
}
diff --git a/monitor/fds.c b/monitor/fds.c
index d86c2c674c..17e9c126e3 100644
--- a/monitor/fds.c
+++ b/monitor/fds.c
@@ -67,8 +67,8 @@ static bool monitor_add_fd(Monitor *mon, int fd, const char
*fdname, Error **err
if (qemu_isdigit(fdname[0])) {
close(fd);
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "fdname",
- "a name not starting with a digit");
+ error_setg(errp,
+ "Parameter 'fdname' expects a name not starting with a
digit");
return false;
}
@@ -353,8 +353,8 @@ AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id,
int64_t fdset_id,
if (has_fdset_id) {
if (fdset_id < 0) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "fdset-id",
- "a non-negative value");
+ error_setg(errp,
+ "Parameter 'fdset-id' expects a non-negative
value");
return NULL;
}
/* Use specified fdset ID */
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index b0f948d337..2d2e71b867 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -173,8 +173,7 @@ char *qmp_human_monitor_command(const char *command_line,
bool has_cpu_index,
if (has_cpu_index) {
int ret = monitor_set_cpu(&hmp.common, cpu_index);
if (ret < 0) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index",
- "a CPU number");
+ error_setg(errp, "Parameter 'cpu-index' expects a CPU number");
goto out;
}
}
diff --git a/net/filter-buffer.c b/net/filter-buffer.c
index 283dc9cbe6..071029a6c7 100644
--- a/net/filter-buffer.c
+++ b/net/filter-buffer.c
@@ -121,8 +121,7 @@ static void filter_buffer_setup(NetFilterState *nf, Error
**errp)
* or COLO use this filter to release packets on demand.
*/
if (!s->interval) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "interval",
- "a non-zero interval");
+ error_setg(errp, "Parameter 'interval' expects a non-zero interval");
return;
}
diff --git a/net/filter.c b/net/filter.c
index 3335908771..1621513bab 100644
--- a/net/filter.c
+++ b/net/filter.c
@@ -232,8 +232,7 @@ static void netfilter_complete(UserCreatable *uc, Error
**errp)
NET_CLIENT_DRIVER_NIC,
MAX_QUEUE_NUM);
if (queues < 1) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "netdev",
- "a network backend id");
+ error_setg(errp, "Parameter 'netdev' expects a network backend id");
return;
} else if (queues > 1) {
error_setg(errp, "multiqueue is not supported");
@@ -251,8 +250,8 @@ static void netfilter_complete(UserCreatable *uc, Error
**errp)
char *position_id;
if (!g_str_has_prefix(nf->position, "id=")) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "position",
- "'head', 'tail' or 'id=<id>'");
+ error_setg(errp,
+ "Parameter 'position' expects 'head', 'tail' or
'id=<id>'");
return;
}
diff --git a/net/net.c b/net/net.c
index 1c0bfdaa6c..5cdbd9c218 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1236,8 +1236,8 @@ static int net_client_init(QemuOpts *opts, bool
is_netdev, Error **errp)
substrings = g_strsplit(ip6_net, "/", 2);
if (!substrings || !substrings[0]) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "ipv6-net",
- "a valid IPv6 prefix");
+ error_setg(errp,
+ "Parameter 'ipv6-net' expects a valid IPv6 prefix");
goto out;
}
@@ -1247,8 +1247,7 @@ static int net_client_init(QemuOpts *opts, bool
is_netdev, Error **errp)
if (substrings[1] &&
qemu_strtoul(substrings[1], NULL, 10, &prefix_len))
{
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
- "ipv6-prefixlen", "a number");
+ error_setg(errp, "Parameter 'ipv6-prefixlen' expects a number");
goto out;
}
@@ -1283,7 +1282,7 @@ void netdev_add(QemuOpts *opts, Error **errp)
void qmp_netdev_add(Netdev *netdev, Error **errp)
{
if (!id_wellformed(netdev->id)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "id", "an identifier");
+ error_setg(errp, "Parameter 'id' expects an identifier");
return;
}
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 6beae659b7..946dbafbb6 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -328,8 +328,8 @@ void qmp_guest_shutdown(const char *mode, Error **errp)
} else if (strcmp(mode, "reboot") == 0) {
shutdown_flag |= EWX_REBOOT;
} else {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "mode",
- "'halt', 'powerdown', or 'reboot'");
+ error_setg(errp,
+ "Parameter 'mode' expects 'halt', 'powerdown', or
'reboot'");
return;
}
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index 7d31589b04..be04b2c5ab 100644
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -84,7 +84,7 @@ Object *user_creatable_add_type(const char *type, const char
*id,
Error *local_err = NULL;
if (id != NULL && !id_wellformed(id)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "id", "an identifier");
+ error_setg(errp, "Parameter 'id' expects an identifier");
error_append_hint(errp, "Identifiers consist of letters, digits, "
"'-', '.', '_', starting with a letter.\n");
return NULL;
diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c
index 7c087299de..3d014f1bea 100644
--- a/qom/qom-qmp-cmds.c
+++ b/qom/qom-qmp-cmds.c
@@ -136,8 +136,8 @@ ObjectPropertyInfoList *qmp_device_list_properties(const
char *typename,
if (!object_class_dynamic_cast(klass, TYPE_DEVICE)
|| object_class_is_abstract(klass)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "typename",
- "a non-abstract device type");
+ error_setg(errp,
+ "Parameter 'typename' expects a non-abstract device type");
return NULL;
}
@@ -194,8 +194,7 @@ ObjectPropertyInfoList *qmp_qom_list_properties(const char
*typename,
}
if (!object_class_dynamic_cast(klass, TYPE_OBJECT)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "typename",
- "a QOM type");
+ error_setg(errp, "Parameter 'typename' expects a QOM type");
return NULL;
}
diff --git a/softmmu/balloon.c b/softmmu/balloon.c
index e0e8969a4b..d941c6b9c1 100644
--- a/softmmu/balloon.c
+++ b/softmmu/balloon.c
@@ -97,7 +97,7 @@ void qmp_balloon(int64_t target, Error **errp)
}
if (target <= 0) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "target", "a size");
+ error_setg(errp, "Parameter 'target' expects a size");
return;
}
diff --git a/softmmu/cpus.c b/softmmu/cpus.c
index 0848e0dbdb..7fc70f9166 100644
--- a/softmmu/cpus.c
+++ b/softmmu/cpus.c
@@ -753,8 +753,7 @@ void qmp_memsave(int64_t addr, int64_t size, const char
*filename,
cpu = qemu_get_cpu(cpu_index);
if (cpu == NULL) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index",
- "a CPU number");
+ error_setg(errp, "Parameter 'cpu-index' expects a CPU number");
return;
}
diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
index a964bd80df..b17aec4357 100644
--- a/softmmu/qdev-monitor.c
+++ b/softmmu/qdev-monitor.c
@@ -246,16 +246,15 @@ static DeviceClass *qdev_get_device_class(const char
**driver, Error **errp)
}
if (object_class_is_abstract(oc)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "driver",
- "a non-abstract device type");
+ error_setg(errp,
+ "Parameter 'driver' expects a non-abstract device type");
return NULL;
}
dc = DEVICE_CLASS(oc);
if (!dc->user_creatable ||
(phase_check(PHASE_MACHINE_READY) && !dc->hotpluggable)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "driver",
- "a pluggable device type");
+ error_setg(errp, "Parameter 'driver' expects a pluggable device type");
return NULL;
}
@@ -263,8 +262,8 @@ static DeviceClass *qdev_get_device_class(const char
**driver, Error **errp)
/* sysbus devices need to be allowed by the machine */
MachineClass *mc = MACHINE_CLASS(object_get_class(qdev_get_machine()));
if (!device_type_is_dynamic_sysbus(mc, *driver)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "driver",
- "a dynamic sysbus device type for the machine");
+ error_setg(errp,
+ "Parameter 'driver' expects a dynamic sysbus device
type for the machine");
return NULL;
}
}
diff --git a/ui/ui-qmp-cmds.c b/ui/ui-qmp-cmds.c
index 41ca0100e7..a95fd35948 100644
--- a/ui/ui-qmp-cmds.c
+++ b/ui/ui-qmp-cmds.c
@@ -209,7 +209,7 @@ void qmp_client_migrate_info(const char *protocol, const
char *hostname,
return;
}
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", "'spice'");
+ error_setg(errp, "Parameter 'protocol' expects 'spice'");
}
#ifdef CONFIG_PNG
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 201f7a87f3..62dd80a5ae 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -622,8 +622,7 @@ QemuOpts *qemu_opts_create(QemuOptsList *list, const char
*id,
} else if (id) {
assert(fail_if_exists);
if (!id_wellformed(id)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "id",
- "an identifier");
+ error_setg(errp, "Parameter 'id' expects an identifier");
error_append_hint(errp, "Identifiers consist of letters, digits, "
"'-', '.', '_', starting with a letter.\n");
return NULL;
--
2.41.0
- [PATCH 01/21] qapi: Inline and remove QERR_BUS_NO_HOTPLUG definition, (continued)
- [PATCH 01/21] qapi: Inline and remove QERR_BUS_NO_HOTPLUG definition, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 02/21] qapi: Inline and remove QERR_DEVICE_HAS_NO_MEDIUM definition, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 03/21] qapi: Inline and remove QERR_DEVICE_IN_USE definition, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 04/21] qapi: Inline and remove QERR_DEVICE_NO_HOTPLUG definition, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 06/21] qapi: Inline and remove QERR_INVALID_PARAMETER definition, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 07/21] qapi: Inline QERR_INVALID_PARAMETER_TYPE definition (constant param), Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 05/21] qapi: Inline QERR_INVALID_PARAMETER definition (constant parameter), Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 09/21] qapi: Inline and remove QERR_INVALID_PARAMETER_TYPE definition, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 08/21] qapi: Inline QERR_INVALID_PARAMETER_TYPE definition (constant value), Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 10/21] qapi: Inline QERR_INVALID_PARAMETER_VALUE definition (constant value),
Philippe Mathieu-Daudé <=
- [PATCH 11/21] qapi: Inline QERR_INVALID_PARAMETER_VALUE definition (constant param), Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 12/21] qapi: Inline and remove QERR_INVALID_PARAMETER_VALUE definition, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 13/21] qapi: Inline and remove QERR_IO_ERROR definition, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 14/21] qapi: Inline and remove QERR_MIGRATION_ACTIVE definition, Philippe Mathieu-Daudé, 2023/10/04
- [PATCH 16/21] qapi: Inline and remove QERR_MISSING_PARAMETER definition, Philippe Mathieu-Daudé, 2023/10/04