diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-26 15:07:03 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-26 15:07:03 -0500 |
| commit | 3aa42d329b4a26af6105ff199be1a785b9ddd461 (patch) | |
| tree | 8cb011152af3a1d4e27aa5c8da15a806fc85b723 /hw/vga-isa.c | |
| parent | 675658d97e86c42278fc08f8fb4c9531a027b4e7 (diff) | |
| parent | 9e56edcf8dd1d4bc7ba2b1efb3641f36c0fad8ba (diff) | |
Merge remote-tracking branch 'spice/spice.v58' into staging
* spice/spice.v58:
vga: raise default vgamem size
add pc-1.2
qxl: add vgamem_size_mb and vgamem_size
vga: make vram size configurable
vga: raise xres+yres limits
qxl: reset current_async on qxl_soft_reset
hw/qxl: ignore guest from guestbug until reset
qxl: stop dirty loging when not in vga mode
hw/qxl: s/qxl_guest_bug/qxl_set_guest_bug/
ui/spice-display.c: add missing initialization for valgrind
Diffstat (limited to 'hw/vga-isa.c')
| -rw-r--r-- | hw/vga-isa.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/hw/vga-isa.c b/hw/vga-isa.c index 4bcc4db62f..d2904737bc 100644 --- a/hw/vga-isa.c +++ b/hw/vga-isa.c @@ -49,7 +49,7 @@ static int vga_initfn(ISADevice *dev) MemoryRegion *vga_io_memory; const MemoryRegionPortio *vga_ports, *vbe_ports; - vga_common_init(s, VGA_RAM_SIZE); + vga_common_init(s); s->legacy_address_space = isa_address_space(dev); vga_io_memory = vga_init_io(s, &vga_ports, &vbe_ports); isa_register_portio_list(dev, 0x3b0, vga_ports, s, "vga"); @@ -69,6 +69,11 @@ static int vga_initfn(ISADevice *dev) return 0; } +static Property vga_isa_properties[] = { + DEFINE_PROP_UINT32("vgamem_mb", ISAVGAState, state.vram_size_mb, 8), + DEFINE_PROP_END_OF_LIST(), +}; + static void vga_class_initfn(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -76,6 +81,7 @@ static void vga_class_initfn(ObjectClass *klass, void *data) ic->init = vga_initfn; dc->reset = vga_reset_isa; dc->vmsd = &vmstate_vga_common; + dc->props = vga_isa_properties; } static TypeInfo vga_info = { |