diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-06-16 10:35:43 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-06-16 10:35:43 +0100 |
| commit | 93f6d1c16036aaf34055d16f54ea770fb8d6d280 (patch) | |
| tree | 393cd2f4938259be149b6e41813cba6b3e726e71 /hw/display/virtio-gpu.c | |
| parent | 4316536bf424d2e7f9cfa7d0dd561adb0986cc81 (diff) | |
| parent | 7a4dfd1e4a741991df1acf31672b391648e0aa0c (diff) | |
| download | focaccia-qemu-93f6d1c16036aaf34055d16f54ea770fb8d6d280.tar.gz focaccia-qemu-93f6d1c16036aaf34055d16f54ea770fb8d6d280.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20150615-1' into staging
virtio-gpu: pci support bits and virtio-vga. # gpg: Signature made Mon Jun 15 13:55:19 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-20150615-1: virtio-vga: add vgabios configuration virtio-vga: add '-vga virtio' support virtio-vga: add virtio gpu device with vga compatibility virtio-gpu-pci: add virtio pci support virtio-gpu: fix error message Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/virtio-gpu.c')
| -rw-r--r-- | hw/display/virtio-gpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 4b10ca1ebb..8c109b79f4 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -534,7 +534,7 @@ int virtio_gpu_create_mapping_iov(struct virtio_gpu_resource_attach_backing *ab, if (ab->nr_entries > 16384) { qemu_log_mask(LOG_GUEST_ERROR, - "%s: nr_entries is too big (%d > 1024)\n", + "%s: nr_entries is too big (%d > 16384)\n", __func__, ab->nr_entries); return -1; } |