Re: [libvirt] [PATCH v2 14/15] vbox: Process empty removable disks in dumpxml

2017-11-03 Thread John Ferlan 


On 10/24/2017 03:35 PM, Dawid Zamirski wrote:
> Previously any removable storage device without media attached was
> omitted from domain XML dump. They're still (rightfully) omitted in
> snapshot XMl dump but need to be accounted properly to for the device

XML

> names to stay in 'sync' between domain and snapshot XML dumps.
> ---
>  src/vbox/vbox_common.c | 128 
> -
>  1 file changed, 74 insertions(+), 54 deletions(-)
> 
> diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
> index ee6421aae..d1d8804c7 100644
> --- a/src/vbox/vbox_common.c
> +++ b/src/vbox/vbox_common.c
> @@ -3213,7 +3213,6 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr data, 
> IMachine *machine)
>  virDomainDiskDefPtr disk = NULL;
>  char *mediumLocUtf8 = NULL;
>  size_t sdCount = 0, i;
> -int diskCount = 0;
>  int ret = -1;
>  
>  def->ndisks = 0;
> @@ -3226,11 +3225,15 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr 
> data, IMachine *machine)
>  if (!mediumAttachment)
>  continue;
>  
> -gVBoxAPI.UIMediumAttachment.GetMedium(mediumAttachment, );
> -if (medium) {
> -def->ndisks++;
> -VBOX_RELEASE(medium);
> +rc = gVBoxAPI.UIMediumAttachment.GetMedium(mediumAttachment, 
> );
> +if (NS_FAILED(rc)) {
> +virReportError(VIR_ERR_INTERNAL_ERROR,
> +   _("Could not get IMedium, rc=%08x"), rc);
> +goto cleanup;
>  }
> +
> +def->ndisks++;
> +VBOX_RELEASE(medium);
>  }
>  
>  /* Allocate mem, if fails return error */
> @@ -3246,7 +3249,7 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr data, 
> IMachine *machine)
>  }
>  
>  /* get the attachment details here */
> -for (i = 0; i < mediumAttachments.count && diskCount < def->ndisks; i++) 
> {
> +for (i = 0; i < mediumAttachments.count; i++) {
>  mediumAttachment = mediumAttachments.items[i];
>  controller = NULL;
>  controllerName = NULL;
> @@ -3258,7 +3261,7 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr data, 
> IMachine *machine)
>  mediumLocUtf8 = NULL;
>  devicePort = 0;
>  deviceSlot = 0;
> -disk = def->disks[diskCount];
> +disk = def->disks[i];
>  
>  if (!mediumAttachment)
>  continue;
> @@ -3270,9 +3273,6 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr data, 
> IMachine *machine)
>  goto cleanup;
>  }
>  
> -if (!medium)
> -continue;
> -
>  rc = gVBoxAPI.UIMediumAttachment.GetController(mediumAttachment,
>);
>  if (NS_FAILED(rc)) {
> @@ -3292,22 +3292,6 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr data, 
> IMachine *machine)
>  goto cleanup;
>  }
>  
> -rc = gVBoxAPI.UIMedium.GetLocation(medium, );
> -if (NS_FAILED(rc)) {
> -virReportError(VIR_ERR_INTERNAL_ERROR,
> -   _("Could not get medium storage location, 
> rc=%08x"),
> -   rc);
> -goto cleanup;
> -}
> -
> -VBOX_UTF16_TO_UTF8(mediumLocUtf16, );
> -
> -if (virDomainDiskSetSource(disk, mediumLocUtf8) < 0) {
> -virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> -   _("Could not set disk source"));
> -goto cleanup;
> -}
> -
>  rc = gVBoxAPI.UIMediumAttachment.GetType(mediumAttachment, 
> );
>  if (NS_FAILED(rc)) {
>  virReportError(VIR_ERR_INTERNAL_ERROR,
> @@ -,11 +3317,30 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr 
> data, IMachine *machine)
> rc);
>  goto cleanup;
>  }
> -rc = gVBoxAPI.UIMedium.GetReadOnly(medium, );
> -if (NS_FAILED(rc)) {
> -virReportError(VIR_ERR_INTERNAL_ERROR,
> -   _("Could not get read only state, rc=%08x"), rc);
> -goto cleanup;
> +
> +if (medium) {
> +rc = gVBoxAPI.UIMedium.GetLocation(medium, );
> +if (NS_FAILED(rc)) {
> +virReportError(VIR_ERR_INTERNAL_ERROR,
> +   _("Could not get medium storage location, 
> rc=%08x"),
> +   rc);
> +goto cleanup;
> +}
> +
> +VBOX_UTF16_TO_UTF8(mediumLocUtf16, );
> +
> +if (virDomainDiskSetSource(disk, mediumLocUtf8) < 0) {
> +virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +   _("Could not set disk source"));
> +goto cleanup;
> +}
> +
> +rc = gVBoxAPI.UIMedium.GetReadOnly(medium, );
> +if (NS_FAILED(rc)) {
> +virReportError(VIR_ERR_INTERNAL_ERROR,
> +   _("Could not get read only

[libvirt] [PATCH v2 14/15] vbox: Process empty removable disks in dumpxml

2017-10-24 Thread Dawid Zamirski 
Previously any removable storage device without media attached was
omitted from domain XML dump. They're still (rightfully) omitted in
snapshot XMl dump but need to be accounted properly to for the device
names to stay in 'sync' between domain and snapshot XML dumps.
---
 src/vbox/vbox_common.c | 128 -
 1 file changed, 74 insertions(+), 54 deletions(-)

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index ee6421aae..d1d8804c7 100644
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -3213,7 +3213,6 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr data, 
IMachine *machine)
 virDomainDiskDefPtr disk = NULL;
 char *mediumLocUtf8 = NULL;
 size_t sdCount = 0, i;
-int diskCount = 0;
 int ret = -1;
 
 def->ndisks = 0;
@@ -3226,11 +3225,15 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr data, 
IMachine *machine)
 if (!mediumAttachment)
 continue;
 
-gVBoxAPI.UIMediumAttachment.GetMedium(mediumAttachment, );
-if (medium) {
-def->ndisks++;
-VBOX_RELEASE(medium);
+rc = gVBoxAPI.UIMediumAttachment.GetMedium(mediumAttachment, );
+if (NS_FAILED(rc)) {
+virReportError(VIR_ERR_INTERNAL_ERROR,
+   _("Could not get IMedium, rc=%08x"), rc);
+goto cleanup;
 }
+
+def->ndisks++;
+VBOX_RELEASE(medium);
 }
 
 /* Allocate mem, if fails return error */
@@ -3246,7 +3249,7 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr data, 
IMachine *machine)
 }
 
 /* get the attachment details here */
-for (i = 0; i < mediumAttachments.count && diskCount < def->ndisks; i++) {
+for (i = 0; i < mediumAttachments.count; i++) {
 mediumAttachment = mediumAttachments.items[i];
 controller = NULL;
 controllerName = NULL;
@@ -3258,7 +3261,7 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr data, 
IMachine *machine)
 mediumLocUtf8 = NULL;
 devicePort = 0;
 deviceSlot = 0;
-disk = def->disks[diskCount];
+disk = def->disks[i];
 
 if (!mediumAttachment)
 continue;
@@ -3270,9 +3273,6 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr data, 
IMachine *machine)
 goto cleanup;
 }
 
