search for: parse_libvirt_xml

When parsing the libvirt XML, make sure to assign the IDs for disks (s_disk_id) from 0 instead of 1, just like all the other input modes not based on libvirt XML. --- v2v/parse_libvirt_xml.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml index 78a6e71c0..dac99511c 100644 --- a/v2v/parse_libvirt_xml.ml +++ b/v2v/parse_libvirt_xml.ml @@ -246,7 +246,7 @@ let parse_libvirt_xml ?conn xml = (* Non-removable disk d...

This device naming is mostly written by virt-p2v, so get the slot from it directly without using the drive_index "decoding" function. --- v2v/parse_libvirt_xml.ml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml index 36d2f66dd..55432f537 100644 --- a/v2v/parse_libvirt_xml.ml +++ b/v2v/parse_libvirt_xml.ml @@ -396,7 +396,15 @@ let parse_libvirt_xml ?conn xml =...

When parsing the libvirt XML, make sure to assign the IDs for disks (s_disk_id) from 0 instead of 1. This does not change the actual behaviour, just makes the IDs like in all the other input modes not based on libvirt XML. --- v2v/parse_libvirt_xml.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml index 78a6e71c0..dac99511c 100644 --- a/v2v/parse_libvirt_xml.ml +++ b/v2v/parse_libvirt_xml.ml @@ -246,7 +246,7 @@ let parse_libvirt_xml ?conn xml = (* Non-removable disk d...

...nes wrote: > On Tue, Aug 14, 2018 at 04:04:10PM +0200, Pino Toscano wrote: > > When parsing the libvirt XML, make sure to assign the IDs for disks > > (s_disk_id) from 0 instead of 1, just like all the other input modes not > > based on libvirt XML. > > --- > > v2v/parse_libvirt_xml.ml | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml > > index 78a6e71c0..dac99511c 100644 > > --- a/v2v/parse_libvirt_xml.ml > > +++ b/v2v/parse_libvirt_xml.ml > > @@ -246,7...

--- v2v/parse_libvirt_xml.ml | 18 ++++++++++++++++-- v2v/test-v2v-print-source.expected | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml index 6032c31..2dee274 100644 --- a/v2v/parse_libvirt_xml.ml +++ b/v2v/parse_libvirt_xml.ml @@ -50,7...

Starting with 5.2.0, libvirt has a way to select automatically the firmware for a guest using an attribute of the <os> tag. Hence, use this information (when available, of course) to flag the firmware used by the guest. --- v2v/parse_libvirt_xml.ml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml index d5d78d367..9cf4c496b 100644 --- a/v2v/parse_libvirt_xml.ml +++ b/v2v/parse_libvirt_xml.ml @@ -476,6 +476,13 @@ let parse_libvirt_xml ?conn xml = done; L...

...+0200, Pino Toscano wrote: > > > > When parsing the libvirt XML, make sure to assign the IDs for disks > > > > (s_disk_id) from 0 instead of 1, just like all the other input modes not > > > > based on libvirt XML. > > > > --- > > > > v2v/parse_libvirt_xml.ml | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml > > > > index 78a6e71c0..dac99511c 100644 > > > > --- a/v2v/parse_libvirt_xml.ml > > &...

virt-v2v obviously cannot convert this kind of devices, since they are specific to the host of the hypervisor. Thus, emit a warning about the presence of passthrough host devices, so at least this can be noticed when converting a guest. --- v2v/parse_libvirt_xml.ml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml index 84c5d4fc7..c71707000 100644 --- a/v2v/parse_libvirt_xml.ml +++ b/v2v/parse_libvirt_xml.ml @@ -460,6 +460,22 @@ let parse_libvirt_xml ?conn xml = done; List.re...

virt-v2v obviously cannot convert this kind of devices, since they are specific to the host of the hypervisor. Thus, emit a warning about the presence of direct network interfaces, so at least this can be noticed when converting a guest. --- v2v/parse_libvirt_xml.ml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml index 9cf4c496b..14cd82afd 100644 --- a/v2v/parse_libvirt_xml.ml +++ b/v2v/parse_libvirt_xml.ml @@ -499,6 +499,24 @@ let parse_libvirt_xml ?conn xml = ) in + (*...

No functional change. --- v2v/parse_libvirt_xml.ml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml index 57e741574..03a201e77 100644 --- a/v2v/parse_libvirt_xml.ml +++ b/v2v/parse_libvirt_xml.ml @@ -123,14 +123,8 @@ let parse_libvirt_xml ?conn xml = | _, _, _...

On Thu, Aug 09, 2018 at 03:05:26PM +0200, Pino Toscano wrote: > This device naming is mostly written by virt-p2v, so get the slot from > it directly without using the drive_index "decoding" function. > --- > v2v/parse_libvirt_xml.ml | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml > index 36d2f66dd..55432f537 100644 > --- a/v2v/parse_libvirt_xml.ml > +++ b/v2v/parse_libvirt_xml.ml > @@ -396,7 +396,15 @@ let parse_libv...

On Tue, Aug 14, 2018 at 04:04:10PM +0200, Pino Toscano wrote: > When parsing the libvirt XML, make sure to assign the IDs for disks > (s_disk_id) from 0 instead of 1, just like all the other input modes not > based on libvirt XML. > --- > v2v/parse_libvirt_xml.ml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml > index 78a6e71c0..dac99511c 100644 > --- a/v2v/parse_libvirt_xml.ml > +++ b/v2v/parse_libvirt_xml.ml > @@ -246,7 +246,7 @@ let parse_libvirt_xml ?co...

...ug 14, 2018 at 04:04:10PM +0200, Pino Toscano wrote: > > > When parsing the libvirt XML, make sure to assign the IDs for disks > > > (s_disk_id) from 0 instead of 1, just like all the other input modes not > > > based on libvirt XML. > > > --- > > > v2v/parse_libvirt_xml.ml | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml > > > index 78a6e71c0..dac99511c 100644 > > > --- a/v2v/parse_libvirt_xml.ml > > > +++ b/v2v/parse_libvi...

Support also a "socket" listen type with no explicitly specified socket (which will be generated by libvirt). Updates commit a4adf48915c0e3e7f4e8b7bbdbb5ac622da1ac58. Related to: RHBZ#1378022 --- v2v/create_libvirt_xml.ml | 4 +++- v2v/parse_libvirt_xml.ml | 4 ++-- v2v/types.ml | 5 +++-- v2v/types.mli | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/v2v/create_libvirt_xml.ml b/v2v/create_libvirt_xml.ml index 19e0a52..c276109 100644 --- a/v2v/create_libvirt_xml.ml +++ b/v2v/create_libvirt_xml.ml @@...

On Thursday, 16 March 2017 22:10:10 CET Richard W.M. Jones wrote: > --- > v2v/parse_libvirt_xml.ml | 18 ++++++++++++++++-- > v2v/test-v2v-print-source.expected | 2 +- > 2 files changed, 17 insertions(+), 3 deletions(-) > > diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml > index 6032c31..2dee274 100644 > --- a/v2v/parse_libvirt_xml.ml > +++ b...

This is built on top of the following patch series: https://www.redhat.com/archives/libguestfs/2019-April/msg00054.html Rich.

--- v2v/parse_libvirt_xml.ml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml index 6032c31..fb895e4 100644 --- a/v2v/parse_libvirt_xml.ml +++ b/v2v/parse_libvirt_xml.ml @@ -50,7 +50,7 @@ let parse_libvirt_xml ?conn xml = let xpath...

...be easier to understand. eg: xpath_int_default xctx "xpath_expr" 10 -> Option.default 10 (xpath_int xctx "xpath_expr") --- common/mltools/xpath_helpers.ml | 12 ------------ common/mltools/xpath_helpers.mli | 6 ------ v2v/copy_to_local.ml | 6 +++--- v2v/parse_libvirt_xml.ml | 9 ++++----- v2v/parse_ovf_from_ova.ml | 16 ++++++++-------- 5 files changed, 15 insertions(+), 34 deletions(-) diff --git a/common/mltools/xpath_helpers.ml b/common/mltools/xpath_helpers.ml index 05fad89a4..3afee8b21 100644 --- a/common/mltools/xpath_helpers.ml +++ b/common/...

https://bugzilla.redhat.com/show_bug.cgi?id=1508874 Also avoids a warning. Rich.

...en_ssh.mli | 2 +- v2v/input_libvirtxml.ml | 3 +- v2v/libvirt_utils-c.c | 259 +++++++++++++++++++----------------- v2v/libvirt_utils.ml | 16 ++- v2v/libvirt_utils.mli | 44 +++--- v2v/output_libvirt.ml | 8 +- v2v/parse_libvirt_xml.ml | 4 +- v2v/parse_libvirt_xml.mli | 2 +- 17 files changed, 233 insertions(+), 194 deletions(-) diff --git a/v2v/copy_to_local.ml b/v2v/copy_to_local.ml index 0a2b7ed75..828b5b490 100644 --- a/v2v/copy_to_local.ml +++ b/v2v/copy_to_local.ml @@ -131,7 +131,8 @@ read the...