summary refs log tree commit diff stats
path: root/include/hw/pci/pci.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-03-08 09:47:55 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-03-08 09:47:55 +0000
commit033c7ddf86fe4315069ac4cf3cfab9bc6035dee7 (patch)
tree9a0fcb113fc5ce223b2b1fcc2596b004571c0d35 /include/hw/pci/pci.h
parentb6d527fbc0b64a2ba7d83623e47b05c745b88043 (diff)
parent7c6044a94e52db8aef9a71d616c7a0914adb71ab (diff)
downloadfocaccia-qemu-033c7ddf86fe4315069ac4cf3cfab9bc6035dee7.tar.gz
focaccia-qemu-033c7ddf86fe4315069ac4cf3cfab9bc6035dee7.zip
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20150304-1' into staging
misc spice/qxl fixes.

# gpg: Signature made Wed Mar  4 13:57:42 2015 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/spice/tags/pull-spice-20150304-1:
  hmp: info spice: take out webdav
  hmp: info spice: Show string channel name
  qxl: drop update_displaychangelistener call for secondary qxl devices
  vga: refactor vram_size clamping and rounding
  qxl: refactor rounding up to a nearest power of 2
  spice: fix invalid memory access to vga.vram
  qxl: document minimal video memory for new modes

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/pci/pci.h')
0 files changed, 0 insertions, 0 deletions