From patchwork Thu Jun 10 11:25:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312757 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCBCCC48BD1 for ; Thu, 10 Jun 2021 11:34:31 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2468E613E9 for ; Thu, 10 Jun 2021 11:34:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2468E613E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrIxC-0000Pu-BH for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:34:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIph-0002ti-LW; Thu, 10 Jun 2021 07:26:45 -0400 Received: from mail-am6eur05on2103.outbound.protection.outlook.com ([40.107.22.103]:32352 helo=EUR05-AM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpf-0004Na-P4; Thu, 10 Jun 2021 07:26:45 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=csGxgQE8soKsJWlUiWQEZat4PSTvEX7j5buz8sci3tlhGvsxBps8AcdbHDePF6YTNjI4tYH9vzUiSuhdLhOaBaLv6rcthREklyGyLWuof4OhoA04vOdZN/i2PLm+drCNeybNijcanJ/2Pj46WpQWOrUHnOikFmlvVPNQ7+EkfvNY6Cyi22bxJLvbVj0mf6rjqixwd1FXyh3+icDnRK0akW7DTVX+qTLPliVZGPEmmI2FgkPzmGnnIzWh1WhIsUqszCHK+dSCoqvLEb0MP8w1dvIR9uarQuu/Hk/8M7GRJqInTHoZ6BRuw7jwsPkvj5ZcNiPDpjsNs/vVbVpnIhwZnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tjT50Aw6DWlp8So9JgiboauEL1EcinJadqO9w7vuNQM=; b=SolAt50/VtlKcQSIgaMbf/JNCHZH+U+U3K2W9ijWN42nVkvw23OmEjQanKnxdtQhtP5a74ZDNUfOWOAndeC8pOUl51xUVCF16KJhG5Yo3S6SIC2cAvH6ToHGbtSebX7xtyp4e4vcmuWINWYu0FdmmqjBuzBhmApy0/IBewM00O4SDj4gO3neZhYjClUvSwOG7FQW3+80GQA5k+SDBJNSmcsnZn7bcykDJ6mP6x9lLbA4cJsxmbIkwctGmzWkQF2b9viKqXcJKFE4S1vTnDjQayYSOVxVQK7KePUEtJr7steCC/3sLo2fF4BKWOlAPrIzL+/37Mi0UmQxPWOh6vPvJA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tjT50Aw6DWlp8So9JgiboauEL1EcinJadqO9w7vuNQM=; b=cL9+9xD+H5r+b9HU5sFgOTDK2oLXiEUQRu/EHCU4XF0VT5GC/xecgQN3NfF5iDXQHthbf0YWB0XWzkZO3VKKmSDxr8GQLLEqezGHIW0xihHIb9aUPyy595RDT69EGFEQdgh9cpVD7o0PrijqdzUtiRmrpMCyaMktTcCQdWgzS0M= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3960.eurprd08.prod.outlook.com (2603:10a6:20b:ad::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.24; Thu, 10 Jun 2021 11:26:35 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:35 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 01/35] block: rename bdrv_replace_child to bdrv_replace_child_tran Date: Thu, 10 Jun 2021 14:25:44 +0300 Message-Id: <20210610112618.127378-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 79e31ecd-fa63-4f3a-4af9-08d92c029ac5 X-MS-TrafficTypeDiagnostic: AM6PR08MB3960: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:53; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ulFV2OGTQ9BYhxqcAPf745vwH34OzjT5R4+hYTVgYvGZOUPB9sdDe/YtxW1o07Hd6bC4qAPua1wRoljEQObPQaCCRfQITGAGTxbwzI5pXjH+DiclPcMhxMkfSyN3jE9hR48pM+9O3OJcR1yJ0jD8x3IVkslKd+R6js42kDYmIXTkxTQzrdISAZ1m/8wU16iQk2GfVLFZJyxwlBjtbbxZ82YwIb8muEAdN8NSYkx9nZoHQr46orhQRVkndNQLFrzAZlWyrizrar2A7oZFVKL28H8VVRATf5UiWhCRDX+zjWTNwPIUa1pKG6/SJH1i5wmtUXnKtB0sGC2Qo0JFmb/SmHyJ7vxA4Rk/MrT2j49gpoWIiOiJJ04P4tnlmjCWUS+5lGPygut3pwPyxPqxJ9xN750cRu7/h/tLfBTizO48GgOtRaJBhgBB4I8ZzEVdfXOxE0fle+4etS332pnkV1ZNQwMPmSJhoWh8nQYwRDvsCKakSaedbL9UywAMCaVOEyxo8RLHSPrnftqWr8oLIuNPn6NS9RsdIjeEI+v8Sk6QRIVjSsO/vohX6MEhSJZvfi0P1UNwvK64N8QR9mcVo1m7TTpQlklURN3/x88NzTIMWkHtRzQYQ5LVDBmkfsCVys1TLLJl7cZ+k2KEvspRwNJV1++p9+XZC6N6B8uDmJlxWW+KyJqnkZjVvbGzNVZx10EO X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(39840400004)(136003)(346002)(366004)(396003)(2906002)(8936002)(2616005)(86362001)(316002)(478600001)(6486002)(16526019)(4326008)(36756003)(8676002)(66556008)(66946007)(66476007)(83380400001)(38100700002)(52116002)(38350700002)(6666004)(26005)(1076003)(956004)(6916009)(6512007)(186003)(6506007)(5660300002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 6VNxfzyveY5Uqlm3ksdVh2VO/sohnqzaoGz35LjJ9b+VQhLRAN4Kj8AzeD/UmhZMEP9dZlTs0ob1gDhRJgA+8VyMwvRH7ecSNlbINYxLZUFIqK9KZ4zwvxW/l9+OjtJHQ11UCWs+YXFhCuw+5cmFzuZbQ/tlBDvw0jEdKYQbjSW60UATEPY4u6hWKD/UsmRaDh6y1emIer/of/v6nGyVn1ichC3uS3qAOPomKnD5vMTTHplUQpRZt+fYI2tJrr6f6QARW/TXuEDSmOeJFQsDeDwWFBYGLpKBKS5iMm/XV2TVpoZFD9O9dBwKPrFvtQuW94U/cVbZ1kFR+BeiSMS1akQrudwSb6W5iwXZcOYz0lETNjm5m9iFX+XKJ/VxF045MpzAs2BjJCO5qALVosjaTMRQ0zumarMMpIK0FW9To+ZxQoWy+fZlCSqdVHBV1Vu//2KW8RZU8LW1zh2chBG2BLnUrsMhpV39mvN2VWV64nSTxLupL/n8kiTIiizGRYki0+BB0tvmCnWTN/rA0Yopp5kDjPUbpNGrNScn2VUFUSP6ezzsTbKOXsNZtoEiWGKSTjQo1Gy06a25FROpvw1nIWaomkhaCUVj9EtlSGTsieT6XQccP8FSa+vVm7V/oaxOtW33joiYxNlsmFHG06ZrYfhYqmCfZQHmWm5ArnHFdy4zUYJK/Yslw15VvZE6oN3beSD+S5PO2s3dEnuHlXI0wWm4SDtOAjyzxrJLJCKa2c2akACDLUOWuCcxcckYHur5q7fJrrONB5CQrGFTvZWVv7omMOx9L9MJqnQ40KN6KsrkdGRCO8a3tPP83Fy7ZLbW580WAS/UW2XSxRMfr0iC3uesDDQV3T7FOHmjZjKLmvwIInEUQ4lXvRNg7cdJ8AdFZIkLx0mxof+8jAxGRd7deS3/nTDO4MNfYJ/W5iKFcnz1dDSbVOrqLIjb3RHRBq+CCo1yY8aDHGe5H0NJLRgO9f776T2c2IqAlFwZxVefgi09EHQ93B6AHUyNueFUlCmX1LbandRTfP9ksyCXDvNCtxylrIO6TxYDldo9oZ06zXcliB74dYTinjGH+nKdjPs6DA4dXCwoAtheD9zpjVVujwZ73YN4aXWk4RRRWsg4cm7KjLbU3HWc8cEny6usH9hfVyMs6RmFnNSeyvRTzhY1agMZkzcHxq5WAwIGCcYFynqB8tdd7H0odqVWYMlcA+PBjp2gqryQ/qEDlfNjvgq3mOsrfPvZayB3TjltzrPwN6y88X71Z0Xz/GcPXjI+P5lDY4zty691UVWt2O3Ap9ik/ySI4IgMrFAUvgG0uEkAmgDDo03hAdNQBuOJgufJg5J/ X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79e31ecd-fa63-4f3a-4af9-08d92c029ac5 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:34.9127 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: RHLO8wiXIvwnxdAxDtuo8HNF1+xk9kq97gzNS/47/Ab9H1+rn7JtOj7LoYpuE7vW367zGdh0ABWGUf3d78u59Jaadn2UPwZoGj1nlJp5Ha8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3960 Received-SPF: pass client-ip=40.107.22.103; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-AM6-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We have bdrv_replace_child() wrapper on bdrv_replace_child_noperm(). But bdrv_replace_child() doesn't update permissions. It's rather strange, as normally it's expected that foo() should call foo_noperm() and update permissions. Let's rename and add comment. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/block.c b/block.c index 3f456892d0..34bfe4ffe8 100644 --- a/block.c +++ b/block.c @@ -2249,12 +2249,14 @@ static TransactionActionDrv bdrv_replace_child_drv = { }; /* - * bdrv_replace_child + * bdrv_replace_child_tran * * Note: real unref of old_bs is done only on commit. + * + * The function doesn't update permissions, caller is responsible for this. */ -static void bdrv_replace_child(BdrvChild *child, BlockDriverState *new_bs, - Transaction *tran) +static void bdrv_replace_child_tran(BdrvChild *child, BlockDriverState *new_bs, + Transaction *tran) { BdrvReplaceChildState *s = g_new(BdrvReplaceChildState, 1); *s = (BdrvReplaceChildState) { @@ -4766,7 +4768,7 @@ static void bdrv_remove_filter_or_cow_child_abort(void *opaque) } /* - * We don't have to restore child->bs here to undo bdrv_replace_child() + * We don't have to restore child->bs here to undo bdrv_replace_child_tran() * because that function is transactionable and it registered own completion * entries in @tran, so .abort() for bdrv_replace_child_safe() will be * called automatically. @@ -4802,7 +4804,7 @@ static void bdrv_remove_filter_or_cow_child(BlockDriverState *bs, } if (child->bs) { - bdrv_replace_child(child, NULL, tran); + bdrv_replace_child_tran(child, NULL, tran); } s = g_new(BdrvRemoveFilterOrCowChild, 1); @@ -4842,7 +4844,7 @@ static int bdrv_replace_node_noperm(BlockDriverState *from, c->name, from->node_name); return -EPERM; } - bdrv_replace_child(c, to, tran); + bdrv_replace_child_tran(c, to, tran); } return 0; From patchwork Thu Jun 10 11:25:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312743 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17DD7C47094 for ; Thu, 10 Jun 2021 11:29:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8DF4061222 for ; Thu, 10 Jun 2021 11:29:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8DF4061222 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrIsm-0008LO-LP for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:29:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpj-00030M-BD; Thu, 10 Jun 2021 07:26:47 -0400 Received: from mail-am6eur05on2118.outbound.protection.outlook.com ([40.107.22.118]:26592 helo=EUR05-AM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpg-0004Ko-3r; Thu, 10 Jun 2021 07:26:47 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ONzZN1SFJ97Xs9k60Ge/Y2aXyNM8Ekgh15Iy+el7fq7m2T3FE6uYceO0/z/80NAfp5aHwNTQKdUveVEekh0ubY0bzGwYa67vfY0rUFPZd2Rq10SyqqNt18qnEtxgwQo14aSIGVfL63xyx+UWYGJGtv+RrRsCJDL5YWXYWmSpVdy5T2ycGvxGXNmWj9W8RZNIN8w2TYdgf9HYUd11Caev2ZKiAEOj7ESIs5FL11OUGyQOeHYSSpxsMa2U81zJlOuOCfC2uvE/SSHH1rTiOTaqqM6rRjOQBPLhS/N1kroTUmmMQKE7DmlmPGF7JkYt9umNG/xuBS/grQQR8Z6FxHtaiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PWZA8lIf/Bzl0KopEnik1m4ezjQSLXdF66EIX+PSFp0=; b=i/seAS1hjI7XIT0Bvqqwz/5vXB/lOGvBPapYuFKkGpZtEubznhJUHu/UPMNwGKo/LBSpekbSROsZnn/r5gtUOu95IdImpLxxH0AyC2qcaqsPBOlFzQ0mDV/TpScW/NW6lV0uMPmo7dMEThaUx/Smo2n/BTkeJivmtsE6QiO2u3D57sBZcpwB33T7NN55bom7H3iX6Ybr7DkACHweTWj6OtvfEF/sY7ubuTxRwKVIVdpJf2jZRVoleuw4sRC1zs6Ji0fXy5nLbsnsFca46P3Jt65yuWJ1MP4xU00yD4QfpNFHpuH3SK+9HWR/ehoevNAcjkMk8eVM5hZtUu/lwItIuQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PWZA8lIf/Bzl0KopEnik1m4ezjQSLXdF66EIX+PSFp0=; b=Gd47vGP4oDYHtxji2JVry47CNfvaiC4oDdOlAeI1T5Wzzsm01Qjh4yxO9vrKdFpjX37PY624rEuuWIZrzdT0sDthXTF1cgZnTXpnu75vcpd9scTUYZwbCeOAbFBSP+65LlhoBs2h0csqhR6ycVWTuRMx4zHhJUUXfPxbTFbuWFk= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3960.eurprd08.prod.outlook.com (2603:10a6:20b:ad::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.24; Thu, 10 Jun 2021 11:26:36 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:36 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 02/35] block: comment graph-modifying function not updating permissions Date: Thu, 10 Jun 2021 14:25:45 +0300 Message-Id: <20210610112618.127378-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cb5214a4-ea29-4272-cbdd-08d92c029b5f X-MS-TrafficTypeDiagnostic: AM6PR08MB3960: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fhngnwDjM/4AUL6yXwALi91QdCgYM5AvqtIcGQZCXk/sGxleZolg5QEx4D1iIvkEfTCo5kfWh4fNv3P/B8fRYSHkm/n9BdsOQrCrx48CT7qMop9oi+mVI9E54e/FAXuDl0C2Yz+8Nk4wmjBimNcd9EB4YiNDcdHJ5+x6N7lQCMx90lOxxbwLapKmvGdXDdVEi+1klxRN6XXLcsOySsOFkEpaNy8oIdtUr8EHPwr2zrNQ4NC9Qbhfnnoz/tkNV/IJ8m7/BXDOp/64bOpv/KYHraFG2QtWs5awRdL7KhHur01R/wja/qWp5NCLagP1Eca0/JH/d6VsXlM+j0JpON/lJ47DsIiHJdVIh3PyHWaFyD9++lYeJZW0ZtdltvaOltsxK8lY/nbGgHhKqO5pshP7l9MDaSZVeJ5SOpipRzyJs9U0z6NeHEwMl552xaJiAcTLwV6VgVXXnEnMnvwKgipWxkmdmktx1ABOxddextseYWk26tFEc8WsPYKWuFi0riduVVHQrj0vB+4xnV4GngtGjnIpVjkrXER4EMjr7qKO2BNaJDchwptofHwtaLs9R1wvNRlo8sckoU+sMvs5nWwbgDKvYDAUmC8ZJkD1F02b2yA1i+Ex3F2b5R7pu2da0w3y4rUcPdrnXoVHdG1tzaT8FpsBivwK36DJo4/04taqpu92PzQLsdR1zu7wM8APfCze X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(39840400004)(136003)(346002)(366004)(396003)(2906002)(8936002)(2616005)(86362001)(316002)(478600001)(6486002)(16526019)(4326008)(36756003)(8676002)(66556008)(66946007)(66476007)(83380400001)(38100700002)(52116002)(38350700002)(6666004)(26005)(1076003)(956004)(6916009)(6512007)(186003)(6506007)(5660300002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: IcKo6NNluXaQ8khpKeHDyAl5oNWbpxw9fR4gi207KtSncHg1GtFftTwxp88qVVSgZzK2nz8q1rC7iGqPdcxCvDECc9yfz4T/+WmuiU4wtLB2+Si3oo4A8O8uRSO9NRyQCUcNRYCy5l74LbiEV7QpHqxe/f6U/O/PaHq1qa8EmV55yPq21Q+6pqOTvW/aUqDLxhJTMA67kZhen/SDETQN+0AOX/3wet1nY6qhd6YLWA+V9BsRdgvshEEVCrbYPh3rHdBsOEs7qKtdfKLywMw+XDx56nFQ1U9ZuFcmgVZN/onJnWQpaX/Nj1KOYXjOT+lcX3/G6hKNRPgRM6Zz7UrdnF3nVW3gA41tVcMB/lIusgMS7Y8ATPq8ME9e1lR8WgqOGnETK0j/gaoYpxAmyndX5zlE52RBWs3/jVPcg4+M2sWerOv64rjp9N75ARqAqNhe0NzEo82Fnw3bbw1HrQyzggelyeolizyIXguTQ8OGqezP+Xav9yBF1fZNfQyRPfdue3BFBXeajUXKqC7mcWfpQLBD2srFc8wIxJlISErvQyXxctMjhKfFLri9Pqe4mjt6KbqTy0vANikqDQ759Hw5VqEp+YScLJMqo5bdqr6XdEtKwFB2LL0mFoEpV9O2P8oTCEYYdORs+qQ3+hUrMEnscKaoDWb9h5w09dB8bg+uI3Vry7ZXcKhlD1+Y6q+GQg+8dpyNmtQY2xTWZO/r6HsZLKXVCAhkY/UUDKxKBUuj+gIySmdskK+NA0m1viOsMCdmqiXKP9ODHntwTzf+9rve9hnkwJuhErf4tHMIjrMHMyfAeT2Ifzl2q7wm9+pl1ltY+8qkXygZZ8HskX6z3NmCXqDuoReQ4UAK7FLCNU60ov+PkCs9fNoYYrfcB7syZuXWG6tnPtjRfvsWots4uql/+ewlr4P8Pm9AGVSK7mm8azF9aZo7svseMd93OoXemnN1i2FGjNi3htIS1UiJippKxZhLzUC7rS06Qt3ncIMhKcqOOlXI5BGu4CwMisrQLQDoQW4BdJkw++fIz5ljC/DD1ClQNehVIggJnD+z1a2EYjtzLozdrWenLbI8qfYoAGIACuS/79TLv7JfD9gQS5HH/Mv+XwSXJPjRuOi4XEGt1my59Z9O9F6AD1IvlQ5w2Xo7eNA70gBH+LT95LPNLgVo8y7GUUumr89Eqzojnp93y6itW1etOkIwYWaISXWYapNWZ4Jwgew2acXbr3c4p3+QmAGc6mRkCKxMwqI7MvQ0MMwcHgvD294+8Tw6Nxkz/6dpnwyou6VREX0Qpha5tqW9Kh6FIplPUOas8CcdjfVvd5fec4okiwolUT8jbIR1Nxff X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb5214a4-ea29-4272-cbdd-08d92c029b5f X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:35.9482 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: OyvdzboAu03p5KYhghNeGADfmziI9kMQGLN1o1ce0c8PH4+EG1qNtzJT/Zifr/eQ3BxUcFqFE3Ta8UQsEg+HPwzzgUQgliYRIVwzWR+8ih0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3960 Received-SPF: pass client-ip=40.107.22.118; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-AM6-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/block.c b/block.c index 34bfe4ffe8..98673e788a 100644 --- a/block.c +++ b/block.c @@ -2770,6 +2770,8 @@ static TransactionActionDrv bdrv_attach_child_common_drv = { * @child is saved to a new entry of @tran, so that *@child could be reverted to * NULL on abort(). So referenced variable must live at least until transaction * end. + * + * Function doesn't update permissions, caller is responsible for this. */ static int bdrv_attach_child_common(BlockDriverState *child_bs, const char *child_name, @@ -2848,6 +2850,8 @@ static int bdrv_attach_child_common(BlockDriverState *child_bs, /* * Variable referenced by @child must live at least until transaction end. * (see bdrv_attach_child_common() doc for details) + * + * Function doesn't update permissions, caller is responsible for this. */ static int bdrv_attach_child_noperm(BlockDriverState *parent_bs, BlockDriverState *child_bs, @@ -3115,6 +3119,8 @@ static BdrvChildRole bdrv_backing_role(BlockDriverState *bs) /* * Sets the bs->backing link of a BDS. A new reference is created; callers * which don't need their own reference any more must call bdrv_unref(). + * + * Function doesn't update permissions, caller is responsible for this. */ static int bdrv_set_backing_noperm(BlockDriverState *bs, BlockDriverState *backing_hd, @@ -4792,6 +4798,8 @@ static TransactionActionDrv bdrv_remove_filter_or_cow_child_drv = { * A function to remove backing-chain child of @bs if exists: cow child for * format nodes (always .backing) and filter child for filters (may be .file or * .backing) + * + * Function doesn't update permissions, caller is responsible for this. */ static void bdrv_remove_filter_or_cow_child(BlockDriverState *bs, Transaction *tran) From patchwork Thu Jun 10 11:25:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312741 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F13EC47094 for ; Thu, 10 Jun 2021 11:29:42 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A72D5613F1 for ; Thu, 10 Jun 2021 11:29:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A72D5613F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrIsW-0007jE-RC for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:29:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpk-00033Z-9f; Thu, 10 Jun 2021 07:26:48 -0400 Received: from mail-am6eur05on2103.outbound.protection.outlook.com ([40.107.22.103]:32352 helo=EUR05-AM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpi-0004Na-Cy; Thu, 10 Jun 2021 07:26:48 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CmZl9dOGpfELexTalVwmOuYds0o3A9FH0nkjSfUqJoDVBtRPYfFOAwgfEiiMJhpxHgyUzxtKGUSKxD9EKThtecJTMeggNSmS2BMorOv3iUFieU4XdnUez69ar0filrOxOszeTdfkGYfdH6swxLbA4gjeq+c2dPZwlTrqDcNShHCTao9TVKRSgZGPn9qVuFZqqxJL4mBEpzNt/dxnHpoGhbNNwxcahqNT6wUdZIF+Ijklr4l/wTLIOab5yNi1jwpw+TFgxlu1f8qSa2lSwi/shfwp4tJKAJWecefmYesRMjJPS905OIr5jm4cEjfhBqF6/0ctcMvPDttVG8L1vlgQTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dZL1atromED1QE5mDCQjohgPAZ8+7OhQsQ9fiQ1H2O0=; b=YWCwxmzQX1MF7I/oRybgXlj9MhgQl7oEKb4FVTs6HXar/wgQZtR0bHvZKTXPmYcLZhZhKTpz1wNEyIgsdURFuHv4BDW7GPlzIi1HI+Ef00y2zdgiGlxAx2ZZ+s2mAZHoJb10G6umiN0WqQss9wripKNvlmOq2FwrKGf7y1dp7dVxMjBrbcjxbkwcOImDe8JkdCV3ePQF6qh1iizTlQZ4x6m0aC+znXM0teVqHvfgq05UZwZZV4Sf7Hf/a3OOKBTSVt9ZWwNy9s+dnIIG/+lEsJpsfqGqSgwUaAQdyW2v+9UMO7rmYWHv86mjdmFpR1DWDIJd89wtjFsoUiV1BOqWSw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dZL1atromED1QE5mDCQjohgPAZ8+7OhQsQ9fiQ1H2O0=; b=kORiInxTbGOpSIK7sfP+HwO/wCzpGlp2z/ZU4MhhRC/HJLYn1n9JNTYJgaBXs6J6R0oTuespp1qNUfBA9lDFvP9bzzOCDBfF70prd1WboG/aaT5QbwmCygbOPMRlsAZKqU70Q779RLokPJhOEpDL+DKVDIOSmUGCQRF8+qjcVyc= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3960.eurprd08.prod.outlook.com (2603:10a6:20b:ad::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.24; Thu, 10 Jun 2021 11:26:37 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:37 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 03/35] block: introduce bdrv_replace_child_bs() Date: Thu, 10 Jun 2021 14:25:46 +0300 Message-Id: <20210610112618.127378-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 044f6f50-26f8-4f57-66bb-08d92c029bfe X-MS-TrafficTypeDiagnostic: AM6PR08MB3960: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:489; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hQf8aE+aaxJWkuaeZjdxzWhgk+KfBRFGNiQKohRzKdJSABxYbsKtDIMBkMYKMaXhTLsnxLOXaJ6nuxCoAszSApKBxHO7N+tPlAsw0uBIU4/CPjCXYHtUGwECpLD3I6Q8ian8Z2FPo+aA2YHvMJyFV7bXuZTuBkSTS9WOaBnIcn7I9mXz67R0NI/ZMoG1rsAlL7cnK9VunkP9mPqp94oFwe4UD264r3lgXRjDJfdG/+1DoljYoAN33H5C6DZz0x9OWqvcHb8LQtPK9wFMhLxi54NFDVtAtfmAr/to6eCNXN+PbxQWpGuaMbMFAk+1+pDYRYrKi4yrCkmyDLGudgBPdSRUREQZyeYhAd8OcJzWmKJdRR54QDIq6Ro7ss8q9yaANM+nLat5uDU1p5eCi3TCax4BnsAb37XTGh/rSYNOmU8CmCkh5aR2J2UCgJvUsYQ5A1hyytR8Q9BFjlZ+GvtHzGQJBrJMhmDPLjQ7ttE1InBTXC0kPjesTRSzjvckGWnIQALset+JpgsEz161uyDm6EAij++zjupNHxtxKbGvSluGOqGB9wO6rLw05o4hiseBLTbRVaCF48SvqsgA7IImxZckM41MdwaBhicu8NdeJMRnQEqG8NJfZE42HBmtKn1LMqAqvON31IecthlqvaA8eAFx2Tguq0Zt6ImRUkMuUUXc2twwsV+TWxkovdydyxzr X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(39840400004)(136003)(346002)(366004)(396003)(2906002)(8936002)(2616005)(86362001)(316002)(478600001)(6486002)(16526019)(4326008)(36756003)(8676002)(66556008)(66946007)(66476007)(83380400001)(38100700002)(52116002)(38350700002)(6666004)(26005)(1076003)(956004)(6916009)(6512007)(186003)(6506007)(5660300002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: ixSH6Ndf+XQE4H4QslYfHzVK9qUsnDiBkkgDUpU+gstOIR0y9d8BY0Xsx5kO3NkJNkcxzDh7rUIySCWUqZNYNLgX91ojnfuNvEjhjGh42elo9GywZYOLPvcdynBffNglA4uftxashb7Gk8/ynbAwd/G/ems2ASI5N5dGyhtjwPQybf02xvMMKnY8zhc+Gr2QYiznZGw+HLLLRcscuZWs/HQoR5+iHCS2SYoR45c1Yb5AkPrWuP8fYyIVZwMraS97Ka/3c9v2Hcjn5OEGqEtuxj9dh2Gz8a8K+ywHpXYVRxHeS2e8tc/RI8iio9XtaZr/Rh/5niJMtsu2ejiY9c3RWNwB3sGlOt8Kr471pl1X/xUbXUV8vHXJU9t9c1oHh0e9pMelgKqJgC5X8bYGzvVoZDK5RfRsYJZapNWuoBugS1QL4DuOoo95ewVrOxPqF7s1JbgRfqg/qOWO2JfI5Uwczlbb5X7UWk+f6dLNHi9r2nHXa0FGWZNQ1L8sy6sktiAAo+MlVDwGb+G2GlOPp2S1ylsgu4zrwsM7acQDq7fbsUAitGGN15GH3xioUQP/bKEmhf+SRvuZ4Rm23Lpv4QDlr2CEbMgtgCl8pq+Ssr4OtTJQwwDQ8Vwqz9Q7SwfUtEhjKkbzB/Ikr88phYtR/xnuJKxYI89owaCPYB/lGeN3GR+DFxlRG5x9KTuvEZfl2weunrNAKw1EYC9xsDb31wwHuGJNfQz2q/avQjC4bG9NrlZCm3xS5t6OsfeHHUeuXCv0hgJa/T8vbfEhkBIgsxGJdssPqdYCa4MgfXrA0xmXR9FqxhgdiRD3Kf2IC1V8exp7bni1Dvwwc4O0atNxbtJdr/VpXjjlRGYMmFbD/orFcUQEK58xX5XfUMe3zVyupiTGayn8zTEfXUaTsZm0N/bkoit9uZYJTQALUkTEpxzsMkdsWo0THbuuBRKwpjtoWBPs6Xpe8D/H4aVwSVb39Fh8nfeEYW6D+zfH/Sf7rxxIHY3jyGmlum8PvQoaKZ2f9NC78qVn6WroiakT2jKttjArSNNljxciTOLtyhOey9cj5oEd8ihhkKnauMBvE59Apnc03RU+pzCLpsJXKhltHaigm8UZZAWHuZyylc2wwDp2H+eGNRiw/gQSq4yso1j/pCFGN3jo0OcRynWFzw8CIUUwOIvXomnSPIGB5DTpDpf55wgpZ2RjX+/SaavIKtvsElU0Vldkfk/MOGdEweN9D0T6SwKDMjXyKNf0qMEiltbdHZ10JspaKfWC9KpINZgAGHakCQEC1V4fOl/QS/mimgKrAlFHvy0Gd4NBlCxnycHpOI2KInpknNd3KcD0csUdnzRL X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 044f6f50-26f8-4f57-66bb-08d92c029bfe X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:36.9757 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dTHkiucHrVYgREZIz8R9HcI0rRHTM8hRtKonEP0aSw+h6v26AxUDSO54B2I0io9aLJxjbdN0YJFfhtpoK1qkvlGFbrFa+Iueyg/SejLPpRU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3960 Received-SPF: pass client-ip=40.107.22.103; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-AM6-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Add function to transactionally replace bs inside BdrvChild. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- include/block/block.h | 2 ++ block.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/include/block/block.h b/include/block/block.h index 8e707a83b7..3a16ca341d 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -361,6 +361,8 @@ int bdrv_append(BlockDriverState *bs_new, BlockDriverState *bs_top, Error **errp); int bdrv_replace_node(BlockDriverState *from, BlockDriverState *to, Error **errp); +int bdrv_replace_child_bs(BdrvChild *child, BlockDriverState *new_bs, + Error **errp); BlockDriverState *bdrv_insert_node(BlockDriverState *bs, QDict *node_options, int flags, Error **errp); int bdrv_drop_filter(BlockDriverState *bs, Error **errp); diff --git a/block.c b/block.c index 98673e788a..b6658381e3 100644 --- a/block.c +++ b/block.c @@ -4987,6 +4987,37 @@ out: return ret; } +/* Not for empty child */ +int bdrv_replace_child_bs(BdrvChild *child, BlockDriverState *new_bs, + Error **errp) +{ + int ret; + Transaction *tran = tran_new(); + g_autoptr(GHashTable) found = NULL; + g_autoptr(GSList) refresh_list = NULL; + BlockDriverState *old_bs = child->bs; + + bdrv_ref(old_bs); + bdrv_drained_begin(old_bs); + bdrv_drained_begin(new_bs); + + bdrv_replace_child_tran(child, new_bs, tran); + + found = g_hash_table_new(NULL, NULL); + refresh_list = bdrv_topological_dfs(refresh_list, found, old_bs); + refresh_list = bdrv_topological_dfs(refresh_list, found, new_bs); + + ret = bdrv_list_refresh_perms(refresh_list, NULL, tran, errp); + + tran_finalize(tran, ret); + + bdrv_drained_end(old_bs); + bdrv_drained_end(new_bs); + bdrv_unref(old_bs); + + return ret; +} + static void bdrv_delete(BlockDriverState *bs) { assert(bdrv_op_blocker_is_empty(bs)); From patchwork Thu Jun 10 11:25:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312753 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56E0AC47094 for ; Thu, 10 Jun 2021 11:34:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F0223613F1 for ; Thu, 10 Jun 2021 11:34:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F0223613F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrIx1-000863-5c for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:34:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpm-0003Cg-Qx; Thu, 10 Jun 2021 07:26:50 -0400 Received: from mail-am6eur05on2118.outbound.protection.outlook.com ([40.107.22.118]:26592 helo=EUR05-AM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpj-0004Ko-Vm; Thu, 10 Jun 2021 07:26:50 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AywUiTVIKq4CiWWCMGrg30Kep67pPWuvbMCiI3b6hOk1u0cl487kCG+rmndDhBIZgFCAHSrr+c6fA4AOEk0ZKfhodQGGrZ6x9c/zRiz/WB5t3oQkYVkP+zeqLnzFdV5TLOkh7mWvywNhQpU3Pdv/bAEfJta77N/ZdcEymDveimBra6s/0Z/G0SchNuv+MDSuEmh60ycQKI2hS5K5fTnP8Q41EVj82yC3WcDjOyyD+9A1I3YOssfYQJslLGsTQLbTurg4QanCyYsDGPDVLVp4S9U86qndhkfdBgI/qj1QliR9TUp+GyG1EmxdjBweYnWaKaeZo2Xxagc2iVex4a3pig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=B4U4w/GZqtNTKo+LGu837g+7dHPDJy6BxGloVPkf1KM=; b=nQ2d1e/uyMJO1I1rkzZcuESsK+rezIzG8/Ql2ek+pSzEqM8HfvwcokflCS8y/7w5E3GQT+6FpnZGdaAiZl5A3DnxDiGTwSLlcc48+mAzyFmntzYHrhhTGDgu9z7lM+EE4sLbdUzVM9zwW9dmyXafYYUL0WSVr41+0susaKfgQsseqKgns1AlgJ+R5rl2LOmdykyhAtelXJoXrZ5AL9MBI5DtUpF+duU5uyhOneeCKxAE2nMhtn1c9HHJ5m8dlYIzADUeBBJ9UYBoXzuaTk825DgL2D+jf2aHknSKWMmtfNYAt0BUw7yX1zWC2Ylq1MjItzSHpNvu5a4kQwMgpRrCHQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=B4U4w/GZqtNTKo+LGu837g+7dHPDJy6BxGloVPkf1KM=; b=vhM/gkmsraCJGIi1Tvk5r9UbWgw9Qyev0WAKZfjvD6xow6a15iRjwkPIqAOAbCVkF3JgMDaVKWP0KAw++gJHNtuQSAVIh+roKVIGj635x67eBiDUUf9gK8wTJF4HD+roumaYO76g/aqPhGpNOU085OhRZcZMgoPkb+MHO5EWo28= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3960.eurprd08.prod.outlook.com (2603:10a6:20b:ad::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.24; Thu, 10 Jun 2021 11:26:38 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:38 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 04/35] block: introduce blk_replace_bs Date: Thu, 10 Jun 2021 14:25:47 +0300 Message-Id: <20210610112618.127378-5-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:37 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7f00a111-7793-430c-4c05-08d92c029c98 X-MS-TrafficTypeDiagnostic: AM6PR08MB3960: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:352; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZnWW2uVootTLHQYBE/j2t7zOtg9glg6UBDlEEWaRYcpEOgglFDw3//5X+5zF7IHl+jqk1/rrzw1ykTun9JhPrKg6H2najmjKCycaaFJPr5YhfkR1quJhdEEzDhSUQzAh7BaLUxI4Y9mypOFtqq4MCnqjPygGVz8JDrO188o6BetDak4P2mSSA5Oez73JhRO/Gn0UTjyQsaxWhP+04rydOlBlUOIvrGBybopc1660wGg/AsyzO9iipnXEZ6xR4TKQqv9kvH5frWzt9iBH0Xp0XWFMf70VYogQLUScbaNQw54XLeTcAMZ5eZAD0Y2L7OsTkDRGfsHk+8Di+BFmsdRHiQDIzvefU4rc14jkVAm5e2bEKWIIRJcSLcEz8K7a3qBXfnMqqgh9vc59NdwSF9kzbHyB/hoe5ZGtytoPc0GKdlqJsPDjGXE5w6rE8YeqFe78Gqf5BH0H1/W2f/xAef7H2YWk/uY0WK7xZ4xS+63KRsHTNUeFk+fZpnwMpW7Vs0SMaUlwKDHQ5k84xYuBS/RxLDU5GmNKCB9yN03s6SA9HuIfJRwTHprDNx9BxbuEifj2zlSIMzlBHDIM9BNaDg9aMus2s1/7SRRCejJxpnZD5UTeoAEcIyFMrOEulpx4V4ZePuGKuC/yrWj8g5DIwqLkMkoKdWqR9WtPKnZoAL64Cgxni9nNrFFlHUqrBcuMGWV1 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(39840400004)(136003)(346002)(366004)(396003)(2906002)(8936002)(2616005)(86362001)(316002)(478600001)(6486002)(16526019)(4326008)(36756003)(8676002)(66556008)(66946007)(66476007)(83380400001)(38100700002)(52116002)(38350700002)(6666004)(26005)(1076003)(956004)(6916009)(6512007)(186003)(6506007)(5660300002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: odNaQFYVfVCFSicfw9LY9/lzFt3HfdskgOE+fZdagDq/9sI+qrM96/albyRf0DmB3hXZHYCE56EypfVd6lKl3MbpXJRMcvM1CicIPq0XbPaEsUwnAzh/cR6jvdgIRkZyjknnS6jog2AHiGjDpd0ho00Yu18OBzS8raBmxdq//lMuk6DnfaUkrx+svoOAXjhJr22bHuALNQ5ljPkZZX1UQ15qJCeU5nlXKYBaNraURj79k5mlSPkO+LZRTc/qzejI87Oj2H75sIk00uJa163bFPJan4mKXJrfFXLLkJlQXjoSySWzV/uRLYCzHaaJmuLACXXnDS3CRheOM7YBH4fe1zCYkd69XzWZOJcdXiH3zC2DzUVtoTkXSxG4lBn5UfxgjE1e+i++PxSEEQL0OIwSt1TRTmA5EJCcxxLfjuBgWoqulr6RL4Fq/GhDISiyxcoAS3MSqArCSRGmVghMksIf3t9QJnwfiT5hVnH1D5476mcS3p51gN//hhhh+pDWC2kFoDjgFPEyHBVrP8XU/PlYbHpAVcs1narBYibmQaLBw4nuZpo794Y/B+2ZvmwXXXIkhyH+jFtVzc1Pc7uA+CDyZ3cr3CG+3ieduOOJ5BNMrZyQ2HADEmK3S5yfmeogZGbHbIIi4ysYrVEU0tQkLW+oPGd/hDAA9cXEp0u2VM3FRi9IJqlwcEamDctA6Uhnt3rOdbj6/HYbU/DKEyoG4g7CO1zLFV+zlAs652cVfZo1hG+apeXlY0u2x+3VZ8t7S/lFVBQ2zQVhBQ1IC4rJoF2TeTETUGpEV0+LiIEsz7KcUx2YT2aa//48HwlmAeWhNkauSFBHvgcWiQm1MVmYvxrCe7cqzqDVqUfs20LnCsGT1P3X/xngeFLnwL6wo8cnTcCqiHQAjw6vL/UuMYRViSpCUzFZWwmtrZBU9NVf8ZR4x6XiIcXnxv8TKshaOCToUWGR7FDfRGAUTJo6qXKLb5nKCd0WK7Zn+RD4XP13puXKf/FSSS8XVBaeOcHCl+6Y5Oyw9KS4GWDIYURDIqDKtr8hDWj0rtCi3WG5Ld3YMGB1eZODQGKDw+9/adRcEVIflpyXbHBKTkYyckOGL15Bg5pn297gt4gtLXXfjxb6MiJmW5TbDygP6AF6yqGvHjIj82n2sCxYISgCX1kXgQF/zl/VZ+DA4tlL+gh3N6tdnxAHi/10bVdUzqPam1RXA8yjpHbwJfvhq9YVtTdQuvtIAL3yZUHhBxBHXxeeVCA+pzLJgLMonwbSg8Oz5gfZdQvywhwIv/1cfjedQztEeeyu84Y7aV3jmX57kyKpQ1rFYHbasof4ecroU8K1Wu6k3QVhhxPE X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7f00a111-7793-430c-4c05-08d92c029c98 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:37.9643 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pM3X5ioyRM2+UVyS1VAz4706A6ujoeTnaV9mUxjHClGgxHimEyGWE3vhCjepM8k2nQEnDpPZE6+sENSxx/GDnoTj3ZoOU+9KB5xtUGyDVSs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3960 Received-SPF: pass client-ip=40.107.22.118; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-AM6-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Add function to change bs inside blk. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- include/sysemu/block-backend.h | 1 + block/block-backend.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h index 5423e3d9c6..05b0ceb746 100644 --- a/include/sysemu/block-backend.h +++ b/include/sysemu/block-backend.h @@ -102,6 +102,7 @@ BlockBackend *blk_by_public(BlockBackendPublic *public); BlockDriverState *blk_bs(BlockBackend *blk); void blk_remove_bs(BlockBackend *blk); int blk_insert_bs(BlockBackend *blk, BlockDriverState *bs, Error **errp); +int blk_replace_bs(BlockBackend *blk, BlockDriverState *new_bs, Error **errp); bool bdrv_has_blk(BlockDriverState *bs); bool bdrv_is_root_node(BlockDriverState *bs); int blk_set_perm(BlockBackend *blk, uint64_t perm, uint64_t shared_perm, diff --git a/block/block-backend.c b/block/block-backend.c index 15f1ea4288..8fabc1c835 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -869,6 +869,14 @@ int blk_insert_bs(BlockBackend *blk, BlockDriverState *bs, Error **errp) return 0; } +/* + * Change BlockDriverState associated with @blk. + */ +int blk_replace_bs(BlockBackend *blk, BlockDriverState *new_bs, Error **errp) +{ + return bdrv_replace_child_bs(blk->root, new_bs, errp); +} + /* * Sets the permission bitmasks that the user of the BlockBackend needs. */ From patchwork Thu Jun 10 11:25:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312873 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B6E6C47094 for ; Thu, 10 Jun 2021 11:37:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B3BBF613F1 for ; Thu, 10 Jun 2021 11:37:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B3BBF613F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJ0L-0006fK-Sw for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:37:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58928) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpn-0003ET-99; Thu, 10 Jun 2021 07:26:51 -0400 Received: from mail-am6eur05on2103.outbound.protection.outlook.com ([40.107.22.103]:32352 helo=EUR05-AM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpk-0004Na-TT; Thu, 10 Jun 2021 07:26:50 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kKTe00fsthR1IyODGWeVSdaIutVq70JFYdA3weQp5l2XKIS2Y3kGtUKNQ1DV83FIX/Pe7tfjSfQz2+NqF/AbsE2AxzX7Lx/5mWW0LtwpcvmUM7NErWAN8cOXYnTSqMPsb5tbkHlY5jn0wGT4rhVM0aIIFLYqKEUO136a4TlJ6bwzISrpShbuLT5MO3AMNoMlj393Ohn/yScdmmwglMk8+4/Gnr3vz8xWHdRMXOF3DesQFhLwzUQT2Vz094fC5obFOyJS8Lo9BvpUvzT0wt47wgmdPE7QVFLlp6HoSxph3aDFSSQDeJCQyL/j1rkGIdLsClYZoDednR2Ta3zRsgiJVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2TYk/vlRgkhlvjrVIe+Pk/FNNMZHyvuvS9JwUm7efHQ=; b=BTYRjQOMLRyfRd9FwINpd6tBkT1gOiaN+dYCZHAfpPxfzO93HjLWUEI7TDhGzCEGCkm0NyK+x9HaEV0EhuOsyUh24M7KTk0yCXazdKXm0Vq2loBQ+dMubmktmv1reOIvJujWn+A+KJwA9hHroup4sF+LhoTzwUJQHA7GNCQ54QW1scfuJBrh7oR0evSqjiSHdLPQwLTACrUveQR9MM0YFjjsz7YKP4j8pgb8tyDJwTHI2Y+7SGv0PB+BH/W+HcguRfU042WEf8RZRGX1qlD3o6zvpFwgs2utzVkwSd1HKZwVj/82o6FLW2tpHfX1GcgdcfFUbwsXVf5A1I90XMXoKQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2TYk/vlRgkhlvjrVIe+Pk/FNNMZHyvuvS9JwUm7efHQ=; b=SACj9SR8jlgZb7Ko41XaWgIGuprWetif5XncVYDnn1t2XN0CLxDWKOHZPyNlvX6H68772EmJ+4uNFcwfvbU9rKobBel/OR+yC/h3Klq+d+WlKtwJJ3Tpmkl/MiSo7aU6ibV+1lmbV+emLbqDCF2nb5Se49dEEjWTIfS2R4sQk7A= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3960.eurprd08.prod.outlook.com (2603:10a6:20b:ad::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.24; Thu, 10 Jun 2021 11:26:39 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:39 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com, Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost Subject: [PATCH v5 05/35] qdev-properties: PropertyInfo: add realized_set_allowed field Date: Thu, 10 Jun 2021 14:25:48 +0300 Message-Id: <20210610112618.127378-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ca2b60d5-4bcb-46c9-2c38-08d92c029d58 X-MS-TrafficTypeDiagnostic: AM6PR08MB3960: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:595; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: i5ChlF7ESx+WN8iRyi//IcKVGnj/RHCwrF0mjXzdOoxAOQ2tLZIrgPB7guVVOYqLpboTBdlce7+Xp1fs2SdXqh3Za2mBOifaMqSIofdufp+EKgCfoh+3usyHmRuM0zZuBmnMsNvDhFguYzfoxKeP5Afzlxt8nFinNtp9KKOtStdjLTbVTIhHZL2oiPXzLXVE4OskJQMsSZBT9i2ekb/39+wGly3AAHQVjKTMSX/sOIGr9GafK8G7iMy6lA0BFZn9o1hnSRxtVcuie5fCxIQpqk3AiryXqwGuPtTiKfdrqHV9SkZ8vhZiDENpDOyvEk6oigPAd0SsSMrcdHoQYoLaDhmXvsnOp1utTSL24ckeCJ49elFEhn/tEgFiBbEPnHjQBf2pHsEJWcy8yAwCvfvQpC76FaZNiQONOzfoIptKnP82AAndhV/smh4UGWz4XzHVGsUoCiNXH11Eb4n9VRZKQSP6XtYHtdH4T+5WHka3X7MYo8hU6GiyBAgZ4ZoJpGP8eYxgqXPyeZ86P+cWWFVn8elW8klpstaWdRHs89k+0wSjH4CFuDAVRotN2P1+mt7dTIPZ48Nz7VfhVEh5g9EqdwSlkMQgC9iCj59befgz3YVyhLRo+mzKMyVZCNBDXEkWaBp3ugx7jPp2QcGaIkDspOSaHMMcKsY8xrdsR8br+GqEL5w/qspB9HTsiY8uJYFv X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(39840400004)(136003)(346002)(366004)(396003)(54906003)(2906002)(8936002)(2616005)(86362001)(316002)(478600001)(6486002)(16526019)(4326008)(36756003)(8676002)(66556008)(66946007)(66476007)(83380400001)(38100700002)(52116002)(38350700002)(6666004)(26005)(1076003)(956004)(6916009)(6512007)(186003)(6506007)(5660300002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 1bjq5u06dCYcr6XdxZ3UsGrctuoZsrGvBV9eI4u7r/BdQfN1KI9R7SV5yjESNi9KaRaBKh5LSHlKNqesaWidZSGnbqKTfzMZMAyv2FiHRCDTZY34MH3UqHxAjcnfXDEYAAGLVZpcztRu3L6wXrtqx/+i1AEwxtHaRAPho9QusAizD/JBkOEwB1eB98dGzYT2S628Kgy6Wh8Y4JHUitNE/R55EKoHcUH8V6uKX5kju7OXtiTM09Sa6ltfT6aU1wwKwptjLiK1ShrjBU7Tr6Aiu1qFiE+X5bZwZE+NPtM4SqH7gdY+WFZbEND3sWbSvKKlqOOhqVrV2RECxwMoKtqfB3jXgdlM6RvVbAfkx80kW75Fzys1/0Ap33Z+gSO0dUfSjSg7md+18nJW+vKjEocSOWiMLvue2z7/0lTJODYbrdcf6wjrO5tP1uh+SmmS/GkQQEAKKRPzOvGfnX/lNyTJGh4BhYoEby/auktqtqdjKpjfT2GCvQNYlIPgXyXw0deh3tY9P78kRJCDGTzyF96vMl4JGJOtEFIqEIS8J7LAjDaAvmFD8nPlSJdE/snNpG72TosubGb8a8j7JiBd5l0iuYsc4NgSWSs4u9Y8gss7EKF0QSwPVMfkYIdyMCTHNHMQYEVBBLTGMLbeZywLHFRN2msLorZqS6/Wa/Rqf+3R1Az7PX9Z37ofD0QPxP5224U0QMaIcbhtaudOvf3zzEemptDmcUzXQU/dUwmVUIHsZmFoS3tq8WBpP6vGLwWCGjr/JHY3ttrQQWhfjLyXDkJ4DG/4uLNUtcDU//F/6W3TV5ntqKlV2mSm79q2qOlRx7SRtzrevT4ADoFsA3L5wIsd3vOMTKHK8R+1dLPxulPZwFkrlnPMyefsoCiIa76OhiP0b7vaT7g1eh6edbhHpkL5+yPzwjWEh0/7rI4POfmiPalSyX5XvI5OynVNQYILXfo2OhAA4Q4dGTHNkIQelsVWLHhcbMJpyH39X8KWWfdxx8WZu8EZ+KGm6fsy7DZGXxb7PDJJj798hHqUZpsmZjjE977EyBlBviIZYd4GxrAaXiovZx1Fg7g0lOBfwemUbwO6+bmoOCNaKmNZnA/yxC4Wxzz+OonLshLecWL9r5E9cUAydceQf4m1wWONV4Xp5W+nRe1P9kp8VuMum+NvqftDxEURyHgXkiweugMV3QvFxjVLOso2D1XZWMkdwjOeOXuQ+lvzrNZw0FAcvQBBQzFCFusWNjDNpLPuzH7hC8xHBEP/pobljybelpYNoIvSg9fWypvArQumcPptP++Ogvw/lFmQDL9HTLDLgNkA9jLULLVv+bIk9R+ld3Kdoxw0z8Zt X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca2b60d5-4bcb-46c9-2c38-08d92c029d58 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:39.2357 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5ioD/lsGaRsNhUaqDMijeA65mogxABJ5FDPgZit+Gt9pBZahyuSWa4q4UjOr4qklByINv9mi+3s3TJaxUkjuPh0EJYlOHdcD9ubUdJkFlRs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3960 Received-SPF: pass client-ip=40.107.22.103; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-AM6-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Add field, so property can declare support for setting the property when device is realized. To be used in the following commit. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- include/hw/qdev-properties.h | 1 + hw/core/qdev-properties.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 0ef97d60ce..f7925f67d0 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -32,6 +32,7 @@ struct PropertyInfo { const char *name; const char *description; const QEnumLookup *enum_table; + bool realized_set_allowed; /* allow setting property on realized device */ int (*print)(Object *obj, Property *prop, char *dest, size_t len); void (*set_default_value)(ObjectProperty *op, const Property *prop); ObjectProperty *(*create)(ObjectClass *oc, const char *name, diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 50f40949f5..c34aac6ebc 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -26,11 +26,11 @@ void qdev_prop_set_after_realize(DeviceState *dev, const char *name, /* returns: true if property is allowed to be set, false otherwise */ static bool qdev_prop_allow_set(Object *obj, const char *name, - Error **errp) + const PropertyInfo *info, Error **errp) { DeviceState *dev = DEVICE(obj); - if (dev->realized) { + if (dev->realized && !info->realized_set_allowed) { qdev_prop_set_after_realize(dev, name, errp); return false; } @@ -79,7 +79,7 @@ static void field_prop_set(Object *obj, Visitor *v, const char *name, { Property *prop = opaque; - if (!qdev_prop_allow_set(obj, name, errp)) { + if (!qdev_prop_allow_set(obj, name, prop->info, errp)) { return; } From patchwork Thu Jun 10 11:25:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312871 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8CA2C47094 for ; Thu, 10 Jun 2021 11:37:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4774E613F1 for ; Thu, 10 Jun 2021 11:37:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4774E613F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJ0A-00069T-AG for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:37:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpj-00031g-MS; Thu, 10 Jun 2021 07:26:47 -0400 Received: from mail-vi1eur05on2122.outbound.protection.outlook.com ([40.107.21.122]:49376 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpf-0004NZ-Pv; Thu, 10 Jun 2021 07:26:47 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BpojRKfGtwj3Zz+qwK7y++gJ+rpOj5xsROLgZJFbi0K/uti52Tpre2zM3XLbHq5yWFU7oy9KCQsoO3ckhHyYTnn5uurzvnxsC/pzMnNFtyVzSfNkSx6gD4B+lX1SRU1zIEcjvTTdDln3qeaCXHoMYrnHyXclPi2bPJM2SOLI4aQAhzEYfMVHK7jdsrm5wsJJXYqWaANZYswSSgUpIc0CiN3CkjTOtC0wrtjvlR3E5h1ks4P0mzMEbP3OwtQy6coKF68RKYfHMUkGuFJhmffFP1P3pixFSMLHBk/343LwSX2YzdahNEvaFUelgE1wXAN8YSSzwfldQJxH3LvAUqbQbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YJfp4qB2n7EBWUo59Of5E9XDnSvgv7wv4W8IEBSsMhQ=; b=StaOofTGTMkoLR3MCmDAZ5orrZtYaggUUVtYXBpKelEKZccXNlDK1WRxtFgVz0HhVjqR3tBiG0C1Laca8muXmv+qwKEbvkZ+1tKIf+dQUwWb+Grn/NGBU890twwo/xKPCbS56VpftQBjNLRE3xY43eeen67Def5Fp9Sm+yAI/UXgvRKYz5Ou+qTfGT46ak4Og2d+it6tGbldJsxL5kgrlfSp1pL6UQUJR+Lcn62ZebMjJ30ufZ9wPIz1Z+7mipu8es3sH6iu/Efty1eK1EK8kJa+NAaNU0nqeIyjPv+TVEVbIgMfK4VbR+POLVnsX40kJqYub8thqPqgXakaEApQ9Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YJfp4qB2n7EBWUo59Of5E9XDnSvgv7wv4W8IEBSsMhQ=; b=hJ72SNkkuRLvYU/66qvjg8Rzsf7P3LQXHeQ12REdeP7Ym3G7TKWk39K5QUeOrD12P+Wh2eGtHu4jlKmo7itRCgYslesWccL20uOTSoDIKwk3hywL7hBAr/mkVeONpByqvXmBJiomGS8CG7NRbLRgJXVvLUbkKMvGjw5EAy4rzJY= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6280.eurprd08.prod.outlook.com (2603:10a6:20b:29b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Thu, 10 Jun 2021 11:26:40 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:40 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com, Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost Subject: [PATCH v5 06/35] qdev: allow setting drive property for realized device Date: Thu, 10 Jun 2021 14:25:49 +0300 Message-Id: <20210610112618.127378-7-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8eb036f0-0b75-4144-ff2d-08d92c029e0f X-MS-TrafficTypeDiagnostic: AS8PR08MB6280: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qpgaC4u7SeQd34LAZMEmYK6KXsM0yOMw2ZVtE1+0ws9/mfXNg3jZXZq2sl+ZBApRmgGvQwnRfoxYrCrq99xQVSLcpEtv4TxvwZzp2cwpoPtw0YyH4MPy47tNnR5hVaG8baN9Dxxf+el+WimoH00feHswBSVvkNtG+e11k3MdUc4v+Iu408se01ypUiVsjqQhy6pj+WkJ3DNrKng2XzKdYG3vj3YeohyoktLsPGQgZtpTCBNpSBLHjeLAotMc9O+6g4LSgoQnNjOVj3lnI7sc2JSp/9HqX7htkEQV0pHcaZofbltl4CPd0+7l/tOPGoTaGEgsyytvbhKYGhOMvKcyOLPv7JVtIa+1/hB7+kOXeOp2BacnVrEM3t9AkRBviAJHLxwf6MJICGtAAHmP63LVGMifrvnL/o+02VJ8CQOCMlV1cPxxmy1dHiEeYoiPLGRSLQXbwO7E3ObZomCSYpyKizYmbvVqRYr78TRdQKTCVB3g8GWEA5e9MFkZ6zlbbRz3J4/8PC7xjCZJjkIBN7EIuTFtosQX8NR3uMtrouWQ5/np8B+lMe1KWnW3Dtpkg2NVDWrkqcytK+0sfzypnBKwhH3Oa7NQpciLF9NJ0xvKXyapEpFngxf6rVrBQwAbodeM1no3cYmmWx1t43VADb6cVV0wpjmvlP7XW5qM72gcEDg= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39840400004)(396003)(376002)(136003)(346002)(366004)(186003)(26005)(86362001)(36756003)(6666004)(54906003)(1076003)(8936002)(4326008)(6506007)(6916009)(8676002)(16526019)(6512007)(52116002)(38350700002)(478600001)(38100700002)(66556008)(2616005)(316002)(66946007)(2906002)(6486002)(83380400001)(5660300002)(66476007)(956004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?LUFS9S+Hg6QV+pUvhpsJVzwLZl6HGT?= =?utf-8?q?l7GEEYYO00JdWWTGmpWKlQCaxm6XPsfR1ml07x02cfRiL8YFckHnG76v/UZ8x7ddf?= =?utf-8?q?94s77wK8cKAwJUYeL7fd2wcxLS+OINu4zHFytKb6/ZWmjDh+1lM5xORd9eOn0lEvq?= =?utf-8?q?fNBs9ABse5SNdfReVk+ZvJeJhJD93/EhpIi6GUtqYll1XCY/jxLARMzZWIfs9m8us?= =?utf-8?q?Fgh+43EUN2QpTjO024xY0cVMLjRi3196X6eG7VDYQpy+WM5vm7UBP6WSsex9oOEcl?= =?utf-8?q?jlrpgL3w8M1OWFXWNDwAicpKCtZKz3+gVHJCbc0W0pHO66VaD07cFBTTqK3ATXRHd?= =?utf-8?q?KE4PdOhAbZfH5WajJYcPVAYnbDjNbYLmiS3CCb5QxMMnepnA45Lpgii+Zd7mDFUfY?= =?utf-8?q?uo0zGgJTcDPB9OJtgBwJwsdIvCJZQRY0c6hns9suXiqiqFYUqe5dRjz0bYFTukZVZ?= =?utf-8?q?1CO0pJM3iwVg4cM+e35J3IcsBLrWOmKoPBhEl4kIxJ3rzk0wMgPpLONmtiL2D7Sp0?= =?utf-8?q?eLppTVajvaNS6vPbpEI/IFgnFKbpDTgPzyXGYlKlG2DjTVBEeN512+9ixg/CNYn7X?= =?utf-8?q?tJ41v2xl8jzSvO/LqkHw2+MRbL5QHZqCa8GCuZ9CgLtqR6BgBqUFB7gnercu1kFze?= =?utf-8?q?Jv/x5IXO/suHG08QRmCBabeykeas/IESI1/x8krwkGCLcnIRC/UC3e4LKyeIq40C4?= =?utf-8?q?Y1CPR7521NZC9G6zsYpoW7SePYWpdmCqBZpIb3r4xakwLQRbxefn6nbm/ppyjIBdL?= =?utf-8?q?YJ+r3W4p3MwXT6oT2d/66XD5a5IxExObVM7BP+vLbRdNHwbTpxdNcSRmaKVbQ+qoy?= =?utf-8?q?Azz91Q/Bx6IcCiIIW78dtywlqWSCNarKxVAEClVTwaLkCap3+Qt+ykPhbtkMTGQ+A?= =?utf-8?q?OiooCHMyDYTnkYjp0HhRrWXFY2wZGKsNz8tiMhQSJj5+sFZhXjKwr/e1m8mv3hAuC?= =?utf-8?q?GF5qTEDxY8/8wMfrq7aLpnAKGL0XLwaOePtVkYFflHnclV9uo2Qqi3qtIvyA9ckvb?= =?utf-8?q?Y+yzW1KbitYdWKJSl9fcyZE7CRx5VEkl5ivZgtraop5jHHe0qZxCCyIkbWLXqNdAV?= =?utf-8?q?C/5NlU2p8fgpsTuky/npuxI9vZwpHye3uFMLsJIyt1QaFPbWJbO8957RFK/5/RyTr?= =?utf-8?q?AKwWSuk6tQa7ARmn9++h9J8dsgNzmwUfgqqs5VW5jVRE8/5dDXEVS9hdjOFR84/6+?= =?utf-8?q?aVJfp0RjtUMUMrxXrS2TnHn1nxfT9J8fFKes0toE2+nTRRx3zLJ7bZFlC7fyOIhLk?= =?utf-8?q?ewh/pDgzrJASYs?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8eb036f0-0b75-4144-ff2d-08d92c029e0f X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:40.4405 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: CbJfmLqpOxk93oLsG69/RdmwQmqAJMtl+0gEO3pW0oKx9j4zWyyzdCi68f4/0gMrq4vFDF9SgLNNRTV6MPUd/ZeM61IanfabvN0cQ1xjo+Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6280 Received-SPF: pass client-ip=40.107.21.122; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We need an ability to insert filters above top block node, attached to block device. It can't be achieved with blockdev-reopen command. So, we want do it with help of qom-set. Intended usage: Assume there is a node A that is attached to some guest device. 1. blockdev-add to create a filter node B that has A as its child. 2. qom-set to change the node attached to the guest device’s BlockBackend from A to B. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- hw/core/qdev-properties-system.c | 43 +++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c index 2760c21f11..e71f5d64d1 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -36,11 +36,11 @@ static bool check_prop_still_unset(Object *obj, const char *name, const void *old_val, const char *new_val, - Error **errp) + bool allow_override, Error **errp) { const GlobalProperty *prop = qdev_find_global_prop(obj, name); - if (!old_val) { + if (!old_val || (!prop && allow_override)) { return true; } @@ -93,16 +93,34 @@ static void set_drive_helper(Object *obj, Visitor *v, const char *name, BlockBackend *blk; bool blk_created = false; int ret; + BlockDriverState *bs; + AioContext *ctx; if (!visit_type_str(v, name, &str, errp)) { return; } - /* - * TODO Should this really be an error? If no, the old value - * needs to be released before we store the new one. - */ - if (!check_prop_still_unset(obj, name, *ptr, str, errp)) { + if (!check_prop_still_unset(obj, name, *ptr, str, true, errp)) { + return; + } + + if (*ptr) { + /* BlockBackend alread exists. So, we want to change attached node */ + blk = *ptr; + ctx = blk_get_aio_context(blk); + bs = bdrv_lookup_bs(NULL, str, errp); + if (!bs) { + return; + } + + if (ctx != bdrv_get_aio_context(bs)) { + error_setg(errp, "Different aio context is not supported for new " + "node"); + } + + aio_context_acquire(ctx); + blk_replace_bs(blk, bs, errp); + aio_context_release(ctx); return; } @@ -114,7 +132,7 @@ static void set_drive_helper(Object *obj, Visitor *v, const char *name, blk = blk_by_name(str); if (!blk) { - BlockDriverState *bs = bdrv_lookup_bs(NULL, str, NULL); + bs = bdrv_lookup_bs(NULL, str, NULL); if (bs) { /* * If the device supports iothreads, it will make sure to move the @@ -123,8 +141,7 @@ static void set_drive_helper(Object *obj, Visitor *v, const char *name, * aware of iothreads require their BlockBackends to be in the main * AioContext. */ - AioContext *ctx = iothread ? bdrv_get_aio_context(bs) : - qemu_get_aio_context(); + ctx = iothread ? bdrv_get_aio_context(bs) : qemu_get_aio_context(); blk = blk_new(ctx, 0, BLK_PERM_ALL); blk_created = true; @@ -196,6 +213,7 @@ static void release_drive(Object *obj, const char *name, void *opaque) const PropertyInfo qdev_prop_drive = { .name = "str", .description = "Node name or ID of a block device to use as a backend", + .realized_set_allowed = true, .get = get_drive, .set = set_drive, .release = release_drive, @@ -204,6 +222,7 @@ const PropertyInfo qdev_prop_drive = { const PropertyInfo qdev_prop_drive_iothread = { .name = "str", .description = "Node name or ID of a block device to use as a backend", + .realized_set_allowed = true, .get = get_drive, .set = set_drive_iothread, .release = release_drive, @@ -238,7 +257,7 @@ static void set_chr(Object *obj, Visitor *v, const char *name, void *opaque, * TODO Should this really be an error? If no, the old value * needs to be released before we store the new one. */ - if (!check_prop_still_unset(obj, name, be->chr, str, errp)) { + if (!check_prop_still_unset(obj, name, be->chr, str, false, errp)) { return; } @@ -408,7 +427,7 @@ static void set_netdev(Object *obj, Visitor *v, const char *name, * TODO Should this really be an error? If no, the old value * needs to be released before we store the new one. */ - if (!check_prop_still_unset(obj, name, ncs[i], str, errp)) { + if (!check_prop_still_unset(obj, name, ncs[i], str, false, errp)) { goto out; } From patchwork Thu Jun 10 11:25:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312869 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F6C6C47094 for ; Thu, 10 Jun 2021 11:37:23 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8C3A9613DE for ; Thu, 10 Jun 2021 11:37:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C3A9613DE Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrIzx-0005af-GH for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:37:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpn-0003G7-Mr; Thu, 10 Jun 2021 07:26:51 -0400 Received: from mail-vi1eur05on2122.outbound.protection.outlook.com ([40.107.21.122]:49376 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpk-0004NZ-G9; Thu, 10 Jun 2021 07:26:51 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yc41WIoL6m9Rd9nEGIPpt+b20uIXhmp2d/7sLfrDfBeUsfF5+VntZLc84FlY0oMU0UPoZqZeUkE9u9FYTKsMnXTsWp+NiwPQLXgcEOfQzKZdH4t0cmqxG3sbigE3CmzDGVebGyBwzskn17gt+FIfcqmuYzz+werT07oEyC66S8RnxG9YRI3E07tsY2bVIgisiKTVw2SXf4lDCUcPsrFDcufYMRPASohGyS+I16/eiuigqxgpNdZgSoqANagckzjNNFyYiplxLSelWY9N8AvreQ6D4aRetSWOsx+/6XudJrPyfdRFQTdpQvRP3sQDA3fTdtoEIqMGApU2PaCgxQah9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=K1ofSgVa+9Z6wnY79L5lG1x3PG6xnyXjWGNMOygZpsE=; b=iBj+pg8oTOsPluMAX//JcVw7sKXMeLgmhf+/3/galOzU1D0Fl3YH4i8QG9BkSOq+BKl8xIuDDaEnVtyuCNgKexCA2wg0dUw4n/7rVA96saxvEOR0G3B5I5okGrxNmbIvPTVqwg0Z0dB3rWhUA2ZlzAoTwW7Q10GpogBTpfyewS+0G12+Xl9iCnSahK6Ca6QlzMj83qfn1pOtlzNODkz3eUqXJsUwJ/YuETtPB/w5ri6EY9mwpRLcqitJj6pDUF/4BnxkCd7kb8hz9e587jcgzR1USKCkHOde4gKQoVZGzQEilzWeTsY9ER9B69j9g7JmIfBBXnnBfKZUC5gkQaujpg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=K1ofSgVa+9Z6wnY79L5lG1x3PG6xnyXjWGNMOygZpsE=; b=N3CVXDRzyV1R6AmsP6yCscN/i6t6BJVX8jYfo4bWssxOIK4E/Z/f+eBF+0Hp0bMlSxMhEBIkoMXxo59cSxRvTwRxNvdLvZcMf4VlPhQrGmu28d04F3xM+lV0IYYIlgg5DuQqs8o+vyH3vH4rPJO9UxHHmbNbAPXUsm4M1lXNjtg= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6280.eurprd08.prod.outlook.com (2603:10a6:20b:29b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Thu, 10 Jun 2021 11:26:41 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:41 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 07/35] block: rename backup-top to copy-before-write Date: Thu, 10 Jun 2021 14:25:50 +0300 Message-Id: <20210610112618.127378-8-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aca76155-766c-40a0-aa53-08d92c029eaf X-MS-TrafficTypeDiagnostic: AS8PR08MB6280: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gAX2OdqQDZRyywt59dmtgJGk26S38/Ucys3VRqfqSGczFg576iVE5WDLKEi81qmkTEZip5yCcZfEN2VL9ba2DCdu8QMEfUwmRW8nBZBj4ksjdTqDqEcjZ89aed3KUeaCaUe/28pNRCwVX7ZMVrmCxSjqVg2VkfYRZHKsvc8f7FNPj8lYPtMw7wVGMxbUvBdHmpECEMS9e/0AcIU7xLbUVpwKAo2poXzQoTNgJc0y+dv2qz888oLM6pHSP2MvlH8A9Vn2QSSM9djjE8ZgvYw7Ba2Ta7j3zA9oqcmtoXtQCTxHNtLAq+ZYNLDpXuYP4P8xcukhQEpUA2pT04ubm7smX6K8Zaf/0kxsdwq5yraVdRSVr3FJAT2/40yJI25MyC5ReI4rGf/pHAD9y7T/cB43oMqYrjlqK1e5yQwBHJCwQrZ0eEzzCEjpHbdVclf1ME4cNoAE6GkJZq2nNp172txn4juYM9/JRCv0PZTXKRcZQUMjuA/WoIfNkBvTR+sdcwPLt9zLCfQjwRBSudBHuwvWEYmAZjkB7GYUkZ9W71WTQdX6d+2thsScB1pfijU2AFwyvxK4lrf0WxQO+eMTJGHHDCu2shHAjAB481zek2jBOK86s0BNjAfYhi3PSLidmcIWoHNW33VFAMc2al+JxToNVx6S/EvteuRzT3T6SckSRmqRhTlApuKgRjdYVmAcOlgQNlCpLJOE7TU1bRmIgRi+Nq9L6qOJticPF90yUlQ9MZuyo+O+ldD8+lBkpqL3kmfyJfZo65ZhOhvqV3gHrL8WLQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39840400004)(396003)(376002)(136003)(346002)(366004)(186003)(26005)(86362001)(36756003)(6666004)(1076003)(8936002)(4326008)(6506007)(6916009)(8676002)(16526019)(6512007)(52116002)(38350700002)(478600001)(38100700002)(66556008)(2616005)(316002)(66946007)(30864003)(2906002)(6486002)(83380400001)(5660300002)(66476007)(956004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?8OtNLCpRkBq0ASWMJiCnMq0txOvG2B?= =?utf-8?q?BYZI4fdoLGt2I+LAb89Z7EYweeBi1SGe5pjO8tTNJ1pfi40nhHzJMJCZcMOEb9Iwl?= =?utf-8?q?i59sKpP+5HcUDb2HCnpGSkx1wxgaTvT/NmECZg4xWIxniNVJ1hrcP106xcrZou+8B?= =?utf-8?q?vEYrP3MpK/02uZudfVqn5IwMJOtqDFkscIi8TqmUbNfWX1rV3HJD8xM4xtQpts1yO?= =?utf-8?q?8Q6HngfJQV9ofGN/nDojWfX8NRXSVGM/j6z3CiBOqY7mtikD9lC9c9MvhWcSVKnRr?= =?utf-8?q?IQuaF6P+0T9smJifvVz9syBjzRN3uN99t4W3pO8Xfmc2FCkIyOppMfBWFsI+XwXRR?= =?utf-8?q?F3lCtakVWIu/zCTRgOVRf1kiFeDOjt+GB9PYQ7D47m9FLLbpHlEq5AKF6c8nqMxYu?= =?utf-8?q?ouNZv2uCqxuJoLQPpmyamJmNi8WbAEjuZh+zmhHlRopgEJmLXqMKxVOo7PPaa1rnf?= =?utf-8?q?9gdKqr2HxbaI8GRPbPe/paEg8g0N7sPbAjHWx5bCHYr69go1ETPjGUY8XzeHB6lUl?= =?utf-8?q?lER31/9N7BBQ5Uin/zu8s2CurujjX006NxkqmS3LxwEm7PNKnfJubFz5SjPatlZii?= =?utf-8?q?HC8rOmMiVtpfV24OZHzYFCARxtFrWjaSxIOOE5ABX93PnWzLwho6BOu5Q0hkc+3KG?= =?utf-8?q?EfzzwNNbRBjawTyflfHXl4SaN51Kia3endu3wbsQdKv0o+snczUa0FO9WmWQhpHEn?= =?utf-8?q?N5yWcBwJSATCOTciXBrzHcNaaWKw6kttwW4+9MqfGXQhy+5rB01tIv1fLkhTJIhzJ?= =?utf-8?q?zmrK6xNFeluu2/O0sLWl6rmxnDoyzrKUcOWazviBNX1kOHxX0za/BSANlQxXmNy6r?= =?utf-8?q?ahDZmBwF0vV54ZM5eMPCgkO0siRmes4nJBenWLL0uAqzyJMI5DjBELlvFfY8kJnB7?= =?utf-8?q?/kOGFo2th9ipE1/C19FofjrUjvjaVtOgXxjIK8fa5McJGD0eTlLduHmyDOdotUuyA?= =?utf-8?q?/wf/m306nuRNy08ubjkEfxt1vM6ADbiKHTm4Gt9HVtT9lUcqBlHFeElCM87T5+ttC?= =?utf-8?q?4Rjy3Ywe0u4Ynm38ArMCRJtYC43OgvPWBT+IxK31RuV1HbDKtAYM5L3KoCPC4gD+X?= =?utf-8?q?tYWHoEtBSHB79AL9ZJjevdPUrUOmNA3upm6p3gt9kd9Mif9n+LoXoVdMqGAXLTzlM?= =?utf-8?q?mLjdNWOUwv/U2gzCs2IOBBcBHRivgUoA06Ahm8vj//OJzdtEoaqXLATWZn2qGnWV3?= =?utf-8?q?e37txrJjg1oS3tosKnub4CoTrR+w6cJosj+2uZaMQVovknVk4DIysyK+JGTFzgPy8?= =?utf-8?q?D4GuJM5Nby/bYF?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: aca76155-766c-40a0-aa53-08d92c029eaf X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:41.5645 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: LDamgIL2PF4sSCOnC8pjrWYqATClTBUwShXGkXswIMh8LvdgBAwwvVx5E3ZlmCIoV/d/3I8aVzzD2CKpIseMQ+9Ct92TuMVSd0w4O2bpVlA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6280 Received-SPF: pass client-ip=40.107.21.122; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We are going to convert backup_top to full featured public filter, which can be used in separate of backup job. Start from renaming from "how it used" to "what it does". While updating comments in 283 iotest, drop and rephrase also things about ".active", as this field is now dropped, and filter doesn't have "inactive" mode. Note that this change may be considered as incompatible interface change, as backup-top filter format name was visible through query-block and query-named-block-nodes. Still, consider the following reasoning: 1. backup-top was never documented, so if someone depends on format name (for driver that can't be used other than it is automatically inserted on backup job start), it's a kind of "undocumented feature use". So I think we are free to change it. 2. There is a hope, that there is no such users: it's a lot more native to give a good node-name to backup-top filter if need to operate with it somehow, and don't touch format name. 3. Another "incompatible" change in further commit would be moving copy-before-write filter from using backing child to file child. And this is even more reasonable than renaming: for now all public filters are file-child based. So, it's a risky change, but risk seems small and good interface worth it. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/{backup-top.h => copy-before-write.h} | 28 +++--- block/backup.c | 22 ++--- block/{backup-top.c => copy-before-write.c} | 100 ++++++++++---------- MAINTAINERS | 4 +- block/meson.build | 2 +- tests/qemu-iotests/283 | 35 +++---- tests/qemu-iotests/283.out | 4 +- 7 files changed, 95 insertions(+), 100 deletions(-) rename block/{backup-top.h => copy-before-write.h} (56%) rename block/{backup-top.c => copy-before-write.c} (62%) diff --git a/block/backup-top.h b/block/copy-before-write.h similarity index 56% rename from block/backup-top.h rename to block/copy-before-write.h index b28b0031c4..5977b7aa31 100644 --- a/block/backup-top.h +++ b/block/copy-before-write.h @@ -1,10 +1,10 @@ /* - * backup-top filter driver + * copy-before-write filter driver * * The driver performs Copy-Before-Write (CBW) operation: it is injected above * some node, and before each write it copies _old_ data to the target node. * - * Copyright (c) 2018-2019 Virtuozzo International GmbH. + * Copyright (c) 2018-2021 Virtuozzo International GmbH. * * Author: * Sementsov-Ogievskiy Vladimir @@ -23,20 +23,20 @@ * along with this program. If not, see . */ -#ifndef BACKUP_TOP_H -#define BACKUP_TOP_H +#ifndef COPY_BEFORE_WRITE_H +#define COPY_BEFORE_WRITE_H #include "block/block_int.h" #include "block/block-copy.h" -BlockDriverState *bdrv_backup_top_append(BlockDriverState *source, - BlockDriverState *target, - const char *filter_node_name, - uint64_t cluster_size, - BackupPerf *perf, - BdrvRequestFlags write_flags, - BlockCopyState **bcs, - Error **errp); -void bdrv_backup_top_drop(BlockDriverState *bs); +BlockDriverState *bdrv_cbw_append(BlockDriverState *source, + BlockDriverState *target, + const char *filter_node_name, + uint64_t cluster_size, + BackupPerf *perf, + BdrvRequestFlags write_flags, + BlockCopyState **bcs, + Error **errp); +void bdrv_cbw_drop(BlockDriverState *bs); -#endif /* BACKUP_TOP_H */ +#endif /* COPY_BEFORE_WRITE_H */ diff --git a/block/backup.c b/block/backup.c index bd3614ce70..ac91821b08 100644 --- a/block/backup.c +++ b/block/backup.c @@ -27,13 +27,13 @@ #include "qemu/bitmap.h" #include "qemu/error-report.h" -#include "block/backup-top.h" +#include "block/copy-before-write.h" #define BACKUP_CLUSTER_SIZE_DEFAULT (1 << 16) typedef struct BackupBlockJob { BlockJob common; - BlockDriverState *backup_top; + BlockDriverState *cbw; BlockDriverState *source_bs; BlockDriverState *target_bs; @@ -104,7 +104,7 @@ static void backup_clean(Job *job) { BackupBlockJob *s = container_of(job, BackupBlockJob, common.job); block_job_remove_all_bdrv(&s->common); - bdrv_backup_top_drop(s->backup_top); + bdrv_cbw_drop(s->cbw); } void backup_do_checkpoint(BlockJob *job, Error **errp) @@ -408,7 +408,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, BackupBlockJob *job = NULL; int64_t cluster_size; BdrvRequestFlags write_flags; - BlockDriverState *backup_top = NULL; + BlockDriverState *cbw = NULL; BlockCopyState *bcs = NULL; assert(bs); @@ -521,22 +521,22 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, write_flags = (bdrv_chain_contains(target, bs) ? BDRV_REQ_SERIALISING : 0) | (compress ? BDRV_REQ_WRITE_COMPRESSED : 0), - backup_top = bdrv_backup_top_append(bs, target, filter_node_name, + cbw = bdrv_cbw_append(bs, target, filter_node_name, cluster_size, perf, write_flags, &bcs, errp); - if (!backup_top) { + if (!cbw) { goto error; } /* job->len is fixed, so we can't allow resize */ - job = block_job_create(job_id, &backup_job_driver, txn, backup_top, + job = block_job_create(job_id, &backup_job_driver, txn, cbw, 0, BLK_PERM_ALL, speed, creation_flags, cb, opaque, errp); if (!job) { goto error; } - job->backup_top = backup_top; + job->cbw = cbw; job->source_bs = bs; job->target_bs = target; job->on_source_error = on_source_error; @@ -552,7 +552,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, block_copy_set_progress_meter(bcs, &job->common.job.progress); block_copy_set_speed(bcs, speed); - /* Required permissions are already taken by backup-top target */ + /* Required permissions are taken by copy-before-write filter target */ block_job_add_bdrv(&job->common, "target", target, 0, BLK_PERM_ALL, &error_abort); @@ -562,8 +562,8 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, if (sync_bitmap) { bdrv_reclaim_dirty_bitmap(sync_bitmap, NULL); } - if (backup_top) { - bdrv_backup_top_drop(backup_top); + if (cbw) { + bdrv_cbw_drop(cbw); } return NULL; diff --git a/block/backup-top.c b/block/copy-before-write.c similarity index 62% rename from block/backup-top.c rename to block/copy-before-write.c index 425e3778be..0dc5a107cf 100644 --- a/block/backup-top.c +++ b/block/copy-before-write.c @@ -1,10 +1,10 @@ /* - * backup-top filter driver + * copy-before-write filter driver * * The driver performs Copy-Before-Write (CBW) operation: it is injected above * some node, and before each write it copies _old_ data to the target node. * - * Copyright (c) 2018-2019 Virtuozzo International GmbH. + * Copyright (c) 2018-2021 Virtuozzo International GmbH. * * Author: * Sementsov-Ogievskiy Vladimir @@ -32,25 +32,25 @@ #include "block/qdict.h" #include "block/block-copy.h" -#include "block/backup-top.h" +#include "block/copy-before-write.h" -typedef struct BDRVBackupTopState { +typedef struct BDRVCopyBeforeWriteState { BlockCopyState *bcs; BdrvChild *target; int64_t cluster_size; -} BDRVBackupTopState; +} BDRVCopyBeforeWriteState; -static coroutine_fn int backup_top_co_preadv( +static coroutine_fn int cbw_co_preadv( BlockDriverState *bs, uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags) { return bdrv_co_preadv(bs->backing, offset, bytes, qiov, flags); } -static coroutine_fn int backup_top_cbw(BlockDriverState *bs, uint64_t offset, - uint64_t bytes, BdrvRequestFlags flags) +static coroutine_fn int cbw_do_copy_before_write(BlockDriverState *bs, + uint64_t offset, uint64_t bytes, BdrvRequestFlags flags) { - BDRVBackupTopState *s = bs->opaque; + BDRVCopyBeforeWriteState *s = bs->opaque; uint64_t off, end; if (flags & BDRV_REQ_WRITE_UNCHANGED) { @@ -63,10 +63,10 @@ static coroutine_fn int backup_top_cbw(BlockDriverState *bs, uint64_t offset, return block_copy(s->bcs, off, end - off, true); } -static int coroutine_fn backup_top_co_pdiscard(BlockDriverState *bs, - int64_t offset, int bytes) +static int coroutine_fn cbw_co_pdiscard(BlockDriverState *bs, + int64_t offset, int bytes) { - int ret = backup_top_cbw(bs, offset, bytes, 0); + int ret = cbw_do_copy_before_write(bs, offset, bytes, 0); if (ret < 0) { return ret; } @@ -74,10 +74,10 @@ static int coroutine_fn backup_top_co_pdiscard(BlockDriverState *bs, return bdrv_co_pdiscard(bs->backing, offset, bytes); } -static int coroutine_fn backup_top_co_pwrite_zeroes(BlockDriverState *bs, +static int coroutine_fn cbw_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset, int bytes, BdrvRequestFlags flags) { - int ret = backup_top_cbw(bs, offset, bytes, flags); + int ret = cbw_do_copy_before_write(bs, offset, bytes, flags); if (ret < 0) { return ret; } @@ -85,12 +85,12 @@ static int coroutine_fn backup_top_co_pwrite_zeroes(BlockDriverState *bs, return bdrv_co_pwrite_zeroes(bs->backing, offset, bytes, flags); } -static coroutine_fn int backup_top_co_pwritev(BlockDriverState *bs, - uint64_t offset, - uint64_t bytes, - QEMUIOVector *qiov, int flags) +static coroutine_fn int cbw_co_pwritev(BlockDriverState *bs, + uint64_t offset, + uint64_t bytes, + QEMUIOVector *qiov, int flags) { - int ret = backup_top_cbw(bs, offset, bytes, flags); + int ret = cbw_do_copy_before_write(bs, offset, bytes, flags); if (ret < 0) { return ret; } @@ -98,7 +98,7 @@ static coroutine_fn int backup_top_co_pwritev(BlockDriverState *bs, return bdrv_co_pwritev(bs->backing, offset, bytes, qiov, flags); } -static int coroutine_fn backup_top_co_flush(BlockDriverState *bs) +static int coroutine_fn cbw_co_flush(BlockDriverState *bs) { if (!bs->backing) { return 0; @@ -107,7 +107,7 @@ static int coroutine_fn backup_top_co_flush(BlockDriverState *bs) return bdrv_co_flush(bs->backing->bs); } -static void backup_top_refresh_filename(BlockDriverState *bs) +static void cbw_refresh_filename(BlockDriverState *bs) { if (bs->backing == NULL) { /* @@ -120,11 +120,11 @@ static void backup_top_refresh_filename(BlockDriverState *bs) bs->backing->bs->filename); } -static void backup_top_child_perm(BlockDriverState *bs, BdrvChild *c, - BdrvChildRole role, - BlockReopenQueue *reopen_queue, - uint64_t perm, uint64_t shared, - uint64_t *nperm, uint64_t *nshared) +static void cbw_child_perm(BlockDriverState *bs, BdrvChild *c, + BdrvChildRole role, + BlockReopenQueue *reopen_queue, + uint64_t perm, uint64_t shared, + uint64_t *nperm, uint64_t *nshared) { if (!(role & BDRV_CHILD_FILTERED)) { /* @@ -149,41 +149,41 @@ static void backup_top_child_perm(BlockDriverState *bs, BdrvChild *c, } } -BlockDriver bdrv_backup_top_filter = { - .format_name = "backup-top", - .instance_size = sizeof(BDRVBackupTopState), +BlockDriver bdrv_cbw_filter = { + .format_name = "copy-before-write", + .instance_size = sizeof(BDRVCopyBeforeWriteState), - .bdrv_co_preadv = backup_top_co_preadv, - .bdrv_co_pwritev = backup_top_co_pwritev, - .bdrv_co_pwrite_zeroes = backup_top_co_pwrite_zeroes, - .bdrv_co_pdiscard = backup_top_co_pdiscard, - .bdrv_co_flush = backup_top_co_flush, + .bdrv_co_preadv = cbw_co_preadv, + .bdrv_co_pwritev = cbw_co_pwritev, + .bdrv_co_pwrite_zeroes = cbw_co_pwrite_zeroes, + .bdrv_co_pdiscard = cbw_co_pdiscard, + .bdrv_co_flush = cbw_co_flush, - .bdrv_refresh_filename = backup_top_refresh_filename, + .bdrv_refresh_filename = cbw_refresh_filename, - .bdrv_child_perm = backup_top_child_perm, + .bdrv_child_perm = cbw_child_perm, .is_filter = true, }; -BlockDriverState *bdrv_backup_top_append(BlockDriverState *source, - BlockDriverState *target, - const char *filter_node_name, - uint64_t cluster_size, - BackupPerf *perf, - BdrvRequestFlags write_flags, - BlockCopyState **bcs, - Error **errp) +BlockDriverState *bdrv_cbw_append(BlockDriverState *source, + BlockDriverState *target, + const char *filter_node_name, + uint64_t cluster_size, + BackupPerf *perf, + BdrvRequestFlags write_flags, + BlockCopyState **bcs, + Error **errp) { ERRP_GUARD(); int ret; - BDRVBackupTopState *state; + BDRVCopyBeforeWriteState *state; BlockDriverState *top; bool appended = false; assert(source->total_sectors == target->total_sectors); - top = bdrv_new_open_driver(&bdrv_backup_top_filter, filter_node_name, + top = bdrv_new_open_driver(&bdrv_cbw_filter, filter_node_name, BDRV_O_RDWR, errp); if (!top) { return NULL; @@ -210,7 +210,7 @@ BlockDriverState *bdrv_backup_top_append(BlockDriverState *source, ret = bdrv_append(top, source, errp); if (ret < 0) { - error_prepend(errp, "Cannot append backup-top filter: "); + error_prepend(errp, "Cannot append copy-before-write filter: "); goto fail; } appended = true; @@ -231,7 +231,7 @@ BlockDriverState *bdrv_backup_top_append(BlockDriverState *source, fail: if (appended) { - bdrv_backup_top_drop(top); + bdrv_cbw_drop(top); } else { bdrv_unref(top); } @@ -241,9 +241,9 @@ fail: return NULL; } -void bdrv_backup_top_drop(BlockDriverState *bs) +void bdrv_cbw_drop(BlockDriverState *bs) { - BDRVBackupTopState *s = bs->opaque; + BDRVCopyBeforeWriteState *s = bs->opaque; bdrv_drop_filter(bs, &error_abort); diff --git a/MAINTAINERS b/MAINTAINERS index 7d9cd29042..68aab7a220 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2291,8 +2291,8 @@ F: block/mirror.c F: qapi/job.json F: block/block-copy.c F: include/block/block-copy.c -F: block/backup-top.h -F: block/backup-top.c +F: block/copy-before-write.h +F: block/copy-before-write.c F: include/block/aio_task.h F: block/aio_task.c F: util/qemu-co-shared-resource.c diff --git a/block/meson.build b/block/meson.build index 01861e1545..d33b4f249b 100644 --- a/block/meson.build +++ b/block/meson.build @@ -4,7 +4,7 @@ block_ss.add(files( 'aio_task.c', 'amend.c', 'backup.c', - 'backup-top.c', + 'copy-before-write.c', 'blkdebug.c', 'blklogwrites.c', 'blkverify.c', diff --git a/tests/qemu-iotests/283 b/tests/qemu-iotests/283 index 010c22f0a2..a09e0183ae 100755 --- a/tests/qemu-iotests/283 +++ b/tests/qemu-iotests/283 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # group: auto quick # -# Test for backup-top filter permission activation failure +# Test for copy-before-write filter permission conflict # # Copyright (c) 2019 Virtuozzo International GmbH. # @@ -31,13 +31,13 @@ size = 1024 * 1024 """ Test description When performing a backup, all writes on the source subtree must go through the -backup-top filter so it can copy all data to the target before it is changed. -backup-top filter is appended above source node, to achieve this thing, so all -parents of source node are handled. A configuration with side parents of source -sub-tree with write permission is unsupported (we'd have append several -backup-top filter like nodes to handle such parents). The test create an -example of such configuration and checks that a backup is then not allowed -(blockdev-backup command should fail). +copy-before-write filter so it can copy all data to the target before it is +changed. copy-before-write filter is appended above source node, to achieve +this thing, so all parents of source node are handled. A configuration with +side parents of source sub-tree with write permission is unsupported (we'd have +append several copy-before-write filter like nodes to handle such parents). The +test create an example of such configuration and checks that a backup is then +not allowed (blockdev-backup command should fail). The configuration: @@ -57,11 +57,10 @@ The configuration: │ base │ ◀──────────── │ other │ └─────────────┘ └───────┘ -On activation (see .active field of backup-top state in block/backup-top.c), -backup-top is going to unshare write permission on its source child. Write -unsharing will be propagated to the "source->base" link and will conflict with -other node write permission. So permission update will fail and backup job will -not be started. +copy-before-write filter wants to unshare write permission on its source child. +Write unsharing will be propagated to the "source->base" link and will conflict +with other node write permission. So permission update will fail and backup job +will not be started. Note, that the only thing which prevents backup of running on such configuration is default permission propagation scheme. It may be altered by @@ -99,13 +98,9 @@ vm.qmp_log('blockdev-backup', sync='full', device='source', target='target') vm.shutdown() -print('\n=== backup-top should be gone after job-finalize ===\n') +print('\n=== copy-before-write filter should be gone after job-finalize ===\n') -# Check that the backup-top node is gone after job-finalize. -# -# During finalization, the node becomes inactive and can no longer -# function. If it is still present, new parents might be attached, and -# there would be no meaningful way to handle their I/O requests. +# Check that the copy-before-write node is gone after job-finalize. vm = iotests.VM() vm.launch() @@ -131,7 +126,7 @@ vm.qmp_log('blockdev-backup', vm.event_wait('BLOCK_JOB_PENDING', 5.0) -# The backup-top filter should still be present prior to finalization +# The copy-before-write filter should still be present prior to finalization assert vm.node_info('backup-filter') is not None vm.qmp_log('job-finalize', id='backup') diff --git a/tests/qemu-iotests/283.out b/tests/qemu-iotests/283.out index c6e12b15c5..f2b7219632 100644 --- a/tests/qemu-iotests/283.out +++ b/tests/qemu-iotests/283.out @@ -5,9 +5,9 @@ {"execute": "blockdev-add", "arguments": {"driver": "blkdebug", "image": "base", "node-name": "other", "take-child-perms": ["write"]}} {"return": {}} {"execute": "blockdev-backup", "arguments": {"device": "source", "sync": "full", "target": "target"}} -{"error": {"class": "GenericError", "desc": "Cannot append backup-top filter: Permission conflict on node 'base': permissions 'write' are both required by node 'other' (uses node 'base' as 'image' child) and unshared by node 'source' (uses node 'base' as 'image' child)."}} +{"error": {"class": "GenericError", "desc": "Cannot append copy-before-write filter: Permission conflict on node 'base': permissions 'write' are both required by node 'other' (uses node 'base' as 'image' child) and unshared by node 'source' (uses node 'base' as 'image' child)."}} -=== backup-top should be gone after job-finalize === +=== copy-before-write filter should be gone after job-finalize === {"execute": "blockdev-add", "arguments": {"driver": "null-co", "node-name": "source"}} {"return": {}} From patchwork Thu Jun 10 11:25:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312751 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D906C47094 for ; Thu, 10 Jun 2021 11:33:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B991C613F1 for ; Thu, 10 Jun 2021 11:33:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B991C613F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrIwN-0006TQ-Sn for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:33:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpq-0003TE-OO; Thu, 10 Jun 2021 07:26:54 -0400 Received: from mail-vi1eur05on2122.outbound.protection.outlook.com ([40.107.21.122]:49376 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpo-0004NZ-Du; Thu, 10 Jun 2021 07:26:54 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A+1Tb0d9UXERdB90ypAJctoLas73pKUNp6iDB4dNFGX+OsnBIgzu7nWeGh0h6Ftqt9LnYIasZC0EGrcf83c/a6VhbG1pkPIBuJYFsdHb1KSjPwNJhqPUe3tX3hL8H38dxpTL+yQEzGUUUX5LGN0w1gJTPsBIKEY28O1m37vxqJafORURJ2jzdz+lEVmo45++EEfdb2cdUoNcn5o1bD5hzFxaNkquv2ZeeJuDTeXeM9KHM5Hgkjc8T6sZAIllDJLEYDcC89AEh9WDCzRRjN9R7+hfUxnCHZkhfJvEWa5ynmWdrnkBB7q3Z4dOccKIbhIeH/Xquz/eXhXhsS6vGOW7tQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rHoTvnykitucvYJIcFD+cBcXCIaLWhU7kSNlyjEqdr4=; b=OH6asy1FosZrjVB0s0zLS5lTkuLSr1N5pihpAwhWw3LuIE3wH8ovfSn0Xbnh8s1jx3z/5PTWn0Uvgw8no3MOUCu9etKyttxdGYWQXe/EP1VbaimhNG+zc2TkGHM4kFdR+pW+JkLJ2+yTA5fXebymR+Z9Bj5GJsIjb0N4jBusrh7whR1R/0rJAApnPZiwWAlu2L8nack9IV+dKbMW8MIaRGTdNyh5XBx7J2MRIRKz10qLpCadKqXoG8vEfpgKXuMJqMrzayZ48Mhaz9vvyPxomx1XA4UJ/UYfuLSNABZxzNO34LUhoow+/SqA0BrDdmKVDhj6EflF17XghlxaMDpoRA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rHoTvnykitucvYJIcFD+cBcXCIaLWhU7kSNlyjEqdr4=; b=rOykTMde4aKibM8jgBnQXycs0wZPTmre4kn1qQcm6bjG+TEpDs+6zVl2ZjlRO55Qc4xmCKoQpXZM+bIudjsw0w2zPBfw+B+KOj1SCD+mfHgzEm7JvlHMMLLm4pftRMZ6OD6CrCxGdLilNrrmN3Q7zdIM60f8SWtInHtbSaJhKq4= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6280.eurprd08.prod.outlook.com (2603:10a6:20b:29b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Thu, 10 Jun 2021 11:26:42 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:42 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 08/35] block-copy: always set BDRV_REQ_SERIALISING flag Date: Thu, 10 Jun 2021 14:25:51 +0300 Message-Id: <20210610112618.127378-9-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:41 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9cfad9c9-d47e-437a-45be-08d92c029f5a X-MS-TrafficTypeDiagnostic: AS8PR08MB6280: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2niSGdG066nfdT490nGzyNBCW0ad1uVoFdOSnFTQTh6EYZ/Ub6SD3W1dlPMa0dCcyZJwPqNXqdfh3oThPPRjWWOSEfi2hPEIepmFVKSrORS17TPE57S3em2RazHjNFL4bfAEKDm9eJ+VJdFUI7GdmHANnfZTwErnfba8vojx6EOOv270Ew6rOZ2+FJmt53dU/zAb6O4kzwqWpvFWTAECORnXrtrdFIFL8A5N+b7TRnXamvl/ecB8eVlGBQOX+sea7a+ugRwqrybggk52OwQmIIqBcrxyQR6qs5PgCk2JBFLAuz9OuHMz1TwPwMp1/jctyV1FFQNAXhQd0h002ETvVVFyaxgacZdjfnhE5wivsNeOiy0GBMVFUyXAbUiN+AC2f+xVJj/CCwFUNEUdaRDQ/eVYOIGF9pgszGpCmm3HA37RR0LW8M4so9NUFAVMHAAs9j6pYNJSitq8hYmN8dLD+Q7iAbWvRvXzC0slkJ+P2p0tOMLLcwSPK3TB37YtanUvdiQ+jI4VPqfhyu+RBBI85yaxwHxHkAVigFWE3g2YEabogvUUhJgDriiOnnIfJnYfDFvmYP+f/6E35UvRISz6J1IKipzyDHltaUMFSWtCi3qfqTS+LBGGE4fnIgf5rNEPsogYDlkkhbFB9tMjGWk5GVjm4TNCEPuaUQCLj8LFgxa0APouzUq0nhXG/0MtNoN6 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39840400004)(396003)(376002)(136003)(346002)(366004)(186003)(26005)(86362001)(36756003)(6666004)(1076003)(8936002)(4326008)(6506007)(6916009)(8676002)(16526019)(6512007)(52116002)(38350700002)(478600001)(38100700002)(66556008)(2616005)(316002)(66946007)(2906002)(6486002)(83380400001)(5660300002)(66476007)(956004)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: F+5rH7UDvBKe9XcE6Eq84zMz8IR3FMntfToKfiSObTSKSvhZVnjCo+dgjXebb3ma9NhMboc8Aw7662NGdNlBAtW3mEzCDtFBSCzz8qSGcZ4wN1ThYfTRbCCe8FcXHM5bAH57uPilHsnll4fz2my3fiGO9Mx3mebZr6MMNOz7zOZXISTJyBqKQmXC5fA4Q2nxkkCZLui9FxZyNHzVtHy6ZhX/8nHBOsKfHfGAcMyAPXJkv4i225b2UfFm+z5K0xREDkgzPmeWiceKjgkuyv+jnCgCMPbvu0i9V3QEf6K37F8BalfINbIWyxoFPZa/9yzquUTtcHMbz77zjxcP77K3muvDZ1HMaQaHbIw0l0y26SPzhVPeNCCsGlIudB/b154jAPlkIv2YHEfTFOYRo11tsobu+fLKzyoKHOcwJo3+vAdZahmeVCrkmpmdS0603CM52KVIjhZRlSLT5vnyN9FPGmBpj+XAk4BPrCbJzSRHLVfhBQRnRFdviCrZvu3ycilf8XIEgiztu6vPTY39A2n1BP/hFcy16rM7VUJW2mdMjgxmn99K8SwBg96OBZsodMH4V9zC1jdhAXMeVU6o8s608Pye5gTLmOTDSeF4rJbj4zZgjpEeQhR1p8cQKrqzNe/mHO43ar7QURQ0c/y11r3kI4XMIhSJXQ+CGkaK4pT4M/trUR7r223cghGnY8q6fjnLUyOn34574O9sOdmcGm7OBHfWYmX+y2UJ7keXePs41xIRw9z+MRYCcq4cmdI+tBtEKoR1ngqYWfXdwflviHMLT7AiM+8aWWl9ksxdhntBEcvhozEWMJ1ftminmg6FHFt2zqFG9xK5qIiLrBmpEW50Ai4kyf8hRjxV5uxWUeLH0twe0WghestwoNoTiZ5b3dpADMz15/C3D7KHUD4RyqU1gXMzSa/5sxb4bJ8Bk8Hpa+y9Jf5WUtQwyELJdMXiZdwuLBIeF7OqGWfVqndSBSqMEUhU5aHXNRGekHI7sXmnYjuKCXW8OwOc3HbP7F+6pu3JlYfgHw9shUQCzpG4tK1+op/fT75YpIhdQJP3H2YYbZrCx3IUdZHhHvLwkBR7gwQ1sf0+9R4NXXeUv3ExxZNQNpNLKV48eK6IFeaol/9lb1y/QFrtn5epXrQ2we44n5uFG9kcAtSe0Oo0lM+FYpK+Uyon4xFVpY3pxUhfNW8ZUG/xY1rzWJY3EuJ9bVg23wTJpKrwobkyaxjR2v4W+r512nxTEj2fDJMCaXa8ecm54gpX1C1g7oWrZNekdRkSgaS8cpVfn7ZqhH6O7DIkcBgLIXkcAJ+3MM/Hat+rfjn0iaaud6tbULqc8l+vWNoetEQB X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9cfad9c9-d47e-437a-45be-08d92c029f5a X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:42.6199 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Xa7YLmWUf64XTdSuEGeUWGJjMFf8vjgpToYjrT1/zsuYORHAbEXMkLzrJAKm+suQ3KoZH2IBH+5ZISUgz5hF08ctXAWOer6Zlze2m04fQeY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6280 Received-SPF: pass client-ip=40.107.21.122; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" It won't hurt in common case, so let's not bother with detecting image fleecing. Also, we want to simplify initialization interface of copy-before-write filter as we are going to make it public. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/copy-before-write.h | 2 +- include/block/block-copy.h | 3 +-- block/backup.c | 21 +-------------------- block/block-copy.c | 29 ++++++++++++++++++++++++++--- block/copy-before-write.c | 4 ++-- 5 files changed, 31 insertions(+), 28 deletions(-) diff --git a/block/copy-before-write.h b/block/copy-before-write.h index 5977b7aa31..f37e2249ae 100644 --- a/block/copy-before-write.h +++ b/block/copy-before-write.h @@ -34,7 +34,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, const char *filter_node_name, uint64_t cluster_size, BackupPerf *perf, - BdrvRequestFlags write_flags, + bool compress, BlockCopyState **bcs, Error **errp); void bdrv_cbw_drop(BlockDriverState *bs); diff --git a/include/block/block-copy.h b/include/block/block-copy.h index 338f2ea7fd..c013a20e1e 100644 --- a/include/block/block-copy.h +++ b/include/block/block-copy.h @@ -24,8 +24,7 @@ typedef struct BlockCopyCallState BlockCopyCallState; BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target, int64_t cluster_size, bool use_copy_range, - BdrvRequestFlags write_flags, - Error **errp); + bool compress, Error **errp); void block_copy_set_progress_meter(BlockCopyState *s, ProgressMeter *pm); diff --git a/block/backup.c b/block/backup.c index ac91821b08..84f9a5f02c 100644 --- a/block/backup.c +++ b/block/backup.c @@ -407,7 +407,6 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, int64_t len, target_len; BackupBlockJob *job = NULL; int64_t cluster_size; - BdrvRequestFlags write_flags; BlockDriverState *cbw = NULL; BlockCopyState *bcs = NULL; @@ -504,26 +503,8 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, goto error; } - /* - * If source is in backing chain of target assume that target is going to be - * used for "image fleecing", i.e. it should represent a kind of snapshot of - * source at backup-start point in time. And target is going to be read by - * somebody (for example, used as NBD export) during backup job. - * - * In this case, we need to add BDRV_REQ_SERIALISING write flag to avoid - * intersection of backup writes and third party reads from target, - * otherwise reading from target we may occasionally read already updated by - * guest data. - * - * For more information see commit f8d59dfb40bb and test - * tests/qemu-iotests/222 - */ - write_flags = (bdrv_chain_contains(target, bs) ? BDRV_REQ_SERIALISING : 0) | - (compress ? BDRV_REQ_WRITE_COMPRESSED : 0), - cbw = bdrv_cbw_append(bs, target, filter_node_name, - cluster_size, perf, - write_flags, &bcs, errp); + cluster_size, perf, compress, &bcs, errp); if (!cbw) { goto error; } diff --git a/block/block-copy.c b/block/block-copy.c index 5808cfe657..22a7c64c10 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -247,7 +247,7 @@ static uint32_t block_copy_max_transfer(BdrvChild *source, BdrvChild *target) BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target, int64_t cluster_size, bool use_copy_range, - BdrvRequestFlags write_flags, Error **errp) + bool compress, Error **errp) { BlockCopyState *s; BdrvDirtyBitmap *copy_bitmap; @@ -259,6 +259,28 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target, } bdrv_disable_dirty_bitmap(copy_bitmap); + /* + * Why we always set BDRV_REQ_SERIALISING write flag: + * + * Assume source is in backing chain of target assume that target is going + * to be used for "image fleecing", i.e. it should represent a kind of + * snapshot of source at backup-start point in time. And target is going to + * be read by somebody (for example, used as NBD export) during backup job. + * + * In this case, we need to add BDRV_REQ_SERIALISING write flag to avoid + * intersection of backup writes and third party reads from target, + * otherwise reading from target we may occasionally read already updated by + * guest data. + * + * For more information see commit f8d59dfb40bb and test + * tests/qemu-iotests/222 + * + * Other cases? The only known reasonable case is "just copy to target, and + * target is not used for something else". In this case BDRV_REQ_SERIALISING + * change nothing, so let's not bother with detecting the "image fleecing" + * case and enabling BDRV_REQ_SERIALISING only for it. + */ + s = g_new(BlockCopyState, 1); *s = (BlockCopyState) { .source = source, @@ -266,7 +288,8 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target, .copy_bitmap = copy_bitmap, .cluster_size = cluster_size, .len = bdrv_dirty_bitmap_size(copy_bitmap), - .write_flags = write_flags, + .write_flags = BDRV_REQ_SERIALISING | + (compress ? BDRV_REQ_WRITE_COMPRESSED : 0), .mem = shres_create(BLOCK_COPY_MAX_MEM), }; @@ -279,7 +302,7 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target, */ s->use_copy_range = false; s->copy_size = cluster_size; - } else if (write_flags & BDRV_REQ_WRITE_COMPRESSED) { + } else if (compress) { /* Compression supports only cluster-size writes and no copy-range. */ s->use_copy_range = false; s->copy_size = cluster_size; diff --git a/block/copy-before-write.c b/block/copy-before-write.c index 0dc5a107cf..4337076c1c 100644 --- a/block/copy-before-write.c +++ b/block/copy-before-write.c @@ -171,7 +171,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, const char *filter_node_name, uint64_t cluster_size, BackupPerf *perf, - BdrvRequestFlags write_flags, + bool compress, BlockCopyState **bcs, Error **errp) { @@ -218,7 +218,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, state->cluster_size = cluster_size; state->bcs = block_copy_state_new(top->backing, state->target, cluster_size, perf->use_copy_range, - write_flags, errp); + compress, errp); if (!state->bcs) { error_prepend(errp, "Cannot create block-copy-state: "); goto fail; From patchwork Thu Jun 10 11:25:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312875 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C012C47094 for ; Thu, 10 Jun 2021 11:39:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EB3DF613FE for ; Thu, 10 Jun 2021 11:39:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EB3DF613FE Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJ23-00013b-50 for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:39:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58996) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpt-0003f8-Bq; Thu, 10 Jun 2021 07:26:57 -0400 Received: from mail-vi1eur05on2122.outbound.protection.outlook.com ([40.107.21.122]:49376 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpr-0004NZ-Cd; Thu, 10 Jun 2021 07:26:57 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DDpSCQ6LzCLgTiVHAuNq7j7qSEZGtlDvrDKJpoZVGLCjCeQ2zCYHa+oUu5szXon/6oNa3r/+jVIfDG+y0kJ3FebKPGFljl3DmBMOr6cAL2Z7iIoV1QjIgfUbVODKU0pT6iXpvXDEuHSSpZkahd4XJ4TMza3yIbYwWHouPtDbSu9wVFWd0V5hrXfRmCQxG0VvOWoou/HpqS6adAjAWviHfJJ4QVV6+cVVy2XHZnn1udUSvcK6byDQb8yVHEYFX6hfGWSEqF1GffIJfU6WshYKhDOwcGXA2STT9Qm1GEWSle6A9gcL2RQJrUU0IsJOhhweO4HWCcpqQcMH2Q/QGsnfBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jDvvfdk+qNZ/K0NLMJ1t2U6awdk74v/hZzY5n8Jf9Fc=; b=n6zi1zJ++9WdVrgNMxQf7jL4bz0nNs/BfEtMMCqprdGVFEr1m3N4xv34RFegiz4BBVjNk1L0E0tgFBCGkhUu9s+oQn6ykO/GNQqgCBxxxFuq9YISgpnCpm/oD+ncMNXZ//C1ETsPXmKbueZRtajco7a/C675+2yvyFzyXWNtoGk+yeCgMIjteOPX5IUIrjtgsJRmiTG9LZGQVDCRJwi/yW6lWP0Fu/oWHahDQ1/hyGuxUKL/AJlAnWaNc13cVo5tLkDAWxtIwBocAEOH+W4Kht+bvipSLzpNXKsCbqiANyJqKC7QJqRxABUAJG0bPs1Z3v7yCudy3nqbts44Hk5y4w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jDvvfdk+qNZ/K0NLMJ1t2U6awdk74v/hZzY5n8Jf9Fc=; b=WZvsIWDRh1T5o4ywaUk0d1GSKBCtjwtITimhjTHXo4ICjiEAj2uWc3+ODFG5qmeZ9Sq+Zf1TlSNpaWb504NdFSCuEqQugzg081sPkMI025GagOfAln8ZY9E9X+nC6Tzo3lQvs1ZUKIInnyBnAHMOC3jxOV/6PE+XC6DF5E3VmNc= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6280.eurprd08.prod.outlook.com (2603:10a6:20b:29b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Thu, 10 Jun 2021 11:26:43 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:43 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 09/35] block/block-copy: introduce block_copy_set_copy_opts() Date: Thu, 10 Jun 2021 14:25:52 +0300 Message-Id: <20210610112618.127378-10-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e7cf7f4f-3628-44d8-5552-08d92c029ff9 X-MS-TrafficTypeDiagnostic: AS8PR08MB6280: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:85; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nkPqsmBfdrQXqyxX5mXZ4Zwn4IemOMluR4L4IAfq/98oj/rJosAuw80Lqe9DB6+Is74MYZiZPMQJY26KyutFP7zQhGVzWFEWzm5s+ZjYAQXpHqf9FuiqT4PE+zZ6PPrW4JRam6ztx1tgalDLRxE/OwU8a6B+QSTSY2I3enCu77s3QXVfNhkVDSlxb3J4yaqf8FRJmJrZqLxxnjvd+L2cRnrlW0tc5MSunNsiW6DFK5gAh8wnLgv0Nb55dHLzSVp7GuqV/bU4NBpSjQCsC5/m34+Lo7rn95xYLDif6CcjAe0M6Eoq3Ib7vD7I6r5HQbpB5TQ+SAx2cS9tjFg8pI1rWLi+7Zsj82DgTIyA9ATij+2piQaz9jxtbTZ1AIrri+AsDopCzEANOZH9LMuPZhbUIGQ0iug7wr0fk9LVcnbfU8NzW6pP/ZhqOFDlr52eAiGldKMZsGdibpHwtDeH/lIgbHXPhTR8pRmga8EuRbjCaP8EvitOTPzVXx+0TggB4x85YuhA/uh0KiGyyBLeBA3tQcOpU2ox/aJbl5+r5TwaKmrOuKTefapvXIf06IPCXPTE9pHTAdIQnHa2+roWEm70Up0AOCti8gCrzLX7A49LIxDIeF5v3NHZE/KkufhTbxsRzWLpFGfP0fnlc3Q2811tmaG4QmUM1xlRIuOOFhIczo5igl108NRjfU7MLErBkvf0 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39840400004)(396003)(376002)(136003)(346002)(366004)(186003)(26005)(86362001)(36756003)(6666004)(1076003)(8936002)(4326008)(6506007)(6916009)(8676002)(16526019)(6512007)(52116002)(38350700002)(478600001)(38100700002)(66556008)(2616005)(316002)(66946007)(2906002)(6486002)(83380400001)(5660300002)(66476007)(956004)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: bgeIxEgmqKem69McZnaCG1Jk3l0gvbJoxLJfT7aQzY1wSl/X8oJx6+JovVwiiX2ehUbySCWCYAAr5ZgzrpielEu7NHIgFsWvkcLRka0TLVrgxknhGUAAJvuBMenmRtpUjXIMDxA+MP1J36c0mPzAzknY0IMk9dHt7YqRlqAn2Kfsbm0JE5KgolMnIQYwbBJCNX+7sMeQzYJokCkco1lG3guJ+eydDTZFbohWdPmgFJuPBl4G/aL/gBxGhFgcHczQ+axket/mavV/2A8D1SEka2INuSAxyj2veswDidQoj8TnIyuLlcKxgpFzqVMt1Sf4PewHIMxfqG1v1QOoirgQTm6K4HdfZe/P+NAXbCE6RWRJcOx8FdiExOP/4SMXike8naqhWIx76cYX179ME3TBmnjM2p41IJdt4WGp+SOm2phWomdwTLNOYcUKZZQq37E5+/DYKb1uxRiCbkMXwK5xkES13HjBmVGVf5TCoaFw5LKe8Hvqgt+ns1pJRScegmqC98ql9uTeiuyhxCLzPb8keimcH8ius2hmgJ/x+1ZHSVXVqKe5aQgdXgBehR8g5vZbKeZMfeQLzW+CM8nKS33eV/DSVe1shk0drD4LaAtFmsUbw1cLv+4KDzbzwGrf+VtSuXPxRg1Uav4nY5326cAdiTh7GF9EqsUzGOKMA8ZOlgZv6u7I0bwAKaipv4gHJ7pH+nck2h2BatFfOajyM9qsrwytG1r+dtTrpWJNblvHou5GuFt/B2JGdc+tJemxg5IhfK4QOf57taNcsEZxb2KpMKNfTNENfLf23RL1beJtvhRegM9M1N1/UjevZsKIUOI2sgwlozqDdptnV81VfjBTlotddQ+YmMo2gBLYoKJxO6sXQrfuojVbKMZnDxdF2vW8P5JnOGMb6lrR90sTDFcL67f48kqfT6trXACjwpNPLq7HhoqQkS7mkyW6cWlOfRrqYsL11g22s+Ca3k4kmKZ9TP7wf2SJMFmwj/1883Db3TlNnDLSFZABTLqkydGONQjVQZ8r0WTKr8eTQZuuoPAFjBl6GaYj606XOsO4+5frgX88iCfxEnPHgf1768f0P34MrahduI4k1JItb5h8+rloRqicUvEMeaBUQqDfq/JE3ZK8500LSFWhSYBr5Oa1DhOlbpa/Kv+bKdZXTHewJhSowHlud90fJTljg6V6WUYnwDlR4dxgXIk+ERBdwGRywNmDhMT+eoCMk/RDMyc8oFid3NIotm4gTJJcNUnb3h9CQtBc3btx3JWl9yIYIIeEBEGCxaKfsUOykNwj0cCRNkYxZdaRgHsyjp/FkVvEj2RBbu8uoV9LjIcKdMwM+Kx5GjGN X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7cf7f4f-3628-44d8-5552-08d92c029ff9 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:43.6135 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: s7uLNQG+oPswaAJrqn4GyzrjsrL0j3efIlOV70pPGiA7zCBDz3jg/DaAkJFSXaF1GS5zqQxsIMAfKeLiN5hLGIiqKPbSmGafF3AMC9D6cwY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6280 Received-SPF: pass client-ip=40.107.21.122; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We'll need a possibility to set compress and use_copy_range options after initialization of the state. So make corresponding part of block_copy_state_new() separate and public. Signed-off-by: Vladimir Sementsov-Ogievskiy --- include/block/block-copy.h | 2 ++ block/block-copy.c | 56 ++++++++++++++++++++++---------------- 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/include/block/block-copy.h b/include/block/block-copy.h index c013a20e1e..b74fb80067 100644 --- a/include/block/block-copy.h +++ b/include/block/block-copy.h @@ -26,6 +26,8 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target, int64_t cluster_size, bool use_copy_range, bool compress, Error **errp); +void block_copy_set_copy_opts(BlockCopyState *s, bool use_copy_range, + bool compress); void block_copy_set_progress_meter(BlockCopyState *s, ProgressMeter *pm); void block_copy_state_free(BlockCopyState *s); diff --git a/block/block-copy.c b/block/block-copy.c index 22a7c64c10..8baf8b9403 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -245,6 +245,37 @@ static uint32_t block_copy_max_transfer(BdrvChild *source, BdrvChild *target) target->bs->bl.max_transfer)); } +/* Function should be called prior any actual copy request */ +void block_copy_set_copy_opts(BlockCopyState *s, bool use_copy_range, + bool compress) +{ + if (compress) { + s->write_flags |= BDRV_REQ_WRITE_COMPRESSED; + } + + if (block_copy_max_transfer(s->source, s->target) < s->cluster_size) { + /* + * copy_range does not respect max_transfer. We don't want to bother + * with requests smaller than block-copy cluster size, so fallback to + * buffered copying (read and write respect max_transfer on their + * behalf). + */ + s->use_copy_range = false; + s->copy_size = s->cluster_size; + } else if (compress) { + /* Compression supports only cluster-size writes and no copy-range. */ + s->use_copy_range = false; + s->copy_size = s->cluster_size; + } else { + /* + * We enable copy-range, but keep small copy_size, until first + * successful copy_range (look at block_copy_do_copy). + */ + s->use_copy_range = use_copy_range; + s->copy_size = MAX(s->cluster_size, BLOCK_COPY_MAX_BUFFER); + } +} + BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target, int64_t cluster_size, bool use_copy_range, bool compress, Error **errp) @@ -288,32 +319,11 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target, .copy_bitmap = copy_bitmap, .cluster_size = cluster_size, .len = bdrv_dirty_bitmap_size(copy_bitmap), - .write_flags = BDRV_REQ_SERIALISING | - (compress ? BDRV_REQ_WRITE_COMPRESSED : 0), + .write_flags = BDRV_REQ_SERIALISING, .mem = shres_create(BLOCK_COPY_MAX_MEM), }; - if (block_copy_max_transfer(source, target) < cluster_size) { - /* - * copy_range does not respect max_transfer. We don't want to bother - * with requests smaller than block-copy cluster size, so fallback to - * buffered copying (read and write respect max_transfer on their - * behalf). - */ - s->use_copy_range = false; - s->copy_size = cluster_size; - } else if (compress) { - /* Compression supports only cluster-size writes and no copy-range. */ - s->use_copy_range = false; - s->copy_size = cluster_size; - } else { - /* - * We enable copy-range, but keep small copy_size, until first - * successful copy_range (look at block_copy_do_copy). - */ - s->use_copy_range = use_copy_range; - s->copy_size = MAX(s->cluster_size, BLOCK_COPY_MAX_BUFFER); - } + block_copy_set_copy_opts(s, use_copy_range, compress); ratelimit_init(&s->rate_limit); QLIST_INIT(&s->tasks); From patchwork Thu Jun 10 11:25:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312879 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A78BC47094 for ; Thu, 10 Jun 2021 11:41:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C7B42613F1 for ; Thu, 10 Jun 2021 11:41:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C7B42613F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJ3e-00041X-MC for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:41:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpl-00037v-LV; Thu, 10 Jun 2021 07:26:49 -0400 Received: from mail-eopbgr40097.outbound.protection.outlook.com ([40.107.4.97]:58455 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpj-0004QC-HA; Thu, 10 Jun 2021 07:26:49 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hzpoo5iwx/XMSMmCMNz/uYItedstommGSPQTXnTifbg6EdD/d9L6Ub9Rp1D39ZLbYBZX4dYjIgxlUNcgAgWLRNndmYHT7gtBGTodYY7mkrNaqqYMdAZiIW31B3H8bmqFK59rCYS08r2nysYLFGjBH8lAfxvjK7hk8+Nx2ehxaW+pjcMxyroQlVgfPXi0huTVM5dor61OCAecgC/5qJPAbkdsHKHwousiM4nUnydWb4jM59FedVm2ogDJwHAtLCqGWL8BKhDJom1NDphxmbhHilhwUoKSS8kghITrtSbhBNs+O07AZMctiCNb+tiMqI/Xz/c5xWzAt3RQ0Ln11YNiHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GcDmkRP6T7exeOjoWL2xQA2aYy/2vOsfdDVeTK8LJ8w=; b=X3ygWCCFGg/6JiyCpku+O6/XG+8QviJxX6iRX3Hxk7AwVL97auLT2csMiHofLFsT/W21AvVOBcIq1uf7Rr+APNGMm8cQYP7bjXbV6RA3y4ed3Hw5MdN50FOlI47CDvPO/oqQESQvkvMwKSeqWD7JRS44xhUt3AMuNGgZmsRfRy+KZ0iDfAvA8Fe4QfjWwMmWiHTMF4A3rtY2w+l1c1ZJqjiaclGX2SxBAzDlNjcF1XlxVpUZe+i/qIDd3KCYgs1scUpfLR+EQDylfDS4ycUlODBr4odlmLTThtYfwnXEE6tzrs3rWCRZrBo1qivNXjb9xGQJoCeSnvR7KRhMLJSdDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GcDmkRP6T7exeOjoWL2xQA2aYy/2vOsfdDVeTK8LJ8w=; b=G9BHBNAxdjxK0WkQU7I8+JDPWJHg/UTyNXSWwNk/E/LVIIhs7oDpU0FnaKQ4H5YYlLMpSscYjW0aFgX5SXjzsejmaSjhtNvXw1hU46F8FJ3A0TehLIazxx3zxvoSkEtKlq3FYD2fjD3ysDk111o823IU4OeK7QDICwclmvHf3Eo= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3381.eurprd08.prod.outlook.com (2603:10a6:20b:43::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Thu, 10 Jun 2021 11:26:44 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:44 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 10/35] block/backup: set copy_range and compress after filter insertion Date: Thu, 10 Jun 2021 14:25:53 +0300 Message-Id: <20210610112618.127378-11-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:43 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 42e57b2a-35eb-4659-8b5f-08d92c02a08c X-MS-TrafficTypeDiagnostic: AM6PR08MB3381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ucpGSTYd+DZsEkLwlsE/PixKoR+ePmPBypQ19MAfo/xkPFBfgZJZQihukdEiremKBC9CMpfVr37MXwsGX2DDgwzhZQiylvwSnHrXYRgDHxqna6pIW5785e5Q91nk85rwScAnD9VrSxGrClpm4BroGfky40HJXVW0AtbMqaRgpPTHNI67UPWAXZYAoXwCSRx5sUwGrDML7nuS4bhXEAXwuqbPe8c310myZ0RYlGusUE1UclTNMWpkoNJvrDjEnfgK9BR31MhJxJa6G+QVkae2xBAPHxRj/oBk1q/zn5kUioLmTcTPIU+qO/p3lIrWn1pXTaQ299amIQTbdWBoUUmm1vAtQLTYJyW8uoS5YuUoyrF/TzjkWpcHP3COKAMWEsser1JpIjK3tZ6RIal/wps5dOxa27ucZ0s5ofpmg7H1zaC0YMD5XP1yT4ka7U2s34V/ZNHZMe0z+Ao8Xyxf7kcySpFW88E++6C2No0qFC4XL0SMlGW94G85RHty7moak8XTHjxwI1sM18LNYwtgkhf/9fiIQNmrZnS6kqyVDnFWcZKA+ICVENMvGfJD2rzKqGQFx56SJIG3moQsut5oCVS1HlgLs55pGYqr3nZKCkCwA+ybKxK7mb0H3xGbsxhQtnmwSh6gMGZNNcjyIJZdd5zsSRpkRjcmHtulCIR+vB1vR8c8THL9qBxnTNmKr5PgKiVn X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(39840400004)(136003)(376002)(346002)(2616005)(66476007)(83380400001)(956004)(8676002)(8936002)(38100700002)(6666004)(66946007)(1076003)(5660300002)(66556008)(316002)(26005)(4326008)(6512007)(478600001)(6486002)(186003)(2906002)(52116002)(38350700002)(6916009)(6506007)(36756003)(16526019)(86362001)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: w++LNqw2UGAQxGNaMSTpHLlyPuO8nytlW/Y5B5jKFasN9ABxi+/NnvOdWjHjRc6RxvUcVuquHEQ6T6POYIyLIw7gSWM+knFTZ/oxVqo3e6DajQERY5qR87/aaMbRY6pZyiN0HKRuMe0OL/fdM+F+Tq5Ad9cewk3BOle+M6GIT3NZht5Eox2xbl9Y2JPB70o5WSpM2pr6BPkysCOvtN1py7/Tce6j0+GZiFg5UF2v476pzG8uGDbNWG1h41jQjNEDi4mQ/SuzVHuLYJJNjY3PgKIZqA0c8Kxkt7UEHmSE/pZ8t2eGhu7pihp6agvDOD9J01yuP/xnVAQnfRE72NwvzWGp80hSNBZnHWeMrZr22Dvt78h2cXBJGskxkeTEAXgfsGcBJyI/PCnePp/9HlHZl+NXLZn0y+ADYvUlLDTeObXw6oB+Lspr/xbdl/sA/ZgXx7ZILU08QViLF8cYE3zqlZDB5A/ytN6kPaMLRcKF0TdeY3a5LaGkJ5jZW9cEocEwT3tFywm6f+wYeCJVxd2CHUEePr5s+MiQYaMin7AdSUPNXz4vb1scPCfbTsu5l50V3p0BxNl07Hkhm3qqmoePCKpIA1t7qpbdyy+cnAsQcQyIyuSXTmNXWKGdQhx1Tm1UNBrsiVI26UTagMe7y/bPgNt8kQGrjng1tQ+l9JfM8Xut8fYLCTbaOgtO9bwJcDZJMx9JjerAmK4+/luIBNl2gn/EjfqOnYzZwjirT/O4RXtcOupwa+6yQoUS/bdfcb+Zt9cBcIL5UuQrGIZkqY89YiTeUK1awIdvFSE1ql1bgmnrqHN/JQPPpeNfDFL74fuNTDiFOhKC7KkUCEK6Kp2Bz8mTYjzN/ReqV1woy2FMH6YXjokbw8s+ZNv5QcG/8lS9lOBwg68KlklnriV5dZOikxTEdV6lH7dUP6CJba58rJ2mJz6zGgZP/vPyxi0Wym6payDuLilF8C19n8Sk8AlGwOllJJgV1j2FWseY4j5bG6lSVGLN8iRzznmsY5jXnqh3WJgjnmSoWyROuNJ3oJNXvkruSpYTZno5/7agANllbCqNQj5jOhqhVfvuhNtLZ20XkUBJSbEvx4MWGJMRXKEIbmyuA4ccUqmGdNp1rWG1W2NGi2VdQJ4YzXUHq/N6bTA2bMC2ouSmlfCObdFN3xFLPmNV6bNkV/zwPKEesbvsSRFT4Vlqso8HSfHCXtjSgJjKLnNv8aWMllF8WHNmV8y7YVVRn180PLtBVKtYz1p/xZBZm16qQtCwVYYFuFMc2ZmJ4U/vT4WVAD113KGZwH+cpu+VbfARekkzlMnLwQ6wym1Ou+M1ApWtRl65z2AN7qxS X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 42e57b2a-35eb-4659-8b5f-08d92c02a08c X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:44.6201 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QrWROFkK9sWE9cTgxTrAnkmgQYYabdlbHG0MH1QdzPU+jXQhi7AMS78aahW1l+/fCIYVjhV5DLPSXO7thl33p0Rhp7JpPB5dVlcDiKDZV5g= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3381 Received-SPF: pass client-ip=40.107.4.97; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We are going to publish copy-before-write filter, so it would be initialized through options. Still we don't want to publish compress and copy-range options, as 1. Modern way to enable compression is to use compress filter. 2. For copy-range it's unclean how to make proper interface: - it's has experimental prefix for backup job anyway - the whole BackupPerf structure doesn't make sense for the filter So, let's just add copy-range possibility to the filter later if needed. Still, we are going to continue support for compression and experimental copy-range in backup job. So, set these options after filter creation. Note, that we can drop "compress" argument of bdrv_cbw_append() now, as well as "perf". The only reason not doing so is that now, when I prepare this patch the big series around it is already reviewed and I want to avoid extra rebase conflicts to simplify review of the following version. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/copy-before-write.h | 1 - block/backup.c | 3 ++- block/copy-before-write.c | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/block/copy-before-write.h b/block/copy-before-write.h index f37e2249ae..538aab8bdb 100644 --- a/block/copy-before-write.h +++ b/block/copy-before-write.h @@ -33,7 +33,6 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, BlockDriverState *target, const char *filter_node_name, uint64_t cluster_size, - BackupPerf *perf, bool compress, BlockCopyState **bcs, Error **errp); diff --git a/block/backup.c b/block/backup.c index 84f9a5f02c..b31fd99ab3 100644 --- a/block/backup.c +++ b/block/backup.c @@ -504,7 +504,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, } cbw = bdrv_cbw_append(bs, target, filter_node_name, - cluster_size, perf, compress, &bcs, errp); + cluster_size, false, &bcs, errp); if (!cbw) { goto error; } @@ -530,6 +530,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, job->len = len; job->perf = *perf; + block_copy_set_copy_opts(bcs, perf->use_copy_range, compress); block_copy_set_progress_meter(bcs, &job->common.job.progress); block_copy_set_speed(bcs, speed); diff --git a/block/copy-before-write.c b/block/copy-before-write.c index 4337076c1c..235251a640 100644 --- a/block/copy-before-write.c +++ b/block/copy-before-write.c @@ -170,7 +170,6 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, BlockDriverState *target, const char *filter_node_name, uint64_t cluster_size, - BackupPerf *perf, bool compress, BlockCopyState **bcs, Error **errp) @@ -217,8 +216,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, state->cluster_size = cluster_size; state->bcs = block_copy_state_new(top->backing, state->target, - cluster_size, perf->use_copy_range, - compress, errp); + cluster_size, false, compress, errp); if (!state->bcs) { error_prepend(errp, "Cannot create block-copy-state: "); goto fail; From patchwork Thu Jun 10 11:25:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312877 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D64C1C47094 for ; Thu, 10 Jun 2021 11:40:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 49B9F613DE for ; Thu, 10 Jun 2021 11:40:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 49B9F613DE Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJ3J-0002w7-F5 for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:40:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpp-0003LQ-2F; Thu, 10 Jun 2021 07:26:53 -0400 Received: from mail-eopbgr40097.outbound.protection.outlook.com ([40.107.4.97]:58455 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpm-0004QC-9h; Thu, 10 Jun 2021 07:26:52 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UYRuZ72k27BcaWb2LjtoeYGH07ieaPFUjL6UBDfIZVF/0K5pOU8z3Eoey/AGu9A1WAS7jXMAyVTXTJQwF/yjlgQAw3pyyF+Nw0WO21TuB0wBvK3GHUgY9mIrGxWF6oW5yuiBJow6VMRswos6fvYgvLAt7PIj7u3eUUICcdLER2b9UkLazpYhTzMyoUUg5+1qE0nJQwA1OM8kiGuD9EtlC+7+xEzsanX0XyoyzhSy0K4qEvC4WVa6gYZnYF2ccjLHeFU07zMlBGzLDWIOSfXMfrRRUgTbXH39zz4hiU3tIqldjGTZuLVEBfnU4srfmdAmLRXv+y/Uh4oEFjoEwiNl4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=snuZrJ4K7ugYjwrH9/gsziimm4n01+9FkrKglHOGwIA=; b=aCFlN0md+0t75ZXiu/+LcQ/TlsmixMkGAJdmbSKQtUmxAP/yM96zjiYkOCE7BWhUg02Qs0p3q+EZ8XPqyxhnh3pXmnQk6iE90DMZoMcApvjox35/Lzsh+/0qGvtlf1LN5cujEcaTu0JH24EWK4zRM4Nlvy4ELEEy73drsAbKM9yB3x6N12ofmgVN2PXsPmbnGo0/O6sKyu2BFOKXvhuHkt7+R4uTMg+9rfnWg3iwNpvqY8W72nZQtgaIdSl0XbUaubKeTbxFj5xOLrmDTgFOEBm3irC0gatEeAmWi5zB1Vh+L88ph9ct+hlKyIjBqo1oQ7X2KM6tkE7TNR48ehLzVw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=snuZrJ4K7ugYjwrH9/gsziimm4n01+9FkrKglHOGwIA=; b=AF6cWBc4VSiBJSm7XNiWz8ah8dtMtUwR4fNX3MvMfSmqTxnINTKzxoW5mNBtPpzShg91r037fiNzVdxdIKNZS2J/8SbJlHv6JgH5bw20haxBssYh7d9MVde1nZ3NV3o8Uch7cNjqpMGNQ+myiDKTVCNTzKcTXSBPDfbadbVvQ4Y= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3381.eurprd08.prod.outlook.com (2603:10a6:20b:43::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Thu, 10 Jun 2021 11:26:45 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:45 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 11/35] block/backup: move cluster size calculation to block-copy Date: Thu, 10 Jun 2021 14:25:54 +0300 Message-Id: <20210610112618.127378-12-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b74e4603-b434-4298-cbb5-08d92c02a12e X-MS-TrafficTypeDiagnostic: AM6PR08MB3381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:88; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YlK0wM7ZSZzYrU6mFDWhZ3uFxAFE2Py1O+tdALchU7+vMh7s50420M1Y+2iJaNs1kiAyCl3lllKeXMQhmf84CRg+YyYH4G2kNlxuaw/KsLdcKIWgDuL6zjaD31dHEchyqE8MUZZjjxre7qBwpccvUikuYKFGiWAr4wkQAq3sZw2Nc1Y8A3gRTPrD46I+l7SnvOq9NeVwTFrS0qAstZZdd5l7yQzp3ehOmMnFM+FTXnAZ1YpPsk9DY6SIZ9M668AknCkoGa+mXwnY5OyO9swL1sxxPBnwSf2hCKcPkmxcnvaTXQkvRwQhrhJuCSAi680Wktp/wNMyci01/mf+vkVVRTFMqTpgAIroFPMWfgekZppYhV7X9mZaI1UBTpBglA1UcPY8Z2vv+tJ25kDcynuHjSJIEY5l1sxF8aQrQ/lt8tm8BDr22HY5r7DnKtzNh0bCp5IeRBwbngkCNLhajfXi9ylP/ZoprVYpfwgInG5tjYeRhekGT/m7zxt5eGAJQ+SLawlwiQY0W0SKA7yYng9dZXq4M6LyWIeO3NGeLBlXccSKAPNvUJmppH7sUVypcbYzODA9qp1wJ8bHeienSqcszXQtLby8Sv0VpyYC9XC9s/PSOqxn9lEZSz5ahfaHiJlKg9zpiWjCkbGBcwnfFvYem+9G8SbJJkV5u3NgjYJ0x7epg4KqJmeGoMw/R5sKiu5x X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(39840400004)(136003)(376002)(346002)(2616005)(66476007)(83380400001)(956004)(8676002)(8936002)(38100700002)(6666004)(66946007)(1076003)(5660300002)(66556008)(316002)(26005)(4326008)(6512007)(478600001)(6486002)(186003)(2906002)(52116002)(38350700002)(6916009)(6506007)(36756003)(16526019)(86362001)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: i/iB5hjQkkXb2WdDX+WkEXWIYnTlW+JRPjaU0yA1TsmUpj5L0OnlEt4uW/YSUBHPu6ZLXV0W9w2Ey2/6/7Ry0HdieOgE9IlnjHEkCF/k/cT+AgfwHr0aMfh0bbgf5Y9wB1xMqRUdGRfX4EWBeXVzRez053XX41PWWOTp4UoC0jcoEQCwkQgnpGVbFJ4NB4v0eyrNqHxlx6kD6oZoOhcwkUoeynMcM/lukiSAdV51vt1hpqus7JUPru3SosInkoFPxMCM9ZOd2INMis1pGEeNsV1E915tjZM8UwZFnm1sexj8lpD/QaviGw9NQEipSMl6ytAIPVplOt3OLKxgnAnvWVaFRVs85yO+2lnCt54ytV3B/p99SsQViIBQ/7DsolQhVLuJ02An/Et/esGyANTFDUlAFbFNCGOHOVCvQSEDP3rc8G46F7LPcyqZMeanwSV40A/4kyoO1PhsP/M5T0uYoX2l5fpu3YSFy8RmUxZczeUbCalJaeDORt+fKpx9zpr3+n1WOqld7xF6f2BsddwMQpz6AnV3ywwm2EcDObn+qxCptu7iyNaUTZkR024AGzHOIfj8JtapvtfeJpE41b1yv86vYQoZbCD7eEXDdBLMV3L1xziwax60Hd4VASW/2njrNufcw5MGLV7TmkcET4NoxlxdfFUo4nIubKpoHbMQpHrCK6/2+yib+Pn/YMgkGZOs1zBMM4CFetVzCyTxtGwfCK42NaRIZtcqJV9STRBCZ7eKenaxBipsi+N0grlI6bI8iWMZK0f8V7aozwzRxwz06xYSnfY8QQwU9FesLKU4zISR9WgIrOWiFOm6UTOI0GyGQNlgfkMuT1xhhFPPGyz44CbQrq7h2j+3giQuir746g/GCw6CeqC5L4l0Qeiel4u5VVlBMNGB/RiVtLPHZXtXP34bojK0FFgfL/SQ6wySfl2K4WJKLar5WuSmeICOhjFaPv7hbnfKFIamPo9D1O0HMg5T8KdTyVOWaOxNnG1Y0KTmLaWGIu5X5xzoiHvLoXnlTHUgaDuuhLTO2M1dJNuuK9nkPXEUxEIkYD3hZHtWCJtNCx5oJb4/iDw89N8j4n1j09rY9W2els/GSWg++DmLaK+k5tuwojo4v6601jaxFL/L+DV0yb116ZUFX/PB+2kAKrtRgrRunM5Xt/1TEo/zKOXx5I3vjUOyaEX4oYU0XqT91w3WJ8zKA+tnwsTDGpcNJFOnPC/Rl996E+7PFYLDOl37CPpi7NbFSF34aoaHZZsmoged7tsNTRZ764oztIZY2n5ovcNBcNfE8wQgMCMbqdKqiD516wZWgxljLZdUO4mw0275MDCs6rSZYuiO/+Hu X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: b74e4603-b434-4298-cbb5-08d92c02a12e X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:45.7392 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PdCqxk2mkodozdllpcwiBDabQdzSCAkmw817IiQbf9tfyjIJf6Js3NpH6dMR+EXZog5ca46NVkdrgdjz7ZVL8gcmH3xhmpXKSyzx+eS7xF8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3381 Received-SPF: pass client-ip=40.107.4.97; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The main consumer of cluster-size is block-copy. Let's calculate it here instead of passing through backup-top. We are going to publish copy-before-write filter soon, so it will be created through options. But we don't want for now to make explicit option for cluster-size, let's continue to calculate it automatically. So, now is the time to get rid of cluster_size argument for bdrv_cbw_append(). Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/copy-before-write.h | 1 - include/block/block-copy.h | 5 +-- block/backup.c | 62 ++++++-------------------------------- block/block-copy.c | 51 ++++++++++++++++++++++++++++++- block/copy-before-write.c | 10 +++--- 5 files changed, 66 insertions(+), 63 deletions(-) diff --git a/block/copy-before-write.h b/block/copy-before-write.h index 538aab8bdb..b386fd8f01 100644 --- a/block/copy-before-write.h +++ b/block/copy-before-write.h @@ -32,7 +32,6 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, BlockDriverState *target, const char *filter_node_name, - uint64_t cluster_size, bool compress, BlockCopyState **bcs, Error **errp); diff --git a/include/block/block-copy.h b/include/block/block-copy.h index b74fb80067..e81cd952f7 100644 --- a/include/block/block-copy.h +++ b/include/block/block-copy.h @@ -23,8 +23,8 @@ typedef struct BlockCopyState BlockCopyState; typedef struct BlockCopyCallState BlockCopyCallState; BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target, - int64_t cluster_size, bool use_copy_range, - bool compress, Error **errp); + bool use_copy_range, bool compress, + Error **errp); void block_copy_set_copy_opts(BlockCopyState *s, bool use_copy_range, bool compress); @@ -88,6 +88,7 @@ void block_copy_kick(BlockCopyCallState *call_state); void block_copy_call_cancel(BlockCopyCallState *call_state); BdrvDirtyBitmap *block_copy_dirty_bitmap(BlockCopyState *s); +int64_t block_copy_cluster_size(BlockCopyState *s); void block_copy_set_skip_unallocated(BlockCopyState *s, bool skip); #endif /* BLOCK_COPY_H */ diff --git a/block/backup.c b/block/backup.c index b31fd99ab3..83516297cb 100644 --- a/block/backup.c +++ b/block/backup.c @@ -29,8 +29,6 @@ #include "block/copy-before-write.h" -#define BACKUP_CLUSTER_SIZE_DEFAULT (1 << 16) - typedef struct BackupBlockJob { BlockJob common; BlockDriverState *cbw; @@ -354,43 +352,6 @@ static const BlockJobDriver backup_job_driver = { .set_speed = backup_set_speed, }; -static int64_t backup_calculate_cluster_size(BlockDriverState *target, - Error **errp) -{ - int ret; - BlockDriverInfo bdi; - bool target_does_cow = bdrv_backing_chain_next(target); - - /* - * If there is no backing file on the target, we cannot rely on COW if our - * backup cluster size is smaller than the target cluster size. Even for - * targets with a backing file, try to avoid COW if possible. - */ - ret = bdrv_get_info(target, &bdi); - if (ret == -ENOTSUP && !target_does_cow) { - /* Cluster size is not defined */ - warn_report("The target block device doesn't provide " - "information about the block size and it doesn't have a " - "backing file. The default block size of %u bytes is " - "used. If the actual block size of the target exceeds " - "this default, the backup may be unusable", - BACKUP_CLUSTER_SIZE_DEFAULT); - return BACKUP_CLUSTER_SIZE_DEFAULT; - } else if (ret < 0 && !target_does_cow) { - error_setg_errno(errp, -ret, - "Couldn't determine the cluster size of the target image, " - "which has no backing file"); - error_append_hint(errp, - "Aborting, since this may create an unusable destination image\n"); - return ret; - } else if (ret < 0 && target_does_cow) { - /* Not fatal; just trudge on ahead. */ - return BACKUP_CLUSTER_SIZE_DEFAULT; - } - - return MAX(BACKUP_CLUSTER_SIZE_DEFAULT, bdi.cluster_size); -} - BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, BlockDriverState *target, int64_t speed, MirrorSyncMode sync_mode, BdrvDirtyBitmap *sync_bitmap, @@ -448,11 +409,6 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, return NULL; } - cluster_size = backup_calculate_cluster_size(target, errp); - if (cluster_size < 0) { - goto error; - } - if (perf->max_workers < 1) { error_setg(errp, "max-workers must be greater than zero"); return NULL; @@ -464,13 +420,6 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, return NULL; } - if (perf->max_chunk && perf->max_chunk < cluster_size) { - error_setg(errp, "Required max-chunk (%" PRIi64 ") is less than backup " - "cluster size (%" PRIi64 ")", perf->max_chunk, cluster_size); - return NULL; - } - - if (sync_bitmap) { /* If we need to write to this bitmap, check that we can: */ if (bitmap_mode != BITMAP_SYNC_MODE_NEVER && @@ -503,12 +452,19 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, goto error; } - cbw = bdrv_cbw_append(bs, target, filter_node_name, - cluster_size, false, &bcs, errp); + cbw = bdrv_cbw_append(bs, target, filter_node_name, false, &bcs, errp); if (!cbw) { goto error; } + cluster_size = block_copy_cluster_size(bcs); + + if (perf->max_chunk && perf->max_chunk < cluster_size) { + error_setg(errp, "Required max-chunk (%" PRIi64 ") is less than backup " + "cluster size (%" PRIi64 ")", perf->max_chunk, cluster_size); + goto error; + } + /* job->len is fixed, so we can't allow resize */ job = block_job_create(job_id, &backup_job_driver, txn, cbw, 0, BLK_PERM_ALL, diff --git a/block/block-copy.c b/block/block-copy.c index 8baf8b9403..774f5029bb 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -27,6 +27,7 @@ #define BLOCK_COPY_MAX_MEM (128 * MiB) #define BLOCK_COPY_MAX_WORKERS 64 #define BLOCK_COPY_SLICE_TIME 100000000ULL /* ns */ +#define BLOCK_COPY_CLUSTER_SIZE_DEFAULT (1 << 16) static coroutine_fn int block_copy_task_entry(AioTask *task); @@ -276,13 +277,56 @@ void block_copy_set_copy_opts(BlockCopyState *s, bool use_copy_range, } } +static int64_t block_copy_calculate_cluster_size(BlockDriverState *target, + Error **errp) +{ + int ret; + BlockDriverInfo bdi; + bool target_does_cow = bdrv_backing_chain_next(target); + + /* + * If there is no backing file on the target, we cannot rely on COW if our + * backup cluster size is smaller than the target cluster size. Even for + * targets with a backing file, try to avoid COW if possible. + */ + ret = bdrv_get_info(target, &bdi); + if (ret == -ENOTSUP && !target_does_cow) { + /* Cluster size is not defined */ + warn_report("The target block device doesn't provide " + "information about the block size and it doesn't have a " + "backing file. The default block size of %u bytes is " + "used. If the actual block size of the target exceeds " + "this default, the backup may be unusable", + BLOCK_COPY_CLUSTER_SIZE_DEFAULT); + return BLOCK_COPY_CLUSTER_SIZE_DEFAULT; + } else if (ret < 0 && !target_does_cow) { + error_setg_errno(errp, -ret, + "Couldn't determine the cluster size of the target image, " + "which has no backing file"); + error_append_hint(errp, + "Aborting, since this may create an unusable destination image\n"); + return ret; + } else if (ret < 0 && target_does_cow) { + /* Not fatal; just trudge on ahead. */ + return BLOCK_COPY_CLUSTER_SIZE_DEFAULT; + } + + return MAX(BLOCK_COPY_CLUSTER_SIZE_DEFAULT, bdi.cluster_size); +} + BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target, - int64_t cluster_size, bool use_copy_range, + bool use_copy_range, bool compress, Error **errp) { BlockCopyState *s; + int64_t cluster_size; BdrvDirtyBitmap *copy_bitmap; + cluster_size = block_copy_calculate_cluster_size(target->bs, errp); + if (cluster_size < 0) { + return NULL; + } + copy_bitmap = bdrv_create_dirty_bitmap(source->bs, cluster_size, NULL, errp); if (!copy_bitmap) { @@ -879,6 +923,11 @@ BdrvDirtyBitmap *block_copy_dirty_bitmap(BlockCopyState *s) return s->copy_bitmap; } +int64_t block_copy_cluster_size(BlockCopyState *s) +{ + return s->cluster_size; +} + void block_copy_set_skip_unallocated(BlockCopyState *s, bool skip) { s->skip_unallocated = skip; diff --git a/block/copy-before-write.c b/block/copy-before-write.c index 235251a640..a7996d54db 100644 --- a/block/copy-before-write.c +++ b/block/copy-before-write.c @@ -37,7 +37,6 @@ typedef struct BDRVCopyBeforeWriteState { BlockCopyState *bcs; BdrvChild *target; - int64_t cluster_size; } BDRVCopyBeforeWriteState; static coroutine_fn int cbw_co_preadv( @@ -52,13 +51,14 @@ static coroutine_fn int cbw_do_copy_before_write(BlockDriverState *bs, { BDRVCopyBeforeWriteState *s = bs->opaque; uint64_t off, end; + int64_t cluster_size = block_copy_cluster_size(s->bcs); if (flags & BDRV_REQ_WRITE_UNCHANGED) { return 0; } - off = QEMU_ALIGN_DOWN(offset, s->cluster_size); - end = QEMU_ALIGN_UP(offset + bytes, s->cluster_size); + off = QEMU_ALIGN_DOWN(offset, cluster_size); + end = QEMU_ALIGN_UP(offset + bytes, cluster_size); return block_copy(s->bcs, off, end - off, true); } @@ -169,7 +169,6 @@ BlockDriver bdrv_cbw_filter = { BlockDriverState *bdrv_cbw_append(BlockDriverState *source, BlockDriverState *target, const char *filter_node_name, - uint64_t cluster_size, bool compress, BlockCopyState **bcs, Error **errp) @@ -214,9 +213,8 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, } appended = true; - state->cluster_size = cluster_size; state->bcs = block_copy_state_new(top->backing, state->target, - cluster_size, false, compress, errp); + false, compress, errp); if (!state->bcs) { error_prepend(errp, "Cannot create block-copy-state: "); goto fail; From patchwork Thu Jun 10 11:25:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312759 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AAFCEC47094 for ; Thu, 10 Jun 2021 11:36:36 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4320D61375 for ; Thu, 10 Jun 2021 11:36:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4320D61375 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrIzD-0003oU-7g for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:36:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpr-0003Wu-J0; Thu, 10 Jun 2021 07:26:55 -0400 Received: from mail-eopbgr40097.outbound.protection.outlook.com ([40.107.4.97]:58455 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpp-0004QC-Lx; Thu, 10 Jun 2021 07:26:55 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KUesjANlpc+r0kFPlXNV4bjo8VgeMSx+zcM11NlDgS+y6QiVxQjM711ZEKKW1aFmrWzyA8uCAxQaFcYqLg37JBtSiekXtsRf6jZnkWdf0bPRkkw6VMYcpqWfaIBi+iBQMYbaxaPYin+6ztqMXbKfJMb+aN1qwq+tppMa2UaJknW9H/K3DrghbrjzS4zEBDaZGR/l8ce3Kxc16chNe37RoVlp2UgQRFbpx0FjX+fKwlLZ5oWP8JVfv+PQtv5sp8ZIrribWNXT1puil6MJ6YS/XByCj3HkxbgNcyqkWyXcJKNa79/PUSW6+zZRQpfS78dTm+e3aXMxV6LsCChzaxGwNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bInQE/uHeOJXFSRvTK95+xxJ8i89selJqzUmDfHwl4k=; b=HzSKPleeECPdMj8scd63KFJJDf+UqeoQQMTz3641H3wQj0BuNJNPDJn0LePg1D043tT2c03PXWgyO6ileHdRPOrbCX1ZbDK+I5FS0t2+dz/pOmn0p2LZmvpH7ZYwCfTz0h9VODPgTW/wijUPtgArJT4G/hx4K3Q+x/Mgqlw03df8N25KTvRz2Fe3trdn5iUYicCuPs91rUGoIvpwxhF471eItq7zmLKFbzErch94burLY3eXFhI/bw4+Bf6AP9ZFHIKDiSqjm8tgVkKcApjn8hI1RDmIMHtq+TDEnDmnDIlBam+jk8bLmnFNbCCIwP2aWvLuN/jfpbjyUv3f8Jl/iw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bInQE/uHeOJXFSRvTK95+xxJ8i89selJqzUmDfHwl4k=; b=Obr1stsFNnmLEkone/I1wBgo9/HYPYweQFmYyOir1ZqEdRUMQtBKauylCXXsfvWVSEi6ggbeBv8N4Z1RojVzTMN72eOTL0KJ44jA3LGTopxd3v7oEPf59TJFC8j4LBZVH/qN4yxfPv71ggioXhZC9EnKaFRw4x9lg+2pqp3/cUI= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3381.eurprd08.prod.outlook.com (2603:10a6:20b:43::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Thu, 10 Jun 2021 11:26:46 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:46 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 12/35] block/copy-before-write: relax permission requirements when no parents Date: Thu, 10 Jun 2021 14:25:55 +0300 Message-Id: <20210610112618.127378-13-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7aa12c79-63d1-4b69-9e2e-08d92c02a1da X-MS-TrafficTypeDiagnostic: AM6PR08MB3381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EtEp/49Mlc8tkUqKZRVDXTFtiw//Cvu9/7F0N5tEDJ/vfp7RV9ieiSK3dqrBtg1GIrHv3jzdUzwpuFSu2De0BTVwaSiOUrgEXaDPmBjoSCYm59+mc9DdT0HaPqtmaWdv98hJt4wZ+NfqJpNbQBiXZ52wZgTZzP0NJUjKKEV7YM8eaElrQBBm4rED96eelAz2XutELspGGPW/lu5fKDicXsglVukcb95f3t/iHhZ8Eo7KzFHtFW4g/uAPdKZxf+YUOmZXfM3IJcskodZlElwCjDZRhbevj+TuS9oimIlaGnzHAGL7NQWSAmJaSL7dRkyIedug+7EHs995iL5OpQPkKp/n7ahQgyM9Vl7HuF61B+qkFhhhZVdIwgwinzgZLh84gTqqgiI1CyakQn3IW7M0p8s9Q5rZGGFcEwqOjTnZQQO47DyFHeHEFOHHx3CSF51eP1BqmRsgbD9s7U7GjUMS8ij7yi4aVMALQfC8AknnJMs8N8sM4zti8YlB4KruRPdFUkGamawoZoLmuF2WvcI2V7Y0Zij9cP21DfVobqTqTaC46nx4unMt5RhvIXHDYBCw4RrdTnL0Hm0pA4omnrWfhRyHKrmT0/DW6RKY4K+zp5eFRUtUXL1t/KR2UWUgkH1ozn8et7dI6lu1B7TE8eS5+nW/EW6PmBUZ4zDQwvBRsH4nqCAn/a1tbKuwa3HWtsP2 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(39840400004)(136003)(376002)(346002)(2616005)(66476007)(83380400001)(956004)(8676002)(8936002)(38100700002)(6666004)(66946007)(1076003)(5660300002)(66556008)(316002)(26005)(4326008)(6512007)(478600001)(6486002)(186003)(2906002)(52116002)(38350700002)(6916009)(6506007)(36756003)(16526019)(86362001)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: Q3yuBp7f+k3hz3JCmCqieFHSWarE1VunYTHcFUls1VsEJWTx0U/4tIuEVafzwraZzAwR5MKFR2UxoLb+X2ACnXoyBVtkXRBDbugWx0Ra6u/Tzl5AhHfcxbdeANQaU3z195UWW69WgVWYc0ayMN9fjkKK1KTsRJJSQi29ixi5Dxdr2mvuTwumNL4L7NyFiHlaD4fuY4zwXXu0eBtKmTPcaWayuCBR8al2gBFc7gVngWWBAce9hxjn1X2y5n7RfJS7lM6nObko+EjV1nqps6ckaeygaZmnCTqnqSJqUM7md/BMlP0eTbaA8NStksyJUovqS5xbDr2CFIMTRvZXxr0Tatz3+m6SSGvytDMpOq9myWTk91S1206IsGB/xEXTeogiQSzI/9l2TUm1KeGqERSQG1sApSjekIMp4vtsr4fgps067UG46OW2MRRftF20URW8RthDK323JINsiv/KViHMxVo7FqyByvj2HMqitCy0+Xf51hEDVLj2MVXNEJPg3df9NL7PR/jEj3cC+XSAEEyimpjHbddzrvEyHxFT0ILIddKIBNvjMS4Pd9mPItXQ5dCpgMTcjfB/ef05KQc4IxdTqGybgbczU6QwNMFdonCaUZV0hUbq+58KivvB1R3rraYG0O6oMYr+PVMY2Bl7U4AmjfhT0LhfA6jGoObJ6VxBNivu/DpIMtnUsdOt2Uuh0SwdWo42r2VEmDy6jGNBN7eMP1NMgOL3jqI7y8yWe27+4T+in/jCDHWyJTR1pSTHynUjdHpaX/m5Vdd9/plfEUaZSb3lKckvEQWtlVxGxewDGUDFwbm7GCAFELncitjtK60yfgn/P8aBiKiA61PxjhOejedDRG2NEysTnhD0VL30LDpLGTlxK8+TZ+/Q7NKeZata3RGl8+jRjGN+Fww8VOlpzAfrNvgRrmv+tIIPsc6cxNrXleuYUYDIFYWZmm/txvqMlEOncrwWbLWFdUmO8DaMSQME0sPRkBtezLBANvgNwObdGQNXeI3k+g9r8KJRM5W+u07mL5hvzeDbjFZ3fLKxpiohajf0ZT344L7YVjqWbgiUXRTHOhJcYhk09wD8rPWVPXZzG5pIuZZlmsXwAD4dKpDkiP0ZGkpCWNMkwmmsW9IbTBryDUHi69bEwTPlGkV5wBp34lbCMUkAs62V7Js5EnJCyIuvl3hmQSig4UAZGfGbEkJLEuY85RUwzcgO+Dji9kXBahlU7z5HUPXQKyHNaLbYMwsPegi1o9eBYeEgXKUnmCHp7MZ1eUb7uqMc7y2y2MFf/SaE2fbFXfoymHXvIwxOYGqtPS8Y/EUughsU04UMSSjCOnH/s/wDlXgg/wRt X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7aa12c79-63d1-4b69-9e2e-08d92c02a1da X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:46.8045 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: zd/GNrGlWnVkptiD7dvLQficsh2LShvj5N8bnWb5zMjyig0Xr1IHL0mbLvAz33iq2/7m0pHxGbsM5LEz3ytYRIWjcoC+gMQJsUK7Wyf3bwU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3381 Received-SPF: pass client-ip=40.107.4.97; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We are going to publish copy-before-write filter. So, user should be able to create it with blockdev-add first, specifying both filtered and target children. And then do blockdev-reopen, to actually insert the filter where needed. Currently, filter unshares write permission unconditionally on source node. It's good, but it will not allow to do blockdev-add. So, let's relax restrictions when filter doesn't have any parent. Test output is modified, as now permission conflict happens only when job creates a blk parent for filter node. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/copy-before-write.c | 8 +++++--- tests/qemu-iotests/283.out | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/block/copy-before-write.c b/block/copy-before-write.c index a7996d54db..2a51cc64e4 100644 --- a/block/copy-before-write.c +++ b/block/copy-before-write.c @@ -142,10 +142,12 @@ static void cbw_child_perm(BlockDriverState *bs, BdrvChild *c, bdrv_default_perms(bs, c, role, reopen_queue, perm, shared, nperm, nshared); - if (perm & BLK_PERM_WRITE) { - *nperm = *nperm | BLK_PERM_CONSISTENT_READ; + if (!QLIST_EMPTY(&bs->parents)) { + if (perm & BLK_PERM_WRITE) { + *nperm = *nperm | BLK_PERM_CONSISTENT_READ; + } + *nshared &= ~(BLK_PERM_WRITE | BLK_PERM_RESIZE); } - *nshared &= ~(BLK_PERM_WRITE | BLK_PERM_RESIZE); } } diff --git a/tests/qemu-iotests/283.out b/tests/qemu-iotests/283.out index f2b7219632..5bb75952ef 100644 --- a/tests/qemu-iotests/283.out +++ b/tests/qemu-iotests/283.out @@ -5,7 +5,7 @@ {"execute": "blockdev-add", "arguments": {"driver": "blkdebug", "image": "base", "node-name": "other", "take-child-perms": ["write"]}} {"return": {}} {"execute": "blockdev-backup", "arguments": {"device": "source", "sync": "full", "target": "target"}} -{"error": {"class": "GenericError", "desc": "Cannot append copy-before-write filter: Permission conflict on node 'base': permissions 'write' are both required by node 'other' (uses node 'base' as 'image' child) and unshared by node 'source' (uses node 'base' as 'image' child)."}} +{"error": {"class": "GenericError", "desc": "Permission conflict on node 'base': permissions 'write' are both required by node 'other' (uses node 'base' as 'image' child) and unshared by node 'source' (uses node 'base' as 'image' child)."}} === copy-before-write filter should be gone after job-finalize === From patchwork Thu Jun 10 11:25:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312911 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BADEC47094 for ; Thu, 10 Jun 2021 11:47:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1E5DA613CA for ; Thu, 10 Jun 2021 11:47:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1E5DA613CA Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:55574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJ9z-000351-10 for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:47:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpw-0003no-1I; Thu, 10 Jun 2021 07:27:01 -0400 Received: from mail-eopbgr40090.outbound.protection.outlook.com ([40.107.4.90]:54851 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpt-0004Ve-A8; Thu, 10 Jun 2021 07:26:59 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ixKKl/2UyYr7J+e9MqP3wnSeUmht3mVAIMh1ZkhcqvD5KfFg9HuIzddMJIMtLw0IMn8Ycc3OQMEItinMCnOoC3Z/Glv7GiNEzlVYUwLf6fvY0zJJ/x0Cj/IPEHYRa40rO/kLEtyXrhTseEgCFDKLZ1yGKSi3s30Lma0PlrFsTbzoeED11kUH20bGW1h+ZjEcmI70BXZc+eRkWga457lGp+3O+pvFI3a8FwvMXOZP03TXZ5ueRdhia+EoJc65O9eQ5okzNHjwwNe8woEZaEaxudUUOY90tlt4i9P4mu/KhDx6YUcduOMkWC53nzhWmgKA/4PuAAE+Q7vK2gw7uJiTsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1N2uiVLFU5ZMtznDXUsWnweG+NBu3A9QkTphI8xiDcg=; b=E3lbPhr7n8GZJLJELtrU8tBw2h0ybbHstmfEWCfp178zFuBB850jc8MDYxcEBJ1rZLfEKx1e2Bqg6oLWfz6xfl5rD9pFymMzNzxOhLKRLPLHNLZnJw0bbJJAnlcGeuJ8qSRgRoSMwjxPE5moboxI9e0C7l0eV2zQUDA8kL+p+QDQHWL27simlRSM9Ckl24eXypHZ4XCDSvK1REh56Qc0k2TDdFdzaAJcL8Kfw24EnCgO9t9dElagzV9N9RU5HYRBJ9px4Wu1stIhBv3V8O57/p2jpyDGJPfO7ZhXoJ71Ht7EvtW1KT49YDMZbir8vOzY0ShtkMteE/W8vX4SJHjWCw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1N2uiVLFU5ZMtznDXUsWnweG+NBu3A9QkTphI8xiDcg=; b=Kx7GYkTA5276CIBK9nInrwXSVqeRMM9qNnt1RviCWzYQ5q43cBZYbg+tlpAYC5CepsJo+MIQ35SbOh2qRFpVTn1HMKbJ5rvf5Q3kPWLnFD0lJrnL8QlgxuPnmgskK0Gc9JDE0Lu85KZT1eVNz81dDCeAWY3WSzcFMsCEgz+GJ6w= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3381.eurprd08.prod.outlook.com (2603:10a6:20b:43::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Thu, 10 Jun 2021 11:26:47 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:47 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 13/35] block/copy-before-write: drop extra bdrv_unref on failure path Date: Thu, 10 Jun 2021 14:25:56 +0300 Message-Id: <20210610112618.127378-14-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8fcca708-f61c-489f-9a1d-08d92c02a273 X-MS-TrafficTypeDiagnostic: AM6PR08MB3381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:243; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JoJcMWjVADA72izL95n8eRP+vkHh1jOnMNY2Hf1TFIasOijROLH3exsoUZcFCcqhVbvBpGADlRqcFPmr8yWDywTskGp0oZdacOfEXny08RiwphE1AfRIZUtsU/vLhBtiFBuJ1pq1PpytqJVZc4BBhMNYrv03Qz5ohTPfWD0/kDtBKsEWt0D9lGl7Ou0+PW/LHiOMKERkcnlQyGO1RLSv3qXhaxDyCO5RlX5J5vNIL5pW1snI7moVvcQLDWW03LNZg1vIy4m5LScOCPdHIHZxMwr6Xul3OxdtSdAm7d+yCvtPeczIzbzIjDlMuFVAlsJLxAnyIhzkpk6VZWLyz4dTMtazqN/lH5GQpiOoS7U4Gwn35zjxFaA7Yj4nqE0aDyQJBdLtpM43nnZV9gcubtEURhcHcd5a4yrcIBykeGeOwpc/gyEA6o10dGB1qkwgJCqBztg+iTRh/7gTMKC0QXLJoSPn3izbZ/geMQ12AHYveHSeVr/cfCGdOFMiW3ysMOqJfAEtMIGKE2AqIXTaXInCRPgDE2bXMtoD73DDEIVX4pUs93ejURRF4psHDb80pIl8WLFhHgZkCXjLV3orDzjI/sFDFGk6BMqWBKjkvAqoX/rrkR2YEeA+8eq4kw4AN//HOQr7xI4ZfiS8k010w04x3mi66G7zxok9U/c8D9U6VjWTek03TILDaA5uoPh0Ebv2 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(39840400004)(136003)(376002)(346002)(2616005)(66476007)(83380400001)(956004)(8676002)(8936002)(38100700002)(6666004)(66946007)(1076003)(5660300002)(66556008)(316002)(26005)(4744005)(4326008)(6512007)(478600001)(6486002)(186003)(2906002)(52116002)(38350700002)(6916009)(6506007)(36756003)(16526019)(86362001)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: LpG6Lk/QRzkW2EJhwF4YF4u9PMw2OfCY3wpcRm1mrFt3Brr8gBtRlL8GwXKxdF3ogshTVaZt9xv2smVAR+S6lqVOCa/QbrEC2iGBME5VvxSaVGI3MYNIDeS3k6BOO/plxX/U/XVPL6jJ3nje2WC7MvuW4KOmNKs2iOKdqW0EeLkCDlwUoTQ8IC2B08/zvooDHcYikIvpxN1sk9C9qQxXAi5ml5lwinHGPM/Fw8+cOb9CMpVgRZNAnVurozQ1dAyFR1HFLQe/aQExYlJok3MXiNhdDngV1CVRdLhtPCfSZcqQvJrbRtYUvMrnX+Cv1Orts5ICP4j3Ij2A7kqQTfN39JD87/OMbzaufzgfaGKDWO4584x+48PDQJwk+qsU/2KSQshdixf49J06WX1jA0zoADboCiNa3pI93w9qC/KVO1zSxJbdcck1wrQntOAV4B1W6v51jN82hRbcH9k6fOgIrV4uENEd1vX/FWJuRz5seDvoxB07TF9AvIvTxlYiuBrJtlikZUwkkvlh3zKdDGXo89XvIP7UyImXXhpnOPfhGxrv6jONXhbjeszubtkF99O4Dq9yEsf28rQkXV3PD9/6rM1gQpXwdv5PgH8FVEf2GJc2QmkSnI/tLJXlVKPaJubN5GY2IuDGds1kFF1v3PUKq5rD76FjTp24g7O8IRpxKCu+am3yqIF7wGs/XmdjJJnRBnWg3xJ+oV+uFxdPdxmak4yJyb635HshYhSLIJ6xqRnSIYy6Cdzmi087NkkO3499T/J+nJB95CIEStHN05yj606o6+BCiz/BaMMfCUYKQRn5t7y8ZxO5iZ42CF2WPH+qOUeDykcU8qBNSwKoW821M77Bc2VfLa4896o39tObAG+awvWxLk9sDd4zgWXLVohp7uwJpX/0HDx/yCLVx1NhZd+W434eDI/t83qasdOlIjw5XrXrwH7nBB+GpFr3U4NQSrCJg6sO3Vtkq30dR/M2t+buCjj4gR8iNbAncCT6p9sxSzC1B5rXg2RYCCb1yFSIWTHlwDtrgt+vYxWGFfsQxfN7oi1Sjz91Xcg6Vz89Ggwtn1OowUUTyRYxQq45rzc2aT951o/XoMVvc6iuIZE7zCuiox03Dny6fvoHEN1MGiBEB30OpR3zbMrIUHeC+g6T8LIa2sbVh/ZItVNM5SMyM1p5GSZbTm9iFOqcEX/T4HshGCL7pN/wjO0PimflvbtVKsrOh21lmZiD5h5qg+hw+L8TkmQwwlch6aPK3Aa2Wq9xaLUmbhOcr5bIonNnSMr6xfm5cqMFg7BgNPKd+LTCBHUtKY6hHPXsRtf2yw+Gshyqwb66xH1lvQYoDTVLspwg X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8fcca708-f61c-489f-9a1d-08d92c02a273 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:47.8509 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +GnHLsNmG/R6eb3CTOCJArcQawUmLvclGWEl2D+m4fYy4DZSiMTv5gGDyhYbsM25Eg06BZMBv/L439+UWTqLo/b/e9w7cayOpb6rdOkwuJ8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3381 Received-SPF: pass client-ip=40.107.4.90; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" bdrv_attach_child() do bdrv_unref() on failure, so we shouldn't do it by hand here. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/copy-before-write.c | 1 - 1 file changed, 1 deletion(-) diff --git a/block/copy-before-write.c b/block/copy-before-write.c index 2a51cc64e4..945d9340f4 100644 --- a/block/copy-before-write.c +++ b/block/copy-before-write.c @@ -201,7 +201,6 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, state->target = bdrv_attach_child(top, target, "target", &child_of_bds, BDRV_CHILD_DATA, errp); if (!state->target) { - bdrv_unref(target); bdrv_unref(top); return NULL; } From patchwork Thu Jun 10 11:25:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312881 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82DD3C48BDF for ; Thu, 10 Jun 2021 11:41:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F0869613F5 for ; Thu, 10 Jun 2021 11:41:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F0869613F5 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJ3e-00041a-VH for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:41:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpu-0003hl-4R; Thu, 10 Jun 2021 07:26:58 -0400 Received: from mail-eopbgr40097.outbound.protection.outlook.com ([40.107.4.97]:58455 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIps-0004QC-7t; Thu, 10 Jun 2021 07:26:57 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h5ZnfNsi3vhYNpLVSnCRqEJllqUdhLtity9BEVBOjVD59sxB2dpUBUbmMxLhSK8yh+veg2oFe2RFbq34vTobkGy2wEgm+PYxRd0S088mesOdSo6wKawo9YLNzax90AHPFBJJ7szJ4ktGmgfMAIecIjLVcQ5nHHeoVqLqHk8v5oZz29KZbI9rYZVffiDWfJPOjaK+O+LYysY0YOel+8Rd01zO2grk4FtPjL0xbk27dd1zjC+zECGer6sMtXxiosgAE4+DKkdPcmGs5Fyh4iu4vhhMLZBcmOdNQjgvTaCHWkRexLDv3pkUgPv3DeqQQV+Y4FIbLQlfQwFZO1cRP4U3Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IAZ8w5qdaPUsW8UWJ6qFAmiuctXcyXUw7XJ0bYfnYHg=; b=getbLMpj3dele+cQ5kvwTvDDxj+o14XNdO4KWUSbQ5xk7sOYFYAQuQW0VA2tAEm0CbCObS9FTPRPIIRXG12wiyIgkE8aVR7jbhR1CZCz5J128h7wG12cLkw9LpyvNWANLHPQXpZLt1gCc3fonb542uufdvapP7ke8yTQjPHgETdzAisgbwJs1WGIXR15P83DWpjUdG3jFbsTIdyv0wQviM4BC/0yhry4SvXDJfgKn3fAW0ggvhmKTL1J8O4dCDJzDU/OP+HE9/SMTIuV3b6kBjXFJVJC9E1+aEeE4XNXDvg0j9mxnqZOhBYReNUqvIxHGiIfgZibp+D92wRl0tpn7Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IAZ8w5qdaPUsW8UWJ6qFAmiuctXcyXUw7XJ0bYfnYHg=; b=dk6B56g5i6DneMO94yQMsc29GLUgGsQrrDkNr1XF6GFo1pf9KKsM5gve9QrKpOQ/bAvTExaamQ/oIc54a3IOqIYqJ2CIyFfma3vweNulksvY+1haXfTXHPvBEYnpOm361FNPtTlcwTshkbkhLbZmY4NuKs6h6J2Pw8FUw/99gao= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3381.eurprd08.prod.outlook.com (2603:10a6:20b:43::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Thu, 10 Jun 2021 11:26:48 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:48 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 14/35] block/copy-before-write: use file child instead of backing Date: Thu, 10 Jun 2021 14:25:57 +0300 Message-Id: <20210610112618.127378-15-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1d6352ac-9ec3-4e8e-7905-08d92c02a30f X-MS-TrafficTypeDiagnostic: AM6PR08MB3381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2582; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2HGTO1OtYYvYeWDQ+O9pxscA4ujPhEweoXu/jdO4TThA7FKeQyzPcZ75AJ5A6GVJKNnDOH1sRhXDw55BAXrYZIaaBChb+GdWTSI9KQ9RUnehYjNK7EmGHU4mIlCUxgvptDGr/Po/JYETHN4CTGG1JJMRxTgbsGaN9FwJExwsZNB6xNzXQbdE55K3/u++BJjjWCIBdeAprGfkyDt1BIRKoxxA5INGmU654LEqrJcofLqZRgDwqgmpea06qQm9YxVVDEq6wfhTaRrvoQKWsGHMiCHpL2vqax0BDmIPyTFPpr9XBiPpk+14ilKxl1kdQNOI1qEeuLoRlSYws0vbWAjA2bcCYr+/vteO/7jRRHILnQjwiDWfNVMvZUTTiWsXJt11byMeusy/zPssmX8mp0yFtwFDtSgiKs8Lr7+/c7ZvYsOpKUyERz+t5zgqxEYvoCSIyXR/WWmF7BH81Mo9fyztJ6IJczMSO2SMmIQMM9tlyP3J+pv06VX8yTTusQs5WDk+AiouhfZW75OZTMFt809dKY+fbjC5cGYq5vcNBBhgHD3ceI60Dpv/GNpuvIYpCPwOnTaLtGSNrMNc6xXPHF0uRxVjy17XQ7o9OFpmqNj0ZM1UclRkPwVN+YWBjnIbkpuCqtKSzumQ0AqQA52xLSvu92yEaGQUPhairev1NXq1DkRkNGfY+tC5HTw6EAXuPypu X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(39840400004)(136003)(376002)(346002)(2616005)(66476007)(83380400001)(956004)(8676002)(8936002)(38100700002)(6666004)(66946007)(1076003)(5660300002)(66556008)(316002)(26005)(4326008)(6512007)(478600001)(6486002)(186003)(2906002)(52116002)(38350700002)(6916009)(6506007)(36756003)(16526019)(86362001)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 089GDNne+TCdZkvKP7y9blXdAusw924pqxrYvG+dCMcj4V7j0zSMM2ZDjajpI5aYjgqrxbVEHL311e+Y5E3qc1Xv1f6mAz4Nmpz5a3MYLdGDQG9fPFbEMMA8johl+Gr4ZPyKGxg9Px4brGXp7DPqzVttQKMz31lgAMaBG0bZbBNqmLQby/Mv5oI7+ZkpeOutGu3df5Chcr5w5hrqeRFnei8AR8R1/UyXS2fOSzaSMy+z2GSlmOPR0LCJM09yJu2qHqbMcnFqyrRa9+ksw7nFUof9Ghiz3NuVTHIOStE7w0LmBjM0XRTiM7ltC7Wy7Ni3MEtWw2PgwOrmFvzmd+QZhE4P1AQlIG3ZjWfIOvgnQqBoD+OK5oYqiclIOa0eWrQwqdrKtQjNczbEZ+FGKLoCqbWbatSYwFg3R93HlO7z2eBaVo3ESSJT3183VKACPXDIkz2U0Qlvzl65VpkY1U4GnC0saX1+3Anmyd1DyyEGsKFcdVSsljYEQbfw2naY0JHd8ndIsFswFJaT+dqX2ekSEGQGoP8Ifqe2lWnBmjLFQ7UyaOaAM9HuQOI1qIiW7szC6NWQcXUfP27dN14U6fOcLsCoKtbKzIMyIa0yJRDSKj9dDV59IQSbp1/U6j53SnU+6k0Qi1MCX9pQezoV+xkD7WLlRaGGqCZAxUO+dtEvR3o6DWpJ3lKTsmdXLEu6xUk2y9d2KMpFfU5t9oSz5Zsx7u15jqsXx+sKmXgzoqvJl1j+IQfSgkraVq086/3yeUpjrJu6lqXC2b9aKwe60fcWkEMAxIa3y5lTrNy5nMCXVzf0JdiuNSHLsQZg1AtPvQJwrNf1IhoHd47Nx53bG0BJCJnvKrxDNQ+KLzp/0SqNhH9asng4QtDaZ0ajuJ5wrM1yVdlQTkm6QLeBKV9sDFYfYtjh4YEh0m+bfO58yH4AykeDKSU5WHa0sZVJiXexAuUejYEVN86b9QDanQk5U5eMriEoNW/EAslbFsAAyWM4pznIF3P/FVEozI2z5d0LOtLyTZ3tOfpYum7Ywj2E9gE9NyqrRPdNivBOAtCzR7PzM8hCeDsDyiRSVkLMJt/Jwkze3aog51ah7H99xNJXMYmGQqPtNJ8/8xbwem8KB/EUiokepdMyx11gY+WaoScj3fD8xCFuzslgiOlj7VqifK/NS6sP2ymaJ4wvU9IBPJq8lBlgJnBwW29+RtmU3P+QltyVznN6Df5roNioI2E+c32FBqgy+yRD7I8GGQtxy7eSDg4HZBZW+l5mYo2FCzfdtiVOR0RjRKT/PtImO/UmuEdwQcd8JHn8dSNzyuhA/f1Ze720dnhTEjhnpIv0LcYejh4r X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d6352ac-9ec3-4e8e-7905-08d92c02a30f X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:48.8057 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PYIqx4l+uUJ2iYjCgwaMpIlkFDxaCbBiOfVbsFtIpjVc6Twtt7iLpID1s2Bf23u8SQxJlTOiH3jTCSDQe1cwZ8gkMxKZ/2cePAZn9nWeZNQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3381 Received-SPF: pass client-ip=40.107.4.97; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We are going to publish copy-before-write filter, and there no public backing-child-based filter in Qemu. No reason to create a precedent, so let's refactor copy-before-write filter instead. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/copy-before-write.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/block/copy-before-write.c b/block/copy-before-write.c index 945d9340f4..7a6c15f141 100644 --- a/block/copy-before-write.c +++ b/block/copy-before-write.c @@ -43,7 +43,7 @@ static coroutine_fn int cbw_co_preadv( BlockDriverState *bs, uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags) { - return bdrv_co_preadv(bs->backing, offset, bytes, qiov, flags); + return bdrv_co_preadv(bs->file, offset, bytes, qiov, flags); } static coroutine_fn int cbw_do_copy_before_write(BlockDriverState *bs, @@ -71,7 +71,7 @@ static int coroutine_fn cbw_co_pdiscard(BlockDriverState *bs, return ret; } - return bdrv_co_pdiscard(bs->backing, offset, bytes); + return bdrv_co_pdiscard(bs->file, offset, bytes); } static int coroutine_fn cbw_co_pwrite_zeroes(BlockDriverState *bs, @@ -82,7 +82,7 @@ static int coroutine_fn cbw_co_pwrite_zeroes(BlockDriverState *bs, return ret; } - return bdrv_co_pwrite_zeroes(bs->backing, offset, bytes, flags); + return bdrv_co_pwrite_zeroes(bs->file, offset, bytes, flags); } static coroutine_fn int cbw_co_pwritev(BlockDriverState *bs, @@ -95,29 +95,22 @@ static coroutine_fn int cbw_co_pwritev(BlockDriverState *bs, return ret; } - return bdrv_co_pwritev(bs->backing, offset, bytes, qiov, flags); + return bdrv_co_pwritev(bs->file, offset, bytes, qiov, flags); } static int coroutine_fn cbw_co_flush(BlockDriverState *bs) { - if (!bs->backing) { + if (!bs->file) { return 0; } - return bdrv_co_flush(bs->backing->bs); + return bdrv_co_flush(bs->file->bs); } static void cbw_refresh_filename(BlockDriverState *bs) { - if (bs->backing == NULL) { - /* - * we can be here after failed bdrv_attach_child in - * bdrv_set_backing_hd - */ - return; - } pstrcpy(bs->exact_filename, sizeof(bs->exact_filename), - bs->backing->bs->filename); + bs->file->bs->filename); } static void cbw_child_perm(BlockDriverState *bs, BdrvChild *c, @@ -186,6 +179,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, top = bdrv_new_open_driver(&bdrv_cbw_filter, filter_node_name, BDRV_O_RDWR, errp); if (!top) { + error_prepend(errp, "Cannot open driver: "); return NULL; } @@ -201,21 +195,32 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, state->target = bdrv_attach_child(top, target, "target", &child_of_bds, BDRV_CHILD_DATA, errp); if (!state->target) { + error_prepend(errp, "Cannot attach target child: "); + bdrv_unref(top); + return NULL; + } + + bdrv_ref(source); + top->file = bdrv_attach_child(top, source, "file", &child_of_bds, + BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY, + errp); + if (!top->file) { + error_prepend(errp, "Cannot attach file child: "); bdrv_unref(top); return NULL; } bdrv_drained_begin(source); - ret = bdrv_append(top, source, errp); + ret = bdrv_replace_node(source, top, errp); if (ret < 0) { error_prepend(errp, "Cannot append copy-before-write filter: "); goto fail; } appended = true; - state->bcs = block_copy_state_new(top->backing, state->target, - false, compress, errp); + state->bcs = block_copy_state_new(top->file, state->target, false, compress, + errp); if (!state->bcs) { error_prepend(errp, "Cannot create block-copy-state: "); goto fail; From patchwork Thu Jun 10 11:25:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312897 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F13D5C47094 for ; Thu, 10 Jun 2021 11:42:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 844C9613DE for ; Thu, 10 Jun 2021 11:42:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 844C9613DE Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJ4x-0007oh-G6 for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:42:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpy-0003rD-4A; Thu, 10 Jun 2021 07:27:03 -0400 Received: from mail-eopbgr40097.outbound.protection.outlook.com ([40.107.4.97]:58455 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpu-0004QC-Nj; Thu, 10 Jun 2021 07:27:01 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CBtU9xDNDOC95Lrs8vPYcuYL/XX9ujhQTEiy4JEdw3DOuuzad9y7enObOE1+VfSxMhyM1zfAkUEusAu5yP90/6QIdD5wiLueU3kiSpi8JaV997CXSeh2hpNWOY09oHNqruIyinql9TTKD4ygRJaPW03Cb90VlpWZSeS0KqB5EGrCTfViLZkFTv08R+z63FrCAaF7tibdM14HtFYiy1S8Auc4ayeIPpzHuKmBuZyGxu/y5OtPVqbU9jZA6h8Qiwbf3HLJEUiCDBpAywD9M0MDIAJYn1kHgerrfMdAa0pQ2K98ew70yqEozkAa01Gs6ETONVmPOg/HMLN+6PAdABQE5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+Y9zwZ4FG3jmKMdQhuvSmetg9/t2U2WeUmbUBzVXQuA=; b=FRp/4tCIagXD41dgaKCpwBzcUcXO92ENP1LE2qrUh4dkWvmilIBK0O5W6eKMw0+HUvq9jopUbZPoomR3KaO8iI7/wE3NeI73e4dWNo/UTSaaUyY1lJ8xhQEOFUF81bbiksAb1+UYNc8jjHeiQ2uSGR7tV5W4JwmHnqNaYQGHXd1HQTO8XtgZweQ+QBTp6Azi84tx5mnYohZvTwAAiiJoEpckaiOE8JSASZsTGqfP/gFYLsNi8p6tnnWw5ag4vKjWck7p5MMoeoENPNJl4cnkEWrrKAD+GDieqLO8pGvY5CAhVLmTy70nHKmP2gWWuIXrG1VgH5+1dbYQY4Ro+hB4Aw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+Y9zwZ4FG3jmKMdQhuvSmetg9/t2U2WeUmbUBzVXQuA=; b=h55R0aIuR6SAi1EJSAQpk3OgcCcSJkh8sQ3uWaa3i3cCBqhjqvP+AH0AuFwD3MFFJJNWKbeg1Vgo72llMUpbXGUivdPNMJ+51LeoXqR0opJRpdoh9dqNFD2y+Q0TonjnTSXlF+P/xRldSVKOALj0dSieGjzoja/r2LPc7jbts2A= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3381.eurprd08.prod.outlook.com (2603:10a6:20b:43::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Thu, 10 Jun 2021 11:26:49 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:49 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 15/35] block/copy-before-write: bdrv_cbw_append(): replace child at last Date: Thu, 10 Jun 2021 14:25:58 +0300 Message-Id: <20210610112618.127378-16-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a9b8d7ad-95d0-4881-2a20-08d92c02a3a1 X-MS-TrafficTypeDiagnostic: AM6PR08MB3381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1013; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sMMnoIghrVq6jRYpdPb6ZheNAwdzsGl81YsA5e2xKO42zM5nNK29UKwGSh5KAr5tgaaHQl29wUU+YWdKxEg5rIiwRAhwTdTpFAn7S3+T4zqwnwx0rgoUnPEGdIfzIL4lG71goVeUpwoApyT7xFSeyKUM8TrU5mfYKzfx5aVT4FNWDXxUyLGq/ZyqWtOd8RObCBhsLxB1pk923wxH5zLPpgOqn5n9JeWQ6rrUOSnO6ifcAzcgrxkkTPBUQK45LPnSbOwFvGcISxz+tfDQZWuTU+zWktKCKYwI8/Wx7KxV/YqbK/jCTxRWd2gPBE1eQcaIsmvuw9+aQ8eyvcwzxEX4oePlSGQzTPdU/PdNTM5+SS0sWbrKPpr6/np0WQ6OKuxagk8G4LAj56Q9uohlLo7ZpsOlppJWzmoblgimoP7sYGc2U3gQ1N+3ecHu4CFa+3UKWeR1joMcY/gh8eupwp89Y6Fmqp86IVM3f5wuN6Fxaowd5ZUvIgbXfv8qZ+wCwrsuu6DpJAvmeTqdgO2lYOjDiNaJ+WTaAUKciGt1/LtJAqD3SKJBaERa+JU4/6Yp3dPlkeywPiYFLUcg6lkhYkrhHTHURGB9HSFCJVflnzCxPPc0th21aShEVhOz2ijiS9FOrrDPGKSj2FKtqLZ27Z42taw3MU8Q6CtDpjgwoRLNCY/uyXTgnQSuFznmDDC/Yk3f X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(39840400004)(136003)(376002)(346002)(2616005)(66476007)(83380400001)(956004)(8676002)(8936002)(38100700002)(6666004)(66946007)(1076003)(5660300002)(66556008)(316002)(26005)(4326008)(6512007)(478600001)(6486002)(186003)(2906002)(52116002)(38350700002)(6916009)(6506007)(36756003)(16526019)(86362001)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 1jyEnm7wXs6IrJjA+EEe7rGnNvYm/8m6JEoSVtz7Nnov0mEJW3/YKY2RnnPA1YnXup8EY+Z7hXYJ/hyd9XSyuygTpNOMl6XNUXw0Fq24MM4lJkWS78afMLXpiVB8E5Xc6c2yxfXLwaaZuSMYgyTwENdfsjVhUTL+fqHsYemY29cyOWhvvcGmTAI1ErHVJLErED59PF/2P33oj+iDk7E1HDR7U0Gav/jZWLN5T5AaB8SIl4TqCXT4cx7RE+BlTI2kZ0T0jiFHE7ZwL+26phR5DgI8fYzrS6TVGcQxJPXUMTWk7ANb50cEV8SauM8NajMuCS88uh4FuuJd11la+dDfSSIa4dd07NbZGrljFGo1offEcUNUHFssOiE5FicH+Fu/aDM1pTtgI0oebZgVUx9SBdxOvHfZ55J/ikA9fMddFTxrkVU7q1PZ+om6gkdaqooL8Eb3Cdby5gBrfEarB68fP0v6Rk2+8MzagxMV08S9L09Lg+OauMP6VepNdbMRQTpk00UdS9Tf2/2LyKp1GCR1MlwUoiQ7dAsmEqAi6El9m63yuji3yQ3VVqDtpFTg876MpHP8Ej9MFaNNhY0ZyZNp6O39cvjnLwAiZXxXdF3wvjl4ypYFcE0XRKUWy4Sd5ttkfVy/qRiaJl/VyAb/1P3JwH8E5HOw2a1SRFOoGDpwMskiiHlic/OuRnMxyfV0MPjM4S6/UMGfymMHMUZwXqEQOjA/9zq0McDF8nXc5WXOSfH7Qqs7khAyt3i9HwTwzyXuGrjZamNttYDvDiunlfU+uGIGn9rXPMZEgATyM9lF/gQ4qAbbIiN6Lfjhnkh1a7LsHn/dyG3YhoIw3fZw66lgA2XfbP4oqEaLS1gO1yr/mTDpqJrDS2SmoRvBL2sbQFy2oEjGBoHNb9KkOw7KnPXVg/sir4x46s9/sCx1VRaqmBHGKu6q2KASN+3ZVl0Eqoq7N8CGCiwt4tS4NG2gGYrv7CjOoeOZLrBV63m0je6el0iPCyLVQO2yPNxnPwaVqIiiyIc4zodd6rLGocCuZMS9iWE6mR9KDUc2HcM3PsXAV5ZF10C0cT97Z58Wtut1bZYj+4ISlT7k6IlcGmRexy6CWtK+IjaE89AfPCPiY5hdzCAUG5IoUAiWkhIlv68yZFgss8xzoWTPKxos50/pTboZaappyp2jrsJBDN7i8ZhHdTQbTIeO2onjmvK79LWKoKu/E6z2DGT3SLuVk57QKRkCgN2+jXT948DF9bnljIKaZeAA1RUaq1kOOYXCu3/zUA5JBobo1UtzWHad52FytuX/TxFw/OwK6FtCwdHpDuv/yzFxztwPm7Cukk/bmTIj4oqU X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: a9b8d7ad-95d0-4881-2a20-08d92c02a3a1 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:49.7924 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: RA7xZSKAWN3Ofk/bvLBImRLIrAgrg5jkjPqZEIQMYQtN0juOReErtFV12YWFsFir3pjvn1Pai52ICea675YpvaUyyEI2UykwgG5CglMz+8Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3381 Received-SPF: pass client-ip=40.107.4.97; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Refactor the function to replace child at last. Thus we don't need to revert it and code is simplified. block-copy state initialization being done before replacing the child doesn't need any drained section. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/copy-before-write.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/block/copy-before-write.c b/block/copy-before-write.c index 7a6c15f141..adbbc64aa9 100644 --- a/block/copy-before-write.c +++ b/block/copy-before-write.c @@ -172,7 +172,6 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, int ret; BDRVCopyBeforeWriteState *state; BlockDriverState *top; - bool appended = false; assert(source->total_sectors == target->total_sectors); @@ -196,8 +195,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, BDRV_CHILD_DATA, errp); if (!state->target) { error_prepend(errp, "Cannot attach target child: "); - bdrv_unref(top); - return NULL; + goto fail; } bdrv_ref(source); @@ -206,18 +204,8 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, errp); if (!top->file) { error_prepend(errp, "Cannot attach file child: "); - bdrv_unref(top); - return NULL; - } - - bdrv_drained_begin(source); - - ret = bdrv_replace_node(source, top, errp); - if (ret < 0) { - error_prepend(errp, "Cannot append copy-before-write filter: "); goto fail; } - appended = true; state->bcs = block_copy_state_new(top->file, state->target, false, compress, errp); @@ -225,21 +213,22 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, error_prepend(errp, "Cannot create block-copy-state: "); goto fail; } - *bcs = state->bcs; + bdrv_drained_begin(source); + ret = bdrv_replace_node(source, top, errp); bdrv_drained_end(source); + if (ret < 0) { + error_prepend(errp, "Cannot append copy-before-write filter: "); + goto fail; + } + + *bcs = state->bcs; return top; fail: - if (appended) { - bdrv_cbw_drop(top); - } else { - bdrv_unref(top); - } - - bdrv_drained_end(source); - + block_copy_state_free(state->bcs); + bdrv_unref(top); return NULL; } From patchwork Thu Jun 10 11:25:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312919 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B4B0C47094 for ; Thu, 10 Jun 2021 11:49:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4508D60FD8 for ; Thu, 10 Jun 2021 11:49:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4508D60FD8 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJBy-0000ko-Fq for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:49:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIq0-0003rz-0p; Thu, 10 Jun 2021 07:27:04 -0400 Received: from mail-eopbgr40090.outbound.protection.outlook.com ([40.107.4.90]:54851 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpy-0004Ve-66; Thu, 10 Jun 2021 07:27:03 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZOVnBkFTKdb3JiVPdvGnrz8grJm7iLgoh53vb/JrbDBCfoKf0jxFAgdy7p0+rkmq8YRxJCTMvd7aMrUf+v0cfFI2wejUAs7bEpVhEug/CqPW9Dr8M1XbDGgVruM07Ismgo4QKaP8li1OSvlG/BYoGBX1TQU0Tctiiu5ysY8RIgOQICv4Btk+S5LJFe2NOrCx+B8iYZsbWbljZCManraQXnrijgvU/XIg87vL39hHKWieFWvYfm4A9ETHmYC/JowlFECoqC/7vPHE3rgWlxfWx0XTqbAUQI1ZMzPQFb84doxthORIMMwr9SrhVx9XW4aUcRb94ugruF+tfIPLz18M7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2CxcOwZdKNFNzBx0wXYgJ5RkseoqLR9SUNfi8XYqszo=; b=YYkZIVOBW6lnkcolGhwz6SKAXeQs3zO/T5WFx30rXoGTXdqPg/jwH0DpWB/YK3sYiqMJhumaaUWQFJvVJtwYjjyUsbgfu1v7AHblgRd62OIjzmWYDY76mMNfPcZpX2u/vsl/97vV816copeU08wNgLLGFqDIQyy9aK18tUVZpFezIPpLqG0GocaLkuWNpTkxbmMAyV1/kg6w0NxC2J3ngpWdOWXNGgeNIKwq9fcVu0NZ6HBfIhlR5u6AJ7nzPkoDcFgLJx0ZApYsE7XubZzd+/uuPR6S0qJJHp2qUlZK037B0U/74sdUsLjeztw6fnQTZ7xrPrZnO5bLaVAHahKWLQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2CxcOwZdKNFNzBx0wXYgJ5RkseoqLR9SUNfi8XYqszo=; b=BWAUiVcY5uSSsc/ji/c4p8dm9HOsvTTp+sSXWBr7aYETYEH8IJR6G2iVhO6yF3VWmTWfbYsr8E2EOlTzkbfZXqXj4kz98IvkDtXUAr0K2UzMkEKSMgcvjU141uodz1MkCzy3AgScLvYxQ7WNF0K0WrOs78/92RMAe5SJ1EcOa+Y= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3381.eurprd08.prod.outlook.com (2603:10a6:20b:43::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Thu, 10 Jun 2021 11:26:50 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:50 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 16/35] block/copy-before-write: introduce cbw_init() Date: Thu, 10 Jun 2021 14:25:59 +0300 Message-Id: <20210610112618.127378-17-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 21ac3cf2-98e8-4b7b-8a83-08d92c02a439 X-MS-TrafficTypeDiagnostic: AM6PR08MB3381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:813; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sZq/Z+XtvEt5ftVhV4WRarmQPonyynCElGw/FRBOXOStYM7oIy266wyCyaAfIZad1+WfAx2OQuDMUowgG+ixJ2PlwD1MFdr/Ufoy9Qk24Tuq6tc27M88Cza7gM7axhS3M1nPsbzHaIAbSLL6hdq0pkuQaQ3hOAXzlS4KuV2FpuGOM1G9ip+KRxC8I5+3Gg/v/UfiwT2p7ANQoMZYYVDoYtVJ8GeIoJKFpSZhMl+lKfJXU/A1RHGBiKDg+D6slDgMmyBIpohcmYKvaMdrpz8uNQnW9sy36ydNMXpFv32LKXm8Sq5u3lRhk3CllzDSjAUh8vk2BSKmQ1LZTOyAKqX8z62AdCnf0cZHTPmtWXcX+ZDlgGETP0q4hNSlj7AP/rQwFprrjcwGtL5oT172GbYtTT/JRI+pLM06oRYyuLs3/5uxjq0ThSL2MC7pqdE+mmdWNFLYELDwznpSHy51aqHrm1Gjhbhjwayda/7gCCQltgLswCv/B6ZcNR4i2rG4ZuM7rbCaa3zf5FpHGcN+SJ+k3eyVcerE3crjUoGVxUShiNlSNT/NqMbg9+pUqh+ZQjBkHUK8WkCPldFYlKqNQjx5brVbIVJLJugec3qJbL33LG623kSJrc8+Lt0oEgGSFRd8t6rcZsJDSvAZgmr8E4iz+RCnuPaM7Tig8XIy6rimCLyxLPQPGTc3KVMT7APJQ21t X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(39840400004)(136003)(376002)(346002)(2616005)(66476007)(83380400001)(956004)(8676002)(8936002)(38100700002)(66946007)(1076003)(5660300002)(66556008)(316002)(26005)(4326008)(6512007)(478600001)(6486002)(186003)(2906002)(52116002)(38350700002)(6916009)(6506007)(36756003)(16526019)(86362001)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 4CAKU+9IOwL8x83+1LJmCZzNlilDs5f7jpG8UqXwDsi2j20xL2wy4ipj6+fDlgfDdtPHb/t0JiYoK53twIO6nY0sPqtmML9uAK8tKQDmZ/IjT6FMFnYBx6D5XKwLJ6eOT5XqktCx9LmHSgtedVSMqWwMrkVsJLsaCR1SQAUYaqElbOAb5JdpXVl4RUBgnGjv7sTigTJE7FrCcyW0KUotoOrWRsvZsvwVM0eAmugneGrmM8mNy7Te20DncumO5TzREvmxIC6Cmau/5hfDZS9P1tY/0xnZWKX73rM/7JFpBR9h/ugRRVDr2BMkdv/aAaBeqMFE94Xn0E73jqC30I/jxebTu6TDLqQmkGvj7HNwsp+9oyEeJsvdJhAshsFd4OqHjTmALuYR8H/KqrJMY3pajnWxepwI+qyt+1ie5tsg7YkVUVuikR2/S+0LW2UZ+AjAiZQi1ZoLntIFYTWqPaVcfx72lmq12Tf+tbXU2AViYLdZww7KLxJavirWmPrCi0i1MkrzolBdUfnwAIfczDHLkhpWJ5LFpWlVjuTnoqWSk5fBRTX+MFbK90Z//4bsBtcYwZcMHEzAuZ+q3DR9F7yNXqv3ydyAHYoDnxpQ0PXlNeWvmaD6rQxaCBlkltHxllhZdtJI+gcsZblLAwG2qJO7qH8j0G0JmN9Wb37WUVgS49K4Ue15V3roMvRhmh6PwokhjrNipHlBUxxQAsUdQ32HLFlH/iE2qapCtw1v1mfYME4yonqXVEimrHJUfJz71cEOh6Gkr+WWQmEcwgCJ6VtMmx7oO+/WCIyOGIP7/3yjAhUc6YCwX/2sHMOKmlKuGtr9mYt9+bKSFbijle3cEYMRI7j3jCR9E67j1L0RAvkbl7uJfLa/DtXAAxH64HDr5eUMynsHM57/+gjFALtancx5axmQC0ipq2h6xbwycnc+J6WzElBtumiSDOqupFd49kcCcEdpCBsXUhWUNFR6Pqsg4GdTtVRqCwzr7T7daMn2IX8fYJP1CMz+gW9noyUhs28aatNsMsEORYh+eU9uCrb7gKU19X4lmriH9ySfZYCGza5ztopHjQ9mC+A49ur1K9lnYAb6/AiMba6Q9cmAXFrOfN/WCfFVy0TOe0p7sjeJ4pwevMZOBvPb0omu0p/dqpl8Wf1HtXb4bm6EWblXdm6jLa3o6mhvveZ+CATAd2WJKSEpOQ1dhKPM6UF26NdPyo+8MHJhxAekm6lApd5eIGqabBafvIiswYUgUHdu6BnSbHpTUZLAyKZnHL+ePLsOs2h4ttrB1tVYx7r0AHalYAoNyTOnexZeBQM6VcBKquD1n+rZLuauojPxORZd5xHPLN7c X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21ac3cf2-98e8-4b7b-8a83-08d92c02a439 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:50.8258 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3Snst3SKvVdnEosVDbkhwj6t9RoBnKBR59Nz1mTVHKZ/AY4h7n2yVK3/IGH5RijzCbCLHUSPBBa+5J7jcegiPujEzqQnhd7D+ueils2/HSY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3381 Received-SPF: pass client-ip=40.107.4.90; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Move part of bdrv_cbw_append() to new function cbw_open(). It's an intermediate step for adding normal .bdrv_open() handler to the filter. With this commit no logic is changed, but we have a function which will be turned into .bdrv_open() handler in future commit. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/copy-before-write.c | 69 +++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/block/copy-before-write.c b/block/copy-before-write.c index adbbc64aa9..a4fee645fd 100644 --- a/block/copy-before-write.c +++ b/block/copy-before-write.c @@ -144,6 +144,45 @@ static void cbw_child_perm(BlockDriverState *bs, BdrvChild *c, } } +static int cbw_init(BlockDriverState *top, BlockDriverState *source, + BlockDriverState *target, bool compress, Error **errp) +{ + BDRVCopyBeforeWriteState *state = top->opaque; + + top->total_sectors = source->total_sectors; + top->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED | + (BDRV_REQ_FUA & source->supported_write_flags); + top->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED | + ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) & + source->supported_zero_flags); + + bdrv_ref(target); + state->target = bdrv_attach_child(top, target, "target", &child_of_bds, + BDRV_CHILD_DATA, errp); + if (!state->target) { + error_prepend(errp, "Cannot attach target child: "); + return -EINVAL; + } + + bdrv_ref(source); + top->file = bdrv_attach_child(top, source, "file", &child_of_bds, + BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY, + errp); + if (!top->file) { + error_prepend(errp, "Cannot attach file child: "); + return -EINVAL; + } + + state->bcs = block_copy_state_new(top->file, state->target, false, compress, + errp); + if (!state->bcs) { + error_prepend(errp, "Cannot create block-copy-state: "); + return -EINVAL; + } + + return 0; +} + BlockDriver bdrv_cbw_filter = { .format_name = "copy-before-write", .instance_size = sizeof(BDRVCopyBeforeWriteState), @@ -181,36 +220,10 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, error_prepend(errp, "Cannot open driver: "); return NULL; } - state = top->opaque; - top->total_sectors = source->total_sectors; - top->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED | - (BDRV_REQ_FUA & source->supported_write_flags); - top->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED | - ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) & - source->supported_zero_flags); - - bdrv_ref(target); - state->target = bdrv_attach_child(top, target, "target", &child_of_bds, - BDRV_CHILD_DATA, errp); - if (!state->target) { - error_prepend(errp, "Cannot attach target child: "); - goto fail; - } - bdrv_ref(source); - top->file = bdrv_attach_child(top, source, "file", &child_of_bds, - BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY, - errp); - if (!top->file) { - error_prepend(errp, "Cannot attach file child: "); - goto fail; - } - - state->bcs = block_copy_state_new(top->file, state->target, false, compress, - errp); - if (!state->bcs) { - error_prepend(errp, "Cannot create block-copy-state: "); + ret = cbw_init(top, source, target, compress, errp); + if (ret < 0) { goto fail; } From patchwork Thu Jun 10 11:26:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312903 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6261C47094 for ; Thu, 10 Jun 2021 11:44:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 84907613F1 for ; Thu, 10 Jun 2021 11:44:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 84907613F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJ7A-0005aT-IC for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:44:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIq3-0003xK-NA; Thu, 10 Jun 2021 07:27:08 -0400 Received: from mail-eopbgr40097.outbound.protection.outlook.com ([40.107.4.97]:58455 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpy-0004QC-M6; Thu, 10 Jun 2021 07:27:07 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y+4+LS4AwPfnWLq1BP4MzqaygcOhj0G+Vc3lx7GCvZ1+0Yc43sDEOUdBxjhKV3RswHWTvAcyTPRs4IrlCFqKbGjbjCtYvNxBKCVLDv5kEh71TgPYLYyzAz6Leogc5sQkbPAxxTGHr7VsWykDGe2qK4tAGDrIaIdfBxSvy5ivTeO4v6DrvYJsalU75iunp6mlrjywq9A/ReTmEf1tlhQacEsNohrgStRE6LAgpvdTCn+hHlvfQ+R1+s9SpB4n/NyJgNLu1bqkjlKpgSx//y/coO/2nAba9oaAmczVxHsAQqjutOYqY1UBxOb0uMzNmgtPb9ZdAMMOGklIAKDStLoYTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=s6nSqQ8glRSbCauI3uUt4rS18W8WqtO0o2GDIenmgro=; b=A/EwXl71HPbzMB27CgFBWHt1O+T77lku5KN12n/ODTWKsT07uoRuQR/P/Mq8QfZIV3JATBuMrEN8R01xvrQjO9qgLxhUuF7EJvxLhxJOIGFdfI2z6bpVX3PkUj18khLdf2ymYM5y9ytHJHNUhKnJ+fTj74YtZM/Tx12WATY7lFwb1BO2uRZiOBtMusrC83+GXt6KiOzlRvUk8rv7hOBY1SyvEkifqDIMc4VSCXODnO6KuCgOcv4tEDjvIxDCkCWrC6CI5P48cn+Fc+agwZ9M4F1H2Nvyv0pabqRpTCFLu5NZzwJH6z3LcGPoei88dTjCw7Urkge/hjo5jVn38kuziQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=s6nSqQ8glRSbCauI3uUt4rS18W8WqtO0o2GDIenmgro=; b=v2CWF/UVHPMh4WToh1kHjpQfSj/ShJufXVjSdmQ0NJLwyIW3vKyvxPcWDOPxBGDNlBNwpCLbG8pVONV5MSqFQBlprdExKD325Shlym65wCGjG9yEGQ2/tEj2ZBnZfJE4tXaLHFBRNOYZbhvYjCZMV7jC35/cQA5sFhwXUpRr450= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3381.eurprd08.prod.outlook.com (2603:10a6:20b:43::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Thu, 10 Jun 2021 11:26:51 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:51 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 17/35] block/copy-before-write: cbw_init(): rename variables Date: Thu, 10 Jun 2021 14:26:00 +0300 Message-Id: <20210610112618.127378-18-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a0a5817f-af60-422e-79a3-08d92c02a4d6 X-MS-TrafficTypeDiagnostic: AM6PR08MB3381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:186; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yb7JmzHcv8EAMYsoh/1dYG+QhN10t+CGyW48+6zK6GMyyxsG34pZU7uXWaq1PwY5k4Tce+SIcdXnoTeRh5+bHHUhrpXjP6j0LcCdvMMkqLUGLFv8CMc/hC2UbZOakm7uxEOq6E3IG67N6th8F+ii6GOXMdLUbZi5PjLBwsretR47kudSCMuL4GAfv24Hr+FD6vx569HqpvdekSNnqGTLbzVoXH60o6GJsDXpduIOhqvbrm9fNjoogLfhOHjQzKe+rRvR2rWETRkdZN5S1pW6iyIDTGu0TZxHPqrRyVIVP95XqnjIEuTXVy2nomJCjIWqWkoqSMpYIpDnL1g117oBJGDHrfgSBxtgk53m211RT/rJ7VtYbJf340vGzS21ULRr8qHEFrQww/J2lVZcCmyF3o1KslwTY35YbpCYJwSGUBhjiGZdnLw/cfakujhg1cz+tvh7sMKV4S1/OkuIZ8qi9BW0CEPKe2OPguYw4BBwRUysELwtCCh4rRliHGOdDqWUXzyrXxAGwSRHYuTeNLH9JhhVWivNRq5id1O9F7lNnGRN0NRTmfMDdPHPnpE0nCDVNvmztRG2qVvbRXXDEqGLVHoY9kZGXyUerq8lF8Apla09Llg1fjPPVNHfsIdZmxoy2utv9QRcPSe2+3PXBj+bt1ZADf+rv5wcX7qLrSu8GKmFWzKoPQGJj9N9SUO9zvK+ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(39840400004)(136003)(376002)(346002)(2616005)(66476007)(83380400001)(956004)(8676002)(8936002)(38100700002)(6666004)(66946007)(1076003)(5660300002)(66556008)(316002)(26005)(4326008)(6512007)(478600001)(6486002)(186003)(2906002)(52116002)(38350700002)(6916009)(6506007)(36756003)(16526019)(86362001)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: HmqA+bqGGzcAbD3v6/iM50VbPbCGU6VzHsXTUDKqz+GScX0lM5sKQUZ7J+IA26tOM3A6LJi9OgUbc9vqE6qHi7zWlKY5YlsG3ycSZBwsg9/2ro5ehqSuGndz84NVVBlmWUfzYs/a65vEvoogKgRXQR8LOXP6Mk/fmxf9hKJM2cBAhVCCyC0hKiiSHNXdBbJLOJ3U9HcyhX2h5tAhnFdSf+LtIDgnZwlq+btj0KlsrpyzaOPxz2a2+NUXs1yx+r8icp99rJNPQG+IDd+9pR3TDkLQygwdZvT/LlmyWrsZ0X3hOgzYspLDb+pdDqv/6tI3hpcgRyFIhTw43RIHc0sCm8SerCBJybvFYJXLZwJUIe9w5uDByZejUM+ME/k8iujdeoqFOH+C/+cTmjiTmLHPTb4CWkcLJ3KJg8WpSUySaNJjSUBPRwYuv1WvLMZio+0LGYAcXkZ0g8bVP94NIcI2IYXt9PdKFRBaP3WOSkJCvJjrbnJL/rjXk3jJFRxYt/HcOSEzbJqzvPVF30UmNvXg8IyJqHLxqWFERPVM1A/XZrHrl2telcD0DSy3HRfFo+UH+ULMq0Jzj/fp/dbGm8IbSYPk9khsDRwSyub1GkqvRM9lMKWokYU1xbUZZanHgbpCTq7dif45sAfGonFfmip/BdRfe9Q5bNZswQ+tROkbuN6ntRISwe4qhtbnV7goBaCJvjVLLrEH0fH+ym0UlapZpb9CPReXr5A0J1UxZ2NDbUEjkWMrGSEwpnoymSYyyel4VBBJP72feZXIRwawlvOrIROrrVP80hKl6AOwcWswbQkxR8p8plJcr8WH99N59x5OYZrLJV8KK9KXT5zZVKzit7Bhoe9aQx8OBNizrNeabj7O44Ty3XzNpSjnMHdy1cq2gIrluoQSj0vlQShH9DAtUIKU2fw3DjaHnoH2fMqHcU0GU1dKsldM2w8WR039F8OnltKmMXKtE5os3AX6oZh4UKJMO9Vw5LMW7zUXTDESrdVOJ7gnADW/CmGNqI1fb5KBnYIBNdtsyGmU2g2aCEOl9kMX2sh3cGjpLzLTvTZO3quVVeuIcJ5RZqzsPWanR2hXSNagHZUIC7HVqQemcAJJ7ypA1QeEclQkFLuEupCgtRdViRZSzL7mrmzL+PylCtna0/CXcDjl/oEHvd1zvgV3XHFNOI6fnhV3xpm7uf/7VbvNKcKL+uKi+sAE10U1I6IFvUNkVz/gvmJzpL+f0o/FmuBN4wi5kcYKrCLbB0Hu+vBypoqclIhfGXRE8aWynXOz369lIdbnIK5c9y6fzJ05+tvrbu9NfXdt7Ir5VbpbhM6AyippMleJmOMeoL+XLsTo X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: a0a5817f-af60-422e-79a3-08d92c02a4d6 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:51.8693 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7akVJV4b1yzpnjKnqycXRhYH4JITPJf3ozLUGrKR5X364jamiWbEQDuHnsOrzqAjg7Vr0CAlemB0oB9OH7q2WkM0GuiDzyNuXHThlaVr07w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3381 Received-SPF: pass client-ip=40.107.4.97; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" One more step closer to real .bdrv_open() handler: use more usual names for bs being initialized and its state. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/copy-before-write.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/block/copy-before-write.c b/block/copy-before-write.c index a4fee645fd..d7f1833efa 100644 --- a/block/copy-before-write.c +++ b/block/copy-before-write.c @@ -144,38 +144,37 @@ static void cbw_child_perm(BlockDriverState *bs, BdrvChild *c, } } -static int cbw_init(BlockDriverState *top, BlockDriverState *source, +static int cbw_init(BlockDriverState *bs, BlockDriverState *source, BlockDriverState *target, bool compress, Error **errp) { - BDRVCopyBeforeWriteState *state = top->opaque; + BDRVCopyBeforeWriteState *s = bs->opaque; - top->total_sectors = source->total_sectors; - top->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED | + bs->total_sectors = source->total_sectors; + bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED | (BDRV_REQ_FUA & source->supported_write_flags); - top->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED | + bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED | ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) & source->supported_zero_flags); bdrv_ref(target); - state->target = bdrv_attach_child(top, target, "target", &child_of_bds, - BDRV_CHILD_DATA, errp); - if (!state->target) { + s->target = bdrv_attach_child(bs, target, "target", &child_of_bds, + BDRV_CHILD_DATA, errp); + if (!s->target) { error_prepend(errp, "Cannot attach target child: "); return -EINVAL; } bdrv_ref(source); - top->file = bdrv_attach_child(top, source, "file", &child_of_bds, - BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY, - errp); - if (!top->file) { + bs->file = bdrv_attach_child(bs, source, "file", &child_of_bds, + BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY, + errp); + if (!bs->file) { error_prepend(errp, "Cannot attach file child: "); return -EINVAL; } - state->bcs = block_copy_state_new(top->file, state->target, false, compress, - errp); - if (!state->bcs) { + s->bcs = block_copy_state_new(bs->file, s->target, false, compress, errp); + if (!s->bcs) { error_prepend(errp, "Cannot create block-copy-state: "); return -EINVAL; } From patchwork Thu Jun 10 11:26:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312905 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3BFBC47094 for ; Thu, 10 Jun 2021 11:45:52 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 67A29613DE for ; Thu, 10 Jun 2021 11:45:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 67A29613DE Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJ8B-0007aK-Iz for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:45:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIq3-0003xS-U7; Thu, 10 Jun 2021 07:27:09 -0400 Received: from mail-eopbgr40090.outbound.protection.outlook.com ([40.107.4.90]:54851 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIq1-0004Ve-Dt; Thu, 10 Jun 2021 07:27:07 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VHJO/s76eBCY7nFgSwXYbNIVl/AIoaV6iFQMFkEqMHpO7vJz2y8UcA83BhEHXr2vVqG31f2BN73RMUYSYKz7CkNZ9ss7FBrEo3PB9VtpkR9pMOdQABPq9rIjwP/vL9R1i8z9EFcT7D2VhidnQDtnGkBPUXoGd38JFoFt0SULKQ0kFDIWEb3iPXvR0MUAEduM55LhppEpQDObZYZSU/1KQH95AD7Cz71pof2F/4wid+sAwoWeksjlF8jpEgumQqiqZGxpVhaLg2qGd4EmEjaD61ueLUcGft7RkTj5BRdFQgu/HXpBNnXF8hrETBWylw/SVDJB1GtMEyrW7qvi6VBTmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/q9xcd+/7Yq7hQ6FYf2psORRuWQaXyG4dc0/KfIYO+4=; b=lIFk1fLMjZ1U7JpicmK76RC3zGz0eTYzsS4qcvfSZTzp3Ik/b8e+bWgb/LcXqD7pMERCDYR46dac2lYZgOCkUqq1HtANLCNjf1h6wTuwArJ7iEHFwhdS+IvKtZlnqWw1gpHift7lP9cuvlG3Ns/+RdB0AuSld+OifLj92kwWJ+7NhFslnMtvKKSMVsPdZdsfkLge+GMU3phpZfWtICLlBkxurozfT1Q8VwfXt4Bz5MHbzyoUfJ7YErUhGkjvc5u6kTYYBM5LCg+8E9uYlCt8+ZLeDlpwQmZ5zzzLSagn+7hxMa/dLuTBZtKdxiKEfEz4HTU8nO7mpmnlgOpnnS3ByA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/q9xcd+/7Yq7hQ6FYf2psORRuWQaXyG4dc0/KfIYO+4=; b=dqSQJIbLPTSPowOvU6IjCMhjQn+rMU2Z5ebUZYiJ+MAWgVJFbDKgWxdiBY3DzoFYuVUiK8YR5D9Mq3M9yalL9a/g3yp5KbMIGW/mrlM+gcy2E8DfhYqFK9r3CJE0hLVupZWU7TKE4ETmJlF723XElJhrexMA05qNAc0AWeXyq+U= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3381.eurprd08.prod.outlook.com (2603:10a6:20b:43::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Thu, 10 Jun 2021 11:26:53 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:53 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 18/35] block/copy-before-write: cbw_init(): use file child after attaching Date: Thu, 10 Jun 2021 14:26:01 +0300 Message-Id: <20210610112618.127378-19-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 52285617-095e-4319-4254-08d92c02a57f X-MS-TrafficTypeDiagnostic: AM6PR08MB3381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:40; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UE8G9C/3CWGuz9kR9SBrAdXAM/9D2ueQuRWaF+/z7AdnapauE5XAZ5JHuIcqvxhRKGJ8xBhe8mST6sPr6FIb/DP/oOmTCQWrqNX1tejmhu1bFLf4jSelKbM5fQ6k4wydiQuVx65pIO/8wbyvGhdYxEOcj3zBV/ABsx71D/nnwjySug6C4Ro4CAu6aLQELLWXYu1iVEG5zEtNf5hONRQtkzw0J5ZxtiMHvWIBEa3uhozUyNdgW2xGWX2CdR+AaOStBshc4zjlTFlYHUAWsGrKAKC1UwubRvWOpqa7kvFHV9W14HGhCl6wZdZnOefx6stURFHskuR3/9OB8g1unuWJKLFdL9kJ8Qf3qmL4tDTBRbFXCRRpbJ25+0HD6sbfznv739GvcBqN/jJqmMQotM/ppOaQ70wLKuyPgp5me8vTqDHESjGobDo6xiqlcrdCWASWzY3ocAQOiHY14rFXHe6vFbxnC6Z2YYjv7sKYuTh71IjYGMBIWWMuNappUMG0p4LmlecXCyifKB8aP1wyeVv8l52bMX+/2UrsxX3691fpTL06rIgNpLQ8Yvx7RIIWXKXnziD6EoekyFlyR4ZTpcwQ0qlQuZuu/H3nN8tv3T0B3v627tmWWkqaEwdd0HtRCjfpcl614NBZCaRy4Mjq8iwYFMu2IgsGZJLEvXbZgVY2mZP92Mwt6qWJufq5kH9dz96a X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(39840400004)(136003)(376002)(346002)(2616005)(66476007)(83380400001)(956004)(8676002)(8936002)(38100700002)(6666004)(66946007)(1076003)(5660300002)(66556008)(316002)(26005)(4326008)(6512007)(478600001)(6486002)(186003)(2906002)(52116002)(38350700002)(6916009)(6506007)(36756003)(16526019)(86362001)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 5XvmndOrbCQKRLrqkdAsEhZ6ZvjT+wQwQM3ZGCMd+knGi8u0eSUYj6WZKmDB9/V19HUTckmr8JYFynqztxOPYxfH8dsihtHpJ5s56jbdzr5wI5UpFSYy1TU+nqoVUw5Nfptpgexzp6qKUVkJfdfX7teOiNPAXZk+t3DWOkqRrEHVVoOwhfc8SAalm/0jcKpVpdqAqXpKDwJYUWV2Z8Ll9uGLSGSuEseTS7+WIEQFWSoWTDlykk0sdIyOs0ZI0Ja7iFO5CzySAuyHafaMomlTjTQXMMcTXga9ZXMsaF4OVPvuIzCcyVBxF0o+zWSSYL1GXRO8BRKLALbMNuOcrQzi5xFe8GVqvaeWbo55u6moDmjtc0GDd9y4oekrqFb09h7qg/257fGE85O3+ILcvugYm5yUDSu0vGqA/yEjDg7P1vwTaczHb9InWiLIV0auHGAr145MNQE78teqoUD3BY+OzgUXOvPMzDmVvj8SLbQVAiVDrA+e/k5zCrwOwBfU7CKcJ8FfkMEfYnHBKVL/uuxUJByWRUx+/sBdRv59ggzyVN+obPCfKxvmIdwX5sVMAUTSdrGlX3QDPLPV5i7eCmLtTL2MVI68I4KvAhRABKrhLJVF2+72gpWZFqAJhK3TiZYnoTQoobC4VE64ORHK50MydaJoGDH1Fun57PYx0bQSrG6l2fecuK9QWbYEN7MkR7nPReUaU4Gsx1weRiwlCMu6tL/Zjat9zB3W1xyG5uEeyJoEf4KBPtk0nqAlzeLhOiPbRtZeiTV2qpjw+h1lS6svQrgna23G+gyLZ2/4/52uROeaNqds1ugc0+GQfl231d4j0xotwYovdlwE8EgRrzz6ATZBC/rNCNBSlfELxuWoOrlue6s8cZQvbBlzZHoAr5+Y+5ht794E0IL6ufLKcFTHkwxILq4CwHBjTZ2oh1WnPMaHBM7p04V7xpTZhFj6E6yk5e+KD134AeqTyeXqMVnEaT5VG7KezlO3EdJDsLXFKu275EnjA8/5Uj5S5PeER2+4HH/giPG6KlK9kpeVOLzC7wuoiGJYvohdS/wP/Zezj5R3h7BjLsio3BgiJtmUB+dkfjSVXQYXkvWcbK/lPfnXQmYTEswmHrSNcd7q7ERRda1t66/BIY+xrspVtn9YPn7gP8MCes9YFj+Aa47eEMrXNmDNEGlqF2vTxF5fI6umIzsc8OXW7zT9jgWEWQGYqqHxY0Y3KbRMg5jDsoJcer3pN49aBkUPWIMMvravY1J0EJFMtmxHEawAMV9JmyPMgUVAUqUnxe0jl/M8OvQQDuqWhGKzTlCUYiqH9gM2hMp7Ww9TudVRLHqYDeGrz23qiYTF X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 52285617-095e-4319-4254-08d92c02a57f X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:52.9206 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: MOi7SVQYiXOXA/h9ojJgen5JzQE/rJYf5G5jQlB/tGZnSfzReHMioJSyvRjAA0x3yCLRhdH0wa7qQDwJo3Y8raynHwWUhoHGYvnQYkiFJUA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3381 Received-SPF: pass client-ip=40.107.4.90; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" In the next commit we'll get rid of source argument of cbw_init(). Prepare to it now, to make next commit simpler: move the code block that uses source below attaching the child and use bs->file->bs instead of source variable. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/copy-before-write.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/block/copy-before-write.c b/block/copy-before-write.c index d7f1833efa..4858dcf8ff 100644 --- a/block/copy-before-write.c +++ b/block/copy-before-write.c @@ -149,13 +149,6 @@ static int cbw_init(BlockDriverState *bs, BlockDriverState *source, { BDRVCopyBeforeWriteState *s = bs->opaque; - bs->total_sectors = source->total_sectors; - bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED | - (BDRV_REQ_FUA & source->supported_write_flags); - bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED | - ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) & - source->supported_zero_flags); - bdrv_ref(target); s->target = bdrv_attach_child(bs, target, "target", &child_of_bds, BDRV_CHILD_DATA, errp); @@ -173,6 +166,13 @@ static int cbw_init(BlockDriverState *bs, BlockDriverState *source, return -EINVAL; } + bs->total_sectors = bs->file->bs->total_sectors; + bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED | + (BDRV_REQ_FUA & bs->file->bs->supported_write_flags); + bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED | + ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) & + bs->file->bs->supported_zero_flags); + s->bcs = block_copy_state_new(bs->file, s->target, false, compress, errp); if (!s->bcs) { error_prepend(errp, "Cannot create block-copy-state: "); From patchwork Thu Jun 10 11:26:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312901 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78B68C47094 for ; Thu, 10 Jun 2021 11:44:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DF71A613DE for ; Thu, 10 Jun 2021 11:44:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF71A613DE Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJ6e-0003ms-U3 for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:44:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIq9-00040J-Kw; Thu, 10 Jun 2021 07:27:13 -0400 Received: from mail-eopbgr40097.outbound.protection.outlook.com ([40.107.4.97]:58455 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIq5-0004QC-20; Thu, 10 Jun 2021 07:27:13 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YhkJdsZzl8t1KUSvSZJ5FZnOl9MyHtUGtvKb2EyzBRC/QvAsK0iWrRTk+dx/f6/d8SbAtWM7PlVUxsEZ3eag7OOMoqTASQa2en/qgXmeYf/vrqLDIIJD7d6hDzLvr4ln6C9NKZorw22y6BU1fr7/lJ09J4zWkRK+3CnV0hNNH4P0GBanxIrbV9MeOKxuTjaO3e+ASR833O7SWVD4TMagzJssQ6LRzDyKxa+d79dtfVAZu6cA9QPsuGq03UI5PYRUPOntN3QQiDztx+NEkeHQrqNsJgfH6jdTbmbr7+fAWwCY3aUbp+M9l3pFH8/1zyAZAlb4NV+an/nUIj6wbYqlNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zzEbTus52yZW9/K2jWF0Zh8FB09qCBl7UQJ9/5sI064=; b=IDHeP9225Fh0FpSKpAzz9oZaHTjmXHl7ldL4kF3rKNaL5xi8yvV+smNa/US2AZaqd9zknhKuOaP9+gCQPUwiHF14mTi1NaBb/SmoYsdZkVCOZvmCpblQDh4XfYXu/1dXQYMfJrasqXghn+C42NU6laS/WbHUc/InXRWOARykqeR/xuMWUj33n1EfuBs9C5HKpeMXixX2MRS6vcfVGJs0RC88I8YvPTQjYEsIWJtzWl4fTj3EjpkiD3psgCOzuyleGv1yUKs37lj7WflSLKQQIUR1drnZGmoMWk6sj9jxjW6G/DPbq26JML7cRLzOfjPzcI8QyDOYz/Hgwl1RyGvHLA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zzEbTus52yZW9/K2jWF0Zh8FB09qCBl7UQJ9/5sI064=; b=L1vfq5BmGCzzEWUQVlSMfRNtzturlp/bwiHAKN6WsNBdHuXFzVM9/6duII71gTPV5/pEYe9ZHJU8qRQUkgIAsf7nUyGVqQYl7HpHFsxcW4NjJ2LY1X6JMl07gjsw+6lpO4EAMthTSgRK5W9r+QatNCm9CvdlYAh4gc8PX9lP6ds= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3381.eurprd08.prod.outlook.com (2603:10a6:20b:43::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Thu, 10 Jun 2021 11:26:54 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:54 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 19/35] block/copy-before-write: bdrv_cbw_append(): drop unused compress arg Date: Thu, 10 Jun 2021 14:26:02 +0300 Message-Id: <20210610112618.127378-20-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:53 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6e90de93-48d6-4731-7f2d-08d92c02a61c X-MS-TrafficTypeDiagnostic: AM6PR08MB3381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:60; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x5Ufm+BfjvGoSrNi7kveHlDov3JU+nb10UJPYOI+2XxOeHWp/BxxmCND4fL9q4qfLGmeC8+e1Kjfu2i4mOq/7Jetk7iW0GkVjRp17SUqBVFIeqsaqLlwouprmP0GAraX9nOEyt32vU2WbantuZlWY9wAZpRNgCKhYiBxzcJGuGXg5y+GttIhQr1EdI7+gud2s6M9Sy/pb4/h8HpUV6e7FI4MGPkyLtmSATJbbHqydmy93bZD93HGzkepOHiHAh2cwSHCZhpzJcAswQrjLfgZzfDEnd2dUqFZVo5fQhsq1FL7dJp0mxiA0UvLwu3lyh1fylOnEHxIDJYoKDFRYDt5XaGOBP/7nbMsbwUiiOhVfE3CMMgb55CAi8m37pyJh08n5sItTxD9FbfuEbdlcwXciN0qtlielLl0Uxdx8gsL0pDkqU833DNOnB+JKtAiM8bZ26YozNWxdRd0RL6RFmfKOPZK3vUKHkNhkIhgyMUyYA4gwT3RIi5sb4GlumZqrsRDGbwmc7aJn+lSA9yEdTuSm4sk009sZFaX8H0mY/kQTUl6Ir5qakAzlKN/z3NE3GhfBnKRcUxN9BTpcJI+Y3knI6aeZzVf1VefUEdEivciJDeLNR0a3ihtDnyPv4Ce5xPq/5BbE+55i0UHxlf+H42JLmyF30lfTCj53ke0YFCvkswMe69dfHBT4FwQx/IMFBi2 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(39840400004)(136003)(376002)(346002)(2616005)(66476007)(83380400001)(956004)(8676002)(8936002)(38100700002)(6666004)(66946007)(1076003)(5660300002)(66556008)(316002)(26005)(4326008)(6512007)(478600001)(6486002)(186003)(2906002)(52116002)(38350700002)(6916009)(6506007)(36756003)(16526019)(86362001)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: Gk5AfQ/EN4a6Kq/ZOiCpt0ptynv+++aHmKrY1sPLHqBhW3k27P8xKbsQTaPpyj2/nQW9I+R/43343xETQAobGkgHsYIcY73x8CAOLUHAu+IcLXxX+fojWuEb8tpFiP/R+IlNMGDaMz0pHu9y0QyWVFoudtEjKXna593koY+Y5kZmmuuPuuCz2RXNwFtbdApxZYWs/l27TpFFJvUVhJL/PDFQr/URK3MwqRBs7qPLIV/Frij0fANjOjAt6sAVLOdJHm5evAl7DLnh60zI2R83iVT2XIU1fd3eSVfHniiFJA1ISznPdOgMqPWnxd+BEOBaf9xIXgLncRwiee6LRzcJNsDUQJK+dMRRkxveA6OetdJPMsQLR8Dq6k91LHbsDWdtFnzgk5gGG/yW0J9LLuAWbkI2hcvd4Byv6LHcnFIxm2jD73KkUJ6YrCuXZ2/pbjlpmq6opubLra1xny6otVJgLoPp7BbjxxqAN3RgghNRwswZ1RUZpAAjF4t6uhIMKYG7H8JADEe6ez9/HpPpnSf+4m8wW+z83M2iKe/kdGlV01RRWgaERNxQ9J3GvDRFForQ+0fcwLAqgLbrr7pzHCZD9Lkz5mFbkgQuphfQVKh45e3PnfRAoRRXlOiEvJZo5jNH0tspv5m0Oy4zPWPUKeHUIBUidKJbHY6S6eH9GoBieEXcWMJ1C4hManDWzfC8XPb/4IeONtdzpvFzxP5cUFiOyOGqhyYViKrfWEU9NDT2jY5GUS5fy3rWIsoJb/Rwi3mZsqy6+eaybscytqOwEBKNAskuTFxsZdSTKIu95tVJKZn+YV7iQgcWCAZrM6l7CFmXZGViYjd4Oay1MuScIUgXbyVQnenQn4Vs6JFgESPppXoLHTdf+G02F/w/sImi4BTm5+Ij6vVcsy0GoeLdZZA4fVrJ91ZPAaKQAVC4TQKuc5P07fkJMTBbRAXFg0Ajwh+drf+xjWzFxLhVf6alv1zqCe9DxV0KWmbldN1ch1m/aQ8/FWjXbgQ6cbIsaYve38RZQJ/fmaYnRXNM8LXwf4DDgD/c4Fi28HnlTD/vdG/1U0Kzg1H5fVZ1NlHvWDj6acwC54wdLvnuX/UrdUGGgGUnnqOJJl953W1TAh2iGxKsZcq0g4aUakUWs//ryyHFbKSFAC6P0Ah4YVPDv12eEiVUwy0a5YtGZBqAe4M+MCTdr9Pqdm3FCK3EMFsVYeuwFN4aGu05YaHZWTpONhRZgdp9p0RW1g2uP6FG+W8tRxL2nf4hjVvJ2H4OIISWNVEc8O22mI07oW5IJVlA1+hJd1ZV9pIcaCcRuW5Gyaypsm0Dla4MCutG46uM1A1V4hYxMDr1 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6e90de93-48d6-4731-7f2d-08d92c02a61c X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:53.9511 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pG4IUHdR4mvLkNELU0UcNDz75ltztQhTD5P5ogeJFNSz4FECbsr7URg+9fU2Dd+FeCYtg3OF7rpZdoTDtJoviUHdnQyjaOEMjc4T0lqJ04Y= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3381 Received-SPF: pass client-ip=40.107.4.97; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/copy-before-write.h | 1 - block/backup.c | 2 +- block/copy-before-write.c | 7 +++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/block/copy-before-write.h b/block/copy-before-write.h index b386fd8f01..51847e711a 100644 --- a/block/copy-before-write.h +++ b/block/copy-before-write.h @@ -32,7 +32,6 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, BlockDriverState *target, const char *filter_node_name, - bool compress, BlockCopyState **bcs, Error **errp); void bdrv_cbw_drop(BlockDriverState *bs); diff --git a/block/backup.c b/block/backup.c index 83516297cb..4869f1e5da 100644 --- a/block/backup.c +++ b/block/backup.c @@ -452,7 +452,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, goto error; } - cbw = bdrv_cbw_append(bs, target, filter_node_name, false, &bcs, errp); + cbw = bdrv_cbw_append(bs, target, filter_node_name, &bcs, errp); if (!cbw) { goto error; } diff --git a/block/copy-before-write.c b/block/copy-before-write.c index 4858dcf8ff..1e7180760a 100644 --- a/block/copy-before-write.c +++ b/block/copy-before-write.c @@ -145,7 +145,7 @@ static void cbw_child_perm(BlockDriverState *bs, BdrvChild *c, } static int cbw_init(BlockDriverState *bs, BlockDriverState *source, - BlockDriverState *target, bool compress, Error **errp) + BlockDriverState *target, Error **errp) { BDRVCopyBeforeWriteState *s = bs->opaque; @@ -173,7 +173,7 @@ static int cbw_init(BlockDriverState *bs, BlockDriverState *source, ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) & bs->file->bs->supported_zero_flags); - s->bcs = block_copy_state_new(bs->file, s->target, false, compress, errp); + s->bcs = block_copy_state_new(bs->file, s->target, false, false, errp); if (!s->bcs) { error_prepend(errp, "Cannot create block-copy-state: "); return -EINVAL; @@ -202,7 +202,6 @@ BlockDriver bdrv_cbw_filter = { BlockDriverState *bdrv_cbw_append(BlockDriverState *source, BlockDriverState *target, const char *filter_node_name, - bool compress, BlockCopyState **bcs, Error **errp) { @@ -221,7 +220,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, } state = top->opaque; - ret = cbw_init(top, source, target, compress, errp); + ret = cbw_init(top, source, target, errp); if (ret < 0) { goto fail; } From patchwork Thu Jun 10 11:26:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312913 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3610C48BDF for ; Thu, 10 Jun 2021 11:47:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1DF1B613CA for ; Thu, 10 Jun 2021 11:47:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1DF1B613CA Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJAC-0003YS-4A for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:47:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIq9-00040I-I3; Thu, 10 Jun 2021 07:27:13 -0400 Received: from mail-eopbgr40090.outbound.protection.outlook.com ([40.107.4.90]:54851 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIq5-0004Ve-1Z; Thu, 10 Jun 2021 07:27:11 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oRgSQ1uDOWKd9qn3+o/Qr+pw54k81UDDsmFpoLxTo1x3oJyjioUoEodW4jJz0zSaFKr4rBhjiS9eIDtFFLXpw44dthOR/bCFk381k8cDIeX7Gth/qb8dGVuxYK51tRPr5lT/X89tZrP7rY2rKw75Z76M3r5QkvCOdglvPVLcULXVZh9RytyRdhFJut90p2LsPPTaPyGv7x1PIGWKXLOVAoQqfN5rdKk/7S3xXybNsFJn7MDtlzz/mz5BsJMQmolFImthPlj2OBlC9inF1qiHwYOKdL/8991G0Aige3/qSZuofCRQieDkzx6NSczCjK84qfKFiOzTYlM84Y31/5Z8zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=A6gZyGdYcdOdZ98c6iLrdZgo9WnaPWMocI/jDACuhxI=; b=fbLv+A16cCsv+x0JlfXgIjZZronOW80GRS0UHBq0r9KaJNNmej42RXVzLQ2FZ1JtGhEdwemFBCuIda/UMGw9XEaBaIXR48qgqYlTtLh8R/5lIG1sZQMX92bIWFLq9kxDP80VTlIw5Hmu67Krmqm14p/OtXvaBY65LacQ/vPmwJEM3HL3uvsOSqznYCVJ8AtGcX1wgAz0kEHwZJj/tt7M7+b9ZX1spsxBiPgERQkYkARppIHSx9mvcOq0BlSjA3gYtW/hMboBPjSL6qJC1Xcy82BdXx6SaCtaevwEXwgt6H02rjlF+GJth8ebpIiOQAEJ0BJJh4ePz/OAlQtaFQzAbg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=A6gZyGdYcdOdZ98c6iLrdZgo9WnaPWMocI/jDACuhxI=; b=wNbpKJ2NcShbDxKhFcIUXfXjJkuvQRAbmNoUmjP1WzcIwwmIRAFrgKTeQ6ca9P65OUIvRcuLHpdi78gfsp0lIWEWPIKRCOEahgj+TYYjX7V9W5zZdL1hSDlCWDyiXYjqBglu3yUgr/ZcYJXsLnq1Mow3tMO0suC3M2ccnBbz4fY= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3381.eurprd08.prod.outlook.com (2603:10a6:20b:43::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Thu, 10 Jun 2021 11:26:54 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:54 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 20/35] block/copy-before-write: cbw_init(): use options Date: Thu, 10 Jun 2021 14:26:03 +0300 Message-Id: <20210610112618.127378-21-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e6a7c1fb-c742-4fa8-cf56-08d92c02a6b3 X-MS-TrafficTypeDiagnostic: AM6PR08MB3381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:110; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: omlJ5hw+P84KotOeJ1bNppe1U0jsNqrlv/G7WUc5dtpCR6FEPQZV9s4MAKNg4JXL6oTaCLST7/XMA+t5TRmsjYZ7k32nLQRd/oT25XABPdIUAHdH04JnjeCT3FqUnB/d1EE5qlQVUY2srcLsjooyzqIWX2prSQdSUmXjakFRIDHu9xxoou/8qfEIOA2Ptgl0LlK/8dTj7x0vK50ie2Vx+nN9PvcSDblxr0UKPlfzHuS7acLO91+NGpehwdVnwqSGgchpJA7r+t1wlcLo58IStb2yKKmdnPKiVKGyA89lRnxAn02ata8u3VeoYIUGCJQx+sjgM7jQk0t9V7cDE0UpiyKhrGez5gnVTYw5uzy23VtVCMh6RiR1FGws6imrFHep+bHMVW48CBAjUzcjqXM39I5vm8RxxxUOZ7vCZMGVxlvbUUfo3skqJGpaO+l5y2tcWDJ1Bmm1TcB3yyi4J8LMLNi0eNxYrElhlmH87xEUqLEeHpoTQCTWw8Ww7aRrt6yb8AbvIAB/U8hOdUYM2quwkIeZvekqSpV6wXyqh0MepA6Lp2DeiIuHEbuT87JkzWmUrsOfmsHyNzgk3k5KQgZ1QpVXP28uo0IMUD67/hmjZcZv/VdQwQdH9Ib2SKNPvR0MV5r4iuWAMhnhxNJo5gHyk/d331917mVykPjzV+e8WYN9PpEQpsf6kswQRmrJwkJN X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(39840400004)(136003)(376002)(346002)(2616005)(66476007)(83380400001)(956004)(8676002)(8936002)(38100700002)(6666004)(66946007)(1076003)(5660300002)(66556008)(316002)(26005)(4326008)(6512007)(478600001)(6486002)(186003)(2906002)(52116002)(38350700002)(6916009)(6506007)(36756003)(16526019)(86362001)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: y/KVHr9joHz0qq2fCO8ln/3JFjCOc8hcW3+t9KN0JbZ1R63Ux8W84avH4Kxa10o2ySGWTaPWfkJzLWeTFWAjA638l2iksbD/Y27uN0fbvkAYnTosLQSaXYJIbirL7UptlKV+XpuEkQKvDOCKuAuCfdXP70jyUoRqBdpKF8nRENQpJgSv0Q1rlxUm6GxJIsFh6JxuEpPP3iSN7Zd1RJg8wO6W9wFyH+qW1zkrQcsFwEOkiX97AM9M4uhv/wj3wk871QeTFaRVxJCOVtPfHxk73+NQiluNlxyMitXibqkoayXBuWTuCSxE+N2klu3S+gIkHZvAmQuaa8hXNPbe4kO5rR/MiaxUVwY8dz6ToRvjQuEDr3mTbNzLU1itYZWb4ncsGryP5TDYpl912G1isNkC5NscBom/THsLhFHVyOUfE+CJxlqtWgOuEqGoFRa116tbt8Ubzr+cZszx+RUT2Y5Mog87QmFyYBhkPSGLvJ0Ckw1W2KY/BhzaDQpkYdNyfVYtlCsiQeUzE+CB0hItCTQUZrivCLqeKYjs1FzvF9+G1+JIm69vxrYa3hYll+VWkLZZJE4evbMnngiW73Q3RdFUZLo7i/PYAP4c+g8MlCrivbr7HiwPvNluP/B7CxSZHPpqHPUuamvM7h2FGZa5QylMAD8/DkP/CYnPDytdvlesEshRlueapdjlHp6EZj7UvfPqsmBuIWou9paPJtIj0hOsYRDYctft8EhEtNhZu6+Z7gif4aqcb6YOwTXDGSTMg4kehbjvTU//b+JilBJhq/EqfbclWwzpFEzFrD9bwyphzDnapNyB/+mp4Rdk2B8sWs/uU1Fj1WwUp63MawPWC3Fl82JiGPKkRSTX0WL4kSSQy2T4GPNphEJO9D8wi6VTKTZZusB476UeTLuQfvwmKsmwfHDZ2Qgwc+WckNWY9IkbEB/W4r79qDKPQUItEUwithEEo5lpZhCp6Ljkl4SCWlWqg5Y3LbWo209gX5K9VtCTU5cv3uRlt4QOx+hK4cOk/GSrfFk5xoT2q08TqFFpSYx3S/3ZQG+aDwfSLhSxWfByN2JejAZJ0wnDccrOB+rbuLqbZ1tKE9boD8+/n+P+z7NSDTtrtDUYkb+nmHW9sI8K/TAZ2AGO0fZMwlDJW2O4A4DIe1cxiZjjRI2GGz9J6Uvt3BxP5JrYQDZUeVKArKDHmaqK+XP7XGcjJ4aq7xwZ5OMcCmfigNlpxFA30FAXGTdBH9tgWHxRRAgiPOxd3KIruQWawdGrzgEswi8ibEIwqAn8yJMsk6l1WkWiFbIllPv52UbOr7dC8H8BJ+xVqH6l4mma1Qs131wiJS97WI4ZXMDR X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6a7c1fb-c742-4fa8-cf56-08d92c02a6b3 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:54.9567 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: SNetw7xDW4rhLRU2jtrPaxm6dYaZjAoDJkawr4rJ918aro6o+hxcnvNXWqT8iKvh2HdSqaOKpkVrWFf5/ld3Eg9xXk++TAJpf0lOR+mSN/M= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3381 Received-SPF: pass client-ip=40.107.4.90; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" One more step closer to .bdrv_open(): use options instead of plain arguments. Move to bdrv_open_child() calls, native for drive open handlers. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/copy-before-write.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/block/copy-before-write.c b/block/copy-before-write.c index 1e7180760a..1cefcade78 100644 --- a/block/copy-before-write.c +++ b/block/copy-before-write.c @@ -144,25 +144,20 @@ static void cbw_child_perm(BlockDriverState *bs, BdrvChild *c, } } -static int cbw_init(BlockDriverState *bs, BlockDriverState *source, - BlockDriverState *target, Error **errp) +static int cbw_init(BlockDriverState *bs, QDict *options, Error **errp) { BDRVCopyBeforeWriteState *s = bs->opaque; - bdrv_ref(target); - s->target = bdrv_attach_child(bs, target, "target", &child_of_bds, - BDRV_CHILD_DATA, errp); - if (!s->target) { - error_prepend(errp, "Cannot attach target child: "); + bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds, + BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY, + false, errp); + if (!bs->file) { return -EINVAL; } - bdrv_ref(source); - bs->file = bdrv_attach_child(bs, source, "file", &child_of_bds, - BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY, - errp); - if (!bs->file) { - error_prepend(errp, "Cannot attach file child: "); + s->target = bdrv_open_child(NULL, options, "target", bs, &child_of_bds, + BDRV_CHILD_DATA, false, errp); + if (!s->target) { return -EINVAL; } @@ -209,6 +204,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, int ret; BDRVCopyBeforeWriteState *state; BlockDriverState *top; + QDict *opts; assert(source->total_sectors == target->total_sectors); @@ -220,7 +216,12 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, } state = top->opaque; - ret = cbw_init(top, source, target, errp); + opts = qdict_new(); + qdict_put_str(opts, "file", bdrv_get_node_name(source)); + qdict_put_str(opts, "target", bdrv_get_node_name(target)); + + ret = cbw_init(top, opts, errp); + qobject_unref(opts); if (ret < 0) { goto fail; } From patchwork Thu Jun 10 11:26:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312915 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80437C47094 for ; Thu, 10 Jun 2021 11:49:05 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D8A2760FD8 for ; Thu, 10 Jun 2021 11:49:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D8A2760FD8 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJBH-0006PF-VO for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:49:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqF-00042Y-TC; Thu, 10 Jun 2021 07:27:23 -0400 Received: from mail-eopbgr40090.outbound.protection.outlook.com ([40.107.4.90]:54851 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqB-0004Ve-2H; Thu, 10 Jun 2021 07:27:19 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eEax5TsGZkANuIHlHkpB8bdPLwBwSdh2N6wb8dwjOp4x35tBQBaca2jkSnMb6wTPpjZmTV1WO0i8xQ+X4agd/JdRqJdjMmqqvErGmiBkCYVvovJLzV56dSQjpv5rlojIgg1jYlTJsoXixkyPrrFg5GVMwIYgCONkwnOCG2UEemos5LHuo/KRt33B+0660MWtiHHwGADJ+aA5qTzUuUkieOGeG423g9dWeLmA7OBd6yDgpKVOyP+2cLeowIqqHFplmRWOoJSV00bQrzPis2f1AqD3an3IoEkNxAXG2yohY8yT4rblc0oMNTyjx5hEFDffJ0r8EdvrZYga8HoeIoToRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Vfqnsp7hFTsT4dqLeM7DgaoDGD1UcygGkQvv816ee3Q=; b=NYhfBN/UVvrIzf/uq9EEiAhzrzgihn7ItY5zICwdtAoGTavk27JGRIVioORIdJokW8tSKmjHS/RmLQLd6USl7oKUU3eyaM/dgh6JpNcSAjKxCFHFqJeZAVMT65VUqwU3B0xf37rlESucw2gaAQkOVvqnFcdzriUVLNf0HuXfGKT3K7EUS4osgEKvnbOWDkUpcB9BR7Y4g3hhPhWCZJIV4tppvUc1RahNRS4fZXsCIuz42HeG5RK7VB+P6Qeruxlr0gtkE8eE28xIwWcQY/tVP9DC9McWDRHYmCL69Ssuevfy6sCvrTvDRDlPuCUzZL14rbuaUZpE008BYxIXj3/Waw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Vfqnsp7hFTsT4dqLeM7DgaoDGD1UcygGkQvv816ee3Q=; b=qFehPKET+MS7GaZtyxzLsYWrPEZavrxw5TgLZhZ8UtwipwHK2lHPkcTyTW0c8o8oak8W8NYgnMTG4fuzQGGC3isVGM+qUeMi+CkrcRB4AD2ZMg0Tt1cK3vWpKuDXsrnFB0KmINs7chaCD9QsiQciYf5jGo0ag7x/35d0g+lyd7s= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3381.eurprd08.prod.outlook.com (2603:10a6:20b:43::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Thu, 10 Jun 2021 11:26:56 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:56 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 21/35] block/copy-before-write: initialize block-copy bitmap Date: Thu, 10 Jun 2021 14:26:04 +0300 Message-Id: <20210610112618.127378-22-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eaf45345-0a4b-4831-9496-08d92c02a757 X-MS-TrafficTypeDiagnostic: AM6PR08MB3381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:194; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o3LZlObp0NNcBZDvdZtU+Vs0ftSmF85or/5FDJO8np4hTkRdRquMoxsCFgPLVNOaBYLMmvN/FKnV8UNU6Xzj5v6P+yXCd/D2YoKY69ayAsFe7KSKfLMEln6NY2JfhrEzfgpqbk9bbwRLr3RCBZHGCMv5T2YYZzf5PnPeXu/eYbTocOcQqAi48iqAfxcyW/HpboxYfiHmJt3c52rajtJR+ZoiyM3haAzQ4T3tr6ZG8AxyH0Z2k4gjQ5BmFT7nQIrtaOyCZw3q0JiNqZMvDrffKvdaDWV9yhvHbRESCIGpByxXfk8/ml4PtiLQdNeHtDHUTRw4Pe42F00SeVpa1XANsMY6q+om5r+2Ilq8dodcRtw2Ihgy8KAmqQ8fOZERdonSNJWG7XMTHTyA2h6Z0cN9TQR22j7sJ4+23mySTMwPJ3RV9R3xowLfP7lIZ2bic9IBP0xc2Mv/urn2e0AzcnMgOf3f3Y9lyiPLAY1wJmzdfZPyw7/d4ICc5MtxOypvgotYlG0xbf9eokyTR1TU4pEmrrN5yA9BLP5+XA/2az5g8GorgNaKeJWfEmcA3O2nuNseF+OXVOXCE3PhvHCFp0tZPQZfagNf/fT9Ep6NugcMpfXL/+Ik6Qdpfsj52rDxpdL71rlUtHAFpiSNt7oBHnwI3RGsMGhnk4sbB05I58EX5x9t8Gr+MrNxK/NZz1mhOCGO X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(39840400004)(136003)(376002)(346002)(2616005)(66476007)(83380400001)(956004)(8676002)(8936002)(38100700002)(6666004)(66946007)(1076003)(5660300002)(66556008)(316002)(26005)(4326008)(6512007)(478600001)(6486002)(186003)(2906002)(52116002)(38350700002)(6916009)(6506007)(36756003)(16526019)(86362001)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: CEHL18ITqfTiMoI4CKG1rgri9e1AFTQUYbDbhG7E60++jYpapLxXQYx3XZd9MCznVedpZunYAfSbaRgkoUb73yScWsdL4H1eRRIpIsExBNLe95TSkrmP2J1boICbMHTF2k/ZwvOSEkniCv8PjBU5O36oFaV/gAl6he0FXS3Zu6YwiJ3LkOW8xgnG6bVSe/Z3aLK1MTVUJef8qDS2T74ektSkebe0CObQ0wGgsYSxml0i7zc4yjedEXuVQrP2GzUZRdpPso4+hmgZDRL/mI9joGkAnrpa6VX1/9kEd+qodsYkGbcdRVyZgojz71pciGfJ/l5f6RfYJa0Qmw4U8gsDq463fSMetoKcVSl+TIHN1Vx6fohectmJhZbH2uAEF3sudsjxCkw1e3tzC2OsGXYgN7TFei2ag1TGa4KpDWUQrTFDtKe8udZKdykxJTgc4N7dSfQvzPy4bziwymrL7kCt/OH9tHU9tsntg8mpOi+I4AX3KyHdR5ZnEpbtyn5/9tGQLLNzq2qQRETOIm6aAv4dDu61HMesupbJbyhyIFaGjEx/WV3ogwlnNwdlROiYHrT5lEsn6ZdN+QRblN33q0gX+mC0xBNZKKKIUuVl+UqCbhuyP2g5QEcESaJJR1/dcDwNoLX+7ibDJb5qVISdUOuOfbYeVKIyouwZcfh21STIi6/9+UsT31t/TuMziC8vu9E/Sm+H1t8O+gu0DdPBHnxYNAKvPFfxEHbyGgvI/d8S2lE/NQh+nemU/nm8gQnzlkuDPq3WCbGDZ5csmGwbVT3oadV1cUZY+iDTX73eigDbj/jlPuhZbBX6+r++HRigTx18cmqIDNbHnC+pNz81DI37GaaoUS7/WjIFArSyMxQ3037CwBxwb20/SM/KB5e0ESCeL20/uF7RLfG8teLf9iVDrr3v7JGqylF8sZQzSMR+SFt8AEzMRSF/JRrbmU1uBfCUyUDUyQCb8riWYBWEMPXNq2jZvtxwU4ct+j78rssp+uGamoz/4Sw4qHbBRbEfEDk4mKW195DeYYIoFQkG1Qv1tw1hvJ5CHGxIl75MLByodDb1YFnh1Km2ozHIW6usCyJJwoSe/l7g2dRnMWSl8EfOc3yW7FtpmocE0HFPg4a6RhvRY/5ZRCytcmWyrcajzN6zDCtwUEiHp6bsWfRtKHii40tVyMUbL8RyuJIkmWpVTAPX9vPoD6fnF/lT3g27kqXj7icZ/c9JxUSl7gaRnZHAj/9aU7CoNWqqvKbqSDkXfoAlUEWXDdIincIB8k2JU1YjDLLSUXe8b1l8RRMHjFm3jzVcyaJwNnqrPo5gAET90G/q4Nf7RK0BAOudGdx5fJFG X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: eaf45345-0a4b-4831-9496-08d92c02a757 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:56.0021 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ggjL7DBchb/AvZMjqV0aUYpxnmQfg3FFJEPSsdZ6UAvR1S5pm0yFCTyzFViO9/3XopxojoS55Uk36mq6gygYfKVq2MPVQ7Nq6GxJGvC17JI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3381 Received-SPF: pass client-ip=40.107.4.90; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We are going to publish copy-before-write filter to be used in separate of backup. Future step would support bitmap for the filter. But let's start from full set bitmap. We have to modify backup, as bitmap is first initialized by copy-before-write filter, and then backup modifies it. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/backup.c | 16 +++++++--------- block/copy-before-write.c | 4 ++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/block/backup.c b/block/backup.c index 4869f1e5da..687d2882bc 100644 --- a/block/backup.c +++ b/block/backup.c @@ -233,18 +233,16 @@ static void backup_init_bcs_bitmap(BackupBlockJob *job) BdrvDirtyBitmap *bcs_bitmap = block_copy_dirty_bitmap(job->bcs); if (job->sync_mode == MIRROR_SYNC_MODE_BITMAP) { + bdrv_clear_dirty_bitmap(bcs_bitmap, NULL); ret = bdrv_dirty_bitmap_merge_internal(bcs_bitmap, job->sync_bitmap, NULL, true); assert(ret); - } else { - if (job->sync_mode == MIRROR_SYNC_MODE_TOP) { - /* - * We can't hog the coroutine to initialize this thoroughly. - * Set a flag and resume work when we are able to yield safely. - */ - block_copy_set_skip_unallocated(job->bcs, true); - } - bdrv_set_dirty_bitmap(bcs_bitmap, 0, job->len); + } else if (job->sync_mode == MIRROR_SYNC_MODE_TOP) { + /* + * We can't hog the coroutine to initialize this thoroughly. + * Set a flag and resume work when we are able to yield safely. + */ + block_copy_set_skip_unallocated(job->bcs, true); } estimate = bdrv_get_dirty_count(bcs_bitmap); diff --git a/block/copy-before-write.c b/block/copy-before-write.c index 1cefcade78..2efe098aae 100644 --- a/block/copy-before-write.c +++ b/block/copy-before-write.c @@ -147,6 +147,7 @@ static void cbw_child_perm(BlockDriverState *bs, BdrvChild *c, static int cbw_init(BlockDriverState *bs, QDict *options, Error **errp) { BDRVCopyBeforeWriteState *s = bs->opaque; + BdrvDirtyBitmap *copy_bitmap; bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds, BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY, @@ -174,6 +175,9 @@ static int cbw_init(BlockDriverState *bs, QDict *options, Error **errp) return -EINVAL; } + copy_bitmap = block_copy_dirty_bitmap(s->bcs); + bdrv_set_dirty_bitmap(copy_bitmap, 0, bdrv_dirty_bitmap_size(copy_bitmap)); + return 0; } From patchwork Thu Jun 10 11:26:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312925 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C72AC47094 for ; Thu, 10 Jun 2021 11:52:05 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2618C613CA for ; Thu, 10 Jun 2021 11:52:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2618C613CA Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJEC-00072m-5I for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:52:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqN-000446-Uw; Thu, 10 Jun 2021 07:27:30 -0400 Received: from mail-eopbgr40097.outbound.protection.outlook.com ([40.107.4.97]:58455 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqB-0004QC-26; Thu, 10 Jun 2021 07:27:27 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cDsOx4bpprdpQw9UOxTkQKgTjx2ouo9JcU9wlrEH0kD7gPZlaUuhwX6GuMIecqnuhNNJUiwZBVaeoH1ybHBI0GvYLA6E/ksepGRJF2SAWz9B92Zc0k6CjcgPYZgqn04PtXHY/gUzk7NPFAFrOLPvSqsFH0o8xw8HXBwM2WUS6s41vhszr0I5lpjPE+C1pVA5QR+rLwdgLR4frcm+XnfC2DnED5pPjYdUnc6YIzrdiW1eG/yxJ229IcJphlI1gWTqbYgRlxi8WxizBYB4he7BI1rhabYOPK9hc+Olz3hP6dB/gHVURBqQgHhbM0Si/y4zR7VCMjrPPBzSrqRSoyLu7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PdC11N3Lp8BlMzO50aHxEgkk+BSGk01QtHBfkIoeXxY=; b=O4HCeIGmS5flre4nZSQ6MN+PldEKdOeSL38dP7KHD/QVUjrTRMqaJQ/oDalNGsVKS9iFlNPSNMyanJBoBh29kVFhr1MASEkVNtld5NqrV/Ku2461DOhb+tdnpjM6t7cEJKyQzv5BsSxzXEFB1l+DEvmtP1B6v64ZgPYWm4/fSjKuBBeQgfvEaHKeLwl2k9N1EgnaP4bWmfX54H9Iewde1s8n+CqK0LrQrScAbe5rnANlA0VBdd4Rq06GS4o5VrkpdEUr3CaRYJLRqlD1MXGDJbK64aCpnMUQyxz93jwq8XppAxcUTIrbboP6YAoh55zefcrYwGB1EDImnB9ZMIQpSw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PdC11N3Lp8BlMzO50aHxEgkk+BSGk01QtHBfkIoeXxY=; b=mBisXro1OVi1B+UpQz0OgF2M/F579FAUo5eTh5E4LZkYPDzSvbxsFgn3WnrBFytpGwp23M60VUDhX5JuUQ+y+kZ/FLyCdMYgtkVpb9UChehXYASOAWOJXWlkJhuDO1z1nlm/szvJWKNhmxnW3dhZFEcWdLrkh1C33esdjYRbUMg= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3381.eurprd08.prod.outlook.com (2603:10a6:20b:43::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Thu, 10 Jun 2021 11:26:57 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:57 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 22/35] block/block-copy: make setting progress optional Date: Thu, 10 Jun 2021 14:26:05 +0300 Message-Id: <20210610112618.127378-23-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 78c8b61d-e57d-4412-96f6-08d92c02a7ee X-MS-TrafficTypeDiagnostic: AM6PR08MB3381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:76; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0cYeZEkgOWdClJF+33H+eoGq5eoJZOp7mTPBm8YVx1GRJKEEF/N+swpQ7uM27xXG3/9JzV0+T2JmHljpSw0kutJehk7Fd9795zH28bUIEAfRZvBqXk07qmbohyaDoUkTt+PjkSdkl0Sg9ZF0Y5FyaO5sX5kDyz/c1xm5MDgtJTtzmPfBa2dID0vYLxaLHYBlhvWllCs4VjJYtWyjuZRPARa8yn5V2hNoFuhCMxAGLr3a5ocV3Uh4CDflJnuH5DzkpgMW/qty3LPeXEC/hI6yk68F2LoJf7ktCSC+cQEs+ByIrLTHVn7aqKfuV969otwgPVtXX1NkkDKrAjEtb2RcBAFDa6Qs7G/hS/6eOJquHVddy2/r5FOHHq0LJ91DLxsiikSVX6uBLMWbv8ATHxhnPkkAUrqapM3KWXOpeZ+UdJyZZT2bBls2/rNxrbgmbuPTu5ilpGN+Ke5pkyB2AXqro4tQb7P+QPU5QkSZ5uYYNvZsLIr3cxv/6ZLMNeKf7UUXCgB1Hk7veAX5DTAAu6qlJwoKlLTGLayTO7BSj2bYoK1w5oEGGJImynKr5WbMH3iUf11S11k1SJDCUBfL83CYhGfZmykMMPK1poPjSsjXUEKia2GKpsbL5olqamen9kw8Qwnf9+jZS8dSSaoyZdGECkJJatYkEeq2UFGxE0EhpYvOt23KRps0RGO2g+PYyPMu X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(39840400004)(136003)(376002)(346002)(2616005)(66476007)(83380400001)(956004)(8676002)(8936002)(38100700002)(6666004)(66946007)(1076003)(5660300002)(66556008)(316002)(26005)(4326008)(6512007)(478600001)(6486002)(186003)(2906002)(52116002)(38350700002)(6916009)(6506007)(36756003)(16526019)(86362001)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: S10/CHZov753tpZj/pJQ/IKUGc+mNd0GMY7y8bvl3rzKgKGWU9lR5JMOtwRYld+Gvi3yNTuE6DMj10caIaRMbSVd1CnwNFk5BCQHaVoJnsozBcS2VfIq9OIj8thRIsrY1mUHsO6iqDLBBZEKTYqaiq8dWbHcxDcYK/YJ6Vc61g9Gy5cf+9fjKLr3Vxoz7+uUkpfzsFSWq+lbPrgUl1iW0Z6ACjvJsHxuFSCIJZBgZc05RISHIjsfy+UoFlRoUuyEQKwn2mq9iQWLOM5TQe6pOmpnWIq6uHrNmZFrOtMv4bx5gm42YtXenGLUomEKu33gwdpW4F9VEnJNM2+l4YHK/aswrhBpq1AEj0PwsTxOObByUpJwqHBagfoqORB3Gi9c1fGm5BgyMAq+xVyDmwEyAGfy1O2zZKTRlg/TSCw87FNJ9TXX88x96KbNv8oUdi/Xkb2cCpu+/tV3QY4t/Qku0VGxWiMn1aH33EO87S/DFUoHcQt3EhUmZ/VbLLrY595/mFMhgTvbgi51F9rmdiObG1cqXiQwxGiwh1ZBS4EXkdgInVBJhJXjA1pb23S338J3bc9TDeLXw9Kw/Yfj1SGJLjSol7/ahvvIUy42upr/gyzlaMFdYQy4X9lSDHJnO5IX3CyTbmrQzfY6yLUW76TFWZswomXGwgE0WjQaBycPqOBQMLnc1psqIHL/a8Gs6jOaqCrpLPyIcLE8YQw3nrJpAjV+llxHbyd+SqY23Fq273R/6SIK8/DKmruh0M9PuXdwGem9gqsvTJciSyrPyhZpD6//w1xecZgoA3SZMMctr84I1NMIfdhe8S3+SDyEZ57KznOQ9+YmsbXcZdIP0PlePELX1Yeq87/jSIjdZfBhenmkSk0g3gmkdQk38G2LX0UEPAQ2Tq0Ix9faCeDD3AnIcOc9HQE39EIAcwFQHH8zihg3f00VA0WCFnOhsI5ffW+tgZBmdV3mn47gsP6oRMl0KrJ8oDIAnIMfrYVAfz+CyFdLsTSJvVHqLSpJAk0FtZIHLiMDL2aY9ofUBabg0J1eFc9rsiu48Jk4SHsctpqnt9/eSHJhwPkcbrCj42XQmw8z2GbD6Kr2xSQvXgyD087loA02BOl/mINzfZCrvHe2+GgfQZlHl6GJ4OVRyjct+pJZQKJa/K38rTjzXC9fvCw36kDRkgIvotJV38Psdv0F8mkdayH0+N3CIJa1K4MrqLXRAPMcu4iWMvRrOnQk3j8Jl00iFIEN/paL8kovi9tDU9KW05LeU36HOqkAiuo2lhMC+pvBYAebf8W0EaHPwCmQhziLvQNDFcUx3PcIIWZlQ8ITHuJcFo3pnvVshFIgZ7a2 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 78c8b61d-e57d-4412-96f6-08d92c02a7ee X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:57.0465 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HSmeL1lTbOtChcSNGS5damLP8Ne2SHY9wJAwvZkXiilAOv+IObrEjgTpxevEUDFWuauWt1qmU4VD4DaFORlueLbsWoNuGeMQPVEE5NA7mws= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3381 Received-SPF: pass client-ip=40.107.4.97; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Now block-copy will crash if user don't set progress meter by block_copy_set_progress_meter(). copy-before-write filter will be used in separate of backup job, and it doesn't want any progress meter (for now). So, allow not setting it. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/block-copy.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/block/block-copy.c b/block/block-copy.c index 774f5029bb..5ee0f48a94 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -544,7 +544,7 @@ static coroutine_fn int block_copy_task_entry(AioTask *task) t->call_state->ret = ret; t->call_state->error_is_read = error_is_read; } - } else { + } else if (t->s->progress) { progress_work_done(t->s->progress, t->bytes); } co_put_to_shres(t->s->mem, t->bytes); @@ -648,9 +648,11 @@ int64_t block_copy_reset_unallocated(BlockCopyState *s, if (!ret) { bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes); - progress_set_remaining(s->progress, - bdrv_get_dirty_count(s->copy_bitmap) + - s->in_flight_bytes); + if (s->progress) { + progress_set_remaining(s->progress, + bdrv_get_dirty_count(s->copy_bitmap) + + s->in_flight_bytes); + } } *count = bytes; @@ -710,9 +712,11 @@ block_copy_dirty_clusters(BlockCopyCallState *call_state) } if (s->skip_unallocated && !(ret & BDRV_BLOCK_ALLOCATED)) { block_copy_task_end(task, 0); - progress_set_remaining(s->progress, - bdrv_get_dirty_count(s->copy_bitmap) + - s->in_flight_bytes); + if (s->progress) { + progress_set_remaining(s->progress, + bdrv_get_dirty_count(s->copy_bitmap) + + s->in_flight_bytes); + } trace_block_copy_skip_range(s, task->offset, task->bytes); offset = task_end(task); bytes = end - offset; From patchwork Thu Jun 10 11:26:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312909 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3D53C48BE0 for ; Thu, 10 Jun 2021 11:47:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 86B68613CA for ; Thu, 10 Jun 2021 11:47:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 86B68613CA Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJ9b-0001gk-MD for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:47:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59270) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqQ-00044S-5q; Thu, 10 Jun 2021 07:27:30 -0400 Received: from mail-eopbgr40090.outbound.protection.outlook.com ([40.107.4.90]:54851 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqG-0004Ve-Ia; Thu, 10 Jun 2021 07:27:29 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nGzN/kV7KLepQe6g/jANtKNlOakbVm+3P7M09X9ti9WYtjQghNJIC3h6pAAnYd0ddn1Gg8G5v1mydPRs8eENWoa9a6SnWQ/m9inZi2OmmjOAWR6QsjE3m+wTFJHf+ZfH6EQHhcIgb3tx8MleEQdJh/rJr9OrU0+rSmfTOXae6ZLOuB8kXk3x8QZ9gfgXiARHD6l/n+3pcIYT3nE4tQNgXJO495Vlh7W+lPbMX6Xpd84RAjGXNLJtWw78xVqhqPOR66GwqtX+pCdUYnXAbnksz1RCJVzrV6TaEiQLPg4LQdVgW5YSCt+owWNlhWik4+vavdIwp3k42sA/9Vx/KtdNjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=u4ocnYB2elMcQ6ru6jvylmC8TgB30m1LbCBjWVE9qmc=; b=Is/BdKVANxRvhcWY21AHYWr/TOXwD6ssaUnXUMvBWXQMDTnYzBzlAQFLFxplgBqh4IDoj6O7C+xjwEirfArgU3DoZQYKqoq4SsY0yXndQkqlaCtpZ3qQftNq+zmm+HOiu1nA2WVmQOdR0wN9YKqHbQsBM71EyBXA81LBMpZhEk2k5rEL+vs94rpSdh8FOsfrw9ZfWuJQgzpceGXoIXc1WNlc2wy9iTG82pfW/k0/kld6c3onYhSxE5m8h+xlFx/1eU+2be0TtzmLRhkSw67GdpX/BvCWmhRuFimSwGzNnXFPg4+E9umE6xR6EDOPTdqMM5Tl7qrgLqMrehAhYixX7w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=u4ocnYB2elMcQ6ru6jvylmC8TgB30m1LbCBjWVE9qmc=; b=er8WZ1HjvhIqeqxwAN5Ku2fhpwoN8N8gBIHTJAlWCtoN20KPGvW614qWnp4c1IclhyKmb1wFtQM8oHVzrGOKy78/Ris4jfzDns17uL7XGCUQOA5kwxCOKCjww4JWONCzOH8t0AFNBBRVLaQmFDfjJtSlauLiWCR6T4yh6yfrmXU= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3381.eurprd08.prod.outlook.com (2603:10a6:20b:43::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Thu, 10 Jun 2021 11:26:58 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:58 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 23/35] block/copy-before-write: make public block driver Date: Thu, 10 Jun 2021 14:26:06 +0300 Message-Id: <20210610112618.127378-24-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1f240ccb-6ca4-4af8-fe2d-08d92c02a890 X-MS-TrafficTypeDiagnostic: AM6PR08MB3381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:341; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SeOM3skAyR8rnQsSK7xomXDw/NrXn72onLXNh1gLSiMRwl7PXro54k/edd641kKByXNaRfM1LLFSeZbUeH6vwCHb5B4s1NITVuPEHnlNuOHBp7thvIRMVQK/ea2viz1nRgunYgCt4wT5husKmDMoQgioMVxJYPtl64gD8KYikgUo8UgcfkeOVOySVi8Go6JwHJz2Eyu2Xg9n7/4ZZk4hyeojNiqHw0tX1/SI4rXEMlDXpcVztjH7wIPhHo8c1VaoVl0vy4DBv4pNaXc7Y0TzJRweKqSUFnPlRrFNvK/gz76CrsWoPjX6xxPhmLexhDAjA6xN283jUzORLr3iELZLrj1kTeTCe+1pJvg1cTexAT3BNzGRAGzo8ruP5bPdbldfiywCxDIwxQ6Ssvjv0/B3TeCh6DQB2vZM3vlhVlGWn0+gluSZZ0KnepVd4oF3VvoZoHNe4CJse4KbpixNQthPUR6rGKarsiu9L9Ucp4o6gwyzXNv51cys/AhQoNm8e4exRJtmYITWsfvVhTT2YIoVPywQMG+soj/7FFr9MRw7uwMpKZqNGEZCKL403sZGI8jBajbi7L7MmyjFTnPISfNnp5c0ufYE+C7zkWmlbpaDa7o5nbGXZgUwWK4wRI2VIrrcZt3ooitQABPFddQnoJzkmCG4tZy/JWFEMaSl6edHQ8mQH0A+hx71fz4ZnkvbW0Nt X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(39840400004)(136003)(376002)(346002)(2616005)(66476007)(83380400001)(956004)(8676002)(8936002)(38100700002)(6666004)(66946007)(1076003)(5660300002)(66556008)(316002)(26005)(4326008)(6512007)(478600001)(6486002)(186003)(2906002)(52116002)(38350700002)(6916009)(6506007)(36756003)(16526019)(86362001)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: TP/WwYoPewHEZirF9xu2EXLHFVogLqao7yOCgU0DHotXubmi2tL0uvwzbiiRVWAWbm/iyoVQXDk+/zT/Igntyw6+00nZ/jqoqVKRxXSpK+avcCP5CBnhdXSSzOaOAoORoOv49NNUcb987vAZZ3tvRBP9HD0ppPtZ18/8tFR6F9zivYrdBv8qkfSqII/Xx5BHjezBO/QyAc5+S8+dxH5kuPuB0fehH5FD7p1qoc87AIA27WGr3IEE2DrK46sc44lRcFMpcnO984p9WcvWvzqVP4wPP4MReYpglynlNMiN+nu/dToarH5cSV11o4UxMVYucrWkxwN5PmJ/9gxNP/5PxPgMCaBNK7nVKSu7fuGOEej4DbeQ+2lOCFUDT+KhvpIEqs57aCrp33A7bjMYMaNJxC8aoFuUh1PcZRD4ACaIh6DFkT7iKNZsZFx+FilpzcWIuD44lYIhITg0jI8wYbsPuMr5TZ02gZKreiP8QnyU/eegsVFdx/lp4sJmEQTE2OP7AMbGhxT8Nt/9xlgm7n7Giadn6THkz068iPxAixtI6xIybTEovq3L6Io2s24CtH9Gm08C3qBTmR2qNoQu45eq+ZfUzzfqE4h/Wz0YahzdnI4wyGrZwAq/JduUitr3FqLLC6Gdk91pqCqLdI4OYrtcPT3TbIcZ8yxUvkwcWilm/AV1X1e4e005vkaVmSqbXv+tQvkJMjkvs5Y6XlAQHVEorwIPjgJ3QCeHLUXLmZCpK4GaMiyotsTFj6NWvp8Af3ehRB0RmN9E5rKkimKL8mBq824r/1vEUWHwqbZl5Dthr+j/EUbJzC2a66K/6b3W93cWIm6y/zjqjTfGeyZ8NhvIT5erkScfP8GKI4TLnEHptRSB4BdWNM2Fc1RYYVrWs3sNQgULLS39yhPdtiEOJk/MMtkSLvaazSR5x4NanuWuCWotuuiyUae2u5Poh6fPv8X7QgGWzS6IHkQrYmqM6IacrTLEYNSwgsZSm5YQ/9BZxawlhdwkXDLaWcb3puK8Ud+iCa8UYJ1RO83Yprs1+UBcE7VcCWrkn9b25NJQeoLuUZmScYaFI9s1wthPmcxDCXmsc3P1zwDQJbS23ktCo3kAUbobg7ktY4ujo9wLiOEUVqleQh2Tj1y5SZboXrITXXJ+2zOrhl4YNyktiL7vLbkP725sY+ECMLKULLJkKWDQT3x0Jg31v9KgdZh2024FrNK9b2ZTCKMSd11yI9HWKuIGZzJGn8ecrDooNvrJOOjVfZDeH5VKFQG7ChLeLoO1CwN5vFEj2Km9MJTQk6KUpTP6k9+g/lPabzpwPNv/z//rx8zJQ3C5/h53il0bUGbnWuWL X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f240ccb-6ca4-4af8-fe2d-08d92c02a890 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:58.0889 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XiekptriV1Ni4EkgAIXHJXi6Yn5qQbiWaCvVd6QkJ3tM50dkWDlpoYL+dxKqqz2v3QkpASONKFXP/IEroXyF10aUAdPf0o/5t2jzhF4RFEM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3381 Received-SPF: pass client-ip=40.107.4.90; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Finally, copy-before-write gets own .bdrv_open and .bdrv_close handlers, block_init() call and becomes available through bdrv_open(). To achieve this: - cbw_init gets unused flags argument and becomes cbw_open - block_copy_state_free() call moved to new cbw_close() - in bdrv_cbw_append: - options are completed with driver and node-name, and we can simply use bdrv_insert_node() to do both open and drained replacing - in bdrv_cbw_drop: - cbw_close() is now responsible for freeing s->bcs, so don't do it here Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- block/copy-before-write.c | 60 ++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/block/copy-before-write.c b/block/copy-before-write.c index 2efe098aae..2cd68b480a 100644 --- a/block/copy-before-write.c +++ b/block/copy-before-write.c @@ -144,7 +144,8 @@ static void cbw_child_perm(BlockDriverState *bs, BdrvChild *c, } } -static int cbw_init(BlockDriverState *bs, QDict *options, Error **errp) +static int cbw_open(BlockDriverState *bs, QDict *options, int flags, + Error **errp) { BDRVCopyBeforeWriteState *s = bs->opaque; BdrvDirtyBitmap *copy_bitmap; @@ -181,10 +182,21 @@ static int cbw_init(BlockDriverState *bs, QDict *options, Error **errp) return 0; } +static void cbw_close(BlockDriverState *bs) +{ + BDRVCopyBeforeWriteState *s = bs->opaque; + + block_copy_state_free(s->bcs); + s->bcs = NULL; +} + BlockDriver bdrv_cbw_filter = { .format_name = "copy-before-write", .instance_size = sizeof(BDRVCopyBeforeWriteState), + .bdrv_open = cbw_open, + .bdrv_close = cbw_close, + .bdrv_co_preadv = cbw_co_preadv, .bdrv_co_pwritev = cbw_co_pwritev, .bdrv_co_pwrite_zeroes = cbw_co_pwrite_zeroes, @@ -205,56 +217,40 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source, Error **errp) { ERRP_GUARD(); - int ret; BDRVCopyBeforeWriteState *state; BlockDriverState *top; QDict *opts; assert(source->total_sectors == target->total_sectors); - top = bdrv_new_open_driver(&bdrv_cbw_filter, filter_node_name, - BDRV_O_RDWR, errp); - if (!top) { - error_prepend(errp, "Cannot open driver: "); - return NULL; - } - state = top->opaque; - opts = qdict_new(); + qdict_put_str(opts, "driver", "copy-before-write"); + if (filter_node_name) { + qdict_put_str(opts, "node-name", filter_node_name); + } qdict_put_str(opts, "file", bdrv_get_node_name(source)); qdict_put_str(opts, "target", bdrv_get_node_name(target)); - ret = cbw_init(top, opts, errp); - qobject_unref(opts); - if (ret < 0) { - goto fail; - } - - bdrv_drained_begin(source); - ret = bdrv_replace_node(source, top, errp); - bdrv_drained_end(source); - if (ret < 0) { - error_prepend(errp, "Cannot append copy-before-write filter: "); - goto fail; + top = bdrv_insert_node(source, opts, BDRV_O_RDWR, errp); + if (!top) { + return NULL; } + state = top->opaque; *bcs = state->bcs; return top; - -fail: - block_copy_state_free(state->bcs); - bdrv_unref(top); - return NULL; } void bdrv_cbw_drop(BlockDriverState *bs) { - BDRVCopyBeforeWriteState *s = bs->opaque; - bdrv_drop_filter(bs, &error_abort); - - block_copy_state_free(s->bcs); - bdrv_unref(bs); } + +static void cbw_init(void) +{ + bdrv_register(&bdrv_cbw_filter); +} + +block_init(cbw_init); From patchwork Thu Jun 10 11:26:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312899 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2DA15C47094 for ; Thu, 10 Jun 2021 11:43:17 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C655D613F1 for ; Thu, 10 Jun 2021 11:43:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C655D613F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJ5f-0001q0-VG for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:43:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIq1-0003ur-PC; Thu, 10 Jun 2021 07:27:06 -0400 Received: from mail-vi1eur05on2114.outbound.protection.outlook.com ([40.107.21.114]:47549 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIpy-0004ZR-Cp; Thu, 10 Jun 2021 07:27:05 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h5TwXdF12J3YqQkXLojAbz9AEkgaj0oU37uOK+mrP1zm/XgTfsAiQ9El8U0eQ7mxoiRzC4nJrT3MkUOPfeEihFMGEh1UYFbq6HihYHPSsRNbxAd5eW4s5mJtAsMUyPvZ2bas5aOkPxm6TS5rH4vQrRCH2QFT7pibpu7kkKI1iZO0Ln29aBGY3vRWhXlE+3e1Q9ife86HtImTGCO/6+9hXwPwih6C7srZIpfcSrKJYwYPuL30GOFpdRj4WXdQzKuSZ0gcKDHfcW/Ic7ClvDRJaGBirTMFYCaTxd0Tvuy0bwjTkRKYKK5KNSGbQAlB8xs9HslUnSbaNPIzrwjizqoLQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/p/TS3XFcJAs/p+Fn61YsyKL9qKv/v9dt+kfqgiTOw8=; b=IWrMf1W972AL/l5lZJZy5Drf14tX9d/HPqZ93o9qa+A1iKfTmsnIGCD9Vdh1P4+cmYUDXQ0S0Jg9G5Jo4/KgOpcnmBbRO7iNc1SiuLnC//XCctmrUb/HKh8bmjZhcDVdWD0O7US5joSMyf+5+M1I3rXUqvwDjsV33v5Fl/L2mMIIgfMjoBDq7YVl1jMY+4NAplLPH8WHhAcg79aujWIanVn4b1iue/56Qcm8dfPm+FUneJxBIolzeT9oxO8ljkNFHwwBhDND6vVLZhCjVI6ZcDZoTTFHAWyv9SgDM7M2n6Bdmcu60qxerxqC/Xn4fQWUX90Wsq58fVuAOWxn41ZgCg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/p/TS3XFcJAs/p+Fn61YsyKL9qKv/v9dt+kfqgiTOw8=; b=FeDfZtXD1OvaIeUOwBrCqvAb10HIMD6yeaqtaJgBC8hBs8hOxdh4GHRaTq3neQYIf0lDKZ+VMAqDiAoCKEJJzOZ+lFoGPsif+f1vMk4PuN4WQe5/Y1rV6051Gd3f139ym+UwzFwhMsLqdsJDGDpFvvtfkTcEgB3EOVcVJLlkxWU= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6280.eurprd08.prod.outlook.com (2603:10a6:20b:29b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Thu, 10 Jun 2021 11:26:59 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:26:59 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com, Eric Blake , Markus Armbruster Subject: [PATCH v5 24/35] qapi: publish copy-before-write filter Date: Thu, 10 Jun 2021 14:26:07 +0300 Message-Id: <20210610112618.127378-25-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fa630c49-5ddb-4c1d-5ce4-08d92c02a954 X-MS-TrafficTypeDiagnostic: AS8PR08MB6280: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2657; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AAsvr8D6kJVWgA/I88VFQTNqbo3CfswkXDPQ97ttbK7PPSfhgBPv0woyJ62OCZ0ZKgMSs8Fde/ChyGSM7yIi/o1CHoroERdpJiez5fNkLaTDXrUJb4F5L2SlLlyLkTGKX1AqQ/v8xvF4zvlcO62ZqiJrriclLyyU0Cn7Yveh+8PaOmryYzKTGSOHM861YsurDc/1pGR/kWeFEhRc/PK7U3pO8vAnGvJYIwL0BwkMLXE39AXxWHvjc9xvrJ7NrDw584PtdQevtYmbjy/gfbL71DVT/kepeOF5S10SQ63h8FR09tsc0Qb2xPhDzYi5hPkIaV7hcEPoflbrejx9HA95R9oziz9eiWuxCSGl2e8ddqNpdy+lyIYfkvmiYro4W/04fNxHE9IakKnY/dKU3a8tbfP0E+rvRa9DTvHrv8C699Jv3uKTwbyauqGY9Wj/Ab2qAGrPMXBB5yF2fKxJ7LkyUyX5BG1bnUSl1LItvKpiKHmfAfjjChXk5ASb9SochapxemNKrktWUzDKwWz1U3+iTHFgL/wfgFsbFn9zAyo3G3gxn2fCXPTYo+EG05qh7hEAqWn0Dn7IdmAwcoxswASM5EcSJ2XhJPhxF5sGjcspxtjjfYFAAqVN1jkV79KOGRV/Tpcn59+6zmZc/ICZV2rGMx0LeLSFD1qrotVPOoeTQD+f8ykBtcamJkzo3yu6RkrP X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39840400004)(396003)(376002)(136003)(346002)(366004)(186003)(26005)(86362001)(36756003)(6666004)(54906003)(1076003)(8936002)(4326008)(6506007)(6916009)(8676002)(16526019)(6512007)(52116002)(38350700002)(478600001)(38100700002)(66556008)(2616005)(316002)(66946007)(2906002)(6486002)(83380400001)(5660300002)(66476007)(956004)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: A0hg72ORAfZvMI4+ibg+FXHyuvlihVDxVQ7pJQ4SGMGVkfwTHhs2pvCR61q+jYP2okhd0GcmlX8rayJofOs7ievW+L48ys2G/jUPxcQJSrtcvsBSmS/8yEII1kJaeM4mvssP13/xKFbO6ylea06jVeNCcExbfxmZvxJKovNF46+zloNSidkTywKNIveCn4CAcVA4kUAyZNC2kKl3MJyWRG3t5pB42d01JuunHG9SBaZ1uY8CGMUCz31VHiyp51q1GYgrMwLe5RSGg9sMrr1S/7sexQ8KX3faCa1QzyjcubFMsqS31bVIQ6ggQ0FMxPp+HFsg19sBzZvhAqG0+QPvCx9rzsa7v6UmVAKRY4W6ACbYIS60IcvZ3ql2rSHvnDGF+05cyJ6qwB0Evprbo5wrYJvd+bphXB7WMOk/4CWtOQQWK1G0o4mP1EBXlaFDqcXSz9IHMnwgrkKa2eDzd314HLrD2DkK3e8Z8O4QO36SiGtzQtcUid6YAD7axSIxKYvg+3u+X/kxDz4N1aMyvoA7MEt0Ju+ViWpWVOwS2x93fqsHjAWDObgt7lW7y4FN8DCfhCMcNe6vRshagh5+Cv0JiJMHhjHcNMl2+wZm5PDizARNw1yT+zb8iN16phqh9FSpkkJv8xbRS0KxW6U1RdxHoiCksuIXnILRqOkns5sEgWsIiJAhuaQsws5HvAubfoUbPBlhn1APC3ss41M/FU4CO9LoBRZNgyPtTFi1qHNnDG6RGvDPOhLZOyNOQii+NiM1D+6Hb7fjGtX9MuvS6taA1aac6bHWBb8ANXH1lV+6xnUGyT5ps6dH5/XtAT3GQZFGzaBlBvtLUPIeC26S6SYY4NEe9Qtx/4AXUM4Dw5ykgEOewH6HEGK/vKrW8PN6iDtJPkAem7ljtjYWsdVh0F4YlURKbR1u8xF5PXiyxV6FmWWUYLHTqJrxe+B54Jwxf/yB6lMX0c2dVxYQDvL9NdWbPNlBotM5+qHmrm1++BcTXbG06Iditszk9tbSqpATz2u24Z7AmV5YxilCna/kjJ1KYLP4paZ5+rqTerPJNXnB/Olfk0fpvw4bRdquEn53rImFZJfvbAMy+aln7bCAlNyuyGtDjyorsaFaZsxImGwCpI0ownMb3trb73ErP+BEvECqMqimDwd1zSRMx3iFpNOjdS9sNCDsPqJwUkT5YY2W81KCZ6lMVv1wqaS79Qtnwt893CI8hJk0JhVhx5JqScRjn5omROuJT+prTyRuRdyQi25HF2ws4UJpIxFU2+TAuWPrNbsrc9yjFi/BjTXr66Q4hsgTduYMDqLKqe6qIKvFfeMPrLHca7cb9zgou8R4xZGJ X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa630c49-5ddb-4c1d-5ce4-08d92c02a954 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:26:59.3484 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PH2jl9andWJl2osfvIsQ3ggCAQu3TUNiqi9AjbRjFv7cBBnfrT/Dg7lZttDjICnk0lp6bYiitYytnlulfwU+dMwiD5W0/DZwwbU59AlhhRM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6280 Received-SPF: pass client-ip=40.107.21.114; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- qapi/block-core.json | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index 2ea294129e..6c1ce86235 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2808,15 +2808,17 @@ # @blklogwrites: Since 3.0 # @blkreplay: Since 4.2 # @compress: Since 5.0 +# @copy-before-write: Since 6.1 # # Since: 2.9 ## { 'enum': 'BlockdevDriver', 'data': [ 'blkdebug', 'blklogwrites', 'blkreplay', 'blkverify', 'bochs', - 'cloop', 'compress', 'copy-on-read', 'dmg', 'file', 'ftp', 'ftps', - 'gluster', 'host_cdrom', 'host_device', 'http', 'https', 'iscsi', - 'luks', 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels', - 'preallocate', 'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd', + 'cloop', 'compress', 'copy-before-write', 'copy-on-read', 'dmg', + 'file', 'ftp', 'ftps', 'gluster', 'host_cdrom', 'host_device', + 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs', 'null-aio', + 'null-co', 'nvme', 'parallels', 'preallocate', 'qcow', 'qcow2', + 'qed', 'quorum', 'raw', 'rbd', { 'name': 'replication', 'if': 'defined(CONFIG_REPLICATION)' }, 'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] } @@ -3937,6 +3939,25 @@ 'base': 'BlockdevOptionsGenericFormat', 'data': { '*bottom': 'str' } } +## +# @BlockdevOptionsCbw: +# +# Driver specific block device options for the copy-before-write driver, +# which does so called copy-before-write operations: when data is +# written to the filter, the filter firstly reads corresponding blocks +# from its file child and copies them to @target child. After successful +# copying the write request is propagated to file child. If copying +# failed, the original write request is failed too and no data is written +# to file child. +# +# @target: The target for copy-before-write operations. +# +# Since: 6.1 +## +{ 'struct': 'BlockdevOptionsCbw', + 'base': 'BlockdevOptionsGenericFormat', + 'data': { 'target': 'BlockdevRef' } } + ## # @BlockdevOptions: # @@ -3989,6 +4010,7 @@ 'bochs': 'BlockdevOptionsGenericFormat', 'cloop': 'BlockdevOptionsGenericFormat', 'compress': 'BlockdevOptionsGenericFormat', + 'copy-before-write':'BlockdevOptionsCbw', 'copy-on-read':'BlockdevOptionsCor', 'dmg': 'BlockdevOptionsGenericFormat', 'file': 'BlockdevOptionsFile', From patchwork Thu Jun 10 11:26:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312921 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71613C47094 for ; Thu, 10 Jun 2021 11:49:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F2C3260FD8 for ; Thu, 10 Jun 2021 11:49:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F2C3260FD8 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJC0-0000rS-5Q for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:49:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqD-00042M-4y; Thu, 10 Jun 2021 07:27:20 -0400 Received: from mail-vi1eur05on2114.outbound.protection.outlook.com ([40.107.21.114]:47549 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIq2-0004ZR-Ku; Thu, 10 Jun 2021 07:27:16 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MUKHqolcU2I+gQPw6fSb3D0YNAAwrWqWPhbSVGt4p3v4XcAksKGLUCvZbYxZn/bD+76kMtebu0+YHz//47ZEDBmpRhBEh+uhPt6GWMwib3ZSypmVq5fdra7WyfOorrt3XNoEP/GsiREV8U6JQZ0mvsTxhiwoelOVM0c/J3omkHtYkaLs1Hr4qRzVPFfI0FQyjIeymOoDyEENE+UcLLX6GAPfSBW8QhZzqtZLP+tPa8GjJcNKtiBdNUrc//3yWmbHcqbs4Jn9xDbFYQqiBDH4P3gAi3hPRfF8QTyqE7BuyV0+dcxH0S+GgRm4CCQ9W/d2yxTOE/TWs+N26Kcp4UbgLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XMTcMHw8EkcoqkoUzlt0w065etXrkK4Q4JWP+sNR5E8=; b=HOOUeOGCUD5gbQB81vchJJC6sYCunFKDKWa1MnSM0HwCUyYHPBo6AQu2Q5V4Lwy2mEOKlQq2bGrX05gG6p9VOkHDheoCWkGIYjFg3afFySjk0GTyjsx9/QnXGqd3/ax/tBTvhTjw5N9MZXSIYblVPSV7CkjoY465BT6HP2XaETwpjgo72+GQ+LagAuIHDGKDLxWWeOutnry0UpEkDVsxnp+BqDRgi4i4xf00IFKUg/yIZqTmpfKfLfNeLRo/tYCWPFruROCUaZvXELyrCQdKBTnXyYuN6ZY7N6vKel30EGFnoEdsuqbqMqAM8KLMymCLfcC1bKz6uEtRTgjucT3ACQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XMTcMHw8EkcoqkoUzlt0w065etXrkK4Q4JWP+sNR5E8=; b=wqLdtLnTbu0luSsIEKA8VDDI2SXfOXaKUOuXw+B0Fbd8fwaK5Qdi8tDLxX3V/Fx4fOPAfcJcDcb2kV3UHVy4/JD0qXkKl3ycub3ItYnUfPRc/Er24h/SB5CUM17usvYJL3d3ybGYUupBDp1Adh6HGTfj+PcLpGt/FHDbAjLduWU= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6280.eurprd08.prod.outlook.com (2603:10a6:20b:29b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Thu, 10 Jun 2021 11:27:00 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:27:00 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com, Cleber Rosa , Eduardo Habkost Subject: [PATCH v5 25/35] python/qemu/machine.py: refactor _qemu_args() Date: Thu, 10 Jun 2021 14:26:08 +0300 Message-Id: <20210610112618.127378-26-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:26:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1dad0be4-5b5b-4f6f-4971-08d92c02aa04 X-MS-TrafficTypeDiagnostic: AS8PR08MB6280: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xHdKoWGKdDFJXcuiwjPpztUFeXyafd6HkSpLTYYWI7UYUrOkdhW3UuKVhU/yQ039d4JvBM6NPwG/UpBcdLRMNZKREXMqu/uL5tV4lNSQ2BHo+H5YHy7FzWMg/X5PkyGboEUGvjIpwTNG6pEKefC3C3LGfFJLbH3HYd4jXDqP2a7WKBPJQo5plcF14ntHZrkr0VTuTJNfR4V7kPcvIDt4ZlcpyP+w8xMHTXMNFjyqdWZmPXtExKA9cc2OvXnOaM2ONaNQps2RHgw1p2ANdTjcmkxucraHz+hGXvDZmpEHpJOk8Df+kHcNZvkOUsH4eHahAY1nKzl6y+H3hhAzBfVKybVeq9Nn9JcNcI9ff4KGEqwrgoTDlJaofCkAvfj3vmvGcfBMJdD4uaOFkdEZsONRj70c9TaOuwItzvMrpXHMKuRNVXQ2lOrn/v4wUw3a1CMAeQOmMJ7u20+HXB2tnqvEL78zHtK4urQx7VTDSk9sXFSo/GJaDIuWpHYzCCI1aT3RQLfKsRNlg3woYsDUO10oiI73ZnXIdGl8+ROmigP77n1SANBArs+06uH4OQtAMU7/ezSv3pEQH37CHtwwRVTJusmKHt/gknnvi1vvK+o4j/vzcXbR7WcprCZiTZF9LNrYgGwLRj1chK9sDBwXYtcdF6hTdvN2oLiurg+V52ey1LZ98pdwO0YhNb8Xoz8XCLpV X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39840400004)(396003)(376002)(136003)(346002)(366004)(186003)(26005)(86362001)(36756003)(6666004)(54906003)(1076003)(8936002)(4326008)(6506007)(6916009)(8676002)(16526019)(6512007)(52116002)(38350700002)(478600001)(38100700002)(66556008)(2616005)(316002)(66946007)(2906002)(6486002)(83380400001)(5660300002)(66476007)(956004)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: vI7oarWnNIFIkz2gBdtA5mYXRD443krZ9mOLe1MLESuu3b8sgUOX2OoF/LACoRwSVaGlq97Q/oVA2ooS6okFkT8sLisRcGCAgU2XQoDHV72qoOB2T2zSP9pKmwcUOqytH4Hn9ieF5hL2J13ZgnnqV3+XAJeEyikV0fa3gpFAydYkt8aC/THZt2V5d93gvvy47n9gkPeW8DnhokiGkpjkZ9e6G6Ffk9q/zIpGQboWt9UYWdOyjGOrWB19OMyEmIpuiz9Ib7ZUz7YcdFqkQIwTTvSI1Xo0OR1wEiB+L8qLXKRxdMzD4uC+UjCA9G23OY+M5uD6jjMaphnOC/SzgddZJmu1ARBJHrf6HcZa9d6/C/1sblsrRZz/xuAIM/qwJdYQrBExClq2bkklFmvjmxnLG8BaKK8U1T83pXwJuicM6proXAtPoi5UtVZY3i1Q2pFPb/jInHIecB7OBkA0HREaApeLQm8wBc1iJK6W3aQVVlejAHAf6N4OrF5Ziale6kCZtwmdq1gi2YXIi9lyBVp0DrBYmpBLyGn1lrKW27Ska8lihBQfnVwsrRjtWc0VQpBXQa8bxRHVHfSzL5Upq59iUpAV9jxE1vSvX/JPnJHl0zQf+EZPF4pemUXvh+D0d1dAw2d7nqVQoQ1uxkzBtq9nOP6r/qRaLlxrLQfA02CPdr+HGGPXpyM0G77EIAxaVvTUUjG3omuf9XWPtWI9DwwWPDsLFceKXy3gbtD/CdyAhaRNRX64vxd4V2bhCLxO7T8G+AGZ+wTHBRoj2cLK/x5Ht5fbKWxfVR41/AT+XLm/Vr7IOrXNingMG9vBz43lbL4R+MQlvWTdE1b2/42M0ab4f0nh9roSgMHsjCAnT+jHpd9B2BqxLnjrvoQTE4C9wh265hbQ32Hx5Pc/A+kz90XtzCuVZvZWB1QqBGM2aCWVHLDS+VD0eT7Rx9mx4bGih9C3a73XxQAFl3OCBwmGMvMOHWEakmLtQ3HgAV8pykIy3LUkjzermIfcArS9KiZUdRtPXQrX0+Od8ECM4R0+JxzS0lBKO0AHDsSiihtvt4GXH2H+xymyFWPlDcItp9pMEECT/JFl5a4ihHILOGjTvz+5L4GXAJWXt+UbjPHSGyX610h95Md6wXF/8OVn5N7/h1Dl+35FTEtS/qL0mZgLLPFsr34JJjWqUwamamPdU8uAIB6ebOOA6+VKBIpFIStjlYDrC/68kYa2xHGLsPxDcdy4taB4VmGONjSgLmAkqXpKbniE+31dx2Qmxfrzbe0PyVAeMrWi5epqjN/M48js7Lks/HYwfzf3T+80Y8U0a7AwQRmktjLJFjKx3v/d6740drEH X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1dad0be4-5b5b-4f6f-4971-08d92c02aa04 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:27:00.4785 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: yUp0xZiW7s3uxZ7PtC7EoIMRx63uY2SPELuPuaAEX/SPApMQf2KdRY5TBWhdUEFaeJbLOK0JMW2E/LwSao2bm2AK8Oh4amQzbearN/M1uQk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6280 Received-SPF: pass client-ip=40.107.21.114; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" - use shorter construction - don't create new dict if not needed - drop extra unpacking key-val arguments - drop extra default values Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz Reviewed-by: John Snow --- python/qemu/machine/machine.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py index b62435528e..5c09f50ec2 100644 --- a/python/qemu/machine/machine.py +++ b/python/qemu/machine/machine.py @@ -553,14 +553,12 @@ def _qmp(self) -> QEMUMonitorProtocol: return self._qmp_connection @classmethod - def _qmp_args(cls, _conv_keys: bool = True, **args: Any) -> Dict[str, Any]: - qmp_args = dict() - for key, value in args.items(): - if _conv_keys: - qmp_args[key.replace('_', '-')] = value - else: - qmp_args[key] = value - return qmp_args + def _qmp_args(cls, conv_keys: bool, + args: Dict[str, Any]) -> Dict[str, object]: + if conv_keys: + return {k.replace('_', '-'): v for k, v in args.items()} + + return args def qmp(self, cmd: str, conv_keys: bool = True, @@ -568,7 +566,7 @@ def qmp(self, cmd: str, """ Invoke a QMP command and return the response dict """ - qmp_args = self._qmp_args(conv_keys, **args) + qmp_args = self._qmp_args(conv_keys, args) return self._qmp.cmd(cmd, args=qmp_args) def command(self, cmd: str, @@ -579,7 +577,7 @@ def command(self, cmd: str, On success return the response dict. On failure raise an exception. """ - qmp_args = self._qmp_args(conv_keys, **args) + qmp_args = self._qmp_args(conv_keys, args) return self._qmp.command(cmd, **qmp_args) def get_qmp_event(self, wait: bool = False) -> Optional[QMPMessage]: From patchwork Thu Jun 10 11:26:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312943 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9262C48BDF for ; Thu, 10 Jun 2021 11:52:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 84263613E7 for ; Thu, 10 Jun 2021 11:52:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 84263613E7 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJEP-0007uo-Lw for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:52:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqG-00042Z-OV; Thu, 10 Jun 2021 07:27:24 -0400 Received: from mail-vi1eur05on2114.outbound.protection.outlook.com ([40.107.21.114]:47549 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqD-0004ZR-Sz; Thu, 10 Jun 2021 07:27:20 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CfRTz70Sok0jUBn7JHFTxGXtO+G/kiKIKlgg/DEmifGVFUQNXKhtmwIbfMeU+RpZSDHEQqUf3hRHSrc8eY1BWxpRuS/oUetrBonCQyG+60HfF1HncdlVQsBkkdPG/4sChIaRv7jftxVYcohsPKt+YkaPFVzmmkrZO+dfH1Nj52B8ssyJdyvjlsm+VZ0bCiIWO9pXn9MjgF3SXH64z49P4ibSKCnHJkjThcxqIPLDXmbPIO1HTTy2JTB9vUwseE5+kyzfuRj1tjFvmCKp1NYW7T2+vI3hULZGEpt2DNSdLct35uSuAe54afwzdHPR3lPWJHlJ+o1GMGl3ymgCdtUiBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sNxfwn1m+7Xtbn+8HvFRHoeuz0/qXYAkDTuwWoJF55M=; b=Ct9vQL5V9znEWIVPjkwVSNuC4GlP304Mhm9tixdWmzrf9H8AB2SG30LK/BuzgmoRDNpb+MCJNXtag6qLNpRcHz0ZE+cSgsntlrHKrucKQaqb5S/1W9fdShdjgf1dJtXblglZEgip7YjkV1gxK7dXqe/ioWsdY9rObAM/O+22n1jIyBurL+JfVgILP53efuLtkMlKkCuboS0zc/hA54YUGUE520IM/ohCnX92OleUyEKyqEKUwJ9R1dP7sl84X3sDH1Qzg/JYfxWWjbrNJtf0VkU8j6UW/hW0pziS1JobMRSukT1SrfsoRn5w9BjOhagIelR6cJctBVoGGaqoyObk8w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sNxfwn1m+7Xtbn+8HvFRHoeuz0/qXYAkDTuwWoJF55M=; b=hRxfpCQ9gNVE8LpvTwS8Ug4os8vc2+HjrRjSeHNjR5iOOn4YxyX4a8H//zF0hWDhT9WK8WE2mGuP9mfAh0hNH7j2RfMLCe5m7VBXYN1DtBXmGoaFjy1JbrPDET98tZvxyXlInhcNU6+im16LLx49urETDqbG3ptCgBkd/Xe6cs0= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6280.eurprd08.prod.outlook.com (2603:10a6:20b:29b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Thu, 10 Jun 2021 11:27:01 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:27:01 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com, Cleber Rosa , Eduardo Habkost Subject: [PATCH v5 26/35] python/qemu/machine: QEMUMachine: improve qmp() method Date: Thu, 10 Jun 2021 14:26:09 +0300 Message-Id: <20210610112618.127378-27-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:27:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e371a34d-c360-4dba-7693-08d92c02aaac X-MS-TrafficTypeDiagnostic: AS8PR08MB6280: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1148; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6BtnfUiSiEjQHQFRT76lLRmwVtrx6iZx/Q4fhOVoE5MS7x4GaW11nz1cWvCmabbMZn3c9TG9/hapOlUnlXiyqwcmJRoWagi0nHI3qngh1jOo7Ejka/XFXuS0OjTnt/wq38aNyoWr+8tuh9mLFuOVy0g8z1YbXv/gQiop2H/xnE3lrVfJveAlf/AqNkP+dKj/wVhpkHaFV7aWgXIf7NZQvsthzFOwNSSMt/TaKb3QCqtSXG/M/eaKaNz2cUtd7WyJuoXJI4tZmk5jZW2YDYrYwd7CawI94m9BTWUTSQrhAt8GlZel2Rm6urRDh9dXo7YhnICAuSoYkZiJluQHF3iTJnnVlkj9meB9h9XtsunH/yXgC2HOhGfxUF+wD/KIGoo77zlXy98gc7VoOwQ0/xpqN1RXvPlxS8QCB3i1hZIQ95utA0JeJOyZiitVnUsa1wLMyZVcF0E4owyvCkd0jIU+eWm8fNCmaakUP3XlclOGTvBsVywDBfiA2m9wsqlUdWWF/GZBQqVkqFjQYfUDYFxR90jU46lyTJzqnzpwUyG6rXMx59+sAfsgoDBVyk2rpJDYPnxB2pNSaSNX7pwAlDn8MFTGNCt0sLbjRbm0Zo98Zg/pnE+lJeBWRrDcF+6qUxNctAQ90ATGcgohRNjHJsT0ydz1ln1zAMI7vr0Wl3v74gDJWJ8oO7BuDJIWbumz8mdB X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39840400004)(396003)(376002)(136003)(346002)(366004)(186003)(26005)(86362001)(36756003)(54906003)(1076003)(8936002)(4326008)(6506007)(6916009)(8676002)(16526019)(6512007)(52116002)(38350700002)(478600001)(38100700002)(66556008)(2616005)(316002)(66946007)(2906002)(6486002)(83380400001)(5660300002)(66476007)(956004)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: njyFx+qIU3LlHhBvCQ4w8QiGvU6//8JbsPFwnj0mSj7WFAX8slFhx+a9dVLH+uuEYQFkJvBCt3L1Vwir9UKZQSNildG/NolsaTq280bQI+hi2W5T/Hlnls2ra/12TR+FEpwkUWAs3TyOrpJHPZmmKngj8EtnqkXc03ERTfA/GgITXLoExXt9dDGxg1jiCWWiR2scXx9Gyo7mboXBOzLVmvqCAa1ik5vnQdufZTFayETsTdDvralDQBizn5tCHr9wFD6RB17eRKxZWgEO2BJ5aA3kP0W2atMGffKD9276O6Kr3hroVR2cIwJL/uG9xm1mV2F3GTqjHRrqVf+X61TRZDYghGugweBwe3LmUV5gkjMoN3B0f3hUHGJVcuIEq0QYMlkRh9U6x6Y+QM4Igw3sV4yKu4wDs9vsqMQLPIaNqYvWOtIYuwGbl9qHV89T63PqXjqvhux18belWUGY1ncPitUNB28JPJT/aFFJA3ThS1tMC8tRsO5tDEvH66Ejb+u3KcHpsl9UvrNYs03uZFmstvrpYgvPiCNuShJvExRBV6njjZpP3GtOzw3chFUvuD0gnYEK38HIpysaYelYJlG65R8fmIxDfI8ctRgpxRoBJMEmkS8YE1RYKs5NwHwPMWpcKHv9QFklpykuj+5x/ytN+q5ihhgw97MDSdcn1LDQjTZRHcTZWgotbADRLuifFKqjx2503Hfgq/5j4sK1oM1TPhxbqN6IeVO0E7xviPYr89E2PHsXvt78ZoP/bEcTqAd+5FKGza9LtR4+PsWXzA92zlMlaL/6lM7aHbugTz7PwntF6d1mKDqf4CyWELTB0QxQXPj0kgdLMPRh3lugk9Z+b10CBKTZKgSe6c8H0l9uJO0zw2J/WdyAJI++K1IC78bbyfAMvwNz1dSzCEJg14VUuGnUL1hheZKfvV5T6Dhiv0MyqsQx/FyyD6206d6b7Tih5Nxms2+9FEIYJtddDQtSJ6Now6FwuPJhtUgB8r7PVG2teu+YDsSMHCrv4g85/R2BMPkdyOeMgvUzZkXj8ASWy2mKLRon342xTyjCkMQXwqPS6ny0p53xcncaA70n47VHSOBy2eX+HLbVv9fTVnJe8xME1/Ypl5bWIJ6exupnizeyo5oq/d/HH9hYKmFi6DxG2lvZRkDMKqLBDxRrYGpdDoGNKg336yYZxbeaFgh5QUnMMfyrc9P6PRQH58UaDkRss8RBadiEiGpETGtjYb7bj7aTOdXO7OjRteok1eKSPlKMnsYfOjfwZB5b/0Tak2C5uGZQiHbwH7Q74TVQ3XdTXpeA7bhVMHdXQ3SkU7aOjkzXhtAzSqW1/jRLCyQmzHba X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: e371a34d-c360-4dba-7693-08d92c02aaac X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:27:01.6005 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: hvcFfAWcsrLp3ULno8553AUp2bHTDHIE7Wf0QpuJO/qAZFKJYeu7GxKx+CrWntT56Kicy5Pv/1Ep+lIfA4tFf1pNYFcmZ76qKkFZfppQ5Gc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6280 Received-SPF: pass client-ip=40.107.21.114; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We often call qmp() with unpacking dict, like qmp('foo', **{...}). mypy don't really like it, it thinks that passed unpacked dict is a positional argument and complains that it type should be bool (because second argument of qmp() is conv_keys: bool). Allow passing dict directly, simplifying interface, and giving a way to satisfy mypy. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz Reviewed-by: John Snow --- python/qemu/machine/machine.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py index 5c09f50ec2..f9fbb41a60 100644 --- a/python/qemu/machine/machine.py +++ b/python/qemu/machine/machine.py @@ -561,11 +561,21 @@ def _qmp_args(cls, conv_keys: bool, return args def qmp(self, cmd: str, - conv_keys: bool = True, + args_dict: Optional[Dict[str, object]] = None, + conv_keys: Optional[bool] = None, **args: Any) -> QMPMessage: """ Invoke a QMP command and return the response dict """ + if args_dict is not None: + assert not args + assert conv_keys is None + args = args_dict + conv_keys = False + + if conv_keys is None: + conv_keys = True + qmp_args = self._qmp_args(conv_keys, args) return self._qmp.cmd(cmd, args=qmp_args) From patchwork Thu Jun 10 11:26:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312917 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 417A6C47094 for ; Thu, 10 Jun 2021 11:49:27 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D252C60FD8 for ; Thu, 10 Jun 2021 11:49:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D252C60FD8 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJBe-0007ss-06 for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:49:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqV-00049U-T3; Thu, 10 Jun 2021 07:27:36 -0400 Received: from mail-vi1eur05on2114.outbound.protection.outlook.com ([40.107.21.114]:47549 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqJ-0004ZR-IK; Thu, 10 Jun 2021 07:27:35 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O28JpC9RuxTooLzqh8LQMcoKQqALeIoCzIRHjtAH0l0NWtvK3DOHPxlEx93pI1FH5JWc5gJNxHXjC1ELqeFJ9C/vjOhaQ0JENQcmeP/QwlU0hvwV2bUFM040lOq1rZUvmJOvoiYiiHBEwgJqvUkokwUzpGAViNAuidrnvuRRgCmcPplEMGyutA9JqkV7yvW0GvKEZF+SzRmm/D6uWSB7rwblfsnIxmbEkEv9xhFe2zoZw/j2v+6Nl5QyjoSNM6LQGss1AA9LIRiq6NcxIdtt6sEtyug6mf+AioXlquIJnP+yzKfH4FTJzq1ZXrUnRmB3KCPvmimBvUj/d/nqA54zWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=V7B38eMa75IHaXy1CHdobFWRDMprMUUEh7qz2TZeq4M=; b=KbhIxxmYDEGCa1zeBKMxVzpf2nK0zIFGFcmZRf/Kh9a6E9Udh3svS2b1TYe6wIL2jmlbYyjCAfgx9TBSleYTa4NdH8QInUNuscgZh92ZLfxBE8rdXMwk4Syi56sEacW7NvcDlkDIkbNlU+NksclaiLGI8DqPRFDBTdm3w6a36mY3qzweHZPR3RQ3sbIx5b1tBjXHdjZ4nvVIQ+cRV9tBzG/wU4jaK5fXIulPaZ/0y05BeRQxjJH2uh9RURfaIOuUd4vNKN3/RPEWoSKe8sV7GSA4xMyPkrRNfaOyt+rVxnUTEswo/ZhxFVHzZKA+spfxdxO4wfh449BLIgbe5zqBCA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=V7B38eMa75IHaXy1CHdobFWRDMprMUUEh7qz2TZeq4M=; b=wWRqnxwDhsD7Ju9AKTSSmLESVgQBrgGye7yhXT7q+ThzKbVJDitP+y7GSv4jCtpoDPtqiyFveG1Vuw7XyBFb50o+MBHktU3gMM+LcCs0TdZ7VV/GyriJapBcKYrNqtuKtwICU1IaEiijX+4X50QXoNaGS09QVy9VW4CevlB4C5k= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6280.eurprd08.prod.outlook.com (2603:10a6:20b:29b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Thu, 10 Jun 2021 11:27:02 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:27:02 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 27/35] iotests.py: VM: add own __enter__ method Date: Thu, 10 Jun 2021 14:26:10 +0300 Message-Id: <20210610112618.127378-28-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:27:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7885e2ec-d9d4-4469-6c26-08d92c02ab47 X-MS-TrafficTypeDiagnostic: AS8PR08MB6280: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1107; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cC3psvr7MWpY0F+h9pyBcsSoxiLSul/sicjbKCdeTuj1Tgn/IT8taA38eTXjzTPDMNAhqYOdMmQ3ROFlEMyZvtWyIbZHzvFpFxnT0mssTMU2acT6bVpvtujE31dZaq+wtj+WxdAY2jrK59h9u6kAbI/qDItdjj4vjO4UCvxU9+sPHsQwsmTTQDyoxpkys2QeunfNouf1lVgSUrvlCISWV5SsNoDgXkstRcs6kQB5JljrOZK7NRIIWYWcxSqIskEyX+L5f4m8exH81GnLZhLPNDZcICDjvVRasA+A5qsrKiTCnWXzyAEkBR8QVnPqsRTkRH/h7Sd0vKrB0YrrXh/3YJ4ImEdKzUPhtswrPod5hB2eUmj4Hvag5F6Eu1REaf335XSsslhMQWxoTMzQTdyM1nxN3nNqhs1Lsfs/0bc2WXJZ1pzCt5KEEjR4jCEUpvs0YS6cvsNuQJUMjq3XA2cVSGhIoOCKy8JIW7P0rAiUTMf3K8ebfzTLIqvAC/q3kphmkpW1zoCAfDwl6cmaR4N0M8Wq5LCamtux/Sc6irez7v9JfJTUN7DVJwNa8kq9yWT8UIozrp3PYaJF6YEE/Gv7pV07TZ5nrrhcvnBn9XFLxemEbWSuoQGdnsHUD3q92NWiuVg5RN8Jsy/qWN5UW42inW+7vNVAUh5ZFEk/FuANWUVdSV28eY8FP30HiMuQnHha X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39840400004)(396003)(376002)(136003)(346002)(366004)(186003)(26005)(86362001)(36756003)(6666004)(1076003)(8936002)(4326008)(6506007)(6916009)(8676002)(16526019)(6512007)(52116002)(38350700002)(478600001)(38100700002)(66556008)(2616005)(316002)(66946007)(2906002)(6486002)(4744005)(5660300002)(66476007)(956004)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: YE75tDoTBiWAmtPlkzxtdSSgc1ahvBwWOUPahe2GWP9W48m9NXGQ7jyYRJor44PbO/vPCjH1UhN68wSDAFp4M/klDyjFrFlCpTwXKJPSXrw1RLoOcT2wrcEDQr0xwdGzDX/aFxDuTQAvF55CTuoodEJZsARbefQlUwVVeXib7KGvvsAvcFou24TpMc0RbTurIovk9TisTWN9hEf1xlyJkIbZ6maK+otZi35Gh/zOXNGhRO196fsjw70CVnIkkOusDK/Y83D/ivy1mERXyxKDO0oJKAIcXqyX4OQk3FJMOMWQbUEXuWa/ARGSxwAwTy3iQ+peBN4stks6U/SkOVUYi5mi++EuyXf4PntNjW36A7N720FBtj5LN+HhJr4Gmdm4o228IZ9FZTPGPwYBIb+3hzB5emEPDKfdJY0ZlFH3clVr3rhUzD5hRgzmzBueMAiZvNxvn50Azc5Pl5ND6CFSwiKiZozcew3N7knIiGPDWa+r95OPLuWCJbB8h+LwDzqfOcw4KoMvdr6Dw0GqgVVTnJCiqjGXSMUEXp30IYb/6U6K3vXdhSfki4+qYeXF1qGfe9zuAp5oXhHZXYV/obWdEGyDa0sW4Ey0V8IY1Bl4AfDYV85fPK0hX1lOX9CNh62F5wUkSbZv4yMA5Qyj/+ZRJLawLXtrQgXU64Hl8G15aPebZLhfe0Zott4zT6rqrEbHpYu8BtAFwQAHsGaeLr3461y4mJ3oKOVHQHh5lP1G29rMEHHyB8ZF5h6SVn+gd0xv+IYR2D1tKucXBpZ7holfg9dNRNzwjlDq0UfUAAAHWx9OV7XFZ/sGeFwR5D1aNtpSRXWJnQS2qaasWDG0g+CPtBT2ewcMXpNzCTduU1Rhwor902fOr1E+yoLIEufelkQI4O/OmshDhU4riuRqafG/+lKQNDGCjlMc6xx0N75lis9/4FHf9MB5MqsR4lM2m65ohswO8DpecZ2Atd5A3978+0f79mPV6RVCfaBtUoLs9BNKU3hwTknCqDwty70Dx9t3l4AeNfUNQLNhKPzbWHiiJL+wMil48sn7F2SCDUOEa9BCQi/ZRWXM1kcJH5hqQ+iU4UbgJ6A7H8crY76R1MAoUfXBfobGrO+MJbdo5WrCbaAg6KiJplDGgCB4O/XHml78ROx1ZjPuJaZkLI2Uhmta+DEJLQl6WKrju5LalJ/QLfWtxWhpJonYbiUuvuMTX2oSwiq/2EHMBuH2v9kQXFwmVWBLj2EHmnE+KivCPjy3iClZ8Vh1wsQoOLLnqUXUMIjiH0YEFUGW3re0Z2Q0twxpAXQNrQr9f04g5ALaQZCPJbU+j6icCMp/mLodhpEAnYVQ X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7885e2ec-d9d4-4469-6c26-08d92c02ab47 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:27:02.6728 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: afPq0mpKk/HHvY3/9pvIn8gxqIGqNoM3tIaTdEm4JKIHH6UrdYQxf6tLkzoW5S3GG5oUq89aqEIa2yj+B9EEEWitniJP5WetN7R72qKb298= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6280 Received-SPF: pass client-ip=40.107.21.114; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" In superclass __enter__ method is defined with return value type hint 'QEMUMachine'. So, mypy thinks that return value of VM.__enter__ is QEMUMachine. Let's redefine __enter__ in VM class, to give it correct type hint. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- tests/qemu-iotests/iotests.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 89663dac06..025e288ddd 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -568,6 +568,10 @@ def remote_filename(path): class VM(qtest.QEMUQtestMachine): '''A QEMU VM''' + # Redefine __enter__ with proper type hint + def __enter__(self) -> 'VM': + return self + def __init__(self, path_suffix=''): name = "qemu%s-%d" % (path_suffix, os.getpid()) super().__init__(qemu_prog, qemu_opts, name=name, From patchwork Thu Jun 10 11:26:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312923 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88169C47094 for ; Thu, 10 Jun 2021 11:50:51 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1FC4960FD8 for ; Thu, 10 Jun 2021 11:50:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1FC4960FD8 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJD0-0004No-7w for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:50:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqg-0004Hq-Ec; Thu, 10 Jun 2021 07:27:46 -0400 Received: from mail-vi1eur05on2114.outbound.protection.outlook.com ([40.107.21.114]:47549 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqW-0004ZR-Lc; Thu, 10 Jun 2021 07:27:45 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=czXFvuLiB8xAUj4Ni8M98jtN08xpd4RMKUNoBZKbpNO1SECL6/To0K8ptCLQJ9EKFxxAL/BrFJnUsQ17+/HxAcXWoD2royoRyzfMigfCcPCRzv2TmyuhmRurGR311pdEM7hy4TYjimoPtjw+NhijyKgDxPELI7hR0ato5cYUZIL/6x16RlYsOyGS69Ts6q1d/bSXG/evyus8vVUZhilkUQDFlIavqG/lydcCPOBVqYsSx9aIbx7tkJZlAkRHPxwsdv/KHMsISBilAs/F9nYmAm/JDJO0RTM7GMkA8mmI6YP5P/tMUb0GziApETqxS+s8Qqa6E2Po88+nDBXYNB2NbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ofy2QVqvSoIMLrXQBtXlnCHooDNtNXeEmY8QERMhYiQ=; b=kemXOCMaRQ6vk92ZULauqFrCwNz7GRdi8zfm834cKDW8bN5ZRGxuOBj0XXoCOH0/W9Iv1lmBt3aKt3lEXF6XAtnWkt7X3X69WkexqN8ydBXMfFNQjr3wSYcFXjIM0IVBSc4Q5ve9q8rLMmwkZ0KYuvEB+oVk+3fItVEi46wp1OtahCGurEV5WPqOzRkDH6RMSq97mmQ2B26hmnuwjw6zgE7tGP26YDfTzjoB8jlguD3+svGLgyjkErCNlFVUnGUKxxnELD178MRmrlZirDK+cxVQz6FGm9FqHzJshZ5G1mzZnd7IWt3ovuhArJ9FxehCzmMOSgO1UtnSa/13aJdVJw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ofy2QVqvSoIMLrXQBtXlnCHooDNtNXeEmY8QERMhYiQ=; b=i8wFNmfL9uAS1OuY5J7NX1P9iSBoGSAWnJTRP/i7O/wltgzHZxHvdYxGHULZg3VhGmIL6Y6+LbqWruS9PS0U1f4Ri4myBOnJq2Q7pc9+oGc02y4v8KNjnSICbENNvpWPtIuWnxmH24E3NEzt4NyDIHzVDUHc2OGxF/Qy3XdIXGw= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6280.eurprd08.prod.outlook.com (2603:10a6:20b:29b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Thu, 10 Jun 2021 11:27:03 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:27:03 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 28/35] iotests/222: fix pylint and mypy complains Date: Thu, 10 Jun 2021 14:26:11 +0300 Message-Id: <20210610112618.127378-29-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:27:02 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a524673c-cd03-489b-d9c0-08d92c02abe7 X-MS-TrafficTypeDiagnostic: AS8PR08MB6280: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:454; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +TCMxIll+QeY5jP25t2Vj3rNfLyO2OJpIx8JpZ+n3ytbXl4nn9YZTGlGWizAv0RV9E4WoRggC8ZLwTjmZu2Ud5dks4qykELht6ZbhzRU2ZmijStbDx1lUnkS/mieE/6ZobKzxSV4quS8szmcGdhvnSSk2OY2j+MW9VYRFg0vmWhEw3eT8wfbt9knNOfU5sF5scwS5Nswhi9s9k6StyyAy06AR0VnreJZec8T/oi2kwPI6Zu9uB1G3cn378RXP/OgjcgVw7ztT4ZyGX4pYvGRQaceq5JkNECI0QuUoaUdyuSb9b9YCEhEenXbtDI0H7Fy+LRv7yYd3YfoSn34qrfNg25QQvtwrhM7eTLWxThqp/p4x3QB6l2fDk48dCo8cSTN/1N5qF7wWSNThimNP8t3nIjGeNldqo2MJYOeqTLjyQY6cLEZpvq49Wmf98/gavIUNITbM9lO0ClUz87BWuDQN3MJRC+v4cOCO7b3RhDTNpxNNXnaxjeFvp+uFfluMYsuwnjWWogIyqSvMpME++FmVzojsiAHSzzHeqNFvVDdVUXO+pZYIyDGNVL7kIe4dnPaN1oZ9Vcoiitrn/kFIaam7M4OHB//2qE7fRCKZf8YGOpw91gyeELNabpbuOTOhQhjQWKzINIipx019Untu1d/XdQZlMDg+K6jdn6dwKsbGqxGfgne87jsOjDaW+hEhljT X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39840400004)(396003)(376002)(136003)(346002)(366004)(186003)(26005)(86362001)(36756003)(6666004)(1076003)(8936002)(4326008)(6506007)(6916009)(8676002)(16526019)(6512007)(52116002)(38350700002)(478600001)(38100700002)(66556008)(2616005)(316002)(66946007)(2906002)(6486002)(83380400001)(5660300002)(66476007)(956004)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: SZFidHqX5IrBT98KYPQRPirtzybKw8QVeZaYGH4fA+ZcH2WydXYNBhnjn/W5Tl5ouWIdmL/XCMW/27bY0BFEB/D5i4XoznGJ09swqALFfaXqTozrs0wIvDylvQZlLNVk/emOFpOVlOSj1g3Vvst7XeXYYntujeA8Wz8/5IdWHkHjh8b9HqD32+2vWCBrl3zuUe2ZzvK94MvQoU4dBvv7xZbeJH9f6ud3TrqJKdvFiHkCCLdVQ61KIgW2ehiefVVCcRNhBMAFmZ4f3wxnI7UB4MPnJM/Ue43y+Rl7EQ+3AwPR7y4+qu0i0m8JapG7jvm0LdX1zfpbzf7ZRxthBLgnJG+H+rs7ji1yz5CKcv4bIQROIjzoX/ymKZ4/SSl+OtuLvVW0DHFvhZAllFMbNKtVs6sJJdWPHQBbkyPPVVboULUnzmN5DXxZ1CnXgK4b/fQN9sZNdNPPH1r+A2JDJMzfuIQ2YQ37Dz2QcxDn/uiJxYcWQP42oFWrTPD16kfNLaruwKsIe5tGO+8qTo+9+0gP30KuROi8XSiGRpfu2MWaTqPfNeO2SNUQxoIA1jGibkKGXL76dGedzUq4kYDixm3R4gYgpsOL79a6CrxEQ1NXvBQzXbFAhBeRytFhbCUfwbZTIwumUX7GdSms0YPQA+xAi5ltq/ABqMsWV/2cjgxwISPNSEUX7vXFxUoyPzwhTy/59h/oKSMoL4kZSW11kxdJKuiNYqHUPEkx9eFORC4VNV/g5uyiNmhiN+O6zyZ9MCn5cs8wcXSRAWAdxVeKaOMkIxd8HqP6H2cXRgEvTqPe35FXHDUW+4jVxvrhRYZJsQg4znD89obWvleN1x74wqIfeMkOhRyrtO/aC23QtE51l/bAJ55IfV32qvhQrdIGagCMESEollHkFhUrovoviWpWX2vd92P+AIqYapUHAgnIsGQfu8FJbNTKOsulJPR9RWgDDM+JqaHb8VndziyuusxSprxUBVYixOECMurbXeXbVUG8oK4Wf+VSnKH8loXgUYhu5zCcrCxFm9dOFHBmZzr9RwY2/iMmPvqYmJbkPvi+HjVuMyxwQwtNT/LstB1tsyJdoctQ6p0OBhoNMw2jAbdAt7Y65HW9aLWfXodKJc78E4KlP0fI1pMhQt9Jc/9IknFasaxo2cmF4jmUHMYR/evdMsLF2bqIBg8869mPX4F/naDYiGuZwE+CUaVKD1Xs0p1+hwEvZiVDlC7H3XSdx7H/E03PPvnlB7hB4XAJqE6ExhLaJVzAqcw/wCsi1P9rPz3rNO/86+ZIauLjdvAiJrl2yl/qZBzz2nLaa7uc224r/6E+swn7raoFf1J/TLvN8hkV X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: a524673c-cd03-489b-d9c0-08d92c02abe7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:27:03.6505 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jUMZkJna/dbxJDyjM8F3gieEtSZAQvkvmQUTAEvMuuuRzvGvdDEmXLPQhRtg4YSozRAA1Rm+liFR/+Fepcmpy7wMviIMOzFsKZz25KIpDt0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6280 Received-SPF: pass client-ip=40.107.21.114; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Here: - long line - move to new interface of vm.qmp() (direct passing dict), to avoid mypy false-positive, as it thinks that unpacked dict is a positional argument. - extra parenthesis - handle event_wait possible None value Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- tests/qemu-iotests/222 | 20 +++++++++++--------- tests/qemu-iotests/297 | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/tests/qemu-iotests/222 b/tests/qemu-iotests/222 index b48afe623e..5e2556f8df 100755 --- a/tests/qemu-iotests/222 +++ b/tests/qemu-iotests/222 @@ -50,7 +50,8 @@ remainder = [("0xd5", "0x108000", "32k"), # Right-end of partial-left [1] with iotests.FilePath('base.img') as base_img_path, \ iotests.FilePath('fleece.img') as fleece_img_path, \ - iotests.FilePath('nbd.sock', base_dir=iotests.sock_dir) as nbd_sock_path, \ + iotests.FilePath('nbd.sock', + base_dir=iotests.sock_dir) as nbd_sock_path, \ iotests.VM() as vm: log('--- Setting up images ---') @@ -81,7 +82,7 @@ with iotests.FilePath('base.img') as base_img_path, \ tgt_node = "fleeceNode" # create tgt_node backed by src_node - log(vm.qmp("blockdev-add", **{ + log(vm.qmp("blockdev-add", { "driver": "qcow2", "node-name": tgt_node, "file": { @@ -103,8 +104,8 @@ with iotests.FilePath('base.img') as base_img_path, \ nbd_uri = 'nbd+unix:///%s?socket=%s' % (tgt_node, nbd_sock_path) log(vm.qmp("nbd-server-start", - **{"addr": { "type": "unix", - "data": { "path": nbd_sock_path } } })) + {"addr": { "type": "unix", + "data": { "path": nbd_sock_path } } })) log(vm.qmp("nbd-server-add", device=tgt_node)) @@ -112,7 +113,7 @@ with iotests.FilePath('base.img') as base_img_path, \ log('--- Sanity Check ---') log('') - for p in (patterns + zeroes): + for p in patterns + zeroes: cmd = "read -P%s %s %s" % p log(cmd) assert qemu_io_silent('-r', '-f', 'raw', '-c', cmd, nbd_uri) == 0 @@ -130,7 +131,7 @@ with iotests.FilePath('base.img') as base_img_path, \ log('--- Verifying Data ---') log('') - for p in (patterns + zeroes): + for p in patterns + zeroes: cmd = "read -P%s %s %s" % p log(cmd) assert qemu_io_silent('-r', '-f', 'raw', '-c', cmd, nbd_uri) == 0 @@ -140,8 +141,9 @@ with iotests.FilePath('base.img') as base_img_path, \ log('') log(vm.qmp('block-job-cancel', device=src_node)) - log(vm.event_wait('BLOCK_JOB_CANCELLED'), - filters=[iotests.filter_qmp_event]) + e = vm.event_wait('BLOCK_JOB_CANCELLED') + assert e is not None + log(e, filters=[iotests.filter_qmp_event]) log(vm.qmp('nbd-server-stop')) log(vm.qmp('blockdev-del', node_name=tgt_node)) vm.shutdown() @@ -150,7 +152,7 @@ with iotests.FilePath('base.img') as base_img_path, \ log('--- Confirming writes ---') log('') - for p in (overwrite + remainder): + for p in overwrite + remainder: cmd = "read -P%s %s %s" % p log(cmd) assert qemu_io_silent(base_img_path, '-c', cmd) == 0 diff --git a/tests/qemu-iotests/297 b/tests/qemu-iotests/297 index 433b732336..345b617b34 100755 --- a/tests/qemu-iotests/297 +++ b/tests/qemu-iotests/297 @@ -31,7 +31,7 @@ SKIP_FILES = ( '096', '118', '124', '132', '136', '139', '147', '148', '149', '151', '152', '155', '163', '165', '169', '194', '196', '199', '202', '203', '205', '206', '207', '208', '210', '211', '212', '213', '216', - '218', '219', '222', '224', '228', '234', '235', '236', '237', '238', + '218', '219', '224', '228', '234', '235', '236', '237', '238', '240', '242', '245', '246', '248', '255', '256', '257', '258', '260', '262', '264', '266', '274', '277', '280', '281', '295', '296', '298', '299', '302', '303', '304', '307', From patchwork Thu Jun 10 11:26:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312951 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DA65C48BDF for ; Thu, 10 Jun 2021 11:54:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D6531613CA for ; Thu, 10 Jun 2021 11:54:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D6531613CA Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJGy-0007sR-0h for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:54:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59416) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqq-0004YJ-Rv; Thu, 10 Jun 2021 07:27:56 -0400 Received: from mail-vi1eur05on2114.outbound.protection.outlook.com ([40.107.21.114]:47549 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqj-0004ZR-R3; Thu, 10 Jun 2021 07:27:56 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zhvdfox3GvIMUjf0hTT3zCBT8qrMr+1EeKvgi45EqBRSxwFj4Ofre7fRzfeerzWjJx6JRIyld5JtwnyEVWrXWPcAy1/LTbLJsAgdVJkJaLsaNVnvdV61QIBlEujcGETPWu5axuAMxs4kq/3X0Pvz/IEmxyd7v/IRxh7qwXwh90R2a+cLbiJhDCO7iIjmJtNDsVkPiv/9rnSBbWxJzb5DjHKnLj4QCfXA15hMalpq7OsTnsSRhLKY/9YW3p8fUUpsCKbKOya/QrdU9w2/EHZz1DphzuPHE32GtCOqcx2tL2ykavsxBRSwnNorQmG8NwpjS7K+wDpyM6geLmSnms8FHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zUZIELcLM8f+XWay+whz9zP3yI/HpiDjHxOfs6j6Jxw=; b=d4KL0Z2Q+uJpmNOUfKbdDoCRz9LxWOWhIJw8qdD3/vHtjGmfEyCPcgQRQOB7CQYM1GhwusxNC564bMiP9F/cRmNWjo4DS3H+9L9Fb1Jl9U0v7J1ZVji682OoWwdL8tQIZKXzC1UtBHaQxQMHRhBYMTuTRFwKW5FagvPRvaG3vDkU4y4RrOenrLHexWrrLOeyj5ONEobj/LVbUq1Jwgmuj0kR44jeheb76Eh76m+yuhgNQYh/fqt7sU3BklWfXPyfOFfemUhHARaoCdaQMuQW6pxT4ebEORRwUpgy0EFH/bgqPE/4ZhRx9/zsnqtQ+Gfe+C6yqq7tghDhN0IiGhtcmA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zUZIELcLM8f+XWay+whz9zP3yI/HpiDjHxOfs6j6Jxw=; b=j1eQQdkB0ppV5kJ6thhtbPGBm1EZHqgOGMRg4NGmfeSChvvbQwEBxUJVDQkNPuLA1p/LFfqxJCs/W8QDU6XD+C7JONIfUJgxb43MC7rSbXSEfcJ2XhcISnoNoV5GdGD+wn0/a3f/bf6pWujqEbiQ7YA+m2wVXqRMhk9YOfW+Rho= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6280.eurprd08.prod.outlook.com (2603:10a6:20b:29b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Thu, 10 Jun 2021 11:27:04 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:27:04 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 29/35] iotests/222: constantly use single quotes for strings Date: Thu, 10 Jun 2021 14:26:12 +0300 Message-Id: <20210610112618.127378-30-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:27:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 00bb2bcc-4df5-444c-c27c-08d92c02ac86 X-MS-TrafficTypeDiagnostic: AS8PR08MB6280: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:446; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: twgzxQg+Pkz7WSgLCxjpNfplYG9Pe6TiGK/yulZo5lVaj1Ko2gmSpN/l4VtVJWZnEF04cvPPlDdSHn+z2IdziM/pzi3+NQolAFGlrK936SHaWilRYoxB6ZDRIEyxgRzRJyU+BoVR8iSEIvm/4opi8+6S6XZwRp8GjUntjd5sj/pvtO04rZVVoTpPN94qd4KFw9KMj8vO9jPccMG/BfjUkf6ysu8JZVX36dXRISbEjPNUz9D2KSz68UwqhgFKUUaABGn+uHlbxPXTeMHo0WQ+dSbaVQ65t4ko9obk3DP9vd1hNjHq8IhvsKvTwo+HaxFk5UDonr4oiJ1sHCrZ2qg5aHinrEUYLHYa/fBU2Ro5HchGFgBtM7/CwGJYPiTzUxHe6XRrBf9G4B6Wf7tVy5Uv+F6xAUa+sVFEvPZBOBYl5Kd0Rv6n6oYlRnONO4RCe0fv8Fqq9v/059in4v+P28tVoR3126aayv90mLUJFIplYSSPsJ71Zlkd6ub2TVoD5U99UKs4HmMBql0K5VFqYxnK/duff3T/51ebrQZrOrMIPzHruHcbsWCon8pvsbJjsgBu666eytiQ0QF+RisjKuy6TQE/2Pk2d+FFim7rT2t+VnoCJ13BHI50g+2uhf7VtZSEFOUaiOiBrMFYjT2OsRGagKAtlbwcUwP7QJe/Y4Ol1B4aglZHZovLzyIicZeSMG65 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39840400004)(396003)(376002)(136003)(346002)(366004)(186003)(26005)(86362001)(36756003)(6666004)(1076003)(8936002)(4326008)(6506007)(6916009)(8676002)(16526019)(6512007)(52116002)(38350700002)(478600001)(38100700002)(66556008)(2616005)(316002)(66946007)(2906002)(6486002)(83380400001)(5660300002)(66476007)(956004)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: K+bBwiQbJ9Hs4XuxUobYlLRMKDNY6bXN6TKdHJpndc4SKp1v1YR2TyBGHHooqgN+KWuYGn8g+chPlgekxslsHgM1DhkQTOrBBgQcTqLsnZKyTBr/OncsP9PBgPq7XfJlD+oNcsnVfoFtv8Gy+/tQ/nfYWHjKWqFhtS2+hLwe/wwJ7NczYJRJpzG2rTWlj8X8dTTKSOjxl5LMxkwQfUTObPlMsZ+c2BkvVPCyPrLRLJ6etsJ1DUY4KhmeUXa8NxwQbkryx1NMAcT6+khpE7NPyuGRmrAJ8Tgp2/M9VEp8BmzQyI+WvRKABYacnMMCoCGG2OrCiLabUcbg+mrInzNfQyCljV12sLwfXdSjZsOJrYZcwNH2C4/GZSKinAtMDC/DKDko8X/riQIH1qBEjmiHxCCABTIOU7jdTM9LRZwF6gH7neF/k9YfhC0u6nMEIT3LGFUrqDnj6uG6e32QdRAtSalT9WURp6fGD5mDgWVBAFsyWX3Ovi+ViVtBxcmMDBWmc9WJr6pH3AhPlUuguQZZoIGyzpUycG2DfRREPsTCzPYq899PC5bvs1OBFfmrT/sRdqco+xtCVaaZH0uWUW/gUjKv6JNIGcVHAV4+z5SsXBaAztblTnE5IYvBKR5ylpEkVbrQvyZk/mk8LAan+F0Dg2zakjOp7rR99FIsVeASL9OknfvEnEZlL8sCt2ppQ6C+mBayjG/CQEt1JAdX+pWU95ajP4EX4j0ikV1ctE3Ev4Jn6FugLJVPSTeL6XXpjXxwNxzvPb4DH0j/0+Cpl3pqn+MZvCbv483NHsTBRCiN7gKGA+iGIhfM4DiF5FqzBRIdM1FOzyx/qWVSQr5sXhH7G65AlMyrquhg//wYC5EVDN1DC239vSe0py6RwqGuZ1NFMNQarJu/MNdtIO6eQVHVunyV2GBXsLtOQ42/PM5lGRy0koaKrX923UX/fz8BuzO+xDdfGdUxphqKTS0kltZ5CjEOpeIjOb7Ydf2hT+69iRl36REQNTo7VMCo/2dRMw6fR8xlleWuRMcjx8lHcWFAlMbpva3WFS1RjFd03SLA5OPLeGbHNB1moXD4ZONCLui+MLz4O5bUgXGy2HXkgBjxwzlkwUkqdTs4Nflddl9Wr8sRZgaqMnHm0HzINAm/2/Y81XhuQa1RpajKDoq+v77JH0vgiB0wj4oAw3aFRFZca32TjoMslIdCxP3Nwhd/8LwULbLSItPYMqvdkm0oYjtmPUeqNOiDe9rADWImyHPQtguOk9QYAbycmGQH7MA+ymyu18hOixNDaXkTKSmnI26HOR9dPjGvNbclXL/QpryF2D76lctlj7uoQjwFw9Ll0fTo X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 00bb2bcc-4df5-444c-c27c-08d92c02ac86 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:27:04.7308 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: O4bjW0qeuuuV3peKJpwT+KPaixp2Pyl0pnYdtRo51QtybEPQtnJwb/2bFHhRvlpjcVXqFUdGcdJr6IapsE3rXMtVHqO4S1rA+fcaDPInZuA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6280 Received-SPF: pass client-ip=40.107.21.114; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The file use both single and double quotes for strings. Let's be consistent. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- tests/qemu-iotests/222 | 68 +++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/tests/qemu-iotests/222 b/tests/qemu-iotests/222 index 5e2556f8df..799369e290 100755 --- a/tests/qemu-iotests/222 +++ b/tests/qemu-iotests/222 @@ -30,23 +30,23 @@ iotests.script_initialize( supported_platforms=['linux'], ) -patterns = [("0x5d", "0", "64k"), - ("0xd5", "1M", "64k"), - ("0xdc", "32M", "64k"), - ("0xcd", "0x3ff0000", "64k")] # 64M - 64K +patterns = [('0x5d', '0', '64k'), + ('0xd5', '1M', '64k'), + ('0xdc', '32M', '64k'), + ('0xcd', '0x3ff0000', '64k')] # 64M - 64K -overwrite = [("0xab", "0", "64k"), # Full overwrite - ("0xad", "0x00f8000", "64k"), # Partial-left (1M-32K) - ("0x1d", "0x2008000", "64k"), # Partial-right (32M+32K) - ("0xea", "0x3fe0000", "64k")] # Adjacent-left (64M - 128K) +overwrite = [('0xab', '0', '64k'), # Full overwrite + ('0xad', '0x00f8000', '64k'), # Partial-left (1M-32K) + ('0x1d', '0x2008000', '64k'), # Partial-right (32M+32K) + ('0xea', '0x3fe0000', '64k')] # Adjacent-left (64M - 128K) -zeroes = [("0", "0x00f8000", "32k"), # Left-end of partial-left (1M-32K) - ("0", "0x2010000", "32k"), # Right-end of partial-right (32M+64K) - ("0", "0x3fe0000", "64k")] # overwrite[3] +zeroes = [('0', '0x00f8000', '32k'), # Left-end of partial-left (1M-32K) + ('0', '0x2010000', '32k'), # Right-end of partial-right (32M+64K) + ('0', '0x3fe0000', '64k')] # overwrite[3] -remainder = [("0xd5", "0x108000", "32k"), # Right-end of partial-left [1] - ("0xdc", "32M", "32k"), # Left-end of partial-right [2] - ("0xcd", "0x3ff0000", "64k")] # patterns[3] +remainder = [('0xd5', '0x108000', '32k'), # Right-end of partial-left [1] + ('0xdc', '32M', '32k'), # Left-end of partial-right [2] + ('0xcd', '0x3ff0000', '64k')] # patterns[3] with iotests.FilePath('base.img') as base_img_path, \ iotests.FilePath('fleece.img') as fleece_img_path, \ @@ -58,7 +58,7 @@ with iotests.FilePath('base.img') as base_img_path, \ log('') assert qemu_img('create', '-f', iotests.imgfmt, base_img_path, '64M') == 0 - assert qemu_img('create', '-f', "qcow2", fleece_img_path, '64M') == 0 + assert qemu_img('create', '-f', 'qcow2', fleece_img_path, '64M') == 0 for p in patterns: qemu_io('-f', iotests.imgfmt, @@ -78,43 +78,43 @@ with iotests.FilePath('base.img') as base_img_path, \ log('--- Setting up Fleecing Graph ---') log('') - src_node = "drive0" - tgt_node = "fleeceNode" + src_node = 'drive0' + tgt_node = 'fleeceNode' # create tgt_node backed by src_node - log(vm.qmp("blockdev-add", { - "driver": "qcow2", - "node-name": tgt_node, - "file": { - "driver": "file", - "filename": fleece_img_path, + log(vm.qmp('blockdev-add', { + 'driver': 'qcow2', + 'node-name': tgt_node, + 'file': { + 'driver': 'file', + 'filename': fleece_img_path, }, - "backing": src_node, + 'backing': src_node, })) # Establish COW from source to fleecing node - log(vm.qmp("blockdev-backup", + log(vm.qmp('blockdev-backup', device=src_node, target=tgt_node, - sync="none")) + sync='none')) log('') log('--- Setting up NBD Export ---') log('') nbd_uri = 'nbd+unix:///%s?socket=%s' % (tgt_node, nbd_sock_path) - log(vm.qmp("nbd-server-start", - {"addr": { "type": "unix", - "data": { "path": nbd_sock_path } } })) + log(vm.qmp('nbd-server-start', + {'addr': { 'type': 'unix', + 'data': { 'path': nbd_sock_path } } })) - log(vm.qmp("nbd-server-add", device=tgt_node)) + log(vm.qmp('nbd-server-add', device=tgt_node)) log('') log('--- Sanity Check ---') log('') for p in patterns + zeroes: - cmd = "read -P%s %s %s" % p + cmd = 'read -P%s %s %s' % p log(cmd) assert qemu_io_silent('-r', '-f', 'raw', '-c', cmd, nbd_uri) == 0 @@ -123,7 +123,7 @@ with iotests.FilePath('base.img') as base_img_path, \ log('') for p in overwrite: - cmd = "write -P%s %s %s" % p + cmd = 'write -P%s %s %s' % p log(cmd) log(vm.hmp_qemu_io(src_node, cmd)) @@ -132,7 +132,7 @@ with iotests.FilePath('base.img') as base_img_path, \ log('') for p in patterns + zeroes: - cmd = "read -P%s %s %s" % p + cmd = 'read -P%s %s %s' % p log(cmd) assert qemu_io_silent('-r', '-f', 'raw', '-c', cmd, nbd_uri) == 0 @@ -153,7 +153,7 @@ with iotests.FilePath('base.img') as base_img_path, \ log('') for p in overwrite + remainder: - cmd = "read -P%s %s %s" % p + cmd = 'read -P%s %s %s' % p log(cmd) assert qemu_io_silent(base_img_path, '-c', cmd) == 0 From patchwork Thu Jun 10 11:26:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312949 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2948DC47094 for ; Thu, 10 Jun 2021 11:54:04 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C8898613CA for ; Thu, 10 Jun 2021 11:54:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C8898613CA Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJG6-0005Ge-Qo for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:54:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqk-0004Nv-Go; Thu, 10 Jun 2021 07:27:50 -0400 Received: from mail-eopbgr40102.outbound.protection.outlook.com ([40.107.4.102]:59870 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqZ-0004oO-O7; Thu, 10 Jun 2021 07:27:50 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g5ZgG0EtRiiPE13h3TpMXVe3Hn+2jXy/t40SJ/3gZM1TrNbRO5CI3WRVnY+RFmN9O4KuQQLRIWGspL7mCEPrzpRgeg1Ud6lkPNyZBW7HImoqqW+G+VFl3IeyvLZeuCRLiuVizk6i1V1ekcSeJBDTseikdrEfXy1NGVAcZVwvw0Ao0Sq5dfUDh3zQX+7Rp9ptppXS3FK43iz6Ea+N6BWt68B5930mEH8ANpDzi1fYJCezGnFKJgiLxwoxJUpaCq12z9h+O3FY/jNCb9ii9xReGiOK2xRO/u/3fSMdWNWxVMl5VVEj8GbXdohdIwi5q+gQf20HufVPlJGrhoZHSGNrvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pm/DX8vEH9U0U4+GCtPJAxsZlteqTAW/fTB5aMXiQYE=; b=a1Z0930WLZ7EBZ9wYyzSfcheG1ggl4BFQUz5NC0Nei4XJbIkdLU1Xyyg7sKTedoWtc11Z93+QJsxktV8Hc8sflT0hKKlII8g4pDFPoLVDgiy2+yN9SubhJ20QYDdEod091t4dgzVF7kBvgGnJXREY2qi/pUNDurh2z0wfR7T1IfqWs+lDvlIQk8q+Av9ykVDxJFE+U0+tKX3aqDNAvU7Haes6jrTX3gjIlQvZo2U+ach6CAFFvdB4qjxJKHk+xiDUtact2ZJMJg8jW1/Y1iEEV1MX5APtr6Vhc08HgLOJThyiv5h0+TOt9mjf91rnFwS498CaKxc1GRdt2+6uJfwQQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pm/DX8vEH9U0U4+GCtPJAxsZlteqTAW/fTB5aMXiQYE=; b=aPdmVsCbpVGTnQvr/rvF9Sv3rbuIaZ2B5CRUOnxqYbfJjG8bXVIaVqTHu2CPB9zWYq8Mez9zeDamPbEUAans/bB9LiBmrnVNmKlUnLSZ5K3EHNbHWADDiPw0I8ATy1h2U+pYmqcNTUOljYpbL0m0gQQHCSo+xvZ8XCZ1NpuF+oE= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3381.eurprd08.prod.outlook.com (2603:10a6:20b:43::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Thu, 10 Jun 2021 11:27:35 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:27:35 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 30/35] iotests: move 222 to tests/image-fleecing Date: Thu, 10 Jun 2021 14:26:13 +0300 Message-Id: <20210610112618.127378-31-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:27:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f87beba8-a9ef-4c18-673f-08d92c02ad28 X-MS-TrafficTypeDiagnostic: AM6PR08MB3381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:497; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v8SQTuCWqvWRjFe1zxZ6cs5NNO1Evn2U6272rW1UDwCVd6GL75te9bHF9zOhqIoHnuMfRnOuHH7icNJsoUjVaquP4GaYj7VJ/aVSTs6FetizwbCJmnZNjC9zq1VsfWZ8UfhyLgVVVWc5TTE3fjxSm+DUUPGShcrHiSTzAJXgJYeKNc3xOrIteaSBgH2xQB2AdHz4XPI4S5chMhwcJNZFdQ8TE9aZczhaskBauXF0aFn48U6wCdxXnvQh/4RMkXVszQ/dkBDON6tCXwbTy0TukFN2oYPrvtZsupabxWfvgSAKqwQ0dFdY3nOD1ACIeNXddF0wdx3o6KqiX37/AxqS1lOihQRBytqGNusIGBlcwpB0efRlop6NPA/CUctWz8IRgF4QlV8HeROH14KhqdqdOGQncvlzgqJRILW8Al0mJdPKeGqywN71UljtRdJZ3BATG4SDMapw+bzfWw8pXCqH+nH7vpRC2A+ANpSldctc+JMS2bzeMQlk4w7dQ3r5Mw/ugkmbcu9OupyCfO7HBUKyyxX22r6zWWJr555U2D+L6OM0PK6Iq8+XVLyw7+xMZ/8uDejQ1lfanF99Ra/mtzN+fq9M90fRY+fFW82Nt/qTLtSoYjR1QnGaEkI0z4aLi/lX2SBRWhzjjO8NcZn1/UUbxRMlW92F1IgDA8Kgtnbv35Kb+PPnRMPz9USyu7/d2N3W X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(39840400004)(136003)(376002)(346002)(2616005)(66476007)(83380400001)(956004)(8676002)(8936002)(38100700002)(6666004)(66946007)(1076003)(5660300002)(66556008)(316002)(26005)(4744005)(4326008)(6512007)(478600001)(6486002)(186003)(2906002)(52116002)(38350700002)(6916009)(6506007)(36756003)(16526019)(86362001)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: GTuQT/3Xb3dPXyCLVWms6788I1NSHOUapJnLgECRK5/3J9NTI1LNEW6dgDOdRjBZN5nhvvbfgnoUssHRf8BpdHsgHUBIhiBYedzjAi6JHaYbbWKXJAzNQpQXopyMoKq9ZgudM9DAQQ4fGa5JYYCinfsSRbea1HZRc5VPqLl7STq2pL3wDKqo1xK285iYZQN2DwrIUFPnzqVFkcXi+arFd5FvxmFSRMGjXi5rM+Ylk9K5Q3KnHYb3QGqCDUvXG61BvRMIw01P4f4cn7TTozGm0NykZidU3AXP4DCvRt+cfYSkYjOPklIXnl4FMRn8eYC024Wv43b8Cc5nGK9slkleu+heb6sZnDz5AE91ULfQ2Msw2hZlJfURjCkXVWCybhJG0Rx0ck9VdJfolNdJJ7Vk/TsZ5Hi/x4AkBxBeLfl4OY8Qzax5Jk6G0ITPGoY5nHSOME+R0Ksl6X6lWNQQwInZULri4u/prbZrYFIORinhcetGVxlk0kDG8pHQ62VeOnNql2h3sYQ0f1Xs6QNwIG5qsczIQZheNM0LIMngMA06+bllZPujwvygLSPKtHWFboIPXPFkAcKaHwDNgCIt2FLusx+wVzo448WyJ5jJBnJHjUmRpAxhWh1fS9vQ1ANT/FyB0MV99uBTyxakmI1Gu/2NCI9lsY9HbOB90wv3g1EOPSEAA4kzmV1QqUExYdQUarPfSqlKqYBR0XMgtvkcG0iL2p4OzdTeg4bK2dxpePhy5vNiUWKbfwfE4pIGhpvPkr+moCZ4T+OiTVtJYgRMn0Rzk4X07ODcxCC/qlAaAeAJ9zagjeaZJNuYgjEfbb2iOKo9ZHa+5z3cUCx+5ua0r4kklIZEyOhwc1JnZ2I6nG3foN238mU9zD/SIFdlANtpLuWX+5NQv3bLgc1pWyMClph0+DFs7CNv7B6CctS/AjeFSYAN6uEM0xqVMTfgwV5SFccNaqCHETfcZaCOLZA659uxXZvdbI4HSJSmJWo3Fxf5FmERdSGoxFnbnA1iIRnYPtJfRIggSoPHgHritSUgMj5icdu0G1A8bSPbZyJbGjEqmHMg5izkyWziqo7eYXzFLLh9l3fFf9LHPTK62vLSucLwChQ49r7apDvJfz494OvYq22D3oiyChh90KOBPsZCIJZZoMzoVlDs20ShCiSeX5Ti5v4316S3tk6X8JQL+hmTYMOAHtA9jjJV8off08c0JQMjMnuVNo91EgRZ89vDpOYzWNRefD1ooBZigFf5tWSQo4vH5/5djMuKkfpMbfTlyxmWK0c/Ui1T1m0AAO6m8KDd3gNPNJt3b0h/xSaoAhyKcROlsZ7RHr90m9+LCP/GSRVc X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: f87beba8-a9ef-4c18-673f-08d92c02ad28 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:27:05.7682 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Tcva+twJpHv6IR+aC7exG4AvUx6mTozHAUDZnB1vetQ5LkQp5/S4jqowhFcnxO0B2GCSAFjMuMicoE64jpMH39isOJtN7MUISgUtx16JmvU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3381 Received-SPF: pass client-ip=40.107.4.102; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Give a good name to test file. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- tests/qemu-iotests/{222 => tests/image-fleecing} | 0 tests/qemu-iotests/{222.out => tests/image-fleecing.out} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename tests/qemu-iotests/{222 => tests/image-fleecing} (100%) rename tests/qemu-iotests/{222.out => tests/image-fleecing.out} (100%) diff --git a/tests/qemu-iotests/222 b/tests/qemu-iotests/tests/image-fleecing similarity index 100% rename from tests/qemu-iotests/222 rename to tests/qemu-iotests/tests/image-fleecing diff --git a/tests/qemu-iotests/222.out b/tests/qemu-iotests/tests/image-fleecing.out similarity index 100% rename from tests/qemu-iotests/222.out rename to tests/qemu-iotests/tests/image-fleecing.out From patchwork Thu Jun 10 11:26:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312945 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1602C47094 for ; Thu, 10 Jun 2021 11:52:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 30F0F613CA for ; Thu, 10 Jun 2021 11:52:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 30F0F613CA Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJF1-0001rF-C7 for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:52:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqq-0004Vz-7c; Thu, 10 Jun 2021 07:27:56 -0400 Received: from mail-eopbgr40102.outbound.protection.outlook.com ([40.107.4.102]:59870 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIql-0004oO-7s; Thu, 10 Jun 2021 07:27:55 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S+v/RUGOqD0kRlK5MZLG1u9zeBNvNtyu+yEAIB9nbugWot6tqhKiTuY+HUoEO+d2n87iPHh9MClqvaDQqkxz0hyZMtwL06nv0JErW5TcZlk493Mrz3q9odfU92e/7WIvJ0X+icQ7Qgxz1x2lT/ny3Ne4wCA6V8NAGoseYlg9y3H2XcCqLct6jFRQRKb/MtC38KYSG7cgatVLjnDNnZzEfQj7LEFeTpSLsBI4EsWoNOV4ErmjbO8mVEnhR7EcKsw5/CF8rfOqFJd5NwyxromLUDkHkqGfCDjTbfyla3E7DY3WgUnsbepgVNucYA1yxC7r1BO0jUVaONB8JPnjzDHfaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=d1D+TJWfNhK5y6L7kQjd0njVG6279vZagGyKFmMJ4ew=; b=KcmdXkpH/pZ0Fe9jbbyzBTD4KGppaSlo8ocr44lTb3aZoEJ1vGG3hTOaoWtzCIv0UKCkvbSN5e+tJQ1EjgPk8hQh/7mFq+ssmXwbdhmCxt3nq8PY3EU+/YMwsEZk+XSRxxAH1zhvTg+sXeBWrV8vQzddYg4CeAKZMzOGu+Zz/xsN7RzWwdKHiShWKq3095FRtk+aWysc8woNkzC9OTtclySS6WidC+ykXc/MW1fsDl/zK166guj3ymV45iX6gU9lBsi+P/bjUGWXR/Xakw4kaUB5aB+8lkmkKqqRG2/QnGg1SPXIbQ0COhISfCQ5mQsVGc9Bis8+/qRS0o2K6NwM6A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=d1D+TJWfNhK5y6L7kQjd0njVG6279vZagGyKFmMJ4ew=; b=u9nV+MzTNHn259reIv+Ee0O98itLlRocNZUUdzHJt+ASeU0PUuVQ6f1A3GuvYXH/yN0NP6slfgP6kOtuYa6gEcDjQ4PK5mnCRZ3U+uhoZrxjGj+l9XpxamhyyXMtAciJFgU7eA1YKxWPLeC111I6uAgmvlyIL14WoE3Bw/MYHzU= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3381.eurprd08.prod.outlook.com (2603:10a6:20b:43::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Thu, 10 Jun 2021 11:27:36 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:27:36 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 31/35] iotests.py: hmp_qemu_io: support qdev Date: Thu, 10 Jun 2021 14:26:14 +0300 Message-Id: <20210610112618.127378-32-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:27:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 23b379cc-b8a4-4da9-5961-08d92c02adbe X-MS-TrafficTypeDiagnostic: AM6PR08MB3381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:431; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1ycx8DOBc77E5q89Nisk4WrNhkDQ441gttKyODdM4fN5mKhGqr5GH9gTA/DvtD7fM1OlX1OEu+8EROmm7zkoAYscAPejTn1KuSUEdwlATjVfRR2/NutNmRmPlhKKbVEE48rCJMSmMeRhz66hOOOdglCpBtuWZVA/GD4BMVEnX6/iEmONIXEAPJGUNW3+GTIBrY0KgZHcnqhCM0FjWMYtZQ3WOcD71sgYmaIhO54mgrW7viq1ECAPduYDZssXdl9QQSa3GtO/vHLB3mA1jXoUoLmrlwt8foIP5d5PVzFACuRt06rn1CFFYJ2CqzBYrwUaMj72VaRaZlv5Bgnh/b7QNC3tAe8KLQum0GhSm2eQqeAWmucCZ2UHjAXBDIZYVjaH2IMzv5/o2nI+ULsNDWfecrIHYuvZDjNwL8tAAxi4mUaSLw7bsAUcWqK77tPq5sukmnHBZkweFDQP4aRip4NtXD7J2t6ZvxTUnolR5SLJQexrnQPndHVRyhS1zoMCfMVV8LDggGWIisxxJqVjOmxA//O0L8mmbU0NvJf7KLGb8koaIFFjwpbkAleMFvLgayr0xEhvYti5/qNddYgPNiCKBSNM9/S/5cYl9bDKFr6mPblk7sQhyW0ZVyIA/TrytHvVuD2bOrvsG/f+rMary/CHsqlfhXYaGVyNbqbuuhja3pliu9Vc3F8PshMeScZHR2Tc X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(39840400004)(136003)(376002)(346002)(2616005)(66476007)(83380400001)(956004)(8676002)(8936002)(38100700002)(6666004)(66946007)(1076003)(5660300002)(66556008)(316002)(26005)(4744005)(4326008)(6512007)(478600001)(6486002)(186003)(2906002)(52116002)(38350700002)(6916009)(6506007)(36756003)(16526019)(86362001)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 8ZIrLJ3QwZ7SeCJydtzxTrSNJH11nSgKBpfe7/glTIvmBVAP5kzQLPi0oKawk7BtP7gmXPX4MjC+GZJsL0Bc9UIcAtbqPeqclqrg2XIghP52jR7jAXKyY1dsYg7dapTsAt5iWSf5WJOvepJyaMw4jeQYvQUHzD/4xOnPFHxCDjcWHDwMkEsjmJHuyGG7z81q2a6jQjw/9L5uw4FoqbF7k1KnVZNty+hhle10jIxpLqzD9hobUkqfkxxvS2N/6mYFFCVdJksv9EkiPdkyximpyVCRydUQMdJbdhJ4VmLf+nAB8ulKgtUrBNjo3fDpMWf/qKZM8U/XqxGG2SuPET2jV24nwRx7OTrTaOZ/iVPGwRtues4Wt7ykMnW3qAcy2JCJZhotO4rFtOhLf1lqvu/gN9cUIzOQpI7cocO2NdtszEL9hXepe35WebZR9v3150yaXV0J/raFESfaKqKK13ehTEw8F5kj9q5qT0FzqdKh3N4peikhfPAi0f6t742Dy8upIxXGQ8FtJo5sP/jTHeA7pgMvArZYng2+35oV1ZD9koeOclhIZXGrOhixp4++QLhTAGXJAVcgR05TLYWZ7BJM0vLBnaydSW230JHxPTrhFc7H2rmTRLq0WZPawPR6wcgcC+FgFNzPGzRMmSnq4VgLqCWIN/D4A2xWYa8bi94eIdJhMCCFYRvdpPy+fKy5OpMF3mPftMCR7IUuOqUGYZlAFP4kBMp/hsZ1iT4QVO/F9Qov4MClddaKGuaitURfcYGoAx4YNfAED5I5ZiyihSjm5GqGw+gdaPxyH7SfJ7RrVAHqgraR9176F8UgzILk/pmJmU7roN427F2j3RpfEDhTJ/tCs+FVEcrRsSNkKtb7Py50zxCKREdcJQp0HTfwa0b48WcYrNRnbuRsZA19pZm0lD318ZT99XopEZqrFA+JDQK3I+LwZlnP+yTLgcl6q5AZC0j3x4FNlhdPlrhM9lIam0j0+FM2IYkXjRJfINfAbMsDMDwMwt1yvEnSlZJn0P+t390r8t5vsTJVLnJvZR+C66/4/qMgLzMEgWAU8GJCrXT0Rf9ayBDdIIQt78TIgT0Yj4hAH8PQeBMtJNmRYSOY0ljpHGwDacfTIoWgFUAycwAMYOsPyHHN0fPN/wFEjO2B0WkUqiq1lgeqfji1vd8TqfIZDIoVfhssVXgk8hYcwlouwrE1H+WR05KoDiC0Mbe0oBUlzprD1HgQDQZzISaweAKtp287pDs1m8ZrMItgHfZjpSonKNGUVrefj2OkGagsxneuXL2Y6bAJ6cU5+dbIOZkl+MRN2KpFmY00zjWC0K54mt5dHOeL+iiGWx1KAZA+ X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 23b379cc-b8a4-4da9-5961-08d92c02adbe X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:27:06.7579 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PGBlkn3A+Or0IZkDjrlSDaIV4bLQGws+N0JVDbeaFtoMgEhM4JAlljhArGNB9B4IUkmRMvdSDeai0fs0dzb8nXZTmJO7FoYzgViQPKtUkgc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3381 Received-SPF: pass client-ip=40.107.4.102; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- tests/qemu-iotests/iotests.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 025e288ddd..9d0031a0e8 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -655,9 +655,10 @@ def resume_drive(self, drive: str) -> None: self.hmp(f'qemu-io {drive} "remove_break bp_{drive}"') def hmp_qemu_io(self, drive: str, cmd: str, - use_log: bool = False) -> QMPMessage: + use_log: bool = False, qdev: bool = False) -> QMPMessage: """Write to a given drive using an HMP command""" - return self.hmp(f'qemu-io {drive} "{cmd}"', use_log=use_log) + d = '-d ' if qdev else '' + return self.hmp(f'qemu-io {d}{drive} "{cmd}"', use_log=use_log) def flatten_qmp_object(self, obj, output=None, basestr=''): if output is None: From patchwork Thu Jun 10 11:26:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312947 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B17B5C47094 for ; Thu, 10 Jun 2021 11:53:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4574C61278 for ; Thu, 10 Jun 2021 11:53:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4574C61278 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJFz-0004s5-F1 for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:53:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqs-0004eV-PL; Thu, 10 Jun 2021 07:27:58 -0400 Received: from mail-eopbgr40102.outbound.protection.outlook.com ([40.107.4.102]:59870 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqq-0004oO-Ux; Thu, 10 Jun 2021 07:27:58 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UZo+J2IB93viBIkjX6RqkcS5SD9Kqa86AKgf/TVjQD6UlnEOQrvxXF5qgcirVwUNuWE8ZHpV+DHqA/JS9gS4n1cPSfSyAIVOtyQsYVTCa1UJwK+6Y2s3sgKLhuoEpbUJZ6MfmArVpd0lLDXI3+Cv6jsUi+xq5J3RBzqhC0WJ/iVEP1vYA4aujh7J7GTA66X6AGsxPDVn5dFEdh+gqKZxA0alM9so+qTqkdeeHoLsQOb0tUncH/Xyy049Oj/W6hDzJdQzNtl4downvUDtJ2FbkMeg84xZtssJ5GnPUdFGINQpNBVXuHIDfCI10sNhDkStY9CWWJ8nJh61x3865LcwyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R10eEY3SLa3JfenTqosr5rslG6Qb5NWVOLL6711tuGc=; b=dzjQM1cVKU6U8xCOrO7/WO7YHFSBtH3Y6S1+W9vySNzVNIz4ZmqK3jKGq5wMK2HNQ1pxVKErmY2pV/kJDmxD699hQowOqzBo4QC5QHdyIpnfZSkTjP7PiAraQMVqYmy9h9a3B5pYwvlgRrjWYM9CCQXhaAAFSud/Sccr06y0xggsqRILwT6WfKsyNOgBbjRwAHJN2RCDqzMyT9XB89hmr6ibSYOyY+fyytVaHh6zjMPEQjdursrNF3LeHDhQe9ESD8tu4sXnMeQYgXVr/XGOOJhsbxUzqkPd0mhE1EZccDC9ABTCbFXV5TrKIvCxqAoUm9xW++rKIcXtGuGelKSTdg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R10eEY3SLa3JfenTqosr5rslG6Qb5NWVOLL6711tuGc=; b=oDJCQeLWJT2HLuveDowZi/kJQ+AolgzluAqHcwPNXfVsNcAmqr0kfkWiFiL0XegjI8lYbTmgpd2wbXv8uBj1TDU6jd7890q0PGkn2QpTJ4vHg0iprIvUxg3wuzCa29wyVqupERP4BFRpezXX9A4ds6Mev+RXxQOSELkdUFhNLyA= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3381.eurprd08.prod.outlook.com (2603:10a6:20b:43::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Thu, 10 Jun 2021 11:27:36 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:27:36 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 32/35] iotests/image-fleecing: proper source device Date: Thu, 10 Jun 2021 14:26:15 +0300 Message-Id: <20210610112618.127378-33-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:27:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f7548ce7-cfdc-4206-8c74-08d92c02ae58 X-MS-TrafficTypeDiagnostic: AM6PR08MB3381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:580; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LJx8qIw7ToUozcNugCAPCSi7rWhuQRnpOpXSPX2+EJnu9Jb4Pn9I9xngEo3Ba1pgrjAqnHijChBGRIQGHtXmrLpQm/KbPfuTOj17ya6JCpeC7eZ/ML/hI746F7rIjmbyNSkgGzidc6SDdOjXPpYlebznsmFjRUqXQ2C7/9AQ7KincghRR1/g1Mf3sTG3AsZj098UBDPxwE9UtJxoq5helukD+okcZA69MFGyBqmoKKCitdtKMjPSTI+BNyhK3c4SAnTXx4TvRqMVgiIym3rSXMicd23oC/8BYIvhshyuvYHWbVJ3gWqvyMWdXfPc9kwr2qeUN07GKus4pRwNqMagch5v6xNt5thSXd05iPkWJObuPt7EBbaA4qhqh/60zsP2iuraC4Cy2F/BzhjieCnw1rwnrU/RBPfMSVjxY8af31Nvhe+qm50YO3d4hwcfoDDtZSNQHETE5h1HYDay3/XbYktgO0JicvBJdP9NqllHAzM7/5CGJSI32MRs5fM8X5jKpr5aaJUl3JnbEH7L8hQwH3eangtHn378E4TAFxbeukid/AzbA6AtYDAwqkium6MLZZ5suX3XEMjWXN3n9Ln4zgZxUcjM8rQ7xneODbAaoZXwA6xgdDKdrJ3jJM+GbMlSaqFehNaarvqfeJtERMpUTeTtJw0mNye670O+yV4V8KkyO2ScWMoZsDz47ktN3SUY X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(39840400004)(136003)(376002)(346002)(2616005)(66476007)(83380400001)(956004)(8676002)(8936002)(38100700002)(6666004)(66946007)(1076003)(5660300002)(66556008)(316002)(26005)(4326008)(6512007)(478600001)(6486002)(186003)(2906002)(52116002)(38350700002)(6916009)(6506007)(36756003)(16526019)(86362001)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: K2dC7rgFEgu/laaYZjibKBDQ1rF3XkmaPq7HcrvaweWTWH0xkSijJ+l/alXKAyGO+nrE90RTeyqGR50S5nLTREsbR7/SkMfF9IZJhiLL4BdbK5BxbGCT782wtCWWrbofkzEAxMBJoc0L7tJ21WZeslBLOW35AlVi6W76sAkk1IRpaU5rcQfV/f4BLn+yB7+N5hXOLF/8jlE5WBspaOwu+jrulDdEOYU+YTi9/Wsb/4JgJ2Cv0/dpNo+mFl191Fl3Lu3uBg176uniHPCK2Vk7FnE8XAAesuOjSJpW7nZcZXBt0S0qfFby1C0pQ8x8JaEfXQRLg1wT0uPFZzOS2dp+pcn4hpr/iIf5Xi49ro7R9mOl6NVHfuPOTLWOq8Rl4y1wPmGwl2B9+JUnumrIE0LeNx5l2qvGZYATu8odjy1as6eaPeAmyXjTawwcw/LdPIjaXJ6wuq+97pIGLJlWtpkGNG1yngCpdjnoX0tOnuLpfYe+KgBm2TwPOXzBIPDxOdLlzhOv3A3kgtUwnYlZpQS2gSMC7u7lV+G2hyhYVK/l8gUNZkDqCbkMipTIboyJGtmcqhAnduRLEazDMKeDYb7O2SOV5sU2l9kvDrSvQlpD26NVvLYH8xY2m97zwMgGP0MEIUxib1xf+ssx/Tbfrbnd6a0qHA/7GAVI//aroHZtNJXMAH1WfnSRJ8YA4BQagWhcorgYRWQWNAchuFEB+hfvpwMHxfbJiEfS8bwEFoHHFL+YBXZHbRlGtvRja/uXokT0J+2fP1jRLIrqrHjqKMbifTpw6VNqyD9RzXF3D2jK/Oj8DTHEp13PVT1nuLu/Ld7cd90pjWCxPioiUUEtpxamZqcBl7Z1Q2QI9A+qEpPh60xmMPH/bxq44MxW2Xw2V51PTsrefv1MqvXHRiry5irSHDpQZPM+SaVJxJOuMh1E+KYEFsICQwKEcrSzRotYo7hHKSbNf3aFoJAaD7c3i+7ki9Mm/ksXEbBhyj2zDoDE5tvah8hAEg9aH+NT8NayIBZrHoLTNhD3JYjxXLg0oONz0ak8NcodTIbf1pNRj0a6p9GNUS2SNmVzxsFexid86n4IFj9q6mXOguD0m/V7HgkLtdC945Wu9jKYV0tVTFsQPdD19K/bp7GIixsCyztEIFooRayVijEwhgofOctsCyzEyhRSHA6zO1oDjcDP7YGSGBc0eIOQz4p92e8ZYs57nleimcWKVVSCx77+8ZUeGLUhUr5y3gfUKeWFOxMnafCVBUCfoOMXTh/KYwkBa/p3yvjvrX2Q0qYD8WIWR8gzZrTNoVKQQnwdtr4xzKtMkaYfhiqFZYHOhyZhIsXAguSoOBFT X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: f7548ce7-cfdc-4206-8c74-08d92c02ae58 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:27:07.8023 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: L0IGlVB37dau35M6GMVTUBAQcqIlojvNHbug5kX4uT/ulAbimRbRc06bOw4ot0Ow2C+/tkUciYVE1LszyqpHbVo1iN7lIyF7Y9MFwzOk8pE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3381 Received-SPF: pass client-ip=40.107.4.102; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Define scsi device to operate with it by qom-set in further patch. Give a new node-name to source block node, to not look like device name. Job now don't want to work without giving explicit id, so, let's call it "fleecing". Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- tests/qemu-iotests/tests/image-fleecing | 12 ++++++++---- tests/qemu-iotests/tests/image-fleecing.out | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/tests/image-fleecing b/tests/qemu-iotests/tests/image-fleecing index 799369e290..961941bb27 100755 --- a/tests/qemu-iotests/tests/image-fleecing +++ b/tests/qemu-iotests/tests/image-fleecing @@ -70,7 +70,11 @@ with iotests.FilePath('base.img') as base_img_path, \ log('--- Launching VM ---') log('') - vm.add_drive(base_img_path) + src_node = 'source' + vm.add_blockdev(f'driver={iotests.imgfmt},file.driver=file,' + f'file.filename={base_img_path},node-name={src_node}') + vm.add_device('virtio-scsi') + vm.add_device(f'scsi-hd,id=sda,drive={src_node}') vm.launch() log('Done') @@ -78,7 +82,6 @@ with iotests.FilePath('base.img') as base_img_path, \ log('--- Setting up Fleecing Graph ---') log('') - src_node = 'drive0' tgt_node = 'fleeceNode' # create tgt_node backed by src_node @@ -94,6 +97,7 @@ with iotests.FilePath('base.img') as base_img_path, \ # Establish COW from source to fleecing node log(vm.qmp('blockdev-backup', + job_id='fleecing', device=src_node, target=tgt_node, sync='none')) @@ -125,7 +129,7 @@ with iotests.FilePath('base.img') as base_img_path, \ for p in overwrite: cmd = 'write -P%s %s %s' % p log(cmd) - log(vm.hmp_qemu_io(src_node, cmd)) + log(vm.hmp_qemu_io('/machine/peripheral/sda', cmd, qdev=True)) log('') log('--- Verifying Data ---') @@ -140,7 +144,7 @@ with iotests.FilePath('base.img') as base_img_path, \ log('--- Cleanup ---') log('') - log(vm.qmp('block-job-cancel', device=src_node)) + log(vm.qmp('block-job-cancel', device='fleecing')) e = vm.event_wait('BLOCK_JOB_CANCELLED') assert e is not None log(e, filters=[iotests.filter_qmp_event]) diff --git a/tests/qemu-iotests/tests/image-fleecing.out b/tests/qemu-iotests/tests/image-fleecing.out index 16643dde30..314a1b54e9 100644 --- a/tests/qemu-iotests/tests/image-fleecing.out +++ b/tests/qemu-iotests/tests/image-fleecing.out @@ -50,7 +50,7 @@ read -P0 0x3fe0000 64k --- Cleanup --- {"return": {}} -{"data": {"device": "drive0", "len": 67108864, "offset": 393216, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}} +{"data": {"device": "fleecing", "len": 67108864, "offset": 393216, "speed": 0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}} {"return": {}} {"return": {}} From patchwork Thu Jun 10 11:26:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312955 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69323C47094 for ; Thu, 10 Jun 2021 11:56:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0928361278 for ; Thu, 10 Jun 2021 11:56:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0928361278 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJIL-0003u8-43 for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:56:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqv-0004qF-8S; Thu, 10 Jun 2021 07:28:01 -0400 Received: from mail-eopbgr40102.outbound.protection.outlook.com ([40.107.4.102]:59870 helo=EUR03-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqt-0004oO-CC; Thu, 10 Jun 2021 07:28:00 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cxnl+94AOI/R0Cw8EI96kOpYlXM3FuUw4NCtg/qPmwZAMmTQ3/WlI/kxuDfn0QgnY/hgXC2nIG6uyAD3kknOcIxXBa6Y2qslqjQ0Mmx5whPx/uoiV0x42gzTR9XExBBoouVyHXTkzJfSNgSgvCNQbuYGs2PCY7V4AGHcS1tg3AwlnQ1IFWxGsYo5enmOwaR+N+LhTQHWzN6Z0fT46H6JsWZW3hCszwm+tdwGiqPVDPiRDctdkD0sXSqzC6GJm5YRAOKME6COZhLWRS43ck1YSjLyywM3rSFO6epgFvwCLWBslGQ14+E/k6bSxIvU7BaQLbgzzyRVWGaypFC944aKOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HfTynrtFoOtQlEZdXbg/sqJjKgrWrpnDM9PaHle0IOc=; b=oFKjZF8ZOP+5NALKKj3WqoZKfjzOaPNERa5QGtKykQ8wNTwlbYWQSaLrztvr5GXygs1Ly48OcEirv7Ap+iTODwO8u4KNOMp/9XzsoYuuz6MTgg49xM72P/Wwai5htC4xKqd3xhUhMQb/svhAAWBjBjOWcCEdl92BywSQkGwUp/IiW9qKrpZCOJqRcyFUdhQ17KZ6P6H0Iye7K0Ep+mb8c0/m2GdJUNd4aFRrvTOXvIBiaANeQ8jOxHsMMCO/FyhV3umdcMelaeHBJuGokCb95Z1LGxHLgqoarOXvQcb9k2F0RBeJD4rzQP/ZJPIpvK077NPDYrLExcXxgm7HQmHRKw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HfTynrtFoOtQlEZdXbg/sqJjKgrWrpnDM9PaHle0IOc=; b=Oh9dxb3wWFL+jbaxuq7BmYya6FnwQBrTk53j44IgDqNeZNqJjVoMV6qIggNEkuOx3ikbToeduoV6mHfJkQdFN/BkdTzbbbil6gRCPEyRprG6ZJHuNnIZAyNDVQfe0j0/j3oCnBi5Oh803LS6uTqaMHO2PWUMZ5bwVYJyOrCQMec= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3381.eurprd08.prod.outlook.com (2603:10a6:20b:43::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Thu, 10 Jun 2021 11:27:36 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:27:36 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 33/35] iotests/image-fleecing: rename tgt_node Date: Thu, 10 Jun 2021 14:26:16 +0300 Message-Id: <20210610112618.127378-34-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:27:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a615935e-345b-4384-0a54-08d92c02aefa X-MS-TrafficTypeDiagnostic: AM6PR08MB3381: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:431; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9koqWV7NJpgD54M9cQjvK6dGAbwXhkERmpIH/iwET0xZg8iovtlXCI0C7MGMkZHMwYRnurEkXtum7C7tMbuCjj2pzetCTnVuLKYPW4GLSZwvb1/tJ1SLqC8yK2PCKXl8dhXOZHLoptgwI62wPg8F7BqEjL4W3DGzxZnHBsWgEQ80QSpYyIEoM6vd2gqAxGvMb+tpEHPjKWb1OPNYeDOskogjz3y/VrKR5FMMHrOYbwIbL1n3tVt1O2bmbGy22Nyryvyj8CP8m2IeqZT9WQtZ786gZjBqf6ndfQji1cNxD69ygApw6LdCtNB0qvSvG+VbfiJwSX8vIncimplccPYeoBeO72M+bhRg8a8i1jcrjJu3G1Q3quY5Ii8wmVJDO2QApGZiLimjJwSG59xqKvXDhJD2Sif0RE6o3TgFyE0e0pXr4Yr4COFHnSblCus6oXIdbKhmed7EXnYikQU1ctKwkNjCXiQQlhz2wQZ/4OAzGBdhtZKYTtSPvJkONtTEq8WGf5+sJMrecvSui1VbPKAF6NBwBEZgC5N9FbE+frO20apUh+GLVEm6Ur71M62nQlg25Kc8sSkPg80qKTiVmPssKUy4vxBIS2xJrODO2vrLBClcvmaoKz1DFep/Eqn/KyxtFCcNDQoW6Frq/HH606d5wQejAyLRqFuTfwqoZ+D8EHIkYvnvZX0t6b9bk7O9hgLV X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(39840400004)(136003)(376002)(346002)(2616005)(66476007)(83380400001)(956004)(8676002)(8936002)(38100700002)(6666004)(66946007)(1076003)(5660300002)(66556008)(316002)(26005)(4326008)(6512007)(478600001)(6486002)(186003)(2906002)(52116002)(38350700002)(6916009)(6506007)(36756003)(16526019)(86362001)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: Z9QNdCKJlHbP5sZFtJYIeH5Ios54ibO8l48FFlYqFtUTtcPqDCEvncYm0klnjkSnNYL9lXRxlP0HlNjRiZr2qEaW701O9IIuA9O51/+Tteu3nvJwakCcf72iDsDIm7RX/wHEFdPzRNTMtR/hKP4PKuPPcNrrKO8/5XhG7AumyWfghmR/W7p3By/AorrIOP1hL7P8ln7tysqKYNm1n7ODEgFUyw0zDXarm6JHDVLbcuA2d+3gNWamFFoTaqzTqOHE26OlUMFKWBO/C5iXl7sS7eAtdCnpwpNbYK2+e117AoXd3Q6/+B8Z/kUyg+ujjxfHveiKXdLY2vrKeI1vwlHYWzKgkpDOKrrlbAwm753+KIj+t8ecKTmM9OAgX+ObO2GKdCRs6hj2LBo4Q7fv060U4dMfoN7AZJ7mQpHq37OnQnaakUmhlzLpc635I6XjcuSPIxkhm8WLNTd9d9DBmZE15RhljVrGlq584BgrYvXUucwB9xIrNxZFiPFxoai3Wj7MyscxmfXo9y3TGGJd3n6097GkN3YbREFI/xKko11CNgb24FvQMQ/BdpqD4rTjmCzsIsQ67+HhSPYa2ZRCMdiG/l9Ex67QAE3TehVKHjjVGXOIXlYusbw2TnM8JrOg844Zf4y8PnLa4kwrOSHVLL/CN8jbB5KpB4lPMsPittukfuWHBa5zIjoWFKpL0U2DC9UR4bi91QjYKTkcZHGAZAMtxE7NxL6X3FhpcVpc4SpqAT/YlsvcqaCf5un/r9QDdND5UtlpfjwHHph+mnff0ScyaSasMSt/ijgEoy4El28n0EvQ770heV440NPCWXvZa5/Y9O4Lb9MPm+2d0RnBX2KKC5q++/s2laY1i6jw9UhBKy6jaHxvpleKubEkX5tz9XwsYGPFbTU1Q1v8X6pZQYlVXw/kUz7Ohuc5XTMEwnAde4ulKPSpuoZrOM2y3vYVbIOM4FcqumoQ9TWLDLWK/QMx1iLffM1U4hV6ntU/RVjB+ngmQm/ZHLX6LZeK8MUYLCG2oOiVCVEuPo3qaNLfVhMX96I+DZ8MNBw6bxXLtwUqKQORehwcQTEjoN/VpFUJ3hU7OOJBHXEpAKeuhRW7518aU21jIroaRylpR0YRPCwLWbLn7xdE8SyzMV1pTzSyLuEsns2FYNXuRohPtEj9VqRJ3w08T1zMPZSMfsFAHi4IRvXNYqJFHv1PrwS1I9un8/5Jc176oQf0RF9BLT6ntw5aVUEY0Xd5alTijnFVQqaRv0Rj4wt5buy+fHs+npGrfP/6qt3ZIiN2jCN9bK3I3A+MU6Iflmn/+2AieMjH0vhWbOZUwYokdpbIfSttrGgRd3JV X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: a615935e-345b-4384-0a54-08d92c02aefa X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:27:08.8855 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: smHpCk85ziKoONXI0oFy+sZ/5+RvmrJivxzPh/AATAMFV441BK1VUsGFYSVYOf0QWKWAk1qcPU2C6NpUv3313ArblEomuIr2ScWDhgJnAj0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3381 Received-SPF: pass client-ip=40.107.4.102; envelope-from=vsementsov@virtuozzo.com; helo=EUR03-DB5-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Actually target of backup(sync=None) is not a final backup target: image fleecing is intended to be used with external tool, which will copy data from fleecing node to some real backup target. Also, we are going to add a test case for "push backup with fleecing", where instead of exporting fleecing node by NBD, we'll start a backup job from fleecing node to real backup target. To avoid confusion, let's rename temporary fleecing node now. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- tests/qemu-iotests/tests/image-fleecing | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/qemu-iotests/tests/image-fleecing b/tests/qemu-iotests/tests/image-fleecing index 961941bb27..ec4ef5f3f6 100755 --- a/tests/qemu-iotests/tests/image-fleecing +++ b/tests/qemu-iotests/tests/image-fleecing @@ -71,6 +71,7 @@ with iotests.FilePath('base.img') as base_img_path, \ log('') src_node = 'source' + tmp_node = 'temp' vm.add_blockdev(f'driver={iotests.imgfmt},file.driver=file,' f'file.filename={base_img_path},node-name={src_node}') vm.add_device('virtio-scsi') @@ -82,12 +83,11 @@ with iotests.FilePath('base.img') as base_img_path, \ log('--- Setting up Fleecing Graph ---') log('') - tgt_node = 'fleeceNode' - # create tgt_node backed by src_node + # create tmp_node backed by src_node log(vm.qmp('blockdev-add', { 'driver': 'qcow2', - 'node-name': tgt_node, + 'node-name': tmp_node, 'file': { 'driver': 'file', 'filename': fleece_img_path, @@ -99,19 +99,19 @@ with iotests.FilePath('base.img') as base_img_path, \ log(vm.qmp('blockdev-backup', job_id='fleecing', device=src_node, - target=tgt_node, + target=tmp_node, sync='none')) log('') log('--- Setting up NBD Export ---') log('') - nbd_uri = 'nbd+unix:///%s?socket=%s' % (tgt_node, nbd_sock_path) + nbd_uri = 'nbd+unix:///%s?socket=%s' % (tmp_node, nbd_sock_path) log(vm.qmp('nbd-server-start', {'addr': { 'type': 'unix', 'data': { 'path': nbd_sock_path } } })) - log(vm.qmp('nbd-server-add', device=tgt_node)) + log(vm.qmp('nbd-server-add', device=tmp_node)) log('') log('--- Sanity Check ---') @@ -149,7 +149,7 @@ with iotests.FilePath('base.img') as base_img_path, \ assert e is not None log(e, filters=[iotests.filter_qmp_event]) log(vm.qmp('nbd-server-stop')) - log(vm.qmp('blockdev-del', node_name=tgt_node)) + log(vm.qmp('blockdev-del', node_name=tmp_node)) vm.shutdown() log('') From patchwork Thu Jun 10 11:26:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312941 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9229C47094 for ; Thu, 10 Jun 2021 11:52:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 667AF613CA for ; Thu, 10 Jun 2021 11:52:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 667AF613CA Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJEP-0007vf-FU for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:52:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqg-0004Ij-Jd; Thu, 10 Jun 2021 07:27:46 -0400 Received: from mail-eopbgr20109.outbound.protection.outlook.com ([40.107.2.109]:37643 helo=EUR02-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqb-0004p6-Mn; Thu, 10 Jun 2021 07:27:46 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iy5RGpgz9DUXsJ2GiM0Am0rKoQPUZTDQkHYTdsAvOWsNkCZ9QkHRIJZWKhHTlJogwdVwbfARuoxVPLIhwpiecn4DlxM8OZno2xu/GlPVbl07bQCnFo417ksc760+rp5sues0Sukg0pm5bsV1YnWH0Qit/6j1w99bbYgeHUwrqo8tB2g8z74mYKYo7kGlg1JZqGjTZjPoLvRcnOVY+QFBqbFeB6Yf5ycDGjrmRRbDATewwKmHlmdP8O712F5c54FcOBgfeLkcU4FstC/2r7uM14SEvhnxIbCI8rDch4BIPi+pSjrO2L5+XGBRDjHdUcKPv51EfQcUPhLYoC98284qCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0Fdt/9kXHN1yQLBrMNRdUEjvnHhIP48yC5QLgDEN0ag=; b=ZiY/fRaw2LhNIWwjAa6+PdUgIvJ5/JZouC2KwlBGrGRHAQ9QDNGq1omvYdmD7axNizj/pQX+ob//DDMCvUEu7XlB8F/4XkSdeFQ0ddMYIyrCIRe5dI3kBFOZC/z4Zxc8gF5dLcMejybVtPPOcSk5tRFq1XMpY6y30UR2ZBtgmfTtsMi7UKYAhBoDTBWDZOaid9x/ttx5Nim1SKfy+tXBi9Oz3xCA0x7WH2W3t/jUYJ/lzBFgL+Q0snSMNri31eHBoW6ZOYxJae8aAXecYOzDVjSv4S0el21HEjQoPBJf0n3c+s/YplbQvpjQdhtgDDtfSRs5655EqVv52n5Jfi6qgg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0Fdt/9kXHN1yQLBrMNRdUEjvnHhIP48yC5QLgDEN0ag=; b=qBosCiHTmlZXnobvzPTJqdQXC/Y+8yDoNRVcO5c8s55e1dQIEprifeeFMO2tvV+w714QuOaQdD18akFRf7ML+4GlCLPQScpt9g+amr3KQzAlvltmrv4VuXlVUhFaVR6WkmZZLq74dIUa9XJRLpSWESPfslvy0P5P+QAnpMiPNwo= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1971.eurprd08.prod.outlook.com (2603:10a6:203:45::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Thu, 10 Jun 2021 11:27:37 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:27:37 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 34/35] iotests/image-fleecing: prepare for adding new test-case Date: Thu, 10 Jun 2021 14:26:17 +0300 Message-Id: <20210610112618.127378-35-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:27:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 84962c41-d484-4ef7-6e1d-08d92c02af97 X-MS-TrafficTypeDiagnostic: AM5PR0801MB1971: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:478; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1SwoAxT0ZJaoiEHhwz/2yHxBImU3qyi+p/u2Kd2D4YeHRSCDMicRunjdeMY0nWCrD/BAoLzkpGP/tlByXEVfvGaiggkikKnvgRRdrdBDM0NiILG4v3pksE000arvBxHxx9TSX16sS+X8HV8zv2xvTZq/2NEo8kksWIEXG8vBdaexm5sFpHCMJRrjQWm2+B5aCZU2v2+Nj8zlO4RPwLA2GcDpyiwrBv30GQ8RrWuDnrrShoE4chV83975HJ1pO0nP0PBjvEqX+31J/1TX3bcW4KFO37OH4pKYxjqGiQJI2HYX0t3ab+SiMT6hiN9U5g5sdDo77w1lssNJYmtHivKeuqDZhP6TAatWoto91kpmZYFIfKeaStTvJurgc59h0BVgFge6ncfoapmNvjP35Khz2SxSc/69QBI7ERr46ZP5rTh7r8078KMNy5DVe0QONSgI2D6S/RCMXFd7xYEo8VQRAnJsNa8cb+H5G4PCpMaPoeUH7lHiVmZECBwmhgb53V9Oqbz2M0krMH0B3zfTqB6EddwQ40R4VBWiJG6sAfJfdt5R7IMoC71A69jEeM3Au+UGPrREDUtLP3CWOTR30VYIzhb7Bw05HbTg/dfaNsaeBZ5NbjRtlSSyP3pavsxtIgqPYQ8uE1J9beg5HYapGWH4vRixlDxCymaCoviuF8cpAk++Ykfazx4KHBxozVm1iJ3e X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(39840400004)(136003)(346002)(376002)(396003)(478600001)(6486002)(5660300002)(8936002)(36756003)(956004)(4326008)(316002)(66556008)(6512007)(6506007)(2906002)(2616005)(6666004)(66476007)(16526019)(8676002)(83380400001)(86362001)(6916009)(52116002)(1076003)(66946007)(26005)(38100700002)(186003)(38350700002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: xTlqQIrcw3ACXd4rd97jleCDp4MnIrpIwlrA3zGtr1FlckQpu8uZYBfoQHGDqJcUq6/GfYRxX3QT0DtA30t0sSTuob0VyqdbVx7AowIGLkS7RQtbK0wiprjDGzC3xCF2B/qi7a2MJ2mUGY48ASp6MguEfd94dAhXr0/g276WGtgIuRjSFmDztNiCfwLUj1vtBkzkauGhGgbvNj9HDQa6Z5u/JeDnc6tP3mV4PVWtM+fIi3vDxaiobE82gaUchg+7EZJzg3A4to2V6SxpVEP/btdZsN8SaC+DGyQvsPsYcJP6vS6wigX2Am0IUC+eYerxtyJl7IQWjSvLKRPRuJsU5GapsoU7mF5xaVX9zYXCFSqidgCPQ5s2wCg6U7d8FvCYqbUAlzWrtMSMY1Wox6YrkqOgBn+YE6DDhxnK/Q4b3srmdUUgMVMjHxncLLc5N1lwhDjFZZecsYesRRFQxL2zcS8wqSAPm10Dm74gtmPLK2EVPBhtYC0YlUs0UTIUMN9vCN16k6VQNyua7PJxKygah3VjrOxFyKaPdmjDatS6FZJU+iyyWvb8LsYEwp1uUdneO3souzaN4ZlRdxje4N2R0AHsPlqYkTU4yxu0fj43SX9awax0jOv5AqMA09ECz0e3rsWO9lykxq5tiz+B+P6Q08l2gAP40ODFBkUd52VXi4CMeBuwTgKAVR8Vojy2jUWZZKCgXKeuyQD1N3X0VUP0errtLiBcwpd/6Ui2j4b6ODHSx/CEY18VhZcitK/gZvte8z76cIklU+YB3ke9YeK9apUYO5hCN00DzuMRpC1v67+yNG5/65Wr/hHor9UqRs7s0M97r4/+/AeFkc2U7buKcU2MPODR8J8LD7ncG1ufuMb9+c1fLVpXbxWuhyG/v5eQo/6/TzWWBzvlyrpv+UNlEm7cYYiLK0NBKjkJS0dHT7/9qGcKRHD1Eg7bYqadnzDuH+cusmas+F3L6ZRoRm4VToQ0kPT09vkaUy53j3+VxeG09FpbWXg9O0Sool5N8Yf1BzN9W7OaMWvaYMWAs5D20WnUsmCgAjSSAyiuMtyKQkttSR6vaaVvBVc/EDjYELHMLZSWzotB6ys90iTigiew8LmAfGCxwUAQlaLhwkAuyNXFF0/sfXz2Sxi80FRr8khzVNKPxWCw5gWsl6vx0X6Dpew5Ku4Zi+DTtio27MzuWM16NuG9s0ZxY03tc6FydqfknTNYuEc4B/PcPj6An/eb+kktm+/8PsZLoFkytyy+bJxZmf1Q8NHBRX4fHYw4FUoxVCmexgyMqUqzpqUNQmfNMQJQfX6oMW4tROTTBxYRJoe6Niuh3ViVlxQxSTj7Tflv X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84962c41-d484-4ef7-6e1d-08d92c02af97 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:27:09.9100 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: LSk4gIWT1O6TLfJDWcqO/ljPKU9qURBrVgbG1oa/lrEjp6dEB7Ns5mOid7iyWzj7C4qQ/hR96OmsmxoFlh9okyxgzDvfQ7IMwQ3khdMxUeY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1971 Received-SPF: pass client-ip=40.107.2.109; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-VE1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We are going to add a test-case with some behavior modifications. So, let's prepare a function to be reused. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- tests/qemu-iotests/tests/image-fleecing | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tests/qemu-iotests/tests/image-fleecing b/tests/qemu-iotests/tests/image-fleecing index ec4ef5f3f6..e210c00d28 100755 --- a/tests/qemu-iotests/tests/image-fleecing +++ b/tests/qemu-iotests/tests/image-fleecing @@ -48,12 +48,7 @@ remainder = [('0xd5', '0x108000', '32k'), # Right-end of partial-left [1] ('0xdc', '32M', '32k'), # Left-end of partial-right [2] ('0xcd', '0x3ff0000', '64k')] # patterns[3] -with iotests.FilePath('base.img') as base_img_path, \ - iotests.FilePath('fleece.img') as fleece_img_path, \ - iotests.FilePath('nbd.sock', - base_dir=iotests.sock_dir) as nbd_sock_path, \ - iotests.VM() as vm: - +def do_test(base_img_path, fleece_img_path, nbd_sock_path, vm): log('--- Setting up images ---') log('') @@ -163,3 +158,15 @@ with iotests.FilePath('base.img') as base_img_path, \ log('') log('Done') + + +def test(): + with iotests.FilePath('base.img') as base_img_path, \ + iotests.FilePath('fleece.img') as fleece_img_path, \ + iotests.FilePath('nbd.sock', + base_dir=iotests.sock_dir) as nbd_sock_path, \ + iotests.VM() as vm: + do_test(base_img_path, fleece_img_path, nbd_sock_path, vm) + + +test() From patchwork Thu Jun 10 11:26:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 12312953 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68240C47094 for ; Thu, 10 Jun 2021 11:55:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D2EE0613CA for ; Thu, 10 Jun 2021 11:55:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D2EE0613CA Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrJHl-0001i1-33 for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 07:55:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqq-0004Vn-56; Thu, 10 Jun 2021 07:27:56 -0400 Received: from mail-eopbgr20109.outbound.protection.outlook.com ([40.107.2.109]:37643 helo=EUR02-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrIqk-0004p6-Mw; Thu, 10 Jun 2021 07:27:52 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XvyGtbIwCq+EGPV5sK5KtEy/BF5lGOAAFne/vz9tG6m4//X++X8su9vrZECzdy+MMNcwOlBRYRUNEaoftHJN9GqdYnhx3/vkeMivyaV1LXoye7dMr1+6gQ/r7ReFjASp22FoTZvHqPYvskkz0P2Uz/1h87CkqFWa9oqPQLVtv14S0mpg9kE4IKhf9KaGOhe2Kep1Es+jTA0e/jwDP76kLgzxw4sZ6TAEJ3lp/zpSCzLPXcUk2l24eSPiYXcVf8hfqLWxOZPJCqUCAVXWYmPI3fZquegsg90y4IRz8Fgzngt6dP6QYb5LMKxHKt6xIPnq5MacelqhYOSfkC3PDJJDIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=A5nciexShtPATulwjI+NVK3OnuPoB2K9ZiF+peWiDmg=; b=UKFGlKUOQ235iOAQJP1y5xou2i+pfyg4W848qb/oryevATHMp8bHaTyzbrEbW3FhwePYA/FFezO7s+otbzPZt0pGu5NsSoKmRlRNryzlVHCxa6I/im+mJgKaiVUTEi824qKFi2AZjgT5P2zP3nCdr9uO7VOJa4IrZ6ZdPMi0VyPa1vKwHLZCfA7MZzyWfpZCBKAvHG27KTCPBdGMufLh54sT5Ndh70aAfQRVMmf5hlg2vvwmHzdJwYLlMGrtqoNW5hLMhhfHcqHrTLUTeT6ctjrge4aoW0y/+HBg+WEXJIAvEIh7v4+jwsq2K1/ZhL920F/XKSofEA49yOCMmWL6zw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=A5nciexShtPATulwjI+NVK3OnuPoB2K9ZiF+peWiDmg=; b=ZJ9VZzo+jdNcnFCqU4lFZ0gYW3OK16j11jK6aNF07IpUPMnXGqelzyMaGTE8/UjU+9CESJ8ExSIr1ZkeFoCqLGxbh+dD0ljpi3laL/+veVRWHQX7x4x3TmHDI6YXBJA8yQJJRZFyUQ5Qcc6GbA3rwgvLx+cv8UtuI1sYWaLJaJc= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1971.eurprd08.prod.outlook.com (2603:10a6:203:45::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Thu, 10 Jun 2021 11:27:37 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f928:f4f2:77c0:74b4%9]) with mapi id 15.20.4195.030; Thu, 10 Jun 2021 11:27:37 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v5 35/35] iotests/image-fleecing: add test-case for copy-before-write filter Date: Thu, 10 Jun 2021 14:26:18 +0300 Message-Id: <20210610112618.127378-36-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210610112618.127378-1-vsementsov@virtuozzo.com> References: <20210610112618.127378-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.215] X-ClientProxiedBy: HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.215) by HE1PR0902CA0037.eurprd09.prod.outlook.com (2603:10a6:7:15::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Thu, 10 Jun 2021 11:27:10 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4c344145-dc25-416a-beb4-08d92c02b03a X-MS-TrafficTypeDiagnostic: AM5PR0801MB1971: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:635; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2PM9bbmI3Lcmv94lB2p5/keXI4E3f4UytGT1UGg7BGXjrheehYmpCcHr8XvXgfqy87ZTnekcQD93epeN+9CQ1t7mgJqx6KX/eMa9WImSQ9pqCLz0HcKjJvROaVsvYK8uCXygtacWuhlqorCQpeof7cBl9BxRXOzvyNOl4VJDUESZ7qIUgsFZ/fz6lo3sGemLaLzpiK4pEACLbpQ6otTFp3Zd49jvwuF/XvXNV11D/acN8uJmfLSCvLWNCmxmfhonSqGwDQJx8bz6UDQKzPmglAErd8J6mz2MCgiFNz1wOlVnBz8sv1FbRdOZSKabroOAzCKqpI0VWKi/aVwsbIC9vQARhEGtZOTmXlG8d3XxT/DgOz2mZkWREfllht9MwrwLvh7b6SdcXnpys/rpW5FT4NGcyjaQ3DecnIsL1bGNHqLWkbszwfxpn4gzT3UO/l5ViEk/jbqXAzshqUa0Wrdx9gVArkdGMiH8aTWmvC7L/yORcGOAHBqP1/0YSuiRHI+gVzgbWOK8A1cJRkCnFfX6c1Unrm8YM2LM3Mp+yExcJj5fZLhkAazywozTN3L/lQwbWfLIeYiJx+Gd0YUXC+bX1m4rZpRsGkrghfYqGtzD7FsdeZUFPOnMUw3S3AkxSMkRaA4XjZsksta/z1mXMjv4CsryWVghvMws/eZ8UP6wgTaj7+SThc6osVTiDImUF5Sk X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(39840400004)(136003)(346002)(376002)(396003)(478600001)(6486002)(5660300002)(8936002)(36756003)(956004)(4326008)(316002)(66556008)(6512007)(6506007)(2906002)(2616005)(66476007)(16526019)(8676002)(83380400001)(86362001)(6916009)(52116002)(1076003)(66946007)(26005)(38100700002)(186003)(38350700002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: G8oKkbf7i6BIpuFE1yTlTAGpQdg8betqI2BbmOWdv+Kid8EKRUMYCztuxcE90MfUemNekGKBXHjh2/1s+sJW9OIT9zu6fOjaIHpc6BWBaBKYUwOKraBqB9W+9Zmk4O2JdUrsl+70DNhJ2jLFJVeq+rA/+TT16ZwCeRDAhCQXyP0CeIXJb2uDBW8dqwfTk71e7uf2tEaeogf6VHfrERXdwaARkFHx6rm8SIvJ6bou+bniFNvZSttnCXf7D2xmIpqtGMBR+M/kNgNaJhjgwfbkGn4SvJdieDi6sCycNACOjPyytVcvqQC41GmReioxpNOMoJh4B8bGEGJdmPtrFdCVZL3U35R6fks112bdZgEbblNevQsiu+9CfsxpHJHa8pV90pHKX1VF0RwO60IFqiqZ88JxklyHO/8e9SqCoQrqIfEMO11eHUu7psTmKycpF/VxkIb9sroSrkZV8uZVBxp3xb1yDa0QNr0ztqt8YqNCS7hm5GBrYwm4/fhb2mO2BWr+OFig5giundnbI5acg9HQ7EEqdsjmzUYpLLFgAHHLrjwTEVYCELcgmLvBgIgK7IpnE4+6OP9oc7tJxRauAFbS++EIvQmkikedR9LLKGGb2LdAdZjE/53J9BTpm9hl48n2AE2YcCKkCcbZuJn8mebSsfTlZ9K45ZEKCsjAxIFEVn9JyF9zcA4ItPuYyuX7xha53pIJgbBCWbNsa6H+Ai+kpBKTxPWqueTMVrmZebuvstPRvH9fovQxP1rDL58f62eMib6iSUk5NhEhxeP1QHvVw88aGAFyzWMbHtL/vpuae9r3kPY8RdNFGW5D/4DevG2T1bTDfXiiFl+t0//jK7NYk9JBQ56aw5pJo5OIPaC0C//pISIumgu4cCUQcKZLgAAb77aiG33aE8I+K3mRiiJk5uzVGNloaDmXPY4O4pz5t6TK4Ksdp1ROD2Nr3inpPUQKf4o7cE0FwdcJS37Y91WRZwCALRyv4xlWvxNkaLXe71NhCpT+AwFIN4d2BhNq6HDtZM3xW1C4gbknQ1ZgtUR4oKcSxg1QRrtRgE6bpAL03fI5m8oCDGAuW+GnBYrM+/+U//0BkaIiQe9zNNLQgh9MhvAGltlsw7nmEu0R3oEn1CjOf278wN+wINl9t4wkqMX+IRX67XmwkVfL5UvN8Bzadd7mxfZERprquiJDlFvIBa+nfkLvg7BhVTeAVWDNk4Q3AS9Phw3lnIZmKMs+6BMY9UzYFdQMwuYoU0bW25jmKQT85yr1wpiq0NmIdlDsCCeMyaAWZtiz4gvWKyhyXpHpUb7Vsxf/YPNFrVHD3Gpf6liwbXgS/aYdzl7pxp5pOjsO X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c344145-dc25-416a-beb4-08d92c02b03a X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2021 11:27:11.0530 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PuX+oBPAzVe98My0TWFebWgW+pIXR9EjGtjpTr5j48YvP8VNftgjg6w/8K+tbHPooPKeFhxEISC0e/RwItSS6tCrzpf0B1swZwAIZtRUnxk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1971 Received-SPF: pass client-ip=40.107.2.109; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-VE1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" New fleecing method becomes available: copy-before-write filter. Actually we don't need backup job to setup image fleecing. Add test for new recommended way of image fleecing. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz --- tests/qemu-iotests/tests/image-fleecing | 50 +++++++++----- tests/qemu-iotests/tests/image-fleecing.out | 72 +++++++++++++++++++++ 2 files changed, 107 insertions(+), 15 deletions(-) diff --git a/tests/qemu-iotests/tests/image-fleecing b/tests/qemu-iotests/tests/image-fleecing index e210c00d28..f6318492c6 100755 --- a/tests/qemu-iotests/tests/image-fleecing +++ b/tests/qemu-iotests/tests/image-fleecing @@ -48,7 +48,7 @@ remainder = [('0xd5', '0x108000', '32k'), # Right-end of partial-left [1] ('0xdc', '32M', '32k'), # Left-end of partial-right [2] ('0xcd', '0x3ff0000', '64k')] # patterns[3] -def do_test(base_img_path, fleece_img_path, nbd_sock_path, vm): +def do_test(use_cbw, base_img_path, fleece_img_path, nbd_sock_path, vm): log('--- Setting up images ---') log('') @@ -67,6 +67,7 @@ def do_test(base_img_path, fleece_img_path, nbd_sock_path, vm): src_node = 'source' tmp_node = 'temp' + qom_path = '/machine/peripheral/sda' vm.add_blockdev(f'driver={iotests.imgfmt},file.driver=file,' f'file.filename={base_img_path},node-name={src_node}') vm.add_device('virtio-scsi') @@ -90,12 +91,22 @@ def do_test(base_img_path, fleece_img_path, nbd_sock_path, vm): 'backing': src_node, })) - # Establish COW from source to fleecing node - log(vm.qmp('blockdev-backup', - job_id='fleecing', - device=src_node, - target=tmp_node, - sync='none')) + # Establish CBW from source to fleecing node + if use_cbw: + log(vm.qmp('blockdev-add', { + 'driver': 'copy-before-write', + 'node-name': 'fl-cbw', + 'file': src_node, + 'target': tmp_node + })) + + log(vm.qmp('qom-set', path=qom_path, property='drive', value='fl-cbw')) + else: + log(vm.qmp('blockdev-backup', + job_id='fleecing', + device=src_node, + target=tmp_node, + sync='none')) log('') log('--- Setting up NBD Export ---') @@ -124,7 +135,7 @@ def do_test(base_img_path, fleece_img_path, nbd_sock_path, vm): for p in overwrite: cmd = 'write -P%s %s %s' % p log(cmd) - log(vm.hmp_qemu_io('/machine/peripheral/sda', cmd, qdev=True)) + log(vm.hmp_qemu_io(qom_path, cmd, qdev=True)) log('') log('--- Verifying Data ---') @@ -139,10 +150,15 @@ def do_test(base_img_path, fleece_img_path, nbd_sock_path, vm): log('--- Cleanup ---') log('') - log(vm.qmp('block-job-cancel', device='fleecing')) - e = vm.event_wait('BLOCK_JOB_CANCELLED') - assert e is not None - log(e, filters=[iotests.filter_qmp_event]) + if use_cbw: + log(vm.qmp('qom-set', path=qom_path, property='drive', value=src_node)) + log(vm.qmp('blockdev-del', node_name='fl-cbw')) + else: + log(vm.qmp('block-job-cancel', device='fleecing')) + e = vm.event_wait('BLOCK_JOB_CANCELLED') + assert e is not None + log(e, filters=[iotests.filter_qmp_event]) + log(vm.qmp('nbd-server-stop')) log(vm.qmp('blockdev-del', node_name=tmp_node)) vm.shutdown() @@ -160,13 +176,17 @@ def do_test(base_img_path, fleece_img_path, nbd_sock_path, vm): log('Done') -def test(): +def test(use_cbw): with iotests.FilePath('base.img') as base_img_path, \ iotests.FilePath('fleece.img') as fleece_img_path, \ iotests.FilePath('nbd.sock', base_dir=iotests.sock_dir) as nbd_sock_path, \ iotests.VM() as vm: - do_test(base_img_path, fleece_img_path, nbd_sock_path, vm) + do_test(use_cbw, base_img_path, fleece_img_path, nbd_sock_path, vm) + +log('=== Test backup(sync=none) based fleecing ===\n') +test(False) -test() +log('=== Test filter based fleecing ===\n') +test(True) diff --git a/tests/qemu-iotests/tests/image-fleecing.out b/tests/qemu-iotests/tests/image-fleecing.out index 314a1b54e9..e96d122a8b 100644 --- a/tests/qemu-iotests/tests/image-fleecing.out +++ b/tests/qemu-iotests/tests/image-fleecing.out @@ -1,3 +1,5 @@ +=== Test backup(sync=none) based fleecing === + --- Setting up images --- Done @@ -65,3 +67,73 @@ read -P0xdc 32M 32k read -P0xcd 0x3ff0000 64k Done +=== Test filter based fleecing === + +--- Setting up images --- + +Done + +--- Launching VM --- + +Done + +--- Setting up Fleecing Graph --- + +{"return": {}} +{"return": {}} +{"return": {}} + +--- Setting up NBD Export --- + +{"return": {}} +{"return": {}} + +--- Sanity Check --- + +read -P0x5d 0 64k +read -P0xd5 1M 64k +read -P0xdc 32M 64k +read -P0xcd 0x3ff0000 64k +read -P0 0x00f8000 32k +read -P0 0x2010000 32k +read -P0 0x3fe0000 64k + +--- Testing COW --- + +write -P0xab 0 64k +{"return": ""} +write -P0xad 0x00f8000 64k +{"return": ""} +write -P0x1d 0x2008000 64k +{"return": ""} +write -P0xea 0x3fe0000 64k +{"return": ""} + +--- Verifying Data --- + +read -P0x5d 0 64k +read -P0xd5 1M 64k +read -P0xdc 32M 64k +read -P0xcd 0x3ff0000 64k +read -P0 0x00f8000 32k +read -P0 0x2010000 32k +read -P0 0x3fe0000 64k + +--- Cleanup --- + +{"return": {}} +{"return": {}} +{"return": {}} +{"return": {}} + +--- Confirming writes --- + +read -P0xab 0 64k +read -P0xad 0x00f8000 64k +read -P0x1d 0x2008000 64k +read -P0xea 0x3fe0000 64k +read -P0xd5 0x108000 32k +read -P0xdc 32M 32k +read -P0xcd 0x3ff0000 64k + +Done