david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: Relax bdrv_lookup_bs constraints.

Browse Source 
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 <benoit@irqsave.net>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Benoît Canet 2014-02-12 17:15:06 +01:00 committed by Stefan Hajnoczi
parent 57b6bdf37c
commit dd67fa5052
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
block.c
View File

@ -3574,30 +3574,26 @@ BlockDriverState *bdrv_lookup_bs(const char *device,
{ {
BlockDriverState *bs = NULL; 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) { if (device) {
bs = bdrv_find(device); bs = bdrv_find(device);
if (!bs) { if (bs) {
error_set(errp, QERR_DEVICE_NOT_FOUND, device);
return NULL;
}
return bs; return bs;
} }
}
if (node_name) {
bs = bdrv_find_node(node_name); bs = bdrv_find_node(node_name);
if (!bs) { if (bs) {
error_set(errp, QERR_DEVICE_NOT_FOUND, node_name); return bs;
return NULL; }
} }
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) BlockDriverState *bdrv_next(BlockDriverState *bs)