- Devel - libvirt List Archives

[libvirt] [PATCH] API: Improve log for domain related APIs
by Osier Yang 24 Dec '10

24 Dec '10

Add VM name/UUID in log for domain related APIs. Format: "param0=%p, param1=%p, (VM: %s)" * src/libvirt.c --- src/libvirt.c | 294 +++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 221 insertions(+), 73 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index ee2495a..03dcafc 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1961,7 +1961,9 @@ error: virConnectPtr virDomainGetConnect (virDomainPtr dom) { - DEBUG("dom=%p", dom); + const char *name = virDomainGetName(dom); + + DEBUG("dom=%p, (VM: %s)", dom, name); virResetLastError(); @@ -2100,7 +2102,10 @@ error: virDomainPtr virDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { - DEBUG("conn=%p, uuid=%s", conn, uuid); + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(uuid, uuidstr); + + DEBUG("conn=%p, uuid=%s", conn, uuidstr); virResetLastError(); @@ -2226,8 +2231,9 @@ int virDomainDestroy(virDomainPtr domain) { virConnectPtr conn; + const char *name = virDomainGetName(domain); - DEBUG("domain=%p", domain); + DEBUG("domain=%p, (VM: %s)", domain, name); virResetLastError(); @@ -2270,7 +2276,9 @@ error: int virDomainFree(virDomainPtr domain) { - DEBUG("domain=%p", domain); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, (VM: %s)", domain, name); virResetLastError(); @@ -2306,13 +2314,15 @@ virDomainFree(virDomainPtr domain) int virDomainRef(virDomainPtr domain) { + const char *name = virDomainGetName(domain); + if ((!VIR_IS_CONNECTED_DOMAIN(domain))) { virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); virDispatchError(NULL); return(-1); } virMutexLock(&domain->conn->lock); - DEBUG("domain=%p refs=%d", domain, domain->refs); + DEBUG("domain=%p, refs=%d, (VM: %s)", domain, domain->refs, name); domain->refs++; virMutexUnlock(&domain->conn->lock); return 0; @@ -2335,7 +2345,9 @@ int virDomainSuspend(virDomainPtr domain) { virConnectPtr conn; - DEBUG("domain=%p", domain); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, (VM: %s)", domain, name); virResetLastError(); @@ -2380,7 +2392,9 @@ int virDomainResume(virDomainPtr domain) { virConnectPtr conn; - DEBUG("domain=%p", domain); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, (VM: %s)", domain, name); virResetLastError(); @@ -2428,7 +2442,9 @@ virDomainSave(virDomainPtr domain, const char *to) { char filepath[4096]; virConnectPtr conn; - DEBUG("domain=%p, to=%s", domain, to); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, to=%s, (VM: %s)", domain, to, name); virResetLastError(); @@ -2570,7 +2586,9 @@ virDomainCoreDump(virDomainPtr domain, const char *to, int flags) { char filepath[4096]; virConnectPtr conn; - DEBUG("domain=%p, to=%s, flags=%d", domain, to, flags); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, to=%s, flags=%d, (VM: %s)", domain, to, flags, name); virResetLastError(); @@ -2647,7 +2665,9 @@ int virDomainShutdown(virDomainPtr domain) { virConnectPtr conn; - DEBUG("domain=%p", domain); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, (VM: %s)", domain, name); virResetLastError(); @@ -2693,7 +2713,9 @@ int virDomainReboot(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - DEBUG("domain=%p, flags=%u", domain, flags); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, flags=%u, (VM: %s)", domain, flags, name); virResetLastError(); @@ -2760,7 +2782,9 @@ virDomainGetName(virDomainPtr domain) int virDomainGetUUID(virDomainPtr domain, unsigned char *uuid) { - DEBUG("domain=%p, uuid=%p", domain, uuid); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, uuid=%p, (VM: %s)", domain, uuid, name); virResetLastError(); @@ -2794,7 +2818,9 @@ int virDomainGetUUIDString(virDomainPtr domain, char *buf) { unsigned char uuid[VIR_UUID_BUFLEN]; - DEBUG("domain=%p, buf=%p", domain, buf); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, buf=%p, (VM: %s)", domain, buf, name); virResetLastError(); @@ -2830,7 +2856,9 @@ error: unsigned int virDomainGetID(virDomainPtr domain) { - DEBUG("domain=%p", domain); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, (VM: %s)", domain, name); virResetLastError(); @@ -2855,7 +2883,9 @@ char * virDomainGetOSType(virDomainPtr domain) { virConnectPtr conn; - DEBUG("domain=%p", domain); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, (VM: %s)", domain, name); virResetLastError(); @@ -2896,7 +2926,9 @@ unsigned long virDomainGetMaxMemory(virDomainPtr domain) { virConnectPtr conn; - DEBUG("domain=%p", domain); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, (VM: %s)", domain, name); virResetLastError(); @@ -2942,7 +2974,9 @@ int virDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) { virConnectPtr conn; - DEBUG("domain=%p, memory=%lu", domain, memory); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, memory=%lu, (VM: %s)", domain, memory, name); virResetLastError(); @@ -2995,7 +3029,9 @@ int virDomainSetMemory(virDomainPtr domain, unsigned long memory) { virConnectPtr conn; - DEBUG("domain=%p, memory=%lu", domain, memory); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, memory=%lu, (VM: %s)", domain, memory, name); virResetLastError(); @@ -3049,7 +3085,10 @@ virDomainSetMemoryParameters(virDomainPtr domain, int nparams, unsigned int flags) { virConnectPtr conn; - DEBUG("domain=%p, params=%p, nparams=%d, flags=%u", domain, params, nparams, flags); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, params=%p, nparams=%d, flags=%u, (VM: %s)", + domain, params, nparams, flags, name); virResetLastError(); @@ -3123,7 +3162,11 @@ virDomainGetMemoryParameters(virDomainPtr domain, int *nparams, unsigned int flags) { virConnectPtr conn; - DEBUG("domain=%p, params=%p, nparams=%d, flags=%u", domain, params, (nparams)?*nparams:-1, flags); + + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, params=%p, nparams=%d, flags=%u, (VM: %s)", + domain, params, (nparams)?*nparams:-1, flags, name); virResetLastError(); @@ -3167,7 +3210,9 @@ int virDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) { virConnectPtr conn; - DEBUG("domain=%p, info=%p", domain, info); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, info=%p, (VM: %s)", domain, info, name); virResetLastError(); @@ -3215,7 +3260,9 @@ char * virDomainGetXMLDesc(virDomainPtr domain, int flags) { virConnectPtr conn; - DEBUG("domain=%p, flags=%d", domain, flags); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, flags=%d, (VM: %s)", domain, flags, name); virResetLastError(); @@ -3662,8 +3709,10 @@ virDomainMigrate (virDomainPtr domain, unsigned long bandwidth) { virDomainPtr ddomain = NULL; - DEBUG("domain=%p, dconn=%p, flags=%lu, dname=%s, uri=%s, bandwidth=%lu", - domain, dconn, flags, NULLSTR(dname), NULLSTR(uri), bandwidth); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, dconn=%p, flags=%lu, dname=%s, uri=%s, bandwidth=%lu, (VM: %s)", + domain, dconn, flags, NULLSTR(dname), NULLSTR(uri), bandwidth, name); virResetLastError(); @@ -3811,8 +3860,10 @@ virDomainMigrateToURI (virDomainPtr domain, const char *dname, unsigned long bandwidth) { - DEBUG("domain=%p, duri=%p, flags=%lu, dname=%s, bandwidth=%lu", - domain, NULLSTR(duri), flags, NULLSTR(dname), bandwidth); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, duri=%p, flags=%lu, dname=%s, bandwidth=%lu, (VM: %s)", + domain, NULLSTR(duri), flags, NULLSTR(dname), bandwidth, name); virResetLastError(); @@ -3924,9 +3975,11 @@ virDomainMigratePerform (virDomainPtr domain, unsigned long bandwidth) { virConnectPtr conn; + const char *name = virDomainGetName(domain); + VIR_DEBUG("domain=%p, cookie=%p, cookielen=%d, uri=%s, flags=%lu, " - "dname=%s, bandwidth=%lu", domain, cookie, cookielen, uri, flags, - NULLSTR(dname), bandwidth); + "dname=%s, bandwidth=%lu, (VM: %s)", domain, cookie, + cookielen, uri, flags, NULLSTR(dname), bandwidth, name); virResetLastError(); @@ -4290,7 +4343,9 @@ virDomainGetSchedulerType(virDomainPtr domain, int *nparams) { virConnectPtr conn; char *schedtype; - DEBUG("domain=%p, nparams=%p", domain, nparams); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, nparams=%p, (VM: %s)", domain, nparams, name); virResetLastError(); @@ -4335,7 +4390,10 @@ virDomainGetSchedulerParameters(virDomainPtr domain, virSchedParameterPtr params, int *nparams) { virConnectPtr conn; - DEBUG("domain=%p, params=%p, nparams=%p", domain, params, nparams); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, params=%p, nparams=%p, (VM: %s)", domain, + params, nparams, name); virResetLastError(); @@ -4378,7 +4436,10 @@ virDomainSetSchedulerParameters(virDomainPtr domain, virSchedParameterPtr params, int nparams) { virConnectPtr conn; - DEBUG("domain=%p, params=%p, nparams=%d", domain, params, nparams); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, params=%p, nparams=%d, (VM: %s)", domain, + params, nparams, name); virResetLastError(); @@ -4438,7 +4499,10 @@ virDomainBlockStats (virDomainPtr dom, const char *path, { virConnectPtr conn; struct _virDomainBlockStats stats2 = { -1, -1, -1, -1, -1 }; - DEBUG("domain=%p, path=%s, stats=%p, size=%zi", dom, path, stats, size); + const char *name = virDomainGetName(dom); + + DEBUG("domain=%p, path=%s, stats=%p, size=%zi, (VM: %s)", dom, + path, stats, size, name); virResetLastError(); @@ -4496,7 +4560,10 @@ virDomainInterfaceStats (virDomainPtr dom, const char *path, virConnectPtr conn; struct _virDomainInterfaceStats stats2 = { -1, -1, -1, -1, -1, -1, -1, -1 }; - DEBUG("domain=%p, path=%s, stats=%p, size=%zi", dom, path, stats, size); + const char *name = virDomainGetName(dom); + + DEBUG("domain=%p, path=%s, stats=%p, size=%zi, (VM: %s)", dom, + path, stats, size, name); virResetLastError(); @@ -4561,7 +4628,9 @@ int virDomainMemoryStats (virDomainPtr dom, virDomainMemoryStatPtr stats, { virConnectPtr conn; unsigned long nr_stats_ret = 0; - DEBUG("domain=%p, stats=%p, nr_stats=%u", dom, stats, nr_stats); + const char *name = virDomainGetName(dom); + + DEBUG("domain=%p, stats=%p, nr_stats=%u, (VM: %s)", dom, stats, nr_stats, name); if (flags != 0) { virLibDomainError (dom, VIR_ERR_INVALID_ARG, @@ -4645,8 +4714,10 @@ virDomainBlockPeek (virDomainPtr dom, unsigned int flags) { virConnectPtr conn; - DEBUG("domain=%p, path=%s, offset=%lld, size=%zi, buffer=%p", - dom, path, offset, size, buffer); + const char *name = virDomainGetName(dom); + + DEBUG("domain=%p, path=%s, offset=%lld, size=%zi, buffer=%p, (VM: %s)", + dom, path, offset, size, buffer, name); virResetLastError(); @@ -4736,8 +4807,10 @@ virDomainMemoryPeek (virDomainPtr dom, unsigned int flags) { virConnectPtr conn; - DEBUG ("domain=%p, start=%lld, size=%zi, buffer=%p, flags=%d", - dom, start, size, buffer, flags); + const char *name = virDomainGetName(dom); + + DEBUG ("domain=%p, start=%lld, size=%zi, buffer=%p, flags=%d, (VM: %s)", + dom, start, size, buffer, flags, name); virResetLastError(); @@ -4821,7 +4894,9 @@ int virDomainGetBlockInfo(virDomainPtr domain, const char *path, virDomainBlockInfoPtr info, unsigned int flags) { virConnectPtr conn; - DEBUG("domain=%p, info=%p flags=%u", domain, info, flags); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, info=%p flags=%u, (VM: %s)", domain, info, flags, name); virResetLastError(); @@ -4919,7 +4994,11 @@ error: int virDomainUndefine(virDomainPtr domain) { virConnectPtr conn; - DEBUG("domain=%p", domain); + const char *name; + + name = virDomainGetName(domain); + + DEBUG("domain=%p, (VM: %s)", domain, name); virResetLastError(); @@ -5041,7 +5120,9 @@ error: int virDomainCreate(virDomainPtr domain) { virConnectPtr conn; - DEBUG("domain=%p", domain); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, (VM :%s)", domain, name); virResetLastError(); @@ -5084,7 +5165,9 @@ error: int virDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - DEBUG("domain=%p, flags=%d", domain, flags); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, flags=%d, (VM: %s)", domain, flags, name); virResetLastError(); @@ -5130,7 +5213,9 @@ virDomainGetAutostart(virDomainPtr domain, int *autostart) { virConnectPtr conn; - DEBUG("domain=%p, autostart=%p", domain, autostart); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, autostart=%p, (VM: %s)", domain, autostart, name); virResetLastError(); @@ -5176,7 +5261,9 @@ virDomainSetAutostart(virDomainPtr domain, int autostart) { virConnectPtr conn; - DEBUG("domain=%p, autostart=%d", domain, autostart); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, autostart=%d, (VM: %s)", domain, autostart, name); virResetLastError(); @@ -5230,7 +5317,9 @@ int virDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus) { virConnectPtr conn; - DEBUG("domain=%p, nvcpus=%u", domain, nvcpus); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, nvcpus=%u, (VM: %s)", domain, nvcpus, name); virResetLastError(); @@ -5296,7 +5385,10 @@ virDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus, unsigned int flags) { virConnectPtr conn; - DEBUG("domain=%p, nvcpus=%u, flags=%u", domain, nvcpus, flags); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, nvcpus=%u, flags=%u, (VM: %s)", domain, + nvcpus, flags, name); virResetLastError(); @@ -5359,7 +5451,9 @@ int virDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - DEBUG("domain=%p, flags=%u", domain, flags); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, flags=%u, (VM: %s)", domain, flags, name); virResetLastError(); @@ -5417,7 +5511,10 @@ virDomainPinVcpu(virDomainPtr domain, unsigned int vcpu, unsigned char *cpumap, int maplen) { virConnectPtr conn; - DEBUG("domain=%p, vcpu=%u, cpumap=%p, maplen=%d", domain, vcpu, cpumap, maplen); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, vcpu=%u, cpumap=%p, maplen=%d, (VM: %s)", + domain, vcpu, cpumap, maplen, name); virResetLastError(); @@ -5480,7 +5577,10 @@ virDomainGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo, unsigned char *cpumaps, int maplen) { virConnectPtr conn; - DEBUG("domain=%p, info=%p, maxinfo=%d, cpumaps=%p, maplen=%d", domain, info, maxinfo, cpumaps, maplen); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, info=%p, maxinfo=%d, cpumaps=%p, maplen=%d, (VM: %s)", + domain, info, maxinfo, cpumaps, maplen, name); virResetLastError(); @@ -5536,7 +5636,9 @@ int virDomainGetMaxVcpus(virDomainPtr domain) { virConnectPtr conn; - DEBUG("domain=%p", domain); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, (VM: %s)", domain, name); virResetLastError(); @@ -5665,7 +5767,9 @@ int virDomainAttachDevice(virDomainPtr domain, const char *xml) { virConnectPtr conn; - DEBUG("domain=%p, xml=%s", domain, xml); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, xml=%s, (VM: %s)", domain, xml, name); virResetLastError(); @@ -5724,7 +5828,9 @@ virDomainAttachDeviceFlags(virDomainPtr domain, const char *xml, unsigned int flags) { virConnectPtr conn; - DEBUG("domain=%p, xml=%s, flags=%d", domain, xml, flags); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, xml=%s, flags=%d, (VM: %s)", domain, xml, flags, name); virResetLastError(); @@ -5767,7 +5873,9 @@ int virDomainDetachDevice(virDomainPtr domain, const char *xml) { virConnectPtr conn; - DEBUG("domain=%p, xml=%s", domain, xml); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, xml=%s, (VM: %s)", domain, xml, name); virResetLastError(); @@ -5822,7 +5930,11 @@ virDomainDetachDeviceFlags(virDomainPtr domain, const char *xml, unsigned int flags) { virConnectPtr conn; - DEBUG("domain=%p, xml=%s, flags=%d", domain, xml, flags); + const char *name; + + name = virDomainGetName(domain); + + DEBUG("domain=%p, xml=%s, flags=%d, (VM: %s)", domain, xml, flags, name); virResetLastError(); @@ -5880,7 +5992,9 @@ virDomainUpdateDeviceFlags(virDomainPtr domain, const char *xml, unsigned int flags) { virConnectPtr conn; - DEBUG("domain=%p, xml=%s, flags=%d", domain, xml, flags); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, xml=%s, flags=%d, (VM: %s)", domain, xml, flags, name); virResetLastError(); @@ -6206,7 +6320,10 @@ error: virNetworkPtr virNetworkLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { - DEBUG("conn=%p, uuid=%s", conn, uuid); + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(uuid, uuidstr); + + DEBUG("conn=%p, uuid=%s", conn, uuidstr); virResetLastError(); @@ -11431,7 +11548,9 @@ error: */ int virDomainIsPersistent(virDomainPtr dom) { - DEBUG("dom=%p", dom); + const char *name = virDomainGetName(dom); + + DEBUG("domain=%p, (VM: %s)", dom, name); virResetLastError(); @@ -11464,7 +11583,9 @@ error: */ int virDomainIsUpdated(virDomainPtr dom) { - DEBUG("dom=%p", dom); + const char *name = virDomainGetName(dom); + + DEBUG("domain=%p, (VM: %s)", dom, name); virResetLastError(); @@ -12353,7 +12474,9 @@ int virDomainGetJobInfo(virDomainPtr domain, virDomainJobInfoPtr info) { virConnectPtr conn; - DEBUG("domain=%p, info=%p", domain, info); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, info=%p, (VM: %s)", domain, info, name); virResetLastError(); @@ -12401,8 +12524,9 @@ int virDomainAbortJob(virDomainPtr domain) { virConnectPtr conn; + const char *name = virDomainGetName(domain); - DEBUG("domain=%p", domain); + DEBUG("domain=%p, (VM: %s)", domain, name); virResetLastError(); @@ -12452,8 +12576,10 @@ virDomainMigrateSetMaxDowntime(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; + const char *name = virDomainGetName(domain); - DEBUG("domain=%p, downtime=%llu, flags=%u", domain, downtime, flags); + DEBUG("domain=%p, downtime=%llu, flags=%u, (VM: %s)", domain, + downtime, flags, name); virResetLastError(); @@ -12522,7 +12648,12 @@ virConnectDomainEventRegisterAny(virConnectPtr conn, void *opaque, virFreeCallback freecb) { - DEBUG("conn=%p dom=%p, eventID=%d, cb=%p, opaque=%p, freecb=%p", conn, dom, eventID, cb, opaque, freecb); + const char *name; + + name = virDomainGetName(dom); + + DEBUG("conn=%p, domain=%p, eventID=%d, cb=%p, opaque=%p, freecb=%p, (VM: %s)", + conn, dom, eventID, cb, opaque, freecb, name); virResetLastError(); if (!VIR_IS_CONNECT(conn)) { @@ -12614,8 +12745,9 @@ error: int virDomainManagedSave(virDomainPtr dom, unsigned int flags) { virConnectPtr conn; + const char *name = virDomainGetName(dom); - VIR_DEBUG("dom=%p, flags=%u", dom, flags); + VIR_DEBUG("dom%p, flags=%u, (VM: %s)", dom, flags, name); virResetLastError(); @@ -12662,8 +12794,9 @@ error: int virDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) { virConnectPtr conn; + const char *name = virDomainGetName(dom); - VIR_DEBUG("dom=%p, flags=%u", dom, flags); + VIR_DEBUG("dom=%p, flags=%u, (VM: %s)", dom, flags, name); virResetLastError(); @@ -12703,8 +12836,9 @@ error: int virDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags) { virConnectPtr conn; + const char *name = virDomainGetName(dom); - VIR_DEBUG("dom=%p, flags=%u", dom, flags); + VIR_DEBUG("dom=%p, flags=%u, (VM: %s)", dom, flags, name); virResetLastError(); @@ -12753,8 +12887,9 @@ virDomainSnapshotCreateXML(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; + const char *name = virDomainGetName(domain); - DEBUG("domain=%p, xmlDesc=%s, flags=%u", domain, xmlDesc, flags); + DEBUG("domain=%p, xmlDesc=%s, flags=%u, (VM: %s)", domain, xmlDesc, flags, name); virResetLastError(); @@ -12845,7 +12980,9 @@ int virDomainSnapshotNum(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - DEBUG("domain=%p", domain); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, (VM: %s)", domain, name); virResetLastError(); @@ -12887,9 +13024,10 @@ virDomainSnapshotListNames(virDomainPtr domain, char **names, int nameslen, unsigned int flags) { virConnectPtr conn; + const char *name = virDomainGetName(domain); - DEBUG("domain=%p, names=%p, nameslen=%d, flags=%u", - domain, names, nameslen, flags); + DEBUG("domain=%p, names=%p, nameslen=%d, flags=%u, (VM: %s)", + domain, names, nameslen, flags, name); virResetLastError(); @@ -12938,7 +13076,10 @@ virDomainSnapshotLookupByName(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - DEBUG("domain=%p, name=%s, flags=%u", domain, name, flags); + const char *domname = virDomainGetName(domain); + + DEBUG("domain=%p, name=%s, flags=%u, (VM: %s)", domain, name, + flags, domname); virResetLastError(); @@ -12982,7 +13123,9 @@ int virDomainHasCurrentSnapshot(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - DEBUG("domain=%p, flags=%u", domain, flags); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, flags=%u, (VM: %s)", domain, flags, name); virResetLastError(); @@ -13023,7 +13166,9 @@ virDomainSnapshotCurrent(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; - DEBUG("domain=%p, flags=%u", domain, flags); + const char *name = virDomainGetName(domain); + + DEBUG("domain=%p, flags=%u, (VM: %s)", domain, flags, name); virResetLastError(); @@ -13187,7 +13332,10 @@ int virDomainOpenConsole(virDomainPtr dom, unsigned int flags) { virConnectPtr conn; - DEBUG("dom=%p devname=%s, st=%p flags=%u", dom, NULLSTR(devname), st, flags); + const char *name = virDomainGetName(dom); + + DEBUG("dom=%p, devname=%s, st=%p, flags=%u, (VM: %s)", dom, + NULLSTR(devname), st, flags, name); virResetLastError(); -- 1.7.3.2

3 4

[libvirt] Back and suggested release schedule
by Daniel Veillard 24 Dec '10

24 Dec '10

Hello all, as some of you may have noticed, I'm back online, just in a very different timezone now ! I'm still behind on reading the list emails but a lot of the changes in the last month have been refactoring and cleanups, and maybe we ought to make a new release at the end of the month to try to catch possible regressions introduced as early as possible. What do people think of a new release for the new year, which would mean entering freeze over the week-end. My own testing will probably be limited as most of my machines are in boxes in a container somewhere, but I should be able to make a release :-) Also on the release name, should we go 0.9.0 considering the refactorings (i.e. indicating future patches will be harder to apply to earlier branches) or stick to 0.8.7 (considering that there isn't major feature improvement ... unless I missed them !), Opinions ? Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

6 16

[libvirt] [PATCH] spec: Automatically turn on cgconfig service
by Jiri Denemark 23 Dec '10

23 Dec '10

From: Daniel P. Berrange <berrange(a)redhat.com> A number of the libvirt APIs require the use of cgroups. This is not enabled by default on a RHEL6 install. After discussion with cgroups team, it was decided that upon installation of the libvirt RPM, we should automatically turn on the cgroups service. This will activate a default configuration that turns on all cgroups controllers libvirt requires for full operation. --- libvirt.spec.in | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 7c60eba..5ea3422 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -68,6 +68,7 @@ %define with_libnl 0%{!?_without_libnl:0} %define with_audit 0%{!?_without_audit:0} %define with_dtrace 0%{!?_without_dtrace:0} +%define with_cgconfig 0%{!?_without_cgconfig:0} # Non-server/HV driver defaults which are always enabled %define with_python 0%{!?_without_python:1} @@ -169,6 +170,13 @@ %define with_dtrace 1 %endif +# Pull in cgroups config system +%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 +%if %{with_qemu} || %{with_lxc} +%define with_cgconfig 0%{!?_without_cgconfig:1} +%endif +%endif + # Force QEMU to run as non-root %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 %define qemu_user qemu @@ -271,6 +279,9 @@ Requires: parted # For multipath support Requires: device-mapper %endif +%if %{with_cgconfig} +Requires: libcgroup +%endif %if %{with_xen} BuildRequires: xen-devel %endif @@ -725,6 +736,12 @@ then fi %endif +%if %{with_cgconfig} +if [ "$1" -eq "1" ]; then +/sbin/chkconfig cgconfig on +fi +%endif + /sbin/chkconfig --add libvirtd if [ "$1" -ge "1" ]; then /sbin/service libvirtd condrestart > /dev/null 2>&1 -- 1.7.3.4

3 3

[libvirt] [PATCH] spec: Enable ESX driver on RHEL
by Jiri Denemark 23 Dec '10

23 Dec '10

--- libvirt.spec.in | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 5ea3422..fd99a54 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -87,7 +87,7 @@ %define with_numactl 0 %endif -# RHEL doesn't ship OpenVZ, VBox, UML, OpenNebula, PowerHypervisor, ESX, +# RHEL doesn't ship OpenVZ, VBox, UML, OpenNebula, PowerHypervisor, # VMWare, or libxenserver (xenapi) %if 0%{?rhel} %define with_openvz 0 @@ -95,7 +95,6 @@ %define with_uml 0 %define with_one 0 %define with_phyp 0 -%define with_esx 0 %define with_vmware 0 %define with_xenapi 0 %endif -- 1.7.3.4

2 4

[libvirt] [PATCH] initgroups() in qemudOpenAsUID()
by Dan Kenigsberg 23 Dec '10

23 Dec '10

qemudOpenAsUID is intended to open a file with the credentials of a specified uid. Current implementation fails if the file is accessible to one of uid's groups but not owned by uid. This patch replaces the supplementary group list that the child process inherited from libvirtd with the default group list of uid. --- src/qemu/qemu_driver.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0ce2d40..a1027d4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6353,6 +6353,7 @@ parent_cleanup: char *buf = NULL; size_t bufsize = 1024 * 1024; int bytesread; + struct passwd *pwd; /* child doesn't need the read side of the pipe */ close(pipefd[0]); @@ -6365,6 +6366,21 @@ parent_cleanup: goto child_cleanup; } + /* we can avoid getpwuid_r() in threadless child */ + if ((pwd = getpwuid(uid)) == NULL) { + exit_code = errno; + virReportSystemError(errno, + _("cannot setuid(%d) to read '%s'"), + uid, path); + goto child_cleanup; + } + if (initgroups(pwd->pw_name, pwd->pw_gid) != 0) { + exit_code = errno; + virReportSystemError(errno, + _("cannot setuid(%d) to read '%s'"), + uid, path); + goto child_cleanup; + } if (setuid(uid) != 0) { exit_code = errno; virReportSystemError(errno, -- 1.7.2.3

5 21

[libvirt] [PATCH] spec: Really skip tests that don't work in mock build root
by Jiri Denemark 23 Dec '10

23 Dec '10

Two of the tests we want to skip are C tests and since we moved compiling tests to make check phase, replacing compiled binary with a no-op shell script before running make check doesn't really work for them. We need to replace the source of such tests. --- libvirt.spec.in | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index fd99a54..3889f5d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -700,8 +700,12 @@ cd tests for i in nodeinfotest daemon-conf seclabeltest do rm -f $i - printf "#!/bin/sh\nexit 0\n" > $i - chmod +x $i + if [ -f $i.c ]; then + echo 'int main(void) { return 0; }' > $i.c + else + printf "#!/bin/sh\nexit 0\n" > $i + chmod +x $i + fi done make check -- 1.7.3.4

2 2

[libvirt] [PATCH] docs: Make VMware Workstation / Player page appear in the menu
by Matthias Bolte 23 Dec '10

23 Dec '10

By adding it to sitemap.html.in. Also <ul> can't be nested in <p>. --- docs/drvvmware.html.in | 4 +++- docs/sitemap.html.in | 4 ++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/docs/drvvmware.html.in b/docs/drvvmware.html.in index 273e0a0..0ef6044 100644 --- a/docs/drvvmware.html.in +++ b/docs/drvvmware.html.in @@ -1,6 +1,6 @@ <html> <body> - <h1>VMware Workstation/Player hypervisors driver</h1> + <h1>VMware Workstation / Player hypervisors driver</h1> <p> The libvirt VMware Workstation driver should be able to manage any Workstation and Player version supported by the VMware VIX API. See the compatibility list @@ -15,10 +15,12 @@ <p> The libvirt VMware driver provides per-user drivers (the "session" instance). Two uris are available: + </p> <ul> <li>"vmwareplayer" for VMware Player</li> <li>"vmwarews" for VMware Workstation</li> </ul> + <p> Some example connection URIs for the driver are: </p> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index 63e420f..490450e 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -192,6 +192,10 @@ <a href="drvesx.html">VMware ESX</a> <span>Driver for VMware ESX</span> </li> + <li> + <a href="drvvmware.html">VMware Workstation / Player</a> + <span>Driver for VMware Workstation / Player</span> + </li> </ul> </li> <li> -- 1.7.0.4

2 2

[libvirt] [PATCH] qemu: Reparent children when deleting a snapshot
by Matthias Bolte 23 Dec '10

23 Dec '10

Shorten qemuDomainSnapshotWriteSnapshotMetadata function name and make it take a snapshot pointer instead of dealing with the current snapshot. Update other functions accordingly. Add a qemuDomainSnapshotReparentChildren hash iterator to reparent the children of a snapshot that is being deleted. Use qemuDomainSnapshotWriteMetadata to write updated metadata to disk. This fixes a problem where outdated parent information breaks the snapshot tree and hinders the deletion of child snapshots. Reported by Philipp Hahn. --- src/qemu/qemu_driver.c | 92 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 71 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 924446f..9b538a3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2607,10 +2607,10 @@ qemuPrepareMonitorChr(struct qemud_driver *driver, return 0; } -static int qemuDomainSnapshotSetActive(virDomainObjPtr vm, - char *snapshotDir); -static int qemuDomainSnapshotSetInactive(virDomainObjPtr vm, - char *snapshotDir); +static int qemuDomainSnapshotSetCurrentActive(virDomainObjPtr vm, + char *snapshotDir); +static int qemuDomainSnapshotSetCurrentInactive(virDomainObjPtr vm, + char *snapshotDir); #define START_POSTFIX ": starting up\n" @@ -2807,7 +2807,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, vm->current_snapshot, vmop))) goto cleanup; - if (qemuDomainSnapshotSetInactive(vm, driver->snapshotDir) < 0) + if (qemuDomainSnapshotSetCurrentInactive(vm, driver->snapshotDir) < 0) goto cleanup; /* now that we know it is about to start call the hook if present */ @@ -9472,8 +9472,9 @@ static char *qemuFindQemuImgBinary(void) return ret; } -static int qemuDomainSnapshotWriteSnapshotMetadata(virDomainObjPtr vm, - char *snapshotDir) +static int qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, + virDomainSnapshotObjPtr snapshot, + char *snapshotDir) { int fd = -1; char *newxml = NULL; @@ -9484,7 +9485,7 @@ static int qemuDomainSnapshotWriteSnapshotMetadata(virDomainObjPtr vm, char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(vm->def->uuid, uuidstr); - newxml = virDomainSnapshotDefFormat(uuidstr, vm->current_snapshot->def, 1); + newxml = virDomainSnapshotDefFormat(uuidstr, snapshot->def, 1); if (newxml == NULL) { virReportOOMError(); return -1; @@ -9501,8 +9502,7 @@ static int qemuDomainSnapshotWriteSnapshotMetadata(virDomainObjPtr vm, goto cleanup; } - if (virAsprintf(&snapFile, "%s/%s.xml", snapDir, - vm->current_snapshot->def->name) < 0) { + if (virAsprintf(&snapFile, "%s/%s.xml", snapDir, snapshot->def->name) < 0) { virReportOOMError(); goto cleanup; } @@ -9528,25 +9528,27 @@ cleanup: return ret; } -static int qemuDomainSnapshotSetActive(virDomainObjPtr vm, - char *snapshotDir) +static int qemuDomainSnapshotSetCurrentActive(virDomainObjPtr vm, + char *snapshotDir) { if (vm->current_snapshot) { vm->current_snapshot->def->active = 1; - return qemuDomainSnapshotWriteSnapshotMetadata(vm, snapshotDir); + return qemuDomainSnapshotWriteMetadata(vm, vm->current_snapshot, + snapshotDir); } return 0; } -static int qemuDomainSnapshotSetInactive(virDomainObjPtr vm, - char *snapshotDir) +static int qemuDomainSnapshotSetCurrentInactive(virDomainObjPtr vm, + char *snapshotDir) { if (vm->current_snapshot) { vm->current_snapshot->def->active = 0; - return qemuDomainSnapshotWriteSnapshotMetadata(vm, snapshotDir); + return qemuDomainSnapshotWriteMetadata(vm, vm->current_snapshot, + snapshotDir); } return 0; @@ -9686,8 +9688,9 @@ static virDomainSnapshotPtr qemuDomainSnapshotCreateXML(virDomainPtr domain, /* Now we set the new current_snapshot for the domain */ vm->current_snapshot = snap; - if (qemuDomainSnapshotWriteSnapshotMetadata(vm, driver->snapshotDir) < 0) - /* qemuDomainSnapshotWriteSnapshotMetadata set the error */ + if (qemuDomainSnapshotWriteMetadata(vm, vm->current_snapshot, + driver->snapshotDir) < 0) + /* qemuDomainSnapshotWriteMetadata set the error */ goto cleanup; snapshot = virGetDomainSnapshot(domain, snap->def->name); @@ -9941,13 +9944,13 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, goto endjob; } else { - if (qemuDomainSnapshotSetActive(vm, driver->snapshotDir) < 0) + if (qemuDomainSnapshotSetCurrentActive(vm, driver->snapshotDir) < 0) goto endjob; rc = qemudStartVMDaemon(snapshot->domain->conn, driver, vm, NULL, false, -1, NULL, VIR_VM_OP_CREATE); qemuDomainStartAudit(vm, "from-snapshot", rc >= 0); - if (qemuDomainSnapshotSetInactive(vm, driver->snapshotDir) < 0) + if (qemuDomainSnapshotSetCurrentInactive(vm, driver->snapshotDir) < 0) goto endjob; if (rc < 0) goto endjob; @@ -9991,7 +9994,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, } } - if (qemuDomainSnapshotSetActive(vm, driver->snapshotDir) < 0) + if (qemuDomainSnapshotSetCurrentActive(vm, driver->snapshotDir) < 0) goto endjob; } @@ -10128,6 +10131,43 @@ static void qemuDomainSnapshotDiscardChildren(void *payload, } } +struct snap_reparent { + struct qemud_driver *driver; + virDomainSnapshotObjPtr snap; + virDomainObjPtr vm; + int err; +}; + +static void +qemuDomainSnapshotReparentChildren(void *payload, + const char *name ATTRIBUTE_UNUSED, + void *data) +{ + virDomainSnapshotObjPtr snap = payload; + struct snap_reparent *rep = data; + + if (rep->err < 0) { + return; + } + + if (snap->def->parent && STREQ(snap->def->parent, rep->snap->def->name)) { + VIR_FREE(snap->def->parent); + + if (rep->snap->def->parent != NULL) { + snap->def->parent = strdup(rep->snap->def->parent); + + if (snap->def->parent == NULL) { + virReportOOMError(); + rep->err = -1; + return; + } + } + + rep->err = qemuDomainSnapshotWriteMetadata(rep->vm, snap, + rep->driver->snapshotDir); + } +} + static int qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot, unsigned int flags) { @@ -10137,6 +10177,7 @@ static int qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot, virDomainSnapshotObjPtr snap = NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; struct snap_remove rem; + struct snap_reparent rep; virCheckFlags(VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN, -1); @@ -10169,6 +10210,15 @@ static int qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot, &rem); if (rem.err < 0) goto endjob; + } else { + rep.driver = driver; + rep.snap = snap; + rep.vm = vm; + rep.err = 0; + virHashForEach(vm->snapshots.objs, qemuDomainSnapshotReparentChildren, + &rep); + if (rep.err < 0) + goto endjob; } ret = qemuDomainSnapshotDiscard(driver, vm, snap); -- 1.7.0.4

3 4

[libvirt] [Patch v5] Add VMware Workstation and Player driver
by Jean-Baptiste Rouault 23 Dec '10

23 Dec '10

* Changes since v4: Fix a bug and a memory leak in vmwareParsePath() Remove domainSave/Restore functions because more work is needed on them

4 11

[libvirt] [PATCH] virsh: Add --force option to update-device
by Jiri Denemark 23 Dec '10

23 Dec '10

--- tools/virsh.c | 5 +++++ tools/virsh.pod | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 4e37f2d..774d937 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -8293,6 +8293,7 @@ static const vshCmdOptDef opts_update_device[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("XML file")}, {"persistent", VSH_OT_BOOL, 0, N_("persist device update")}, + {"force", VSH_OT_BOOL, 0, N_("force device update")}, {NULL, 0, 0, NULL} }; @@ -8331,6 +8332,10 @@ cmdUpdateDevice(vshControl *ctl, const vshCmd *cmd) } else { flags = VIR_DOMAIN_DEVICE_MODIFY_LIVE; } + + if (vshCommandOptBool(cmd, "force")) + flags |= VIR_DOMAIN_DEVICE_MODIFY_FORCE; + ret = virDomainUpdateDeviceFlags(dom, buffer, flags); VIR_FREE(buffer); diff --git a/tools/virsh.pod b/tools/virsh.pod index 9cb6829..9c45a61 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -731,12 +731,14 @@ I<type> can be either I<network> to indicate a physical network device or I<brid It is recommended to use the I<mac> option to distinguish between the interfaces if more than one are present on the domain. -=item B<update-device> I<domain-id> I<file> optional I<--persistent> - -Update the characteristics of a device associated with I<domain-id>, -based on the device definition in an XML I<file>. If the I<--persistent> -option is used, the changes will affect the next boot of the domain. -See the documentation to learn about libvirt XML format for a device. +=item B<update-device> I<domain-id> I<file> optional I<--persistent> I<--force> + +Update the characteristics of a device associated with I<domain-id>, based on +the device definition in an XML I<file>. If the I<--persistent> option is +used, the changes will affect the next boot of the domain. The I<--force> +option can be used to force device update, e.g., to eject a CD-ROM even if it +is locked/mounted in the domain. See the documentation to learn about libvirt +XML format for a device. =back -- 1.7.3.4

2 2