[Pkg-libvirt-commits] [libguestfs] 48/59: v2v: -o glance: Fix metadata for disk type and NIC (RHBZ#1161575).

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository libguestfs.

commit 47d20d60be80f5a7a89953155f4852d65304ae29
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri Nov 7 11:25:06 2014 +0000

    v2v: -o glance: Fix metadata for disk type and NIC (RHBZ#1161575).
    
    The labels 'hw_disk_bus' and 'hw_vif_model' were swapped.  This
    happened to work for virtio guests.  For non-virtio guests you ended
    up with absurdities like requiring an rtl8139 driver for the disk.
    
    Thanks: Junquin Zhou
    (cherry picked from commit 7407c0ae14c382e11e93afe94c0fc37d16df6ae9)
---
 v2v/output_glance.ml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v2v/output_glance.ml b/v2v/output_glance.ml
index 3697541..f67bf62 100644
--- a/v2v/output_glance.ml
+++ b/v2v/output_glance.ml
@@ -74,11 +74,11 @@ object
     (* Set the properties (ie. metadata). *)
     let min_ram = source.s_memory /^ 1024L /^ 1024L in
     let properties = [
-      "hw_vif_model",
+      "hw_disk_bus",
       (match guestcaps.gcaps_block_bus with
       | Virtio_blk -> "virtio"
       | IDE -> "ide");
-      "hw_disk_bus",
+      "hw_vif_model",
       (match guestcaps.gcaps_net_bus with
       | Virtio_net -> "virtio"
       | E1000 -> "e1000"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git