|
 |
218e99 |
From d9420445fe0b78de91dc8615a61b973ed64e4f78 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
Date: Mon, 9 Sep 2013 14:27:57 +0200
|
|
|
218e99 |
Subject: [PATCH 06/38] blockdev: drop redundant proto_drv check
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
Message-id: <1378736903-18489-7-git-send-email-kwolf@redhat.com>
|
|
|
218e99 |
Patchwork-id: 54193
|
|
|
218e99 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH 06/32] blockdev: drop redundant proto_drv check
|
|
|
218e99 |
Bugzilla: 1005818
|
|
|
218e99 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
Bugzilla: 1005818
|
|
|
218e99 |
|
|
|
218e99 |
It is not necessary to check that we can find a protocol block driver
|
|
|
218e99 |
since we create or open the image file. This produces the error that we
|
|
|
218e99 |
need anyway.
|
|
|
218e99 |
|
|
|
218e99 |
Besides, the QERR_INVALID_BLOCK_FORMAT is inappropriate since the
|
|
|
218e99 |
protocol is incorrect rather than the format.
|
|
|
218e99 |
|
|
|
218e99 |
Also drop an empty line between bdrv_open() and checking its return
|
|
|
218e99 |
value. This may be due to copy-pasting from earlier code that performed
|
|
|
218e99 |
other operations before handling errors.
|
|
|
218e99 |
|
|
|
218e99 |
Reported-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
218e99 |
Reviewed-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
|
|
|
218e99 |
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
218e99 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
(cherry picked from commit cb78466ef60ccf707a6f38a1294c435b65a828e0)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
blockdev.c | 15 ---------------
|
|
|
218e99 |
1 file changed, 15 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
blockdev.c | 15 ---------------
|
|
|
218e99 |
1 files changed, 0 insertions(+), 15 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/blockdev.c b/blockdev.c
|
|
|
218e99 |
index b8521c7..1f405c9 100644
|
|
|
218e99 |
--- a/blockdev.c
|
|
|
218e99 |
+++ b/blockdev.c
|
|
|
218e99 |
@@ -818,7 +818,6 @@ typedef struct ExternalSnapshotStates {
|
|
|
218e99 |
static void external_snapshot_prepare(BlkTransactionStates *common,
|
|
|
218e99 |
Error **errp)
|
|
|
218e99 |
{
|
|
|
218e99 |
- BlockDriver *proto_drv;
|
|
|
218e99 |
BlockDriver *drv;
|
|
|
218e99 |
int flags, ret;
|
|
|
218e99 |
Error *local_err = NULL;
|
|
|
218e99 |
@@ -874,12 +873,6 @@ static void external_snapshot_prepare(BlkTransactionStates *common,
|
|
|
218e99 |
|
|
|
218e99 |
flags = states->old_bs->open_flags;
|
|
|
218e99 |
|
|
|
218e99 |
- proto_drv = bdrv_find_protocol(new_image_file);
|
|
|
218e99 |
- if (!proto_drv) {
|
|
|
218e99 |
- error_set(errp, QERR_INVALID_BLOCK_FORMAT, format);
|
|
|
218e99 |
- return;
|
|
|
218e99 |
- }
|
|
|
218e99 |
-
|
|
|
218e99 |
/* create new image w/backing file */
|
|
|
218e99 |
if (mode != NEW_IMAGE_MODE_EXISTING) {
|
|
|
218e99 |
bdrv_img_create(new_image_file, format,
|
|
|
218e99 |
@@ -1372,7 +1365,6 @@ void qmp_drive_mirror(const char *device, const char *target,
|
|
|
218e99 |
{
|
|
|
218e99 |
BlockDriverState *bs;
|
|
|
218e99 |
BlockDriverState *source, *target_bs;
|
|
|
218e99 |
- BlockDriver *proto_drv;
|
|
|
218e99 |
BlockDriver *drv = NULL;
|
|
|
218e99 |
Error *local_err = NULL;
|
|
|
218e99 |
int flags;
|
|
|
218e99 |
@@ -1440,12 +1432,6 @@ void qmp_drive_mirror(const char *device, const char *target,
|
|
|
218e99 |
sync = MIRROR_SYNC_MODE_FULL;
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
- proto_drv = bdrv_find_protocol(target);
|
|
|
218e99 |
- if (!proto_drv) {
|
|
|
218e99 |
- error_set(errp, QERR_INVALID_BLOCK_FORMAT, format);
|
|
|
218e99 |
- return;
|
|
|
218e99 |
- }
|
|
|
218e99 |
-
|
|
|
218e99 |
bdrv_get_geometry(bs, &size);
|
|
|
218e99 |
size *= 512;
|
|
|
218e99 |
if (sync == MIRROR_SYNC_MODE_FULL && mode != NEW_IMAGE_MODE_EXISTING) {
|
|
|
218e99 |
@@ -1480,7 +1466,6 @@ void qmp_drive_mirror(const char *device, const char *target,
|
|
|
218e99 |
*/
|
|
|
218e99 |
target_bs = bdrv_new("");
|
|
|
218e99 |
ret = bdrv_open(target_bs, target, NULL, flags | BDRV_O_NO_BACKING, drv);
|
|
|
218e99 |
-
|
|
|
218e99 |
if (ret < 0) {
|
|
|
218e99 |
bdrv_delete(target_bs);
|
|
|
218e99 |
error_set(errp, QERR_OPEN_FILE_FAILED, target);
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|