- Devel - libvirt List Archives

[libvirt] [PATCH] hash: make virHashFree more free-like
by Eric Blake 21 Feb '11

21 Feb '11

Two-argument free functions are uncommon; match the style elsewhere by caching the callback at creation. * src/util/hash.h (virHashCreate, virHashFree): Move deallocator argument to creation. * cfg.mk (useless_free_options): Add virHashFree. * src/util/hash.c (_virHashTable): Track deallocator. (virHashCreate, virHashFree): Update to new signature. * src/conf/domain_conf.c (virDomainObjListDeinit) (virDomainObjListInit, virDomainDiskDefForeachPath) (virDomainSnapshotObjListDeinit, virDomainSnapshotObjListInit): Update callers. * src/conf/nwfilter_params.c (virNWFilterHashTableFree) (virNWFilterHashTableCreate): Likewise. * src/conf/nwfilter_conf.c (virNWFilterTriggerVMFilterRebuild): Likewise. * src/cpu/cpu_generic.c (genericHashFeatures, genericBaseline): Likewise. * src/xen/xm_internal.c (xenXMOpen, xenXMClose): Likewise. * src/nwfilter/nwfilter_learnipaddr.c (virNWFilterLearnInit) (virNWFilterLearnShutdown): Likewise. * src/qemu/qemu_command.c (qemuDomainPCIAddressSetCreate) (qemuDomainPCIAddressSetFree): Likewise. * src/qemu/qemu_process.c (qemuProcessWaitForMonitor): Likewise. --- Requires that this be applied first: https://www.redhat.com/archives/libvir-list/2011-February/msg00784.html cfg.mk | 1 + src/conf/domain_conf.c | 49 ++++++++++++++++++---------------- src/conf/nwfilter_conf.c | 6 ++-- src/conf/nwfilter_params.c | 5 ++- src/cpu/cpu_generic.c | 10 +++--- src/nwfilter/nwfilter_learnipaddr.c | 9 +++--- src/qemu/qemu_command.c | 16 ++++++----- src/qemu/qemu_process.c | 4 +- src/util/hash.c | 14 +++++---- src/util/hash.h | 9 +++--- src/xen/xm_internal.c | 12 ++++---- 11 files changed, 73 insertions(+), 62 deletions(-) diff --git a/cfg.mk b/cfg.mk index f870723..1bb9cbb 100644 --- a/cfg.mk +++ b/cfg.mk @@ -106,6 +106,7 @@ useless_free_options = \ --name=virDomainSoundDefFree \ --name=virDomainVideoDefFree \ --name=virDomainWatchdogDefFree \ + --name=virHashFree \ --name=virInterfaceDefFree \ --name=virInterfaceIpDefFree \ --name=virInterfaceObjFree \ diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e7c3409..b97c1f0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -391,26 +391,27 @@ VIR_ENUM_IMPL(virDomainTimerMode, VIR_DOMAIN_TIMER_MODE_LAST, #define VIR_DOMAIN_XML_WRITE_FLAGS VIR_DOMAIN_XML_SECURE #define VIR_DOMAIN_XML_READ_FLAGS VIR_DOMAIN_XML_INACTIVE +static void +virDomainObjListDeallocator(void *payload, const char *name ATTRIBUTE_UNUSED) +{ + virDomainObjPtr obj = payload; + virDomainObjLock(obj); + if (virDomainObjUnref(obj) > 0) + virDomainObjUnlock(obj); +} + int virDomainObjListInit(virDomainObjListPtr doms) { - doms->objs = virHashCreate(50); + doms->objs = virHashCreate(50, virDomainObjListDeallocator); if (!doms->objs) return -1; return 0; } -static void virDomainObjListDeallocator(void *payload, const char *name ATTRIBUTE_UNUSED) -{ - virDomainObjPtr obj = payload; - virDomainObjLock(obj); - if (virDomainObjUnref(obj) > 0) - virDomainObjUnlock(obj); -} - void virDomainObjListDeinit(virDomainObjListPtr doms) { - virHashFree(doms->objs, virDomainObjListDeallocator); + virHashFree(doms->objs); } @@ -8751,25 +8752,27 @@ virDomainSnapshotObjPtr virDomainSnapshotAssignDef(virDomainSnapshotObjListPtr s } /* Snapshot Obj List functions */ +static void +virDomainSnapshotObjListDeallocator(void *payload, + const char *name ATTRIBUTE_UNUSED) +{ + virDomainSnapshotObjPtr obj = payload; + + virDomainSnapshotObjUnref(obj); +} + int virDomainSnapshotObjListInit(virDomainSnapshotObjListPtr snapshots) { - snapshots->objs = virHashCreate(50); + snapshots->objs = virHashCreate(50, virDomainSnapshotObjListDeallocator); if (!snapshots->objs) return -1; return 0; } -static void virDomainSnapshotObjListDeallocator(void *payload, - const char *name ATTRIBUTE_UNUSED) -{ - virDomainSnapshotObjPtr obj = payload; - - virDomainSnapshotObjUnref(obj); -} - -static void virDomainSnapshotObjListDeinit(virDomainSnapshotObjListPtr snapshots) +static void +virDomainSnapshotObjListDeinit(virDomainSnapshotObjListPtr snapshots) { - virHashFree(snapshots->objs, virDomainSnapshotObjListDeallocator); + virHashFree(snapshots->objs); } struct virDomainSnapshotNameData { @@ -9002,7 +9005,7 @@ int virDomainDiskDefForeachPath(virDomainDiskDefPtr disk, } } - paths = virHashCreate(5); + paths = virHashCreate(5, NULL); do { virStorageFileMetadata meta; @@ -9070,7 +9073,7 @@ int virDomainDiskDefForeachPath(virDomainDiskDefPtr disk, ret = 0; cleanup: - virHashFree(paths, NULL); + virHashFree(paths); VIR_FREE(nextpath); return ret; diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index c6a4d6f..1f250e9 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2,7 +2,7 @@ * nwfilter_conf.c: network filter XML processing * (derived from storage_conf.c) * - * Copyright (C) 2006-2010 Red Hat, Inc. + * Copyright (C) 2006-2011 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * Copyright (C) 2010 IBM Corporation @@ -2297,7 +2297,7 @@ virNWFilterTriggerVMFilterRebuild(virConnectPtr conn) .conn = conn, .err = 0, .step = STEP_APPLY_NEW, - .skipInterfaces = virHashCreate(0), + .skipInterfaces = virHashCreate(0, NULL), }; if (!cb.skipInterfaces) @@ -2328,7 +2328,7 @@ virNWFilterTriggerVMFilterRebuild(virConnectPtr conn) &cb); } - virHashFree(cb.skipInterfaces, NULL); + virHashFree(cb.skipInterfaces); return err; } diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 23423fa..cd94b30 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -1,6 +1,7 @@ /* * nwfilter_params.c: parsing and data maintenance of filter parameters * + * Copyright (C) 2011 Red Hat, Inc. * Copyright (C) 2010 IBM Corporation * * This library is free software; you can redistribute it and/or @@ -102,7 +103,7 @@ virNWFilterHashTableFree(virNWFilterHashTablePtr table) int i; if (!table) return; - virHashFree(table->hashTable, hashDealloc); + virHashFree(table->hashTable); for (i = 0; i < table->nNames; i++) VIR_FREE(table->names[i]); @@ -119,7 +120,7 @@ virNWFilterHashTableCreate(int n) { virReportOOMError(); return NULL; } - ret->hashTable = virHashCreate(n); + ret->hashTable = virHashCreate(n, hashDealloc); if (!ret->hashTable) { VIR_FREE(ret); return NULL; diff --git a/src/cpu/cpu_generic.c b/src/cpu/cpu_generic.c index a39f262..a98b109 100644 --- a/src/cpu/cpu_generic.c +++ b/src/cpu/cpu_generic.c @@ -2,7 +2,7 @@ * cpu_generic.c: CPU manipulation driver for architectures which are not * handled by their own driver * - * Copyright (C) 2009--2010 Red Hat, Inc. + * Copyright (C) 2009-2011 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -39,14 +39,14 @@ genericHashFeatures(virCPUDefPtr cpu) virHashTablePtr hash; unsigned int i; - if ((hash = virHashCreate(cpu->nfeatures)) == NULL) + if ((hash = virHashCreate(cpu->nfeatures, NULL)) == NULL) return NULL; for (i = 0; i < cpu->nfeatures; i++) { if (virHashAddEntry(hash, cpu->features[i].name, cpu->features + i)) { - virHashFree(hash, NULL); + virHashFree(hash); return NULL; } } @@ -105,7 +105,7 @@ genericCompare(virCPUDefPtr host, ret = VIR_CPU_COMPARE_IDENTICAL; cleanup: - virHashFree(hash, NULL); + virHashFree(hash); return ret; } @@ -178,7 +178,7 @@ genericBaseline(virCPUDefPtr *cpus, } } - virHashFree(hash, NULL); + virHashFree(hash); } if (VIR_ALLOC_N(cpu->features, count) < 0) diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 02af918..8bd7b50 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -2,6 +2,7 @@ * nwfilter_learnipaddr.c: support for learning IP address used by a VM * on an interface * + * Copyright (C) 2011 Red Hat, Inc. * Copyright (C) 2010 IBM Corp. * Copyright (C) 2010 Stefan Berger * @@ -822,7 +823,7 @@ virNWFilterLearnInit(void) { threadsTerminate = false; - pendingLearnReq = virHashCreate(0); + pendingLearnReq = virHashCreate(0, freeLearnReqEntry); if (!pendingLearnReq) { return 1; } @@ -844,7 +845,7 @@ virNWFilterLearnInit(void) { return 1; } - ifaceLockMap = virHashCreate(0); + ifaceLockMap = virHashCreate(0, freeIfaceLock); if (!ifaceLockMap) { virNWFilterLearnShutdown(); return 1; @@ -879,12 +880,12 @@ virNWFilterLearnShutdown(void) { virNWFilterLearnThreadsTerminate(false); - virHashFree(pendingLearnReq, freeLearnReqEntry); + virHashFree(pendingLearnReq); pendingLearnReq = NULL; virNWFilterHashTableFree(ipAddressMap); ipAddressMap = NULL; - virHashFree(ifaceLockMap, freeIfaceLock); + virHashFree(ifaceLockMap); ifaceLockMap = NULL; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0db2843..a41859c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -745,6 +745,13 @@ cleanup: } +static void +qemuDomainPCIAddressSetFreeEntry(void *payload, + const char *name ATTRIBUTE_UNUSED) +{ + VIR_FREE(payload); +} + qemuDomainPCIAddressSetPtr qemuDomainPCIAddressSetCreate(virDomainDefPtr def) { qemuDomainPCIAddressSetPtr addrs; @@ -752,7 +759,7 @@ qemuDomainPCIAddressSetPtr qemuDomainPCIAddressSetCreate(virDomainDefPtr def) if (VIR_ALLOC(addrs) < 0) goto no_memory; - if (!(addrs->used = virHashCreate(10))) + if (!(addrs->used = virHashCreate(10, qemuDomainPCIAddressSetFreeEntry))) goto error; if (virDomainDeviceInfoIterate(def, qemuCollectPCIAddress, addrs) < 0) @@ -823,11 +830,6 @@ int qemuDomainPCIAddressEnsureAddr(qemuDomainPCIAddressSetPtr addrs, return ret; } -static void qemuDomainPCIAddressSetFreeEntry(void *payload, const char *name ATTRIBUTE_UNUSED) -{ - VIR_FREE(payload); -} - int qemuDomainPCIAddressReleaseAddr(qemuDomainPCIAddressSetPtr addrs, virDomainDeviceInfoPtr dev) @@ -852,7 +854,7 @@ void qemuDomainPCIAddressSetFree(qemuDomainPCIAddressSetPtr addrs) if (!addrs) return; - virHashFree(addrs->used, qemuDomainPCIAddressSetFreeEntry); + virHashFree(addrs->used); VIR_FREE(addrs); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 31e3c60..9c5ea63 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -994,7 +994,7 @@ qemuProcessWaitForMonitor(struct qemud_driver* driver, * reliable if it's available. * Note that the monitor itself can be on a pty, so we still need to try the * log output method. */ - paths = virHashCreate(0); + paths = virHashCreate(0, qemuProcessFreePtyPath); if (paths == NULL) goto cleanup; @@ -1008,7 +1008,7 @@ qemuProcessWaitForMonitor(struct qemud_driver* driver, ret = qemuProcessFindCharDevicePTYsMonitor(vm, paths); cleanup: - virHashFree(paths, qemuProcessFreePtyPath); + virHashFree(paths); if (kill(vm->pid, 0) == -1 && errno == ESRCH) { /* VM is dead, any other error raised in the interim is probably diff --git a/src/util/hash.c b/src/util/hash.c index 9497b60..d7950b9 100644 --- a/src/util/hash.c +++ b/src/util/hash.c @@ -55,6 +55,7 @@ struct _virHashTable { struct _virHashEntry *table; int size; int nbElems; + virHashDeallocator f; }; /* @@ -80,13 +81,14 @@ virHashComputeKey(virHashTablePtr table, const char *name) /** * virHashCreate: * @size: the size of the hash table + * @deallocator: function to call on each entry during virHashFree * * Create a new virHashTablePtr. * * Returns the newly created object, or NULL if an error occured. */ virHashTablePtr -virHashCreate(int size) +virHashCreate(int size, virHashDeallocator deallocator) { virHashTablePtr table = NULL; @@ -100,6 +102,7 @@ virHashCreate(int size) table->size = size; table->nbElems = 0; + table->f = deallocator; if (VIR_ALLOC_N(table->table, size) < 0) { virReportOOMError(); VIR_FREE(table); @@ -203,13 +206,12 @@ virHashGrow(virHashTablePtr table, int size) /** * virHashFree: * @table: the hash table - * @f: the deallocator function for items in the hash * * Free the hash @table and its contents. The userdata is - * deallocated with @f if provided. + * deallocated with function provided at creation time. */ void -virHashFree(virHashTablePtr table, virHashDeallocator f) +virHashFree(virHashTablePtr table) { int i; virHashEntryPtr iter; @@ -228,8 +230,8 @@ virHashFree(virHashTablePtr table, virHashDeallocator f) inside_table = 1; while (iter) { next = iter->next; - if ((f != NULL) && (iter->payload != NULL)) - f(iter->payload, iter->name); + if ((table->f != NULL) && (iter->payload != NULL)) + table->f(iter->payload, iter->name); VIR_FREE(iter->name); iter->payload = NULL; if (!inside_table) diff --git a/src/util/hash.h b/src/util/hash.h index b0ef441..cf08e1a 100644 --- a/src/util/hash.h +++ b/src/util/hash.h @@ -3,7 +3,7 @@ * Description: This module implements the hash table and allocation and * deallocation of domains and connections * - * Copy: Copyright (C) 2005 Red Hat, Inc. + * Copy: Copyright (C) 2005, 2011 Red Hat, Inc. * * Author: Bjorn Reese <bjorn.reese(a)systematic.dk> * Daniel Veillard <veillard(a)redhat.com> @@ -49,13 +49,14 @@ typedef void (*virHashIterator) (void *payload, const char *name, void *data); * Returns 1 if the hash entry is desired, 0 to move * to next entry */ -typedef int (*virHashSearcher) (const void *payload, const char *name, const void *data); +typedef int (*virHashSearcher) (const void *payload, const char *name, + const void *data); /* * Constructor and destructor. */ -virHashTablePtr virHashCreate(int size); -void virHashFree(virHashTablePtr table, virHashDeallocator f); +virHashTablePtr virHashCreate(int size, virHashDeallocator f); +void virHashFree(virHashTablePtr table); int virHashSize(virHashTablePtr table); /* diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 242a7de..bc304f0 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1,7 +1,7 @@ /* * xm_internal.h: helper routines for dealing with inactive domains * - * Copyright (C) 2006-2007, 2009-2010 Red Hat, Inc. + * Copyright (C) 2006-2007, 2009-2011 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -587,12 +587,12 @@ xenXMOpen (virConnectPtr conn, priv->configDir = XM_CONFIG_DIR; - priv->configCache = virHashCreate(50); + priv->configCache = virHashCreate(50, xenXMConfigFree); if (!priv->configCache) return (-1); - priv->nameConfigMap = virHashCreate(50); + priv->nameConfigMap = virHashCreate(50, NULL); if (!priv->nameConfigMap) { - virHashFree(priv->configCache, NULL); + virHashFree(priv->configCache); priv->configCache = NULL; return (-1); } @@ -611,8 +611,8 @@ xenXMOpen (virConnectPtr conn, int xenXMClose(virConnectPtr conn) { xenUnifiedPrivatePtr priv = conn->privateData; - virHashFree(priv->nameConfigMap, NULL); - virHashFree(priv->configCache, xenXMConfigFree); + virHashFree(priv->nameConfigMap); + virHashFree(priv->configCache); return (0); } -- 1.7.4

