mirror of https://gitlab.com/qemu-project/qemu
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>
This commit is contained in:
parent
a95921f171
commit
f95b25c37e
|
@ -29,7 +29,6 @@
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "qapi/qapi-events-qdev.h"
|
#include "qapi/qapi-events-qdev.h"
|
||||||
#include "qapi/qmp/qdict.h"
|
#include "qapi/qmp/qdict.h"
|
||||||
#include "qapi/qmp/qerror.h"
|
|
||||||
#include "qapi/visitor.h"
|
#include "qapi/visitor.h"
|
||||||
#include "qemu/error-report.h"
|
#include "qemu/error-report.h"
|
||||||
#include "qemu/option.h"
|
#include "qemu/option.h"
|
||||||
|
@ -479,7 +478,8 @@ static void device_set_realized(Object *obj, bool value, Error **errp)
|
||||||
static int unattached_count;
|
static int unattached_count;
|
||||||
|
|
||||||
if (dev->hotplugged && !dc->hotpluggable) {
|
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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,9 +17,6 @@
|
||||||
* add new ones!
|
* add new ones!
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define QERR_DEVICE_NO_HOTPLUG \
|
|
||||||
"Device '%s' does not support hotplugging"
|
|
||||||
|
|
||||||
#define QERR_INVALID_PARAMETER \
|
#define QERR_INVALID_PARAMETER \
|
||||||
"Invalid parameter '%s'"
|
"Invalid parameter '%s'"
|
||||||
|
|
||||||
|
|
|
@ -917,7 +917,7 @@ void qdev_unplug(DeviceState *dev, Error **errp)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!dc->hotpluggable) {
|
if (!dc->hotpluggable) {
|
||||||
error_setg(errp, QERR_DEVICE_NO_HOTPLUG,
|
error_setg(errp, "Device '%s' does not support hotplugging",
|
||||||
object_get_typename(OBJECT(dev)));
|
object_get_typename(OBJECT(dev)));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue