From nobody Thu May 15 21:41:27 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; dkim=fail; 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 1508873778252899.8027518972577; Tue, 24 Oct 2017 12:36:18 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AE60C7EAA1; Tue, 24 Oct 2017 19:36:16 +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 8C7545C462; Tue, 24 Oct 2017 19:36:16 +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 DD1F81805966; Tue, 24 Oct 2017 19:36:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v9OJZlgq009750 for ; Tue, 24 Oct 2017 15:35:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id ECE3A60F9D; Tue, 24 Oct 2017 19:35:47 +0000 (UTC) Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E5BDD60F8B for ; Tue, 24 Oct 2017 19:35:47 +0000 (UTC) Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B523FC04AC59 for ; Tue, 24 Oct 2017 19:35:46 +0000 (UTC) Received: by mail-qt0-f195.google.com with SMTP id 1so31962026qtn.3 for ; Tue, 24 Oct 2017 12:35:46 -0700 (PDT) Received: from dawid-fedora.datto.lan ([47.19.105.250]) by smtp.gmail.com with ESMTPSA id f66sm683127qkc.25.2017.10.24.12.35.45 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Oct 2017 12:35:45 -0700 (PDT) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com AE60C7EAA1 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=fail (p=none dis=none) header.from=datto.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com AE60C7EAA1 Authentication-Results: mx1.redhat.com; dkim=fail reason="signature verification failed" (2048-bit key) header.d=datto-com.20150623.gappssmtp.com header.i=@datto-com.20150623.gappssmtp.com header.b="yX+2Luog" DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B523FC04AC59 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=pass (p=none dis=none) header.from=datto.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=dzamirski@datto.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com B523FC04AC59 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=datto-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=9TMat4WLyJnwWFA4v3iXtH8gjouUufkdwyWf1zdZGb0=; b=yX+2LuoguEr/bpnbWXIYg+iOeYhdEf6hvc/hYEJgvTDXnL9fNf6q/oSxIQh1g7nO2f mSrraxiUIJqlAUEJpBZctleR/L4w3yF0LzhWGXuWz2XojHeu8n1aDxRGH92zSkDFGV+l CwFA65hEhyUUr1fyipY3VMh9/5bJyuyl6LyWRHbxA4UEdeJ60CdaeHI31wJODtBSOQX4 WwDr2xnBI5Dqfm6uXUy7ba7LbvlR9vkjP1VGBE9NSsdWE0i9zqLGU4B7Cr/Tf46Oy/NG gN6G3xoothBkhJrxRjp2xDcZdARl4Hc3lisBCPDRhiIYvecN9Gtf7JTyK4e8NaEDsdQL moDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=9TMat4WLyJnwWFA4v3iXtH8gjouUufkdwyWf1zdZGb0=; b=rWYxddnE3BveVxSckosxnnH+HgrBPoSuiNOxvtgrSbtdNnbKpbWugh9HvmdUb5YrXO m3vjpNyqSbOrMMmGdmjfx32iwuAUZLKwMHdkQ3oCUH3Mk1YGDE3DF3o0W+dRxle7i93k BGVCt55tloUGaWiS+jFqnER8TnkpmIn+aPjCbD2XF3QQ9IjkXwmDJoISwAMrWWlYMqXo a8yaxXnbxRMFnkSkkMxhlMzI1LqpWnfnUDGC6oKu/1h2c6OnbmZVxFj0P5eNOzUKQ6ff oOQieIKqWJ+xumObjfoBbp601jkpksCBIXjUy+VWtnxLNh3XBTOZGG2oCAB+iNKantb0 pfGQ== X-Gm-Message-State: AMCzsaU/NjwKWgUz1EqSMXdnkS0h8+4PSPXHMEvzT1JYtlfjq2doSmAI CTCW2aMI+kEhh2zxNtvh/BkXLItH5no= X-Google-Smtp-Source: ABhQp+QNfA9B8slIINFtzvlSZr62ZWWATP7F2ZGjnShYJyCEgiDp3ELn0j/QZBSxyWq9Cl1CtVr5gg== X-Received: by 10.200.38.225 with SMTP id 30mr28378602qtp.334.1508873745615; Tue, 24 Oct 2017 12:35:45 -0700 (PDT) From: Dawid Zamirski To: libvir-list@redhat.com Date: Tue, 24 Oct 2017 15:35:36 -0400 Message-Id: <20171024193538.9078-14-dzamirski@datto.com> In-Reply-To: <20171024193538.9078-1-dzamirski@datto.com> References: <20171024193538.9078-1-dzamirski@datto.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 24 Oct 2017 19:35:47 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 24 Oct 2017 19:35:47 +0000 (UTC) for IP:'209.85.216.195' DOMAIN:'mail-qt0-f195.google.com' HELO:'mail-qt0-f195.google.com' FROM:'dzamirski@datto.com' RCPT:'' X-RedHat-Spam-Score: 0.469 (DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, SPF_PASS) 209.85.216.195 mail-qt0-f195.google.com 209.85.216.195 mail-qt0-f195.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.31 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 13/15] vbox: Cleanup vboxDumpDisks implementation 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 24 Oct 2017 19:36:17 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Primer the code for further changes: * move variable declarations to the top of the function * group together free/release statements * error check and report VBOX API calls used Reviewed-by: John Ferlan --- src/vbox/vbox_common.c | 188 +++++++++++++++++++++++++++++++--------------= ---- 1 file changed, 120 insertions(+), 68 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 9dc36a1b2..ee6421aae 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3202,6 +3202,16 @@ static int vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine) { vboxArray mediumAttachments =3D VBOX_ARRAY_INITIALIZER; + IMediumAttachment *mediumAttachment =3D NULL; + IMedium *medium =3D NULL; + IStorageController *controller =3D NULL; + PRUnichar *controllerName =3D NULL, *mediumLocUtf16 =3D NULL; + PRUint32 deviceType, storageBus; + PRInt32 devicePort, deviceSlot; + PRBool readOnly; + nsresult rc; + virDomainDiskDefPtr disk =3D NULL; + char *mediumLocUtf8 =3D NULL; size_t sdCount =3D 0, i; int diskCount =3D 0; int ret =3D -1; @@ -3212,15 +3222,14 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr da= ta, IMachine *machine) =20 /* get the number of attachments */ for (i =3D 0; i < mediumAttachments.count; i++) { - IMediumAttachment *imediumattach =3D mediumAttachments.items[i]; - if (imediumattach) { - IMedium *medium =3D NULL; + mediumAttachment =3D mediumAttachments.items[i]; + if (!mediumAttachment) + continue; =20 - gVBoxAPI.UIMediumAttachment.GetMedium(imediumattach, &medium); - if (medium) { - def->ndisks++; - VBOX_RELEASE(medium); - } + gVBoxAPI.UIMediumAttachment.GetMedium(mediumAttachment, &medium); + if (medium) { + def->ndisks++; + VBOX_RELEASE(medium); } } =20 @@ -3229,7 +3238,7 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr data= , IMachine *machine) goto cleanup; =20 for (i =3D 0; i < def->ndisks; i++) { - virDomainDiskDefPtr disk =3D virDomainDiskDefNew(NULL); + disk =3D virDomainDiskDefNew(NULL); if (!disk) goto cleanup; =20 @@ -3238,104 +3247,141 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr = data, IMachine *machine) =20 /* get the attachment details here */ for (i =3D 0; i < mediumAttachments.count && diskCount < def->ndisks; = i++) { - IMediumAttachment *imediumattach =3D mediumAttachments.items[i]; - IStorageController *storageController =3D NULL; - PRUnichar *storageControllerName =3D NULL; - PRUint32 deviceType =3D DeviceType_Null; - PRUint32 storageBus =3D StorageBus_Null; - PRBool readOnly =3D PR_FALSE; - IMedium *medium =3D NULL; - PRUnichar *mediumLocUtf16 =3D NULL; - char *mediumLocUtf8 =3D NULL; - PRInt32 devicePort =3D 0; - PRInt32 deviceSlot =3D 0; - - if (!imediumattach) + mediumAttachment =3D mediumAttachments.items[i]; + controller =3D NULL; + controllerName =3D NULL; + deviceType =3D DeviceType_Null; + storageBus =3D StorageBus_Null; + readOnly =3D PR_FALSE; + medium =3D NULL; + mediumLocUtf16 =3D NULL; + mediumLocUtf8 =3D NULL; + devicePort =3D 0; + deviceSlot =3D 0; + disk =3D def->disks[diskCount]; + + if (!mediumAttachment) continue; =20 - gVBoxAPI.UIMediumAttachment.GetMedium(imediumattach, &medium); + rc =3D gVBoxAPI.UIMediumAttachment.GetMedium(mediumAttachment, &me= dium); + if (NS_FAILED(rc)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not get IMedium, rc=3D%08x"), rc); + goto cleanup; + } + if (!medium) continue; =20 - gVBoxAPI.UIMediumAttachment.GetController(imediumattach, &storageC= ontrollerName); - if (!storageControllerName) { - VBOX_RELEASE(medium); - continue; + rc =3D gVBoxAPI.UIMediumAttachment.GetController(mediumAttachment, + &controllerName); + if (NS_FAILED(rc)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to get storage controller name, rc=3D= %08x"), + rc); + goto cleanup; } =20 - gVBoxAPI.UIMachine.GetStorageControllerByName(machine, - storageControllerNam= e, - &storageController); - VBOX_UTF16_FREE(storageControllerName); - if (!storageController) { - VBOX_RELEASE(medium); - continue; + rc =3D gVBoxAPI.UIMachine.GetStorageControllerByName(machine, + controllerName, + &controller); + if (NS_FAILED(rc)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not get storage controller by name, rc= =3D%08x"), + rc); + goto cleanup; + } + + rc =3D gVBoxAPI.UIMedium.GetLocation(medium, &mediumLocUtf16); + if (NS_FAILED(rc)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not get medium storage location, rc=3D= %08x"), + rc); + goto cleanup; } =20 - gVBoxAPI.UIMedium.GetLocation(medium, &mediumLocUtf16); VBOX_UTF16_TO_UTF8(mediumLocUtf16, &mediumLocUtf8); - VBOX_UTF16_FREE(mediumLocUtf16); - ignore_value(virDomainDiskSetSource(def->disks[diskCount], - mediumLocUtf8)); - VBOX_UTF8_FREE(mediumLocUtf8); =20 - if (!virDomainDiskGetSource(def->disks[diskCount])) { - VBOX_RELEASE(medium); - VBOX_RELEASE(storageController); + if (virDomainDiskSetSource(disk, mediumLocUtf8) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not set disk source")); + goto cleanup; + } =20 + rc =3D gVBoxAPI.UIMediumAttachment.GetType(mediumAttachment, &devi= ceType); + if (NS_FAILED(rc)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not get device type, rc=3D%08x"), rc); + goto cleanup; + } + rc =3D gVBoxAPI.UIMediumAttachment.GetPort(mediumAttachment, &devi= cePort); + if (NS_FAILED(rc)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not get device port, rc=3D%08x"), rc); + goto cleanup; + } + rc =3D gVBoxAPI.UIMediumAttachment.GetDevice(mediumAttachment, &de= viceSlot); + if (NS_FAILED(rc)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not get device slot, rc=3D%08x"), rc); + goto cleanup; + } + rc =3D gVBoxAPI.UIStorageController.GetBus(controller, &storageBus= ); + if (NS_FAILED(rc)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not get storage controller bus, rc=3D%= 08x"), + rc); + goto cleanup; + } + rc =3D gVBoxAPI.UIMedium.GetReadOnly(medium, &readOnly); + if (NS_FAILED(rc)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not get read only state, rc=3D%08x"), = rc); goto cleanup; } =20 - gVBoxAPI.UIStorageController.GetBus(storageController, &storageBus= ); - gVBoxAPI.UIMediumAttachment.GetPort(imediumattach, &devicePort); - gVBoxAPI.UIMediumAttachment.GetDevice(imediumattach, &deviceSlot); + disk->dst =3D vboxGenerateMediumName(storageBus, devicePort, devic= eSlot, + sdCount); =20 - def->disks[diskCount]->dst =3D vboxGenerateMediumName(storageBus, - devicePort, - deviceSlot, - sdCount); - if (!def->disks[diskCount]->dst) { + if (!disk->dst) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not generate medium name for the disk " "at: port:%d, slot:%d"), devicePort, deviceSl= ot); - VBOX_RELEASE(medium); - VBOX_RELEASE(storageController); - goto cleanup; } =20 if (storageBus =3D=3D StorageBus_IDE) { - def->disks[diskCount]->bus =3D VIR_DOMAIN_DISK_BUS_IDE; + disk->bus =3D VIR_DOMAIN_DISK_BUS_IDE; } else if (storageBus =3D=3D StorageBus_SATA) { sdCount++; - def->disks[diskCount]->bus =3D VIR_DOMAIN_DISK_BUS_SATA; + disk->bus =3D VIR_DOMAIN_DISK_BUS_SATA; } else if (storageBus =3D=3D StorageBus_SCSI || storageBus =3D=3D StorageBus_SAS) { sdCount++; - def->disks[diskCount]->bus =3D VIR_DOMAIN_DISK_BUS_SCSI; + disk->bus =3D VIR_DOMAIN_DISK_BUS_SCSI; } else if (storageBus =3D=3D StorageBus_Floppy) { - def->disks[diskCount]->bus =3D VIR_DOMAIN_DISK_BUS_FDC; + disk->bus =3D VIR_DOMAIN_DISK_BUS_FDC; } =20 - gVBoxAPI.UIMediumAttachment.GetType(imediumattach, &deviceType); if (deviceType =3D=3D DeviceType_HardDisk) - def->disks[diskCount]->device =3D VIR_DOMAIN_DISK_DEVICE_DISK; + disk->device =3D VIR_DOMAIN_DISK_DEVICE_DISK; else if (deviceType =3D=3D DeviceType_Floppy) - def->disks[diskCount]->device =3D VIR_DOMAIN_DISK_DEVICE_FLOPP= Y; + disk->device =3D VIR_DOMAIN_DISK_DEVICE_FLOPPY; else if (deviceType =3D=3D DeviceType_DVD) - def->disks[diskCount]->device =3D VIR_DOMAIN_DISK_DEVICE_CDROM; + disk->device =3D VIR_DOMAIN_DISK_DEVICE_CDROM; =20 - - gVBoxAPI.UIMedium.GetReadOnly(medium, &readOnly); if (readOnly =3D=3D PR_TRUE) - def->disks[diskCount]->src->readonly =3D true; + disk->src->readonly =3D true; =20 - virDomainDiskSetType(def->disks[diskCount], - VIR_STORAGE_TYPE_FILE); + virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE); =20 - VBOX_RELEASE(medium); - VBOX_RELEASE(storageController); diskCount++; + + VBOX_UTF16_FREE(controllerName); + VBOX_UTF8_FREE(mediumLocUtf8); + VBOX_UTF16_FREE(mediumLocUtf16); + VBOX_RELEASE(medium); + VBOX_RELEASE(controller); } =20 ret =3D 0; @@ -3345,6 +3391,12 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr dat= a, IMachine *machine) =20 /* cleanup on error */ if (ret < 0) { + VBOX_UTF16_FREE(controllerName); + VBOX_UTF8_FREE(mediumLocUtf8); + VBOX_UTF16_FREE(mediumLocUtf16); + VBOX_RELEASE(medium); + VBOX_RELEASE(controller); + for (i =3D 0; i < def->ndisks; i++) VIR_FREE(def->disks[i]); VIR_FREE(def->disks); --=20 2.14.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list