[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL v2 01/40] block: Don't call blk_bs() twice in bdrv_lo
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL v2 01/40] block: Don't call blk_bs() twice in bdrv_lookup_bs() |
Date: |
Tue, 10 Nov 2015 15:09:01 +0100 |
From: Alberto Garcia <address@hidden>
Signed-off-by: Alberto Garcia <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/block.c b/block.c
index e9f40dc..eb8158a 100644
--- a/block.c
+++ b/block.c
@@ -2683,12 +2683,12 @@ BlockDriverState *bdrv_lookup_bs(const char *device,
blk = blk_by_name(device);
if (blk) {
- if (!blk_bs(blk)) {
+ bs = blk_bs(blk);
+ if (!bs) {
error_setg(errp, "Device '%s' has no medium", device);
- return NULL;
}
- return blk_bs(blk);
+ return bs;
}
}
--
1.8.3.1
- [Qemu-block] [PULL v2 00/40] Block layer patches, Kevin Wolf, 2015/11/10
- [Qemu-block] [PULL v2 02/40] block: Add blk_remove_bs(), Kevin Wolf, 2015/11/10
- [Qemu-block] [PULL v2 03/40] block: Make bdrv_states public, Kevin Wolf, 2015/11/10
- [Qemu-block] [PULL v2 01/40] block: Don't call blk_bs() twice in bdrv_lookup_bs(),
Kevin Wolf <=
- [Qemu-block] [PULL v2 04/40] block: Add functions for inheriting a BBRS, Kevin Wolf, 2015/11/10
- [Qemu-block] [PULL v2 05/40] blockdev: Add blockdev-open-tray, Kevin Wolf, 2015/11/10
- [Qemu-block] [PULL v2 06/40] blockdev: Add blockdev-close-tray, Kevin Wolf, 2015/11/10
- [Qemu-block] [PULL v2 09/40] blockdev: Implement eject with basic operations, Kevin Wolf, 2015/11/10
- [Qemu-block] [PULL v2 08/40] blockdev: Add blockdev-insert-medium, Kevin Wolf, 2015/11/10
- [Qemu-block] [PULL v2 07/40] blockdev: Add blockdev-remove-medium, Kevin Wolf, 2015/11/10
- [Qemu-block] [PULL v2 11/40] block: Inquire tray state before tray-moved events, Kevin Wolf, 2015/11/10
- [Qemu-block] [PULL v2 10/40] blockdev: Implement change with basic operations, Kevin Wolf, 2015/11/10
- [Qemu-block] [PULL v2 12/40] qmp: Introduce blockdev-change-medium, Kevin Wolf, 2015/11/10
- [Qemu-block] [PULL v2 13/40] hmp: Use blockdev-change-medium for change command, Kevin Wolf, 2015/11/10