mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qapi: Inline and remove QERR_DEVICE_HAS_NO_MEDIUM definition

Browse Source 
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 sed, and manual cleanup.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240312141343.3168265-4-armbru@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2024-03-12 15:13:36 +01:00 committed by Markus Armbruster
parent 7f65e789ab
commit a95921f171
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
block/snapshot.c
View File

@ -28,7 +28,6 @@
#include "block/qdict.h" #include "block/qdict.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
#include "qapi/qmp/qstring.h" #include "qapi/qmp/qstring.h"
#include "qemu/option.h" #include "qemu/option.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
@ -359,7 +358,8 @@ int bdrv_snapshot_delete(BlockDriverState *bs,
GLOBAL_STATE_CODE(); GLOBAL_STATE_CODE();
if (!drv) { if (!drv) {
error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, bdrv_get_device_name(bs)); error_setg(errp, "Device '%s' has no medium",
bdrv_get_device_name(bs));
return -ENOMEDIUM; return -ENOMEDIUM;
} }
if (!snapshot_id && !name) { if (!snapshot_id && !name) {
@ -437,7 +437,8 @@ int bdrv_snapshot_load_tmp(BlockDriverState *bs,
GRAPH_RDLOCK_GUARD_MAINLOOP(); GRAPH_RDLOCK_GUARD_MAINLOOP();
if (!drv) { if (!drv) {
error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, bdrv_get_device_name(bs)); error_setg(errp, "Device '%s' has no medium",
bdrv_get_device_name(bs));
return -ENOMEDIUM; return -ENOMEDIUM;
} }
if (!snapshot_id && !name) { if (!snapshot_id && !name) {

2
blockdev.c
View File

@ -1395,7 +1395,7 @@ static void external_snapshot_action(TransactionAction *action,
bdrv_drained_begin(state->old_bs); bdrv_drained_begin(state->old_bs);
if (!bdrv_is_inserted(state->old_bs)) { if (!bdrv_is_inserted(state->old_bs)) {
error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, error_setg(errp, "Device '%s' has no medium",
bdrv_get_device_or_node_name(state->old_bs)); bdrv_get_device_or_node_name(state->old_bs));
return; return;
} }

3
include/qapi/qmp/qerror.h
View File

@ -17,9 +17,6 @@
* add new ones! * add new ones!
*/ */
#define QERR_DEVICE_HAS_NO_MEDIUM \
"Device '%s' has no medium"
#define QERR_DEVICE_NO_HOTPLUG \ #define QERR_DEVICE_NO_HOTPLUG \
"Device '%s' does not support hotplugging" "Device '%s' does not support hotplugging"