diff options
| author | Markus Armbruster <armbru@redhat.com> | 2023-02-07 08:51:10 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2023-02-23 14:10:17 +0100 |
| commit | 36ebc7db796e6ac97b400dc544192e2e36986b03 (patch) | |
| tree | bf5ca955c9692b0b38fbbc780c2e9b55c067fa60 /stubs | |
| parent | 588c13fcb015896e4d1f7a516d8ce6336e64133b (diff) | |
| download | qemu-36ebc7db796e6ac97b400dc544192e2e36986b03.zip qemu-36ebc7db796e6ac97b400dc544192e2e36986b03.tar.gz qemu-36ebc7db796e6ac97b400dc544192e2e36986b03.tar.bz2 | |
hw/acpi: Move QMP command to hw/core/
The QERR_ macros are leftovers from the days of "rich" error objects.
We've been trying to reduce their remaining use.
qmp_query_vm_generation_id() in stubs/vmgenid.c is the last user of
QERR_UNSUPPORTED outside qga/. Unlike the stubs we just dropped, it
is actually reachable, namely when CONFIG_ACPI_VMGENID is off. It
always fails like
(qemu) info vm-generation-id
Error: this feature or command is not currently supported
Turns out the real qmp_query_vm_generation_id() doesn't actually
depend on CONFIG_ACPI_VMGENID, and fails safely when it's off. Move
it to hw/core/machine-qmp-cmds.c, and drop the stub. The error
message becomes
Error: VM Generation ID device not found
Feels like an improvement to me.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230207075115.1525-8-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'stubs')
| -rw-r--r-- | stubs/meson.build | 1 | ||||
| -rw-r--r-- | stubs/vmgenid.c | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/stubs/meson.build b/stubs/meson.build index 981585c..7657467 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -45,7 +45,6 @@ stub_ss.add(files('target-get-monitor-def.c')) stub_ss.add(files('target-monitor-defs.c')) stub_ss.add(files('trace-control.c')) stub_ss.add(files('uuid.c')) -stub_ss.add(files('vmgenid.c')) stub_ss.add(files('vmstate.c')) stub_ss.add(files('vm-stop.c')) stub_ss.add(files('win32-kbd-hook.c')) diff --git a/stubs/vmgenid.c b/stubs/vmgenid.c deleted file mode 100644 index bfad656..0000000 --- a/stubs/vmgenid.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "qemu/osdep.h" -#include "qapi/error.h" -#include "qapi/qapi-commands-machine.h" -#include "qapi/qmp/qerror.h" - -GuidInfo *qmp_query_vm_generation_id(Error **errp) -{ - error_setg(errp, QERR_UNSUPPORTED); - return NULL; -} |