From nobody Thu May 15 21:39:06 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 1508873773828488.8298741270156; Tue, 24 Oct 2017 12:36:13 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DE873267FA; Tue, 24 Oct 2017 19:36:11 +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 B56BC60246; Tue, 24 Oct 2017 19:36:11 +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 6F4CB1805966; Tue, 24 Oct 2017 19:36:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v9OJZl1K009733 for ; Tue, 24 Oct 2017 15:35:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2C32F173D2; Tue, 24 Oct 2017 19:35:47 +0000 (UTC) Received: from mx1.redhat.com (ext-mx10.extmail.prod.ext.phx2.redhat.com [10.5.110.39]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 275FE5C552 for ; Tue, 24 Oct 2017 19:35:47 +0000 (UTC) Received: from mail-qt0-f171.google.com (mail-qt0-f171.google.com [209.85.216.171]) (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 BC85C5D687 for ; Tue, 24 Oct 2017 19:35:45 +0000 (UTC) Received: by mail-qt0-f171.google.com with SMTP id v41so31891957qtv.12 for ; Tue, 24 Oct 2017 12:35:45 -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.44 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Oct 2017 12:35:44 -0700 (PDT) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DE873267FA Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=fail (p=none dis=none) header.from=datto.com Authentication-Results: ext-mx06.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 DE873267FA 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="JSonsbFp" DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com BC85C5D687 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=pass (p=none dis=none) header.from=datto.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=dzamirski@datto.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com BC85C5D687 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=+bBHEiZxIve7xms39aahFiiO+gtmDpfVS+9wb62pyMI=; b=JSonsbFpq++iN/0x3Jl9sfBdSbq6o499n63jUjUCJ+lM3wtPbGqiPh5TYXpeCV4oRi Tb2Ngga0CC/eTM+0Wh28vX+29wEkaKeMv2WQ2oxHSycGw9msHVYz1vDi6lv5kA9aIFQJ RlLejG4xmmxCj1JmppZ0IfbwOE/jRiL4N9iqJr5zYyfl951ZaFY0sZghr526afk2/cez yuc0Z+elL5emSxXn2cZPuGm4EvsAdH0EQT5WD5cSNx1vywy3Wozau+bkoWxMA1qbmeQX 3KQZt6/SZZUtXphZHln2tUPjCkl+jHTA1NeenzYyk91Klj1SYNeM/eU3h9UR0E6WkJ+P zwbQ== 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=+bBHEiZxIve7xms39aahFiiO+gtmDpfVS+9wb62pyMI=; b=qOfIsElWMyQ9JhcitmaoKKhA7cqCXuAeOXh4yuyTgW13cCzuxWk3QjUDA9ONLDZ7qB PLx9Pr2/Q89dSKOptcj8znxKqsGpiIivxb1H+PZQNN2n8XXGtJYDmavXihKSalwOnrQ9 0jupXrp61dyHBqnraDUam3VF//jKbtB9LLQBOd12vdjfK2xqq1nQ8keTa9s5ziRC/HZY 0hHaWYjwU0HHLZzlUTcbZF5aPeR8MAwDwNb1rA/6SQSe1zxIP0UrRQCtFTuq0VkyyEJW V/q0padAXX5LKIC5Hsj7MnHfcZA1yCti3jMXuyd3RXopnsidsLTjbh1Ece/0bwigWIii cjOg== X-Gm-Message-State: AMCzsaVUQQo1tg4DHL46AY6y1UozacJvTDzjziIjNX6qswTvTgoHoliT Ih0aewrccIfxs5uG8xo/+ZgXiDHBOvU= X-Google-Smtp-Source: ABhQp+RhYuzoXXaKPtXZBm78xQkrTmLIiLNSaxyTvk9bj0Xu1q1JVcOAeijQxjn58r0CmyeGHwArgw== X-Received: by 10.200.28.70 with SMTP id j6mr26478060qtk.78.1508873744683; Tue, 24 Oct 2017 12:35:44 -0700 (PDT) From: Dawid Zamirski To: libvir-list@redhat.com Date: Tue, 24 Oct 2017 15:35:34 -0400 Message-Id: <20171024193538.9078-12-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.39]); Tue, 24 Oct 2017 19:35:46 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 24 Oct 2017 19:35:46 +0000 (UTC) for IP:'209.85.216.171' DOMAIN:'mail-qt0-f171.google.com' HELO:'mail-qt0-f171.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.171 mail-qt0-f171.google.com 209.85.216.171 mail-qt0-f171.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.39 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 11/15] vbox: Add vboxDumpStorageControllers 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 24 Oct 2017 19:36:12 +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" Reviewed-by: John Ferlan --- src/vbox/vbox_common.c | 119 +++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 119 insertions(+) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 9d45e4a76..715eb670e 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3153,6 +3153,123 @@ vboxHostDeviceGetXMLDesc(vboxDriverPtr data, virDom= ainDefPtr def, IMachine *mach goto release_filters; } =20 + +static int +vboxDumpStorageControllers(virDomainDefPtr def, IMachine *machine) +{ + vboxArray storageControllers =3D VBOX_ARRAY_INITIALIZER; + IStorageController *controller =3D NULL; + PRUint32 storageBus =3D StorageBus_Null; + PRUint32 controllerType =3D StorageControllerType_Null; + virDomainControllerDefPtr cont =3D NULL; + size_t i =3D 0; + int model =3D -1, ret =3D -1; + virDomainControllerType type =3D VIR_DOMAIN_CONTROLLER_TYPE_LAST; + + gVBoxAPI.UArray.vboxArrayGet(&storageControllers, machine, + gVBoxAPI.UArray.handleMachineGetStorageControllers(machin= e)); + + for (i =3D 0; i < storageControllers.count; i++) { + controller =3D storageControllers.items[i]; + storageBus =3D StorageBus_Null; + controllerType =3D StorageControllerType_Null; + type =3D VIR_DOMAIN_CONTROLLER_TYPE_LAST; + model =3D -1; + + if (!controller) + continue; + + gVBoxAPI.UIStorageController.GetBus(controller, &storageBus); + gVBoxAPI.UIStorageController.GetControllerType(controller, + &controllerType); + + /* vbox controller model =3D> libvirt controller model */ + switch ((enum StorageControllerType) controllerType) { + case StorageControllerType_PIIX3: + model =3D VIR_DOMAIN_CONTROLLER_MODEL_IDE_PIIX3; + + break; + case StorageControllerType_PIIX4: + model =3D VIR_DOMAIN_CONTROLLER_MODEL_IDE_PIIX4; + + break; + case StorageControllerType_ICH6: + model =3D VIR_DOMAIN_CONTROLLER_MODEL_IDE_ICH6; + + break; + case StorageControllerType_BusLogic: + model =3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_BUSLOGIC; + + break; + case StorageControllerType_LsiLogic: + model =3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC; + + break; + case StorageControllerType_LsiLogicSas: + model =3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1068; + + break; + case StorageControllerType_IntelAhci: + case StorageControllerType_I82078: + case StorageControllerType_Null: + model =3D -1; + + break; + } + + /* vbox controller bus =3D> libvirt controller type */ + switch ((enum StorageBus) storageBus) { + case StorageBus_IDE: + type =3D VIR_DOMAIN_CONTROLLER_TYPE_IDE; + + break; + case StorageBus_SCSI: + case StorageBus_SAS: + type =3D VIR_DOMAIN_CONTROLLER_TYPE_SCSI; + + break; + case StorageBus_SATA: + type =3D VIR_DOMAIN_CONTROLLER_TYPE_SATA; + + break; + case StorageBus_Floppy: + type =3D VIR_DOMAIN_CONTROLLER_TYPE_FDC; + + break; + case StorageBus_Null: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unsupported null storage bus")); + + goto cleanup; + } + + if (type !=3D VIR_DOMAIN_CONTROLLER_TYPE_LAST) { + cont =3D virDomainDefAddController(def, type, -1, model); + if (!cont) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to add %s controller type definit= ion"), + virDomainControllerTypeToString(type)); + goto cleanup; + } + } + } + + ret =3D 0; + + cleanup: + gVBoxAPI.UArray.vboxArrayRelease(&storageControllers); + + if (ret < 0) { + for (i =3D 0; i < def->ncontrollers; i++) + virDomainControllerDefFree(def->controllers[i]); + VIR_FREE(def->controllers); + def->ncontrollers =3D 0; + } + + return ret; +} + + static void vboxDumpIDEHDDs(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine) { @@ -4000,6 +4117,8 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, u= nsigned int flags) goto cleanup; if (vboxDumpDisplay(def, data, machine) < 0) goto cleanup; + if (vboxDumpStorageControllers(def, machine) < 0) + goto cleanup; =20 vboxDumpIDEHDDs(def, data, machine); =20 --=20 2.14.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list