diff options
| author |   Osier Yang <jyang@redhat.com> | 2012-08-03 23:48:05 +0800 |
|---|---|---|
| committer | Osier Yang <jyang@redhat.com> | 2012-08-14 17:27:49 +0800 |
| commit | bb705e251931754faa246145ebbd5deb8d692daa (patch) | |
| tree | 6e0a6d3dc9c47c2654ea81a9d89cbba8fbc8b45d /src/lxc | |
| parent | json: fix interface locale dependency (diff) | |
| download | libvirt-bb705e251931754faa246145ebbd5deb8d692daa.tar.gz libvirt-bb705e251931754faa246145ebbd5deb8d692daa.tar.bz2 libvirt-bb705e251931754faa246145ebbd5deb8d692daa.zip | |
Destroy virdomainlist.[ch]
As the consensus in:
https://www.redhat.com/archives/libvir-list/2012-July/msg01692.html,
this patch is to destroy conf/virdomainlist.[ch], folding the
helpers into conf/domain_conf.[ch].
* src/Makefile.am:
- Various indention fixes incidentally
- Add macro DATATYPES_SOURCES (datatypes.[ch])
- Link datatypes.[ch] for libvirt_lxc
* src/conf/domain_conf.c:
- Move all the stuffs from virdomainlist.c into it
- Use virUnrefDomain and virUnrefDomainSnapshot instead of
virDomainFree and virDomainSnapshotFree, which are defined
in libvirt.c, and we don't want to link to it.
- Remove "if" before "free" the object, as virObjectUnref
is in the list "useless_free_options".
* src/conf/domain_conf.h:
- Move all the stuffs from virdomainlist.h into it
- s/LIST_FILTER/LIST_DOMAINS_FILTER/
* src/libxl/libxl_driver.c:
- s/LIST_FILTER/LIST_DOMAINS_FILTER/
- no (include "virdomainlist.h")
* src/libxl/libxl_driver.c: Likewise
* src/lxc/lxc_driver.c: Likewise
* src/openvz/openvz_driver.c: Likewise
* src/parallels/parallels_driver.c: Likewise
* src/qemu/qemu_driver.c: Likewise
* src/test/test_driver.c: Likewise
* src/uml/uml_driver.c: Likewise
* src/vbox/vbox_tmpl.c: Likewise
* src/vmware/vmware_driver.c: Likewise
* tools/virsh-domain-monitor.c: Likewise
* tools/virsh.c: Likewise
Diffstat (limited to 'src/lxc')
| -rw-r--r-- | src/lxc/lxc_driver.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index b7b119c9d..2b5707ec7 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -63,7 +63,6 @@ #include "virtime.h" #include "virtypedparam.h" #include "viruri.h" -#include "virdomainlist.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -2676,7 +2675,7 @@ lxcListAllDomains(virConnectPtr conn, virLXCDriverPtr driver = conn->privateData; int ret = -1; - virCheckFlags(VIR_CONNECT_LIST_FILTERS_ALL, -1); + virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); lxcDriverLock(driver); ret = virDomainList(conn, driver->domains.objs, domains, flags); |