diff options
| author | Peter Maydell | 2018-08-21 16:57:56 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-08-21 16:57:56 +0200 |
| commit | 13b7b188501d419a7d63c016e00065bcc693b7d4 (patch) | |
| tree | e906273d5e9e4ad5b3512f230edd8c4803aa57cf /hw/display/qxl.c | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-3.1-20180821' into... (diff) | |
| parent | hw/pci-host/bonito: Move away from old_mmio accessors (diff) | |
| download | qemu-13b7b188501d419a7d63c016e00065bcc693b7d4.tar.gz qemu-13b7b188501d419a7d63c016e00065bcc693b7d4.tar.xz qemu-13b7b188501d419a7d63c016e00065bcc693b7d4.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180821-pull-request' into staging
hw/display: misc fixes
# gpg: Signature made Tue 21 Aug 2018 09:16:01 BST
# gpg: using RSA key 4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/vga-20180821-pull-request:
hw/pci-host/bonito: Move away from old_mmio accessors
hw/display/vga-isa-mm: Convert away from old_mmio
qxl: drop unused generation variable
hw/display/ramfb: Compile the ramfb code only when CONFIG_FW_CFG_DMA is set
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/qxl.c')
| -rw-r--r-- | hw/display/qxl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 830c392c53..8e9135d9c6 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -2057,7 +2057,6 @@ static void qxl_realize_common(PCIQXLDevice *qxl, Error **errp) qemu_spice_display_init_common(&qxl->ssd); qxl->mode = QXL_MODE_UNDEFINED; - qxl->generation = 1; qxl->num_memslots = NUM_MEMSLOTS; qemu_mutex_init(&qxl->track_lock); qemu_mutex_init(&qxl->async_lock); |