From nobody Wed May 15 00:21:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1556805816; cv=none; d=zoho.com; s=zohoarc; b=THVER/AanPD0cjTIbzlyyqk8YXLA1sphdJfrqpsRc5iFYpzEKxluH/hpXXDVWgDmC35RRvr7k8krRBQGFPYDIdFYQXpKIYYSRYij+6IuJYCHPZeNyL3pvGJpXjWM8v5gB3FTkI0DYjy2lPM44phfkDuZuEmYbjvM7Lgje5bkl74= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556805816; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=9ccw3z6s2hPMEok4793CteM3gasxj/Ia2H+u0wiDWIc=; b=ELDCnzJeUTa7GU0zyJiwpioo5gVD3M7LWib92RQSeDine+LHDwQrZteZlww3LrLxvoNUzFVD7re8wOP2KEEkWIiw8O8OydkENlvspeu3OIKVXyegQnJRfj+ivwmA4V3o5DmmvsJbOT2yM40paqnAnoiTMvB4CAm4/XO5ZJD3oCY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556805816225774.5436268323057; Thu, 2 May 2019 07:03:36 -0700 (PDT) Received: from localhost ([127.0.0.1]:51588 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMCJ8-0005Hy-8i for importer@patchew.org; Thu, 02 May 2019 10:03:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMCH1-0003wg-GC for qemu-devel@nongnu.org; Thu, 02 May 2019 10:01:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMCGw-0001Q4-Mk for qemu-devel@nongnu.org; Thu, 02 May 2019 10:01:19 -0400 Received: from aserp2130.oracle.com ([141.146.126.79]:37802) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMCGp-0001Hf-L4; Thu, 02 May 2019 10:01:07 -0400 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x42Drlcw044213; Thu, 2 May 2019 14:01:06 GMT Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by aserp2130.oracle.com with ESMTP id 2s6xhygtdm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 02 May 2019 14:01:06 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x42DwtIr147312; Thu, 2 May 2019 13:59:06 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserp3020.oracle.com with ESMTP id 2s6xhgtnfc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 02 May 2019 13:59:06 +0000 Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x42Dx5Hj004439; Thu, 2 May 2019 13:59:05 GMT Received: from nexus.ravello.local (/213.57.127.2) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 02 May 2019 06:59:05 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=9ccw3z6s2hPMEok4793CteM3gasxj/Ia2H+u0wiDWIc=; b=f1PrdpiTYAcV8GxxUsZ1nVNuf/qJ05TNmikZsnmi2q5g9wKJpqYoSjJE9oX0JDFcARa5 5oU/CYFA5gZNlHOpfh/782GQsl33+iGGkniSIyUDHHzup0DalWBHJP0Y9a2Q6ldJKeY7 6pT4+8yEsKp1jnRa8jUG+jKbmXTsQ3wjrmkNWtKmNacJ56Wl1VjslCeYL7NX3d8YZJtJ WWq1/YIRXortjVeFq/vDNMIF5aNPd6m4aJtvNW3Z5p/vmYvTNbCEkH5nrU1py4+CNE1P zrC4zDIpOXL++ZmVp7f+NHxUQWQQXw5e1uxJ+6GA6GuxfiJR0qLkLhknmNsHLrqCB1Oy TA== From: Sam Eiderman To: kwolf@redhat.com, mreitz@redhat.com, qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Thu, 2 May 2019 16:58:26 +0300 Message-Id: <20190502135828.42797-2-shmuel.eiderman@oracle.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20190502135828.42797-1-shmuel.eiderman@oracle.com> References: <20190502085029.30776-1-shmuel.eiderman@oracle.com> <20190502135828.42797-1-shmuel.eiderman@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9244 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=965 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905020095 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9244 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=986 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905020095 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 141.146.126.79 Subject: [Qemu-devel] [PATCH v2 1/3] qemu-img: rebase: Reuse parent BlockDriverState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 =3D 0. Reviewed-by: Karl Heubaum Reviewed-by: Eyal Moscovici Signed-off-by: Sagi Amit Co-developed-by: Sagi Amit Signed-off-by: Sam Eiderman --- qemu-img.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 8ee63daeae..d9b609b3f0 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -3297,28 +3297,23 @@ static int img_rebase(int argc, char **argv) =20 /* For safe rebasing we need to compare old and new backing file */ if (!unsafe) { - char backing_name[PATH_MAX]; QDict *options =3D NULL; + BlockDriverState *base_bs =3D backing_bs(bs); =20 - if (bs->backing_format[0] !=3D '\0') { - options =3D qdict_new(); - qdict_put_str(options, "driver", bs->backing_format); + if (!base_bs) { + error_setg(&local_err, "Image does not have a backing file"); + ret =3D -1; + goto out; } =20 - if (force_share) { - if (!options) { - options =3D qdict_new(); - } - qdict_put_bool(options, BDRV_OPT_FORCE_SHARE, true); - } - bdrv_get_backing_filename(bs, backing_name, sizeof(backing_name)); - blk_old_backing =3D blk_new_open(backing_name, NULL, - options, src_flags, &local_err); - if (!blk_old_backing) { + blk_old_backing =3D blk_new(BLK_PERM_CONSISTENT_READ, + BLK_PERM_ALL); + ret =3D 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 =3D -1; + "Could not reuse old backing file '%s': ", + base_bs->filename); goto out; } =20 --=20 2.13.3 From nobody Wed May 15 00:21:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1556805692; cv=none; d=zoho.com; s=zohoarc; b=PXPdA0RqWtGQ7Q9W/DFzpC8XJqChibjpNuWo8uwBU0H1kJiy4BLK4KEIFIM+9g1ntjn8K8ugbErGtoARbEyd2GIwLf0+7HsoMIzZ7Si99e9v7jjhG/i08xdVgnK46qhWKI18fU7OYS67I8/075F20LSN3OT0CTQTbz0XL4cRmbc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556805692; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=+GmqDTr4A0b+4arMEn7WVVZ2pJzJXgiEeewztayhFGY=; b=EPZlBdxOb5b3LgJKgmTiNUzfN5TYtPaJRA+0eleo1aACSUqABUQU47HMPJFzvylasYv3THuY507dhbpt+5EKxEZiH6liBKr25OuYJ4mGlIPcOB8LYzmtpnY2EPTVw8+mSBvRG9FOfs3JlchWIa+XP0kdxrhe3RJibf95PSqGM1U= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556805692867915.9583165111042; Thu, 2 May 2019 07:01:32 -0700 (PDT) Received: from localhost ([127.0.0.1]:51568 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMCH5-0003Qk-G0 for importer@patchew.org; Thu, 02 May 2019 10:01:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMCFF-0002N0-9S for qemu-devel@nongnu.org; Thu, 02 May 2019 09:59:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMCF7-0008Mc-8p for qemu-devel@nongnu.org; Thu, 02 May 2019 09:59:22 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:57268) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMCF0-0008F7-UK; Thu, 02 May 2019 09:59:16 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x42DrlVf035774; Thu, 2 May 2019 13:59:09 GMT Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2130.oracle.com with ESMTP id 2s6xhygtn4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 02 May 2019 13:59:09 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x42Dx5NF078452; Thu, 2 May 2019 13:59:09 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userp3020.oracle.com with ESMTP id 2s6xhh2rhv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 02 May 2019 13:59:09 +0000 Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x42Dx875030393; Thu, 2 May 2019 13:59:08 GMT Received: from nexus.ravello.local (/213.57.127.2) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 02 May 2019 06:59:08 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=+GmqDTr4A0b+4arMEn7WVVZ2pJzJXgiEeewztayhFGY=; b=Z9Y6nrS2+q1acxCTrq+HcGGxrDctndroar4aE5grrQ1WNOEUWy7Qm2FKSgkxWLdSrZNE BTupRJTdW/Xo6Cm41+IHJSPLyPalSS4t7+/JQe3XC85bSvFnAx1XhBJMxGcckhtrvoCy nB1ba/U3Z5x3PoXWNToAylIjJ3zf+UAZZ6u6FHP2cX3K05Ge4Ko4QB/C0x80klysOORT JNYe278ERQZ7Q6zp3Dp013gGOB+iRRWoJag0oA1NHTwauIWyCXpnzCjyHWz6aikhkSut CiS4MqGLlxssP7NgCauROzwT2jLTwZRtsx84LBXDWOuk675yVIll3vgovTxclDDrYof1 KA== From: Sam Eiderman To: kwolf@redhat.com, mreitz@redhat.com, qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Thu, 2 May 2019 16:58:27 +0300 Message-Id: <20190502135828.42797-3-shmuel.eiderman@oracle.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20190502135828.42797-1-shmuel.eiderman@oracle.com> References: <20190502085029.30776-1-shmuel.eiderman@oracle.com> <20190502135828.42797-1-shmuel.eiderman@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9244 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=994 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905020095 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9244 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905020095 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.86 Subject: [Qemu-devel] [PATCH v2 2/3] qemu-img: rebase: Reduce reads on in-chain rebase X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In the following case: (base) A <- B <- C (tip) when running: qemu-img rebase -b A C QEMU would read all sectors not allocated in the file being rebased (C) and compare them to the new base image (A), regardless of whether they were changed or even allocated anywhere along the chain between the new base and the top image (B). This causes many unneeded reads when rebasing an image which represents a small diff of a large disk, as it would read most of the disk's sectors. Instead, use bdrv_is_allocated_above() to reduce the number of unnecessary reads. Reviewed-by: Karl Heubaum Signed-off-by: Sam Eiderman Signed-off-by: Eyal Moscovici --- qemu-img.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/qemu-img.c b/qemu-img.c index d9b609b3f0..7f20858cb9 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -3152,7 +3152,7 @@ static int img_rebase(int argc, char **argv) BlockBackend *blk =3D NULL, *blk_old_backing =3D NULL, *blk_new_backin= g =3D NULL; uint8_t *buf_old =3D NULL; uint8_t *buf_new =3D NULL; - BlockDriverState *bs =3D NULL; + BlockDriverState *bs =3D NULL, *prefix_chain_bs =3D NULL; char *filename; const char *fmt, *cache, *src_cache, *out_basefmt, *out_baseimg; int c, flags, src_flags, ret; @@ -3343,6 +3343,12 @@ static int img_rebase(int argc, char **argv) goto out; } =20 + /* + * Find out whether we rebase an image on top of a previous im= age + * in its chain. + */ + prefix_chain_bs =3D bdrv_find_backing_image(bs, out_real_path); + blk_new_backing =3D blk_new_open(out_real_path, NULL, options, src_flags, &local_err); g_free(out_real_path); @@ -3422,6 +3428,23 @@ static int img_rebase(int argc, char **argv) continue; } =20 + if (prefix_chain_bs) { + /* + * If cluster wasn't changed since prefix_chain, we don't = need + * to take action + */ + ret =3D bdrv_is_allocated_above(bs, prefix_chain_bs, + offset, n, &n); + if (ret < 0) { + error_report("error while reading image metadata: %s", + strerror(-ret)); + goto out; + } + if (!ret) { + continue; + } + } + /* * Read old and new backing file and take into consideration t= hat * backing files may be smaller than the COW image. --=20 2.13.3 From nobody Wed May 15 00:21:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1556805693; cv=none; d=zoho.com; s=zohoarc; b=kcvN3slDtTMJh0PY6LXJjr26UuTTEIbhivQQEop6jaqJMV5iEAxRmwcYSJ+AGVPHGrcg8Ss756VlNDVPevLH54Ul29Y2meUL/Jsk6jRPF9JYtvxJa80EfZAEvkQ//Tu/VXGn612xcqdpAvEvCO9Xv/c+voF1NUJYp0h6OClWbf0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556805693; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=ziyXdHnH9IbZkZ8fEb7OALXrXP4qx5fOVQ/VMaT7tUw=; b=D+1QALuqNP4c7zg2/IAplhI57t+bhUKbXZGpofoDHD/7AgYeWoMYatNmx06Y7jDYyuz79MTVeiSoS+LBsysNPX3TW84F1Dg8yo37gSNBLJ/WYqIMT1KX6MA/wZFFqiYxgT/s3W++Zlp+IiWe7FrVDRNbDb2TF2k3GASlqx3P/Qg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 155680569384339.244976510648485; Thu, 2 May 2019 07:01:33 -0700 (PDT) Received: from localhost ([127.0.0.1]:51570 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMCH6-0003RF-PD for importer@patchew.org; Thu, 02 May 2019 10:01:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34745) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMCF7-0002Gi-FT for qemu-devel@nongnu.org; Thu, 02 May 2019 09:59:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMCF6-0008MF-BN for qemu-devel@nongnu.org; Thu, 02 May 2019 09:59:21 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:57320) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMCF0-0008HT-Un; Thu, 02 May 2019 09:59:16 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x42Drm6D035800; Thu, 2 May 2019 13:59:12 GMT Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by userp2130.oracle.com with ESMTP id 2s6xhygtne-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 02 May 2019 13:59:12 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x42DvtkJ105620; Thu, 2 May 2019 13:59:12 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userp3030.oracle.com with ESMTP id 2s7p89sdmc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 02 May 2019 13:59:11 +0000 Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x42DxBGq030467; Thu, 2 May 2019 13:59:11 GMT Received: from nexus.ravello.local (/213.57.127.2) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 02 May 2019 06:59:10 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=ziyXdHnH9IbZkZ8fEb7OALXrXP4qx5fOVQ/VMaT7tUw=; b=MtdXHJzCfhlakVnzFk5RHqlMMPzCE+ih7p0dWjBglCizCQgOLFt1Mc+x4jivsrJ4bgWg LzTInhczJbTG8yJP1NkOCTa/Z0nA4ScyGZaIqYG+xMbeboEb9irShNox6RvoqLtF8xnb JqTFZJVmlhO5iSNFHd5BQOZ23a4dx0wT/RlXkn3eNZ5XLDp7dkVurvfRlqDpV61Yapj4 rjCC0EU3pZeYHFXnUXMzGRxQ9ayqo9kFgNTjmtjT++kirm+0Mf1zDnwKylu7wKbfYUzE yhf0QyL/COfHc+UJ4Ik02vbgR6g9Ln5yZ6dmJ2lZwev1Bn0J2YodlkoxZ+lkQqBwLpGv 4g== From: Sam Eiderman To: kwolf@redhat.com, mreitz@redhat.com, qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Thu, 2 May 2019 16:58:28 +0300 Message-Id: <20190502135828.42797-4-shmuel.eiderman@oracle.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20190502135828.42797-1-shmuel.eiderman@oracle.com> References: <20190502085029.30776-1-shmuel.eiderman@oracle.com> <20190502135828.42797-1-shmuel.eiderman@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9244 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905020095 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9244 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905020095 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.86 Subject: [Qemu-devel] [PATCH v2 3/3] qemu-img: rebase: Reuse in-chain BlockDriverState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If a chain was detected, don't open a new BlockBackend from the target backing file which will create a new BlockDriverState. Instead, create an empty BlockBackend and attach the already open BlockDriverState. Permissions for blk_new() were copied from blk_new_open() when flags =3D 0. Reviewed-by: Karl Heubaum Reviewed-by: Eyal Moscovici Signed-off-by: Sagi Amit Co-developed-by: Sagi Amit Signed-off-by: Sam Eiderman Reviewed-by: Max Reitz --- qemu-img.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 7f20858cb9..b32884bfc5 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -3348,16 +3348,29 @@ static int img_rebase(int argc, char **argv) * in its chain. */ prefix_chain_bs =3D bdrv_find_backing_image(bs, out_real_path); - - blk_new_backing =3D blk_new_open(out_real_path, NULL, - options, src_flags, &local_err); - g_free(out_real_path); - if (!blk_new_backing) { - error_reportf_err(local_err, - "Could not open new backing file '%s': ", - out_baseimg); - ret =3D -1; - goto out; + if (prefix_chain_bs) { + g_free(out_real_path); + blk_new_backing =3D blk_new(BLK_PERM_CONSISTENT_READ, + BLK_PERM_ALL); + ret =3D blk_insert_bs(blk_new_backing, prefix_chain_bs, + &local_err); + if (ret < 0) { + error_reportf_err(local_err, + "Could not reuse backing file '%s': = ", + out_baseimg); + goto out; + } + } else { + blk_new_backing =3D blk_new_open(out_real_path, NULL, + options, src_flags, &local_= err); + g_free(out_real_path); + if (!blk_new_backing) { + error_reportf_err(local_err, + "Could not open new backing file '%s= ': ", + out_baseimg); + ret =3D -1; + goto out; + } } } } --=20 2.13.3