From nobody Thu May 15 13:51:49 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 1510080600213929.9535468211271; Tue, 7 Nov 2017 10:50:00 -0800 (PST) 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 CC662C058ECB; Tue, 7 Nov 2017 18:49:58 +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 A80FC5C545; Tue, 7 Nov 2017 18:49:58 +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 6F4181800C87; Tue, 7 Nov 2017 18:49:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vA7IneFR024848 for ; Tue, 7 Nov 2017 13:49:40 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3D5655EDE9; Tue, 7 Nov 2017 18:49:40 +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 375AA5D6A9 for ; Tue, 7 Nov 2017 18:49:37 +0000 (UTC) Received: from mail-qt0-f178.google.com (mail-qt0-f178.google.com [209.85.216.178]) (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 67758C04AC56 for ; Tue, 7 Nov 2017 18:49:36 +0000 (UTC) Received: by mail-qt0-f178.google.com with SMTP id z19so266349qtg.11 for ; Tue, 07 Nov 2017 10:49:36 -0800 (PST) Received: from dawid-fedora.datto.lan ([47.19.105.250]) by smtp.gmail.com with ESMTPSA id t34sm1313175qtb.79.2017.11.07.10.49.34 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Nov 2017 10:49:34 -0800 (PST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CC662C058ECB Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=fail (p=none dis=none) header.from=datto.com Authentication-Results: ext-mx08.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 CC662C058ECB 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="Zod8Mkry" DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 67758C04AC56 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 67758C04AC56 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=gKrjjgcwVdcWScwVxSoUMwvn9ii+bMksgcRmSYTO09Q=; b=Zod8MkryA/EM2PwDndXXl4Hwb7S7m+7dkgGknzyCNoo0x2WHMR7i3FEpN6MXkLuQq3 b3iu10hpix866mvgtDbMqGpgFFRdllHl/3HaSFPnNRGZRIL7g8x6ZKjvrxBR858yNEgP wE7uaVfNKnIGi0lO9VQ9l+XT1NAIYvSB8+hwSFawYqPuFAA0hkd9Etu434RjJcyJvEAD AVoKwxTaczVuCoV/0B3f+IXlsMOB4WgkE1yVDhsQiTOsHfteug4j/2SPMj5+Dc0QdaVK yWr4BFmcTdrmTStYk76RrS1E9QIXZUdrQKZXTCSih/oheBG1dewnZQUyTw39SVCH9YFU hTTw== 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=gKrjjgcwVdcWScwVxSoUMwvn9ii+bMksgcRmSYTO09Q=; b=hDgUVKzSpb8p+3/XTAmqba3sh6jIeAjtQlitJFsMidqNV+BgrpSwWL/H+m2hDxEFuQ 0dwA8AfXddiNuvIXTBlIDQZHkeGdm+kly7ZchjFqPJC9L9wPDZZpTamJATXTCPGR9ndQ eOiY20mHKduTXCwnIOYMts1y00R+ecv4VU+GkghNXWlOeKmFK6qEPwgF0MMMf8NrcUxE 94bB0KrMug3hyELyCy+fXTwVlPvbq55rc3BG35H9QXvneepu6GfLJi3TH3obPyavpGIZ ctAbsQZU+e9W+bNjZdrIsmDhh7pYOXejr8CnhWE2p9aN+rQfyqWkwGd5n6zjbuIGubBY 0hTQ== X-Gm-Message-State: AMCzsaVTKjhMZhftRivmAkKMkUSVigGCo1BFadWdNuFP2KujErMi0Uip SU2YHjBZe57GAbAnhy9TUpkz+lhZP94= X-Google-Smtp-Source: ABhQp+Qs0i1W1Jzd0kRGC+kc2BW+BdgAIh2fKA4S0P1VRsWuCuwE9qHj09Os4aXM8pB21VT0mMo71Q== X-Received: by 10.200.23.196 with SMTP id r4mr29932301qtk.158.1510080575394; Tue, 07 Nov 2017 10:49:35 -0800 (PST) From: Dawid Zamirski To: libvir-list@redhat.com Date: Tue, 7 Nov 2017 13:49:20 -0500 Message-Id: <20171107184930.12769-4-dzamirski@datto.com> In-Reply-To: <20171107184930.12769-1-dzamirski@datto.com> References: <20171107184930.12769-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, 07 Nov 2017 18:49:36 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 07 Nov 2017 18:49:36 +0000 (UTC) for IP:'209.85.216.178' DOMAIN:'mail-qt0-f178.google.com' HELO:'mail-qt0-f178.google.com' FROM:'dzamirski@datto.com' RCPT:'' X-RedHat-Spam-Score: -0.221 (DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, SPF_PASS) 209.85.216.178 mail-qt0-f178.google.com 209.85.216.178 mail-qt0-f178.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.31 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 03/13] 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 07 Nov 2017 18:49:59 +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" --- src/vbox/vbox_common.c | 109 +++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 109 insertions(+) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 49df52c12..4d596075c 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3147,6 +3147,113 @@ 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: + 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); + + return ret; +} + + static void vboxDumpIDEHDDs(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine) { @@ -3994,6 +4101,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.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list