2 2

Re: [libvirt] [libvirt-php] rewrite checking for libxml2
by Lyre 21 Feb '11

21 Feb '11

> > I don't think you're supposed to inline pkg.m4 within aclocal... I didn't check it carefully. But it was generated by autoreconf -fi, I'm not quite sure what exactly it did.

4 3

[libvirt] [PATCH] build: Fix API docs generation in VPATH build
by Jiri Denemark 21 Feb '11

21 Feb '11

--- docs/Makefile.am | 12 ++++++++---- docs/devhelp/devhelp.xsl | 7 +++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index adf74ee..c4926d4 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -88,7 +88,10 @@ EXTRA_DIST= \ sitemap.html.in \ todo.pl todo.cfg-example -MAINTAINERCLEANFILES = $(dot_html) $(apihtml) $(devhelphtml) +MAINTAINERCLEANFILES = \ + $(addprefix $(srcdir)/,$(dot_html)) \ + $(addprefix $(srcdir)/,$(apihtml)) \ + $(addprefix $(srcdir)/,$(devhelphtml)) all: web @@ -146,19 +149,20 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in -@if [ -x $(XSLTPROC) ] ; then \ echo "Rebuilding the HTML pages from the XML API" ; \ - $(XSLTPROC) --nonet $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi + $(XSLTPROC) --nonet -o $(srcdir)/ \ + $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi -@if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \ if $(XMLCATALOG) '$(XML_CATALOG_FILE)' "-//W3C//DTD XHTML 1.0 Strict//EN" \ > /dev/null ; then \ echo "Validating the resulting XHTML pages" ; \ SGML_CATALOG_FILES='$(XML_CATALOG_FILE)' \ - $(XMLLINT) --catalogs --nonet --valid --noout html/*.html ; \ + $(XMLLINT) --catalogs --nonet --valid --noout $(srcdir)/html/*.html ; \ else echo "missing XHTML1 DTD" ; fi ; fi $(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl) -@echo Rebuilding devhelp files -@if [ -x $(XSLTPROC) ] ; then \ - $(XSLTPROC) --nonet -o devhelp/libvirt.devhelp \ + $(XSLTPROC) --nonet -o $(srcdir)/devhelp/ \ $(top_srcdir)/docs/devhelp/devhelp.xsl $(srcdir)/libvirt-api.xml ; fi python_generated_files = \ diff --git a/docs/devhelp/devhelp.xsl b/docs/devhelp/devhelp.xsl index 6600f5f..add5794 100644 --- a/docs/devhelp/devhelp.xsl +++ b/docs/devhelp/devhelp.xsl @@ -13,6 +13,13 @@  <xsl:key name="symbols" match="/api/symbols/*" use="@name"/> + <xsl:template match="/"> + <xsl:document xmlns="http://www.devhelp.net/book" href="libvirt.devhelp" + method="xml" encoding="UTF-8" indent="yes"> + <xsl:apply-templates/> + </xsl:document> + </xsl:template> + <xsl:template match="/api"> <book title="{@name} Reference Manual" link="index.html" author="" name="{@name}"> <xsl:apply-templates select="files"/> -- 1.7.4.1

3 4

[libvirt] RFC: make <mac> element required?
by Michal Prívozník 21 Feb '11

21 Feb '11

Hi, I am about to fix https://bugzilla.redhat.com/show_bug.cgi?id=616721 It seems to me that problem is libvirt inserts a new element <mac address='...'> during parsing interface XML with random mac address which result in error described in BZ. I am not sure wheter to fix it just in virsh or in virDomainDetachDevice() as well. If in virsh, then other application may fail without knowing why. But isn't the second option too aggressive? Michal Privoznik

2 1

[libvirt] hash.c patches
by Christophe Fergeau 21 Feb '11

21 Feb '11

Hi, I recently started looking at libvirt code, and while reading hash.c, I noticed a few buglets and some cleanup that could be done. I was planning to test them carefully before sending them (ie make sure there's a unit test for this code), but since I don't know when I have time for that, and since make check and make syntax-check are passing, I'm just sending them for an initial review :) If you prefer the patches inline/in separate mails, just let me know. Thanks! Christophe

6 28

[libvirt] Vietnamese Translation for libvirt
by Hero Phương 21 Feb '11

21 Feb '11

Dear libvirt-list, I want to send my translation to upstream. But I have waited for being approved in translation site ( https://translate.fedoraproject.org/projects/p/libvirt/access/rq/add/) for a long time. Does anyone here have the responsibility for approving membership for libvirt translation? Please help me! Regards, HeroP

2 2

[libvirt] [PATCH] build: Fix VPATH build
by Jiri Denemark 21 Feb '11

21 Feb '11

Even VPATH make dist succeeds now --- docs/Makefile.am | 8 ++++---- docs/apibuild.py | 23 +++++++++++++---------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 473bbbf..8c96e79 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -92,7 +92,7 @@ MAINTAINERCLEANFILES = $(dot_html) $(apihtml) $(devhelphtml) all: web -api: libvirt-api.xml libvirt-refs.xml +api: $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml web: $(dot_html) html/index.html devhelp/index.html @@ -146,7 +146,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in -@if [ -x $(XSLTPROC) ] ; then \ echo "Rebuilding the HTML pages from the XML API" ; \ - $(XSLTPROC) --nonet $(srcdir)/newapi.xsl libvirt-api.xml ; fi + $(XSLTPROC) --nonet $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi -@if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \ if $(XMLCATALOG) '$(XML_CATALOG_FILE)' "-//W3C//DTD XHTML 1.0 Strict//EN" \ > /dev/null ; then \ @@ -159,7 +159,7 @@ $(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl) -@echo Rebuilding devhelp files -@if [ -x $(XSLTPROC) ] ; then \ $(XSLTPROC) --nonet -o devhelp/libvirt.devhelp \ - $(top_srcdir)/docs/devhelp/devhelp.xsl libvirt-api.xml ; fi + $(top_srcdir)/docs/devhelp/devhelp.xsl $(srcdir)/libvirt-api.xml ; fi python_generated_files = \ $(srcdir)/html/libvirt-libvirt.html \ @@ -179,7 +179,7 @@ clean-local: rm -f *~ *.bak *.hierarchy *.signals *-unused.txt *.html maintainer-clean-local: clean-local - rm -rf libvirt-api.xml libvirt-refs.xml todo.html.in + rm -rf $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml todo.html.in rebuild: api all diff --git a/docs/apibuild.py b/docs/apibuild.py index 62b7557..895a313 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -1614,8 +1614,9 @@ class CParser: class docBuilder: """A documentation builder""" - def __init__(self, name, directories=['.'], includes=[]): + def __init__(self, name, path='.', directories=['.'], includes=[]): self.name = name + self.path = path self.directories = directories self.includes = includes + included_files.keys() self.modules = {} @@ -2062,7 +2063,7 @@ class docBuilder: output.write(" </index>\n") def serialize(self): - filename = "%s-api.xml" % self.name + filename = "%s/%s-api.xml" % (self.path, self.name) print "Saving XML description %s" % (filename) output = open(filename, "w") output.write('<?xml version="1.0" encoding="ISO-8859-1"?>\n') @@ -2098,7 +2099,7 @@ class docBuilder: output.write("</api>\n") output.close() - filename = "%s-refs.xml" % self.name + filename = "%s/%s-refs.xml" % (self.path, self.name) print "Saving XML Cross References %s" % (filename) output = open(filename, "w") output.write('<?xml version="1.0" encoding="ISO-8859-1"?>\n') @@ -2113,14 +2114,16 @@ def rebuild(): srcdir = os.environ["srcdir"] if glob.glob(srcdir + "/../src/libvirt.c") != [] : print "Rebuilding API description for libvirt" - builder = docBuilder("libvirt", - [srcdir + "/../src", - srcdir + "/../src/util", - srcdir + "/../include/libvirt"], - []) + dirs = [srcdir + "/../src", + srcdir + "/../src/util", + srcdir + "/../include/libvirt"] + if glob.glob(srcdir + "/../include/libvirt/libvirt.h") == [] : + dirs.append("../include/libvirt") + builder = docBuilder("libvirt", srcdir, dirs, []) elif glob.glob("src/libvirt.c") != [] : - print "Rebuilding API description for libvir" - builder = docBuilder("libvirt", ["src", "src/util", "include/libvirt"], + print "Rebuilding API description for libvirt" + builder = docBuilder("libvirt", srcdir, + ["src", "src/util", "include/libvirt"], []) else: print "rebuild() failed, unable to guess the module" -- 1.7.4.1

3 11

[libvirt] libvirt-ask
by stone1927 21 Feb '11

21 Feb '11

windows7 connect to linux/kvm by libvirt that is always failure.sothere, I want to know why? Why use qemu+tcp:// connect to linux/kvm is failure.

4 4

[libvirt] [PATCH 0/6 v3] Add blkio cgroup support
by Gui Jianfeng 21 Feb '11

21 Feb '11

Hi This patchset adds blkio cgroup support for qemu and lxc. [PATCH 1/6] cgroup: Enable cgroup hierarchy for blkio cgroup [PATCH 2/6 v3] cgroup: Implement blkio.weight tuning API. [PATCH 3/6] Update XML Schema for new entries. [PATCH 4/6 v3] qemu: Implement blkio tunable XML configuration and parsing. [PATCH 5/6 v3] LXC: LXC Blkio weight configuration support. [PATCH 6/6] Add documentation for blkiotune elements. Will post a patchset to implement virsh command "blkiotune" to tune blkio cgroup parameter later on. v2 -> v3 Changes: o Remove an unused local variable o Rename virCgroup(Set/Get)Weight to virCgroup(Set/Get)BlkioWeight o Add documentation in docs/formatdomain.html.in o Update XML Schema for new entries. docs/formatdomain.html.in | 10 ++++++++++ docs/schemas/domain.rng | 20 ++++++++++++++++++++ src/conf/domain_conf.c | 13 +++++++++++++ src/conf/domain_conf.h | 4 ++++ src/libvirt_private.syms | 2 ++ src/lxc/lxc_controller.c | 10 ++++++++++ src/qemu/qemu_cgroup.c | 16 +++++++++++++++- src/qemu/qemu_conf.c | 3 ++- src/util/cgroup.c | 41 ++++++++++++++++++++++++++++++++++++++++- src/util/cgroup.h | 4 ++++ 10 files changed, 120 insertions(+), 3 deletions(-) Thanks Gui

4 29

[libvirt] [libvirt-php] domains: added autostart and is active
by Lyre 21 Feb '11

21 Feb '11

This patch added following functions for domain: * integer libvirt_domain_get_autostart(resource $domain) return 1, 0, and -1 indicates true, false, and error. * bool libvirt_domain_set_autostart(resource $domain, bool $autosatrt) return ture on succeess and false on failure. * integer libvirt_domain_is_active(resource $domain) return 1, 0, and -1 indicates true, false, and error. modified: src/libvirt.c modified: src/php_libvirt.h --- src/libvirt.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- src/php_libvirt.h | 3 +++ 2 files changed, 47 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 570511e..748d898 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -63,6 +63,9 @@ static function_entry libvirt_functions[] = { PHP_FE(libvirt_domain_memory_stats,NULL) PHP_FE(libvirt_domain_block_stats,NULL) PHP_FE(libvirt_domain_interface_stats,NULL) + PHP_FE(libvirt_domain_get_autostart, NULL) + PHP_FE(libvirt_domain_set_autostart, NULL) + PHP_FE(libvirt_domain_is_active, NULL) PHP_FE(libvirt_version,NULL) PHP_FE(libvirt_domain_get_connect, NULL) PHP_FE(libvirt_domain_migrate, NULL) @@ -70,7 +73,7 @@ static function_entry libvirt_functions[] = { PHP_FE(libvirt_domain_get_job_info, NULL) PHP_FE(libvirt_domain_xml_xpath, NULL) PHP_FE(libvirt_domain_get_block_info, NULL) - PHP_FE(libvirt_domain_get_network_info, NULL) + PHP_FE(libvirt_domain_get_network_info, NULL) PHP_FE(libvirt_list_storagepools,NULL) PHP_FE(libvirt_storagepool_lookup_by_name,NULL) PHP_FE(libvirt_storagepool_list_volumes,NULL) @@ -2200,6 +2203,46 @@ PHP_FUNCTION(libvirt_domain_interface_stats) LONGLONG_ASSOC(return_value, "tx_drop", stats.tx_drop); } +PHP_FUNCTION(libvirt_domain_get_autostart) +{ + php_libvirt_domain *domain = NULL; + zval *zdomain; + int flags = 0; + + GET_DOMAIN_FROM_ARGS ("r", &zdomain); + + if (virDomainGetAutostart (domain->domain, &flags) != 0) + { + RETURN_LONG (-1); + } + RETURN_LONG ((long)flags); +} + +PHP_FUNCTION(libvirt_domain_set_autostart) +{ + php_libvirt_domain *domain = NULL; + zval *zdomain; + zend_bool flags = 0; + + GET_DOMAIN_FROM_ARGS ("rb", &zdomain, &flags); + + if (virDomainSetAutostart (domain->domain, flags) != 0) + { + RETURN_FALSE; + } + RETURN_TRUE; +} + +PHP_FUNCTION(libvirt_domain_is_active) +{ + php_libvirt_domain *domain = NULL; + zval *zdomain; + + GET_DOMAIN_FROM_ARGS ("r", &zdomain); + + RETURN_LONG (virDomainIsActive(domain->domain)); +} + PHP_FUNCTION(libvirt_version) { unsigned long libVer; diff --git a/src/php_libvirt.h b/src/php_libvirt.h index 054df46..213d27f 100644 --- a/src/php_libvirt.h +++ b/src/php_libvirt.h @@ -107,6 +107,9 @@ PHP_FUNCTION(libvirt_domain_memory_peek); PHP_FUNCTION(libvirt_domain_memory_stats); PHP_FUNCTION(libvirt_domain_block_stats); PHP_FUNCTION(libvirt_domain_interface_stats); +PHP_FUNCTION(libvirt_domain_get_autostart); +PHP_FUNCTION(libvirt_domain_set_autostart); +PHP_FUNCTION(libvirt_domain_is_active); PHP_FUNCTION(libvirt_version); PHP_FUNCTION(libvirt_domain_get_connect); PHP_FUNCTION(libvirt_domain_migrate); -- 1.7.1

1 0