[Qemu-commits] [qemu/qemu] c593f1: iotests: Drop deprecated 'props' from object-add

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: c593f16543ed30be20167e328766e685530ca9e0
      
https://github.com/qemu/qemu/commit/c593f16543ed30be20167e328766e685530ca9e0
  Author: Alberto Garcia <berto@igalia.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M tests/qemu-iotests/087
    M tests/qemu-iotests/184
    M tests/qemu-iotests/218
    M tests/qemu-iotests/235
    M tests/qemu-iotests/245
    M tests/qemu-iotests/258
    M tests/qemu-iotests/258.out
    M tests/qemu-iotests/295
    M tests/qemu-iotests/296

  Log Message:
  -----------
  iotests: Drop deprecated 'props' from object-add

Signed-off-by: Alberto Garcia <berto@igalia.com>
Message-Id: <20210222115737.2993-1-berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 568bf20672a18afc7ff239e5513c8f8147a253d2
      
https://github.com/qemu/qemu/commit/568bf20672a18afc7ff239e5513c8f8147a253d2
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M block/backup.c

  Log Message:
  -----------
  backup: Remove nodes from job in .clean()

The block job holds a reference to the backup-top node (because it is
passed as the main job BDS to block_job_create()).  Therefore,
bdrv_backup_top_drop() cannot delete the backup-top node (replacing it
by its child does not affect the job parent, because that has
.stay_at_node set).  That is a problem, because all of its I/O functions
assume the BlockCopyState (s->bcs) to be valid and that it has a
filtered child; but after bdrv_backup_top_drop(), neither of those
things are true.

It does not make sense to add new parents to backup-top after
backup_clean(), so we should detach it from the job before
bdrv_backup_top_drop().  Because there is no function to do that for a
single node, just detach all of the job's nodes -- the job does not do
anything past backup_clean() anyway.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210219153348.41861-2-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 6fb8ef5036204ee421cdd14febc044a374bce4cb
      
https://github.com/qemu/qemu/commit/6fb8ef5036204ee421cdd14febc044a374bce4cb
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M block/backup-top.c

  Log Message:
  -----------
  backup-top: Refuse I/O in inactive state

When the backup-top node transitions from active to inactive in
bdrv_backup_top_drop(), the BlockCopyState is freed and the filtered
child is removed, so the node effectively becomes unusable.

However, noone told its I/O functions this, so they will happily
continue accessing bs->backing and s->bcs.  Prevent that by aborting
early when s->active is false.

(After the preceding patch, the node should be gone after
bdrv_backup_top_drop(), so this should largely be a theoretical problem.
But still, better to be safe than sorry, and also I think it just makes
sense to check s->active in the I/O functions.)

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210219153348.41861-3-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 857be78f489deb681c5dbcef6bafb9a11c5a208d
      
https://github.com/qemu/qemu/commit/857be78f489deb681c5dbcef6bafb9a11c5a208d
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

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

  Log Message:
  -----------
  iotests/283: Check that finalize drops backup-top

Without any of HEAD^ or HEAD^^ applied, qemu will most likely crash on
the qemu-io invocation, for a variety of immediate reasons.  The
underlying problem is generally a use-after-free access into
backup-top's BlockCopyState.

With only HEAD^ applied, qemu-io will run into an EIO (which is not
capture by the output, but you can see that the qemu-io invocation will
be accepted (i.e., qemu-io will run) in contrast to the reference
output, where the node name cannot be found), and qemu will then crash
in query-named-block-nodes: bdrv_get_allocated_file_size() detects
backup-top to be a filter and passes the request through to its child.
However, after bdrv_backup_top_drop(), that child is NULL, so the
recursive call crashes.

With HEAD^^ applied, this test should pass.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210219153348.41861-4-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 83665ef324922a101ca6848e2612f9768d6ff44a
      
https://github.com/qemu/qemu/commit/83665ef324922a101ca6848e2612f9768d6ff44a
  Author: Eric Blake <eblake@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M tests/qemu-iotests/300

  Log Message:
  -----------
  iotests: Fix up python style in 300

Break some long lines, and relax our type hints to be more generic to
any JSON, in order to more easily permit the additional JSON depth now
possible in migration parameters.  Detected by iotest 297.

