diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-04-07 20:55:07 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-04-07 20:55:07 +0100 |
| commit | 3f1082e5b856a9c96baefdfa66504c17665234f9 (patch) | |
| tree | fd44af44fcdd68bf21b242959a169d3a9c1982e5 /hw/block | |
| parent | 2f37b0222cf9274d014fcb1f211b14ee626561c9 (diff) | |
| parent | 758af9cfabfb000eb00e42b9738e655b18fdd812 (diff) | |
| download | qemu-3f1082e5b856a9c96baefdfa66504c17665234f9.zip | |
Merge remote-tracking branch 'remotes/aperard/tags/pull-xen-20200407' into staging
Xen queue for QEMU 5.0
- Fix for xen-block.
- A fix for a Coverity false positive in xen-usb.
- Update MAINTAINERS to add xen-usb.c to Xen section.
# gpg: Signature made Tue 07 Apr 2020 16:21:16 BST
# gpg: using RSA key F80C006308E22CFD8A92E7980CF5572FD7FB55AF
# gpg: issuer "anthony.perard@citrix.com"
# gpg: Good signature from "Anthony PERARD <anthony.perard@gmail.com>" [marginal]
# gpg: aka "Anthony PERARD <anthony.perard@citrix.com>" [marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 5379 2F71 024C 600F 778A 7161 D8D5 7199 DF83 42C8
# Subkey fingerprint: F80C 0063 08E2 2CFD 8A92 E798 0CF5 572F D7FB 55AF
* remotes/aperard/tags/pull-xen-20200407:
MAINTAINERS: Add xen-usb.c to Xen section
xen-block: Fix uninitialized variable
hw/usb/xen-usb.c: Pass struct usbback_req* to usbback_packet_complete()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/block')
| -rw-r--r-- | hw/block/xen-block.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index 07bb32e22b..99cb4c67cb 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -860,7 +860,7 @@ static XenBlockIOThread *xen_block_iothread_create(const char *id, XenBlockIOThread *iothread = g_new(XenBlockIOThread, 1); Error *local_err = NULL; QDict *opts; - QObject *ret_data; + QObject *ret_data = NULL; iothread->id = g_strdup(id); |