| Message ID | 20230207075115.1525-6-armbru@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | error: Reduce qerror.h usage a bit more | expand |
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. > > smbios_entry_add() is only ever called on behalf of CLI option > -smbios. Since qemu-options.hx sets @arch_mask to QEMU_ARCH_I386 | > QEMU_ARCH_ARM, it is reachable only for these targets. Since they > provide a real smbios_entry_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>
diff --git a/hw/smbios/smbios-stub.c b/hw/smbios/smbios-stub.c index 64e5ba93ec..e8808adfda 100644 --- a/hw/smbios/smbios-stub.c +++ b/hw/smbios/smbios-stub.c @@ -21,11 +21,9 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" -#include "qapi/qmp/qerror.h" #include "hw/firmware/smbios.h" void smbios_entry_add(QemuOpts *opts, Error **errp) { - error_setg(errp, QERR_UNSUPPORTED); + g_assert_not_reached(); }
The QERR_ macros are leftovers from the days of "rich" error objects. We've been trying to reduce their remaining use. smbios_entry_add() is only ever called on behalf of CLI option -smbios. Since qemu-options.hx sets @arch_mask to QEMU_ARCH_I386 | QEMU_ARCH_ARM, it is reachable only for these targets. Since they provide a real smbios_entry_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/smbios/smbios-stub.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)