Thu Feb 15 15:47:46 IST 2007 Mark McLoughlin <markmc@redhat.com>

        * qemud/conf.c: fix a couple of qemud_vm_def leaks

        * driver.c: simplify qemudDomainDefine()

diff --git a/ChangeLog b/ChangeLog
index 1ebbb6c0319dd63bc17fe56e97772e9705ac8f28..6fa4d9342e2d5b662334d0c8fc1d38af5800fe27 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Feb 15 15:47:46 IST 2007 Mark McLoughlin <markmc@redhat.com>
+
+       * qemud/conf.c: fix a couple of qemud_vm_def leaks
+
+       * driver.c: simplify qemudDomainDefine()
+       
 Wed Feb 14 17:01:24 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
        * qemud/qemud.c: Ensure we create the main libvirt config

diff --git a/NEWS b/NEWS
index ff95ff51c49b6c06742f091b5d91823d94199d3e..6a6a9cd9283d71027b1e79b0f16e2cc0b38b5695 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,10 +9,11 @@ Releases
    - Various internal cleanups (Mark McLoughlin, Richard Jones,
       Daniel Berrange, Karel Zak)
    - Bug fixes: avoid a crash in connect (Daniel Berrange), virsh args
-      parsing (Richard Jones), 
-      
+      parsing (Richard Jones)
    - Add support for QEmu and KVM virtualization (Daniel Berrange)
    - Add support for network configuration (Mark McLoughlin)
+   - Minor improvements: regression testing (Daniel Berrange), 
+      localization string updates
 
 
 0.1.11: Jan 22 2007:

diff --git a/qemud/conf.c b/qemud/conf.c
index 73fffbaae6fae218cb958bc45cb3a8ac60b5d834..09940fe03deec376b7e3ee16dd06560f177804be 100644 (file)
--- a/qemud/conf.c
+++ b/qemud/conf.c
@@ -108,6 +108,7 @@ void qemudFreeVMDef(struct qemud_vm_def *def) {
         net = net->next;
         free(prev);
     }
+    free(def);
 }
 
 void qemudFreeVM(struct qemud_vm *vm) {
@@ -1211,6 +1212,7 @@ struct qemud_vm *qemudLoadConfigXML(struct qemud_server *server,
     } else {
         if (!(vm = calloc(1, sizeof(struct qemud_vm)))) {
             qemudReportError(server, VIR_ERR_NO_MEMORY, "vm");
+            qemudFreeVMDef(def);
             return NULL;
         }
 

diff --git a/qemud/driver.c b/qemud/driver.c
index 13549fae4ae6a561521af16bb050fc43af0bc3b0..1e041ec09572139dcd85463cc80048033a8f3033 100644 (file)
--- a/qemud/driver.c
+++ b/qemud/driver.c
@@ -490,13 +490,7 @@ int qemudDomainStart(struct qemud_server *server, struct qemud_vm *vm) {
 
 
 struct qemud_vm *qemudDomainDefine(struct qemud_server *server, const char *xml) {
-    struct qemud_vm *vm;
-
-    if (!(vm = qemudLoadConfigXML(server, NULL, xml, 1))) {
-        return NULL;
-    }
-
-    return vm;
+    return qemudLoadConfigXML(server, NULL, xml, 1);
 }
 
 int qemudDomainUndefine(struct qemud_server *server, const unsigned char *uuid) {