From patchwork Wed Jul 21 10:05:24 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: 12390553 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 9F440C07E9B for ; Wed, 21 Jul 2021 10:19:24 +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 102206121F for ; Wed, 21 Jul 2021 10:19:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 102206121F 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]:50152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m69Jz-00009Z-3M for qemu-devel@archiver.kernel.org; Wed, 21 Jul 2021 06:19:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m697O-0006sm-Tc; Wed, 21 Jul 2021 06:06:22 -0400 Received: from mail-db8eur05on2124.outbound.protection.outlook.com ([40.107.20.124]:45473 helo=EUR05-DB8-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 1m697N-0001sc-5K; Wed, 21 Jul 2021 06:06:22 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oQKZX3KQbtQGZU1xgONLJx7pgI6IuGu30UrzRR6Gb5U53xqCxD4bpkPikpUWfb4vpDE2lmDE2iVXhn2H4Uy5ufmqUsFYhMZmUsXs15nTdTulyLQZcG2KAlAgCTstUba+xIqPzf022IMwJldiU3AACvWdwsKgegqGqovQJQDKfgXZpNkG9rhHGWl+RYIgwzCMP3qx0r+oeZeeknhb/Tot+3SBPpyAAFqu7Yz0xl4cErmqG1inrX5siKVu/pr+bursfUONEYjj1AbCUdJjvM+SwhwmmibR2haAWzvCmO27qmNbjfbacrOPXyXaBW+P6zWljWdSmhE6kmBqzFDb5eyeQQ== 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=7GmJJP2me1hAQJQvNuKG3Yp1F2STkJylbpXCBY/QG70=; b=m++0lCs1Oav35gasdj4WB6A4UD7By7Y7oSDYxpN40WuuL49w63memZ7psLXZ49oFwv7aPwBRW1bkj4ss0IlcO7giNx9ydxGRDhcDWaO8hCrVIihFKdCnET3X7pbafWNxf2L70ophhOD3UvaVG2kgTCdFMpphTpodEuGlN8EJZoUqjlIW+915savxxZbXmE8H6K1y3e+0hbZR9wce1LWwAKNSkc7+67sxsvSFsFwzmIoEMQFCXCtNhED/KqxTrK5qCe9W6KMCJmynzGRkPVVaTPTABGlaz2HsZ98bf7WyKRAxEKeTgZYAEzgImJDzvDD1c4GATB0ess0ruXXcOjKFpw== 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=7GmJJP2me1hAQJQvNuKG3Yp1F2STkJylbpXCBY/QG70=; b=eRx6wHni+Cacc2C9eK/kbL4aHwdi635xWdVLMqcQilG+cLlVIBX+RNMz94BDCtdlW2wgh3LtepIym63dCKr8ivyLW+KtNd5Ons4YM2JUCExD/JCQmseq2pbD2VdRFPXD8RtJVb47vMCjrte9OyBMF89Usvo6HYSYH0Cgn/d1GOw= 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 AM6PR08MB4168.eurprd08.prod.outlook.com (2603:10a6:20b:aa::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.28; Wed, 21 Jul 2021 10:06:12 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::44b9:68ac:bdc7:e23c]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::44b9:68ac:bdc7:e23c%6]) with mapi id 15.20.4331.034; Wed, 21 Jul 2021 10:06:12 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, armbru@redhat.com, eblake@redhat.com, crosa@redhat.com, ehabkost@redhat.com, berrange@redhat.com, pbonzini@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com, kwolf@redhat.com Subject: [PATCH v6 02/33] block: introduce blk_replace_bs Date: Wed, 21 Jul 2021 13:05:24 +0300 Message-Id: <20210721100555.45594-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210721100555.45594-1-vsementsov@virtuozzo.com> References: <20210721100555.45594-1-vsementsov@virtuozzo.com> X-ClientProxiedBy: HE1PR0701CA0068.eurprd07.prod.outlook.com (2603:10a6:3:64::12) 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.211) by HE1PR0701CA0068.eurprd07.prod.outlook.com (2603:10a6:3:64::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.12 via Frontend Transport; Wed, 21 Jul 2021 10:06:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b3925385-9907-4547-5318-08d94c2f2b75 X-MS-TrafficTypeDiagnostic: AM6PR08MB4168: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:352; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m7QQXuJsPqgIjGYVZ47RNqtaz0Lq/1lm1SHQ84XTH87cAISbuAa5izgHAGFNzJFrTqq+gUEd/45fTkhtnxIEdHnpqB8dc5TmxWI/IOek1J4KIcLRGms99yIR9+TgmfCHz3k9bPx62ty4dfFltTlEFo6QVSZz2MthMDGtxdr32axU+NQ9PL5RHO7EXlJpYSwN9tz4RWtaLwmXbWU9fzYDiPEOpm6L9mpNcuEtYNiXpXb8hktpqcB7ITDZe7bMviGxZpnC/iXqaTDvAU2g5OT8fCr6rPk15LKonEn1qe8BACgnbSCJS/1dulapMl1vJ/pVDaoA6uILc7Fr6sprvPnZqmEbANnnn+kFntUMdYy2KGCY96tiHWbz95I1Innh4BTTmKg000pjPCYJ0CBQm0rOhhAmQDqhdM5zNhQQJFoqHrCVbrugyV+51jqiJRGsaFdCznlUMIo7mkfbyUhDrQTHmt9ws4aBozGNABg/9kvn5EdLnaoTvq98nkpqpn6xwD2cOgijBzgv4yQP+tbjezfpZdntrGV6YHnJIPBtW9t5pJ7kT2oOPzlwa4EEu4pvEOTNr/7jhUxJhJqjW5H52Xm4RI6tzb09CdefKtOsnfmwlgTOZgmisV8h40K0eqNi5nQd25wfvixgKMXWvLMYUnyJT8V/K4eVRa3UTjLNMEnAxvpE3r4Y9ZDEBq+VcKpBMKbdiNDkk9rBHTOOER+zJFqT+A== 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)(39830400003)(396003)(136003)(366004)(346002)(376002)(6916009)(83380400001)(86362001)(26005)(186003)(36756003)(2906002)(8676002)(6512007)(956004)(2616005)(6666004)(4326008)(66476007)(316002)(38350700002)(66556008)(38100700002)(6486002)(5660300002)(6506007)(66946007)(7416002)(1076003)(478600001)(8936002)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7xmEgjptoJQZeqjwgGCtB9L4aVFIKipoq2VKZdrbYXm3dC6lHtfSL1k7YNXodiy3WtFQB0d+nVluFW/NpF/nz2IKFHiIFnX5XuuTTU4/KRSLALHONp3gdu9k3BddMQCA3Y7LRdy5ORbnMNXuat2RnqYy+8nW29XCS14/+De/uddWuYt2CrV5ejtyJ6LUBXdFB0FtVI4lvwvGjCJNV/smqL6E+Y87E7jmm6VSyV8IAm5XDzhcRXcuQh4B95wx+40sNrXTZHkL8Q813s974Y0AuVOILN6oYNH75mmv3MI9Wc7CcZTwp179iDP76EWneO6pdC1edoTSMQAaxolHBzLLkjT3eR5WRhFsFOjbbpUXthOXOz7pbe2vJpgDzC44qaPSPJbeusnkkvhG73XhCNj0WeAU2NQMIFUw0j6206Oz3h33ZaYRz+izyjdROKgdbcxwF4c/J0g16XSj3HFBxfcuUewCiAwOVLimZdP2Ba95mOMBQfaVk2H90Wuaj/GFrPIJXK2FPepSo/tiYvXv5OQKKjoowcC3r2H7uoeKINcnTW4mWLySznUsVNbX8FxwN9kNLYU2Bte+QSokBysUJrIVDf6dCeg0ssD8oxwBhifeuXqHHJYFis+kbSQaCmT/vhNkd2p4t3NMOo6ViavHoVBipKPy0vC0U52dFpI7PJC5ssOz/jcohvOYxg2IU38EgzuKvF9YBWPZs1acDNIne14aiPpO7D2D4iRovSLpibiL1a6Krew91wkeoRJaLq3eS+q3QpkvV5F4RlXc8ha9vge+qQ31nQPzkE4+690TWiny5JJVah36c8LPL5jxkl6BH7RxbKFKECqAHiqsi1ScgLWqwLj2pdamcoVJJv04j77DbBMndk7o8o0DeBr7LSBE2xAmYSoYw+6zK4rQqweOnBZcyj9OB4IerSfnfxAOpg3eZsk8tBsBfEpqtcPA9Ovtjf0M5K7FRmjDOrUGenT4bXXmznMrM1e/B0P/Z6yCtXROZJNXnAf9uJ/FxsM7QFCBzQmmKaHdeAxvAlImaKb0iFK/0cw/rBYsAmwvd0U9f4+QiZyU9A1O8kPlhKt+r0Bvgo2q8WpJXVcJM04euRmhjiTqRMbwqQ3aF8uEUibrmPFELRDeWNOShmV51ncje4ceo5Xd+iEyogyX8JFkVFV9aKdGCoVVWvPAoZB0rs4A/nUpxKFeAy4UOlXbdxcEd6CHdefYEBt2bDOrlVzbMiJKDFFrxUQX7os0Se58t7Pc/XSvqIecFgf/8NxjIvc4vitWCD/ihm67HTGLcx9vEBZRt/ZNeYh4Pyc88o1EwaD9YUmmUjlPueGb65UpdxYM2tncLknX X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3925385-9907-4547-5318-08d94c2f2b75 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2021 10:06:12.7004 (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: JdOrGvP3KCH6tp29+CJvXz9RnQRtGJqVPF1WaOCow0AW+AIO4biFbY3rS9wBdRitF3/VnYL6xoTNH1vo6GQBXNT0xED1YPAwKMozJY73Jms= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4168 Received-SPF: pass client-ip=40.107.20.124; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-DB8-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 9ac5f7bbd3..29d4fdbf63 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 deb55c272e..6140d133e2 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. */