From nobody Mon Feb 9 04:46:11 2026 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 1526642978099905.2704494471565; Fri, 18 May 2018 04:29:38 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8664E30E070A; Fri, 18 May 2018 11:29:36 +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 5089930BA8E6; Fri, 18 May 2018 11:29:36 +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 E424F180BACF; Fri, 18 May 2018 11:29:35 +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 w4IBTNAM016081 for ; Fri, 18 May 2018 07:29:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6697B2026980; Fri, 18 May 2018 11:29:23 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 099552026DFD for ; Fri, 18 May 2018 11:29:22 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 18 May 2018 13:29:01 +0200 Message-Id: <6a1bc5207cabf84b41f02f44cab30ccbd9cf0227.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 11/15] qemu: domain: Add private data for NBD migration storage source definition 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.84 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Fri, 18 May 2018 11:29:37 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Allow saving various aspects necessary to do NBD migration via blockdev by storing a 'virStorageSource' in the disk private data meant to store the NBD target of migration. Along with this add code to parse and format it into the status XML. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 162 +++++++++++++++++++++++++++++++++++++++++++++= +--- src/qemu/qemu_domain.h | 1 + 2 files changed, 156 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 94a9c5d1bc..632c025bef 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1015,6 +1015,7 @@ qemuDomainDiskPrivateDispose(void *obj) qemuDomainDiskPrivatePtr priv =3D obj; VIR_FREE(priv->blockJobError); + virStorageSourceFree(priv->migrSource); } static virClassPtr qemuDomainStorageSourcePrivateClass; @@ -2067,20 +2068,82 @@ qemuDomainObjPrivateXMLFormatPR(virBufferPtr buf, } -static void +static int +qemuDomainObjPrivateXMLFormatNBDMigrationSource(virBufferPtr buf, + virStorageSourcePtr src) +{ + virBuffer attrBuf =3D VIR_BUFFER_INITIALIZER; + virBuffer childBuf =3D VIR_BUFFER_INITIALIZER; + virBuffer privateDataBuf =3D VIR_BUFFER_INITIALIZER; + int ret =3D -1; + + virBufferSetChildIndent(&childBuf, buf); + virBufferSetChildIndent(&privateDataBuf, &childBuf); + + virBufferAsprintf(&attrBuf, " type=3D'%s' format=3D'%s'", + virStorageTypeToString(src->type), + virStorageFileFormatTypeToString(src->format)); + + if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src, + VIR_DOMAIN_DEF_FORMAT_STATUS, false) = < 0) + goto cleanup; + + if (qemuStorageSourcePrivateDataFormat(src, &privateDataBuf) < 0) + goto cleanup; + + if (virXMLFormatElement(&childBuf, "privateData", NULL, &privateDataBu= f) < 0) + goto cleanup; + + if (virXMLFormatElement(buf, "migrationSource", &attrBuf, &childBuf) <= 0) + goto cleanup; + + ret =3D 0; + + cleanup: + virBufferFreeAndReset(&attrBuf); + virBufferFreeAndReset(&childBuf); + virBufferFreeAndReset(&privateDataBuf); + + return ret; +} + + +static int qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPtr buf, virDomainObjPtr vm) { + virBuffer attrBuf =3D VIR_BUFFER_INITIALIZER; + virBuffer childBuf =3D VIR_BUFFER_INITIALIZER; size_t i; virDomainDiskDefPtr disk; qemuDomainDiskPrivatePtr diskPriv; + int ret =3D -1; for (i =3D 0; i < vm->def->ndisks; i++) { disk =3D vm->def->disks[i]; diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); - virBufferAsprintf(buf, "\n", + + virBufferSetChildIndent(&childBuf, buf); + + virBufferAsprintf(&attrBuf, " dev=3D'%s' migrating=3D'%s'", disk->dst, diskPriv->migrating ? "yes" : "no"); + + if (diskPriv->migrSource && + qemuDomainObjPrivateXMLFormatNBDMigrationSource(&childBuf, + diskPriv->migr= Source) < 0) + goto cleanup; + + if (virXMLFormatElement(buf, "disk", &attrBuf, &childBuf) < 0) + goto cleanup; } + + ret =3D 0; + + cleanup: + virBufferFreeAndReset(&attrBuf); + virBufferFreeAndReset(&childBuf); + + return ret; } @@ -2092,6 +2155,7 @@ qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, virBuffer attrBuf =3D VIR_BUFFER_INITIALIZER; virBuffer childBuf =3D VIR_BUFFER_INITIALIZER; qemuDomainJob job =3D priv->job.active; + int ret =3D -1; if (!qemuDomainTrackJob(job)) job =3D QEMU_JOB_NONE; @@ -2115,13 +2179,23 @@ qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, if (priv->job.asyncJob !=3D QEMU_ASYNC_JOB_NONE) virBufferAsprintf(&attrBuf, " flags=3D'0x%lx'", priv->job.apiFlags= ); - if (priv->job.asyncJob =3D=3D QEMU_ASYNC_JOB_MIGRATION_OUT) - qemuDomainObjPrivateXMLFormatNBDMigration(&childBuf, vm); + if (priv->job.asyncJob =3D=3D QEMU_ASYNC_JOB_MIGRATION_OUT && + qemuDomainObjPrivateXMLFormatNBDMigration(&childBuf, vm) < 0) + goto cleanup; if (priv->job.migParams) qemuMigrationParamsFormat(&childBuf, priv->job.migParams); - return virXMLFormatElement(buf, "job", &attrBuf, &childBuf); + if (virXMLFormatElement(buf, "job", &attrBuf, &childBuf) < 0) + goto cleanup; + + ret =3D 0; + + cleanup: + virBufferFreeAndReset(&attrBuf); + virBufferFreeAndReset(&childBuf); + + return ret; } @@ -2367,12 +2441,79 @@ qemuDomainObjPrivateXMLParsePR(xmlXPathContextPtr c= txt, } +static int +qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr node, + xmlXPathContextPtr ctxt, + virDomainDiskDefPtr disk) +{ + xmlNodePtr savedNode =3D ctxt->node; + qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); + virStorageSourcePtr migrSource =3D NULL; + char *format =3D NULL; + char *type =3D NULL; + int ret =3D -1; + + ctxt->node =3D node; + + if (!(ctxt->node =3D virXPathNode("./migrationSource", ctxt))) { + ret =3D 0; + goto cleanup; + } + + if (VIR_ALLOC(migrSource) < 0) + goto cleanup; + + if (!(type =3D virXMLPropString(ctxt->node, "type"))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing storage source type")); + goto cleanup; + } + + if (!(format =3D virXMLPropString(ctxt->node, "format"))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + ("missing storage source format")); + goto cleanup; + } + + if ((migrSource->type =3D virStorageTypeFromString(type)) <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown storage source type '%s'"), type); + goto cleanup; + } + + if ((migrSource->format =3D virStorageFileFormatTypeFromString(format)= ) <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown storage source format '%s'"), format); + goto cleanup; + } + + if (virDomainStorageSourceParse(ctxt->node, ctxt, migrSource, + VIR_DOMAIN_DEF_PARSE_STATUS) < 0) + goto cleanup; + + if ((ctxt->node =3D virXPathNode("./privateData", ctxt)) && + qemuStorageSourcePrivateDataParse(ctxt, migrSource) < 0) + goto cleanup; + + VIR_STEAL_PTR(diskPriv->migrSource, migrSource); + ret =3D 0; + + cleanup: + virStorageSourceFree(migrSource); + VIR_FREE(format); + VIR_FREE(type); + ctxt->node =3D savedNode; + return ret; +} + + static int qemuDomainObjPrivateXMLParseJobNBD(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv, xmlXPathContextPtr ctxt) { xmlNodePtr *nodes =3D NULL; + char *dst =3D NULL; size_t i; int n; int ret =3D -1; @@ -2387,11 +2528,17 @@ qemuDomainObjPrivateXMLParseJobNBD(virDomainObjPtr = vm, n =3D 0; } for (i =3D 0; i < n; i++) { - char *dst =3D virXMLPropString(nodes[i], "dev"); virDomainDiskDefPtr disk; - if (dst && (disk =3D virDomainDiskByName(vm->def, dst, false))) + if ((dst =3D virXMLPropString(nodes[i], "dev")) && + (disk =3D virDomainDiskByName(vm->def, dst, false))) { QEMU_DOMAIN_DISK_PRIVATE(disk)->migrating =3D true; + + if (qemuDomainObjPrivateXMLParseJobNBDSource(nodes[i], ctx= t, + disk) < 0) + goto cleanup; + } + VIR_FREE(dst); } } @@ -2401,6 +2548,7 @@ qemuDomainObjPrivateXMLParseJobNBD(virDomainObjPtr vm, cleanup: VIR_FREE(nodes); + VIR_FREE(dst); return ret; } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 40d1d095a3..000d8fb8d7 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -370,6 +370,7 @@ struct _qemuDomainDiskPrivate { bool blockJobSync; /* the block job needs synchronized termination */ bool migrating; /* the disk is being migrated */ + virStorageSourcePtr migrSource; /* disk source object used for NBD mig= ration */ /* information about the device */ bool tray; /* device has tray */ --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list