{"id":806867,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806867/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<1503965694-10794-6-git-send-email-mdroth@linux.vnet.ibm.com>","date":"2017-08-29T00:13:40","name":"[05/79] qemu-img/convert: Move bs_n > 1 && -B check down","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"51a256916f24a99715042adac9c8bc6197865407","submitter":{"id":5549,"url":"http://patchwork.ozlabs.org/api/1.0/people/5549/?format=json","name":"Michael Roth","email":"mdroth@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1503965694-10794-6-git-send-email-mdroth@linux.vnet.ibm.com/mbox/","series":[{"id":281,"url":"http://patchwork.ozlabs.org/api/1.0/series/281/?format=json","date":"2017-08-29T00:13:45","name":"Patch Round-up for stable 2.9.1, freeze on 2017-09-04","version":1,"mbox":"http://patchwork.ozlabs.org/series/281/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806867/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xh9HM5yjlz9s7g\n\tfor ;\n\tTue, 29 Aug 2017 10:58:23 +1000 (AEST)","from localhost ([::1]:42118 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmUrF-00053Z-KG\n\tfor incoming@patchwork.ozlabs.org; Mon, 28 Aug 2017 20:58:21 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:48723)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmUCm-0001dx-Pk\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:36 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmUCj-000603-IX\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:32 -0400","from mx0b-001b2d01.pphosted.com ([148.163.158.5]:35078\n\thelo=mx0a-001b2d01.pphosted.com)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dmUCj-0005zQ-DQ\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:29 -0400","from pps.filterd (m0098413.ppops.net [127.0.0.1])\n\tby mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7T0E8qJ017779\n\tfor ; Mon, 28 Aug 2017 20:16:29 -0400","from e34.co.us.ibm.com (e34.co.us.ibm.com [32.97.110.152])\n\tby mx0b-001b2d01.pphosted.com with ESMTP id 2cmub2ww78-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Mon, 28 Aug 2017 20:16:28 -0400","from localhost\n\tby e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tMon, 28 Aug 2017 18:16:28 -0600","from b03cxnp08027.gho.boulder.ibm.com (9.17.130.19)\n\tby e34.co.us.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tMon, 28 Aug 2017 18:16:24 -0600","from b03ledav006.gho.boulder.ibm.com\n\t(b03ledav006.gho.boulder.ibm.com [9.17.130.237])\n\tby b03cxnp08027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v7T0GO3962128192; Mon, 28 Aug 2017 17:16:24 -0700","from b03ledav006.gho.boulder.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 2C3D6C6042;\n\tMon, 28 Aug 2017 18:16:24 -0600 (MDT)","from localhost (unknown [9.80.85.217])\n\tby b03ledav006.gho.boulder.ibm.com (Postfix) with ESMTP id ED29EC6037;\n\tMon, 28 Aug 2017 18:16:23 -0600 (MDT)"],"From":"Michael Roth ","To":"qemu-devel@nongnu.org","Date":"Mon, 28 Aug 2017 19:13:40 -0500","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>","References":"<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>","X-TM-AS-GCONF":"00","x-cbid":"17082900-0016-0000-0000-0000076EE829","X-IBM-SpamModules-Scores":"","X-IBM-SpamModules-Versions":"BY=3.00007630; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000226; SDB=6.00909028; UDB=6.00455849;\n\tIPR=6.00689279; \n\tBA=6.00005557; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009;\n\tZB=6.00000000; \n\tZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016909;\n\tXFM=3.00000015; UTC=2017-08-29 00:16:26","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17082900-0017-0000-0000-00003B3F1B41","Message-Id":"<1503965694-10794-6-git-send-email-mdroth@linux.vnet.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-08-28_13:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=1\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1708290001","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]","X-Received-From":"148.163.158.5","Subject":"[Qemu-devel] [PATCH 05/79] qemu-img/convert: Move bs_n > 1 && -B\n\tcheck down","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"qemu-stable@nongnu.org, Max Reitz ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Max Reitz \n\nIt does not make much sense to use a backing image for the target when\nyou concatenate multiple images (because then there is no correspondence\nbetween the source images' backing files and the target's); but it was\nstill possible to give one by using -o backing_file=X instead of -B X.\n\nFix this by moving the check.\n\n(Also, change the error message because -B is not the only way to\n specify the backing file, evidently.)\n\nCc: qemu-stable \nSigned-off-by: Max Reitz \nReviewed-by: Eric Blake \n* applied patch from v1 of series as suggested by author\nSigned-off-by: Michael Roth \n---\n qemu-img.c | 14 +++++++-------\n tests/qemu-iotests/122.out | 4 ++--\n 2 files changed, 9 insertions(+), 9 deletions(-)","diff":"diff --git a/qemu-img.c b/qemu-img.c\nindex cfc3bc3..4b2d59a 100644\n--- a/qemu-img.c\n+++ b/qemu-img.c\n@@ -2113,13 +2113,6 @@ static int img_convert(int argc, char **argv)\n }\n \n \n- if (bs_n > 1 && out_baseimg) {\n- error_report(\"-B makes no sense when concatenating multiple input \"\n- \"images\");\n- ret = -1;\n- goto out;\n- }\n-\n src_flags = 0;\n ret = bdrv_parse_cache_mode(src_cache, &src_flags, &src_writethrough);\n if (ret < 0) {\n@@ -2229,6 +2222,13 @@ static int img_convert(int argc, char **argv)\n out_baseimg = out_baseimg_param;\n }\n \n+ if (bs_n > 1 && out_baseimg) {\n+ error_report(\"Having a backing file for the target makes no sense when \"\n+ \"concatenating multiple input images\");\n+ ret = -1;\n+ goto out;\n+ }\n+\n /* Check if compression is supported */\n if (compress) {\n bool encryption =\ndiff --git a/tests/qemu-iotests/122.out b/tests/qemu-iotests/122.out\nindex 98814de..9317d80 100644\n--- a/tests/qemu-iotests/122.out\n+++ b/tests/qemu-iotests/122.out\n@@ -61,8 +61,8 @@ read 65536/65536 bytes at offset 4194304\n 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n read 65536/65536 bytes at offset 8388608\n 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n-qemu-img: -B makes no sense when concatenating multiple input images\n-qemu-img: -B makes no sense when concatenating multiple input images\n+qemu-img: Having a backing file for the target makes no sense when concatenating multiple input images\n+qemu-img: Having a backing file for the target makes no sense when concatenating multiple input images\n \n === Compression with misaligned allocations and image sizes ===\n \n","prefixes":["05/79"]}