Fixes: ca4bfec41d56
 (qemu-iotests: 300: Add test case for modifying persistence of bitmap)
Reported-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20210215220518.1745469-1-eblake@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 56cb002e3bc0f2a08be1c5a79f8b176b97ff4b4b
      
https://github.com/qemu/qemu/commit/56cb002e3bc0f2a08be1c5a79f8b176b97ff4b4b
  Author: Stefano Garzarella <sgarzare@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M blockjob.c

  Log Message:
  -----------
  blockjob: report a better error message

When a block job fails, we report strerror(-job->job.ret) error
message, also if the job set an error object.
Let's report a better error message using error_get_pretty(job->job.err).

If an error object was not set, strerror(-job->ret) is used as fallback,
as explained in include/qemu/job.h:

typedef struct Job {
    ...
    /**
     * Error object for a failed job.
     * If job->ret is nonzero and an error object was not set, it will be set
     * to strerror(-job->ret) during job_completed.
     */
    Error *err;
}

In block_job_query() there can be a transient where 'job.err' is not set
by a scheduled bottom half. In that case we use strerror(-job->ret) as it
was before.

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20210225103633.76746-1-sgarzare@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: d182ce772a74289462f8619130aab5c8ea719b26
      
https://github.com/qemu/qemu/commit/d182ce772a74289462f8619130aab5c8ea719b26
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M storage-daemon/qemu-storage-daemon.c

  Log Message:
  -----------
  storage-daemon: report unexpected arguments on the fly

If the first character of optstring is '-', then each nonoption argv
element is handled as if it were the argument of an option with character
code 1.  This removes the reordering of the argv array, and enables usage
of loc_set_cmdline to provide better error messages.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210301152844.291799-2-pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: a597e5964b042e7db12454f68dd0e19c4dd34fb6
      
https://github.com/qemu/qemu/commit/a597e5964b042e7db12454f68dd0e19c4dd34fb6
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M storage-daemon/qemu-storage-daemon.c

  Log Message:
  -----------
  storage-daemon: include current command line option in the errors

Use the location management facilities that the emulator uses, so that
the current command line option appears in the error message.

Before:

  $ storage-daemon/qemu-storage-daemon --nbd key..=
  qemu-storage-daemon: Invalid parameter 'key..'

After:

  $ storage-daemon/qemu-storage-daemon --nbd key..=
  qemu-storage-daemon: --nbd key..=: Invalid parameter 'key..'

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210301152844.291799-3-pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 7dc033e47f450285c2253cd1d37ba87753cdff43
      
https://github.com/qemu/qemu/commit/7dc033e47f450285c2253cd1d37ba87753cdff43
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M docs/tools/qemu-storage-daemon.rst
    M storage-daemon/qemu-storage-daemon.c

  Log Message:
  -----------
  qemu-storage-daemon: add --pidfile option

Daemons often have a --pidfile option where the pid is written to a file
so that scripts can stop the daemon by sending a signal.

The pid file also acts as a lock to prevent multiple instances of the
daemon from launching for a given pid file.

QEMU, qemu-nbd, qemu-ga, virtiofsd, and qemu-pr-helper all support the
--pidfile option. Add it to qemu-storage-daemon too.

Reported-by: Richard W.M. Jones <rjones@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210302142746.170535-1-stefanha@redhat.com>
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 691ce8a9cc8a4908bab204286d1a4238f3660b02
      
https://github.com/qemu/qemu/commit/691ce8a9cc8a4908bab204286d1a4238f3660b02
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M docs/tools/qemu-storage-daemon.rst

  Log Message:
  -----------
  docs: show how to spawn qemu-storage-daemon with fd passing

The QMP monitor, NBD server, and vhost-user-blk export all support file
descriptor passing. This is a useful technique because it allows the
parent process to spawn and wait for qemu-storage-daemon without busy
waiting, which may delay startup due to arbitrary sleep() calls.

This Python example is inspired by the test case written for libnbd by
Richard W.M. Jones <rjones@redhat.com>:
https://gitlab.com/nbdkit/libnbd/-/commit/89113f484effb0e6c322314ba75c1cbe07a04543

