~ubuntu-virt/qemu/+git/qemu-lp-import:stable-2.12

Last commit made on 2018-08-02
Get this branch:
git clone -b stable-2.12 https://git.launchpad.net/~ubuntu-virt/qemu/+git/qemu-lp-import

Branch merges

Branch information

Name:
stable-2.12
Repository:
lp:~ubuntu-virt/qemu/+git/qemu-lp-import

Recent commits

e22f675... by Michael Roth

Update version for 2.12.1 release

Signed-off-by: Michael Roth <email address hidden>

aae299a... by Fam Zheng

file-posix: Handle EINTR in preallocation=full write

Cc: <email address hidden>
Signed-off-by: Fam Zheng <email address hidden>
Signed-off-by: Kevin Wolf <email address hidden>
(cherry picked from commit a1c81f4f16a74d0d544f5d3ac405bcaad83541fd)
 Conflicts:
 block/file-posix.c
* avoid dep on 93f4e2ff by adding check to raw_regular_truncate instead
Signed-off-by: Michael Roth <email address hidden>

b102aea... by KONRAD Frederic <email address hidden>

qcow: fix a reference leak

Since 42a3e1ab367cdf38cce093de24eb406b99a4ef96 qemu asserts when using the
vvfat driver:

git clone git://qemu.org/qemu.git
cd qemu
./configure --target-list=ppc-softmmu --enable-debug
make -j8
mkdir foo
touch foo/hello
./ppc-softmmu/qemu-system-ppc -M prep --nographic --monitor null \
                              -hda fat:rw:./foo

"Ctrl-C"

qemu-system-ppc: block.c:3368: bdrv_close_all: Assertion \
   `((&all_bdrv_states)->tqh_first == ((void *)0))' failed.

This is because we reference bs twice in qcow_co_create(..) one time in
bdrv_open_blockdev_ref(..) and in blk_insert_bs(..) but we unref it only once
in blk_unref which leads to the reference leak.

Note that I didn't tested much QCOW after this change as I don't use it much.

Signed-off-by: KONRAD Frederic <email address hidden>
Signed-off-by: Kevin Wolf <email address hidden>
(cherry picked from commit 41b6513436d2ebb64c7df8f009f630922a8e8990)
Signed-off-by: Michael Roth <email address hidden>

336cd38... by Christian Borntraeger

s390x/sclp: fix maxram calculation

We clamp down ram_size to match the sclp increment size. We do
not do the same for maxram_size, which means for large guests
with some sizes (e.g. -m 50000) maxram_size differs from ram_size.
This can break other code (e.g. CMMA migration) which uses maxram_size
to calculate the number of pages and then throws some errors.

Fixes: 82fab5c5b90e468f3e9d54c ("s390x/sclp: remove memory hotplug support")
Signed-off-by: Christian Borntraeger <email address hidden>
CC: <email address hidden>
CC: David Hildenbrand <email address hidden>
Message-Id: <email address hidden>
Reviewed-by: David Hildenbrand <email address hidden>
Signed-off-by: Cornelia Huck <email address hidden>
(cherry picked from commit 408e5ace517ff18c9c7cd918fc93358162e6e26d)
Signed-off-by: Michael Roth <email address hidden>

bf1cb81... by =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <email address hidden>

qga: process_event() simplification and leak fix

json_parser_parse_err() may return something else than a QDict, in
which case we loose the object. Let's keep track of the original
object to avoid leaks.

When an error occurs, "qdict" contains the response, but we still
check the "execute" key there. Untangle a bit this code, by having a
clear error path.

CC: Michael Roth <email address hidden>
Signed-off-by: Marc-André Lureau <email address hidden>
Reviewed-by: Markus Armbruster <email address hidden>
Cc: <email address hidden>
Signed-off-by: Michael Roth <email address hidden>
(cherry picked from commit ae7da1e5f658ea21d96e565514de20ff2cf24fa1)
* drop context dep on d43b16945a
* drop functional dep on cb3e7f08ae
Signed-off-by: Michael Roth <email address hidden>

08c4a51... by Markus Armbruster <email address hidden>

qmp: De-duplicate error response building

All callers of qmp_build_error_object() duplicate the code to wrap it
in a response object. Replace it by qmp_error_response() that
captures the duplicated code, including error_free().

Signed-off-by: Markus Armbruster <email address hidden>
Reviewed-by: Eric Blake <email address hidden>
Message-Id: <email address hidden>
(cherry picked from commit cee32796cadc9510ee00f029a933009df7a28ae2)
 Conflicts:
 include/qapi/qmp/dispatch.h
 qapi/qmp-dispatch.c
 qga/main.c
* drop context dep on cb3e7f08ae
* prereq for ae7da1e5f6
Signed-off-by: Michael Roth <email address hidden>

4417845... by Markus Armbruster <email address hidden>

qobject: New qdict_from_jsonf_nofail()

Many uses of qobject_from_jsonf() convert JSON objects. Create new
convenience function qdict_from_jsonf_nofail() that includes the
conversion to QDict. The next few commits will put it to use.

Signed-off-by: Markus Armbruster <email address hidden>
Reviewed-by: Eric Blake <email address hidden>
Message-Id: <email address hidden>
(cherry picked from commit a193352ff9c7cd2cd07846118bc49921d0f53af8)
Signed-off-by: Michael Roth <email address hidden>

2f36efa... by Michael Roth

Merge tag 's390x-20180724-212-stable' into stable-2.12-staging

update s390-ccw.img for stable

90b2d94... by =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <email address hidden>

ccid-card-passthru: fix regression in realize()

Since cc847bfd16d894fd8c1a2ce25f31772f6cdbbc74, CCID card-passthru
fails to intialize, because it changed a debug line to an error,
probably by mistake. Change it back to a DPRINTF debug.

(solves Boxes creating VM with smartcard passthru failing to start)

Signed-off-by: Marc-André Lureau <email address hidden>
Reviewed-by: Philippe Mathieu-Daudé <email address hidden>
Message-id: <email address hidden>
Signed-off-by: Gerd Hoffmann <email address hidden>
(cherry picked from commit e58d64a16abc2304c4dcb644411eb9580bf63b1e)
Signed-off-by: Michael Roth <email address hidden>

c164271... by Cornelia Huck <email address hidden>

pc-bios/s390-ccw.img: update image for stable

Contains the following commits:
- s390-ccw: force diag 308 subcode to unsigned long
- pc-bios/s390-ccw: struct tpi_info must be declared as aligned(4)

Signed-off-by: Cornelia Huck <email address hidden>