[Qemu-devel] [PATCH] qerror.h: Swap definitions that were not in alphabetical order

[Qemu-devel] [PATCH] qerror.h: Swap definitions that were not in alphabetical order

[Alberto Garcia]

Signed-off-by: Alberto Garcia <berto@igalia.com>
---
 include/qapi/qmp/qerror.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h
index 986260f..57a62d4 100644
--- a/include/qapi/qmp/qerror.h
+++ b/include/qapi/qmp/qerror.h
@@ -37,12 +37,12 @@ void qerror_report_err(Error *err);
 #define QERR_BASE_NOT_FOUND \
     ERROR_CLASS_GENERIC_ERROR, "Base '%s' not found"
 
-#define QERR_BLOCK_JOB_NOT_READY \
-    ERROR_CLASS_GENERIC_ERROR, "The active block job for device '%s' cannot be completed"
-
 #define QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED \
     ERROR_CLASS_GENERIC_ERROR, "Block format '%s' used by device '%s' does not support feature '%s'"
 
+#define QERR_BLOCK_JOB_NOT_READY \
+    ERROR_CLASS_GENERIC_ERROR, "The active block job for device '%s' cannot be completed"
+
 #define QERR_BUS_NO_HOTPLUG \
     ERROR_CLASS_GENERIC_ERROR, "Bus '%s' does not support hotplugging"
 
-- 
2.1.4

Re: [Qemu-devel] [PATCH] qerror.h: Swap definitions that were not in alphabetical order

[John Snow]

On 02/20/2015 01:53 PM, Alberto Garcia wrote:
> Signed-off-by: Alberto Garcia <berto@igalia.com>
> ---
>   include/qapi/qmp/qerror.h | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h
> index 986260f..57a62d4 100644
> --- a/include/qapi/qmp/qerror.h
> +++ b/include/qapi/qmp/qerror.h
> @@ -37,12 +37,12 @@ void qerror_report_err(Error *err);
>   #define QERR_BASE_NOT_FOUND \
>       ERROR_CLASS_GENERIC_ERROR, "Base '%s' not found"
>
> -#define QERR_BLOCK_JOB_NOT_READY \
> -    ERROR_CLASS_GENERIC_ERROR, "The active block job for device '%s' cannot be completed"
> -
>   #define QERR_BLOCK_FORMAT_FEATURE_NOT_SUPPORTED \
>       ERROR_CLASS_GENERIC_ERROR, "Block format '%s' used by device '%s' does not support feature '%s'"
>
> +#define QERR_BLOCK_JOB_NOT_READY \
> +    ERROR_CLASS_GENERIC_ERROR, "The active block job for device '%s' cannot be completed"
> +
>   #define QERR_BUS_NO_HOTPLUG \
>       ERROR_CLASS_GENERIC_ERROR, "Bus '%s' does not support hotplugging"
>
>

Cc: qemu-trivial@nongnu.org

Reviewed-by: John Snow <jsnow@redhat.com>

Re: [Qemu-devel] [PATCH] qerror.h: Swap definitions that were not in alphabetical order

[Michael Tokarev]

Applied to -trivial, thank you!

Markus, should I add your Reviewed-By (or Acked-By)?

/mjt

Re: [Qemu-devel] [PATCH] qerror.h: Swap definitions that were not in alphabetical order

[Markus Armbruster]

Michael Tokarev <mjt@tls.msk.ru> writes:

> Applied to -trivial, thank you!
>
> Markus, should I add your Reviewed-By (or Acked-By)?

I'm working towards getting rid of the whole thing.  But until then,
keeping it sorted is good.

Reviewed-by: Markus Armbruster <armbru@redhat.com>