haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

qerror: Eliminate QERR_ macros used in just one place

Browse source 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201113082626.2725812-3-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2020-11-13 09:26:18 +01:00
parent ac114d5cd5
commit f820af8743
3 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/qapi/qmp/qerror.h
View file

@ -25,21 +25,12 @@
#define QERR_DEVICE_HAS_NO_MEDIUM \ #define QERR_DEVICE_HAS_NO_MEDIUM \
"Device '%s' has no medium" "Device '%s' has no medium"
#define QERR_DEVICE_INIT_FAILED \
"Device '%s' could not be initialized"
#define QERR_DEVICE_IN_USE \ #define QERR_DEVICE_IN_USE \
"Device '%s' is in use" "Device '%s' is in use"
#define QERR_DEVICE_NO_HOTPLUG \ #define QERR_DEVICE_NO_HOTPLUG \
"Device '%s' does not support hotplugging" "Device '%s' does not support hotplugging"
#define QERR_FD_NOT_FOUND \
"File descriptor named '%s' not found"
#define QERR_FD_NOT_SUPPLIED \
"No file descriptor supplied via SCM_RIGHTS"
#define QERR_FEATURE_DISABLED \ #define QERR_FEATURE_DISABLED \
"The feature '%s' is not enabled" "The feature '%s' is not enabled"

8
monitor/misc.c
View file

@ -1232,7 +1232,7 @@ void qmp_getfd(const char *fdname, Error **errp)
fd = qemu_chr_fe_get_msgfd(&cur_mon->chr); fd = qemu_chr_fe_get_msgfd(&cur_mon->chr);
if (fd == -1) { if (fd == -1) {
error_setg(errp, QERR_FD_NOT_SUPPLIED); error_setg(errp, "No file descriptor supplied via SCM_RIGHTS");
return; return;
} }
@ -1286,7 +1286,7 @@ void qmp_closefd(const char *fdname, Error **errp)
} }
qemu_mutex_unlock(&cur_mon->mon_lock); qemu_mutex_unlock(&cur_mon->mon_lock);
error_setg(errp, QERR_FD_NOT_FOUND, fdname); error_setg(errp, "File descriptor named '%s' not found", fdname);
} }
int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp) int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp)
@ -1357,7 +1357,7 @@ AddfdInfo *qmp_add_fd(bool has_fdset_id, int64_t fdset_id, bool has_opaque,
fd = qemu_chr_fe_get_msgfd(&mon->chr); fd = qemu_chr_fe_get_msgfd(&mon->chr);
if (fd == -1) { if (fd == -1) {
error_setg(errp, QERR_FD_NOT_SUPPLIED); error_setg(errp, "No file descriptor supplied via SCM_RIGHTS");
goto error; goto error;
} }
@ -1410,7 +1410,7 @@ error:
} else { } else {
snprintf(fd_str, sizeof(fd_str), "fdset-id:%" PRId64, fdset_id); snprintf(fd_str, sizeof(fd_str), "fdset-id:%" PRId64, fdset_id);
} }
error_setg(errp, QERR_FD_NOT_FOUND, fd_str); error_setg(errp, "File descriptor named '%s' not found", fd_str);
} }
FdsetInfoList *qmp_query_fdsets(Error **errp) FdsetInfoList *qmp_query_fdsets(Error **errp)

2
net/net.c
View file

@ -1013,7 +1013,7 @@ static int net_client_init1(const Netdev *netdev, bool is_netdev, Error **errp)
if (net_client_init_fun[netdev->type](netdev, netdev->id, peer, errp) < 0) { if (net_client_init_fun[netdev->type](netdev, netdev->id, peer, errp) < 0) {
/* FIXME drop when all init functions store an Error */ /* FIXME drop when all init functions store an Error */
if (errp && !*errp) { if (errp && !*errp) {
error_setg(errp, QERR_DEVICE_INIT_FAILED, error_setg(errp, "Device '%s' could not be initialized",
NetClientDriver_str(netdev->type)); NetClientDriver_str(netdev->type));
} }
return -1; return -1;