diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-03-12 15:13:37 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2024-04-24 09:50:58 +0200 |
| commit | f95b25c37e34d575346fb171b2f59c162bbefb38 (patch) | |
| tree | a740c8bca60f8fb268fc75729ae226be5edfc37d | |
| parent | a95921f1712b5f3bb9f905a08984b478b89e0fa5 (diff) | |
| download | qemu-f95b25c37e34d575346fb171b2f59c162bbefb38.zip qemu-f95b25c37e34d575346fb171b2f59c162bbefb38.tar.gz qemu-f95b25c37e34d575346fb171b2f59c162bbefb38.tar.bz2 | |
qapi: Inline and remove QERR_DEVICE_NO_HOTPLUG definition
Address the comment added in commit 4629ed1e98
("qerror: Finally unused, clean up"), from 2015:
/*
* These macros will go away, please don't use
* in new code, and do not add new ones!
*/
Mechanical transformation using sed, and manual cleanup.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240312141343.3168265-5-armbru@redhat.com>
| -rw-r--r-- | hw/core/qdev.c | 4 | ||||
| -rw-r--r-- | include/qapi/qmp/qerror.h | 3 | ||||
| -rw-r--r-- | system/qdev-monitor.c | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/hw/core/qdev.c b/hw/core/qdev.c index c68d0f7..00efaf1 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -29,7 +29,6 @@ #include "qapi/error.h" #include "qapi/qapi-events-qdev.h" #include "qapi/qmp/qdict.h" -#include "qapi/qmp/qerror.h" #include "qapi/visitor.h" #include "qemu/error-report.h" #include "qemu/option.h" @@ -479,7 +478,8 @@ static void device_set_realized(Object *obj, bool value, Error **errp) static int unattached_count; if (dev->hotplugged && !dc->hotpluggable) { - error_setg(errp, QERR_DEVICE_NO_HOTPLUG, object_get_typename(obj)); + error_setg(errp, "Device '%s' does not support hotplugging", + object_get_typename(obj)); return; } diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index daa8898..e932110 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -17,9 +17,6 @@ * add new ones! */ -#define QERR_DEVICE_NO_HOTPLUG \ - "Device '%s' does not support hotplugging" - #define QERR_INVALID_PARAMETER \ "Invalid parameter '%s'" diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index 2ae1460..6af6ef7 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -917,7 +917,7 @@ void qdev_unplug(DeviceState *dev, Error **errp) } if (!dc->hotpluggable) { - error_setg(errp, QERR_DEVICE_NO_HOTPLUG, + error_setg(errp, "Device '%s' does not support hotplugging", object_get_typename(OBJECT(dev))); return; } |