-if (!medium)
-continue;
-
 rc = gVBoxAPI.UIMediumAttachment.GetController(mediumAttachment,
   );
 if (NS_FAILED(rc)) {
@@ -3292,22 +3292,6 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr data, 
IMachine *machine)
 goto cleanup;
 }
 
-rc = gVBoxAPI.UIMedium.GetLocation(medium, );
-if (NS_FAILED(rc)) {
-virReportError(VIR_ERR_INTERNAL_ERROR,
-   _("Could not get medium storage location, rc=%08x"),
-   rc);
-goto cleanup;
-}
-
-VBOX_UTF16_TO_UTF8(mediumLocUtf16, );
-
-if (virDomainDiskSetSource(disk, mediumLocUtf8) < 0) {
-virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-   _("Could not set disk source"));
-goto cleanup;
-}
-
 rc = gVBoxAPI.UIMediumAttachment.GetType(mediumAttachment, 
);
 if (NS_FAILED(rc)) {
 virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -,11 +3317,30 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr data, 
IMachine *machine)
rc);
 goto cleanup;
 }
-rc = gVBoxAPI.UIMedium.GetReadOnly(medium, );
-if (NS_FAILED(rc)) {
-virReportError(VIR_ERR_INTERNAL_ERROR,
-   _("Could not get read only state, rc=%08x"), rc);
-goto cleanup;
+
+if (medium) {
+rc = gVBoxAPI.UIMedium.GetLocation(medium, );
+if (NS_FAILED(rc)) {
+virReportError(VIR_ERR_INTERNAL_ERROR,
+   _("Could not get medium storage location, 
rc=%08x"),
+   rc);
+goto cleanup;
+}
+
+VBOX_UTF16_TO_UTF8(mediumLocUtf16, );
+
+if (virDomainDiskSetSource(disk, mediumLocUtf8) < 0) {
+virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+   _("Could not set disk source"));
+goto cleanup;
+}
+
+rc = gVBoxAPI.UIMedium.GetReadOnly(medium, );
+if (NS_FAILED(rc)) {
+virReportError(VIR_ERR_INTERNAL_ERROR,
+   _("Could not get read only state, rc=%08x"), 
rc);
+goto cleanup;
+}
 }
 
 disk->dst = vboxGenerateMediumName(storageBus, devicePort, deviceSlot,
@@ -3375,8 +3378,6 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr data, 
IMachine *machine)
 
 virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE);
 
-