From: Sam Eiderman <shmuel.eiderman@oracle.com>
To: kwolf@redhat.com, qemu-block@nongnu.org, qemu-devel@nongnu.org,
mreitz@redhat.com
Cc: eyal.moscovici@oracle.com, arbel.moshe@oracle.com,
liran.alon@oracle.com, shmuel.eiderman@oracle.com,
sagi.amit@oracle.com, karl.heubaum@oracle.com
Subject: [Qemu-devel] [PATCH v4 1/3] qemu-img: rebase: Reuse parent BlockDriverState
Date: Thu, 23 May 2019 18:44:42 +0300 [thread overview]
Message-ID: <20190523154444.28783-2-shmuel.eiderman@oracle.com> (raw)
In-Reply-To: <20190523154444.28783-1-shmuel.eiderman@oracle.com>
In safe mode we open the entire chain, including the parent backing
file of the rebased file.
Do not open a new BlockBackend for the parent backing file, which
saves opening the rest of the chain twice, which for long chains
saves many "pricy" bdrv_open() calls.
Permissions for blk_new() were copied from blk_new_open() when
flags = 0.
Reviewed-by: Karl Heubaum <karl.heubaum@oracle.com>
Reviewed-by: Eyal Moscovici <eyal.moscovici@oracle.com>
Signed-off-by: Sagi Amit <sagi.amit@oracle.com>
Co-developed-by: Sagi Amit <sagi.amit@oracle.com>
Signed-off-by: Sam Eiderman <shmuel.eiderman@oracle.com>
---
qemu-img.c | 29 +++++++++--------------------
1 file changed, 9 insertions(+), 20 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 28fba1e7a7..9bd0bb1e47 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -3309,29 +3309,18 @@ static int img_rebase(int argc, char **argv)
/* For safe rebasing we need to compare old and new backing file */
if (!unsafe) {
- char backing_name[PATH_MAX];
QDict *options = NULL;
+ BlockDriverState *base_bs = backing_bs(bs);
- if (bs->backing) {
- if (bs->backing_format[0] != '\0') {
- options = qdict_new();
- qdict_put_str(options, "driver", bs->backing_format);
- }
-
- if (force_share) {
- if (!options) {
- options = qdict_new();
- }
- qdict_put_bool(options, BDRV_OPT_FORCE_SHARE, true);
- }
- bdrv_get_backing_filename(bs, backing_name, sizeof(backing_name));
- blk_old_backing = blk_new_open(backing_name, NULL,
- options, src_flags, &local_err);
- if (!blk_old_backing) {
+ if (base_bs) {
+ blk_old_backing = blk_new(BLK_PERM_CONSISTENT_READ,
+ BLK_PERM_ALL);
+ ret = blk_insert_bs(blk_old_backing, base_bs,
+ &local_err);
+ if (ret < 0) {
error_reportf_err(local_err,
- "Could not open old backing file '%s': ",
- backing_name);
- ret = -1;
+ "Could not reuse old backing file '%s': ",
+ base_bs->filename);
goto out;
}
} else {
--
2.13.3
next prev parent reply other threads:[~2019-05-23 15:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-23 15:44 [Qemu-devel] [PATCH v4 0/3] qemu-img: rebase: Improve/optimize rebase operation Sam Eiderman
2019-05-23 15:44 ` Sam Eiderman [this message]
2019-05-23 16:13 ` [Qemu-devel] [PATCH v4 1/3] qemu-img: rebase: Reuse parent BlockDriverState Max Reitz
2019-05-23 15:44 ` [Qemu-devel] [PATCH v4 2/3] qemu-img: rebase: Reduce reads on in-chain rebase Sam Eiderman
2019-05-23 16:14 ` Max Reitz
2019-05-23 16:35 ` Sam Eiderman
2019-05-23 15:44 ` [Qemu-devel] [PATCH v4 3/3] qemu-img: rebase: Reuse in-chain BlockDriverState Sam Eiderman
2019-05-23 16:14 ` Max Reitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190523154444.28783-2-shmuel.eiderman@oracle.com \
--to=shmuel.eiderman@oracle.com \
--cc=arbel.moshe@oracle.com \
--cc=eyal.moscovici@oracle.com \
--cc=karl.heubaum@oracle.com \
--cc=kwolf@redhat.com \
--cc=liran.alon@oracle.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=sagi.amit@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.