diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-01 11:28:28 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-01 11:28:28 +0100 |
| commit | 7fec76a02267598a4e437ddfdaeaeb6de09b92f3 (patch) | |
| tree | 338c85fea4651c80e9a7d681ec78ce0d87c9c65f /blockdev.c | |
| parent | 474f3938d79ab36b9231c9ad3b5a9314c2aeacde (diff) | |
| parent | ab5d4a30f7f3803ca5106b370969c1b7b54136f8 (diff) | |
| download | focaccia-qemu-7fec76a02267598a4e437ddfdaeaeb6de09b92f3.tar.gz focaccia-qemu-7fec76a02267598a4e437ddfdaeaeb6de09b92f3.zip | |
Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2019-06-24' into staging
Block patches: - The SSH block driver now uses libssh instead of libssh2 - The VMDK block driver gets read-only support for the seSparse subformat - Various fixes # gpg: Signature made Mon 24 Jun 2019 15:42:56 BST # gpg: using RSA key 91BEB60A30DB3E8857D11829F407DB0061D5CF40 # gpg: issuer "mreitz@redhat.com" # gpg: Good signature from "Max Reitz <mreitz@redhat.com>" [full] # Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40 * remotes/maxreitz/tags/pull-block-2019-06-24: iotests: Fix 205 for concurrent runs ssh: switch from libssh2 to libssh vmdk: Add read-only support for seSparse snapshots vmdk: Reduce the max bound for L1 table size vmdk: Fix comment regarding max l1_size coverage iotest 134: test cluster-misaligned encrypted write blockdev: enable non-root nodes for transaction drive-backup source nvme: do not advertise support for unsupported arbitration mechanism Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'blockdev.c')
| -rw-r--r-- | blockdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/blockdev.c b/blockdev.c index 5d6a13dea9..4d141e9a1f 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1774,7 +1774,7 @@ static void drive_backup_prepare(BlkActionState *common, Error **errp) assert(common->action->type == TRANSACTION_ACTION_KIND_DRIVE_BACKUP); backup = common->action->u.drive_backup.data; - bs = qmp_get_root_bs(backup->device, errp); + bs = bdrv_lookup_bs(backup->device, backup->device, errp); if (!bs) { return; } |