From nobody Tue Feb 10 11:23:43 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; 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 1510080604590336.52273087438937; Tue, 7 Nov 2017 10:50:04 -0800 (PST) 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 0787F624DA; Tue, 7 Nov 2017 18:50:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C000060CA5; Tue, 7 Nov 2017 18:50:02 +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 16E683FADE; Tue, 7 Nov 2017 18:50:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vA7IngAn024892 for ; Tue, 7 Nov 2017 13:49:42 -0500 Received: by smtp.corp.redhat.com (Postfix) id B09B7512F7; Tue, 7 Nov 2017 18:49:42 +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 AC0D860171 for ; Tue, 7 Nov 2017 18:49:42 +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 CC304C04B927 for ; Tue, 7 Nov 2017 18:49:41 +0000 (UTC) Received: by mail-qt0-f195.google.com with SMTP id 8so308135qtv.1 for ; Tue, 07 Nov 2017 10:49:41 -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.40 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Nov 2017 10:49:40 -0800 (PST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0787F624DA Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=fail (p=none dis=none) header.from=datto.com Authentication-Results: ext-mx10.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 0787F624DA 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="vyU3SUmt" DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CC304C04B927 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 CC304C04B927 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=/6+zVlbeox2o4uajh3YggDsG9ja9o7JeLnnOvrFSmII=; b=vyU3SUmt3YhNZowIKue/KCLbDwgH0K1rNQRW/qd88gNTABaqgx3DDgueeuikvX0K0h EawsLWXvR/8HYu8DYLwjwFa4QOyUjtPE8ZJxfEC21qXBm0/8luuZtuYtocaz0tHlB7fo hv7ato63n2Kfcgd26ABAUFZRlpt3enbgXqogATS/tLXUC8m4OAvRt9x1/xy2fxudMCtz JEx9cub9zRBPj35+1jg1dkAk/DPkyoSQfwh48nSqeIclCKS5nsyMFr20RZ/t9gg6N24P 6Mq9RwD16JoIJw2d7NKype89AQaQwmB+clXUPrzlTJWa7/ORHe/1jqULvgwIcY+a2kMF 0WFg== 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=/6+zVlbeox2o4uajh3YggDsG9ja9o7JeLnnOvrFSmII=; b=jbpO9b4Ryt+RuWhsws4FOnWHDazWjTQe/71YpU3X8Ja+bOuJ4OWRhDnsNg82/ehZYJ sSs86e/sERHiAmY4fq4rx6YBRh+nhl1yGfVLTTN/TAur/tg4vmHaPn+zcxaGAIs8OK1x FfbctU3TN8n+F8H23Vv+9jP+RjfeUwIFJX/t/rAw/rcJbh5WYyd1s/6QnpQPy6JPTnzT QO3kHFEw76AdYeydtPhEgR7rMafnvgGc/bagh+eHFayITCFU7vFPdENzzuohHFcjG1tN qB1er6jFSxCYANny/MFVk90m6DXtbt+TrlG27zSYfooNzDXtk5r+S1wTLFaVzzMIZPHr VQYg== X-Gm-Message-State: AJaThX5EcGj2vj+MJnC0udhaW6IDmqyAHZGiODPIsqkh483v8nE2ue0s rcHY9TONinSLvZg+JXC6Hcypsctfgts= X-Google-Smtp-Source: ABhQp+SYxn2dWKLJxxyB9n6yEYAm7noi7h9SWmOHitXmGEzTSGzD3HfDp7/MFQ+MhCMQDQG93iSLyA== X-Received: by 10.237.34.88 with SMTP id o24mr5800911qtc.191.1510080580761; Tue, 07 Nov 2017 10:49:40 -0800 (PST) From: Dawid Zamirski To: libvir-list@redhat.com Date: Tue, 7 Nov 2017 13:49:28 -0500 Message-Id: <20171107184930.12769-12-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:42 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 07 Nov 2017 18:49:42 +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.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 11/13] vbox: Generate disk address element in dumpxml 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.39]); Tue, 07 Nov 2017 18:50:03 +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" This patch adds
element to each device since device names alone won't adequately reflect the storage device layout in the VM. With this patch, the ouput produced by dumpxml will faithfully reproduce the storage layout of the VM if used with define. --- src/vbox/vbox_common.c | 51 ++++++++++++++++++++++++++++++++++++++++++----= ---- 1 file changed, 43 insertions(+), 8 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 661e09a27..8da08240e 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3336,25 +3336,60 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr da= ta, IMachine *machine) goto cleanup; } =20 - if (storageBus =3D=3D StorageBus_IDE) { + disk->info.type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE; + disk->info.addr.drive.bus =3D 0; + disk->info.addr.drive.unit =3D devicePort; + + switch ((enum StorageBus) storageBus) { + case StorageBus_IDE: disk->bus =3D VIR_DOMAIN_DISK_BUS_IDE; - } else if (storageBus =3D=3D StorageBus_SATA) { - sdCount++; + disk->info.addr.drive.bus =3D devicePort; /* primary, secondar= y */ + disk->info.addr.drive.unit =3D deviceSlot; /* master, slave */ + + break; + case StorageBus_SATA: disk->bus =3D VIR_DOMAIN_DISK_BUS_SATA; - } else if (storageBus =3D=3D StorageBus_SCSI) { sdCount++; + + break; + case StorageBus_SCSI: disk->bus =3D VIR_DOMAIN_DISK_BUS_SCSI; - } else if (storageBus =3D=3D StorageBus_Floppy) { + sdCount++; + + break; + case StorageBus_Floppy: disk->bus =3D VIR_DOMAIN_DISK_BUS_FDC; + + break; + case StorageBus_SAS: + case StorageBus_Null: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unsupported null storage bus")); + goto cleanup; } =20 - if (deviceType =3D=3D DeviceType_HardDisk) + switch ((enum DeviceType) deviceType) { + case DeviceType_HardDisk: disk->device =3D VIR_DOMAIN_DISK_DEVICE_DISK; - else if (deviceType =3D=3D DeviceType_Floppy) + + break; + case DeviceType_Floppy: disk->device =3D VIR_DOMAIN_DISK_DEVICE_FLOPPY; - else if (deviceType =3D=3D DeviceType_DVD) + + break; + case DeviceType_DVD: disk->device =3D VIR_DOMAIN_DISK_DEVICE_CDROM; =20 + break; + case DeviceType_Network: + case DeviceType_USB: + case DeviceType_SharedFolder: + case DeviceType_Null: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unsupported vbox device type: %d"), deviceTy= pe); + goto cleanup; + } + if (readOnly =3D=3D PR_TRUE) disk->src->readonly =3D true; =20 --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list