diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-12-06 07:27:32 -0800 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-12-06 07:27:32 -0800 |
| commit | 2f8eb086732ad1875003101f5324f01c47d7408c (patch) | |
| tree | d659d3015c140aa109f1c555cce867520d713ebd /hw/display/vga-isa.c | |
| parent | 99fc08366b06282614daeda989d2fde6ab8a707f (diff) | |
| parent | ac5837e330ec33e2df2d83338713a5c4272c8cc8 (diff) | |
| download | focaccia-qemu-2f8eb086732ad1875003101f5324f01c47d7408c.tar.gz focaccia-qemu-2f8eb086732ad1875003101f5324f01c47d7408c.zip | |
Merge tag 'mips-20211206' of https://github.com/philmd/qemu into staging
MIPS fixes - Do not emit SD instruction on 32-bit CPU (Jiaxun Yang) - Correctly catch load_elf() errors on Boston board (Jiaxun Yang) - Revert bogus CLI fix for ISA VGA devices (Alex Bennée) # gpg: Signature made Mon 06 Dec 2021 03:03:24 AM PST # gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full] * tag 'mips-20211206' of https://github.com/philmd/qemu: Revert "vga: don't abort when adding a duplicate isa-vga device" hw/mips/boston: Fix load_elf() error detection hw/mips/bootloader: Fix write_ulong() Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw/display/vga-isa.c')
| -rw-r--r-- | hw/display/vga-isa.c | 10 |
1 files changed, 0 insertions, 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); |