| Message ID | 20211206095209.2332376-1-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [for,6.2?,v2] Revert "vga: don't abort when adding a duplicate isa-vga device" | expand |
On 12/6/21 10:52, Alex Bennée wrote: > This reverts commit 7852a77f598635a67a222b6c1463c8b46098aed2. > > The check is bogus as it ends up finding itself and falling over. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Resolves: https://gitlab.com/qemu-project/qemu/-/issues/733 > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > Message-Id: <20211202164929.1119036-1-alex.bennee@linaro.org> > > --- > v2 > - fixed bug link IIUC Cornelia & Mark said the correct fix is simply: -- >8 -- - if (object_resolve_path_type("", TYPE_ISA_VGA, NULL)) { + if (!object_resolve_path_type("", TYPE_ISA_VGA, NULL)) { --- > --- > hw/display/vga-isa.c | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c > index 8cea84f2be..90851e730b 100644 > --- a/hw/display/vga-isa.c > +++ b/hw/display/vga-isa.c > @@ -33,7 +33,6 @@ > #include "hw/loader.h" > #include "hw/qdev-properties.h" > #include "qom/object.h" > -#include "qapi/error.h" > > #define TYPE_ISA_VGA "isa-vga" > OBJECT_DECLARE_SIMPLE_TYPE(ISAVGAState, ISA_VGA) > @@ -62,15 +61,6 @@ static void vga_isa_realizefn(DeviceState *dev, Error **errp) > MemoryRegion *vga_io_memory; > const MemoryRegionPortio *vga_ports, *vbe_ports; > > - /* > - * make sure this device is not being added twice, if so > - * exit without crashing qemu > - */ > - if (object_resolve_path_type("", TYPE_ISA_VGA, NULL)) { > - error_setg(errp, "at most one %s device is permitted", TYPE_ISA_VGA); > - return; > - } > - > s->global_vmstate = true; > vga_common_init(s, OBJECT(dev)); > s->legacy_address_space = isa_address_space(isadev); >
On 12/6/21 11:43, Philippe Mathieu-Daudé wrote: > On 12/6/21 10:52, Alex Bennée wrote: >> This reverts commit 7852a77f598635a67a222b6c1463c8b46098aed2. >> >> The check is bogus as it ends up finding itself and falling over. >> >> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/733 >> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> >> Message-Id: <20211202164929.1119036-1-alex.bennee@linaro.org> >> >> --- >> v2 >> - fixed bug link > > IIUC Cornelia & Mark said the correct fix is simply: > > -- >8 -- > - if (object_resolve_path_type("", TYPE_ISA_VGA, NULL)) { > + if (!object_resolve_path_type("", TYPE_ISA_VGA, NULL)) { > --- Bah I just noticed your update on v1: https://www.mail-archive.com/qemu-devel@nongnu.org/msg854596.html So: Acked-by: Philippe Mathieu-Daudé <f4bug@amsat.org> and queued to mips-fixes, thanks.
On Mon, Dec 6, 2021 at 11:50 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > On 12/6/21 11:43, Philippe Mathieu-Daudé wrote: > > On 12/6/21 10:52, Alex Bennée wrote: > >> This reverts commit 7852a77f598635a67a222b6c1463c8b46098aed2. > >> > >> The check is bogus as it ends up finding itself and falling over. > >> > >> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > >> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/733 > >> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > >> Message-Id: <20211202164929.1119036-1-alex.bennee@linaro.org> > >> > >> --- > >> v2 > >> - fixed bug link > > > > IIUC Cornelia & Mark said the correct fix is simply: > > > > -- >8 -- > > - if (object_resolve_path_type("", TYPE_ISA_VGA, NULL)) { > > + if (!object_resolve_path_type("", TYPE_ISA_VGA, NULL)) { > > --- > > Bah I just noticed your update on v1: > https://www.mail-archive.com/qemu-devel@nongnu.org/msg854596.html > > So: > > Acked-by: Philippe Mathieu-Daudé <f4bug@amsat.org> I meant: Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > and queued to mips-fixes, thanks. (still valid).
diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c index 8cea84f2be..90851e730b 100644 --- a/hw/display/vga-isa.c +++ b/hw/display/vga-isa.c @@ -33,7 +33,6 @@ #include "hw/loader.h" #include "hw/qdev-properties.h" #include "qom/object.h" -#include "qapi/error.h" #define TYPE_ISA_VGA "isa-vga" OBJECT_DECLARE_SIMPLE_TYPE(ISAVGAState, ISA_VGA) @@ -62,15 +61,6 @@ static void vga_isa_realizefn(DeviceState *dev, Error **errp) MemoryRegion *vga_io_memory; const MemoryRegionPortio *vga_ports, *vbe_ports; - /* - * make sure this device is not being added twice, if so - * exit without crashing qemu - */ - if (object_resolve_path_type("", TYPE_ISA_VGA, NULL)) { - error_setg(errp, "at most one %s device is permitted", TYPE_ISA_VGA); - return; - } - s->global_vmstate = true; vga_common_init(s, OBJECT(dev)); s->legacy_address_space = isa_address_space(isadev);