On Tue, Feb 14, 2017 at 01:26:40AM +0100, Tomáš Golembiovský wrote: > We have to be explicit about the drivers in backing file JSON in order > for libvirt to work. > > Signed-off-by: Tomáš Golembiovský <[email protected]> > --- > 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 411e90118..d5e3e64c4 100644 > --- a/v2v/input_ova.ml > +++ b/v2v/input_ova.ml > @@ -374,6 +374,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:
Seems reasonable. I guess we need to revert commit f73ac1fc9c21d70e33824e61cf091533afb57273 too? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-builder quickly builds VMs from scratch http://libguestfs.org/virt-builder.1.html _______________________________________________ Libguestfs mailing list [email protected] https://www.redhat.com/mailman/listinfo/libguestfs
