[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/11] block: Relax bdrv_lookup_bs constraints.
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 10/11] block: Relax bdrv_lookup_bs constraints. |
Date: |
Fri, 14 Feb 2014 18:29:32 +0100 |
From: BenoƮt Canet <address@hidden>
The following patch will reuse bdrv_lookup_bs in order to open images by
references so the rules of usage of bdrv_lookup_bs must be relaxed a bit.
Signed-off-by: Benoit Canet <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block.c | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/block.c b/block.c
index 636aa11..ba2aecf 100644
--- a/block.c
+++ b/block.c
@@ -3574,30 +3574,26 @@ BlockDriverState *bdrv_lookup_bs(const char *device,
{
BlockDriverState *bs = NULL;
- if ((!device && !node_name) || (device && node_name)) {
- error_setg(errp, "Use either device or node-name but not both");
- return NULL;
- }
-
if (device) {
bs = bdrv_find(device);
- if (!bs) {
- error_set(errp, QERR_DEVICE_NOT_FOUND, device);
- return NULL;
+ if (bs) {
+ return bs;
}
-
- return bs;
}
- bs = bdrv_find_node(node_name);
+ if (node_name) {
+ bs = bdrv_find_node(node_name);
- if (!bs) {
- error_set(errp, QERR_DEVICE_NOT_FOUND, node_name);
- return NULL;
+ if (bs) {
+ return bs;
+ }
}
- return bs;
+ error_setg(errp, "Cannot find device=%s nor node_name=%s",
+ device ? device : "",
+ node_name ? node_name : "");
+ return NULL;
}
BlockDriverState *bdrv_next(BlockDriverState *bs)
--
1.8.5.3
- [Qemu-devel] [PULL 01/11] sdhci: Drop unnecessary #include, (continued)
- [Qemu-devel] [PULL 01/11] sdhci: Drop unnecessary #include, Stefan Hajnoczi, 2014/02/14
- [Qemu-devel] [PULL 03/11] block: Add notes to iSCSI's .bdrv_open and .bdrv_reopen_prepare, Stefan Hajnoczi, 2014/02/14
- [Qemu-devel] [PULL 02/11] blockdev: Remove 'type' parameter from blockdev_init(), Stefan Hajnoczi, 2014/02/14
- [Qemu-devel] [PULL 04/11] block: Don't throw away errno via error_setg, Stefan Hajnoczi, 2014/02/14
- [Qemu-devel] [PULL 05/11] block: qemu-iotests - fix test 070 (vhdx), Stefan Hajnoczi, 2014/02/14
- [Qemu-devel] [PULL 07/11] qemu-iotests: Don't run 005 on vmdk split formats, Stefan Hajnoczi, 2014/02/14
- [Qemu-devel] [PULL 06/11] block: qemu-iotests - add vhdx log replay tests for qemu-img, Stefan Hajnoczi, 2014/02/14
- [Qemu-devel] [PULL 09/11] blockdev: Fix wrong usage of QDECREF causing snapshoted quorum to crash on close., Stefan Hajnoczi, 2014/02/14
- [Qemu-devel] [PULL 08/11] block: mirror - use local_err to avoid NULL errp, Stefan Hajnoczi, 2014/02/14
- [Qemu-devel] [PULL 11/11] block: Open by reference will try device then node_name., Stefan Hajnoczi, 2014/02/14
- [Qemu-devel] [PULL 10/11] block: Relax bdrv_lookup_bs constraints.,
Stefan Hajnoczi <=
- Re: [Qemu-devel] [PULL 00/11] Block patches, Peter Maydell, 2014/02/15