diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-02-20 16:51:19 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-02-20 16:51:19 +0000 |
| commit | 7afee874f1b27abc998b8b747d16b77cb6398716 (patch) | |
| tree | 293adb8f0329da30a351e34de7968a462a6a18f0 /hw/display | |
| parent | 8cd7325f034e119012dcdf56808a73d0884c706e (diff) | |
| parent | d1cb67841ca213802ee789957188ec87e8b7996d (diff) | |
| download | qemu-7afee874f1b27abc998b8b747d16b77cb6398716.zip qemu-7afee874f1b27abc998b8b747d16b77cb6398716.tar.gz qemu-7afee874f1b27abc998b8b747d16b77cb6398716.tar.bz2 | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging
Fix memory leak with fdt
cosmetic change in code and logs
update mailmap
# gpg: Signature made Wed 19 Feb 2020 10:15:56 GMT
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-branch-pull-request:
hw/xtensa/xtfpga:fix leak of fdevice tree blob
hw/nios2:fix leak of fdevice tree blob
hw/net/rocker: Report unimplemented feature with qemu_log_mask(UNIMP)
hw/block/pflash_cfi02: Remove unneeded variable assignment
hw/display/qxl: Remove unneeded variable assignment
contrib/rdmacm-mux: Remove superfluous semicolon
tests/qtest/libqos/qgraph: Remove superfluous semicolons
target/i386/whpx: Remove superfluous semicolon
ui/input-barrier: Remove superfluous semicolon
hw/vfio/display: Remove superfluous semicolon
hw/scsi/esp: Remove superfluous semicolon
hw/m68k/next-cube: Remove superfluous semicolon
hw/arm/xlnx-versal: Remove superfluous semicolon
audio/alsaaudio: Remove superfluous semicolons
scripts/checkpatch.pl: Detect superfluous semicolon in C code
Report stringified errno in VFIO related errors
mailmap: Add entry for Yu-Chen Lin
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display')
| -rw-r--r-- | hw/display/qxl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 64884da..21a43a1 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -1631,7 +1631,7 @@ static void ioport_write(void *opaque, hwaddr addr, PCIQXLDevice *d = opaque; uint32_t io_port = addr; qxl_async_io async = QXL_SYNC; - uint32_t orig_io_port = io_port; + uint32_t orig_io_port; if (d->guest_bug && io_port != QXL_IO_RESET) { return; |