Commit 75158ebb authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qerror: Eliminate QERR_DEVICE_NOT_FOUND 



Error classes other than ERROR_CLASS_GENERIC_ERROR should not be used
in new code.  Hiding them in QERR_ macros makes new uses hard to spot.
Fortunately, there's just one such macro left.  Eliminate it with this
coccinelle semantic patch:

    @@
    expression EP, E;
    @@
    -error_set(EP, QERR_DEVICE_NOT_FOUND, E)
    +error_set(EP, ERROR_CLASS_DEVICE_NOT_FOUND, "Device '%s' not found", E)

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent c6bf0f7f

backends/rng-egd.c

+2 −1
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ static void rng_egd_opened(RngBackend *b, Error **errp) 


    s->chr = qemu_chr_find(s->chr_name);

    if (s->chr == NULL) {

        error_set(errp, QERR_DEVICE_NOT_FOUND, s->chr_name);

        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,

                  "Device '%s' not found", s->chr_name);

        return;

    }

blockdev-nbd.c

+2 −1
Original line number Diff line number Diff line
@@ -91,7 +91,8 @@ void qmp_nbd_server_add(const char *device, bool has_writable, bool writable, 


    blk = blk_by_name(device);

    if (!blk) {

        error_set(errp, QERR_DEVICE_NOT_FOUND, device);

        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,

                  "Device '%s' not found", device);

        return;

    }

    if (!blk_is_inserted(blk)) {

blockdev.c

+22 −11
Original line number Diff line number Diff line
@@ -1111,7 +1111,8 @@ SnapshotInfo *qmp_blockdev_snapshot_delete_internal_sync(const char *device, 


    blk = blk_by_name(device);

    if (!blk) {

        error_set(errp, QERR_DEVICE_NOT_FOUND, device);

        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,

                  "Device '%s' not found", device);

        return NULL;

    }

    bs = blk_bs(blk);
@@ -1300,7 +1301,8 @@ static void internal_snapshot_prepare(BlkTransactionState *common, 
    /* 2. check for validation */

    blk = blk_by_name(device);

    if (!blk) {

        error_set(errp, QERR_DEVICE_NOT_FOUND, device);

        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,

                  "Device '%s' not found", device);

        return;

    }

    bs = blk_bs(blk);
@@ -1580,7 +1582,8 @@ static void drive_backup_prepare(BlkTransactionState *common, Error **errp) 


    blk = blk_by_name(backup->device);

    if (!blk) {

        error_set(errp, QERR_DEVICE_NOT_FOUND, backup->device);

        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,

                  "Device '%s' not found", backup->device);

        return;

    }

    bs = blk_bs(blk);
@@ -1850,7 +1853,8 @@ void qmp_eject(const char *device, bool has_force, bool force, Error **errp) 


    blk = blk_by_name(device);

    if (!blk) {

        error_set(errp, QERR_DEVICE_NOT_FOUND, device);

        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,

                  "Device '%s' not found", device);

        return;

    }
@@ -1910,7 +1914,8 @@ void qmp_change_blockdev(const char *device, const char *filename, 


    blk = blk_by_name(device);

    if (!blk) {

        error_set(errp, QERR_DEVICE_NOT_FOUND, device);

        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,

                  "Device '%s' not found", device);

        return;

    }

    bs = blk_bs(blk);
@@ -1971,7 +1976,8 @@ void qmp_block_set_io_throttle(const char *device, int64_t bps, int64_t bps_rd, 


    blk = blk_by_name(device);

    if (!blk) {

        error_set(errp, QERR_DEVICE_NOT_FOUND, device);

        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,

                  "Device '%s' not found", device);

        return;

    }

    bs = blk_bs(blk);
@@ -2291,7 +2297,8 @@ void qmp_block_stream(const char *device, 


    blk = blk_by_name(device);

    if (!blk) {

        error_set(errp, QERR_DEVICE_NOT_FOUND, device);

        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,

                  "Device '%s' not found", device);

        return;

    }

    bs = blk_bs(blk);
@@ -2365,7 +2372,8 @@ void qmp_block_commit(const char *device, 
     *  scenario in which all optional arguments are omitted. */

    blk = blk_by_name(device);

    if (!blk) {

        error_set(errp, QERR_DEVICE_NOT_FOUND, device);

        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,

                  "Device '%s' not found", device);

        return;

    }

    bs = blk_bs(blk);
@@ -2477,7 +2485,8 @@ void qmp_drive_backup(const char *device, const char *target, 


    blk = blk_by_name(device);

    if (!blk) {

        error_set(errp, QERR_DEVICE_NOT_FOUND, device);

        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,

                  "Device '%s' not found", device);

        return;

    }

    bs = blk_bs(blk);
@@ -2691,7 +2700,8 @@ void qmp_drive_mirror(const char *device, const char *target, 


    blk = blk_by_name(device);

    if (!blk) {

        error_set(errp, QERR_DEVICE_NOT_FOUND, device);

        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,

                  "Device '%s' not found", device);

        return;

    }

    bs = blk_bs(blk);
@@ -2957,7 +2967,8 @@ void qmp_change_backing_file(const char *device, 


    blk = blk_by_name(device);

    if (!blk) {

        error_set(errp, QERR_DEVICE_NOT_FOUND, device);

        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,

                  "Device '%s' not found", device);

        return;

    }

    bs = blk_bs(blk);

hmp.c

+4 −2
Original line number Diff line number Diff line
@@ -1867,7 +1867,8 @@ void hmp_qemu_io(Monitor *mon, const QDict *qdict) 
    if (blk) {

        qemuio_command(blk, command);

    } else {

        error_set(&err, QERR_DEVICE_NOT_FOUND, device);

        error_set(&err, ERROR_CLASS_DEVICE_NOT_FOUND,

                  "Device '%s' not found", device);

    }



    hmp_handle_error(mon, &err);
@@ -1995,7 +1996,8 @@ void hmp_qom_set(Monitor *mon, const QDict *qdict) 


    obj = object_resolve_path(path, &ambiguous);

    if (obj == NULL) {

        error_set(&err, QERR_DEVICE_NOT_FOUND, path);

        error_set(&err, ERROR_CLASS_DEVICE_NOT_FOUND,

                  "Device '%s' not found", path);

    } else {

        if (ambiguous) {

            monitor_printf(mon, "Warning: Path '%s' is ambiguous\n", path);

include/qapi/qmp/qerror.h

+0 −3
Original line number Diff line number Diff line
@@ -55,9 +55,6 @@ void qerror_report_err(Error *err); 
#define QERR_DEVICE_NO_HOTPLUG \

    ERROR_CLASS_GENERIC_ERROR, "Device '%s' does not support hotplugging"



#define QERR_DEVICE_NOT_FOUND \

    ERROR_CLASS_DEVICE_NOT_FOUND, "Device '%s' not found"



#define QERR_FD_NOT_FOUND \

    ERROR_CLASS_GENERIC_ERROR, "File descriptor named '%s' not found"