[Qemu-commits] [qemu/qemu] 059f70: iotests: Provide a function for check

qemu-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 059f70: iotests: Provide a function for check

From:	Peter Maydell
Subject:	[Qemu-commits] [qemu/qemu] 059f70: iotests: Provide a function for checking the creat...
Date:	Fri, 03 Jan 2020 06:30:12 -0800
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 059f708d0c440a2be255dd3c46d536c095ee19a3
      
https://github.com/qemu/qemu/commit/059f708d0c440a2be255dd3c46d536c095ee19a3
  Author: Thomas Huth <address@hidden>
  Date:   2019-12-18 (Wed, 18 Dec 2019)

  Changed paths:
    M tests/qemu-iotests/005
    M tests/qemu-iotests/220
    M tests/qemu-iotests/common.rc

  Log Message:
  -----------
  iotests: Provide a function for checking the creation of huge files

Some tests create huge (but sparse) files, and to be able to run those
tests in certain limited environments (like CI containers), we have to
check for the possibility to create such files first. Thus let's introduce
a common function to check for large files, and replace the already
existing checks in the iotests 005 and 220 with this function.

Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: efd0e5a1215bbdfd28168485800f5cfec9735cf8
      
https://github.com/qemu/qemu/commit/efd0e5a1215bbdfd28168485800f5cfec9735cf8
  Author: Thomas Huth <address@hidden>
  Date:   2019-12-18 (Wed, 18 Dec 2019)

  Changed paths:
    M tests/qemu-iotests/060

  Log Message:
  -----------
  iotests: Skip test 060 if it is not possible to create large files

Test 060 fails in the arm64, s390x and ppc64le LXD containers on Travis
(which we will hopefully enable in our CI soon). These containers
apparently do not allow large files to be created. The repair process
in test 060 creates a file of 64 GiB, so test first whether such large
files are possible and skip the test if that's not the case.

Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: e28582fdb28b2e8b29a351c20b0c8f1af4120688
      
https://github.com/qemu/qemu/commit/e28582fdb28b2e8b29a351c20b0c8f1af4120688
  Author: Thomas Huth <address@hidden>
  Date:   2019-12-18 (Wed, 18 Dec 2019)

  Changed paths:
    M tests/qemu-iotests/079

  Log Message:
  -----------
  iotests: Skip test 079 if it is not possible to create large files

Test 079 fails in the arm64, s390x and ppc64le LXD containers on Travis
(which we will hopefully enable in our CI soon). These containers
apparently do not allow large files to be created. Test 079 tries to
create a 4G sparse file, which is apparently already too big for these
containers, so check first whether we can really create such files before
executing the test.

Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: ecaf647f300d69271c245a67adca9c3a89d9463a
      
https://github.com/qemu/qemu/commit/ecaf647f300d69271c245a67adca9c3a89d9463a
  Author: Daniel P. Berrangé <address@hidden>
  Date:   2019-12-18 (Wed, 18 Dec 2019)

  Changed paths:
    M qapi/block-core.json

  Log Message:
  -----------
  qapi: better document NVMe blockdev @device parameter

Mention that this is a PCI device address & give the format it is
expected in. Also mention that it must be first unbound from any
host kernel driver.

Signed-off-by: Daniel P. Berrangé <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 0da7d13a4c2ff8ac40aeb1bd24c5564c82624555
      
https://github.com/qemu/qemu/commit/0da7d13a4c2ff8ac40aeb1bd24c5564c82624555
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2019-12-18 (Wed, 18 Dec 2019)

  Changed paths:
    M qemu-img.c
    A tests/qemu-iotests/279
    A tests/qemu-iotests/279.out
    M tests/qemu-iotests/group

  Log Message:
  -----------
  qemu-img: fix info --backing-chain --image-opts

Only apply --image-opts to the topmost image when listing an entire
backing chain.  It is incorrect to treat backing filenames as image
options.  Assuming we have the backing chain t.IMGFMT.base <-
t.IMGFMT.mid <- t.IMGFMT, qemu-img info fails as follows:

  $ qemu-img info --backing-chain --image-opts \
      driver=qcow2,file.driver=file,file.filename=t.IMGFMT
  qemu-img: Could not open 'TEST_DIR/t.IMGFMT.mid': Cannot find 
device=TEST_DIR/t.IMGFMT.mid nor node_name=TEST_DIR/t.IMGFMT.mid

Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: f6dc1c31d3801dcbdf0c56574f9ff4f05180810c
      