Thanks to Daniel P. Berrangé <berrange@redhat.com> for suggestions on
how to get this working. Now let's document it!

Reported-by: Richard W.M. Jones <rjones@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210301172728.135331-2-stefanha@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 409e6a53320fe5b6f9ed0adb527aed4a5a88bb44
      
https://github.com/qemu/qemu/commit/409e6a53320fe5b6f9ed0adb527aed4a5a88bb44
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M docs/tools/qemu-storage-daemon.rst

  Log Message:
  -----------
  docs: replace insecure /tmp examples in qsd docs

World-writeable directories have security issues. Avoid showing them in
the documentation since someone might accidentally use them in
situations where they are insecure.

There tend to be 3 security problems:
1. Denial of service. An adversary may be able to create the file
   beforehand, consume all space/inodes, etc to sabotage us.
2. Impersonation. An adversary may be able to create a listen socket and
   accept incoming connections that were meant for us.
3. Unauthenticated client access. An adversary may be able to connect to
   us if we did not set the uid/gid and permissions correctly.

These can be prevented or mitigated with private /tmp, carefully setting
the umask, etc but that requires special action and does not apply to
all situations. Just avoid using /tmp in examples.

Reported-by: Richard W.M. Jones <rjones@redhat.com>
Reported-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210301172728.135331-3-stefanha@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 522a78089cc1d1344db3150042a8752895ee1090
      
https://github.com/qemu/qemu/commit/522a78089cc1d1344db3150042a8752895ee1090
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M hw/block/vhost-user-blk.c

  Log Message:
  -----------
  vhost-user-blk: fix blkcfg->num_queues endianness

Treat the num_queues field as virtio-endian. On big-endian hosts the
vhost-user-blk num_queues field was in the wrong endianness.

Move the blkcfg.num_queues store operation from realize to
vhost_user_blk_update_config() so feature negotiation has finished and
we know the endianness of the device. VIRTIO 1.0 devices are
little-endian, but in case someone wants to use legacy VIRTIO we support
all endianness cases.

Cc: qemu-stable@nongnu.org
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20210223144653.811468-2-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 690694bf7da83ecbcf763473151f20be1ddd0012
      
https://github.com/qemu/qemu/commit/690694bf7da83ecbcf763473151f20be1ddd0012
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M tests/qtest/libqos/libqtest.h
    M tests/qtest/libqtest.c

  Log Message:
  -----------
  libqtest: add qtest_socket_server()

Add an API that returns a new UNIX domain socket in the listen state.
The code for this was already there but only used internally in
init_socket().

This new API will be used by vhost-user-blk-test.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20210223144653.811468-3-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 31d35f6c55f344650b053a1d7055e2ec46a7da79
      
https://github.com/qemu/qemu/commit/31d35f6c55f344650b053a1d7055e2ec46a7da79
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M tests/qtest/libqos/libqtest.h
    M tests/qtest/libqtest.c

  Log Message:
  -----------
  libqtest: add qtest_kill_qemu()

Tests that manage multiple processes may wish to kill QEMU before
destroying the QTestState. Expose a function to do that.

The vhost-user-blk-test testcase will need this.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20210223144653.811468-4-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: d4b28c31e2dc9873726b8773f4f4f21170465220
      
https://github.com/qemu/qemu/commit/d4b28c31e2dc9873726b8773f4f4f21170465220
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M tests/qtest/libqos/libqtest.h
    M tests/qtest/libqtest.c

  Log Message:
  -----------
  libqtest: add qtest_remove_abrt_handler()

Add a function to remove previously-added abrt handler functions.

Now that a symmetric pair of add/remove functions exists we can also
balance the SIGABRT handler installation. The signal handler was
installed each time qtest_add_abrt_handler() was called. Now it is
installed when the abrt handler list becomes non-empty and removed again
when the list becomes empty.

The qtest_remove_abrt_handler() function will be used by
vhost-user-blk-test.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20210223144653.811468-5-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 2d52150aad8d628968dd5dee1cd8a3b4dafb9208
      
