[Qemu-devel] [PATCH] qerror: Improve QERR_DEVICE_NOT_ACTIVE message

[Hani Benhabiles <kroosec@gmail.com>]

The error message as currently used is confusing as there are no "balloon" or
"spice" devices.

(qemu) balloon 1024
balloon: Device 'balloon' has not been activated

With this patch:

(qemu) balloon 1024
balloon: No balloon device has been activated

Signed-off-by: Hani Benhabiles <hani@linux.com>
Suggested-by: Markus Armbruster <armbru@redhat.com>
---
 include/qapi/qmp/qerror.h | 2 +-
 qmp.c                     | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h
index 73c67b7..25193c9 100644
--- a/include/qapi/qmp/qerror.h
+++ b/include/qapi/qmp/qerror.h
@@ -105,7 +105,7 @@ void qerror_report_err(Error *err);
     ERROR_CLASS_GENERIC_ERROR, "Device '%s' does not support hotplugging"
 
 #define QERR_DEVICE_NOT_ACTIVE \
-    ERROR_CLASS_DEVICE_NOT_ACTIVE, "Device '%s' has not been activated"
+    ERROR_CLASS_DEVICE_NOT_ACTIVE, "No %s device has been activated"
 
 #define QERR_DEVICE_NOT_ENCRYPTED \
     ERROR_CLASS_GENERIC_ERROR, "Device '%s' is not encrypted"
diff --git a/qmp.c b/qmp.c
index d0d98e7..ffddd26 100644
--- a/qmp.c
+++ b/qmp.c
@@ -289,7 +289,6 @@ void qmp_set_password(const char *protocol, const char *password,
 
     if (strcmp(protocol, "spice") == 0) {
         if (!using_spice) {
-            /* correct one? spice isn't a device ,,, */
             error_set(errp, QERR_DEVICE_NOT_ACTIVE, "spice");
             return;
         }
@@ -337,7 +336,6 @@ void qmp_expire_password(const char *protocol, const char *whenstr,
 
     if (strcmp(protocol, "spice") == 0) {
         if (!using_spice) {
-            /* correct one? spice isn't a device ,,, */
             error_set(errp, QERR_DEVICE_NOT_ACTIVE, "spice");
             return;
         }
-- 
1.8.3.2