From nobody Tue Feb 10 00:22:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=virtuozzo.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1640189026914971.2156127070448; Wed, 22 Dec 2021 08:03:46 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-244-z9I8_jJtNdOBmEKdZcOSjQ-1; Wed, 22 Dec 2021 11:03:44 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 10529501EA; Wed, 22 Dec 2021 16:03:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 465CB7E414; Wed, 22 Dec 2021 16:03:39 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 061614BB7C; Wed, 22 Dec 2021 16:03:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1BMG3brd004652 for ; Wed, 22 Dec 2021 11:03:37 -0500 Received: by smtp.corp.redhat.com (Postfix) id 28DC240CFD19; Wed, 22 Dec 2021 16:03:37 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2305040CFD18 for ; Wed, 22 Dec 2021 16:03:37 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0741D8039D5 for ; Wed, 22 Dec 2021 16:03:37 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70092.outbound.protection.outlook.com [40.107.7.92]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-523-Tkgo-84IMrSyDGoC2y1YEA-5; Wed, 22 Dec 2021 11:03:33 -0500 Received: from AM9PR08MB6737.eurprd08.prod.outlook.com (2603:10a6:20b:304::18) by AM9PR08MB6148.eurprd08.prod.outlook.com (2603:10a6:20b:284::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.18; Wed, 22 Dec 2021 16:03:13 +0000 Received: from AM9PR08MB6737.eurprd08.prod.outlook.com ([fe80::b118:483a:d003:3112]) by AM9PR08MB6737.eurprd08.prod.outlook.com ([fe80::b118:483a:d003:3112%5]) with mapi id 15.20.4823.016; Wed, 22 Dec 2021 16:03:13 +0000 X-MC-Unique: z9I8_jJtNdOBmEKdZcOSjQ-1 X-MC-Unique: Tkgo-84IMrSyDGoC2y1YEA-5 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v2 4/4] qapi: add blockdev-replace command Date: Wed, 22 Dec 2021 17:02:54 +0100 Message-ID: <20211222160254.226909-5-vsementsov@virtuozzo.com> In-Reply-To: <20211222160254.226909-1-vsementsov@virtuozzo.com> References: <20211222160254.226909-1-vsementsov@virtuozzo.com> X-ClientProxiedBy: AM6P193CA0070.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:8e::47) To AM9PR08MB6737.eurprd08.prod.outlook.com (2603:10a6:20b:304::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 53a2c510-b39f-497d-d3ae-08d9c5648e8a X-MS-TrafficTypeDiagnostic: AM9PR08MB6148:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:61 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: JukFvGf7fmJzpyKpNdgS3YjzQ+/8SvIAMyjB/0y2bU+yHKrrpCqoUDU5LNiy9kXIWL6W+ZV+nwJAwytkpXupWbuIxpfam8fnGCo6pIUPdC8EZGoZ40vLrZOJO+gkYY2b9WguflktMA5tCV/Br8y2Hh+xF2TptE9QHRoJ7e65XE8eJVdhzP7QBVWuSXWOvGPBJJR8Bd+OqIf9sglE0uKPNg9tU41YrE699xZ2PKytL4L/CLsXmMZUGf/ozw11P3U0wfP5ADL+buSiy5412xaRzcLn04sVfP13+ntaWj3cYClEyMj+t3FOXXz7reCOqbV/u+FybL3eY1YFPCjZQUadFTYZCFM+Kdmdqk0QKZYKaFsRmaAYPQ7xD5iv3PHABRonAcXDiFj5rNrIoj90bmYGChecaABlWw+cWUsOnUSc5SKPwCmFETnnREZO0DbEfbI5pUjl6fqGCmnwgAiWPn/kWqjZpsRNM9+SRKxCoR5G17fBVETfV6ykAqo4TGojbxbZ+CDp4ZKxPPQ6x3rI52Blj9ZHfSoQ8ETgKsrxqK5bn/k+uoZ+Ik+KulvuN+vuvz4RTYoSbNNKtgN1d9cwYpjJMams/lO/4mPUa/9zha7aaXHjWBSfNTOzeBdrtej7jRhestYu/SukJYwFjLccgnovByMbdHLFpthjNiPR5T8S+IdRPYOgy46MD5LrSDU7lWclRoTdlbm4O6f4xc39jEyUHg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9PR08MB6737.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(38350700002)(38100700002)(6506007)(316002)(2906002)(6916009)(2616005)(1076003)(5660300002)(83380400001)(6666004)(86362001)(8936002)(6512007)(66476007)(36756003)(6486002)(186003)(26005)(4326008)(8676002)(66556008)(508600001)(66946007)(52116002); DIR:OUT; SFP:1102 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?61ee0YgjahY05rsF0ZhIva5WVlkFqB6+kcQumQEcMsdpvb6nPPmnX4hCLkkY?= =?us-ascii?Q?u8Japs91g3O1T3Lu62wx5097UfS3A2+Qe3ba23U/eVidAiZOkrj8GMB82oq/?= =?us-ascii?Q?rx9Rs9uBjoXyBRyVGSRIiHUd7EXnmJC9CDHuXrqhuWFE+aIs6BqZ7R1vm0eu?= =?us-ascii?Q?tdlecjEpBencC5wkTzVPfr2/n/JBQWMhHSYzBfaYn7LD0MzyAEV4JF/sGVoV?= =?us-ascii?Q?XL/6jJgjwWD/eN/ZAcznlD4RHZYbQSXAbf5eJhvLsrNjW2d5UYGSOsHeQj8/?= =?us-ascii?Q?txfo0cwFRqv3WXI2cHY10aazISem1DMzhHpreb1yVJtGIJAdcNBrHAITz/1S?= =?us-ascii?Q?NPtC6yj6QnmOUOdsGqi4sNTfibRLMcg0fPq8le/kFkIXnH/dGrJdupfwfCK/?= =?us-ascii?Q?CL97qP9kvU2vfxIZV4pohh2eiVQ7aFbqWJc3ydt5u7dexlVs6pE5FQxyCUxf?= =?us-ascii?Q?qGLu1pwgPfpUY5gdglKLgrFy2e+/C6fG4/XpqgvgOg6zM0LbFizjvafslajt?= =?us-ascii?Q?XZm4F5h1bbq/lMsMk1E6EBjYYuijfbPs/wMmRwbZFVVAtX7tbTPp+Q/8RcYW?= =?us-ascii?Q?IbBTK5h3H4eli4hdvPJfryO1s0eAqgTFP8vIaElXDnl8V1renHa0eQvNLpv0?= =?us-ascii?Q?cH8PXiqTQJK8PN/cZc3vFpwobPpO0uo4Z7EpZdlcF9xavnfksUhjm2htRRYB?= =?us-ascii?Q?rNObcqM/PbqsAJiak1lKqCs8P2s1cJiOMJ58FzT5ILufn2Du3HBUXBqo8yWO?= =?us-ascii?Q?jQgNRfEFlOdiR/aiQZdArvPvUWQmhvI781t8a6A6GbrtPDsrdx3KUNI3De9H?= =?us-ascii?Q?SA5hpjuzho3+nVU6tC/r7AlVrhJARxQA567m6n55meI6OcCE8pJn2fmlcjmo?= =?us-ascii?Q?gLtDJPI36baBFGEvbnS2tTPySRNZ/o7hac+bQqNoxsC2Yfh8ByBEhh7mTjik?= =?us-ascii?Q?l+go+cWtgS7U+Lw5xNjwucdi91y8uXpZNtTHOhy5ktz8y0UYlUrWlfqN5ytC?= =?us-ascii?Q?1N/pxA93ye2/WlJPW5IKXNjtTKgpZ5/P23a5xry/861I+/sBNqiN1hJx19Nt?= =?us-ascii?Q?4u8Se8aiSUBjOrp3P6iMdu3MNot3XgeYL5jrZnma+Zogvrht91HCEVDONWW4?= =?us-ascii?Q?BDZyBSSZbjOXGoucIodZyXqFMpQXKUifppox+82oZNW0kxFDcTBZbqYlyxwu?= =?us-ascii?Q?rNQPg6j4U00a9b28/KfB/AdmRTqjNljKpUqpypW1tv16LVQ1NsIkc6Xym8t0?= =?us-ascii?Q?GkTSo20CCQx4ok3ABqcA0N9VrXSZ8NTcsu5mY//Ey5YQTLzykWivxX9Obkwv?= =?us-ascii?Q?zH8W3Jbwy4RUvuQ8ZAVwAXcrFuO9cMe5HtuYeZL6Gm0vYoXTnzTd1CnOmcbX?= =?us-ascii?Q?aVb3bZRnJOR+Q5lodBBZoyTTOO9suypeGckWdg3jg6ocMYpz2xwM+VWf9BOo?= =?us-ascii?Q?rlLbvk0/UdqCfzXIxr2KVTjIkY5iuZ46N/lZYdR3GC7Jfp8dpD5LR/ukUKfl?= =?us-ascii?Q?3OP2wfBYBy7mGW8A0rNv4Go3/CnBNPQvkHiXd3hH3QuX96Vn5MC+9gsqpvg3?= =?us-ascii?Q?ZbW4b+VdMeJrgO1ILv1IoDitsdqh3wQxY94qIf17rT3Zo1Pxjz0KritniYQk?= =?us-ascii?Q?fw4RjZGIDGA3VpK0l0qHjy+atpv6q9pUcZn8tlBmSmSmRsibj77hL3GJeosp?= =?us-ascii?Q?sZcBb3IZ25UF1MmnsNpsbN53xvU=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53a2c510-b39f-497d-d3ae-08d9c5648e8a X-MS-Exchange-CrossTenant-AuthSource: AM9PR08MB6737.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Dec 2021 16:03:12.9749 (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: JzjYA4vDOScfV84XKc/HI+eckm2C7kfL4IevKCOnZzFExhFhxrtgpz7Rcr6BozqE5Oc9dfRcVqUJS1AId0sybASjjXofc4eO7RH8PZDyuZY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR08MB6148 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 1BMG3brd004652 X-loop: libvir-list@redhat.com Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, libvir-list@redhat.com, dim@virtuozzo.com, igor@virtuozzo.com, qemu-devel@nongnu.org, armbru@redhat.com, hreitz@redhat.com, pkrempa@redhat.com, yur@virtuozzo.com, nshirokovskiy@virtuozzo.com, stefanha@redhat.com, den@openvz.org, eblake@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1640189028653100003 Content-Type: text/plain; charset="utf-8" Add a command that can replace bs in following BdrvChild structures: - qdev blk root child - block-export blk root child - any child BlockDriverState selected by child-name Signed-off-by: Vladimir Sementsov-Ogievskiy --- qapi/block.json | 61 +++++++++++++++++++++++++++++++++++++++++++++ block/qapi-sysemu.c | 56 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/qapi/block.json b/qapi/block.json index 82fcf2c914..a4dd1e34d4 100644 --- a/qapi/block.json +++ b/qapi/block.json @@ -570,3 +570,64 @@ '*boundaries-read': ['uint64'], '*boundaries-write': ['uint64'], '*boundaries-flush': ['uint64'] } } +## +# @BlockParentType: +# +# Since 7.0 +## +{ 'enum': 'BlockParentType', + 'data': ['qdev', 'driver', 'export'] } + +## +# @BdrvChildRefQdev: +# +# Since 7.0 +## +{ 'struct': 'BdrvChildRefQdev', + 'data': { 'qdev-id': 'str' } } + +## +# @BdrvChildRefExport: +# +# Since 7.0 +## +{ 'struct': 'BdrvChildRefExport', + 'data': { 'export-id': 'str' } } + +## +# @BdrvChildRefDriver: +# +# Since 7.0 +## +{ 'struct': 'BdrvChildRefDriver', + 'data': { 'node-name': 'str', 'child': 'str' } } + +## +# @BlockdevReplace: +# +# Since 7.0 +## +{ 'union': 'BlockdevReplace', + 'base': { + 'parent-type': 'BlockParentType', + 'new-child': 'str' + }, + 'discriminator': 'parent-type', + 'data': { + 'qdev': 'BdrvChildRefQdev', + 'export': 'BdrvChildRefExport', + 'driver': 'BdrvChildRefDriver' + } } + +## +# @x-blockdev-replace: +# +# Replace a block-node associated with device (selected by +# @qdev-id) or with block-export (selected by @export-id) or +# any child of block-node (selected by @node-name and @child) +# with @new-child block-node. +# +# Since 7.0 +## +{ 'command': 'x-blockdev-replace', 'boxed': true, + 'data': 'BlockdevReplace' } diff --git a/block/qapi-sysemu.c b/block/qapi-sysemu.c index 8498402ad4..ca1aaef376 100644 --- a/block/qapi-sysemu.c +++ b/block/qapi-sysemu.c @@ -588,3 +588,59 @@ void qmp_block_latency_histogram_set( } } } + +void qmp_x_blockdev_replace(BlockdevReplace *repl, Error **errp) +{ + BdrvChild *child =3D NULL; + BlockDriverState *new_child_bs; + + if (repl->parent_type =3D=3D BLOCK_PARENT_TYPE_DRIVER) { + BlockDriverState *parent_bs; + + parent_bs =3D bdrv_find_node(repl->u.driver.node_name); + if (!parent_bs) { + error_setg(errp, "Block driver node with node-name '%s' not " + "found", repl->u.driver.node_name); + return; + } + + child =3D bdrv_find_child(parent_bs, repl->u.driver.child); + if (!child) { + error_setg(errp, "Block driver node '%s' doesn't have child " + "named '%s'", repl->u.driver.node_name, + repl->u.driver.child); + return; + } + } else { + /* Other types are similar, they work through blk */ + BlockBackend *blk; + bool is_qdev =3D repl->parent_type =3D=3D BLOCK_PARENT_TYPE_QDEV; + const char *id =3D + is_qdev ? repl->u.qdev.qdev_id : repl->u.export.export_id; + + assert(is_qdev || repl->parent_type =3D=3D BLOCK_PARENT_TYPE_EXPOR= T); + + blk =3D is_qdev ? blk_by_qdev_id(id, errp) : blk_by_export_id(id, = errp); + if (!blk) { + return; + } + + child =3D blk_root(blk); + if (!child) { + error_setg(errp, "%s '%s' is empty, nothing to replace", + is_qdev ? "Device" : "Export", id); + return; + } + } + + assert(child); + assert(child->bs); + + new_child_bs =3D bdrv_find_node(repl->new_child); + if (!new_child_bs) { + error_setg(errp, "Node '%s' not found", repl->new_child); + return; + } + + bdrv_replace_child_bs(child, new_child_bs, errp); +} --=20 2.31.1