[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 04/12] blockdev: drop redundant proto_drv check
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v6 04/12] blockdev: drop redundant proto_drv check |
Date: |
Mon, 24 Jun 2013 17:13:12 +0200 |
It is not necessary to check that we can find a protocol block driver
since we create or open the image file. This produces the error that we
need anyway.
Besides, the QERR_INVALID_BLOCK_FORMAT is inappropriate since the
protocol is incorrect rather than the format.
Also drop an empty line between bdrv_open() and checking its return
value. This may be due to copy-pasting from earlier code that performed
other operations before handling errors.
Reported-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Wenchao Xia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
blockdev.c | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 5975dde..f6938d3 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -818,7 +818,6 @@ typedef struct ExternalSnapshotStates {
static void external_snapshot_prepare(BlkTransactionStates *common,
Error **errp)
{
- BlockDriver *proto_drv;
BlockDriver *drv;
int flags, ret;
Error *local_err = NULL;
@@ -874,12 +873,6 @@ static void external_snapshot_prepare(BlkTransactionStates
*common,
flags = states->old_bs->open_flags;
- proto_drv = bdrv_find_protocol(new_image_file);
- if (!proto_drv) {
- error_set(errp, QERR_INVALID_BLOCK_FORMAT, format);
- return;
- }
-
/* create new image w/backing file */
if (mode != NEW_IMAGE_MODE_EXISTING) {
bdrv_img_create(new_image_file, format,
@@ -1375,7 +1368,6 @@ void qmp_drive_mirror(const char *device, const char
*target,
{
BlockDriverState *bs;
BlockDriverState *source, *target_bs;
- BlockDriver *proto_drv;
BlockDriver *drv = NULL;
Error *local_err = NULL;
int flags;
@@ -1443,12 +1435,6 @@ void qmp_drive_mirror(const char *device, const char
*target,
sync = MIRROR_SYNC_MODE_FULL;
}
- proto_drv = bdrv_find_protocol(target);
- if (!proto_drv) {
- error_set(errp, QERR_INVALID_BLOCK_FORMAT, format);
- return;
- }
-
bdrv_get_geometry(bs, &size);
size *= 512;
if (sync == MIRROR_SYNC_MODE_FULL && mode != NEW_IMAGE_MODE_EXISTING) {
@@ -1483,7 +1469,6 @@ void qmp_drive_mirror(const char *device, const char
*target,
*/
target_bs = bdrv_new("");
ret = bdrv_open(target_bs, target, NULL, flags | BDRV_O_NO_BACKING, drv);
-
if (ret < 0) {
bdrv_delete(target_bs);
error_setg_file_open(errp, -ret, target);
--
1.8.1.4
- [Qemu-devel] [PATCH v6 00/12] block: drive-backup live backup command, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH v6 01/12] notify: add NotiferWithReturn so notifier list can abort, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH v6 09/12] blockdev: add DriveBackup transaction, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH v6 08/12] blockdev: allow BdrvActionOps->commit() to be NULL, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH v6 03/12] block: add basic backup support to block driver, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH v6 10/12] blockdev: add Abort transaction, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH v6 11/12] qemu-iotests: extract wait_until_completed() into iotests.py, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH v6 05/12] blockdev: use bdrv_getlength() in qmp_drive_mirror(), Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH v6 02/12] block: add bdrv_add_before_write_notifier(), Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH v6 04/12] blockdev: drop redundant proto_drv check,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v6 06/12] block: add drive-backup QMP command, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH v6 07/12] blockdev: rename BlkTransactionStates to singular, Stefan Hajnoczi, 2013/06/24
- [Qemu-devel] [PATCH v6 12/12] qemu-iotests: add 055 drive-backup test case, Stefan Hajnoczi, 2013/06/24
- Re: [Qemu-devel] [PATCH v6 00/12] block: drive-backup live backup command, Kevin Wolf, 2013/06/25