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

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: fa818b2febfc090acb9b2e69c1c2a4e4b38aee83
      
https://github.com/qemu/qemu/commit/fa818b2febfc090acb9b2e69c1c2a4e4b38aee83
  Author: Alberto Garcia <berto@igalia.com>
  Date:   2021-03-08 (Mon, 08 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: bdc4c4c5e372756a5ba3fb3a61e585b02f0dd7f4
      
https://github.com/qemu/qemu/commit/bdc4c4c5e372756a5ba3fb3a61e585b02f0dd7f4
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2021-03-08 (Mon, 08 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: 705dde27c6c53b73d2aa139b5b2a0ea490153e5b
      
https://github.com/qemu/qemu/commit/705dde27c6c53b73d2aa139b5b2a0ea490153e5b
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2021-03-08 (Mon, 08 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: e41799409281eab19c17692d1c52cb4cef7f5494
      
https://github.com/qemu/qemu/commit/e41799409281eab19c17692d1c52cb4cef7f5494
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2021-03-08 (Mon, 08 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: 4aa6fc69e8d2d64d37af382854ff5b12675248c2
      
https://github.com/qemu/qemu/commit/4aa6fc69e8d2d64d37af382854ff5b12675248c2
  Author: Eric Blake <eblake@redhat.com>
  Date:   2021-03-08 (Mon, 08 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: 3b6ad6230e902168f63315e47933025b016f546e
      
https://github.com/qemu/qemu/commit/3b6ad6230e902168f63315e47933025b016f546e
  Author: Stefano Garzarella <sgarzare@redhat.com>
  Date:   2021-03-08 (Mon, 08 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: a5ef35052e66721e9f943b2b9a91176536b4d896
      
https://github.com/qemu/qemu/commit/a5ef35052e66721e9f943b2b9a91176536b4d896
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-03-08 (Mon, 08 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: 501a4b3681c90bbcf610fbbd6335c26af30668d7
      
https://github.com/qemu/qemu/commit/501a4b3681c90bbcf610fbbd6335c26af30668d7
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-03-08 (Mon, 08 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: 03d2b412aaf2078425f8472f31c8a9c2340969eb
      
https://github.com/qemu/qemu/commit/03d2b412aaf2078425f8472f31c8a9c2340969eb
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-08 (Mon, 08 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: 3f14b909ebe7296eef6d4b1a1ed5f602ab129602
      
https://github.com/qemu/qemu/commit/3f14b909ebe7296eef6d4b1a1ed5f602ab129602
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-08 (Mon, 08 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: e246bf3ddc4d61d03227373fecfdcd4fec3508db
      
https://github.com/qemu/qemu/commit/e246bf3ddc4d61d03227373fecfdcd4fec3508db
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-08 (Mon, 08 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: 535255b43898d2e96744057eb86f8497d4d7a461
      
https://github.com/qemu/qemu/commit/535255b43898d2e96744057eb86f8497d4d7a461
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-08 (Mon, 08 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: 9fb7bb06986741b7fd8427fac9f22177ca38dcff
      
https://github.com/qemu/qemu/commit/9fb7bb06986741b7fd8427fac9f22177ca38dcff
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-08 (Mon, 08 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: 7a23c523762371fd26a7a9ecfa8f16b64618a1ad
      
https://github.com/qemu/qemu/commit/7a23c523762371fd26a7a9ecfa8f16b64618a1ad
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-08 (Mon, 08 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: e1fa7f5591c219a94f039754f6fbe58e757e7af6
      
https://github.com/qemu/qemu/commit/e1fa7f5591c219a94f039754f6fbe58e757e7af6
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-08 (Mon, 08 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: a4f1542af58fd6ab061e594d4e161f1c8b4a4372
      
https://github.com/qemu/qemu/commit/a4f1542af58fd6ab061e594d4e161f1c8b4a4372
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-08 (Mon, 08 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: 524bac0744e5abf95856fb9e31c01fd2ef102188
      
https://github.com/qemu/qemu/commit/524bac0744e5abf95856fb9e31c01fd2ef102188
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-08 (Mon, 08 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: e44362ce317bcc46d409ed6c4a5ed2b46804bcbf
      
https://github.com/qemu/qemu/commit/e44362ce317bcc46d409ed6c4a5ed2b46804bcbf
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-08 (Mon, 08 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: db4eadf9f10e19f864d70d1df3a90fbda31b8c06
      
https://github.com/qemu/qemu/commit/db4eadf9f10e19f864d70d1df3a90fbda31b8c06
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-08 (Mon, 08 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: 05ae4e674e3d47342a7660ae7bc55b393e09f4c7
      
https://github.com/qemu/qemu/commit/05ae4e674e3d47342a7660ae7bc55b393e09f4c7
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2021-03-08 (Mon, 08 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: 35f428ba39718711177036ddf112e9299e7f20b2
      
https://github.com/qemu/qemu/commit/35f428ba39718711177036ddf112e9299e7f20b2
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-03-08 (Mon, 08 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: 67ae4ace9bce25d37be8dd97630ed336c29d6b72
      
https://github.com/qemu/qemu/commit/67ae4ace9bce25d37be8dd97630ed336c29d6b72
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-03-08 (Mon, 08 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: e0b5207f54e45ccb7c733e736add47f7b06c5867
      
https://github.com/qemu/qemu/commit/e0b5207f54e45ccb7c733e736add47f7b06c5867
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-03-08 (Mon, 08 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: baefd977002e72402f2cc42b11f2cb11b96aae9e
      
https://github.com/qemu/qemu/commit/baefd977002e72402f2cc42b11f2cb11b96aae9e
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-03-08 (Mon, 08 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: 55b116302f26c50772fd8b73f9af13b091461ae5
      
https://github.com/qemu/qemu/commit/55b116302f26c50772fd8b73f9af13b091461ae5
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-03-08 (Mon, 08 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: c203c3b813be4a012b45cc6e33a2c18512071b1c
      
https://github.com/qemu/qemu/commit/c203c3b813be4a012b45cc6e33a2c18512071b1c
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-03-08 (Mon, 08 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: a960c4b484a3d2cce892f870dba749132402a2f7
      
https://github.com/qemu/qemu/commit/a960c4b484a3d2cce892f870dba749132402a2f7
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2021-03-08 (Mon, 08 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: ef809f709de81aef01bbb7403b87cbe2ac7e0c10
      
https://github.com/qemu/qemu/commit/ef809f709de81aef01bbb7403b87cbe2ac7e0c10
  Author: Kevin Wolf <kwolf@redhat.com>
  Date:   2021-03-08 (Mon, 08 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>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: 785ec4b1b968906ea1d22f753a3b199be946550b
      
https://github.com/qemu/qemu/commit/785ec4b1b968906ea1d22f753a3b199be946550b
  Author: Connor Kuehl <ckuehl@redhat.com>
  Date:   2021-03-08 (Mon, 08 Mar 2021)

  Changed paths:
    M block.c
    M tests/qemu-iotests/030
    M tests/qemu-iotests/040
    M tests/qemu-iotests/051.pc.out
    M tests/qemu-iotests/081.out
    M tests/qemu-iotests/085.out
    M tests/qemu-iotests/087.out
    M tests/qemu-iotests/206.out
    M tests/qemu-iotests/210.out
    M tests/qemu-iotests/211.out
    M tests/qemu-iotests/212.out
    M tests/qemu-iotests/213.out
    M tests/qemu-iotests/223.out
    M tests/qemu-iotests/237.out
    M tests/qemu-iotests/245
    M tests/qemu-iotests/249.out
    M tests/qemu-iotests/283.out
    M tests/qemu-iotests/300

  Log Message:
  -----------
  block: Clarify error messages pertaining to 'node-name'

Some error messages contain ambiguous representations of the 'node-name'
parameter. This can be particularly confusing when exchanging QMP
messages (C = client, S = server):

C: {"execute": "block_resize", "arguments": { "device": "my_file", "size": 
26843545600 }}
S: {"error": {"class": "GenericError", "desc": "Cannot find device=my_file nor 
node_name="}}
                                                                               
^^^^^^^^^

This error message suggests one could send a message with a key called
'node_name':

C: {"execute": "block_resize", "arguments": { "node_name": "my_file", "size": 
26843545600 }}
                                               ^^^^^^^^^

but using the underscore is actually incorrect, the parameter should be
'node-name':

S: {"error": {"class": "GenericError", "desc": "Parameter 'node_name' is 
unexpected"}}

This behavior was uncovered in bz1651437, but I ended up going down a
rabbit hole looking for other areas where this miscommunication might
occur and changing those accordingly as well.

Fixes: https://bugzilla.redhat.com/1651437
Signed-off-by: Connor Kuehl <ckuehl@redhat.com>
Message-Id: <20210305151929.1947331-2-ckuehl@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: ef2e38a1a1d2915b148c4a49f61626e62c46fbb6
      
https://github.com/qemu/qemu/commit/ef2e38a1a1d2915b148c4a49f61626e62c46fbb6
  Author: Connor Kuehl <ckuehl@redhat.com>
  Date:   2021-03-08 (Mon, 08 Mar 2021)

  Changed paths:
    M blockdev.c
    M tests/qemu-iotests/245

  Log Message:
  -----------
  blockdev: Clarify error messages pertaining to 'node-name'

Signed-off-by: Connor Kuehl <ckuehl@redhat.com>
Message-Id: <20210305151929.1947331-3-ckuehl@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>


  Commit: a557b00469bca61a058fc1db4855503cac1c3219
      
https://github.com/qemu/qemu/commit/a557b00469bca61a058fc1db4855503cac1c3219
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-03-09 (Tue, 09 Mar 2021)

  Changed paths:
    M MAINTAINERS
    M block.c
    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 blockdev.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/030
    M tests/qemu-iotests/040
    M tests/qemu-iotests/051.pc.out
    M tests/qemu-iotests/081.out
    M tests/qemu-iotests/085.out
    M tests/qemu-iotests/087
    M tests/qemu-iotests/087.out
    M tests/qemu-iotests/184
    M tests/qemu-iotests/206.out
    M tests/qemu-iotests/210.out
    M tests/qemu-iotests/211.out
    M tests/qemu-iotests/212.out
    M tests/qemu-iotests/213.out
    M tests/qemu-iotests/218
    M tests/qemu-iotests/223.out
    M tests/qemu-iotests/235
    M tests/qemu-iotests/237.out
    M tests/qemu-iotests/245
    M tests/qemu-iotests/249.out
    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/libqtest.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
- docs: Improvements for qemu-storage-daemon documentation
- parallels: load bitmap extension
- backup-top: Don't crash on post-finalize accesses
- Improve error messages related to node-name options
- iotests improvements

# gpg: Signature made Mon 08 Mar 2021 17:01:41 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: (30 commits)
  blockdev: Clarify error messages pertaining to 'node-name'
  block: Clarify error messages pertaining to 'node-name'
  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
  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
  libqtest: add qtest_remove_abrt_handler()
  libqtest: add qtest_kill_qemu()
  libqtest: add qtest_socket_server()
  vhost-user-blk: fix blkcfg->num_queues endianness
  docs: replace insecure /tmp examples in qsd docs
  ...

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


Compare: https://github.com/qemu/qemu/compare/750efa2ec476...a557b00469bc