From: Daniel Veillard <veillard@redhat.com>
Date: Wed, 1 Jul 2009 10:42:10 +0000 (+0000)
Subject: cleanup and small update for OpenNebula
X-Git-Tag: LIBVIRT_0_6_5~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7bd305904c6102ecb3df4854899338f09987a46;p=thirdparty%2Flibvirt.git

cleanup and small update for OpenNebula
* src/opennebula/one_conf.c src/opennebula/one_driver.c: cleanup
  and small update for OpenNebula driver by Abel Miguez Rodriguez
Daniel
---

diff --git a/ChangeLog b/ChangeLog
index c6444e4b63..8af5bd4fc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul  1 12:38:28 CEST 2009 Daniel Veillard <veillard@redhat.com>
+
+	* src/opennebula/one_conf.c src/opennebula/one_driver.c: cleanup
+	  and small update for OpenNebula driver by Abel Miguez Rodriguez
+
 Wed Jul  1 11:38:15 BST 2009 Daniel P. Berrange <berrange@redhat.com>
 
 	* src/opennebula/one_client.c, src/opennebula/one_client.h:
diff --git a/src/opennebula/one_conf.c b/src/opennebula/one_conf.c
index 133a814712..7a2d9849e6 100644
--- a/src/opennebula/one_conf.c
+++ b/src/opennebula/one_conf.c
@@ -85,6 +85,26 @@ virCapsPtr oneCapsInit(void)
         goto no_memory;
     }
 
+    if (virCapabilitiesAddGuestDomain(guest,
+                                      "one",
+                                      NULL,
+                                      NULL,
+                                      0,
+                                      NULL) == NULL)
+    {
+        goto no_memory;
+    }
+    if ((guest = virCapabilitiesAddGuest(caps,
+                                         "xen",
+                                         "i686",
+                                         32,
+                                         NULL,
+                                         NULL,
+                                         0,
+                                         NULL)) == NULL)
+    {
+        goto no_memory;
+    }
     if (virCapabilitiesAddGuestDomain(guest,
                                       "one",
                                       NULL,
diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c
index 0950458a30..135397ca05 100644
--- a/src/opennebula/one_driver.c
+++ b/src/opennebula/one_driver.c
@@ -505,7 +505,7 @@ static int oneDomainShutdown(virDomainPtr dom)
             ret= 0;
             goto return_point;
         }
-        oneError(dom->conn, dom, VIR_ERR_OPERATION_FAILED,
+        oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID,
                  _("Wrong state to perform action"));
         goto return_point;
     }
@@ -541,7 +541,7 @@ static int oneDomainDestroy(virDomainPtr dom)
     if(c_oneCancel(vm->pid)) {
         /* VM not running, delete the instance at ONE DB */
         if(c_oneFinalize(vm->pid)){
-            oneError(dom->conn, dom, VIR_ERR_OPERATION_FAILED,
+            oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID,
                      _("Wrong state to perform action"));
             goto return_point;
         }
@@ -576,11 +576,11 @@ static int oneDomainSuspend(virDomainPtr dom)
                 ret=0;
                 goto return_point;
             }
-            oneError(dom->conn, dom, VIR_ERR_OPERATION_FAILED,
+            oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID,
                      _("Wrong state to perform action"));
             goto return_point;
         }
-        oneError(dom->conn,dom,VIR_ERR_OPERATION_FAILED,
+        oneError(dom->conn,dom, VIR_ERR_OPERATION_INVALID,
                  _("domain is not running"));
     } else {
         oneError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN,
@@ -609,11 +609,11 @@ static int oneDomainResume(virDomainPtr dom)
                 ret=0;
                 goto return_point;
             }
-            oneError(dom->conn, dom, VIR_ERR_OPERATION_FAILED,
+            oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID,
                      _("Wrong state to perform action"));
             goto return_point;
         }
-        oneError(dom->conn,dom,VIR_ERR_OPERATION_FAILED,
+        oneError(dom->conn,dom, VIR_ERR_OPERATION_INVALID,
                  _("domain is not paused "));
     } else {
         oneError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN,