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/qxl.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/qxl.c')
| -rw-r--r-- | hw/display/qxl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 47bbf1f1fe..e9c54d7399 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -2061,7 +2061,7 @@ static int qxl_init_primary(PCIDevice *dev) qxl->id = 0; qxl_init_ramsize(qxl); vga->vram_size_mb = qxl->vga.vram_size >> 20; - vga_common_init(vga, OBJECT(dev)); + vga_common_init(vga, OBJECT(dev), true); vga_init(vga, OBJECT(dev), pci_address_space(dev), pci_address_space_io(dev), false); portio_list_init(qxl_vga_port_list, OBJECT(dev), qxl_vga_portio_list, |