Merge branch 'spice.v59' of git://anongit.freedesktop.org/spice/qemu
authorAurelien Jarno <aurelien@aurel32.net>
Mon, 10 Sep 2012 13:32:11 +0000 (15:32 +0200)
committerAurelien Jarno <aurelien@aurel32.net>
Mon, 10 Sep 2012 13:32:11 +0000 (15:32 +0200)
* 'spice.v59' of git://anongit.freedesktop.org/spice/qemu:
  Remove #ifdef QXL_COMMAND_FLAG_COMPAT_16BPP
  qxl: Add set_client_capabilities() interface to QXLInterface
  spice: make number of surfaces runtime-configurable.
  configure: print spice-protocol and spice-server versions
  qxl: add QXL_IO_MONITORS_CONFIG_ASYNC
  qxl: disallow unknown revisions
  qxl/update_area_io: guest_bug on invalid parameters
  spice: increase the verbosity of spice section in "qemu --help"
  spice: adding seamless-migration option to the command line
  spice: add 'migrated' flag to spice info
  spice migration: add QEVENT_SPICE_MIGRATE_COMPLETED
  spice: notify on vm state change only via spice_server_vm_start/stop
  spice: notify spice server on vm start/stop
  spice: abort on invalid streaming cmdline params

1  2 
configure
hmp.c
hw/qxl.c
monitor.c
qapi-schema.json

diff --cc configure
Simple merge
diff --cc hmp.c
Simple merge
diff --cc hw/qxl.c
Simple merge
diff --cc monitor.c
Simple merge
Simple merge