Re: [Qemu-devel] [PATCH 05/11] qerror: Clean up QERR_ macros to expand into a single string

[Stefan Hajnoczi <stefanha@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 3530 bytes --]

On Sat, Jun 13, 2015 at 04:20:52PM +0200, Markus Armbruster wrote:
> These macros expand into error class enumeration constant, comma,
> string.  Unclean.  Has been that way since commit 13f59ae.
> 
> 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: Markus Armbruster <armbru@redhat.com>
> ---
>  backends/rng-egd.c               |  8 ++---
>  backends/rng-random.c            |  6 ++--
>  backends/rng.c                   |  2 +-
>  backends/tpm.c                   |  2 +-
>  balloon.c                        |  2 +-
>  block.c                          |  2 +-
>  block/backup.c                   |  4 +--
>  block/commit.c                   |  2 +-
>  block/mirror.c                   |  8 ++---
>  block/qcow.c                     |  4 +--
>  block/qcow2.c                    |  4 +--
>  block/qed.c                      |  4 +--
>  block/quorum.c                   |  4 +--
>  block/snapshot.c                 |  4 +--
>  block/stream.c                   |  4 +--
>  block/vmdk.c                     | 12 ++++----
>  blockdev-nbd.c                   |  2 +-
>  blockdev.c                       | 43 +++++++++++++-------------
>  blockjob.c                       |  8 ++---
>  cpus.c                           |  8 ++---
>  dump.c                           | 12 ++++----
>  hmp.c                            | 10 +++---
>  hw/core/nmi.c                    |  2 +-
>  hw/core/qdev-properties-system.c |  3 +-
>  hw/core/qdev-properties.c        | 12 ++++----
>  hw/core/qdev.c                   |  8 ++---
>  hw/intc/openpic.c                |  6 ++--
>  hw/pci/pci-stub.c                |  2 +-
>  hw/ppc/spapr_pci.c               |  8 ++---
>  hw/s390x/s390-virtio.c           |  2 +-
>  hw/usb/redirect.c                |  6 ++--
>  include/qapi/qmp/qerror.h        | 60 ++++++++++++++++++------------------
>  migration/migration.c            | 35 ++++++++++-----------
>  migration/savevm.c               |  2 +-
>  monitor.c                        | 66 ++++++++++++++++++++--------------------
>  net/net.c                        | 12 ++++----
>  qapi/opts-visitor.c              | 24 +++++++--------
>  qapi/qapi-visit-core.c           | 28 ++++++++---------
>  qapi/qmp-dispatch.c              | 12 ++++----
>  qapi/qmp-input-visitor.c         | 28 ++++++++---------
>  qapi/string-input-visitor.c      | 24 +++++++--------
>  qdev-monitor.c                   | 12 ++++----
>  qemu-img.c                       |  2 +-
>  qga/commands-posix.c             | 40 ++++++++++++------------
>  qga/commands-win32.c             | 66 ++++++++++++++++++++--------------------
>  qga/main.c                       |  4 +--
>  qmp.c                            | 34 ++++++++++-----------
>  qom/object.c                     | 12 ++++----
>  stubs/arch-query-cpu-def.c       |  2 +-
>  target-i386/cpu.c                | 19 ++++++------
>  tpm.c                            |  8 +++--
>  ui/vnc.c                         |  4 +--
>  util/qemu-option.c               | 22 ++++++++------
>  53 files changed, 362 insertions(+), 358 deletions(-)

Nice simplification.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]