diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-18 07:56:18 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-18 07:56:18 -0500 |
| commit | 25b9e14e78bf9790cdee12d57c45898e86866a24 (patch) | |
| tree | 44170bfd10733c58e320f86b3998a3bc1ee07bc3 /hw/qxl.c | |
| parent | b26d712ecc9558fcd2a77a0b677a18d4919228bd (diff) | |
| parent | 06ddea49f8127bd055dbc7e83df896d9311c88cc (diff) | |
| download | qemu-25b9e14e78bf9790cdee12d57c45898e86866a24.zip qemu-25b9e14e78bf9790cdee12d57c45898e86866a24.tar.gz qemu-25b9e14e78bf9790cdee12d57c45898e86866a24.tar.bz2 | |
Merge remote-tracking branch 'spice/spice.v52' into staging
* spice/spice.v52:
qxl-render: fix broken vnc+spice since commit f934493
qxl: set default values of vram*_size_mb to -1
trace-events: remove unused qxl_vga_ioport_while_not_in_vga_mode
Diffstat (limited to 'hw/qxl.c')
| -rw-r--r-- | hw/qxl.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1959,8 +1959,8 @@ static Property qxl_properties[] = { DEFINE_PROP_UINT32("guestdebug", PCIQXLDevice, guestdebug, 0), DEFINE_PROP_UINT32("cmdlog", PCIQXLDevice, cmdlog, 0), DEFINE_PROP_UINT32("ram_size_mb", PCIQXLDevice, ram_size_mb, -1), - DEFINE_PROP_UINT32("vram_size_mb", PCIQXLDevice, vram32_size_mb, 0), - DEFINE_PROP_UINT32("vram64_size_mb", PCIQXLDevice, vram_size_mb, 0), + DEFINE_PROP_UINT32("vram_size_mb", PCIQXLDevice, vram32_size_mb, -1), + DEFINE_PROP_UINT32("vram64_size_mb", PCIQXLDevice, vram_size_mb, -1), DEFINE_PROP_END_OF_LIST(), }; |