diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-03-11 13:45:37 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-11 13:45:37 +0000 |
| commit | 2e35c7738e16452a95aec1fbef5e8b6f38a2d647 (patch) | |
| tree | b7e5e3108fb029a0574ae5c9ab4460b009ba9762 /include | |
| parent | 79d8b1dc5b44d806d9700f2e8a8028075a8ff2b2 (diff) | |
| parent | ff243cff11526c0703cefdd60467dfaa5c5803a0 (diff) | |
| download | qemu-2e35c7738e16452a95aec1fbef5e8b6f38a2d647.zip qemu-2e35c7738e16452a95aec1fbef5e8b6f38a2d647.tar.gz qemu-2e35c7738e16452a95aec1fbef5e8b6f38a2d647.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190311-v2-pull-request' into staging
vga: virtio reset fix, add ati emulation.
# gpg: Signature made Mon 11 Mar 2019 08:50:12 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/vga-20190311-v2-pull-request:
mips_fulong2e: Add on-board graphics chip
hw/display: Add basic ATI VGA emulation
virtio-gpu: make virtio_gpu_reset static
virtio-vga: fix reset.
virtio: add class_size to VirtioPCIDeviceTypeInfo
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/virtio/virtio-gpu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 98504f9..ce0ca72 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -148,7 +148,6 @@ extern const GraphicHwOps virtio_gpu_ops; } while (0) /* virtio-gpu.c */ -void virtio_gpu_reset(VirtIODevice *vdev); void virtio_gpu_ctrl_response(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd, struct virtio_gpu_ctrl_hdr *resp, |