[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 01/11] block: Accept node-name for block-stream
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v2 01/11] block: Accept node-name for block-stream |
Date: |
Wed, 6 Jul 2016 17:20:37 +0200 |
In order to remove the necessity to use BlockBackend names in the
external API, we want to allow node-names everywhere. This converts
block-stream to accept a node-name without lifting the restriction that
we're operating at a root node.
In case of an invalid device name, the command returns the GenericError
error class now instead of DeviceNotFound, because this is what
qmp_get_root_bs() returns.
Signed-off-by: Kevin Wolf <address@hidden>
---
blockdev.c | 32 ++++++++++++++++++++------------
qapi/block-core.json | 5 +----
qmp-commands.hx | 2 +-
tests/qemu-iotests/030 | 2 +-
4 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 0f8065c..01e57c9 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1172,6 +1172,23 @@ fail:
return dinfo;
}
+static BlockDriverState *qmp_get_root_bs(const char *name, Error **errp)
+{
+ BlockDriverState *bs;
+
+ bs = bdrv_lookup_bs(name, name, errp);
+ if (bs == NULL) {
+ return NULL;
+ }
+
+ if (!bdrv_has_blk(bs)) {
+ error_setg(errp, "Need a root block node");
+ return NULL;
+ }
+
+ return bs;
+}
+
void hmp_commit(Monitor *mon, const QDict *qdict)
{
const char *device = qdict_get_str(qdict, "device");
@@ -3011,7 +3028,6 @@ void qmp_block_stream(const char *device,
bool has_on_error, BlockdevOnError on_error,
Error **errp)
{
- BlockBackend *blk;
BlockDriverState *bs;
BlockDriverState *base_bs = NULL;
AioContext *aio_context;
@@ -3022,22 +3038,14 @@ void qmp_block_stream(const char *device,
on_error = BLOCKDEV_ON_ERROR_REPORT;
}
- blk = blk_by_name(device);
- if (!blk) {
- error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
- "Device '%s' not found", device);
+ bs = qmp_get_root_bs(device, errp);
+ if (!bs) {
return;
}
- aio_context = blk_get_aio_context(blk);
+ aio_context = bdrv_get_aio_context(bs);
aio_context_acquire(aio_context);
- if (!blk_is_available(blk)) {
- error_setg(errp, "Device '%s' has no medium", device);
- goto out;
- }
- bs = blk_bs(blk);
-
if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_STREAM, errp)) {
goto out;
}
diff --git a/qapi/block-core.json b/qapi/block-core.json
index ac8f5f6..f069e40 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1413,7 +1413,7 @@
# On successful completion the image file is updated to drop the backing file
# and the BLOCK_JOB_COMPLETED event is emitted.
#
-# @device: the device name
+# @device: the device name or node-name of a root node
#
# @base: #optional the common backing file name
#
@@ -1438,9 +1438,6 @@
# 'stop' and 'enospc' can only be used if the block device
# supports io-status (see BlockInfo). Since 1.3.
#
-# Returns: Nothing on success
-# If @device does not exist, DeviceNotFound
-#
# Since: 1.1
##
{ 'command': 'block-stream',
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 6937e83..0588fd6 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -1118,7 +1118,7 @@ Copy data from a backing file into a block device.
Arguments:
-- "device": The device's ID, must be unique (json-string)
+- "device": The device name or node-name of a root node (json-string)
- "base": The file name of the backing image above which copying starts
(json-string, optional)
- "backing-file": The backing file string to write into the active layer. This
diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
index 3ac2443..107049b 100755
--- a/tests/qemu-iotests/030
+++ b/tests/qemu-iotests/030
@@ -126,7 +126,7 @@ class TestSingleDrive(iotests.QMPTestCase):
def test_device_not_found(self):
result = self.vm.qmp('block-stream', device='nonexistent')
- self.assert_qmp(result, 'error/class', 'DeviceNotFound')
+ self.assert_qmp(result, 'error/class', 'GenericError')
class TestSmallerBackingFile(iotests.QMPTestCase):
--
1.8.3.1
- [Qemu-devel] [PATCH v2 00/11] block: Accept node-name in all node level QMP commands, Kevin Wolf, 2016/07/06
- [Qemu-devel] [PATCH v2 01/11] block: Accept node-name for block-stream,
Kevin Wolf <=
- [Qemu-devel] [PATCH v2 02/11] block: Accept node-name for block-commit, Kevin Wolf, 2016/07/06
- [Qemu-devel] [PATCH v2 03/11] block: Accept node-name for blockdev-backup, Kevin Wolf, 2016/07/06
- [Qemu-devel] [PATCH v2 04/11] block: Accept node-name for blockdev-mirror, Kevin Wolf, 2016/07/06
- [Qemu-devel] [PATCH v2 05/11] block: Accept node-name for blockdev-snapshot-delete-internal-sync, Kevin Wolf, 2016/07/06
- [Qemu-devel] [PATCH v2 06/11] block: Accept node-name for blockdev-snapshot-internal-sync, Kevin Wolf, 2016/07/06
- [Qemu-devel] [PATCH v2 07/11] block: Accept node-name for change-backing-file, Kevin Wolf, 2016/07/06
- [Qemu-devel] [PATCH v2 08/11] block: Accept node-name for drive-backup, Kevin Wolf, 2016/07/06
- [Qemu-devel] [PATCH v2 09/11] block: Accept node-name for drive-mirror, Kevin Wolf, 2016/07/06
- [Qemu-devel] [PATCH v2 10/11] nbd-server: Use a separate BlockBackend, Kevin Wolf, 2016/07/06
- [Qemu-devel] [PATCH v2 11/11] nbd-server: Allow node name for nbd-server-add, Kevin Wolf, 2016/07/06