From nobody Tue May 7 23:50:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1611364518; cv=none; d=zohomail.com; s=zohoarc; b=Jm0jaPZjl5A1MeFr8QrkVmvUq5SVQh3lvYW7YsKn/FXhnu7u1LqDsxBgAIcUqE+QJTSgZwyMP9+QqTzoC6VfipBnpcW0twkuAl57low01nle84lwJ47M6imJ1GL2MkvJ3VUzKcDu7TMcFV1ZRYEag5DfDUM+rdekT3f3kFyVA/I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611364518; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=0QQG9+nfypEIo56I08Ch/qcTbgTSsdVAjNU6UBGu0yU=; b=G8dKsrpZq9M+dsskgwZms79jEIwErPcrj7xi0FnuO2mE7dRjLhds3cle+nuUxt9dUQhlYi5wur86lwKiegnz2HGWY2WY1EqaLMzB+yRn43pA/NgdDoO68n5tl9eXYiKoW1f5j2NmA6ZN29Y84KIElod8rzNY8Pja4BQmJtJN5TY= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1611364518641403.986356483244; Fri, 22 Jan 2021 17:15:18 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-360-Zp1k6WV6PZmBOF96AOSvEA-1; Fri, 22 Jan 2021 20:15:14 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 94BB4806664; Sat, 23 Jan 2021 01:15:08 +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 CAC216F139; Sat, 23 Jan 2021 01:15:05 +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 417EF4E58E; Sat, 23 Jan 2021 01:15:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10N1BUo1001127 for ; Fri, 22 Jan 2021 20:11:31 -0500 Received: by smtp.corp.redhat.com (Postfix) id CA259F11D7; Sat, 23 Jan 2021 01:11:30 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C3C92F1005 for ; Sat, 23 Jan 2021 01:11:27 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D10DF101A53F for ; Sat, 23 Jan 2021 01:11:27 +0000 (UTC) Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-583-EQa5uwB5PUijXmlOCBqLJg-1; Fri, 22 Jan 2021 20:11:25 -0500 Received: by mail-qt1-f175.google.com with SMTP id z22so5589299qto.7 for ; Fri, 22 Jan 2021 17:11:25 -0800 (PST) Received: from localhost (209-6-122-159.s2973.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [209.6.122.159]) by smtp.gmail.com with ESMTPSA id z9sm6988683qts.66.2021.01.22.17.11.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2021 17:11:24 -0800 (PST) X-MC-Unique: Zp1k6WV6PZmBOF96AOSvEA-1 X-MC-Unique: EQa5uwB5PUijXmlOCBqLJg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0QQG9+nfypEIo56I08Ch/qcTbgTSsdVAjNU6UBGu0yU=; b=XcqN5hK5eOe4tF2sHV67oICH74cYStT+/aIUzz7eMDu2rSTpkzF48HfCJ4rJzlYqfD +Zy9u+qpchrTbcSlOyPY0XIuahB6hnquPL8zTpwAWI3nhUwfwilMTsyi237csYT7haqd 6ngTdH2vGVLZgXgMrBpb5Dpe6hZBdD0gfzYnED/qZRtpZ0yTfSeJICBsBVNy0Md3D/Ql yeBACBttVnWK507dT523vv2jos4R+FH0PqjPmWGbHUHJC1B+Q/CBOe+JTEc+3KKf2qx6 cE0VERnk7XfFtRBqa9E8x/ob/xxrrz9JqSge3GBvbK3jO/NHvoBU2oDfGMHV9Cl0QPB8 w9RA== X-Gm-Message-State: AOAM533J5fS1fzsEq6TkA4EfTZjtZvtqKSS+u3O0bnQZB8PazMjgAkj0 5IDUWSZTTT5R8ZhunA8UbzHnR8bDJw== X-Google-Smtp-Source: ABdhPJzK0gvYG3gTyPDEoZD+NEYfY7pWl69ZEG1QvqrnmjqE44g6bz7W1x/HgWdG2ORLVbTy0Q9RCw== X-Received: by 2002:aed:231d:: with SMTP id h29mr6862488qtc.238.1611364285074; Fri, 22 Jan 2021 17:11:25 -0800 (PST) From: Masayoshi Mizuma To: libvir-list@redhat.com Subject: [RFC PATCH 1/7] qemu_hotplug: Add asynJob argument to qemuDomainAttachDiskGeneric Date: Fri, 22 Jan 2021 20:11:00 -0500 Message-Id: <20210123011106.11126-2-msys.mizuma@gmail.com> In-Reply-To: <20210123011106.11126-1-msys.mizuma@gmail.com> References: <20210123011106.11126-1-msys.mizuma@gmail.com> 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.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Masayoshi Mizuma , Masayoshi Mizuma 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.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Masayoshi Mizuma Add asynJob argument to qemuDomainAttachDiskGeneric() so that it can be used before CPUs start. Signed-off-by: Masayoshi Mizuma --- src/qemu/qemu_hotplug.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 882e5d2384..609e9d1a8a 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -693,7 +693,8 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, static int qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, virDomainObjPtr vm, - virDomainDiskDefPtr disk) + virDomainDiskDefPtr disk, + qemuDomainAsyncJob asyncJob) { g_autoptr(qemuBlockStorageSourceChainData) data =3D NULL; int ret =3D -1; @@ -740,7 +741,8 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, if (qemuHotplugAttachManagedPR(driver, vm, disk->src, QEMU_ASYNC_JOB_N= ONE) < 0) goto cleanup; =20 - qemuDomainObjEnterMonitor(driver, vm); + if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) + goto cleanup; =20 if (qemuBlockStorageSourceChainAttach(priv->mon, data) < 0) goto exit_monitor; @@ -820,7 +822,7 @@ qemuDomainAttachVirtioDiskDevice(virQEMUDriverPtr drive= r, if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev, disk->dst) <= 0) return -1; =20 - if ((rv =3D qemuDomainAttachDiskGeneric(driver, vm, disk)) < 0) { + if ((rv =3D qemuDomainAttachDiskGeneric(driver, vm, disk, QEMU_ASYNC_J= OB_NONE)) < 0) { if (rv =3D=3D -1 && releaseaddr) qemuDomainReleaseDeviceAddress(vm, &disk->info); =20 @@ -999,7 +1001,7 @@ qemuDomainAttachSCSIDisk(virQEMUDriverPtr driver, return -1; } =20 - if (qemuDomainAttachDiskGeneric(driver, vm, disk) < 0) + if (qemuDomainAttachDiskGeneric(driver, vm, disk, QEMU_ASYNC_JOB_NONE)= < 0) return -1; =20 return 0; @@ -1016,7 +1018,7 @@ qemuDomainAttachUSBMassStorageDevice(virQEMUDriverPtr= driver, if (virDomainUSBAddressEnsure(priv->usbaddrs, &disk->info) < 0) return -1; =20 - if (qemuDomainAttachDiskGeneric(driver, vm, disk) < 0) { + if (qemuDomainAttachDiskGeneric(driver, vm, disk, QEMU_ASYNC_JOB_NONE)= < 0) { virDomainUSBAddressRelease(priv->usbaddrs, &disk->info); return -1; } --=20 2.27.0 From nobody Tue May 7 23:50:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1611364547; cv=none; d=zohomail.com; s=zohoarc; b=SO7RLAZSbCkR6soJ0eE56h7FpPuWi/9u6PaKdP6RufZ2qBs7Yzos+i2WXKb6RkvYsrgkpWj239EMM97yx+R0gjTuk7qdbtSEarzwVHtkOreLjygWw8DCL2B/hIC6EZKyZ2BBa12HpSKIOpEalFoASN1SeYS6t3F20JIRKudp+us= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611364547; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=zmOduyRI7eErkPS0iANFmvw2eIbEXPMZe5QQRfvRMvQ=; b=ZmM3IX0FooSrEZU0Tdw4N+sif0Sw416V+pdc8U0lvZEXI6oerm45cEWE5CFvcEWYyQx8pkaoesaZAKOQk3wr5UyWR9+SxE0pLhW4k+dWMhvrluWdpNEia/xp1P3BBk2Y+RKgw7eu2uOawtBGqaDyrNtBrN0NFVVHXLpeLiWQmlc= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1611364547567272.2100667931825; Fri, 22 Jan 2021 17:15:47 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-35-cy1OG2UCOTWaVgo_fMn0hw-1; Fri, 22 Jan 2021 20:15:44 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5ADFD15720; Sat, 23 Jan 2021 01:15:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3AAC8709AD; Sat, 23 Jan 2021 01:15:38 +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 081531809CA3; Sat, 23 Jan 2021 01:15:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10N1BVZO001139 for ; Fri, 22 Jan 2021 20:11:31 -0500 Received: by smtp.corp.redhat.com (Postfix) id 92EB52026D5D; Sat, 23 Jan 2021 01:11:31 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8E1482026D46 for ; Sat, 23 Jan 2021 01:11:29 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 195E7100FBC5 for ; Sat, 23 Jan 2021 01:11:29 +0000 (UTC) Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-267-Hv0M3XpFMxqhnbKt0kw8Rw-1; Fri, 22 Jan 2021 20:11:26 -0500 Received: by mail-qk1-f176.google.com with SMTP id x81so4217937qkb.0 for ; Fri, 22 Jan 2021 17:11:26 -0800 (PST) Received: from localhost (209-6-122-159.s2973.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [209.6.122.159]) by smtp.gmail.com with ESMTPSA id x64sm3936372qtd.15.2021.01.22.17.11.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2021 17:11:25 -0800 (PST) X-MC-Unique: cy1OG2UCOTWaVgo_fMn0hw-1 X-MC-Unique: Hv0M3XpFMxqhnbKt0kw8Rw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zmOduyRI7eErkPS0iANFmvw2eIbEXPMZe5QQRfvRMvQ=; b=MkvI8MlSI4KR4w89cLfQUjWf8KQ+kr15CthhqoECzscZOfVFFLBL/2g51YbwDBcN2O zPcJkDVc/H+YsILvqpQcWT36j9Ph/B9zNzXcHVWL1ihKjZA+77nGfbRQGYmaaSVg9cgi Pkn7JHGKiCePaHyuiRCeAVSrrY/R9b1P6mKcMI+Ag3JVxh/F4qwSaMjfqqN3xQeeVZHO UZWwdwRxgPR5DSoDDx6tEVvvQkqdtWR3jcaRhoDTFrzcWUMIw0PpT5MlruwhvmBYOp3H Bb1SmJIRoWWBaGAA6/LDU6b1lKf753IRPRJBRUKoWzOL+4RNlLBD0lDR/dmXUfqQNdvG 2WKQ== X-Gm-Message-State: AOAM53047WISk1fTpYnpePfnOmOYs8ESSdaYRAUOfaGr3mSJy1KRKzPB GwSQfe07pm9LPxXkM9cfYsNP2xTPcw== X-Google-Smtp-Source: ABdhPJyi4YYL9ZjP0/zplhx0UALS52NwvWSDdfVmBj9+2NUCkhi+nihLfSY7eRlOzMQEABaRTKAOBg== X-Received: by 2002:a37:afc2:: with SMTP id y185mr7623370qke.499.1611364286328; Fri, 22 Jan 2021 17:11:26 -0800 (PST) From: Masayoshi Mizuma To: libvir-list@redhat.com Subject: [RFC PATCH 2/7] qemu_hotplug: Add asyncJob argument to qemuDomainAttachDeviceDiskLiveInternal Date: Fri, 22 Jan 2021 20:11:01 -0500 Message-Id: <20210123011106.11126-3-msys.mizuma@gmail.com> In-Reply-To: <20210123011106.11126-1-msys.mizuma@gmail.com> References: <20210123011106.11126-1-msys.mizuma@gmail.com> 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.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Masayoshi Mizuma , Masayoshi Mizuma 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.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Masayoshi Mizuma Add asynJob argument to qemuDomainAttachDeviceDiskLiveInternal() so that it= can be used before CPUs start. To avoid a compile warning, G_GNUC_UNUSED is add= ed here. A later patch will remove G_GNUC_UNUSED. Signed-off-by: Masayoshi Mizuma --- src/qemu/qemu_hotplug.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 609e9d1a8a..a61899d53a 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1030,7 +1030,8 @@ qemuDomainAttachUSBMassStorageDevice(virQEMUDriverPtr= driver, static int qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriverPtr driver, virDomainObjPtr vm, - virDomainDeviceDefPtr dev) + virDomainDeviceDefPtr dev, + qemuDomainAsyncJob asyncJob G_GNUC_= UNUSED) { size_t i; virDomainDiskDefPtr disk =3D dev->data.disk; @@ -1138,7 +1139,7 @@ qemuDomainAttachDeviceDiskLive(virQEMUDriverPtr drive= r, return 0; } =20 - return qemuDomainAttachDeviceDiskLiveInternal(driver, vm, dev); + return qemuDomainAttachDeviceDiskLiveInternal(driver, vm, dev, QEMU_AS= YNC_JOB_NONE); } =20 =20 --=20 2.27.0 From nobody Tue May 7 23:50:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1611364542; cv=none; d=zohomail.com; s=zohoarc; b=SCrD4TfwyerwrDz+xsKKawmmxaehcfB9Z5k0WVhJBt+ew1ZfF9MOO8G9gHsxfredUQRfK5ZHf3LVtegJSbzvYue7ZrWVcu27bJYGE+Tu3DfkJH1ooMujIWlT01FLT8wA2HYgMFB3VkdgPgc8JCcHktVJsfzWSA3nJjuuk822okA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611364542; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Sz0FZ7rkTfbl3QaQAd5rqvcqm33ntHA5riE3MuuC+uM=; b=bhczx1dp9BOa6v1kRn42LjPGQi0fCMSHPyPC+vbEoRbptbiT+1StKHCakssCgoFR2ejbyBNOfvxr6dyv67K9PuyoEllM4MXul+vaVM8YqZmfX/pMJUEwZ9vvAoZx5GSkICts4YV7pWe497jE08FcSNa0wTKNMqWZr4g+lvaiQGo= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1611364542651636.2058087305288; Fri, 22 Jan 2021 17:15:42 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-438-DBznBBzpPX-VBIMpC3dZnw-1; Fri, 22 Jan 2021 20:15:39 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D15F41005D44; Sat, 23 Jan 2021 01:15:30 +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 2FC3471D4D; Sat, 23 Jan 2021 01:15:30 +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 ED6E05002D; Sat, 23 Jan 2021 01:15:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10N1BUJB001126 for ; Fri, 22 Jan 2021 20:11:31 -0500 Received: by smtp.corp.redhat.com (Postfix) id CA1F6F101D; Sat, 23 Jan 2021 01:11:30 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C3D01F11CB for ; Sat, 23 Jan 2021 01:11:30 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 62F36100FBC6 for ; Sat, 23 Jan 2021 01:11:30 +0000 (UTC) Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-592-dIqPZoeHNrqlyi1lFZqhhg-1; Fri, 22 Jan 2021 20:11:28 -0500 Received: by mail-qk1-f175.google.com with SMTP id x81so4217968qkb.0 for ; Fri, 22 Jan 2021 17:11:28 -0800 (PST) Received: from localhost (209-6-122-159.s2973.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [209.6.122.159]) by smtp.gmail.com with ESMTPSA id u7sm7199663qke.116.2021.01.22.17.11.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2021 17:11:27 -0800 (PST) X-MC-Unique: DBznBBzpPX-VBIMpC3dZnw-1 X-MC-Unique: dIqPZoeHNrqlyi1lFZqhhg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Sz0FZ7rkTfbl3QaQAd5rqvcqm33ntHA5riE3MuuC+uM=; b=QW+lKxDbQrGN/h+ixJX026uGct3XPfjCy5bRXMEdm+XQDAqIqm/504DU3kwzJVhl6P DRUIqFzhcv1rXMUvcvm8uiFU1Q1xlRXBzMeJotiInZQiy9sShuxikOwVR/E9b+2OoklU uHNzJ8f+M0IcfVYvyEFjLk4lcP7GI8XWJ3f8ILTrHlttBnKZ37kUEqp511LA/Ns85fHM RkMtzsALrq+JRo0tcaLyHYuWHBfyUDKUnIuOajKbvA97PfyM2o65Dbemenx07kGruOUu CJp8dRLywUQRCVf4iD3VGZ/2ogoKGlXnauIms2OKhLt0FvOyY/H/Cg1laensQiiB+qF5 9XZg== X-Gm-Message-State: AOAM533Wfiv/0w0VTC+SJNjwA+Lx9GFS1j7lO5CO4MJZajAIq2nG3PWh LG8QZSpuGT2sPpmy2gPYISx/D7h4LQ== X-Google-Smtp-Source: ABdhPJwhaKq0UnWXfglSUrz1sKmD9J/mrqzy+5bZR/KqulpkHOA+zVJM+3YuWJk0qxBMLraY+81C3A== X-Received: by 2002:a37:809:: with SMTP id 9mr7431455qki.156.1611364287704; Fri, 22 Jan 2021 17:11:27 -0800 (PST) From: Masayoshi Mizuma To: libvir-list@redhat.com Subject: [RFC PATCH 3/7] qemu_hotplug: Add asynJob argument to qemuDomainRemoveDiskDevice Date: Fri, 22 Jan 2021 20:11:02 -0500 Message-Id: <20210123011106.11126-4-msys.mizuma@gmail.com> In-Reply-To: <20210123011106.11126-1-msys.mizuma@gmail.com> References: <20210123011106.11126-1-msys.mizuma@gmail.com> 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.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Masayoshi Mizuma , Masayoshi Mizuma 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.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Masayoshi Mizuma Add asynJob argument to qemuDomainRemoveDiskDevice() so that it can be used before CPUs start. Signed-off-by: Masayoshi Mizuma --- src/qemu/qemu_hotplug.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a61899d53a..b989652533 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4302,7 +4302,8 @@ static bool qemuIsMultiFunctionDevice(virDomainDefPtr= def, static int qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, - virDomainDiskDefPtr disk) + virDomainDiskDefPtr disk, + qemuDomainAsyncJob asyncJob) { qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); g_autoptr(qemuBlockStorageSourceChainData) diskBackend =3D NULL; @@ -4347,7 +4348,8 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, } } =20 - qemuDomainObjEnterMonitor(driver, vm); + if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) + goto cleanup; =20 if (corAlias) ignore_value(qemuMonitorBlockdevDel(priv->mon, corAlias)); @@ -5093,7 +5095,8 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver, * into this function. */ case VIR_DOMAIN_DEVICE_DISK: - if (qemuDomainRemoveDiskDevice(driver, vm, dev->data.disk) < 0) + if (qemuDomainRemoveDiskDevice(driver, vm, dev->data.disk, + QEMU_ASYNC_JOB_NONE) < 0) return -1; break; case VIR_DOMAIN_DEVICE_CONTROLLER: --=20 2.27.0 From nobody Tue May 7 23:50:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1611364550; cv=none; d=zohomail.com; s=zohoarc; b=eQD1Wnaza0rykdDsND9YGZfgnijGjCJkBsqr3v1hBtepXVPXjaLZuoWrdFogDIQdJ6i6l5hbS0N15IQIfKsmVu+TqQ9KcS9E0bqyYgG6JYjXhWLfXT+007SDP03+jzlbDryTdquw5zBbc5rwg8Wk2Z+XF9AoGuFHkN18DXtfedk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611364550; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=ipt/X2dYsn3SP7CQqYS54CcDS9S64O4wjWj9mIU6BWM=; b=MZAp94jSxe6q7vgDa54uj42s98PH1dTJk7YpQSnmB3QWQLMKecTfYmFiOAsD2x3LUfD3ewh/fdca6X3Oz0o2ByCjV+nTTR0xLjdbNsM18rVHinV2FJIMtn4sREnl/oYMtRbsruam4HvUbciIWHQycJ0KLWsmg6Kj9fwLYOaGB0g= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1611364550360192.81813349133608; Fri, 22 Jan 2021 17:15:50 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-269-P07T3dP3MhGWugKMAfrm5g-1; Fri, 22 Jan 2021 20:15:46 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 28E2D15725; Sat, 23 Jan 2021 01:15:41 +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 04C295D746; Sat, 23 Jan 2021 01:15:41 +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 C47CD5002F; Sat, 23 Jan 2021 01:15:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10N1BWjR001146 for ; Fri, 22 Jan 2021 20:11:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id 15DD4F11CB; Sat, 23 Jan 2021 01:11:32 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 10486F1005 for ; Sat, 23 Jan 2021 01:11:32 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F0D1D800B3B for ; Sat, 23 Jan 2021 01:11:31 +0000 (UTC) Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-32-BWMvokyrMR2lUbtYax4sLA-1; Fri, 22 Jan 2021 20:11:29 -0500 Received: by mail-qt1-f171.google.com with SMTP id c12so5619698qtv.5 for ; Fri, 22 Jan 2021 17:11:29 -0800 (PST) Received: from localhost (209-6-122-159.s2973.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [209.6.122.159]) by smtp.gmail.com with ESMTPSA id t62sm2685484qtd.11.2021.01.22.17.11.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2021 17:11:28 -0800 (PST) X-MC-Unique: P07T3dP3MhGWugKMAfrm5g-1 X-MC-Unique: BWMvokyrMR2lUbtYax4sLA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ipt/X2dYsn3SP7CQqYS54CcDS9S64O4wjWj9mIU6BWM=; b=dzKH5zhPNFM+jakVvpKlQjCtAI35ntIdGXgHHJMHarKah15q8JMzZhfGbf5V8qvd/u u4SXTWrIRrQyhOqFtHl2hiAE14gNGt9Lvg6ileAyhc4qWQw59UUVAB+67BdlkiibigiG AdZ5uPyUX0Lw5MJBabn2zvfR6a5ii4tnW4qN3btaqhyt/c2IA40L6RZ/Cgz7aaa18f9E 8PFmy7ZnOxTNtYq0kHD+ZWgmi+4+L4DQLH5ej8sbpa6W1kBQm3HDdho5nxWzyVjaJQDk jsQv7vUPPjIFI6BQ7V9XYlyJsEH6qZaey6zDlm119zT3VQoKCS3gWDW7wRsXQAviiMgv RcPw== X-Gm-Message-State: AOAM531GkhteSzls0kk963JsJskPuoNOEQJWj7YOrLK8RGkICp5rtHWR CGjdFM31AWiBkGHmlLRTCHy6yXjrBQ== X-Google-Smtp-Source: ABdhPJxK+KD1/NiL8qdbfkCBtYyRKBYi/id9NGVPJOv9qUA5S/qKppFJ23MkOrf0SkbydVu/f9G7sA== X-Received: by 2002:ac8:5cd0:: with SMTP id s16mr6767690qta.333.1611364289184; Fri, 22 Jan 2021 17:11:29 -0800 (PST) From: Masayoshi Mizuma To: libvir-list@redhat.com Subject: [RFC PATCH 4/7] qemu_hotplug: Add bootindex argument to qemuDomainAttachDiskGeneric Date: Fri, 22 Jan 2021 20:11:03 -0500 Message-Id: <20210123011106.11126-5-msys.mizuma@gmail.com> In-Reply-To: <20210123011106.11126-1-msys.mizuma@gmail.com> References: <20210123011106.11126-1-msys.mizuma@gmail.com> 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.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Masayoshi Mizuma , Masayoshi Mizuma 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.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Masayoshi Mizuma Add bootindex argument to qemuDomainAttachDiskGeneric() so that qemu can detect the boot index for the disks which are hot-added before CPUs start. Signed-off-by: Masayoshi Mizuma --- src/qemu/qemu_hotplug.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index b989652533..a2535949b7 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -694,6 +694,7 @@ static int qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainDiskDefPtr disk, + unsigned int bootindex, qemuDomainAsyncJob asyncJob) { g_autoptr(qemuBlockStorageSourceChainData) data =3D NULL; @@ -732,7 +733,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, goto cleanup; } =20 - if (!(devstr =3D qemuBuildDiskDeviceStr(vm->def, disk, 0, priv->qemuCa= ps))) + if (!(devstr =3D qemuBuildDiskDeviceStr(vm->def, disk, bootindex, priv= ->qemuCaps))) goto cleanup; =20 if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks + 1) < 0) @@ -822,7 +823,8 @@ qemuDomainAttachVirtioDiskDevice(virQEMUDriverPtr drive= r, if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev, disk->dst) <= 0) return -1; =20 - if ((rv =3D qemuDomainAttachDiskGeneric(driver, vm, disk, QEMU_ASYNC_J= OB_NONE)) < 0) { + if ((rv =3D qemuDomainAttachDiskGeneric(driver, vm, disk, 0, + QEMU_ASYNC_JOB_NONE)) < 0) { if (rv =3D=3D -1 && releaseaddr) qemuDomainReleaseDeviceAddress(vm, &disk->info); =20 @@ -1001,7 +1003,7 @@ qemuDomainAttachSCSIDisk(virQEMUDriverPtr driver, return -1; } =20 - if (qemuDomainAttachDiskGeneric(driver, vm, disk, QEMU_ASYNC_JOB_NONE)= < 0) + if (qemuDomainAttachDiskGeneric(driver, vm, disk, 0, QEMU_ASYNC_JOB_NO= NE) < 0) return -1; =20 return 0; @@ -1018,7 +1020,7 @@ qemuDomainAttachUSBMassStorageDevice(virQEMUDriverPtr= driver, if (virDomainUSBAddressEnsure(priv->usbaddrs, &disk->info) < 0) return -1; =20 - if (qemuDomainAttachDiskGeneric(driver, vm, disk, QEMU_ASYNC_JOB_NONE)= < 0) { + if (qemuDomainAttachDiskGeneric(driver, vm, disk, 0, QEMU_ASYNC_JOB_NO= NE) < 0) { virDomainUSBAddressRelease(priv->usbaddrs, &disk->info); return -1; } --=20 2.27.0 From nobody Tue May 7 23:50:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1611364541; cv=none; d=zohomail.com; s=zohoarc; b=Kn2pG0oyg13StfPbhUq/9V+19JISHT8q+0lgg1izwMq5TzzB6zxwNKB7JRrQz76Q6YosqSki15noIsqqPOKfR318RXpI/QDdY3z5QtC8iaS58VS2pQNQbQFM4j31dz7Dg+Y/qV9r+J3g77TPz7v5tTPI9fi6BDm9f0BiAR8RN7I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611364541; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=VInge0N38beT/UVHQOO0BxocwAiKP/MfHTX4CD/a3vc=; b=W3sZwDM9ZRqi3/E15DTsrYnAGWUqEJ1I+E2u8T+j5fokqDCn35etevq2oF/AijbOhMloqz7hTPGFJl5S2qJPJ/pdR6JXrR3MJtmgLgmYz27vgeJPrZrxSC7ZH8PdvMgrNZHMhfA8n1g9b1zHSuSTANSqrCelZntXbtRUx2vTdGk= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1611364541758981.342945839966; Fri, 22 Jan 2021 17:15:41 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-186-ZZTD_OaZMNa0UPn2Yy-ZYQ-1; Fri, 22 Jan 2021 20:15:38 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 01C42107ACFA; Sat, 23 Jan 2021 01:15:33 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D2AF410023BD; Sat, 23 Jan 2021 01:15:32 +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 A15CC1809CA2; Sat, 23 Jan 2021 01:15:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10N1BaaN001173 for ; Fri, 22 Jan 2021 20:11:36 -0500 Received: by smtp.corp.redhat.com (Postfix) id EFB8C2166B2F; Sat, 23 Jan 2021 01:11:35 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EA79B2166B27 for ; Sat, 23 Jan 2021 01:11:33 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6233D185A794 for ; Sat, 23 Jan 2021 01:11:33 +0000 (UTC) Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-220-WloGq7ChO-e7H1jyjyvrkQ-1; Fri, 22 Jan 2021 20:11:31 -0500 Received: by mail-qt1-f175.google.com with SMTP id t17so5626549qtq.2 for ; Fri, 22 Jan 2021 17:11:31 -0800 (PST) Received: from localhost (209-6-122-159.s2973.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [209.6.122.159]) by smtp.gmail.com with ESMTPSA id u5sm7491440qka.86.2021.01.22.17.11.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2021 17:11:30 -0800 (PST) X-MC-Unique: ZZTD_OaZMNa0UPn2Yy-ZYQ-1 X-MC-Unique: WloGq7ChO-e7H1jyjyvrkQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VInge0N38beT/UVHQOO0BxocwAiKP/MfHTX4CD/a3vc=; b=WmBe/tL0VpKhA57gBNSdNW28azoQuZVqJFoAlBf1I117jtWhrksFNOcgy/oIIqKuyF ezxWpNWvS2Ey+dCGgURzV+Zh783VINOfQceJvc1taRDBuwboy24yvfns8v/FbQ+fvY/0 LzIdnGJ6PVN48kPKtCu6MEYBzhde9avXhBVhqqw2jBtzP9+EdNhGJ61/vTpWPBXOrFJ1 8BrciLozcuq8kgKi2V9ouFx4rc/OnRhSe4GiPo23fDp7sU5zL3v8EAkrpVuqj96V6Qau KtImI+/49f2tSHpUY+MdB1kSkJbYkT5lC2sSvWr+4Et8IJ1OiHENmBrqzKubUXgpxp3Q n/ow== X-Gm-Message-State: AOAM531MIeCNmoDxvgkrre24JbhdNjvtNGvfmb+xRCPjg/dnUZ2jkzUw 8OLRmLLdXZiz+3StdPTpfVjJKkU4Fw== X-Google-Smtp-Source: ABdhPJywHFZMRW1+s5BfXWpoFwh8yLa4hTz3MWP2P2l/tnkz7ldS6NFlo/0IfY5/yh3hrW2fOHHVAQ== X-Received: by 2002:ac8:7b45:: with SMTP id m5mr6767958qtu.323.1611364290536; Fri, 22 Jan 2021 17:11:30 -0800 (PST) From: Masayoshi Mizuma To: libvir-list@redhat.com Subject: [RFC PATCH 5/7] qemu_hotplug: make disk sharable Date: Fri, 22 Jan 2021 20:11:04 -0500 Message-Id: <20210123011106.11126-6-msys.mizuma@gmail.com> In-Reply-To: <20210123011106.11126-1-msys.mizuma@gmail.com> References: <20210123011106.11126-1-msys.mizuma@gmail.com> 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.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: Masayoshi Mizuma , Masayoshi Mizuma 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.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Masayoshi Mizuma Add qemuHotplugCreateDisksTransient() to make disk sharable. The procedure is followings. First, create the overlay disk with the original disk is set as the backingStore. Then, blockdev-del the StorageProgs and FormatProgs of the disk. That's because to fix the bootindex of the disk. Lastly, device_add the disks. Signed-off-by: Masayoshi Mizuma --- src/qemu/qemu_command.c | 3 + src/qemu/qemu_hotplug.c | 285 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_hotplug.h | 3 + 3 files changed, 291 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1ec302d4ac..81a27703c5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2139,6 +2139,9 @@ qemuBuildDisksCommandLine(virCommandPtr cmd, bootCD =3D 0; break; case VIR_DOMAIN_DISK_DEVICE_DISK: + /* to use bootindex later for transient disk */ + disk->info.bootIndex =3D bootDisk; + G_GNUC_FALLTHROUGH; case VIR_DOMAIN_DISK_DEVICE_LUN: bootindex =3D bootDisk; bootDisk =3D 0; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a2535949b7..5d0445538d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -6710,3 +6710,288 @@ qemuDomainSetVcpuInternal(virQEMUDriverPtr driver, virBitmapFree(livevcpus); return ret; } + +struct _qemuHotplugTransientDiskContext { + virDomainDeviceDefPtr trandev; + virDomainDiskDefPtr *domdisk; + size_t ndd; +}; + +typedef struct _qemuHotplugTransientDiskContext qemuHotplugTransientDisk= Context; +typedef qemuHotplugTransientDiskContext *qemuHotplugTransientDiskContextPt= r; + +static qemuHotplugTransientDiskContextPtr +qemuHotplugTransientDiskContextNew(size_t ndisks) +{ + qemuHotplugTransientDiskContextPtr ret =3D g_new0(qemuHotplugTransient= DiskContext, 1); + + ret->trandev =3D g_new0(virDomainDeviceDef, ndisks); + ret->domdisk =3D g_new0(virDomainDiskDefPtr, ndisks); + + return ret; +} + +static void +qemuHotplugTransientDiskCleanup(virDomainDeviceDefPtr data, + virDomainDiskDefPtr *domdisk) +{ + VIR_FREE(data); + VIR_FREE(domdisk); + + return; +} + +static void +qemuHotplugTransientDiskContextCleanup(qemuHotplugTransientDiskContextPtr = hptctxt) +{ + if (!hptctxt) + return; + + qemuHotplugTransientDiskCleanup(hptctxt->trandev, hptctxt->domdisk); + + g_free(hptctxt); +} + +G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuHotplugTransientDiskContext, qemuHotplug= TransientDiskContextCleanup); + +static int +qemuHotplugDiskPrepareOneBlockdev(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virQEMUDriverConfigPtr cfg, + virDomainDiskDefPtr domdisk, + virDomainDiskDefPtr trandisk, + GHashTable *blockNamedNodeData, + qemuDomainAsyncJob asyncJob) +{ + qemuDomainObjPrivatePtr priv =3D vm->privateData; + g_autoptr(qemuBlockStorageSourceChainData) data =3D NULL; + g_autoptr(virStorageSource) terminator =3D NULL; + + terminator =3D virStorageSourceNew(); + + if (qemuDomainPrepareStorageSourceBlockdev(trandisk, trandisk->src, + priv, cfg) < 0) + return -1; + + if (!(data =3D qemuBuildStorageSourceChainAttachPrepareBlockdevTop(tra= ndisk->src, + termi= nator, + priv-= >qemuCaps))) + return -1; + + if (qemuBlockStorageSourceCreateDetectSize(blockNamedNodeData, + trandisk->src, domdisk->src= ) < 0) + return -1; + + if (qemuBlockStorageSourceCreate(vm, trandisk->src, domdisk->src, + NULL, data->srcdata[0], + asyncJob) < 0) + return -1; + + /* blockdev-del the transient disk src. The disk is blockdev-add'ed + * while the disk is hot-added */ + if (qemuBlockStorageSourceDetachOneBlockdev(driver, vm, + asyncJob, trandisk->src) <= 0) + return -1; + + return 0; +} + +static int +qemuHotplugDiskTransientPrepareOne(virDomainObjPtr vm, + virQEMUDriverConfigPtr cfg, + virDomainDiskDefPtr domdisk, + virDomainDiskDefPtr trandisk, + GHashTable *blockNamedNodeData, + qemuDomainAsyncJob asyncJob) +{ + qemuDomainObjPrivatePtr priv =3D vm->privateData; + virQEMUDriverPtr driver =3D priv->driver; + bool supportsCreate; + + if (qemuDomainStorageSourceValidateDepth(trandisk->src, 1, trandisk->d= st) < 0) + return -1; + + if (virStorageSourceInitChainElement(trandisk->src, domdisk->src, fals= e) < 0) + return -1; + + trandisk->src->readonly =3D false; + supportsCreate =3D virStorageSourceSupportsCreate(trandisk->src); + + if (supportsCreate) { + if (qemuDomainStorageFileInit(driver, vm, trandisk->src, NULL) < 0) + return -1; + + if (virStorageSourceCreate(trandisk->src) < 0) { + virReportSystemError(errno, _("failed to create image file '%s= '"), + NULLSTR(trandisk->src->path)); + return -1; + } + } + + if (qemuDomainStorageSourceAccessAllow(driver, vm, trandisk->src, + false, true, true) < 0) + return -1; + + if (qemuHotplugDiskPrepareOneBlockdev(driver, vm, cfg, domdisk, trandi= sk, + blockNamedNodeData, asyncJob) < = 0) + return -1; + + return 0; +} + +static qemuHotplugTransientDiskContextPtr +qemuHotplugDiskPrepareDisksTransient(virDomainObjPtr vm, + virQEMUDriverConfigPtr cfg, + GHashTable *blockNamedNodeData, + qemuDomainAsyncJob asyncJob) +{ + g_autoptr(qemuHotplugTransientDiskContext) hptctxt =3D NULL; + qemuDomainObjPrivatePtr priv =3D vm->privateData; + virQEMUDriverPtr driver =3D priv->driver; + size_t i; + + hptctxt =3D qemuHotplugTransientDiskContextNew(vm->def->ndisks); + + for (i =3D 0; i < vm->def->ndisks; i++) { + virDomainDiskDefPtr domdisk =3D vm->def->disks[i]; + virDomainDiskDefPtr trandisk; + virDomainDeviceDefPtr trandev; + + if (!(trandisk =3D virDomainDiskDefNew(driver->xmlopt))) + return NULL; + + trandev =3D hptctxt->trandev + hptctxt->ndd; + trandev->type =3D VIR_DOMAIN_DEVICE_DISK; + + memcpy(&trandisk->info, &domdisk->info, sizeof(virDomainDeviceInfo= )); + trandisk->info.alias =3D NULL; + trandisk->info.romfile =3D NULL; + + if (domdisk->transient) { + trandisk->src =3D virStorageSourceNew(); + trandisk->src->type =3D VIR_STORAGE_TYPE_FILE; + trandisk->src->format =3D VIR_STORAGE_FILE_QCOW2; + trandisk->src->path =3D g_strdup_printf("%s.TRANSIENT-%s", + domdisk->src->path, vm->def= ->name); + + if (!(trandisk->src->backingStore =3D + virStorageSourceCopy(domdisk->src, false)= )) + return NULL; + + if (virFileExists(trandisk->src->path)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("Overlay file '%s' for transient disk '%s= ' already exists"), + trandisk->src->path, domdisk->dst); + return NULL; + } + + if (qemuHotplugDiskTransientPrepareOne(vm, cfg, domdisk, trand= isk, + blockNamedNodeData, + asyncJob) < 0) + return NULL; + } else { + /* The disks without transient option will be device_add as we= ll + * because to fix the bootindex */ + if (!(trandisk->src =3D virStorageSourceCopy(domdisk->src, fal= se))) + return NULL; + } + + trandisk->bus =3D domdisk->bus; + trandisk->dst =3D g_strdup(domdisk->dst); + trandev->data.disk =3D trandisk; + + hptctxt->domdisk[hptctxt->ndd] =3D domdisk; + + hptctxt->ndd++; + } + + return g_steal_pointer(&hptctxt); +} + +static int +qemuHotplugDiskTransientCreate(virDomainObjPtr vm, + qemuHotplugTransientDiskContextPtr hptctxt, + virQEMUDriverConfigPtr cfg, + qemuDomainAsyncJob asyncJob) +{ + qemuDomainObjPrivatePtr priv =3D vm->privateData; + virQEMUDriverPtr driver =3D priv->driver; + const char *alias =3D NULL; + size_t i; + int ret; + + for (i =3D 0; i < hptctxt->ndd; i++) { + virDomainDeviceDefPtr trandev =3D hptctxt->trandev + i; + virDomainDiskDefPtr domdisk =3D hptctxt->domdisk[i]; + bool transient =3D domdisk->transient; + + /* transient disk doesn't support disk hotplug. Disable it here te= mporarily + * to remove it */ + if (transient) + domdisk->transient =3D false; + + /* blockdev-del StorageProgs and FormatProps of domdisk so that + * qemuDomainAttachDeviceDiskLiveInternal() can blockdev-add without + * write lock issue */ + if (qemuDomainRemoveDiskDevice(driver, vm, domdisk, asyncJob) < 0) + return -1; + + ret =3D qemuDomainAttachDeviceDiskLiveInternal(driver, vm, trandev= , asyncJob); + if (!ret) { + alias =3D trandev->data.disk->info.alias; + if (transient) { + trandev->data.disk->transient =3D true; + } + } else { + VIR_DEBUG("Failed to attach disk %s (transient: %d) with disk = hotplug.", + trandev->data.disk->dst, transient); + return -1; + } + + if (alias) { + virObjectEventPtr event; + event =3D virDomainEventDeviceAddedNewFromObj(vm, alias); + virObjectEventStateQueue(driver->domainEventState, event); + } + + if (qemuDomainUpdateDeviceList(driver, vm, asyncJob) < 0) + return -1; + } + + if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) + return -1; + + return 0; +} + +int +qemuHotplugCreateDisksTransient(virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob) +{ + qemuDomainObjPrivatePtr priv =3D vm->privateData; + virQEMUDriverPtr driver =3D priv->driver; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(qemuHotplugTransientDiskContext) hptctxt =3D NULL; + g_autoptr(GHashTable) blockNamedNodeData =3D NULL; + + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) && + virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_PCIE_ROOT_PORT_HOTPLUG)) { + + VIR_DEBUG("prepare transient disks with disk hotplug"); + + if (!(blockNamedNodeData =3D qemuBlockGetNamedNodeData(vm, asyncJo= b))) + return -1; + + if (!(hptctxt =3D qemuHotplugDiskPrepareDisksTransient(vm, cfg, + blockNamedNodeData, + asyncJob))) + return -1; + + if (qemuHotplugDiskTransientCreate(vm, hptctxt, cfg, asyncJob) < 0) + return -1; + } + + priv->inhibitDiskTransientDelete =3D false; + + return 0; +} diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 6287c5b5e8..baef2dba42 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -160,3 +160,6 @@ int qemuHotplugAttachDBusVMState(virQEMUDriverPtr drive= r, int qemuHotplugRemoveDBusVMState(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainAsyncJob asyncJob); + +int qemuHotplugCreateDisksTransient(virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob); --=20 2.27.0 From nobody Tue May 7 23:50:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1611364565; cv=none; d=zohomail.com; s=zohoarc; b=Zm6XXFc3u2txDetqgL5l45W/xHpvYdmgOfll3v7JoJap9Slew6gzF2k4tf+fn5BWMJkoSwyfn1WztbancDcHEVTLiNQN449V19U41+piYL0bw3byoR2LmfP4HTVzmUbHIVhnr5pZgD0Kmjqcd4uji0MQKiF1a9GNW90DXnoNzI0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611364565; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=AE42CeOn4gIl9iGGSHm5pOwdOLXZ6TuUs4DZFjA5hyg=; b=LgZNu4sntzoYoqZleNu0JqlAu5iETA4KNouydBijKX29JYTjcBeUkg8FiUPNV0ugpYCG0iCzOrc14CUYRI1VoJ+phkjUwav6TH7Cx2kBBnCBClJyv5HQzTKfTYL2UeuiSlkGytKP52OLYWJNlK/moTbyChO/iDQTcjwiq+WYqD8= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1611364565077326.8284220117488; Fri, 22 Jan 2021 17:16:05 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-162-HN5iJ_wGOKy1zYk5qIMsQA-1; Fri, 22 Jan 2021 20:15:37 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A6EA9801FD4; Sat, 23 Jan 2021 01:15:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 83C74100AE4B; Sat, 23 Jan 2021 01:15:31 +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 507D71809CA0; Sat, 23 Jan 2021 01:15:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10N1BYp1001166 for ; Fri, 22 Jan 2021 20:11:35 -0500 Received: by smtp.corp.redhat.com (Postfix) id C8E2410336C0; Sat, 23 Jan 2021 01:11:34 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C4F831031F52 for ; Sat, 23 Jan 2021 01:11:34 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B2BC9811E76 for ; Sat, 23 Jan 2021 01:11:34 +0000 (UTC) Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com [209.85.160.178]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-589-EcPsq1MCMfSj92jSOdZfxg-1; Fri, 22 Jan 2021 20:11:32 -0500 Received: by mail-qt1-f178.google.com with SMTP id v3so5607612qtw.4 for ; Fri, 22 Jan 2021 17:11:32 -0800 (PST) Received: from localhost (209-6-122-159.s2973.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [209.6.122.159]) by smtp.gmail.com with ESMTPSA id 23sm5021485qks.71.2021.01.22.17.11.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2021 17:11:31 -0800 (PST) X-MC-Unique: HN5iJ_wGOKy1zYk5qIMsQA-1 X-MC-Unique: EcPsq1MCMfSj92jSOdZfxg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AE42CeOn4gIl9iGGSHm5pOwdOLXZ6TuUs4DZFjA5hyg=; b=uVpagqjdPGT31jkBqlNQMdP+38pEEzffYeSdGl8qMnyYx3qDHKV+r45cj/NMk+O0y+ wdXtQB5XPsiyCZPNPCS1/xkSofHYsQirr2LKiqRx1+PKP/3B+EQ6VfnfLJ0/jx0iBU4t 7zWggKg2z9I5T7T2ZS6ynB3dBAlPLyvpCfx25xursUQJ8+9okoZ4oVCu4T463c5RmHmA WtmM41dS5o7lp7iTYLlCCQmOA9raLCL5dbSLbtSdWmj9gZas6DJ6Ie2SjOXCrQ9vLyD0 czeAbZBWLIT8PlPY+ILMfIivepd0bWjg6/CDC+T5g9g79Ihndyzd8FXVv+gKrVnxSpyn fe3Q== X-Gm-Message-State: AOAM5327WKwUvdIiRYBaFeuJqz5A2vH7GV5htVYsqsuX0q3po+/CBEXx /j0sXp099OoLP7CuV48JgVKzgG7uFw== X-Google-Smtp-Source: ABdhPJwN+ImfRl50Eavob6gnOrysAIYSnK8n5B3l1+1prciXbVTdodEmsJkmU/tfp5AMgbV0LhGlOA== X-Received: by 2002:ac8:5d09:: with SMTP id f9mr6976947qtx.157.1611364292035; Fri, 22 Jan 2021 17:11:32 -0800 (PST) From: Masayoshi Mizuma To: libvir-list@redhat.com Subject: [RFC PATCH 6/7] qemu: Add check whether the transient disks are sharable Date: Fri, 22 Jan 2021 20:11:05 -0500 Message-Id: <20210123011106.11126-7-msys.mizuma@gmail.com> In-Reply-To: <20210123011106.11126-1-msys.mizuma@gmail.com> References: <20210123011106.11126-1-msys.mizuma@gmail.com> 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.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: Masayoshi Mizuma , Masayoshi Mizuma 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.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Masayoshi Mizuma Check whether the transient disks are shareable or not. If followings are true, the transient disks are shareable. - qemu has blockdev and hotplug feature - the all disk bus support hot-plug Signed-off-by: Masayoshi Mizuma --- src/qemu/qemu_command.c | 17 +++++++++++++---- src/qemu/qemu_domain.h | 3 +++ src/qemu/qemu_process.c | 38 +++++++++++++++++++++++++++++++++++++- 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 81a27703c5..d5958f46ef 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2063,10 +2063,14 @@ qemuBuildDiskCommandLine(virCommandPtr cmd, const virDomainDef *def, virDomainDiskDefPtr disk, virQEMUCapsPtr qemuCaps, - unsigned int bootindex) + unsigned int bootindex, + qemuDomainObjPrivatePtr priv) { g_autofree char *optstr =3D NULL; =20 + if ((disk->transient) && (priv->TransientDiskSharable)) + disk->src->readonly =3D true; + if (qemuBuildDiskSourceCommandLine(cmd, disk, qemuCaps) < 0) return -1; =20 @@ -2084,6 +2088,10 @@ qemuBuildDiskCommandLine(virCommandPtr cmd, if (qemuCommandAddExtDevice(cmd, &disk->info) < 0) return -1; =20 + /* All disks are hot-added later if TransientDiskSharable is true */ + if (priv->TransientDiskSharable) + return 0; + virCommandAddArg(cmd, "-device"); =20 if (!(optstr =3D qemuBuildDiskDeviceStr(def, disk, bootindex, @@ -2098,7 +2106,8 @@ qemuBuildDiskCommandLine(virCommandPtr cmd, static int qemuBuildDisksCommandLine(virCommandPtr cmd, const virDomainDef *def, - virQEMUCapsPtr qemuCaps) + virQEMUCapsPtr qemuCaps, + qemuDomainObjPrivatePtr priv) { size_t i; unsigned int bootCD =3D 0; @@ -2154,7 +2163,7 @@ qemuBuildDisksCommandLine(virCommandPtr cmd, if (disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_FLOPPY) bootindex =3D 0; =20 - if (qemuBuildDiskCommandLine(cmd, def, disk, qemuCaps, bootindex) = < 0) + if (qemuBuildDiskCommandLine(cmd, def, disk, qemuCaps, bootindex, = priv) < 0) return -1; } =20 @@ -9935,7 +9944,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, VIR_DOMAIN_CONTROLLER_TYPE_C= CID) < 0) return NULL; =20 - if (qemuBuildDisksCommandLine(cmd, def, qemuCaps) < 0) + if (qemuBuildDisksCommandLine(cmd, def, qemuCaps, priv) < 0) return NULL; =20 if (qemuBuildFilesystemCommandLine(cmd, def, qemuCaps, priv) < 0) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 154339ef8f..37b050def4 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -267,6 +267,9 @@ struct _qemuDomainObjPrivate { /* prevent deletion of disk overlay files between startup = and * succesful setup of the overlays */ bool inhibitDiskTransientDelete; + + /* True if the all transient disks are sharable */ + bool TransientDiskSharable; }; =20 #define QEMU_DOMAIN_PRIVATE(vm) \ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f87a3c0f60..2e2d1c6fea 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6892,6 +6892,40 @@ qemuProcessEnablePerf(virDomainObjPtr vm) return 0; } =20 +static void +qemuCheckTransientDiskSharable(virDomainObjPtr vm) +{ + qemuDomainObjPrivatePtr priv =3D vm->privateData; + bool hotplug =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_PCIE_ROOT_PO= RT_HOTPLUG); + size_t i; + + priv->TransientDiskSharable =3D false; + + if (!hotplug) + return; + + for (i =3D 0; i < vm->def->ndisks; i++) { + virDomainDiskDefPtr disk =3D vm->def->disks[i]; + + if (disk->transient && disk->bus !=3D VIR_DOMAIN_DISK_BUS_LAST) + return; + } + + priv->TransientDiskSharable =3D true; +} + +static int +qemuProcessCreateDisksTransient(virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob) +{ + qemuDomainObjPrivatePtr priv =3D vm->privateData; + + if (priv->TransientDiskSharable) + return qemuHotplugCreateDisksTransient(vm, asyncJob); + else + return qemuSnapshotCreateDisksTransient(vm, asyncJob); +} + =20 /** * qemuProcessLaunch: @@ -6982,6 +7016,8 @@ qemuProcessLaunch(virConnectPtr conn, incoming !=3D NULL) < 0) goto cleanup; =20 + qemuCheckTransientDiskSharable(vm); + VIR_DEBUG("Building emulator command line"); if (!(cmd =3D qemuBuildCommandLine(driver, qemuDomainLogContextGetManager(logCtx= t), @@ -7228,7 +7264,7 @@ qemuProcessLaunch(virConnectPtr conn, goto cleanup; =20 VIR_DEBUG("Setting up transient disk"); - if (qemuSnapshotCreateDisksTransient(vm, asyncJob) < 0) + if (qemuProcessCreateDisksTransient(vm, asyncJob) < 0) goto cleanup; =20 ret =3D 0; --=20 2.27.0 From nobody Tue May 7 23:50:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1611364553; cv=none; d=zohomail.com; s=zohoarc; b=B62WNFLtOvdjRPJ1OvYF7sS5dxbRE7Cux9/vz10mlgvAJO17GYDMftD89WcikO8tBmUjFlnp/rBZy+b+cR02HPipTdNaQrLj/6mcaI46kEmiY9aXkpshx4cNCFlHo+785nXU8TK9oJNWnnCHUrgEYLi/CZExs89ZqE4pP16iigg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611364553; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=r9ILmJK0e3VTCSwZAPhciwTAOC8i6ZPvXWtJk0nkob8=; b=nPX1l4z0tPKt7HO1CYwwPy+D60Xxqi9nDo+b5TEBhCPpMl7lkZbrsjtJOyzy2v6TITHAK2ILP/y3gFK5W7cNOjyYr/im0SfS9gxx3ZtMdIqwyMwbXgX9FUxeu60RN3LKb+CbJhyX7ApXVIlipXwm6o/Cu/N5oBrqm+rLk6wmELw= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 161136455316421.606142025560985; Fri, 22 Jan 2021 17:15:53 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-372-QIyAo3XKMhWRetPZPJPFgw-1; Fri, 22 Jan 2021 20:15:49 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 65E1215729; Sat, 23 Jan 2021 01:15:44 +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 3D4F31992D; Sat, 23 Jan 2021 01:15:44 +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 03DEB50032; Sat, 23 Jan 2021 01:15:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10N1Ba5b001181 for ; Fri, 22 Jan 2021 20:11:36 -0500 Received: by smtp.corp.redhat.com (Postfix) id 9F0FF2026D5D; Sat, 23 Jan 2021 01:11:36 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9A3BD2026D46 for ; Sat, 23 Jan 2021 01:11:36 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 86707811E76 for ; Sat, 23 Jan 2021 01:11:36 +0000 (UTC) Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-407-ZdmVAL7AOzq-QatvRaLABQ-1; Fri, 22 Jan 2021 20:11:34 -0500 Received: by mail-qk1-f179.google.com with SMTP id z11so7085330qkj.7 for ; Fri, 22 Jan 2021 17:11:33 -0800 (PST) Received: from localhost (209-6-122-159.s2973.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [209.6.122.159]) by smtp.gmail.com with ESMTPSA id 8sm7333242qkr.28.2021.01.22.17.11.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jan 2021 17:11:33 -0800 (PST) X-MC-Unique: QIyAo3XKMhWRetPZPJPFgw-1 X-MC-Unique: ZdmVAL7AOzq-QatvRaLABQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=r9ILmJK0e3VTCSwZAPhciwTAOC8i6ZPvXWtJk0nkob8=; b=Hzc/WO/3YbQTIHWmnWcgA9x8kPNq7cyM122uSvQFxo7ayhvIQzQlqhP5CSqIEdw/fy feWZowjvA06Xl6u3x9sTuZU6LWrmulEWDEisp/0esdKBRFftklDTw1crgLv1AU6x9vca FJc+IDfkjFMWcZ/NMQmhKc8W744hx2uOc00YzmRF5ni/ST+QXMt4xcxLqStYRLzdVB7B 23K27AvgxctpYsjaAQd16WOiasU6VegzN8xA6qfJxSmrDCZHkbvPRDBRG70euiF3lJSA FRGER+JAD9q5ITQxBy0alWoO8adAUvKdLbb06KCvtzjfaX8HBQ4B73Mfz1USAPAA/sr5 DhOw== X-Gm-Message-State: AOAM5338iQrB9HbQcfZaRU/kpIIwlk9aMewAVG6Eo6I7f6Y6SyBMBw39 DgAzB1r1HKMA2JUYiH41NvWD+k+LBQ== X-Google-Smtp-Source: ABdhPJxFzHHFyzIvDevUxa6IIclXa24SeyU5K9CDHwadNrIruqkzkVZri8gP5t/cFrHWudPALBdxRA== X-Received: by 2002:a05:620a:1139:: with SMTP id p25mr7497630qkk.9.1611364293403; Fri, 22 Jan 2021 17:11:33 -0800 (PST) From: Masayoshi Mizuma To: libvir-list@redhat.com Subject: [RFC PATCH 7/7] qemu: Add virtio disks as sharable transient disks Date: Fri, 22 Jan 2021 20:11:06 -0500 Message-Id: <20210123011106.11126-8-msys.mizuma@gmail.com> In-Reply-To: <20210123011106.11126-1-msys.mizuma@gmail.com> References: <20210123011106.11126-1-msys.mizuma@gmail.com> 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.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Masayoshi Mizuma , Masayoshi Mizuma 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.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Masayoshi Mizuma Add virtio disks to be sharable transient disks. Signed-off-by: Masayoshi Mizuma --- src/qemu/qemu_hotplug.c | 13 ++++++++----- src/qemu/qemu_process.c | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 5d0445538d..fc6ca028e3 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -814,7 +814,9 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, static int qemuDomainAttachVirtioDiskDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, - virDomainDiskDefPtr disk) + virDomainDiskDefPtr disk, + int bootindex, + qemuDomainAsyncJob asyncJob) { virDomainDeviceDef dev =3D { VIR_DOMAIN_DEVICE_DISK, { .disk =3D disk = } }; bool releaseaddr =3D false; @@ -823,8 +825,8 @@ qemuDomainAttachVirtioDiskDevice(virQEMUDriverPtr drive= r, if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev, disk->dst) <= 0) return -1; =20 - if ((rv =3D qemuDomainAttachDiskGeneric(driver, vm, disk, 0, - QEMU_ASYNC_JOB_NONE)) < 0) { + if ((rv =3D qemuDomainAttachDiskGeneric(driver, vm, disk, bootindex, + asyncJob)) < 0) { if (rv =3D=3D -1 && releaseaddr) qemuDomainReleaseDeviceAddress(vm, &disk->info); =20 @@ -1033,7 +1035,7 @@ static int qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainDeviceDefPtr dev, - qemuDomainAsyncJob asyncJob G_GNUC_= UNUSED) + qemuDomainAsyncJob asyncJob) { size_t i; virDomainDiskDefPtr disk =3D dev->data.disk; @@ -1080,7 +1082,8 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriverP= tr driver, break; =20 case VIR_DOMAIN_DISK_BUS_VIRTIO: - ret =3D qemuDomainAttachVirtioDiskDevice(driver, vm, disk); + ret =3D qemuDomainAttachVirtioDiskDevice(driver, vm, disk, + disk->info.bootIndex, async= Job); break; =20 case VIR_DOMAIN_DISK_BUS_SCSI: diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2e2d1c6fea..55577632c5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6907,7 +6907,7 @@ qemuCheckTransientDiskSharable(virDomainObjPtr vm) for (i =3D 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk =3D vm->def->disks[i]; =20 - if (disk->transient && disk->bus !=3D VIR_DOMAIN_DISK_BUS_LAST) + if (disk->transient && disk->bus !=3D VIR_DOMAIN_DISK_BUS_VIRTIO) return; } =20 --=20 2.27.0