diff --git a/ChangeLog b/ChangeLog index 1ebbb6c031..6fa4d9342e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Feb 15 15:47:46 IST 2007 Mark McLoughlin + + * 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 * qemud/qemud.c: Ensure we create the main libvirt config diff --git a/NEWS b/NEWS index ff95ff51c4..6a6a9cd928 100644 --- 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 73fffbaae6..09940fe03d 100644 --- 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 13549fae4a..1e041ec095 100644 --- 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) {