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_int.h | |
| 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_int.h')
| -rw-r--r-- | hw/display/vga_int.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h index e6418906a7..d42ac926e3 100644 --- a/hw/display/vga_int.h +++ b/hw/display/vga_int.h @@ -177,7 +177,7 @@ static inline int c6_to_8(int v) return (v << 2) | (b << 1) | b; } -void vga_common_init(VGACommonState *s, Object *obj); +void vga_common_init(VGACommonState *s, Object *obj, bool global_vmstate); void vga_init(VGACommonState *s, Object *obj, MemoryRegion *address_space, MemoryRegion *address_space_io, bool init_vga_ports); MemoryRegion *vga_init_io(VGACommonState *s, Object *obj, |