https://github.com/qemu/qemu/commit/2d52150aad8d628968dd5dee1cd8a3b4dafb9208
  Author: Coiby Xu <coiby.xu@gmail.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M MAINTAINERS
    M tests/qtest/libqos/meson.build
    A tests/qtest/libqos/vhost-user-blk.c
    A tests/qtest/libqos/vhost-user-blk.h
    M tests/qtest/meson.build
    A tests/qtest/vhost-user-blk-test.c

  Log Message:
  -----------
  test: new qTest case to test the vhost-user-blk-server

This test case has the same tests as tests/virtio-blk-test.c except for
tests have block_resize. Since the vhost-user-blk export only serves one
client one time, two exports are started by qemu-storage-daemon for the
hotplug test.

Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Coiby Xu <coiby.xu@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210223144653.811468-6-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 2828da3cf0177776d745467780c54d099d9a7bcf
      
https://github.com/qemu/qemu/commit/2828da3cf0177776d745467780c54d099d9a7bcf
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M tests/qtest/vhost-user-blk-test.c

  Log Message:
  -----------
  tests/qtest: add multi-queue test case to vhost-user-blk-test

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210223144653.811468-7-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: cf961a4815ff9ed4a95553ccc18077e7ed6e2d73
      
https://github.com/qemu/qemu/commit/cf961a4815ff9ed4a95553ccc18077e7ed6e2d73
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M block/export/vhost-user-blk-server.c

  Log Message:
  -----------
  block/export: fix blk_size double byteswap

The config->blk_size field is little-endian. Use the native-endian
blk_size variable to avoid double byteswapping.

