Commit c6bd8c70 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qerror: Clean up QERR_ macros to expand into a single string 



These macros expand into error class enumeration constant, comma,
string.  Unclean.  Has been that way since commit 13f59ae8.

The error class is always ERROR_CLASS_GENERIC_ERROR since the previous
commit.

Clean up as follows:

* Prepend every use of a QERR_ macro by ERROR_CLASS_GENERIC_ERROR, and
  delete it from the QERR_ macro.  No change after preprocessing.

* Rewrite error_set(ERROR_CLASS_GENERIC_ERROR, ...) into
  error_setg(...).  Again, no change after preprocessing.

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

backends/rng-egd.c

+4 −4
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static void rng_egd_opened(RngBackend *b, Error **errp) 
    RngEgd *s = RNG_EGD(b);



    if (s->chr_name == NULL) {

        error_set(errp, QERR_INVALID_PARAMETER_VALUE,

        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,

                   "chardev", "a valid character device");

        return;

    }
@@ -153,7 +153,7 @@ static void rng_egd_opened(RngBackend *b, Error **errp) 
    }



    if (qemu_chr_fe_claim(s->chr) != 0) {

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

        error_setg(errp, QERR_DEVICE_IN_USE, s->chr_name);

        return;

    }
@@ -168,7 +168,7 @@ static void rng_egd_set_chardev(Object *obj, const char *value, Error **errp) 
    RngEgd *s = RNG_EGD(b);



    if (b->opened) {

        error_set(errp, QERR_PERMISSION_DENIED);

        error_setg(errp, QERR_PERMISSION_DENIED);

    } else {

        g_free(s->chr_name);

        s->chr_name = g_strdup(value);

backends/rng-random.c

+3 −3
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static void rng_random_opened(RngBackend *b, Error **errp) 
    RndRandom *s = RNG_RANDOM(b);



    if (s->filename == NULL) {

        error_set(errp, QERR_INVALID_PARAMETER_VALUE,

        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,

                   "filename", "a valid filename");

    } else {

        s->fd = qemu_open(s->filename, O_RDONLY | O_NONBLOCK);
@@ -98,7 +98,7 @@ static void rng_random_set_filename(Object *obj, const char *filename, 
    RndRandom *s = RNG_RANDOM(obj);



    if (b->opened) {

        error_set(errp, QERR_PERMISSION_DENIED);

        error_setg(errp, QERR_PERMISSION_DENIED);

        return;

    }

backends/rng.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static void rng_backend_prop_set_opened(Object *obj, bool value, Error **errp) 
    }



    if (!value && s->opened) {

        error_set(errp, QERR_PERMISSION_DENIED);

        error_setg(errp, QERR_PERMISSION_DENIED);

        return;

    }

backends/tpm.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static void tpm_backend_prop_set_opened(Object *obj, bool value, Error **errp) 
    }



    if (!value && s->opened) {

        error_set(errp, QERR_PERMISSION_DENIED);

        error_setg(errp, QERR_PERMISSION_DENIED);

        return;

    }

balloon.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ void qmp_balloon(int64_t target, Error **errp) 
    }



    if (target <= 0) {

        error_set(errp, QERR_INVALID_PARAMETER_VALUE, "target", "a size");

        error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "target", "a size");

        return;

    }