summary refs log tree commit diff stats
path: root/hw/display/virtio-gpu-pci.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-07-02 15:20:55 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-07-02 15:20:55 +0100
commit5317b0f6d4bb581c5c8f88f31138ee301ad2b7e5 (patch)
tree6e2750e7e4efbaae1985b1d63259a823ab03b6c7 /hw/display/virtio-gpu-pci.c
parent6686ce3f1628f045035d58db8890d20705fd5c34 (diff)
parentc4d3c0a2696c09a884b680d15b03325e46656a6c (diff)
downloadfocaccia-qemu-5317b0f6d4bb581c5c8f88f31138ee301ad2b7e5.tar.gz
focaccia-qemu-5317b0f6d4bb581c5c8f88f31138ee301ad2b7e5.zip
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20150702-v3' into staging
Several s390x patches including:
- missing virtio-1 related code for virtio-ccw
- bugfixes in ipl device, gdb, virtio-ccw
- bugfix in s390-ccw bios + rebuild
- introduce versioned machines for s390-ccw-virtio

# gpg: Signature made Thu Jul  2 15:05:34 2015 BST using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"

* remotes/cohuck/tags/s390x-20150702-v3:
  s390x/migration: Introduce 2.4 machine
  s390x/gdb: synchronize cpu state after modifying acrs
  s390x/ipl: Fix boot if no bootindex was specified
  virtio-ccw: migrate ->revision
  s390x/virtio-ccw: support virtio-1 set_vq format
  s390x/virtio-ccw: add virtio set-revision call
  s390x/css: Add a callback for when subchannel gets disabled
  s390-ccw.img: update
  s390-ccw.img: Consume service interrupts
  css: mss/mcss-e vs. migration
  virtio-ccw: complete handling of guest-initiated resets

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