Fixes: 11f60f7eaee2630dd6fa0c3a8c49f792e46c4cf1 ("block/export: make 
vhost-user-blk config space little-endian")
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210223144653.811468-8-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 82eac56740e797efad4653443bc1e5e003828ecf
      
https://github.com/qemu/qemu/commit/82eac56740e797efad4653443bc1e5e003828ecf
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M block/export/vhost-user-blk-server.c

  Log Message:
  -----------
  block/export: use VIRTIO_BLK_SECTOR_BITS

Use VIRTIO_BLK_SECTOR_BITS and VIRTIO_BLK_SECTOR_SIZE when dealing with
virtio-blk sector numbers. Although the values happen to be the same as
BDRV_SECTOR_BITS and BDRV_SECTOR_SIZE, they are conceptually different.
This makes it clearer when we are dealing with virtio-blk sector units.

Use VIRTIO_BLK_SECTOR_BITS in vu_blk_initialize_config(). Later patches
will use it the new constants the virtqueue request processing code
path.

Suggested-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210223144653.811468-9-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: fe921e0f67625c3dbaa96f745def536bcea77562
      
https://github.com/qemu/qemu/commit/fe921e0f67625c3dbaa96f745def536bcea77562
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M block/export/vhost-user-blk-server.c

  Log Message:
  -----------
  block/export: fix vhost-user-blk export sector number calculation

The driver is supposed to honor the blk_size field but the protocol
still uses 512-byte sector numbers. It is incorrect to multiply
req->sector_num by blk_size.

VIRTIO 1.1 5.2.5 Device Initialization says:

  blk_size can be read to determine the optimal sector size for the
  driver to use. This does not affect the units used in the protocol
  (always 512 bytes), but awareness of the correct value can affect
  performance.

Fixes: 3578389bcf76c824a5d82e6586a6f0c71e56f2aa ("block/export: vhost-user 
block device backend server")
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210223144653.811468-10-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: c9affc7d402e84e092fa7e2032722834720ac776
      
https://github.com/qemu/qemu/commit/c9affc7d402e84e092fa7e2032722834720ac776
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M block/export/vhost-user-blk-server.c

  Log Message:
  -----------
  block/export: port virtio-blk discard/write zeroes input validation

Validate discard/write zeroes the same way we do for virtio-blk. Some of
these checks are mandated by the VIRTIO specification, others are
internal to QEMU.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210223144653.811468-11-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 2f56051e14fd8d5507a9c9afcc95831eee607bbe
      
https://github.com/qemu/qemu/commit/2f56051e14fd8d5507a9c9afcc95831eee607bbe
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M tests/qtest/vhost-user-blk-test.c

  Log Message:
  -----------
  vhost-user-blk-test: test discard/write zeroes invalid inputs

Exercise input validation code paths in
block/export/vhost-user-blk-server.c.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210223144653.811468-12-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 07ea49bab18bf1af8232625d868be1fedeeb908c
      
https://github.com/qemu/qemu/commit/07ea49bab18bf1af8232625d868be1fedeeb908c
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M block/export/vhost-user-blk-server.c

  Log Message:
  -----------
  block/export: port virtio-blk read/write range check

Check that the sector number and byte count are valid.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210223144653.811468-13-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: b9b1ea806b93e89add9644569c866aa570a9b635
      
https://github.com/qemu/qemu/commit/b9b1ea806b93e89add9644569c866aa570a9b635
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M block/dirty-bitmap.c
    M block/qcow2-bitmap.c
    M include/block/dirty-bitmap.h

  Log Message:
  -----------
  qcow2-bitmap: make bytes_covered_by_bitmap_cluster() public

Rename bytes_covered_by_bitmap_cluster() to
bdrv_dirty_bitmap_serialization_coverage() and make it public.
It is needed as we are going to share it with bitmap loading in
parallels format.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Message-Id: <20210224104707.88430-2-vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: e8df61e9a909df6eb935c7cb2c894072f8e74bf6
      
https://github.com/qemu/qemu/commit/e8df61e9a909df6eb935c7cb2c894072f8e74bf6
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M docs/interop/parallels.txt

  Log Message:
  -----------
  parallels.txt: fix bitmap L1 table description

Actually L1 table entry offset is in 512 bytes sectors. Fix the spec.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210224104707.88430-3-vsementsov@virtuozzo.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: e9d6b4f6317d64414832c0164f27fe033c64e6fa
      
https://github.com/qemu/qemu/commit/e9d6b4f6317d64414832c0164f27fe033c64e6fa
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M block/parallels.c
    M block/parallels.h

  Log Message:
  -----------
  block/parallels: BDRVParallelsState: add cluster_size field

We are going to use it in more places, calculating
"s->tracks << BDRV_SECTOR_BITS" doesn't look good.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210224104707.88430-4-vsementsov@virtuozzo.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: bb9c76b4e33e86f0a8a185113e64785b5250579d
      
https://github.com/qemu/qemu/commit/bb9c76b4e33e86f0a8a185113e64785b5250579d
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M block/meson.build
    A block/parallels-ext.c
    M block/parallels.c
    M block/parallels.h

  Log Message:
  -----------
  parallels: support bitmap extension for read-only mode

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210224104707.88430-5-vsementsov@virtuozzo.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: efb8373f1deda5a91dd680096b8c5ed4d0bbd2a3
      
https://github.com/qemu/qemu/commit/efb8373f1deda5a91dd680096b8c5ed4d0bbd2a3
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

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

  Log Message:
  -----------
  iotests.py: add unarchive_sample_image() helper

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210224104707.88430-6-vsementsov@virtuozzo.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: d1152a02b290c48ccd58192e8c37521ad11b1803
      
https://github.com/qemu/qemu/commit/d1152a02b290c48ccd58192e8c37521ad11b1803
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    A tests/qemu-iotests/sample_images/parallels-with-bitmap.bz2
    A tests/qemu-iotests/sample_images/parallels-with-bitmap.sh
    A tests/qemu-iotests/tests/parallels-read-bitmap
    A tests/qemu-iotests/tests/parallels-read-bitmap.out

  Log Message:
  -----------
  iotests: add parallels-read-bitmap test

Test support for reading bitmap from parallels image format.
parallels-with-bitmap.bz2 is generated on Virtuozzo by
parallels-with-bitmap.sh

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210224104707.88430-7-vsementsov@virtuozzo.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 737555938750f0bca0f8f1c20b30866ad3eb9d9d
      
https://github.com/qemu/qemu/commit/737555938750f0bca0f8f1c20b30866ad3eb9d9d
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: update parallels block driver

Add new parallels-ext.c and myself as co-maintainer.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210304095151.19358-1-vsementsov@virtuozzo.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 67bedc3aed5c455b629c2cb5f523b536c46adff9
      
https://github.com/qemu/qemu/commit/67bedc3aed5c455b629c2cb5f523b536c46adff9
  Author: Kevin Wolf <kwolf@redhat.com>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M docs/tools/qemu-storage-daemon.rst

  Log Message:
  -----------
  docs: qsd: Explain --export nbd,name=... default

The 'name' option for NBD exports is optional. Add a note that the
default for the option is the node name (people could otherwise expect
that it's the empty string like for qemu-nbd).

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20210305094856.18964-1-kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 33615cec7bdef58def3c77a5855638e932455270
      
https://github.com/qemu/qemu/commit/33615cec7bdef58def3c77a5855638e932455270
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-03-05 (Fri, 05 Mar 2021)

  Changed paths:
    M MAINTAINERS
    M block/backup-top.c
    M block/backup.c
    M block/dirty-bitmap.c
    M block/export/vhost-user-blk-server.c
    M block/meson.build
    A block/parallels-ext.c
    M block/parallels.c
    M block/parallels.h
    M block/qcow2-bitmap.c
    M blockjob.c
    M docs/interop/parallels.txt
    M docs/tools/qemu-storage-daemon.rst
    M hw/block/vhost-user-blk.c
    M include/block/dirty-bitmap.h
    M storage-daemon/qemu-storage-daemon.c
    M tests/qemu-iotests/087
    M tests/qemu-iotests/184
    M tests/qemu-iotests/218
    M tests/qemu-iotests/235
    M tests/qemu-iotests/245
    M tests/qemu-iotests/258
    M tests/qemu-iotests/258.out
    M tests/qemu-iotests/283
    M tests/qemu-iotests/283.out
    M tests/qemu-iotests/295
    M tests/qemu-iotests/296
    M tests/qemu-iotests/300
    M tests/qemu-iotests/iotests.py
    A tests/qemu-iotests/sample_images/parallels-with-bitmap.bz2
    A tests/qemu-iotests/sample_images/parallels-with-bitmap.sh
    A tests/qemu-iotests/tests/parallels-read-bitmap
    A tests/qemu-iotests/tests/parallels-read-bitmap.out
    M tests/qtest/libqos/libqtest.h
    M tests/qtest/libqos/meson.build
    A tests/qtest/libqos/vhost-user-blk.c
    A tests/qtest/libqos/vhost-user-blk.h
    M tests/qtest/libqtest.c
    M tests/qtest/meson.build
    A tests/qtest/vhost-user-blk-test.c

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

Block layer patches:

- qemu-storage-daemon: add --pidfile option
- qemu-storage-daemon: CLI error messages include the option name now
- vhost-user-blk export: Misc fixes, added test cases
- docs: Improvements for qemu-storage-daemon documentation
- parallels: load bitmap extension
- backup-top: Don't crash on post-finalize accesses
- iotests improvements

# gpg: Signature made Fri 05 Mar 2021 16:53:21 GMT
# gpg:                using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6
# gpg:                issuer "kwolf@redhat.com"
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream: (31 commits)
  docs: qsd: Explain --export nbd,name=... default
  MAINTAINERS: update parallels block driver
  iotests: add parallels-read-bitmap test
  iotests.py: add unarchive_sample_image() helper
  parallels: support bitmap extension for read-only mode
  block/parallels: BDRVParallelsState: add cluster_size field
  parallels.txt: fix bitmap L1 table description
  qcow2-bitmap: make bytes_covered_by_bitmap_cluster() public
  block/export: port virtio-blk read/write range check
  vhost-user-blk-test: test discard/write zeroes invalid inputs
  block/export: port virtio-blk discard/write zeroes input validation
  block/export: fix vhost-user-blk export sector number calculation
  block/export: use VIRTIO_BLK_SECTOR_BITS
  block/export: fix blk_size double byteswap
  tests/qtest: add multi-queue test case to vhost-user-blk-test
  test: new qTest case to test the vhost-user-blk-server
  libqtest: add qtest_remove_abrt_handler()
  libqtest: add qtest_kill_qemu()
  libqtest: add qtest_socket_server()
  vhost-user-blk: fix blkcfg->num_queues endianness
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/91e92cad67ca...33615cec7bde