- Devel - libvirt List Archives

[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

[libvirt] [libvirt-php 0/2] Another update for building system
by Lyre 21 Feb '11

21 Feb '11

Hi all: This patch updeted the building system. * Added necessary checkings in configure.ac * Cleared up libvirt-php.spec and src/Makefile.am BTW, I've changed my email to business address. Lyre (2): spec file cleanup Added checkings for tools and libraries aclocal.m4 | 189 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 12 ++++ libvirt-php.spec | 8 +- src/Makefile.am | 30 +++------ 4 files changed, 216 insertions(+), 23 deletions(-)

4 5

[libvirt] [PATCH] 802.1Qbh: Delay IFF_UP'ing interface until migration final stage
by Roopa Prabhu 19 Feb '11

19 Feb '11

From: Roopa Prabhu <roprabhu(a)cisco.com> Current code does an IFF_UP on a 8021Qbh interface immediately after a port profile set. This is ok in most cases except when its the migration prepare stage. During migration we want to postpone IFF_UP'ing the interface on the destination host until the source host has disassociated the interface. This patch moves IFF_UP of the interface to the final stage of migration. The motivation for this change is to postpone any addr registrations on the destination host until the source host has done the addr deregistrations. While at it, for symmetry with associate move ifDown of a 8021Qbh interface to before disassociate Signed-off-by: Roopa Prabhu <roprabhu(a)cisco.com> Signed-off-by: David Wang <dwang2(a)cisco.com> Signed-off-by: Christian Benvenuti <benve(a)cisco.com> --- src/util/macvtap.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/util/macvtap.c b/src/util/macvtap.c index 8814400..a71db86 100644 --- a/src/util/macvtap.c +++ b/src/util/macvtap.c @@ -1470,8 +1470,6 @@ doPortProfileOp8021Qbh(const char *ifname, NULL, vf, PORT_REQUEST_DISASSOCIATE); - if (!rc) - ifaceUp(ifname); break; case DISASSOCIATE: @@ -1484,7 +1482,6 @@ doPortProfileOp8021Qbh(const char *ifname, NULL, vf, PORT_REQUEST_DISASSOCIATE); - ifaceDown(ifname); break; default: @@ -1550,10 +1547,11 @@ vpAssociatePortProfileId(const char *macvtap_ifname, case VIR_VIRTUALPORT_8021QBH: /* avoid associating twice */ - if (vmOp == VIR_VM_OP_MIGRATE_IN_FINISH) - break; - rc = doPortProfileOp8021Qbh(linkdev, macvtap_macaddr, - virtPort, vmuuid, ASSOCIATE); + if (vmOp != VIR_VM_OP_MIGRATE_IN_FINISH) + rc = doPortProfileOp8021Qbh(linkdev, macvtap_macaddr, + virtPort, vmuuid, ASSOCIATE); + if (vmOp != VIR_VM_OP_MIGRATE_IN_START && !rc) + ifaceUp(linkdev); break; } @@ -1600,6 +1598,7 @@ vpDisassociatePortProfileId(const char *macvtap_ifname, /* avoid disassociating twice */ if (vmOp == VIR_VM_OP_MIGRATE_IN_FINISH) break; + ifaceDown(linkdev); rc = doPortProfileOp8021Qbh(linkdev, macvtap_macaddr, virtPort, NULL, DISASSOCIATE); break;

2 1

[libvirt] [PATCH] nwfilter: enable rejection of packets
by Stefan Berger 19 Feb '11

19 Feb '11

This patch adds the possibility to not just drop packets, but to also have them rejected where iptables at least sends an ICMP msg back to the originator. On ebtables this again maps into dropping packets since rejecting is not supported. I am adding 'since 0.8.9' to the docs assuming this will be the next version of libvirt. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- docs/formatnwfilter.html.in | 8 +++++--- docs/schemas/nwfilter.rng | 1 + src/conf/nwfilter_conf.c | 6 ++++-- src/conf/nwfilter_conf.h | 1 + src/nwfilter/nwfilter_ebiptables_driver.c | 15 +++++++++++++-- 5 files changed, 24 insertions(+), 7 deletions(-) Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -53,11 +53,13 @@ VIR_ENUM_IMPL(virNWFilterRuleAction, VIR_NWFILTER_RULE_ACTION_LAST, "drop", - "accept"); + "accept", + "reject"); VIR_ENUM_IMPL(virNWFilterJumpTarget, VIR_NWFILTER_RULE_ACTION_LAST, "DROP", - "ACCEPT"); + "ACCEPT", + "REJECT"); VIR_ENUM_IMPL(virNWFilterRuleDirection, VIR_NWFILTER_RULE_DIRECTION_LAST, "in", Index: libvirt-acl/src/conf/nwfilter_conf.h =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.h +++ libvirt-acl/src/conf/nwfilter_conf.h @@ -291,6 +291,7 @@ struct _udpliteHdrFilterDef { enum virNWFilterRuleActionType { VIR_NWFILTER_RULE_ACTION_DROP = 0, VIR_NWFILTER_RULE_ACTION_ACCEPT, + VIR_NWFILTER_RULE_ACTION_REJECT, VIR_NWFILTER_RULE_ACTION_LAST, }; Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -1516,7 +1516,7 @@ _iptablesCreateRuleInstance(int directio if (rule->action == VIR_NWFILTER_RULE_ACTION_ACCEPT) target = accept_target; else { - target = "DROP"; + target = virNWFilterJumpTargetTypeToString(rule->action); skipMatch = defMatch; } @@ -1880,6 +1880,7 @@ ebtablesCreateRuleInstance(char chainPre number[20]; char chain[MAX_CHAINNAME_LENGTH]; virBuffer buf = VIR_BUFFER_INITIALIZER; + const char *target; if (!ebtables_cmd_path) { virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2295,10 +2296,20 @@ ebtablesCreateRuleInstance(char chainPre return -1; } + switch (rule->action) { + case VIR_NWFILTER_RULE_ACTION_REJECT: + /* REJECT not supported */ + target = virNWFilterJumpTargetTypeToString( + VIR_NWFILTER_RULE_ACTION_DROP); + break; + default: + target = virNWFilterJumpTargetTypeToString(rule->action); + } + virBufferVSprintf(&buf, " -j %s" CMD_DEF_POST CMD_SEPARATOR CMD_EXEC, - virNWFilterJumpTargetTypeToString(rule->action)); + target); if (virBufferError(&buf)) { virBufferFreeAndReset(&buf); Index: libvirt-acl/docs/schemas/nwfilter.rng =================================================================== --- libvirt-acl.orig/docs/schemas/nwfilter.rng +++ libvirt-acl/docs/schemas/nwfilter.rng @@ -839,6 +839,7 @@ <choice> <value>drop</value> <value>accept</value> + <value>reject</value> </choice> </define> Index: libvirt-acl/docs/formatnwfilter.html.in =================================================================== --- libvirt-acl.orig/docs/formatnwfilter.html.in +++ libvirt-acl/docs/formatnwfilter.html.in @@ -260,9 +260,11 @@ </p> <ul> <li> - action -- mandatory; must either be <code>drop</code> or <code>accept</code> if - the evaluation of the filtering rule is supposed to drop or accept - a packet + action -- mandatory; must either be <code>drop</code>, + <code>reject</code><span class="since">(since 0.8.9)</span>, + or <code>accept</code> if + the evaluation of the filtering rule is supposed to drop, + reject (using ICMP message), or accept a packet </li> <li> direction -- mandatory; must either be <code>in</code>, <code>out</code> or

2 2

[libvirt] [PATCH] [libvirt-tck] Fix expected error code in network test
by Jim Fehlig 18 Feb '11

18 Feb '11

I missed this one while fixing a similar bug in the domain transient autostart tests. Attempting to autostart a transient network results in ERR_OPERATION_INVALID not ERR_INTERNAL_ERROR. --- scripts/networks/051-transient-autostart.t | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/networks/051-transient-autostart.t b/scripts/networks/051-transient-autostart.t index 2b83fbc..2e220d3 100644 --- a/scripts/networks/051-transient-autostart.t +++ b/scripts/networks/051-transient-autostart.t @@ -48,7 +48,7 @@ my $auto = $net->get_autostart(); ok(!$auto, "autostart is disabled for transient VMs"); -ok_error(sub { $net->set_autostart(1) }, "Set autostart not supported on transient VMs", Sys::Virt::Error::ERR_INTERNAL_ERROR); +ok_error(sub { $net->set_autostart(1) }, "Set autostart not supported on transient VMs", Sys::Virt::Error::ERR_OPERATION_INVALID); diag "Destroying the transient network"; $net->destroy; -- 1.7.3.1

2 2

[libvirt] [PATCH] Drop empty argument from dnsmasq call
by Guido Günther 18 Feb '11

18 Feb '11

Hi, Libvirt currently fails to start with dnsmasq >= 2.56. since dnsmasq now bails out with empty arguments. See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=613944 for the Debian bug and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=589885 for the upstream reasoning. Tested with 2.55 and 2.56. O.k. to apply? Cheers, -- Guido

3 6

[libvirt] [PATCH] Remove all object hashtable caches from virConnectPtr
by Daniel P. Berrange 18 Feb '11

18 Feb '11

A followup to, merely rebased to latest GIT http://www.redhat.com/archives/libvir-list/2010-October/msg01213.html The virConnectPtr struct will cache instances of all other objects. APIs like virDomainLookupByUUID will return a cached object, so if you do virDomainLookupByUUID twice in a row, you'll get the same exact virDomainPtr instance. This does not have any performance benefit, since the actual logic in virDomainLookupByUUID (and other APIs returning virDomainPtr, etc instances) is not short-circuited. All it does is to ensure there is only one single virDomainPtr in existance for any given UUID. The caching has a number of downsides though, all relating to stale data. If APIs aren't careful to always overwrite the 'id' field in virDomainPtr it may become out of data. Likewise for the name field, if a guest is renamed, or if a guest is deleted, and then a new one created with the same UUID but different name. This has been an ongoing, endless source of bugs for all applications using libvirt from languages with garbage collection, causing them to get virDomainPtr instances from long ago with stale data. The caching is also a waste of memory resources, since both applications, and language bindings often maintain their own hashtable caches of object instances. This patch removes all the hash table caching, so all APIs return brand new virDomainPtr (etc) object instances. * src/datatypes.h: Delete all hash tables. * src/datatypes.c: Remove all object caching code --- src/datatypes.c | 648 +++++++++++++------------------------------------------ src/datatypes.h | 10 - 2 files changed, 151 insertions(+), 507 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index 1b68f6a..0864349 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -41,117 +41,6 @@ * * ************************************************************************/ -/** - * virDomainFreeName: - * @domain: a domain object - * - * Destroy the domain object, this is just used by the domain hash callback. - * - * Returns 0 in case of success and -1 in case of failure. - */ -static int -virDomainFreeName(virDomainPtr domain, const char *name ATTRIBUTE_UNUSED) -{ - return (virUnrefDomain(domain)); -} - -/** - * virNetworkFreeName: - * @network: a network object - * - * Destroy the network object, this is just used by the network hash callback. - * - * Returns 0 in case of success and -1 in case of failure. - */ -static int -virNetworkFreeName(virNetworkPtr network, const char *name ATTRIBUTE_UNUSED) -{ - return (virUnrefNetwork(network)); -} - -/** - * virInterfaceFreeName: - * @interface: an interface object - * - * Destroy the interface object, this is just used by the interface hash callback. - * - * Returns 0 in case of success and -1 in case of failure. - */ -static int -virInterfaceFreeName(virInterfacePtr iface, const char *name ATTRIBUTE_UNUSED) -{ - return (virUnrefInterface(iface)); -} - -/** - * virStoragePoolFreeName: - * @pool: a pool object - * - * Destroy the pool object, this is just used by the pool hash callback. - * - * Returns 0 in case of success and -1 in case of failure. - */ -static int -virStoragePoolFreeName(virStoragePoolPtr pool, const char *name ATTRIBUTE_UNUSED) -{ - return (virUnrefStoragePool(pool)); -} - -/** - * virStorageVolFreeName: - * @vol: a vol object - * - * Destroy the vol object, this is just used by the vol hash callback. - * - * Returns 0 in case of success and -1 in case of failure. - */ -static int -virStorageVolFreeName(virStorageVolPtr vol, const char *name ATTRIBUTE_UNUSED) -{ - return (virUnrefStorageVol(vol)); -} - -/** - * virSecretFreeName: - * @secret: a secret object - * - * Destroy the secret object, this is just used by the secret hash callback. - * - * Returns 0 in case of success and -1 in case of failure. - */ -static int -virSecretFreeName(virSecretPtr secret, const char *name ATTRIBUTE_UNUSED) -{ - return virUnrefSecret(secret); -} - -/** - * virNWFilterFreeName: - * @nwfilter: a nwfilter object - * - * Destroy the nwfilter object, this is just used by the nwfilter hash callback. - * - * Returns 0 in case of success and -1 in case of failure. - */ -static int -virNWFilterFreeName(virNWFilterPtr nwfilter, const char *name ATTRIBUTE_UNUSED) -{ - return virUnrefNWFilter(nwfilter); -} - -/** - * virDomainSnapshotFreeName: - * @snapshot: a domain snapshotobject - * - * Destroy the domain snapshot object, this is just used by the domain hash callback. - * - * Returns 0 in case of success and -1 in case of failure. - */ -static int -virDomainSnapshotFreeName(virDomainSnapshotPtr snapshot, const char *name ATTRIBUTE_UNUSED) -{ - return (virUnrefDomainSnapshot(snapshot)); -} /** * virGetConnect: @@ -179,45 +68,12 @@ virGetConnect(void) { ret->privateData = NULL; ret->networkPrivateData = NULL; ret->interfacePrivateData = NULL; - ret->domains = virHashCreate(20); - if (ret->domains == NULL) - goto failed; - ret->networks = virHashCreate(20); - if (ret->networks == NULL) - goto failed; - ret->interfaces = virHashCreate(20); - if (ret->interfaces == NULL) - goto failed; - ret->storagePools = virHashCreate(20); - if (ret->storagePools == NULL) - goto failed; - ret->storageVols = virHashCreate(20); - if (ret->storageVols == NULL) - goto failed; - ret->nodeDevices = virHashCreate(256); - if (ret->nodeDevices == NULL) - goto failed; - ret->secrets = virHashCreate(20); - if (ret->secrets == NULL) - goto failed; - ret->nwfilters = virHashCreate(20); - if (ret->nwfilters == NULL) - goto failed; ret->refs = 1; return(ret); failed: if (ret != NULL) { - virHashFree(ret->domains, (virHashDeallocator) virDomainFreeName); - virHashFree(ret->networks, (virHashDeallocator) virNetworkFreeName); - virHashFree(ret->interfaces, (virHashDeallocator) virInterfaceFreeName); - virHashFree(ret->storagePools, (virHashDeallocator) virStoragePoolFreeName); - virHashFree(ret->storageVols, (virHashDeallocator) virStorageVolFreeName); - virHashFree(ret->nodeDevices, (virHashDeallocator) virNodeDeviceFree); - virHashFree(ret->secrets, (virHashDeallocator) virSecretFreeName); - virHashFree(ret->nwfilters, (virHashDeallocator) virNWFilterFreeName); - virMutexDestroy(&ret->lock); VIR_FREE(ret); } @@ -259,15 +115,6 @@ virReleaseConnect(virConnectPtr conn) { virMutexLock(&conn->lock); - virHashFree(conn->domains, (virHashDeallocator) virDomainFreeName); - virHashFree(conn->networks, (virHashDeallocator) virNetworkFreeName); - virHashFree(conn->interfaces, (virHashDeallocator) virInterfaceFreeName); - virHashFree(conn->storagePools, (virHashDeallocator) virStoragePoolFreeName); - virHashFree(conn->storageVols, (virHashDeallocator) virStorageVolFreeName); - virHashFree(conn->nodeDevices, (virHashDeallocator) virNodeDeviceFree); - virHashFree(conn->secrets, (virHashDeallocator) virSecretFreeName); - virHashFree(conn->nwfilters, (virHashDeallocator) virNWFilterFreeName); - virResetError(&conn->err); xmlFreeURI(conn->uri); @@ -341,42 +188,23 @@ virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) { virUUIDFormat(uuid, uuidstr); - ret = (virDomainPtr) virHashLookup(conn->domains, uuidstr); - if (ret == NULL) { - if (VIR_ALLOC(ret) < 0) { - virMutexUnlock(&conn->lock); - virReportOOMError(); - goto error; - } - ret->name = strdup(name); - if (ret->name == NULL) { - virMutexUnlock(&conn->lock); - virReportOOMError(); - goto error; - } - ret->magic = VIR_DOMAIN_MAGIC; - ret->conn = conn; - ret->id = -1; - memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); - ret->snapshots = virHashCreate(20); - if (ret->snapshots == NULL) { - virMutexUnlock(&conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", - _("failed to create domain snapshots hash")); - goto error; - } - - if (virHashAddEntry(conn->domains, uuidstr, ret) < 0) { - virMutexUnlock(&conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", - _("failed to add domain to connection hash table")); - goto error; - } - conn->refs++; - DEBUG("New hash entry %p", ret); - } else { - DEBUG("Existing hash entry %p: refs now %d", ret, ret->refs+1); + if (VIR_ALLOC(ret) < 0) { + virMutexUnlock(&conn->lock); + virReportOOMError(); + goto error; + } + ret->name = strdup(name); + if (ret->name == NULL) { + virMutexUnlock(&conn->lock); + virReportOOMError(); + goto error; } + ret->magic = VIR_DOMAIN_MAGIC; + ret->conn = conn; + ret->id = -1; + memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); + + conn->refs++; ret->refs++; virMutexUnlock(&conn->lock); return(ret); @@ -409,17 +237,9 @@ virReleaseDomain(virDomainPtr domain) { virUUIDFormat(domain->uuid, uuidstr); DEBUG("release domain %p %s %s", domain, domain->name, uuidstr); - if (virHashRemoveEntry(conn->domains, uuidstr, NULL) < 0) { - virMutexUnlock(&conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", - _("domain missing from connection hash table")); - conn = NULL; - } - domain->magic = -1; domain->id = -1; VIR_FREE(domain->name); - virHashFree(domain->snapshots, (virHashDeallocator) virDomainSnapshotFreeName); VIR_FREE(domain); if (conn) { @@ -500,31 +320,22 @@ virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) { virUUIDFormat(uuid, uuidstr); - ret = (virNetworkPtr) virHashLookup(conn->networks, uuidstr); - if (ret == NULL) { - if (VIR_ALLOC(ret) < 0) { - virMutexUnlock(&conn->lock); - virReportOOMError(); - goto error; - } - ret->name = strdup(name); - if (ret->name == NULL) { - virMutexUnlock(&conn->lock); - virReportOOMError(); - goto error; - } - ret->magic = VIR_NETWORK_MAGIC; - ret->conn = conn; - memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); - - if (virHashAddEntry(conn->networks, uuidstr, ret) < 0) { - virMutexUnlock(&conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", - _("failed to add network to connection hash table")); - goto error; - } - conn->refs++; + if (VIR_ALLOC(ret) < 0) { + virMutexUnlock(&conn->lock); + virReportOOMError(); + goto error; + } + ret->name = strdup(name); + if (ret->name == NULL) { + virMutexUnlock(&conn->lock); + virReportOOMError(); + goto error; } + ret->magic = VIR_NETWORK_MAGIC; + ret->conn = conn; + memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); + + conn->refs++; ret->refs++; virMutexUnlock(&conn->lock); return(ret); @@ -557,13 +368,6 @@ virReleaseNetwork(virNetworkPtr network) { virUUIDFormat(network->uuid, uuidstr); DEBUG("release network %p %s %s", network, network->name, uuidstr); - if (virHashRemoveEntry(conn->networks, uuidstr, NULL) < 0) { - virMutexUnlock(&conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", - _("network missing from connection hash table")); - conn = NULL; - } - network->magic = -1; VIR_FREE(network->name); VIR_FREE(network); @@ -647,70 +451,28 @@ virGetInterface(virConnectPtr conn, const char *name, const char *mac) { virMutexLock(&conn->lock); - ret = (virInterfacePtr) virHashLookup(conn->interfaces, name); - - if (ret != NULL) { - if (STRCASENEQ(ret->mac, mac)) { - /* - * If the mac address has changed, try to modify it in - * place, which will only work if the new mac is the - * same length as, or shorter than, the old mac. - */ - size_t newmaclen = strlen(mac); - size_t oldmaclen = strlen(ret->mac); - if (newmaclen <= oldmaclen) { - strcpy(ret->mac, mac); - } else { - /* - * If it's longer, we're kind of screwed, because we - * can't add a new hashtable entry (it would clash - * with the existing entry of same name), and we can't - * free/re-alloc the existing entry's mac, as some - * other thread may already be using the existing mac - * pointer. Fortunately, this should never happen, - * since the length of the mac address for any - * interface is determined by the type of the - * interface, and that is unlikely to change. - */ - virMutexUnlock(&conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, - _("Failed to change interface mac address " - "from %s to %s due to differing lengths."), - ret->mac, mac); - ret = NULL; - goto error; - } - } - } else { - if (VIR_ALLOC(ret) < 0) { - virMutexUnlock(&conn->lock); - virReportOOMError(); - goto error; - } - ret->name = strdup(name); - if (ret->name == NULL) { - virMutexUnlock(&conn->lock); - virReportOOMError(); - goto error; - } - ret->mac = strdup(mac); - if (ret->mac == NULL) { - virMutexUnlock(&conn->lock); - virReportOOMError(); - goto error; - } + if (VIR_ALLOC(ret) < 0) { + virMutexUnlock(&conn->lock); + virReportOOMError(); + goto error; + } + ret->name = strdup(name); + if (ret->name == NULL) { + virMutexUnlock(&conn->lock); + virReportOOMError(); + goto error; + } + ret->mac = strdup(mac); + if (ret->mac == NULL) { + virMutexUnlock(&conn->lock); + virReportOOMError(); + goto error; + } - ret->magic = VIR_INTERFACE_MAGIC; - ret->conn = conn; + ret->magic = VIR_INTERFACE_MAGIC; + ret->conn = conn; - if (virHashAddEntry(conn->interfaces, name, ret) < 0) { - virMutexUnlock(&conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", - _("failed to add interface to connection hash table")); - goto error; - } - conn->refs++; - } + conn->refs++; ret->refs++; virMutexUnlock(&conn->lock); return(ret); @@ -741,15 +503,6 @@ virReleaseInterface(virInterfacePtr iface) { virConnectPtr conn = iface->conn; DEBUG("release interface %p %s", iface, iface->name); - if (virHashRemoveEntry(conn->interfaces, iface->name, NULL) < 0) { - /* unlock before reporting error because error report grabs lock */ - virMutexUnlock(&conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", - _("interface missing from connection hash table")); - /* don't decr the conn refct if we weren't connected to it */ - conn = NULL; - } - iface->magic = -1; VIR_FREE(iface->name); VIR_FREE(iface->mac); @@ -836,31 +589,22 @@ virGetStoragePool(virConnectPtr conn, const char *name, virUUIDFormat(uuid, uuidstr); - ret = (virStoragePoolPtr) virHashLookup(conn->storagePools, uuidstr); - if (ret == NULL) { - if (VIR_ALLOC(ret) < 0) { - virMutexUnlock(&conn->lock); - virReportOOMError(); - goto error; - } - ret->name = strdup(name); - if (ret->name == NULL) { - virMutexUnlock(&conn->lock); - virReportOOMError(); - goto error; - } - ret->magic = VIR_STORAGE_POOL_MAGIC; - ret->conn = conn; - memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); - - if (virHashAddEntry(conn->storagePools, uuidstr, ret) < 0) { - virMutexUnlock(&conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, - "%s", _("failed to add storage pool to connection hash table")); - goto error; - } - conn->refs++; + if (VIR_ALLOC(ret) < 0) { + virMutexUnlock(&conn->lock); + virReportOOMError(); + goto error; + } + ret->name = strdup(name); + if (ret->name == NULL) { + virMutexUnlock(&conn->lock); + virReportOOMError(); + goto error; } + ret->magic = VIR_STORAGE_POOL_MAGIC; + ret->conn = conn; + memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); + + conn->refs++; ret->refs++; virMutexUnlock(&conn->lock); return(ret); @@ -894,13 +638,6 @@ virReleaseStoragePool(virStoragePoolPtr pool) { virUUIDFormat(pool->uuid, uuidstr); DEBUG("release pool %p %s %s", pool, pool->name, uuidstr); - if (virHashRemoveEntry(conn->storagePools, uuidstr, NULL) < 0) { - virMutexUnlock(&conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", - _("pool missing from connection hash table")); - conn = NULL; - } - pool->magic = -1; VIR_FREE(pool->name); VIR_FREE(pool); @@ -984,42 +721,33 @@ virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, } virMutexLock(&conn->lock); - ret = (virStorageVolPtr) virHashLookup(conn->storageVols, key); - if (ret == NULL) { - if (VIR_ALLOC(ret) < 0) { - virMutexUnlock(&conn->lock); - virReportOOMError(); - goto error; - } - ret->pool = strdup(pool); - if (ret->pool == NULL) { - virMutexUnlock(&conn->lock); - virReportOOMError(); - goto error; - } - ret->name = strdup(name); - if (ret->name == NULL) { - virMutexUnlock(&conn->lock); - virReportOOMError(); - goto error; - } - if (virStrcpyStatic(ret->key, key) == NULL) { - virMutexUnlock(&conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, - _("Volume key %s too large for destination"), key); - goto error; - } - ret->magic = VIR_STORAGE_VOL_MAGIC; - ret->conn = conn; - - if (virHashAddEntry(conn->storageVols, key, ret) < 0) { - virMutexUnlock(&conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", - _("failed to add storage vol to connection hash table")); - goto error; - } - conn->refs++; + if (VIR_ALLOC(ret) < 0) { + virMutexUnlock(&conn->lock); + virReportOOMError(); + goto error; + } + ret->pool = strdup(pool); + if (ret->pool == NULL) { + virMutexUnlock(&conn->lock); + virReportOOMError(); + goto error; + } + ret->name = strdup(name); + if (ret->name == NULL) { + virMutexUnlock(&conn->lock); + virReportOOMError(); + goto error; + } + if (virStrcpyStatic(ret->key, key) == NULL) { + virMutexUnlock(&conn->lock); + virLibConnError(VIR_ERR_INTERNAL_ERROR, + _("Volume key %s too large for destination"), key); + goto error; } + ret->magic = VIR_STORAGE_VOL_MAGIC; + ret->conn = conn; + + conn->refs++; ret->refs++; virMutexUnlock(&conn->lock); return(ret); @@ -1051,13 +779,6 @@ virReleaseStorageVol(virStorageVolPtr vol) { virConnectPtr conn = vol->conn; DEBUG("release vol %p %s", vol, vol->name); - if (virHashRemoveEntry(conn->storageVols, vol->key, NULL) < 0) { - virMutexUnlock(&conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", - _("vol missing from connection hash table")); - conn = NULL; - } - vol->magic = -1; VIR_FREE(vol->name); VIR_FREE(vol->pool); @@ -1136,30 +857,21 @@ virGetNodeDevice(virConnectPtr conn, const char *name) } virMutexLock(&conn->lock); - ret = (virNodeDevicePtr) virHashLookup(conn->nodeDevices, name); - if (ret == NULL) { - if (VIR_ALLOC(ret) < 0) { - virMutexUnlock(&conn->lock); - virReportOOMError(); - goto error; - } - ret->magic = VIR_NODE_DEVICE_MAGIC; - ret->conn = conn; - ret->name = strdup(name); - if (ret->name == NULL) { - virMutexUnlock(&conn->lock); - virReportOOMError(); - goto error; - } - - if (virHashAddEntry(conn->nodeDevices, name, ret) < 0) { - virMutexUnlock(&conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, - "%s", _("failed to add node dev to conn hash table")); - goto error; - } - conn->refs++; + if (VIR_ALLOC(ret) < 0) { + virMutexUnlock(&conn->lock); + virReportOOMError(); + goto error; } + ret->magic = VIR_NODE_DEVICE_MAGIC; + ret->conn = conn; + ret->name = strdup(name); + if (ret->name == NULL) { + virMutexUnlock(&conn->lock); + virReportOOMError(); + goto error; + } + + conn->refs++; ret->refs++; virMutexUnlock(&conn->lock); return(ret); @@ -1190,13 +902,6 @@ virReleaseNodeDevice(virNodeDevicePtr dev) { virConnectPtr conn = dev->conn; DEBUG("release dev %p %s", dev, dev->name); - if (virHashRemoveEntry(conn->nodeDevices, dev->name, NULL) < 0) { - virMutexUnlock(&conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, - "%s", _("dev missing from connection hash table")); - conn = NULL; - } - dev->magic = -1; VIR_FREE(dev->name); VIR_FREE(dev->parent); @@ -1278,30 +983,21 @@ virGetSecret(virConnectPtr conn, const unsigned char *uuid, virUUIDFormat(uuid, uuidstr); - ret = virHashLookup(conn->secrets, uuidstr); - if (ret == NULL) { - if (VIR_ALLOC(ret) < 0) { - virMutexUnlock(&conn->lock); - virReportOOMError(); - goto error; - } - ret->magic = VIR_SECRET_MAGIC; - ret->conn = conn; - memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); - ret->usageType = usageType; - if (!(ret->usageID = strdup(usageID))) { - virMutexUnlock(&conn->lock); - virReportOOMError(); - goto error; - } - if (virHashAddEntry(conn->secrets, uuidstr, ret) < 0) { - virMutexUnlock(&conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", - _("failed to add secret to conn hash table")); - goto error; - } - conn->refs++; + if (VIR_ALLOC(ret) < 0) { + virMutexUnlock(&conn->lock); + virReportOOMError(); + goto error; + } + ret->magic = VIR_SECRET_MAGIC; + ret->conn = conn; + memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); + ret->usageType = usageType; + if (!(ret->usageID = strdup(usageID))) { + virMutexUnlock(&conn->lock); + virReportOOMError(); + goto error; } + conn->refs++; ret->refs++; virMutexUnlock(&conn->lock); return ret; @@ -1333,13 +1029,6 @@ virReleaseSecret(virSecretPtr secret) { virUUIDFormat(secret->uuid, uuidstr); DEBUG("release secret %p %s", secret, uuidstr); - if (virHashRemoveEntry(conn->secrets, uuidstr, NULL) < 0) { - virMutexUnlock(&conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", - _("secret missing from connection hash table")); - conn = NULL; - } - VIR_FREE(secret->usageID); secret->magic = -1; VIR_FREE(secret); @@ -1480,31 +1169,22 @@ virGetNWFilter(virConnectPtr conn, const char *name, const unsigned char *uuid) virUUIDFormat(uuid, uuidstr); - ret = (virNWFilterPtr) virHashLookup(conn->nwfilters, uuidstr); - if (ret == NULL) { - if (VIR_ALLOC(ret) < 0) { - virMutexUnlock(&conn->lock); - virReportOOMError(); - goto error; - } - ret->name = strdup(name); - if (ret->name == NULL) { - virMutexUnlock(&conn->lock); - virReportOOMError(); - goto error; - } - ret->magic = VIR_NWFILTER_MAGIC; - ret->conn = conn; - memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); - - if (virHashAddEntry(conn->nwfilters, uuidstr, ret) < 0) { - virMutexUnlock(&conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", - _("failed to add network filter to connection hash table")); - goto error; - } - conn->refs++; + if (VIR_ALLOC(ret) < 0) { + virMutexUnlock(&conn->lock); + virReportOOMError(); + goto error; + } + ret->name = strdup(name); + if (ret->name == NULL) { + virMutexUnlock(&conn->lock); + virReportOOMError(); + goto error; } + ret->magic = VIR_NWFILTER_MAGIC; + ret->conn = conn; + memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); + + conn->refs++; ret->refs++; virMutexUnlock(&conn->lock); return(ret); @@ -1539,13 +1219,6 @@ virReleaseNWFilter(virNWFilterPtr nwfilter) virUUIDFormat(nwfilter->uuid, uuidstr); DEBUG("release nwfilter %p %s %s", nwfilter, nwfilter->name, uuidstr); - if (virHashRemoveEntry(conn->nwfilters, uuidstr, NULL) < 0) { - virMutexUnlock(&conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", - _("pool missing from connection hash table")); - conn = NULL; - } - nwfilter->magic = -1; VIR_FREE(nwfilter->name); VIR_FREE(nwfilter); @@ -1565,7 +1238,7 @@ virReleaseNWFilter(virNWFilterPtr nwfilter) /** * virUnrefNWFilter: - * @pool: the nwfilter to unreference + * @nwfilter: the nwfilter to unreference * * Unreference the networkf itler. If the use count drops to zero, the * structure is actually freed. @@ -1583,7 +1256,7 @@ virUnrefNWFilter(virNWFilterPtr nwfilter) return -1; } virMutexLock(&nwfilter->conn->lock); - DEBUG("unref pool %p %s %d", nwfilter, nwfilter->name, nwfilter->refs); + DEBUG("unref nwfilter %p %s %d", nwfilter, nwfilter->name, nwfilter->refs); nwfilter->refs--; refs = nwfilter->refs; if (refs == 0) { @@ -1612,33 +1285,21 @@ virGetDomainSnapshot(virDomainPtr domain, const char *name) } virMutexLock(&domain->conn->lock); - ret = (virDomainSnapshotPtr) virHashLookup(domain->snapshots, name); - if (ret == NULL) { - if (VIR_ALLOC(ret) < 0) { - virMutexUnlock(&domain->conn->lock); - virReportOOMError(); - goto error; - } - ret->name = strdup(name); - if (ret->name == NULL) { - virMutexUnlock(&domain->conn->lock); - virReportOOMError(); - goto error; - } - ret->magic = VIR_SNAPSHOT_MAGIC; - ret->domain = domain; - - if (virHashAddEntry(domain->snapshots, name, ret) < 0) { - virMutexUnlock(&domain->conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, - "%s", _("failed to add snapshot to domain hash table")); - goto error; - } - domain->refs++; - DEBUG("New hash entry %p", ret); - } else { - DEBUG("Existing hash entry %p: refs now %d", ret, ret->refs+1); + if (VIR_ALLOC(ret) < 0) { + virMutexUnlock(&domain->conn->lock); + virReportOOMError(); + goto error; + } + ret->name = strdup(name); + if (ret->name == NULL) { + virMutexUnlock(&domain->conn->lock); + virReportOOMError(); + goto error; } + ret->magic = VIR_SNAPSHOT_MAGIC; + ret->domain = domain; + + domain->refs++; ret->refs++; virMutexUnlock(&domain->conn->lock); return(ret); @@ -1658,13 +1319,6 @@ virReleaseDomainSnapshot(virDomainSnapshotPtr snapshot) virDomainPtr domain = snapshot->domain; DEBUG("release snapshot %p %s", snapshot, snapshot->name); - if (virHashRemoveEntry(domain->snapshots, snapshot->name, NULL) < 0) { - virMutexUnlock(&domain->conn->lock); - virLibConnError(VIR_ERR_INTERNAL_ERROR, - "%s", _("snapshot missing from domain hash table")); - domain = NULL; - } - snapshot->magic = -1; VIR_FREE(snapshot->name); VIR_FREE(snapshot); diff --git a/src/datatypes.h b/src/datatypes.h index 38f76a7..ebda992 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -24,7 +24,6 @@ # include "internal.h" -# include "hash.h" # include "driver.h" # include "threads.h" @@ -188,14 +187,6 @@ struct _virConnect { virErrorFunc handler; /* associated handlet */ void *userData; /* the user data */ - virHashTablePtr domains; /* hash table for known domains */ - virHashTablePtr networks; /* hash table for known domains */ - virHashTablePtr interfaces; /* hash table for known interfaces */ - virHashTablePtr storagePools;/* hash table for known storage pools */ - virHashTablePtr storageVols;/* hash table for known storage vols */ - virHashTablePtr nodeDevices; /* hash table for known node devices */ - virHashTablePtr secrets; /* hash table for known secrets */ - virHashTablePtr nwfilters; /* hash table for known nw filters */ int refs; /* reference count */ }; @@ -211,7 +202,6 @@ struct _virDomain { char *name; /* the domain external name */ int id; /* the domain ID */ unsigned char uuid[VIR_UUID_BUFLEN]; /* the domain unique identifier */ - virHashTablePtr snapshots; /* hash table for known snapshots */ }; /** -- 1.7.4

2 1