Merge lp:~invernizzi/eucalyptus/fix-676819 into lp:eucalyptus

[Luca Invernizzi]

Fixes LP #676819 Attaching a volume fails on ubuntu 11.10 with kvm

Fixes bug #676819. When using the node-controller with kvm in ubuntu 11.10, it's not possible to attach a volume when the vm is pending/running. The details are in the bug report, but the main reason is that the handler for kvm is using the "phy" driver, that is xen specific.
I've also prepared a patch in the debian format: it's in the bug report.

[graziano obertelli (graziano.obertelli)]

Luca,

I will be merging it onto 2.0 (euca-devel is in flux right now), so I will have to do a manual merge into it.

[graziano obertelli (graziano.obertelli)]

review: Approve

=== modified file 'node/handlers_kvm.c'
--- node/handlers_kvm.c	2011-03-08 20:09:06 +0000
+++ node/handlers_kvm.c	2011-11-25 09:36:25 +0000
@@ -138,9 +138,9 @@
              virtio_dev = 1;
         }
         if (nc->config_use_virtio_disk && virtio_dev) {
-             snprintf (xml, 1024, "<disk type='block'><driver name='phy'/><source dev='%s'/><target dev='%s' bus='virtio'/></disk>", remoteDev, localDevReal);
+             snprintf (xml, 1024, "<disk type='block'><driver name='qemu'/><source dev='%s'/><target dev='%s' bus='virtio'/></disk>", remoteDev, localDevReal);
         } else {
-             snprintf (xml, 1024, "<disk type='block'><driver name='phy'/><source dev='%s'/><target dev='%s'/></disk>", remoteDev, localDevReal);
+             snprintf (xml, 1024, "<disk type='block'><driver name='qemu'/><source dev='%s'/><target dev='%s'/></disk>", remoteDev, localDevReal);
         }
         rc = stat(remoteDev, &statbuf);
         if (rc) {
@@ -479,15 +479,15 @@
                 if((local_iscsi_dev = get_iscsi_target(nc->get_storage_cmd_path, nc->home, remoteDev)) == NULL)
                     return ERROR;
                 if (nc->config_use_virtio_disk && virtio_dev) {
-                    snprintf (xml, 1024, "<disk type='block'><driver name='phy'/><source dev='%s'/><target dev='%s' bus='virtio'/></disk>", local_iscsi_dev, localDevReal);
+                    snprintf (xml, 1024, "<disk type='block'><driver name='qemu'/><source dev='%s'/><target dev='%s' bus='virtio'/></disk>", local_iscsi_dev, localDevReal);
                 } else {
-                    snprintf (xml, 1024, "<disk type='block'><driver name='phy'/><source dev='%s'/><target dev='%s'/></disk>", local_iscsi_dev, localDevReal);
+                    snprintf (xml, 1024, "<disk type='block'><driver name='qemu'/><source dev='%s'/><target dev='%s'/></disk>", local_iscsi_dev, localDevReal);
                 }
             } else {
                 if (nc->config_use_virtio_disk && virtio_dev) {
-   		    snprintf (xml, 1024, "<disk type='block'><driver name='phy'/><source dev='%s'/><target dev='%s' bus='virtio'/></disk>", remoteDev, localDevReal);
+   		    snprintf (xml, 1024, "<disk type='block'><driver name='qemu'/><source dev='%s'/><target dev='%s' bus='virtio'/></disk>", remoteDev, localDevReal);
                 } else {
-   		    snprintf (xml, 1024, "<disk type='block'><driver name='phy'/><source dev='%s'/><target dev='%s'/></disk>", remoteDev, localDevReal);
+   		    snprintf (xml, 1024, "<disk type='block'><driver name='qemu'/><source dev='%s'/><target dev='%s'/></disk>", remoteDev, localDevReal);
                 }
 	    }
             /* protect KVM calls, just in case */