https://github.com/qemu/qemu/commit/f6dc1c31d3801dcbdf0c56574f9ff4f05180810c
  Author: Kevin Wolf <address@hidden>
  Date:   2019-12-18 (Wed, 18 Dec 2019)

  Changed paths:
    M block.c
    M tests/qemu-iotests/049
    M tests/qemu-iotests/049.out

  Log Message:
  -----------
  block: Error out on image creation with conflicting size options

If both the create options (qemu-img create -o ...) and the size
parameter were given, the size parameter was silently ignored. Instead,
make specifying two sizes an error.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 1ef7d9d368eb76d64e86e4d1251eb8e53881ff26
      
https://github.com/qemu/qemu/commit/1ef7d9d368eb76d64e86e4d1251eb8e53881ff26
  Author: Kevin Wolf <address@hidden>
  Date:   2019-12-18 (Wed, 18 Dec 2019)

  Changed paths:
    M blockjob.c
    M tests/qemu-iotests/030

  Log Message:
  -----------
  blockjob: Fix error message for negative speed

The error message for a negative speed uses QERR_INVALID_PARAMETER,
which implies that the 'speed' option doesn't even exist:

    {"error": {"class": "GenericError", "desc": "Invalid parameter 'speed'"}}

Make it use QERR_INVALID_PARAMETER_VALUE instead:

    {"error": {"class": "GenericError", "desc": "Parameter 'speed' expects a 
non-negative value"}}

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Reviewed-by: Max Reitz <address@hidden>


  Commit: 3b65081638c68be1c6ed08635c8acd99f32320ac
      
https://github.com/qemu/qemu/commit/3b65081638c68be1c6ed08635c8acd99f32320ac
  Author: Kevin Wolf <address@hidden>
  Date:   2019-12-18 (Wed, 18 Dec 2019)

  Changed paths:
    M block/qcow2.c

  Log Message:
  -----------
  qcow2: Declare BDRV_REQ_NO_FALLBACK supported

In the common case, qcow2_co_pwrite_zeroes() already only modifies
metadata case, so we're fine with or without BDRV_REQ_NO_FALLBACK set.

The only exception is when using an external data file, where the
request is passed down to the block driver of the external data file. We
are forwarding the BDRV_REQ_NO_FALLBACK flag there, though, so this is
fine, too.

Declare the flag supported therefore.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>


  Commit: a96f0350e3d95c98f2bff1863d14493af5c1d360
      
https://github.com/qemu/qemu/commit/a96f0350e3d95c98f2bff1863d14493af5c1d360
  Author: Kevin Wolf <address@hidden>
  Date:   2019-12-18 (Wed, 18 Dec 2019)

  Changed paths:
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  iotests: Add qemu_io_log()

Add a function that runs qemu-io and logs the output with the
appropriate filters applied.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>


  Commit: 55824e0980f9cfe36a90d2d2acb7bb1ef8c41c39
      
https://github.com/qemu/qemu/commit/55824e0980f9cfe36a90d2d2acb7bb1ef8c41c39
  Author: Kevin Wolf <address@hidden>
  Date:   2019-12-18 (Wed, 18 Dec 2019)

  Changed paths:
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  iotests: Fix timeout in run_job()

run_job() accepts a wait parameter for a timeout, but it doesn't
actually use it. The only thing that is missing is passing it to
events_wait(), so do that now.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>


  Commit: 4688c4e32ec76004676470f11734478799673d6d
      
https://github.com/qemu/qemu/commit/4688c4e32ec76004676470f11734478799673d6d
  Author: Kevin Wolf <address@hidden>
  Date:   2019-12-18 (Wed, 18 Dec 2019)

  Changed paths:
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  iotests: Support job-complete in run_job()

Automatically complete jobs that have a 'ready' state and need an
explicit job-complete. Without this, run_job() would hang for such
jobs.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>


  Commit: 74e60fb56af3ea7ad94c2db7f38a9e226dc4faae
      
https://github.com/qemu/qemu/commit/74e60fb56af3ea7ad94c2db7f38a9e226dc4faae
  Author: Alberto Garcia <address@hidden>
  Date:   2019-12-18 (Wed, 18 Dec 2019)

  Changed paths:
    M block/qcow2.c

  Log Message:
  -----------
  qcow2: Use offset_into_cluster()

There's a couple of places left in the qcow2 code that still do the
calculation manually, so let's replace them.

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 00637c6b0b67694127cc01dd75f3626da23acdaa
      
https://github.com/qemu/qemu/commit/00637c6b0b67694127cc01dd75f3626da23acdaa
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: fix qcow2-bitmap.c under Dirty Bitmaps header

Somehow I wrote not full path to the file. Fix that.

Also, while being here, rearrange entries, so that includes go first,
then block, than migration, than util.

Fixes: 052db8e71444d
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: c85c6d9ec1f992a4d9b4b72cabf80235ab652b90
      
https://github.com/qemu/qemu/commit/c85c6d9ec1f992a4d9b4b72cabf80235ab652b90
  Author: Thomas Huth <address@hidden>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M tests/qemu-iotests/051
    M tests/qemu-iotests/267

  Log Message:
  -----------
  iotests: Add more "_require_drivers" checks to the shell-based tests

Test 051 should be skipped if nbd is not available, and 267 should
be skipped if copy-on-read is not enabled.

Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: d6f2c0b5a27f2a7e249ad6202fe88756c053ac0a
      
https://github.com/qemu/qemu/commit/d6f2c0b5a27f2a7e249ad6202fe88756c053ac0a
  Author: Max Reitz <address@hidden>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M tests/qemu-iotests/273
    M tests/qemu-iotests/273.out

  Log Message:
  -----------
  iotests/273: Filter format-specific information

Doing this allows running this test with e.g. -o compat=0.10 or
-o compat=refcount_bits=1.

Signed-off-by: Max Reitz <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: eb4ea9aaa0051054b3c148ad8631be7510851681
      
https://github.com/qemu/qemu/commit/eb4ea9aaa0051054b3c148ad8631be7510851681
  Author: Max Reitz <address@hidden>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M tests/qemu-iotests/common.rc

  Log Message:
  -----------
  iotests: Fix IMGOPTSSYNTAX for nbd

There is no $SOCKDIR, only $SOCK_DIR.

Fixes: f3923a72f199b2c63747a7032db74730546f55c6
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 66be5c3e7825cab861b3d68e87851a4ac9ff8c3d
      
https://github.com/qemu/qemu/commit/66be5c3e7825cab861b3d68e87851a4ac9ff8c3d
  Author: Tuguoyi <address@hidden>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M block/qcow2.c

  Log Message:
  -----------
  qcow2: Move error check of local_err near its assignment

The local_err check outside of the if block was necessary
when it was introduced in commit d1258dd0c87 because it needed to be
executed even if qcow2_load_autoloading_dirty_bitmaps() returned false.

After some modifications that all required the error check to remain
where it is, commit 9c98f145dfb finally moved the
qcow2_load_dirty_bitmaps() call into the if block, so now the error
check should be there, too.

Signed-off-by: Guoyi Tu <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: e9dbd1cae86f7cb6f8e470e1485aeb0c6e23ae64
      
https://github.com/qemu/qemu/commit/e9dbd1cae86f7cb6f8e470e1485aeb0c6e23ae64
  Author: Kevin Wolf <address@hidden>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  iotests: Create VM.blockdev_create()

We have several almost identical copies of a blockdev_create() function
in different test cases. Time to create one unified function in
iotests.py.

To keep the diff managable, this patch only creates the function and
follow-up patches will convert the individual test cases.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: a0de1e5330a033720158db52b1e258f5b8fa1d2e
      
https://github.com/qemu/qemu/commit/a0de1e5330a033720158db52b1e258f5b8fa1d2e
  Author: Kevin Wolf <address@hidden>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M tests/qemu-iotests/255

  Log Message:
  -----------
  iotests: 255: Drop blockdev_create()

blockdev_create() is completely unused in this test case, so we can just
drop it.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: f6da17366ab3f61b7ca3d15b17090f6a632dc53f
      
https://github.com/qemu/qemu/commit/f6da17366ab3f61b7ca3d15b17090f6a632dc53f
  Author: Kevin Wolf <address@hidden>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M tests/qemu-iotests/206

  Log Message:
  -----------
  iotests: 206: Convert to VM.blockdev_create()

Instead of having a separate blockdev_create() function, make use of the
VM.blockdev_create() offered by iotests.py.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: e55c24138b924f8a549100eebda3184ad11bb955
      
https://github.com/qemu/qemu/commit/e55c24138b924f8a549100eebda3184ad11bb955
  Author: Kevin Wolf <address@hidden>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M tests/qemu-iotests/210

  Log Message:
  -----------
  iotests: 210: Convert to VM.blockdev_create()

Instead of having a separate blockdev_create() function, make use of the
VM.blockdev_create() offered by iotests.py.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 08b171380c1ac6875f585691c9ef7fa837ad1ef1
      
https://github.com/qemu/qemu/commit/08b171380c1ac6875f585691c9ef7fa837ad1ef1
  Author: Kevin Wolf <address@hidden>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M tests/qemu-iotests/212

  Log Message:
  -----------
  iotests: 212: Convert to VM.blockdev_create()

Instead of having a separate blockdev_create() function, make use of the
VM.blockdev_create() offered by iotests.py.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 55689338403cada88be4084a67081fdf838adaf5
      
https://github.com/qemu/qemu/commit/55689338403cada88be4084a67081fdf838adaf5
  Author: Kevin Wolf <address@hidden>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M tests/qemu-iotests/213

  Log Message:
  -----------
  iotests: 213: Convert to VM.blockdev_create()

Instead of having a separate blockdev_create() function, make use of the
VM.blockdev_create() offered by iotests.py.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 59f61afa7e1800ee513a7ba8ef03bec0a370438c
      
https://github.com/qemu/qemu/commit/59f61afa7e1800ee513a7ba8ef03bec0a370438c
  Author: Kevin Wolf <address@hidden>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M tests/qemu-iotests/237

  Log Message:
  -----------
  iotests: 237: Convert to VM.blockdev_create()

Instead of having a separate blockdev_create() function, make use of the
VM.blockdev_create() offered by iotests.py.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: de1ff674a0f56e97d944ba66a8bbc89e2769d8c1
      
https://github.com/qemu/qemu/commit/de1ff674a0f56e97d944ba66a8bbc89e2769d8c1
  Author: Kevin Wolf <address@hidden>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M tests/qemu-iotests/266
    M tests/qemu-iotests/266.out

  Log Message:
  -----------
  iotests: 266: Convert to VM.blockdev_create()

Instead of having a separate blockdev_create() function, make use of the
VM.blockdev_create() offered by iotests.py.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 6055cdf3d9736ebb2971dc3e243fa5facdd415ee
      
https://github.com/qemu/qemu/commit/6055cdf3d9736ebb2971dc3e243fa5facdd415ee
  Author: Kevin Wolf <address@hidden>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M tests/qemu-iotests/207

  Log Message:
  -----------
  iotests: 207: Remove duplication with VM.blockdev_create()

The blockdev_create() function in this test case adds another filter to
the logging, but provides otherwise the same functionality as
VM.blockdev_create() from iotests.py. Make it a thin wrapper around the
iotests.py function.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 7fe6bb7a34599714afa8d4e5fac612ec1fdbdb5c
      
https://github.com/qemu/qemu/commit/7fe6bb7a34599714afa8d4e5fac612ec1fdbdb5c
  Author: Kevin Wolf <address@hidden>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M tests/qemu-iotests/211

  Log Message:
  -----------
  iotests: 211: Remove duplication with VM.blockdev_create()

The blockdev_create() function in this test case adds an error check
that skips the test in case of failure because of memory shortage, but
provides otherwise the same functionality as VM.blockdev_create() from
iotests.py. Make it a thin wrapper around the iotests.py function.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 7bb4941ace471fc7dd6ded4749b95b9622baa6ed
      
https://github.com/qemu/qemu/commit/7bb4941ace471fc7dd6ded4749b95b9622baa6ed
  Author: Kevin Wolf <address@hidden>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: Activate recursively even for already active nodes

bdrv_invalidate_cache_all() assumes that all nodes in a given subtree
are either active or inactive when it starts. Therefore, as soon as it
arrives at an already active node, it stops.

However, this assumption is wrong. For example, it's possible to take a
snapshot of an inactive node, which results in an active overlay over an
inactive backing file. The active overlay is probably also the root node
of an inactive BlockBackend (blk->disable_perm == true).

In this case, bdrv_invalidate_cache_all() does not need to do anything
to activate the overlay node, but it still needs to recurse into the
children and the parents to make sure that after returning success,
really everything is activated.

Cc: address@hidden
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>


  Commit: 89b6fc45614bb45dcd58f1590415afe5c2791abd
      
https://github.com/qemu/qemu/commit/89b6fc45614bb45dcd58f1590415afe5c2791abd
  Author: Kevin Wolf <address@hidden>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    M hmp-commands.hx
    M monitor/hmp-cmds.c

  Log Message:
  -----------
  hmp: Allow using qdev ID for qemu-io command

In order to issue requests on an existing BlockBackend with the
'qemu-io' HMP command, allow specifying the BlockBackend not only with a
BlockBackend name, but also with a qdev ID/QOM path for a device that
owns the (possibly anonymous) BlockBackend.

Because qdev names could be conflicting with BlockBackend and node
names, introduce a -d option to explicitly address a device. If the
option is not given, a BlockBackend or a node is addressed.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: f62f08ab7a9d902da70078992248ec5c98f652ad
      
https://github.com/qemu/qemu/commit/f62f08ab7a9d902da70078992248ec5c98f652ad
  Author: Kevin Wolf <address@hidden>
  Date:   2019-12-19 (Thu, 19 Dec 2019)

  Changed paths:
    A tests/qemu-iotests/280
    A tests/qemu-iotests/280.out
    M tests/qemu-iotests/group

  Log Message:
  -----------
  iotests: Test external snapshot with VM state

This tests creating an external snapshot with VM state (which results in
an active overlay over an inactive backing file, which is also the root
node of an inactive BlockBackend), re-activating the images and
performing some operations to test that the re-activation worked as
intended.

Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 1010af540b8bdd54ba05cf5567fd85aafa76dd7d
      
https://github.com/qemu/qemu/commit/1010af540b8bdd54ba05cf5567fd85aafa76dd7d
  Author: Peter Maydell <address@hidden>
  Date:   2019-12-20 (Fri, 20 Dec 2019)

  Changed paths:
    M MAINTAINERS
    M block.c
    M block/qcow2.c
    M blockjob.c
    M hmp-commands.hx
    M monitor/hmp-cmds.c
    M qapi/block-core.json
    M qemu-img.c
    M tests/qemu-iotests/030
    M tests/qemu-iotests/049
    M tests/qemu-iotests/049.out
    M tests/qemu-iotests/051
    M tests/qemu-iotests/206
    M tests/qemu-iotests/207
    M tests/qemu-iotests/210
    M tests/qemu-iotests/211
    M tests/qemu-iotests/212
    M tests/qemu-iotests/213
    M tests/qemu-iotests/237
    M tests/qemu-iotests/255
    M tests/qemu-iotests/266
    M tests/qemu-iotests/266.out
    M tests/qemu-iotests/267
    M tests/qemu-iotests/273
    M tests/qemu-iotests/273.out
    A tests/qemu-iotests/279
    A tests/qemu-iotests/279.out
    A tests/qemu-iotests/280
    A tests/qemu-iotests/280.out
    M tests/qemu-iotests/common.rc
    M tests/qemu-iotests/group
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block layer patches:

- qemu-img: fix info --backing-chain --image-opts
- Error out on image creation with conflicting size options
- Fix external snapshot with VM state
- hmp: Allow using qdev ID for qemu-io command
- Misc code cleanup
- Many iotests improvements

# gpg: Signature made Thu 19 Dec 2019 17:23:11 GMT
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <address@hidden>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream: (30 commits)
  iotests: Test external snapshot with VM state
  hmp: Allow using qdev ID for qemu-io command
  block: Activate recursively even for already active nodes
  iotests: 211: Remove duplication with VM.blockdev_create()
  iotests: 207: Remove duplication with VM.blockdev_create()
  iotests: 266: Convert to VM.blockdev_create()
  iotests: 237: Convert to VM.blockdev_create()
  iotests: 213: Convert to VM.blockdev_create()
  iotests: 212: Convert to VM.blockdev_create()
  iotests: 210: Convert to VM.blockdev_create()
  iotests: 206: Convert to VM.blockdev_create()
  iotests: 255: Drop blockdev_create()
  iotests: Create VM.blockdev_create()
  qcow2: Move error check of local_err near its assignment
  iotests: Fix IMGOPTSSYNTAX for nbd
  iotests/273: Filter format-specific information
  iotests: Add more "_require_drivers" checks to the shell-based tests
  MAINTAINERS: fix qcow2-bitmap.c under Dirty Bitmaps header
  qcow2: Use offset_into_cluster()
  iotests: Support job-complete in run_job()
  ...

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/dd5b0f954908...1010af540b8b
[Prev in Thread]
Current Thread
[Next in Thread]
[Qemu-commits] [qemu/qemu] 059f70: iotests: Provide a function for checking the creat..., Peter Maydell <=
Next by Date: [Qemu-commits] [qemu/qemu] ca26b0: vhost-user-gpu: Drop trailing json comma
Next by thread: [Qemu-commits] [qemu/qemu] ca26b0: vhost-user-gpu: Drop trailing json comma
Index(es):
- Date
- Thread