Skip to contentSkip to conversation

qerror.h: Swap definitions that were not in alphabetical order

PATCH Applied Alberto Garcia 3 participants 4 messages Feb 20, 2015 – Mar 2, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qerror.h: Swap definitions that were not in alphabetical order

---
 include/qapi/qmp/qerror.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
include/qapi/qmp/qerror.h +3 -3
index 986260f..57a62d4 100644
@@ -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"
 
Signature · 1 line
2.1.4
#1 lore raw

Looks good, except you need to send to [email protected] in addition to qemu-trivial. Thanks!

Quoted 24 lines · Alberto Garcia
---
 include/qapi/qmp/qerror.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
include/qapi/qmp/qerror.h +3 -3
index 986260f..57a62d4 100644
@@ -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"
Reviewed-by
#3 lore raw
Quoted 3 lines · Michael Tokarev

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.