[Libguestfs] [PATCH v2 1/3] v2v: ova: fix generated JSON for libvirt support
We have to be explicit about the drivers in backing file JSON in order
for libvirt to work.
Signed-off-by: Tomáš Golembiovský <tgolembi(a)redhat.com>
---
v2v/input_ova.ml | 1 +
v2v/test-v2v-i-ova-subfolders.expected2 | 2 +-
v2v/test-v2v-i-ova-tar.expected2 | 2 +-
v2v/test-v2v-i-ova-two-disks.expected2 | 4 ++--
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml
index fff1c22cc..5e63b605e 100644
--- a/v2v/input_ova.ml
+++ b/v2v/input_ova.ml
@@ -375,6 +375,7 @@ object
"offset", JSON.Int64 offset;
"size", JSON.Int64 size;
"file", JSON.Dict [
+ "driver", JSON.String "file";
"filename", JSON.String ova]
]
] in
diff --git a/v2v/test-v2v-i-ova-subfolders.expected2
b/v2v/test-v2v-i-ova-subfolders.expected2
index ef2993ed6..5029760c9 100644
--- a/v2v/test-v2v-i-ova-subfolders.expected2
+++ b/v2v/test-v2v-i-ova-subfolders.expected2
@@ -10,7 +10,7 @@ hypervisor type: vmware
video:
sound:
disks:
- json:{ "file": { "driver": "raw", "offset": x,
"size": 10240, "file": { "filename": "test.ova" }
} } (vmdk) [scsi]
+ json:{ "file": { "driver": "raw", "offset": x,
"size": 10240, "file": { "driver": "file",
"filename": "test.ova" } } } (vmdk) [scsi]
removable media:
CD-ROM [ide] in slot 0
NICs:
diff --git a/v2v/test-v2v-i-ova-tar.expected2 b/v2v/test-v2v-i-ova-tar.expected2
index 200e32a70..a97a7149c 100644
--- a/v2v/test-v2v-i-ova-tar.expected2
+++ b/v2v/test-v2v-i-ova-tar.expected2
@@ -10,7 +10,7 @@ hypervisor type: vmware
video:
sound:
disks:
- json:{ "file": { "driver": "raw", "offset": x,
"size": 10240, "file": { "filename":
"test-tar.ova" } } } (vmdk) [scsi]
+ json:{ "file": { "driver": "raw", "offset": x,
"size": 10240, "file": { "driver": "file",
"filename": "test-tar.ova" } } } (vmdk) [scsi]
removable media:
CD-ROM [ide] in slot 0
NICs:
diff --git a/v2v/test-v2v-i-ova-two-disks.expected2
b/v2v/test-v2v-i-ova-two-disks.expected2
index cf4cea50b..621ace84b 100644
--- a/v2v/test-v2v-i-ova-two-disks.expected2
+++ b/v2v/test-v2v-i-ova-two-disks.expected2
@@ -10,8 +10,8 @@ hypervisor type: vmware
video:
sound:
disks:
- json:{ "file": { "driver": "raw", "offset": x,
"size": 10240, "file": { "filename": "test.ova" }
} } (vmdk) [scsi]
- json:{ "file": { "driver": "raw", "offset": x,
"size": 102400, "file": { "filename": "test.ova" }
} } (vmdk) [scsi]
+ json:{ "file": { "driver": "raw", "offset": x,
"size": 10240, "file": { "driver": "file",
"filename": "test.ova" } } } (vmdk) [scsi]
+ json:{ "file": { "driver": "raw", "offset": x,
"size": 102400, "file": { "driver": "file",
"filename": "test.ova" } } } (vmdk) [scsi]
removable media:
CD-ROM [ide] in slot 0
NICs:
--
2.11.1