* src/qemu_driver.c: some uuid to string conversion were missing

  patch from Guido Günther
Daniel

diff --git a/ChangeLog b/ChangeLog
index 67d13bad168777e5552cb16c6e6af0fad03b71d3..2ec026eb84276e4e2e361f91f5a33c3a0304202f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 25 11:00:27 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+       * src/qemu_driver.c: some uuid to string conversion were missing
+         patch from Guido Günther
+
 Fri Jul 25 10:46:25 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
        * include/libvirt/libvirt.h include/libvirt/libvirt.h.in:

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 9bd059a45ee91f53413cb2c258008a26daaf219d..127e2d57ae1ad4d9163490f50eb90ecf1f7a8d95 100644 (file)
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -63,6 +63,7 @@
 #include "stats_linux.h"
 #include "capabilities.h"
 #include "memory.h"
+#include "uuid.h"
 
 /* For storing short-lived temporary files. */
 #define TEMPDIR LOCAL_STATE_DIR "/cache/libvirt"
@@ -2155,8 +2156,11 @@ static unsigned long qemudDomainGetMaxMemory(virDomainPtr dom) {
     virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
 
     if (!vm) {
+        char uuidstr[VIR_UUID_STRING_BUFLEN];
+
+        virUUIDFormat(dom->uuid, uuidstr);
         qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN,
-                         _("no domain with matching uuid '%s'"), dom->uuid);
+                         _("no domain with matching uuid '%s'"), uuidstr);
         return 0;
     }
 
@@ -2168,8 +2172,11 @@ static int qemudDomainSetMaxMemory(virDomainPtr dom, unsigned long newmax) {
     virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
 
     if (!vm) {
+        char uuidstr[VIR_UUID_STRING_BUFLEN];
+
+        virUUIDFormat(dom->uuid, uuidstr);
         qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN,
-                         _("no domain with matching uuid '%s'"), dom->uuid);
+                         _("no domain with matching uuid '%s'"), uuidstr);
         return -1;
     }
 
@@ -2188,8 +2195,11 @@ static int qemudDomainSetMemory(virDomainPtr dom, unsigned long newmem) {
     virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid);
 
     if (!vm) {
+        char uuidstr[VIR_UUID_STRING_BUFLEN];
+
+        virUUIDFormat(dom->uuid, uuidstr);
         qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN,
-                         _("no domain with matching uuid '%s'"), dom->uuid);
+                         _("no domain with matching uuid '%s'"), uuidstr);
         return -1;
     }
 
@@ -2458,8 +2468,11 @@ static int qemudDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) {
     int max;
 
     if (!vm) {
+        char uuidstr[VIR_UUID_STRING_BUFLEN];
+
+        virUUIDFormat(dom->uuid, uuidstr);
         qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN,
-                         _("no domain with matching uuid '%s'"), dom->uuid);
+                         _("no domain with matching uuid '%s'"), uuidstr);
         return -1;
     }
 
@@ -2617,8 +2630,11 @@ static int qemudDomainGetMaxVcpus(virDomainPtr dom) {
     int ret;
 
     if (!vm) {
+        char uuidstr[VIR_UUID_STRING_BUFLEN];
+
+        virUUIDFormat(dom->uuid, uuidstr);
         qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN,
-                         _("no domain with matching uuid '%s'"), dom->uuid);
+                         _("no domain with matching uuid '%s'"), uuidstr);
         return -1;
     }