* src/xm_internal.c: fix a crash on vcpupin to inactive Xen domains,

as raised by Takahashi Tomohiro
daniel
This commit is contained in:
Daniel Veillard 2009-04-15 09:53:34 +00:00
parent cab9eed62e
commit 14687aad81
2 changed files with 8 additions and 2 deletions

View File

@ -1,3 +1,8 @@
Wed Apr 15 11:52:15 CEST 2009 Daniel Veillard <veillard@redhat.com>
* src/xm_internal.c: fix a crash on vcpupin to inactive Xen domains,
as raised by Takahashi Tomohiro
Wed Apr 15 11:33:33 CEST 2009 Daniel Veillard <veillard@redhat.com> Wed Apr 15 11:33:33 CEST 2009 Daniel Veillard <veillard@redhat.com>
* src/lxc_driver.c: adds the getHostname method to the lxc driver * src/lxc_driver.c: adds the getHostname method to the lxc driver

View File

@ -1624,7 +1624,7 @@ int xenXMDomainPinVcpu(virDomainPtr domain,
const char *filename; const char *filename;
xenXMConfCachePtr entry; xenXMConfCachePtr entry;
virBuffer mapbuf = VIR_BUFFER_INITIALIZER; virBuffer mapbuf = VIR_BUFFER_INITIALIZER;
char *mapstr = NULL; char *mapstr = NULL, *mapsave = NULL;
int i, j, n, comma = 0; int i, j, n, comma = 0;
int ret = -1; int ret = -1;
char *cpuset = NULL; char *cpuset = NULL;
@ -1679,6 +1679,7 @@ int xenXMDomainPinVcpu(virDomainPtr domain,
} }
mapstr = virBufferContentAndReset(&mapbuf); mapstr = virBufferContentAndReset(&mapbuf);
mapsave = mapstr;
if (VIR_ALLOC_N(cpuset, maxcpu) < 0) { if (VIR_ALLOC_N(cpuset, maxcpu) < 0) {
virReportOOMError(domain->conn); virReportOOMError(domain->conn);
@ -1700,7 +1701,7 @@ int xenXMDomainPinVcpu(virDomainPtr domain,
ret = 0; ret = 0;
cleanup: cleanup:
VIR_FREE(mapstr); VIR_FREE(mapsave);
VIR_FREE(cpuset); VIR_FREE(cpuset);
xenUnifiedUnlock(priv); xenUnifiedUnlock(priv);
return (ret); return (ret);