diff options
| author | Peter Maydell | 2018-07-12 13:29:23 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-07-12 13:29:23 +0200 |
| commit | ff82d3c73ec20d6f40e8bbfafe8ed5110bba5049 (patch) | |
| tree | 3613b3317a26f609ea5246bc8a2345c02922cf33 /hw/scsi/scsi-disk.c | |
| parent | Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20180711.1' in... (diff) | |
| parent | error: Remove NULL checks on error_propagate() calls (diff) | |
| download | qemu-ff82d3c73ec20d6f40e8bbfafe8ed5110bba5049.tar.gz qemu-ff82d3c73ec20d6f40e8bbfafe8ed5110bba5049.tar.xz qemu-ff82d3c73ec20d6f40e8bbfafe8ed5110bba5049.zip | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180712' into staging
- fix confusion around sizes in storage attribute migration
- remove NULL check on error_propagate() in virtio-ccw
# gpg: Signature made Thu 12 Jul 2018 10:27:28 BST
# gpg: using RSA key DECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg: aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg: aka "Cornelia Huck <cohuck@kernel.org>"
# gpg: aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20180712:
error: Remove NULL checks on error_propagate() calls
s390x/storage attributes: fix CMMA_BLOCK_SIZE usage
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/scsi/scsi-disk.c')
0 files changed, 0 insertions, 0 deletions