diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-10-12 09:13:58 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-10-12 09:13:58 -0500 |
| commit | 3f42ac89ba7197872c1bc6ddc850184fc83622a0 (patch) | |
| tree | 50ce25684abc38d217d2d0d51acabd12dcf6f73e /hw/pc_piix.c | |
| parent | b4ae3cfa57b8c1bdbbd7b7d420971e9171203ade (diff) | |
| parent | 591af14359f698d89cd334622237a20f19ae7060 (diff) | |
| download | qemu-3f42ac89ba7197872c1bc6ddc850184fc83622a0.zip qemu-3f42ac89ba7197872c1bc6ddc850184fc83622a0.tar.gz qemu-3f42ac89ba7197872c1bc6ddc850184fc83622a0.tar.bz2 | |
Merge remote-tracking branch 'spice/spice.v61' into staging
* spice/spice.v61:
qxl: set default revision to 4
spice: raise requirement to 0.12
hw/qxl: qxl_dirty_surfaces: use uintptr_t
hw/qxl: fix condition for exiting guest_bug
hw/qxl: exit on failure to register qxl interface
qxl: fix range check for rev3 io commands.
qxl/update_area_io: cleanup invalid parameters handling
qxl: always update displaysurface on resize
Diffstat (limited to 'hw/pc_piix.c')
| -rw-r--r-- | hw/pc_piix.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index fd5898f..82364ab 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -371,6 +371,14 @@ static QEMUMachine pc_machine_v1_3 = { .driver = "ivshmem",\ .property = "use64",\ .value = "0",\ + },{\ + .driver = "qxl",\ + .property = "revision",\ + .value = stringify(3),\ + },{\ + .driver = "qxl-vga",\ + .property = "revision",\ + .value = stringify(3),\ } static QEMUMachine pc_machine_v1_2 = { |