]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'spice/spice.v66' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 18 Dec 2012 21:41:21 +0000 (15:41 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 18 Dec 2012 21:41:21 +0000 (15:41 -0600)
* spice/spice.v66:
  docs: add spice-port-fqdn.txt
  spice-qemu-char: register spicevmc ports during qemu_spice_init()
  spice-qemu-char: keep a list of spice chardev
  spice-qemu-char: add spiceport chardev
  spice-qemu-char: factor out CharDriverState creation
  spice-qemu-char: write to chardev whatever amount it can read
  qxl+vnc: register a vm state change handler for dummy spice_server
  qxl: save qemu_create_displaysurface_from result

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Trivial merge