* src/opennebula/one_conf.c src/opennebula/one_driver.c: fix One

  driver compilation issues, patch by Javier Fontan and remove
  some tabs in format strings
daniel

diff --git a/ChangeLog b/ChangeLog
index 6853f86d70c55d534692ad82d6bfd043dd5ecfd5..2f3c87c495ad81d5540ac5f1f5353466d8a97ce2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jun 24 18:15:56 CEST 2009 Daniel Veillard <veillard@redhat.com>
+
+       * src/opennebula/one_conf.c src/opennebula/one_driver.c: fix One
+         driver compilation issues, patch by Javier Fontan and remove
+         some tabs in format strings
+
 Mon Jun 22 12:40:11 EDT 2009 Cole Robinson <crobinso@redhat.com>
 
        * src/libvirt_private.syms src/storage_conf.c src/storage_conf.h

diff --git a/src/opennebula/one_conf.c b/src/opennebula/one_conf.c
index dc0eff0879f54d765330d6a32445021bb5782451..133a814712daf5e077ae2f1abc6e29e66c49df5c 100644 (file)
--- a/src/opennebula/one_conf.c
+++ b/src/opennebula/one_conf.c
@@ -172,20 +172,20 @@ char* xmlOneTemplate(virConnectPtr conn,virDomainDefPtr def)
         // missing source is only allowed at cdrom and floppy
         if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK) {
             virBufferVSprintf(&buf, "DISK=[ type = disk,\n"
-                              "        source = \"%s\",\n",
+                              "\tsource = \"%s\",\n",
                               def->disks[i]->src);
         }
         else if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM) {
             virBufferAddLit(&buf,  "DISK=[ type = cdrom,\n");
-            if (def->disks[i]->src) virBufferVSprintf(&buf, "  source = \"%s\",\n",def->disks[i]->src);
+            if (def->disks[i]->src) virBufferVSprintf(&buf, "\tsource = \"%s\",\n",def->disks[i]->src);
         }
         else if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) {
             virBufferAddLit(&buf,  "DISK=[ type = floppy,\n");
-            if (def->disks[i]->src) virBufferVSprintf(&buf, "  source = \"%s\",\n",def->disks[i]->src);
+            if (def->disks[i]->src) virBufferVSprintf(&buf, "\tsource = \"%s\",\n",def->disks[i]->src);
         }
 
-        virBufferVSprintf(&buf, "      target = \"%s\",\n"
-                          "    readonly =",
+        virBufferVSprintf(&buf, "\ttarget = \"%s\",\n"
+                          "\treadonly =",
                           def->disks[i]->dst);
 
         if (def->disks[i]->readonly)
@@ -225,18 +225,24 @@ char* xmlOneTemplate(virConnectPtr conn,virDomainDefPtr def)
         }
     }
 
-    if (def->graphics != NULL) {
-        if (def->graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
+    for(i=0;i<def->ngraphics;i++) {
+        if (def->graphics[i] == NULL)
+            continue;
+
+        if (def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
             virBufferAddLit(&buf,"GRAPHICS = [\n  type = \"vnc\"");
 
-            if (def->graphics->data.vnc.listenAddr != NULL)
-                virBufferVSprintf(&buf,",\n  listen = \"%s\"",def->graphics->data.vnc.listenAddr);
+            if (def->graphics[i]->data.vnc.listenAddr != NULL)
+                virBufferVSprintf(&buf,",\n  listen = \"%s\"",
+                    def->graphics[i]->data.vnc.listenAddr);
 
-            if (def->graphics->data.vnc.autoport == 0)
-                virBufferVSprintf(&buf,",\n  port = \"%d\"",def->graphics->data.vnc.port);
+            if (def->graphics[i]->data.vnc.autoport == 0)
+                virBufferVSprintf(&buf,",\n  port = \"%d\"",
+                    def->graphics[i]->data.vnc.port);
 
-            if (def->graphics->data.vnc.passwd != NULL)
-                virBufferVSprintf(&buf,",\n  passwd = \"%s\"",def->graphics->data.vnc.passwd);
+            if (def->graphics[i]->data.vnc.passwd != NULL)
+                virBufferVSprintf(&buf,",\n  passwd = \"%s\"",
+                    def->graphics[i]->data.vnc.passwd);
 
             virBufferAddLit(&buf," ]\n");
 

diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c
index 70da4fa91dbff3cd935eca05cb7425f7ff921746..5e24dbf6cd0742a21cac1f1bbd4fe96deb0d8091 100644 (file)
--- a/src/opennebula/one_driver.c
+++ b/src/opennebula/one_driver.c
@@ -749,6 +749,8 @@ static virDriver oneDriver = {
     NULL, /* domainGetSecurityLabel */
     NULL, /* nodeGetSecurityModel */
     NULL, /* domainDumpXML */
+    NULL, /* domainXMLFromNative */
+    NULL, /* domainXMLToNative */
     oneListDefinedDomains, /* listDefinedDomains */
     oneNumDefinedDomains, /* numOfDefinedDomains */
     oneDomainStart, /* domainCreate */