From nobody Thu May 15 13:50:43 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 150841903882612.575920353580727; Thu, 19 Oct 2017 06:17:18 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id B27EF561CB; Thu, 19 Oct 2017 13:17:17 +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 89023D0901; Thu, 19 Oct 2017 13:17:17 +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 33987180BACF; Thu, 19 Oct 2017 13:17:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v9JDGwD0024096 for ; Thu, 19 Oct 2017 09:16:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id B8142CBACD; Thu, 19 Oct 2017 13:16:58 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B5CACBAD0; Thu, 19 Oct 2017 13:16:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B27EF561CB Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 19 Oct 2017 15:16:36 +0200 Message-Id: <5b0dc7fdfd42e0db02030016ad84e10c5cb2b513.1508418883.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 4/6] qemu: hotplug: extract disk hotplug worker code 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 19 Oct 2017 13:17:18 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This horrible piece of spaghetti code is copy-past(ae)d in the SCSI and USB disk hotplug code with minimal changes. Extract it for further reuse. --- src/qemu/qemu_hotplug.c | 50 ++++++++++++++++++++++++++++++++++-----------= ---- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f00d4f546..f251af904 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -345,21 +345,24 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr drive= r, } +/** + * qemuDomainAttachDiskGeneric: + * + * Attaches disk to a VM. This function aggregates common code for all bus= types. + * In cases when the VM crashed while adding the disk, -2 is returned. */ static int -qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, - virQEMUDriverPtr driver, - virDomainObjPtr vm, - virDomainDiskDefPtr disk) +qemuDomainAttachDiskGeneric(virConnectPtr conn, + virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainDiskDefPtr disk) { int ret =3D -1; int rv; qemuDomainObjPrivatePtr priv =3D vm->privateData; - virDomainDeviceDef dev =3D { VIR_DOMAIN_DEVICE_DISK, { .disk =3D disk = } }; virErrorPtr orig_err; char *devstr =3D NULL; char *drivestr =3D NULL; char *drivealias =3D NULL; - bool releaseaddr =3D false; bool driveAdded =3D false; bool secobjAdded =3D false; bool encobjAdded =3D false; @@ -373,9 +376,6 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, if (qemuDomainPrepareDisk(driver, vm, disk, NULL, false) < 0) goto cleanup; - if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev, disk->dst) <= 0) - goto error; - if (qemuAssignDeviceDiskAlias(vm->def, disk, priv->qemuCaps) < 0) goto error; @@ -441,7 +441,7 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, goto exit_monitor; if (qemuDomainObjExitMonitor(driver, vm) < 0) { - releaseaddr =3D false; + ret =3D -2; goto error; } @@ -471,22 +471,42 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, if (encobjAdded) ignore_value(qemuMonitorDelObject(priv->mon, encinfo->s.aes.alias)= ); if (qemuDomainObjExitMonitor(driver, vm) < 0) - releaseaddr =3D false; + ret =3D -2; virErrorRestore(&orig_err); virDomainAuditDisk(vm, NULL, disk->src, "attach", false); error: qemuDomainDelDiskSrcTLSObject(driver, vm, disk->src); - - if (releaseaddr) - qemuDomainReleaseDeviceAddress(vm, &disk->info, disk->dst); - ignore_value(qemuDomainPrepareDisk(driver, vm, disk, NULL, true)); goto cleanup; } +static int +qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, + virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainDiskDefPtr disk) +{ + virDomainDeviceDef dev =3D { VIR_DOMAIN_DEVICE_DISK, { .disk =3D disk = } }; + bool releaseaddr =3D false; + int rv; + + if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev, disk->dst) <= 0) + return -1; + + if ((rv =3D qemuDomainAttachDiskGeneric(conn, driver, vm, disk)) < 0) { + if (rv =3D=3D -1 && releaseaddr) + qemuDomainReleaseDeviceAddress(vm, &disk->info, disk->dst); + + return -1; + } + + return 0; +} + + int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainControllerDefPtr controller) --=20 2.14.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list