From nobody Wed May 14 20:34:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526642984347695.7200423125636; Fri, 18 May 2018 04:29:44 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 363B73110E85; Fri, 18 May 2018 11:29:42 +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 AFF656596B; Fri, 18 May 2018 11:29: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 44AB34BB78; Fri, 18 May 2018 11:29:41 +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 w4IBTLQK016059 for ; Fri, 18 May 2018 07:29:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 81C772026E03; Fri, 18 May 2018 11:29:21 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 271C92026DFD for ; Fri, 18 May 2018 11:29:21 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 18 May 2018 13:28:58 +0200 Message-Id: <8959b7b230b5bcdf734cc77f16ce3e7cd7bedfe8.1526642823.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 08/15] qemu: block: Add helpers for hot-adding virStorageSource via blockdev 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 18 May 2018 11:29:43 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" These helpers add infrastructure which simplifies adding and rolling back virStorageSources to a running qemu instance. Using of the helper structure and separate functions allows for a much cleaner code in the section dealing with the monitor. Signed-off-by: Peter Krempa --- src/qemu/qemu_block.c | 155 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ src/qemu/qemu_block.h | 34 +++++++++++ 2 files changed, 189 insertions(+) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index a514e8a055..09437cdb40 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -1467,3 +1467,158 @@ qemuBlockStorageSourceGetBlockdevProps(virStorageSo= urcePtr src) virJSONValueFree(props); return ret; } + + +void +qemuBlockStorageSourceAttachDataFree(qemuBlockStorageSourceAttachDataPtr d= ata) +{ + if (!data) + return; + + virJSONValueFree(data->storageProps); + virJSONValueFree(data->formatProps); + VIR_FREE(data); +} + + +/** + * qemuBlockStorageSourceAttachPrepareBlockdev: + * @src: storage source to prepare data from + * + * Creates a qemuBlockStorageSourceAttachData structure containing data to= attach + * @src to a VM using the blockdev-add approach. Note that this function o= nly + * creates the data for the storage source itself, any other related + * authentication/encryption/... objects need to be prepared separately. + * + * The changes are then applied using qemuBlockStorageSourceAttachApply. + * + * Returns the filled data structure on success or NULL on error and a lib= virt + * error is reported + */ +qemuBlockStorageSourceAttachDataPtr +qemuBlockStorageSourceAttachPrepareBlockdev(virStorageSourcePtr src) +{ + qemuBlockStorageSourceAttachDataPtr data; + qemuBlockStorageSourceAttachDataPtr ret =3D NULL; + + if (VIR_ALLOC(data) < 0) + return NULL; + + if (!(data->formatProps =3D qemuBlockStorageSourceGetBlockdevProps(src= )) || + !(data->storageProps =3D qemuBlockStorageSourceGetBackendProps(src= , false))) + goto cleanup; + + data->storageNodeName =3D src->nodestorage; + data->formatNodeName =3D src->nodeformat; + + VIR_STEAL_PTR(ret, data); + + cleanup: + qemuBlockStorageSourceAttachDataFree(data); + return ret; +} + + +/** + * qemuBlockStorageSourceAttachApply: + * @mon: monitor object + * @data: structure holding data of block device to apply + * + * Attaches a virStorageSource definition converted to + * qemuBlockStorageSourceAttachData to a running VM. This function expects= being + * called after the monitor was entered. + * + * Returns 0 on success and -1 on error with a libvirt error reported. If = an + * error occured, changes which were already applied need to be rolled bac= k by + * calling qemuBlockStorageSourceAttachRollback. + */ +int +qemuBlockStorageSourceAttachApply(qemuMonitorPtr mon, + qemuBlockStorageSourceAttachDataPtr data) +{ + int rv; + + if (data->storageProps) { + rv =3D qemuMonitorBlockdevAdd(mon, data->storageProps); + data->storageProps =3D NULL; + + if (rv < 0) + return -1; + + data->storageAttached =3D true; + } + + if (data->formatProps) { + rv =3D qemuMonitorBlockdevAdd(mon, data->formatProps); + data->formatProps =3D NULL; + + if (rv < 0) + return -1; + + data->formatAttached =3D true; + } + + return 0; +} + + +/** + * qemuBlockStorageSourceAttachRollback: + * @mon: monitor object + * @data: structure holding data of block device to roll back + * + * Attempts a best effort rollback of changes which were made to a running= VM by + * qemuBlockStorageSourceAttachApply. Preserves any existing errors. + * + * This function expects being called after the monitor was entered. + */ +void +qemuBlockStorageSourceAttachRollback(qemuMonitorPtr mon, + qemuBlockStorageSourceAttachDataPtr d= ata) +{ + virErrorPtr orig_err; + + virErrorPreserveLast(&orig_err); + + if (data->formatAttached) + ignore_value(qemuMonitorBlockdevDel(mon, data->formatNodeName)); + + if (data->storageAttached) + ignore_value(qemuMonitorBlockdevDel(mon, data->storageNodeName)); + + virErrorRestore(&orig_err); +} + + +/** + * qemuBlockStorageSourceDetachOneBlockdev: + * @driver: qemu driver object + * @vm: domain object + * @asyncJob: currently running async job + * @src: storage source to detach + * + * Detaches one virStorageSource using blockdev-del. Note that this does n= ot + * detach any authentication/encryption objects. This function enters the + * monitor internally. + */ +int +qemuBlockStorageSourceDetachOneBlockdev(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob, + virStorageSourcePtr src) +{ + int ret; + + if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) + return -1; + + ret =3D qemuMonitorBlockdevDel(qemuDomainGetMonitor(vm), src->nodeform= at); + + if (ret =3D=3D 0) + ret =3D qemuMonitorBlockdevDel(qemuDomainGetMonitor(vm), src->node= storage); + + if (qemuDomainObjExitMonitor(driver, vm) < 0) + return -1; + + return ret; +} diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h index f819c6f907..bbaf9ec0f1 100644 --- a/src/qemu/qemu_block.h +++ b/src/qemu/qemu_block.h @@ -67,4 +67,38 @@ qemuBlockStorageSourceGetURI(virStorageSourcePtr src); virJSONValuePtr qemuBlockStorageSourceGetBlockdevProps(virStorageSourcePtr src); + +typedef struct qemuBlockStorageSourceAttachData qemuBlockStorageSourceAtta= chData; +typedef qemuBlockStorageSourceAttachData *qemuBlockStorageSourceAttachData= Ptr; +struct qemuBlockStorageSourceAttachData { + virJSONValuePtr storageProps; + const char *storageNodeName; + bool storageAttached; + + virJSONValuePtr formatProps; + const char *formatNodeName; + bool formatAttached; +}; + + +void +qemuBlockStorageSourceAttachDataFree(qemuBlockStorageSourceAttachDataPtr d= ata); + +qemuBlockStorageSourceAttachDataPtr +qemuBlockStorageSourceAttachPrepareBlockdev(virStorageSourcePtr src); + +int +qemuBlockStorageSourceAttachApply(qemuMonitorPtr mon, + qemuBlockStorageSourceAttachDataPtr data= ); + +void +qemuBlockStorageSourceAttachRollback(qemuMonitorPtr mon, + qemuBlockStorageSourceAttachDataPtr d= ata); + +int +qemuBlockStorageSourceDetachOneBlockdev(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob, + virStorageSourcePtr src); + #endif /* __QEMU_BLOCK_H__ */ --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list