diff options
| author | Peter Maydell | 2014-05-01 17:02:45 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-05-01 17:02:45 +0200 |
| commit | 87f6ede9bbccc03f337220478fb03fa70fbc3659 (patch) | |
| tree | 5f700dc3912c1a76b8f0267092865b9e7dfc3e6b /hw/display/vga-isa.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-6' into staging (diff) | |
| parent | add secondary-vga to display-vga test (diff) | |
| download | qemu-87f6ede9bbccc03f337220478fb03fa70fbc3659.tar.gz qemu-87f6ede9bbccc03f337220478fb03fa70fbc3659.tar.xz qemu-87f6ede9bbccc03f337220478fb03fa70fbc3659.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-2' into staging
vga: add secondary stdvga variant
# gpg: Signature made Mon 28 Apr 2014 10:11:44 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-vga-2:
add secondary-vga to display-vga test
add display-vga test
vga: add secondary stdvga variant
vga: allow non-global vmstate
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/vga-isa.c')
| -rw-r--r-- | hw/display/vga-isa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c index 1d9ea6b51d..2b480bd44d 100644 --- a/hw/display/vga-isa.c +++ b/hw/display/vga-isa.c @@ -56,7 +56,7 @@ static void vga_isa_realizefn(DeviceState *dev, Error **errp) MemoryRegion *vga_io_memory; const MemoryRegionPortio *vga_ports, *vbe_ports; - vga_common_init(s, OBJECT(dev)); + vga_common_init(s, OBJECT(dev), true); s->legacy_address_space = isa_address_space(isadev); vga_io_memory = vga_init_io(s, OBJECT(dev), &vga_ports, &vbe_ports); isa_register_portio_list(isadev, 0x3b0, vga_ports, s, "vga"); |