On Thu, Dec 02, 2021 at 04:49:29PM +0000, 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.ben...@linaro.org> > Resolves: https://gitlab.com/qemu-project/qemu.git/-/issues/733 > --- > hw/display/vga-isa.c | 10 ---------- > 1 file changed, 10 deletions(-)
Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> This turns the qemu-system-mips64el CLI scenario from a pretty error back into an abort. Either way the user in question isn't getting a running mips VM, so that's preferrable to blocking valid usage scenarios. I agree this should go into 6.2, as it a regression introduced since 6.1, and this revert is low risk since it is simply deleting lines. When a PULL is done we should re-open https://gitlab.com/qemu-project/qemu/-/issues/44 > > 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); > -- > 2.30.2 > > Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
