[PATCH 06/12] hw/acpi: Dumb down acpi_table_add() stub

Markus Armbruster posted 12 patches 3 years ago
[PATCH 06/12] hw/acpi: Dumb down acpi_table_add() stub
Posted by Markus Armbruster 3 years ago
The QERR_ macros are leftovers from the days of "rich" error objects.
We've been trying to reduce their remaining use.

acpi_table_add() is only ever called on behalf of CLI option
-acpitable.  Since qemu-options.hx sets @arch_mask to QEMU_ARCH_I386,
it is reachable only for these targets.  Since they provide a real
acpi_table_add(), the stub is unreachable.

There's no point in unreachable code keeping QERR_UNSUPPORTED alive.
Dumb it down to g_assert_not_reached().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/acpi/acpi-stub.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hw/acpi/acpi-stub.c b/hw/acpi/acpi-stub.c
index 4c9d081ed4..e268ce9b1a 100644
--- a/hw/acpi/acpi-stub.c
+++ b/hw/acpi/acpi-stub.c
@@ -19,11 +19,9 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
 #include "hw/acpi/acpi.h"
 
 void acpi_table_add(const QemuOpts *opts, Error **errp)
 {
-    error_setg(errp, QERR_UNSUPPORTED);
+    g_assert_not_reached();
 }
-- 
2.39.0
Re: [PATCH 06/12] hw/acpi: Dumb down acpi_table_add() stub
Posted by Juan Quintela 3 years ago
Markus Armbruster <armbru@redhat.com> wrote:
> The QERR_ macros are leftovers from the days of "rich" error objects.
> We've been trying to reduce their remaining use.
>
> acpi_table_add() is only ever called on behalf of CLI option
> -acpitable.  Since qemu-options.hx sets @arch_mask to QEMU_ARCH_I386,
> it is reachable only for these targets.  Since they provide a real
> acpi_table_add(), the stub is unreachable.
>
> There's no point in unreachable code keeping QERR_UNSUPPORTED alive.
> Dumb it down to g_assert_not_reached().
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>