diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-06-10 18:13:58 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-06-10 18:13:58 +0100 |
| commit | 0e12e61ff9a3407d123d0dbc4d945aec98d60fdf (patch) | |
| tree | 40ac452edb1e5792d0384add5a39289f5607088c /device-hotplug.c | |
| parent | 3974c9d8ccfccbd81edc9df271fcae7082f3921d (diff) | |
| parent | 62232bf48456bda4058ceae05851bc58c1032338 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20150610-1' into staging
stdvga: factor out mmio subregion init
virtio-gpu: add virtio gpu core code, 2d mode
# gpg: Signature made Wed Jun 10 10:03:11 2015 BST 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/kraxel/tags/pull-vga-20150610-1:
virtio-gpu/2d: add virtio gpu core code
virtio: update headers, add virtio-gpu (2d)
stdvga: factor out mmio subregion init
stdvga: pass VGACommonState instead of PCIVGAState
stdvga: fix offset in pci_vga_ioport_read
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'device-hotplug.c')
0 files changed, 0 insertions, 0 deletions