On 07/20/2012 08:24 AM, Osier Yang wrote:
> This introduces a new API to list the storage pool objects,
> 4 groups of flags are provided to filter the returned pools:
>
> * Active or not
>
> * Autostarting or not
>
> * Persistent or not
>
> * And the pool type.
>
> include/libvirt/libvirt.h.in: New enum virConnectListAllStoragePoolFlags;
> Declare the API.
> python/generator.py: Skip the generating
> src/driver.h: (virDrvConnectListAllStoragePools)
> src/libvirt.c: Implementation for the API.
> src/libvirt_public.syms: Export the symbol.
> +++ b/include/libvirt/libvirt.h.in
> @@ -2471,6 +2471,38 @@ int
> virConnectListDefinedStoragePools(virConnectPtr conn,
>int maxnames);
>
> /*
> + * virConnectListAllStoragePoolsFlags:
> + *
> + * Flags used to filter the returned pools. Flags in each group
> + * are exclusive attribute for a pool.
In virConnectListAllDomainsFlags, we used a different wording:
Flags used to tune pools returned by virConnectListAllStoragePools().
Note that these flags come in groups; if all bits from a group are 0,
then that group is not used to filter results.
> +++ b/src/libvirt.c
> @@ -11215,6 +11215,83 @@ virStoragePoolGetConnect (virStoragePoolPtr pool)
> }
>
> /**
> + * virConnectListAllStoragePools:
> + * @conn: Pointer to the hypervisor connection.
> + * @pools: Pointer to a variable to store the array containing storage pool
> + * objects or NULL if the list is not required (just returns number
> + * of pools).
> + * @flags: bitwise-OR of virConnectListAllStoragePoolsFlags.
> + *
> + * Collect the list of storage pools, and allocate an array to store those
> + * objects. This API solves the race inherent between
> virConnectListStoragePools
> + * and virConnectListDefinedStoragePools.
It would also be worth enhancing the documentation of those two
functions to point out the race, and cross-reference to this function.
For a prior example, see how commit 747f64ee did things.
> + *
> + * By default, this API covers all storage pools; it is also possible
> + * to return the filtered objects with flags. Filters are provided in groups,
> + * where each group contains bits that describe mutually exclusive attributes
> + * of a storage pool.
The wording in the prior example was:
Normally, all storage pools are returned; however, @flags can be used to
filter the results for a smaller list of targeted pools. The valid
flags are divided into groups, where each group contains bits that
describe mutually exclusive attributes of a pool, and where all bits
within a group describe all possible pools.
> + *
> + * The first group of @flags is VIR_CONNECT_LIST_STORAGE_POOLS_INACTIVE and
> + * VIR_CONNECT_LIST_STORAGE_POOLS_INACTIVE to fitler the pools by state.
s/fitler/filter/
> @@ -11256,9 +11333,11 @@ error:
> * @names: array of char * to fill with pool names (allocated by caller)
> * @maxnames: size of the names array
> *
> - * Provides the list of names of active storage pools
> - * upto maxnames. If there are more than maxnames, the
> - * remaining names will be silently ignored.
> + * Provides the list of names of active storage pools upto maxnames.
s/upto/up to/
> + * If there are more than maxnames, the remaining names will be silently
> + * ignored.
> + *
> + * For more control over the results, see virConnectListAllStoragePools().
> *
> * Returns 0 on success, -1 on error
This lists the cross-reference, but not the fact that there is an
inherent race. Based on the prior example, this should be something like:
Returns the number of pools found or -1 in case of error. Note that
this command is inherently racy; a pool can be started between a call to
virConnectNumOfStoragePools() and this call; you are only guaranteed
that all currently active pools were listed if the return is less than
@maxnames.
> +++ b/src/libvirt_public.syms
> @@ -544,4 +544,9 @@ LIBVIRT_0.9.13 {
> virDomainSnapshotRef;
> } LIBVIRT_0.9.11;
>
> +LIBVIRT_0.9.14 {
> +global:
> +virConnectListAllStoragePools;
> +} LIBVIRT_0.9.13;
Merge conflict with Guido's patch a91067f. Should be easy to resolve.
--
Eric Blake ebl...@redhat.com+1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
We don't expect people to have tools installed to regenerate .png
from .fig by default. However, since commit 5eb3df8, several
.fig files were updated without regenerating the .png file, and
as a result, 'make dist' ends up regenerating those five files,
or worse, failing because of missing tools.
Additionally, the generation of .png files is nondeterministic
(the resulting files contain a timestamp), which means prior to
this patch, running 'make dist' from two checkouts will end up
producing different tarball contents (two 'make dist' runs will
always produce different tar files, since tarballs also contain
timestamps; but unpacking the tarballs and doing a recursive
diff will show if the contents are unchanged).
Running 'make *.png' in the docs directory and committing the
result means the timestamps are now up-to-date, and 'make dist'
no longer has anything to do. This gets us closer to the goal
of two checkouts being able to produce the same tarball.
* docs/libvirt-*.png: Regenerate.
---
Found when testing 'make dist' on a machine without ImageMagick
installed (for the 'convert' program).
docs/libvirt-daemon-arch.png | Bin 16479 -> 11624 bytes
docs/libvirt-driver-arch.png | Bin 16835 -> 12555 bytes
docs/libvirt-net-logical.png | Bin 7387 -> 11243 bytes
docs/libvirt-net-physical.png | Bin 10666 -> 11336 bytes
docs/libvirt-object-model.png | Bin 14327 -> 9559 bytes
5 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/docs/libvirt-daemon-arch.png b/docs/libvirt-daemon-arch.png
index
b7ed2f689112e45ffd5b108ed7a03f9808618d96..621a55cdbfebf968ed079e3940b5bd3da22321a1
100644
GIT binary patch
literal 11624
[actual patch stripped for mailing list length limits - it's just
a regeneration of binary files]
--
1.7.10.4
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On 07/20/2012 03:34 PM, Eric Blake wrote:
> Commit ddd6bef4 fixed an issue where 'make dist' failed to create
> a tarball because we have files with relative names longer than
> 100 bytes by the time you include a 'libvirt-0.9.13' prefix, by
> switching to the ustart format. Unfortunately, even with ustar
> format, the use of 'tar -ch' with symbolic links that resolve to
> a file name too long also fails (omitting the -h works, but automake
> automatically passes -h); such symlinks were added in commit
> 6dcf98c, which resulted in 'make dist' breaking again. The solution
> is to rename the offending symlinks to something shorter, by
> shortening the entire nodeinfodata naming scheme.
As the first person (I think) who encountered this problem, I can verify
that Eric has shortened the paths enough for the build to be successful.
(Thanks!)
In case anyone was curious, it turns out that, while ustar format
lengthens the "name" field of the header from 100 bytes to 255 bytes, it
doesn't do anything for the "link_name" field, which remains at the
traditional tar's 100 bytes. When you tell tar "-h" to follow symlinks
and dump the file they point to rather than just recording the link, the
way that tar does this is to resolve the link, then do a lookup in the
list of files that have already been dumped into the tarfile; if a match
is found, the full name (as recorded the first time it was dumped) of
the originally dumped file is written to the "link_name" field rather
than storing another entire copy of the file into the tarfile. So,
"name" contains the full name of the symlink, and "link_name" contains
the full name of the original file. The result is that the full path of
the file pointed to by the symlink cannot be > 100 characters.
(Even in the case that the original symlink was a very short relative
link, that could resolve to a very long pathname. This explains why
there was no failure when "-h" wasn't specified - in that case
"link_name" of the failures cases was a "very short relative link", so
it was successful.)
>
> * tests/nodeinfotest.c (mymain): Shorten test names.
> (linuxTestNodeInfo): Accommodate new names.
> * tests/nodeinfodata/*: Rename files accordingly.
> ---
>
> This LOOKS huge, but is really just a couple of 'git mv' commands
> and a change to nodeinfotest.c. Scroll to the bottom for the
> real change; I've shortened boring parts of this mail to get past
> the 100k mail cap enforced by the list.
>
> ...fs-test-1-ppc.cpuinfo => linux-ppc-test1.cpuinfo} |0
> ...1-cpu-ppc-output.txt => linux-ppc-test1.expected} |0
> .../cpu/cpu0/online |0
> ...
> ...5-cpu-x86-output.txt => linux-x86-test5.expected} |0
> ...fs-test-6-x86.cpuinfo => linux-x86-test6.cpuinfo} |0
> ...6-cpu-x86-output.txt => linux-x86-test6.expected} |0
> tests/nodeinfotest.c | 18
> +-
> 447 files changed, 9 insertions(+), 9 deletions(-)
> rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1-ppc.cpuinfo =>
> linux-ppc-test1.cpuinfo} (100%)
> ...
> rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5-cpu-x86-output.txt
> rename to tests/nodeinfodata/linux-x86-test5.expected
> diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-x86.cpuinfo
> b/tests/nodeinfodata/linux-x86-test6.cpuinfo
> similarity index 100%
> rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-x86.cpuinfo
> rename to tests/nodeinfodata/linux-x86-test6.cpuinfo
> diff --git
> a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-cpu-x86-output.txt
> b/tests/nodeinfodata/linux-x86-test6.expected
> similarity index 100%
> rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-cpu-x86-output.txt
> rename to tests/nodeinfodata/linux-x86-test6.expected
> diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c
> index 851acd0..c44cc8a 100644
> --- a/tests/nodeinfotest.c
> +++ b/tests/nodeinfotest.c
> @@ -100,9 +100,9 @@ linuxTestNodeInfo(const void *data)
> if (virAsprintf(&sysfs_dir, "%s/nodeinfodata/linux-%s",
> abs_srcdir, test) < 0 ||
> virAsprintf(&cpuinfo, "%s/nodeinfodata/linux-%s-%s.cpuinfo",
> -abs_srcdir, test, arch) < 0 ||
> -virAsprintf(&output, "%s/nodeinfodata/linux-%s-cpu-%s-output.txt",
> -abs_srcdir, test, arch) < 0) {
> +abs_srcdir, arch, test) < 0 ||
> +virAsprintf(&output, "%s/nodeinfodata/linux-%s-%s.expected",
> +abs_srcdir, arch, test) < 0) {
> goto cleanup;
> }
>
> @@ -123,14 +123,14 @@ mymain(void)
> int ret = 0;
> int i;
> const char *nodeData[] = {
> -"nodeinfo-sysfs-test-1",
> +"test1",
> # if !(defined(__powerpc__) || \
> defined(__powerpc64__))
> -"nodeinfo-sysfs-test-2",
> -"nodeinfo-sysfs-test-3",
> -"nodeinfo-sysfs-test-4",
> -"nodeinfo-sysfs-test-5",
> -"n
Pick up some build fixes in the latest gnulib. In particular,
we want to ensure that official tarballs are secure, but don't
want to penalize people who don't run 'make dist', since fixed
automake still hasn't hit common platforms like Fedora 17.
* .gnulib: Update to latest, for Automake CVE-2012-3386 detection.
* bootstrap: Resync from gnulib.
* bootstrap.conf (gnulib_extra_files): Drop missing, since gnulib
has dropped it in favor of Automake's version.
* cfg.mk (local-checks-to-skip): Conditionally skip the security
check in cases where it doesn't matter.
---
I'm stoked! I figured out how to upgrade to the latest automake
and make our release process secure (tested with 'make dist' on
a system with insecure automake), without penalizing normal
development (tested with 'make check' on the same system).
* .gnulib a02ba4b...6c37e0a (76):
> verify: document conflict with -Wnested-externs
> maint.mk: forbid exit(-1)
> fsusage: port back to Solaris
> gnu-web-doc-update: fix error messages
> gnu-web-doc-update: check the requirements.
> maint.mk: minor simplification.
> gitlog-to-changelog: VPATH build issues.
> fpending: Assume AC_CHECK_DECLS_ONCE invocation, like in fpending.m4.
> pthread_sigmask: fix bug on FreeBSD 9
> README-release: make it more legible
> autoupdate
> maint: require that each sc_... command start with "@"
> maint.mk: add leading "@" to quiet new "make syntax-check" rule
> autoupdate
> maint.mk: new syntax check for HAVE_DECL checks
> argp: make HAVE_DECL usage consistent
> stat-time: relax license to LGPLv2+
> strndup: fix m4 usage error
> maint: enable the sc_avoid_if_before_free syntax-check rule
> gettext: do not assume '#define ... defined ...' behavior
> getloadavg: clean out old Emacs and Autoconf cruft
> bootstrap: let warn be like tests/init.sh's warn_
> getopt: Simplify after Emacs changed.
> maint.mk: add sc_vulnerable_makefile_CVE-2012-3386
> maint.mk: _sc_search_regexp, sc_vulnerable_makefile_CVE-2009-4029: fix
> getloadavg, getopt: fix commentary re configure.in
> timespec: mark functions with const attributes
> canonicalize[-lgpl]: handle "guessing" values when cross-building
> canonicalize: make the right guess when cross-compiling to GNU
> update from texinfo
> timespec-sub: avoid duplicate include
> bootstrap: use a more consistent error reporting scheme
> sys_time: allow too-wide tv_sec
> pthread: check for both pthread_create and pthread_join
> parse-datetime: doc tuneup
> do-release-commit-and-tag: fix the previous commit
> do-release-commit-and-tag: fix typo
> pthread: check for pthread_create, not pthread_join
> parse-datetime: fix failure to diagnose invalid input
> bootstrap: do not require now-removed build-aux/missing
> alloca: add support for HP NonStop TNS/E native
> fsusage: remove code not needed on non GNU/Linux systems.
> fsusage: include files needed for glibc 2.6 fallback
> fsusage: avoid needless check on GNU/Linux
> log: Fix an autoconf >= 2.64 warning.
> autoupdate
> autoupdate
> log10f: Fix possible configuration problem.
> Fix typo in ChangeLog entry.
> remove: No longer override on all platforms. Fixes bug from 2012-03-20.
> config: drop scripts that automake says are not independent
> root-uid: new module
> regex: use locale-independent comparison for codeset name
> getopt-posix: No longer guarantee that option processing is resettable.
> argp, regex: Ensure strcasecmp gets declared.
> autoupdate
> ptsname_r: Fix typo in last commit.
> ptsname_r: Make it consistent with ptsname on AIX.
> ptsname_r: Make it consistent with ptsname on OSF/1.
> ttyname_r: Fix result on OSF/1, Solaris.
> ptsname_r: Add support for Solaris.
> ptsname_r: Fix test failure on native Windows.
> ptsname_r: Fix test failures on IRIX, Solaris.
> ptsname test: Extend test.
> time: fix obsolete comment
> getopt-gnu: Handle suboptimal getopt_long's abbreviation handling.
> time_r: fix typo that always overrode localtime_r decl
> Write "Mac OS X" instead of "MacOS X".
> grantpt: Relax requirement regarding invalid file descriptors.
> fbufmode test: Don't test unportable behaviour.
> gnulib-tool: Refactor inctests variable.
> gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
> parse-duration test: Avoid spurious output.
> testing: fix typo in here doc
> maint: disable the strncpy prohibition
> Fix misspellings in comments.
.gnulib|2 +-
bootstrap | 118 +---
bootstrap.conf |1 -
cfg.mk | 11 ++
4 files changed, 81 insertions(+), 51 deletions(-)
diff --git a/.gnulib b/.gnulib
index a02ba4b..6c37e0a 16
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit a02ba4bf889fee4622db87f185c3d0af84d74ae7
+Subproject commit 6c37e0a73c7c1b6fe6eac4d794e2e65791a2700d
diff --git a/bootstrap b/bootstrap
index ce37a2c..e3e270
On 07/20/2012 04:26 PM, Eric Blake wrote:
> +# define virAtomicIntGet(atomic) \
> +(__extension__ ({ \
> +verify (sizeof(*(atomic)) == sizeof(int)); \
> within functions, use this instead:
>
> (void)verify_true(...)
Or this, to give a better error message where possible:
(void) verify_expr (sizeof(*(atomic)) == sizeof(int), "wrong size");
>
> The cast to void is unfortunately necessary to avoid a -Wall of
> 'statement with no effect'.
Likewise true of verify_expr().
--
Eric Blake ebl...@redhat.com+1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On 07/20/2012 12:36 AM, Hu Tao wrote:
+# define virAtomicIntGet(atomic) \
+(__extension__ ({ \
+verify (sizeof(*(atomic)) == sizeof(int)); \
+(void) (0 ? *(atomic) ^ *(atomic) : 0); \
+__sync_synchronize (); \
+(int) *(atomic);\
+}))
>>
>>>
>>> The `verify' lines cause building warnings:
>>>
>>> cc1: warnings being treated as errors
>>> util/virobject.c: In function 'virClassNew':
>>> util/virobject.c:74:99: error: nested extern declaration of
>>> '_gl_verify_function2' [-Wnested-externs]
>>
>> Which version of gcc?
It turns out this is a problem with any gcc older than 4.6 (that is,
newer gcc with static_assert support no longer triggers this problematic
nested extern). I was unable to come up with a way to avoid triggering
-Wnested-externs on older gcc without creating conflicting definitions.
However, it's easy to work around in libvirt. If -Wnested-externs is
in effect, then restrict the use of verify(...) to the top level
(outside of functions), and within functions, use this instead:
(void)verify_true(...)
The cast to void is unfortunately necessary to avoid a -Wall of
'statement with no effect'.
--
Eric Blake ebl...@redhat.com+1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On Wed, Jul 18, 2012 at 09:19:05PM +0100, Daniel P. Berrange wrote:
> On Sun, Jul 15, 2012 at 11:45:05PM +0200, Guido Günther wrote:
> > to query a guests's hostname. Containers like LXC and OpenVZ allow to
> > set a hostname different from the hosts name and QEMU's guest agent
> > could provide similar functionality.
> > ---
> > include/libvirt/libvirt.h.in |2 ++
> > src/driver.h |6 ++
> > src/libvirt.c| 45
> > ++
> > src/libvirt_public.syms |5 +
> > 4 files changed, 58 insertions(+)
>
> ACK
I've applied the whole series with your suggestions.
Thanks,
-- Guido
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On Fri, Jul 20, 2012 at 01:34:36PM -0600, Eric Blake wrote:
> Commit ddd6bef4 fixed an issue where 'make dist' failed to create
> a tarball because we have files with relative names longer than
> 100 bytes by the time you include a 'libvirt-0.9.13' prefix, by
> switching to the ustart format. Unfortunately, even with ustar
> format, the use of 'tar -ch' with symbolic links that resolve to
> a file name too long also fails (omitting the -h works, but automake
> automatically passes -h); such symlinks were added in commit
> 6dcf98c, which resulted in 'make dist' breaking again. The solution
> is to rename the offending symlinks to something shorter, by
> shortening the entire nodeinfodata naming scheme.
>
> * tests/nodeinfotest.c (mymain): Shorten test names.
> (linuxTestNodeInfo): Accommodate new names.
> * tests/nodeinfodata/*: Rename files accordingly.
> ---
>
> This LOOKS huge, but is really just a couple of 'git mv' commands
> and a change to nodeinfotest.c. Scroll to the bottom for the
> real change; I've shortened boring parts of this mail to get past
> the 100k mail cap enforced by the list.
>
> ...fs-test-1-ppc.cpuinfo => linux-ppc-test1.cpuinfo} |0
> ...1-cpu-ppc-output.txt => linux-ppc-test1.expected} |0
> .../cpu/cpu0/online |0
> ...
> ...5-cpu-x86-output.txt => linux-x86-test5.expected} |0
> ...fs-test-6-x86.cpuinfo => linux-x86-test6.cpuinfo} |0
> ...6-cpu-x86-output.txt => linux-x86-test6.expected} |0
> tests/nodeinfotest.c | 18
> +-
> 447 files changed, 9 insertions(+), 9 deletions(-)
> rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1-ppc.cpuinfo =>
> linux-ppc-test1.cpuinfo} (100%)
> ...
> rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5-cpu-x86-output.txt
> rename to tests/nodeinfodata/linux-x86-test5.expected
> diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-x86.cpuinfo
> b/tests/nodeinfodata/linux-x86-test6.cpuinfo
> similarity index 100%
> rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-x86.cpuinfo
> rename to tests/nodeinfodata/linux-x86-test6.cpuinfo
> diff --git
> a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-cpu-x86-output.txt
> b/tests/nodeinfodata/linux-x86-test6.expected
> similarity index 100%
> rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-cpu-x86-output.txt
> rename to tests/nodeinfodata/linux-x86-test6.expected
> diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c
> index 851acd0..c44cc8a 100644
> --- a/tests/nodeinfotest.c
> +++ b/tests/nodeinfotest.c
> @@ -100,9 +100,9 @@ linuxTestNodeInfo(const void *data)
> if (virAsprintf(&sysfs_dir, "%s/nodeinfodata/linux-%s",
> abs_srcdir, test) < 0 ||
> virAsprintf(&cpuinfo, "%s/nodeinfodata/linux-%s-%s.cpuinfo",
> -abs_srcdir, test, arch) < 0 ||
> -virAsprintf(&output, "%s/nodeinfodata/linux-%s-cpu-%s-output.txt",
> -abs_srcdir, test, arch) < 0) {
> +abs_srcdir, arch, test) < 0 ||
> +virAsprintf(&output, "%s/nodeinfodata/linux-%s-%s.expected",
> +abs_srcdir, arch, test) < 0) {
> goto cleanup;
> }
>
> @@ -123,14 +123,14 @@ mymain(void)
> int ret = 0;
> int i;
> const char *nodeData[] = {
> -"nodeinfo-sysfs-test-1",
> +"test1",
> # if !(defined(__powerpc__) || \
> defined(__powerpc64__))
> -"nodeinfo-sysfs-test-2",
> -"nodeinfo-sysfs-test-3",
> -"nodeinfo-sysfs-test-4",
> -"nodeinfo-sysfs-test-5",
> -"nodeinfo-sysfs-test-6",
> +"test2",
> +"test3",
> +"test4",
> +"test5",
> +"test6",
> # endif
> };
ACK
Daniel
--
|: http://berrange.com -o-http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Commit ddd6bef4 fixed an issue where 'make dist' failed to create
a tarball because we have files with relative names longer than
100 bytes by the time you include a 'libvirt-0.9.13' prefix, by
switching to the ustart format. Unfortunately, even with ustar
format, the use of 'tar -ch' with symbolic links that resolve to
a file name too long also fails (omitting the -h works, but automake
automatically passes -h); such symlinks were added in commit
6dcf98c, which resulted in 'make dist' breaking again. The solution
is to rename the offending symlinks to something shorter, by
shortening the entire nodeinfodata naming scheme.
* tests/nodeinfotest.c (mymain): Shorten test names.
(linuxTestNodeInfo): Accommodate new names.
* tests/nodeinfodata/*: Rename files accordingly.
---
This LOOKS huge, but is really just a couple of 'git mv' commands
and a change to nodeinfotest.c. Scroll to the bottom for the
real change; I've shortened boring parts of this mail to get past
the 100k mail cap enforced by the list.
...fs-test-1-ppc.cpuinfo => linux-ppc-test1.cpuinfo} |0
...1-cpu-ppc-output.txt => linux-ppc-test1.expected} |0
.../cpu/cpu0/online |0
...
...5-cpu-x86-output.txt => linux-x86-test5.expected} |0
...fs-test-6-x86.cpuinfo => linux-x86-test6.cpuinfo} |0
...6-cpu-x86-output.txt => linux-x86-test6.expected} |0
tests/nodeinfotest.c | 18 +-
447 files changed, 9 insertions(+), 9 deletions(-)
rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1-ppc.cpuinfo =>
linux-ppc-test1.cpuinfo} (100%)
...
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5-cpu-x86-output.txt
rename to tests/nodeinfodata/linux-x86-test5.expected
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-x86.cpuinfo
b/tests/nodeinfodata/linux-x86-test6.cpuinfo
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-x86.cpuinfo
rename to tests/nodeinfodata/linux-x86-test6.cpuinfo
diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-cpu-x86-output.txt
b/tests/nodeinfodata/linux-x86-test6.expected
similarity index 100%
rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-cpu-x86-output.txt
rename to tests/nodeinfodata/linux-x86-test6.expected
diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c
index 851acd0..c44cc8a 100644
--- a/tests/nodeinfotest.c
+++ b/tests/nodeinfotest.c
@@ -100,9 +100,9 @@ linuxTestNodeInfo(const void *data)
if (virAsprintf(&sysfs_dir, "%s/nodeinfodata/linux-%s",
abs_srcdir, test) < 0 ||
virAsprintf(&cpuinfo, "%s/nodeinfodata/linux-%s-%s.cpuinfo",
-abs_srcdir, test, arch) < 0 ||
-virAsprintf(&output, "%s/nodeinfodata/linux-%s-cpu-%s-output.txt",
-abs_srcdir, test, arch) < 0) {
+abs_srcdir, arch, test) < 0 ||
+virAsprintf(&output, "%s/nodeinfodata/linux-%s-%s.expected",
+abs_srcdir, arch, test) < 0) {
goto cleanup;
}
@@ -123,14 +123,14 @@ mymain(void)
int ret = 0;
int i;
const char *nodeData[] = {
-"nodeinfo-sysfs-test-1",
+"test1",
# if !(defined(__powerpc__) || \
defined(__powerpc64__))
-"nodeinfo-sysfs-test-2",
-"nodeinfo-sysfs-test-3",
-"nodeinfo-sysfs-test-4",
-"nodeinfo-sysfs-test-5",
-"nodeinfo-sysfs-test-6",
+"test2",
+"test3",
+"test4",
+"test5",
+"test6",
# endif
};
--
1.7.10.4
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On Fri, Jul 20, 2012 at 11:15:58AM -0600, Eric Blake wrote:
> On 07/20/2012 10:59 AM, Daniel P. Berrange wrote:
> > From: "Daniel P. Berrange"
> >
> > Instead of using an O(n) efficiency linked list for storing
> > MCS labels, use a hash table. Instead of having the list
> > be global, put it in the SELinux driver private data struct
> > to ensure uniqueness across different instances of the driver
>
> Goodness on two fronts - improved efficiency and re-entrancy :)
I expanded the commit message to mention the thread safety aspect
of this.
Daniel
--
|: http://berrange.com -o-http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On Fri, Jul 20, 2012 at 11:06:40AM -0600, Eric Blake wrote:
> On 07/20/2012 10:59 AM, Daniel P. Berrange wrote:
> > From: "Daniel P. Berrange"
> >
> > The function names in the SELinux driver all start with
> > SELinux or 'mcs' as a prefix. Sanitize this so that they
> > all use 'virSecuritySELinux' as the prefix
> >
> > Signed-off-by: Daniel P. Berrange
> > ---
> > src/security/security_selinux.c | 394
> > ---
> > 1 file changed, 198 insertions(+), 196 deletions(-)
>
> Mechanical. ACK.
>
> > @@ -487,12 +489,12 @@ SELinuxSecurityDriverClose(virSecurityManagerPtr mgr)
> > }
> >
> >
> > -static const char *SELinuxSecurityGetModel(virSecurityManagerPtr mgr
> > ATTRIBUTE_UNUSED)
> > +static const char
> > *virSecuritySELinuxSecurityGetModel(virSecurityManagerPtr mgr
> > ATTRIBUTE_UNUSED)
>
> For hunks like this, do you want to reformat to:
>
> static const char *
> virSecuritySELinuxSecurityGetModel(virSecurityManagerPtr mgr
> ATTRIBUTE_UNUSED)
>
> to avoid the long lines? But that's cosmetic, and doesn't get in the
> way of my ack.
Yes, I've fixed the long lines here
Daniel
--
|: http://berrange.com -o-http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On 07/20/2012 08:21 AM, Daniel P. Berrange wrote:
> From: "Daniel P. Berrange"
>
> Define a new virConnectSetCloseCallback() public API which allows
> registering a callback to be invoked when the connection to a
> hypervisor is closed. The callback is provided with the reason for
> the close, which may be 'error', 'eof' or 'keepalive'.
>
> Signed-off-by: Daniel P. Berrange
> ---
> include/libvirt/libvirt.h.in | 40 +---
> src/datatypes.c |4 +++
> src/datatypes.h |5
> src/libvirt.c| 60
> ++
> src/libvirt_public.syms |6 +
> 5 files changed, 105 insertions(+), 10 deletions(-)
>
> diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
> index e34438c..85d8c8a 100644
> --- a/include/libvirt/libvirt.h.in
> +++ b/include/libvirt/libvirt.h.in
> @@ -49,6 +49,17 @@ extern "C" {
> * defines VIR_ENUM_SENTINELS. Enumerations for bit values do not
> * have a *_LAST value, but additional bits may be defined. */
>
> +/*
> + * virFreeCallback:
> + * @opaque: opaque user data provided at registration
> + *
> + * Type for a domain event callback when the event is deregistered and
> + * need to be freed, @opaque is provided along with the callback at
> + * registration time
> + */
> +typedef void (*virFreeCallback)(void *opaque);
We're now using this for more than just domain events; the comment needs
a slight update. Maybe:
Type for a callback cleanup function to be paired with a callback. This
function will be called as a final chance to clean up the @opaque
registered with the primary callback, at the time when the primary
callback is deregistered.
> +++ b/src/datatypes.c
> @@ -115,6 +115,10 @@ virReleaseConnect(virConnectPtr conn) {
>
> virMutexLock(&conn->lock);
>
> +if (conn->closeOpaque &&
> +conn->closeFreeCallback)
> +conn->closeFreeCallback(conn->closeOpaque);
I'm still not sure I like filtering on NULL opaque. Our other uses of a
virFreeCallback include src/fdstream.c:virFDStreamRemoveCallback, and
there we call fdst->ff without regards to whether fdst->opaque is null.
> +int virConnectSetCloseCallback(virConnectPtr conn,
> + virConnectCloseFunc cb,
> + void *opaque,
> + virFreeCallback freecb)
> +{
> +VIR_DEBUG("conn=%p", conn);
> +
> +virResetLastError();
> +
> +if (!VIR_IS_CONNECT(conn)) {
> +virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__);
> +virDispatchError(NULL);
> +return -1;
> +}
> +
> +virMutexLock(&conn->lock);
> +
> +if (conn->closeCallback) {
> +virLibConnError(VIR_ERR_OPERATION_INVALID, "%s",
> +_("A close callback is already registered"));
> +goto error;
> +}
Do we want to allow deregistration of a close callback (we have
virConnectDomainEventDeregister, after all).
--
Eric Blake ebl...@redhat.com+1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On 07/20/2012 08:24 AM, Osier Yang wrote:
> Except objects of domains, domain snapshots, we will also add APIs
> to list objects like storage pools, storage vols, network, interface,
> etc. And it's deserved to have the small helper functions in a
> common file instead of in separate files.
>
> This patch renames virdomainlist.[ch] to virobjectlist.[ch], and
> also renames the macros to filter domain objects more specificly.
s/specificly/specifically/
>
> src/conf/virdomainlist.c: Renamed to src/conf/virobjectlist.c
> src/conf/virdomainlist.h: Renamed to src/conf/virobjectlist.h
Looks reasonable.
> @@ -31,7 +33,7 @@
> #include "datatypes.h"
> #include "virterror_internal.h"
>
> -#define VIR_FROM_THIS VIR_FROM_DOMAIN
> +#define VIR_FROM_THIS VIR_FROM_NONE
I'm debating whether:
s/VIR_FROM_NONE/VIR_FROM_CONF/
makes sense. Or maybe you keep the file organized in sections, and
between each section, you:
#undef VIR_FROM_THIS
#define VIR_FROM_THIS VIR_FROM_SECRET
// secret listing
#undef VIR_FROM_THIS
#define VIR_FROM_THIS VIR_FROM_DOMAIN_SNAPSHOT
// snapshot listing
and so forth. That way, the error messages will be a bit better.
ACK.
--
Eric Blake ebl...@redhat.com+1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On 07/20/2012 10:59 AM, Daniel P. Berrange wrote:
> From: "Daniel P. Berrange"
>
> Instead of using an O(n) efficiency linked list for storing
> MCS labels, use a hash table. Instead of having the list
> be global, put it in the SELinux driver private data struct
> to ensure uniqueness across different instances of the driver
Goodness on two fronts - improved efficiency and re-entrancy :)
ACK.
--
Eric Blake ebl...@redhat.com+1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On 07/20/2012 10:59 AM, Daniel P. Berrange wrote:
> From: "Daniel P. Berrange"
>
> When adding MCS labels, OOM was not being handled correctly.
> In addition when reserving an existing label, no check was
> made to see if it was already reserved
>
> Signed-off-by: Daniel P. Berrange
> ---
> src/security/security_selinux.c | 41
> ++-
> 1 file changed, 32 insertions(+), 9 deletions(-)
>
ACK.
--
Eric Blake ebl...@redhat.com+1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On 07/20/2012 10:59 AM, Daniel P. Berrange wrote:
> From: "Daniel P. Berrange"
>
> The function names in the SELinux driver all start with
> SELinux or 'mcs' as a prefix. Sanitize this so that they
> all use 'virSecuritySELinux' as the prefix
>
> Signed-off-by: Daniel P. Berrange
> ---
> src/security/security_selinux.c | 394
> ---
> 1 file changed, 198 insertions(+), 196 deletions(-)
Mechanical. ACK.
> @@ -487,12 +489,12 @@ SELinuxSecurityDriverClose(virSecurityManagerPtr mgr)
> }
>
>
> -static const char *SELinuxSecurityGetModel(virSecurityManagerPtr mgr
> ATTRIBUTE_UNUSED)
> +static const char *virSecuritySELinuxSecurityGetModel(virSecurityManagerPtr
> mgr ATTRIBUTE_UNUSED)
For hunks like this, do you want to reformat to:
static const char *
virSecuritySELinuxSecurityGetModel(virSecurityManagerPtr mgr
ATTRIBUTE_UNUSED)
to avoid the long lines? But that's cosmetic, and doesn't get in the
way of my ack.
--
Eric Blake ebl...@redhat.com+1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
This is a repost of
https://www.redhat.com/archives/libvir-list/2012-May/msg01186.html
No changes except to rebase.
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On Fri, Jul 20, 2012 at 10:15:29AM -0600, Eric Blake wrote:
> On 07/20/2012 08:24 AM, Osier Yang wrote:
> > Some of the macros use tab, while the left use spaces, this patch
> > change it to always use the spaces. And a few aligning fixes.
> > ---
> > src/datatypes.h | 86
> > +++---
> > 1 files changed, 43 insertions(+), 43 deletions(-)
>
> ACK.
>
> >
> > diff --git a/src/datatypes.h b/src/datatypes.h
> > index fc284d2..01a8544 100644
> > --- a/src/datatypes.h
> > +++ b/src/datatypes.h
> > @@ -33,8 +33,8 @@
> > * magic value used to protect the API when pointers to connection
> > structures
> > * are passed down by the users.
> > */
> > -# define VIR_CONNECT_MAGIC 0x4F23DEAD
> > -# define VIR_IS_CONNECT(obj) ((obj) &&
> > (obj)->magic==VIR_CONNECT_MAGIC)
> > +# define VIR_CONNECT_MAGIC 0x4F23DEAD
> > +# define VIR_IS_CONNECT(obj) ((obj) && (obj)->magic==VIR_CONNECT_MAGIC)
>
> Conflicts with Dan's series to use virObject.
Push this patch now independantly of the rest of this huge series.
I'll sort out conflicts when I rebase my virObject code next week.
Daniel
--
|: http://berrange.com -o-http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On 07/20/2012 08:24 AM, Osier Yang wrote:
> Some of the macros use tab, while the left use spaces, this patch
> change it to always use the spaces. And a few aligning fixes.
> ---
> src/datatypes.h | 86 +++---
> 1 files changed, 43 insertions(+), 43 deletions(-)
ACK.
>
> diff --git a/src/datatypes.h b/src/datatypes.h
> index fc284d2..01a8544 100644
> --- a/src/datatypes.h
> +++ b/src/datatypes.h
> @@ -33,8 +33,8 @@
> * magic value used to protect the API when pointers to connection structures
> * are passed down by the users.
> */
> -# define VIR_CONNECT_MAGIC 0x4F23DEAD
> -# define VIR_IS_CONNECT(obj) ((obj) && (obj)->magic==VIR_CONNECT_MAGIC)
> +# define VIR_CONNECT_MAGIC 0x4F23DEAD
> +# define VIR_IS_CONNECT(obj) ((obj) && (obj)->magic==VIR_CONNECT_MAGIC)
Conflicts with Dan's series to use virObject.
--
Eric Blake ebl...@redhat.com+1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On 07/20/2012 08:18 AM, Daniel P. Berrange wrote:
>>> @@ -463,6 +480,9 @@ void virNetClientFree(virNetClientPtr client)
>>> return;
>>> }
>>>
>>> +if (client->closeFf && client->closeOpaque)
>>> +client->closeFf(client->closeOpaque);
>>
>> Again, you should not be forcing closeOpaque to be non-NULL. It's
>> opaque, after all.
>
> If opaque is NULL, then there's nothing that needs free'ing.
Maybe nothing to free, but there may still be side effects (such as
logging) in the closeFf that the caller still wants to have happen.
--
Eric Blake ebl...@redhat.com+1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On 07/20/12 16:11, Daniel P. Berrange wrote:
From: "Daniel P. Berrange"
Update the legacy Xen drivers to use virReportError instead of
the statsError, virXenInotifyError, virXenStoreError,
virXendError, xenUnifiedError, xenXMError custom macros
Signed-off-by: Daniel P. Berrange
---
cfg.mk |7 -
src/xen/block_stats.c| 54 +++---
src/xen/xen_driver.c | 114 ++--
src/xen/xen_hypervisor.c | 158
src/xen/xen_inotify.c| 48 +++--
src/xen/xend_internal.c | 462 +++---
src/xen/xm_internal.c| 134 +++---
src/xen/xs_internal.c| 40 ++--
8 files changed, 489 insertions(+), 528 deletions(-)
I reviewed the xen_hypervisor file and hope you didn't change anything
in the other files so
ACK
Peter
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On Fri, Jul 20, 2012 at 09:46:42AM -0600, Eric Blake wrote:
> > One remark up there, but no biggie.
>
> I had to hunt for that remark among 70k of verbatim patch. Not only is
> it okay to trim portions of the patch that you are happy with, but
> trimming actually helps focus on the problems. Just be sure you leave
> enough context to help the readers pinpoint where the problem was (as I
> did here, by including the @@ line at the start of the problematic hunk).
I completely agree with your point, but if you have a good mutt
colour setup, it is fairly easy to scan through large mails and
distinguish new text vs quoted text at a glance. I even have
some magic settings to highlight patches in email
http://berrange.fedorapeople.org/mutt-patch-colour.jpeg
In my .muttrc:
# General colour settings
color attachment brightmagenta black
#color body white black
color bold green black
color header brightyellow black ^(From|Subject):
color hdrdefault yellow black
#color index white black
#color indicator brightyellow red
color indicator brightyellow red
color markers brightcyan black
color message brightcyan black
color normal white black
color quoted brightblue black
color search green black
color signature red black
color status yellow blue
color tilde magenta black
color tree magenta black
color underline green black
# Patch file highlighting
color body green black "^diff \-.*"
color body green black "^index [a-f0-9].*"
color body green black "^\-\-\- .*"
color body green black "^[\+]{3} .*"
color body cyan black "^[\+][^\+]+.*"
color body red black "^\-[^\-]+.*"
color body brightblue black "^@@ .*"
Daniel
--
|: http://berrange.com -o-http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On 07/20/12 16:11, Daniel P. Berrange wrote:
From: "Daniel P. Berrange"
The xenHypervisorInit method was called from two different
locations, during initial driver registration and also while
opening a Xen connection. The former can't report any useful
errors to the end user/app, so remove it. To ensure thread
safety use a VIR_ONCE_GLOBAL_INIT call to invoke
xenHypervisorInit from the xenHypervisorOpen method.
---
src/xen/xen_driver.c |3 ---
src/xen/xen_hypervisor.c | 31 ++-
2 files changed, 10 insertions(+), 24 deletions(-)
This version definitely looks better. ACK.
Peter
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On 07/20/12 16:11, Daniel P. Berrange wrote:
From: "Daniel P. Berrange"
As per the comment, the Xen hypervisor driver is considered to
be mandatory when running privileged. When it fails to open,
we should thus return an error, not ignore it.
---
src/xen/xen_driver.c |2 ++
1 file changed, 2 insertions(+)
ACK.
Peter
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On 07/20/2012 07:23 AM, Daniel P. Berrange wrote:
>> I guess I'm missing something important here... If libvirtd is old enough not
>> to support listAllStoragePools, how it can be new enough to support the new
>> API which would return pool type?
>
> Yeah, this just doesn't make any sense. All filtering should be done in
> the libvirtd server side for new enough libvirt. Nothing should be done
> client side, for old or new libvirtd.
Not quite true. For domains and snapshots, we added some client-side
filtering into virsh _in the cases where the filtering was easy using
older API_. For example, when listing snapshot parents, virsh will do
getXML scraping to determine that information from older libvirt that
lacked virDomainSnapshotGetParent.
The rule of thumb in virsh is that if you can easily determine using
older API (such as dumpxml, O(1) per guest that you are querying)
whether to filter, then when new virsh finds out that it is talking to
an old server that can't do server-side filtering, then virsh can still
do the filtering client-side. But if the information was not available
in older API, then virsh should fail loudly if the filtering attempt
cannot be honored due to older server. For example, with snapshots, I
added the ability to filter on whether a snapshot has children, but
getting that information from older API is a prohibitively expensive -
it is O(n^2) API calls per snapshot making filtering an O(n^3) operation
if I were to attempt it on every snapshot, so that is failed instead of
attempting a fallback.
--
Eric Blake ebl...@redhat.com+1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On 07/20/2012 07:34 AM, Martin Kletzander wrote:
> On 07/18/2012 08:40 PM, Daniel P. Berrange wrote:
>> From: "Daniel P. Berrange"
>>
>> Update the VMX shared code to use virReportError instead of
>> the VMX_ERROR custom macro
>>
>> @@ -3676,9 +3672,9 @@ virVMXFormatSerial(virVMXContext *ctx,
>> virDomainChrDefPtr def,
>> break;
>>
>>default:
>> -VMX_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,
>> - _("Unsupported character device TCP protocol '%s'"),
>> - virDomainChrTcpProtocolTypeToString(
>> +virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
>> + _("Unsupported character device TCP protocol
>> '%s'"),
>> + virDomainChrTcpProtocolTypeToString(
>>def->source.data.tcp.protocol));
>
> I'd probably indent the "def->source..." line differently so it's more
> visible that it is one level deeper.
>
>
> One remark up there, but no biggie.
I had to hunt for that remark among 70k of verbatim patch. Not only is
it okay to trim portions of the patch that you are happy with, but
trimming actually helps focus on the problems. Just be sure you leave
enough context to help the readers pinpoint where the problem was (as I
did here, by including the @@ line at the start of the problematic hunk).
--
Eric Blake ebl...@redhat.com+1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On 07/04/12 19:42, Dmitry Guryanov wrote:
PARALLELS has one serious discrepancy with libvirt: libvirt stores
domain configuration files in one place, and storage files
in other places (with the API of storage pools and storage volumes).
PARALLELS stores all domain data in a single directory, for example, you
may have domain with name fedora-15, which will be located in
'/var/parallels/fedora-15.pvm', and it's hard disk image will be
in '/var/parallels/fedora-15.pvm/harddisk1.hdd'.
I've decided to create storage driver, which produces pseudo-volumes
(xml files with volume description), and they will be 'converted' to
real disk images after attaching to a VM.
So if someone creates VM with one hard disk using virt-manager,
at first virt-manager creates a new volume, and then defines a
domain. We can lookup a volume by path in XML domain definition
and find out location of new domain and size of its hard disk.
Signed-off-by: Dmitry Guryanov
---
Comments inline.
po/POTFILES.in|1 +
src/Makefile.am |3 +-
src/parallels/parallels_driver.c |6 +-
src/parallels/parallels_driver.h |5 +
src/parallels/parallels_storage.c | 1460 +
src/parallels/parallels_utils.c | 24 +
6 files changed, 1496 insertions(+), 3 deletions(-)
create mode 100644 src/parallels/parallels_storage.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index dcb0813..240becb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -66,6 +66,7 @@ src/phyp/phyp_driver.c
src/parallels/parallels_driver.c
src/parallels/parallels_driver.h
src/parallels/parallels_utils.c
+src/parallels/parallels_storage.c
src/qemu/qemu_agent.c
src/qemu/qemu_bridge_filter.c
src/qemu/qemu_capabilities.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 93989c8..6908bb2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -482,7 +482,8 @@ HYPERV_DRIVER_EXTRA_DIST =
\
PARALLELS_DRIVER_SOURCES =\
parallels/parallels_driver.h\
parallels/parallels_driver.c\
- parallels/parallels_utils.c
+ parallels/parallels_utils.c \
+ parallels/parallels_storage.c
NETWORK_DRIVER_SOURCES = \
network/bridge_driver.h network/bridge_driver.c
diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
index 54bdc9a..8c8ddd8 100644
--- a/src/parallels/parallels_driver.c
+++ b/src/parallels/parallels_driver.c
@@ -65,13 +65,13 @@ static int parallelsStart(virDomainObjPtr privdom);
static int parallelsKill(virDomainObjPtr privdom);
static int parallelsStop(virDomainObjPtr privdom);
-static void
+void
parallelsDriverLock(parallelsConnPtr driver)
{
virMutexLock(&driver->lock);
}
-static void
+void
Looks like these should be squashed into one of the previous patches,
but I'm not sure if you'll need this.
parallelsDriverUnlock(parallelsConnPtr driver)
{
virMutexUnlock(&driver->lock);
@@ -1226,6 +1226,8 @@ parallelsRegister(void)
if (virRegisterDriver(¶llelsDriver) < 0)
return -1;
+if (parallelsStorageRegister())
+return -1;
return 0;
}
diff --git a/src/parallels/parallels_driver.h b/src/parallels/parallels_driver.h
index 2b3c956..6f06ac8 100644
--- a/src/parallels/parallels_driver.h
+++ b/src/parallels/parallels_driver.h
@@ -26,6 +26,7 @@
# include "domain_conf.h"
# include "storage_conf.h"
+# include "driver.h"
# include "domain_event.h"
# include "json.h"
@@ -59,8 +60,12 @@ typedef struct _parallelsConn parallelsConn;
typedef struct _parallelsConn *parallelsConnPtr;
int parallelsRegister(void);
+int parallelsStorageRegister(void);
virJSONValuePtr parallelsParseOutput(const char *binary, ...)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL;
int parallelsCmdRun(const char *binary, ...) ATTRIBUTE_NONNULL(1)
ATTRIBUTE_SENTINEL;
+char * parallelsAddFileExt(const char *path, const char *ext);
+void parallelsDriverLock(parallelsConnPtr driver);
+void parallelsDriverUnlock(parallelsConnPtr driver);
Please include these in some kind of private header file, so you don't
expose them into other drivers.
#endif
diff --git a/src/parallels/parallels_storage.c
b/src/parallels/parallels_storage.c
new file mode 100644
index 000..5a5b366
--- /dev/null
+++ b/src/parallels/parallels_storage.c
@@ -0,0 +1,1460 @@
+/*
+ * parallels_storage.c: core driver functions for managing
+ * Parallels Virtuozzo Server hosts
+ *
+ * Copyright (C) 2012 Parallels, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any la
On 07/20/2012 12:36 AM, Hu Tao wrote:
>>> The `verify' lines cause building warnings:
>>>
>>> cc1: warnings being treated as errors
>>> util/virobject.c: In function 'virClassNew':
>>> util/virobject.c:74:99: error: nested extern declaration of
>>> '_gl_verify_function2' [-Wnested-externs]
>>
>> Which version of gcc?
>>
>> I'll have to see if I can come up with a solution in upstream gnulib
>> that expands verify() in such a way that works with -Wnested-externs.
>
> $ gcc --version
> gcc (GCC) 4.5.1 20100924 (Red Hat 4.5.1-4)
> Copyright (C) 2010 Free Software Foundation, Inc.
>
>
> This is the gcc shipped with Fedora 14.
You _do_ realize that Fedora 14 is unsupported upstream (right now, the
oldest supported version is Fedora 16). That said, I still have an F14
VM lying around, so I will try to reproduce this.
--
Eric Blake ebl...@redhat.com+1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Two more changes:
1. Use virReportError instead of custom xxxReportError.
2. Moved the geometry element to diskspec, so it applies to all kind
of disks.
Please disregard the preceding patches.
J.B. Joret (2):
Support for Disk Geometry Override
qemu: Disk Geometry Override Support
docs/formatdomain.html.in | 25 +++
docs/schemas/domaincommon.rng | 25 +++
src/conf/domain_conf.c | 71
src/conf/domain_conf.h | 17 +
src/libvirt_private.syms |2 +
src/qemu/qemu_command.c| 59
.../qemuxml2argv-disk-geometry.args|4 +
.../qemuxml2argv-disk-geometry.xml | 26 +++
tests/qemuxml2argvtest.c |2 +
9 files changed, 231 insertions(+), 0 deletions(-)
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.xml
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
This is to list the secret objects. No flags are supported
include/libvirt/libvirt.h.in: Declare enum virConnectListAllSecretFlags
and virConnectListAllSecrets.
python/generator.py: Skip auto-generating
src/driver.h: (virDrvConnectListAllSecrets)
src/libvirt.c: Implement the public API
src/libvirt_public.syms: Export the symbol to public
---
include/libvirt/libvirt.h.in |3 ++
python/generator.py |1 +
src/driver.h |5
src/libvirt.c| 50 ++
src/libvirt_public.syms |1 +
5 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index aea4d8a..c67c89b 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -3164,6 +3164,9 @@ int virConnectNumOfSecrets
(virConnectPtr conn);
int virConnectListSecrets (virConnectPtr conn,
char **uuids,
int maxuuids);
+int virConnectListAllSecrets(virConnectPtr conn,
+ virSecretPtr **secrets,
+ unsigned int flags);
virSecretPtrvirSecretLookupByUUID(virConnectPtr conn,
const unsigned char *uuid);
virSecretPtrvirSecretLookupByUUIDString(virConnectPtr conn,
diff --git a/python/generator.py b/python/generator.py
index 00e242f..447ff47 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -462,6 +462,7 @@ skip_function = (
'virConnectListAllInterfaces', # overridden in virConnect.py
'virConnectListAllNodeDevices', # overridden in virConnect.py
'virConnectListAllNWFilters', # overridden in virConnect.py
+'virConnectListAllSecrets', # overridden in virConnect.py
'virStreamRecvAll', # Pure python libvirt-override-virStream.py
'virStreamSendAll', # Pure python libvirt-override-virStream.py
diff --git a/src/driver.h b/src/driver.h
index 5ace502..8c1d799 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -1540,6 +1540,10 @@ typedef int
(*virDrvListSecrets) (virConnectPtr conn,
char **uuids,
int maxuuids);
+typedef int
+(*virDrvListAllSecrets)(virConnectPtr conn,
+virSecretPtr **secrets,
+unsigned int flags);
typedef struct _virSecretDriver virSecretDriver;
typedef virSecretDriver *virSecretDriverPtr;
@@ -1561,6 +1565,7 @@ struct _virSecretDriver {
virDrvNumOfSecrets numOfSecrets;
virDrvListSecrets listSecrets;
+virDrvListAllSecretslistAllSecrets;
virDrvSecretLookupByUUIDlookupByUUID;
virDrvSecretLookupByUsage lookupByUsage;
virDrvSecretDefineXML defineXML;
diff --git a/src/libvirt.c b/src/libvirt.c
index ff02c88..009e99f 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -14350,6 +14350,56 @@ error:
}
/**
+ * virConnectListAllSecrets:
+ * @conn: Pointer to the hypervisor connection.
+ * @secrets: Pointer to a variable to store the array containing the secret
+ * objects or NULL if the list is not required (just returns the
+ * number of secrets).
+ * @flags: extra flags; not used yet, so callers should always pass 0
+ *
+ * Collect the list of secrets, and allocate an array to store those objects.
+ *
+ * Returns the number of secrets found or -1 and sets @secrets to NULL in case
+ * of error. On success, the array stored into @secrets is guaranteed to
+ * have an extra allocated element set to NULL but not included in the return
count,
+ * to make iteration easier. The caller is responsible for calling
+ * virSecretFree() on each array element, then calling free() on @secrets.
+ */
+int
+virConnectListAllSecrets(virConnectPtr conn,
+ virSecretPtr **secrets,
+ unsigned int flags)
+{
+VIR_DEBUG("conn=%p, secrets=%p, flags=%x", conn, secrets, flags);
+
+virResetLastError();
+
+if (secrets)
+*secrets = NULL;
+
+if (!VIR_IS_CONNECT(conn)) {
+virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__);
+virDispatchError(NULL);
+return -1;
+}
+
+if (conn->secretDriver &&
+conn->secretDriver->listAllSecrets) {
+int ret;
+ret = conn->secretDriver->listAllSecrets(conn, secrets, flags);
+if (ret < 0)
+goto error;
+return ret;
+}
+
+virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__);
+
+error:
+virDispatchError(conn);
+return -1;
+}
+
+/**
* virConnectListSecrets:
* @conn: virConnect connection
* @uuids: Pointer to an array to store the UUIDs
diff --git
This is to list the node device objects, supports to filter the results
by capability types.
include/libvirt/libvirt.h.in: Declare enum virConnectListAllNodeDeviceFlags
and virConnectListAllNodeDevices.
python/generator.py: Skip auto-generating
src/driver.h: (virDrvConnectListAllNodeDevices)
src/libvirt.c: Implement the public API
src/libvirt_public.syms: Export the symbol to public
---
include/libvirt/libvirt.h.in | 25 +
python/generator.py |1 +
src/driver.h |4 +++
src/libvirt.c| 59 ++
src/libvirt_public.syms |1 +
5 files changed, 90 insertions(+), 0 deletions(-)
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index 15e2363..cfdb162 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -2750,6 +2750,31 @@ int virNodeListDevices
(virConnectPtr conn,
char **const names,
int maxnames,
unsigned int flags);
+/*
+ * virConnectListAllNodeDevices:
+ *
+ * Flags used to filter the returned node devices. Flags in each group
+ * are exclusive.
+ */
+typedef enum {
+/* Reserved the first 6 bits for the possibility of persistent
+ * node device support in future.
+ */
+
+VIR_CONNECT_LIST_NODE_DEVICES_CAP_SYSTEM= 1 << 6,
+VIR_CONNECT_LIST_NODE_DEVICES_CAP_PCI_DEV = 1 << 7,
+VIR_CONNECT_LIST_NODE_DEVICES_CAP_USB_DEV = 1 << 8,
+VIR_CONNECT_LIST_NODE_DEVICES_CAP_USB_INTERFACE = 1 << 9,
+VIR_CONNECT_LIST_NODE_DEVICES_CAP_NET = 1 << 10,
+VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI_HOST = 1 << 11,
+VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI_TARGET = 1 << 12,
+VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI = 1 << 13,
+VIR_CONNECT_LIST_NODE_DEVICES_CAP_STORAGE = 1 << 14,
+} virConnectListAllNodeDeviceFlags;
+
+int virConnectListAllNodeDevices (virConnectPtr conn,
+ virNodeDevicePtr
**devices,
+ unsigned int flags);
virNodeDevicePtrvirNodeDeviceLookupByName (virConnectPtr conn,
const char *name);
diff --git a/python/generator.py b/python/generator.py
index 51c3fce..6f50fa0 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -460,6 +460,7 @@ skip_function = (
'virStoragePoolListAllVolumes', # overridden in virStoragePool.py
'virConnectListAllNetworks', # overridden in virConnect.py
'virConnectListAllInterfaces', # overridden in virConnect.py
+'virConnectListAllNodeDevices', # overridden in virConnect.py
'virStreamRecvAll', # Pure python libvirt-override-virStream.py
'virStreamSendAll', # Pure python libvirt-override-virStream.py
diff --git a/src/driver.h b/src/driver.h
index 335ee86..102684c 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -1456,6 +1456,9 @@ typedef int (*virDevMonListDevices)(virConnectPtr conn,
char **const names,
int maxnames,
unsigned int flags);
+typedef int (*virDevMonListAllNodeDevices)(virConnectPtr conn,
+ virNodeDevicePtr **devices,
+ unsigned int flags);
typedef virNodeDevicePtr (*virDevMonDeviceLookupByName)(virConnectPtr conn,
const char *name);
@@ -1489,6 +1492,7 @@ struct _virDeviceMonitor {
virDrvClose close;
virDevMonNumOfDevices numOfDevices;
virDevMonListDeviceslistDevices;
+virDevMonListAllNodeDevices listAllNodeDevices;
virDevMonDeviceLookupByName deviceLookupByName;
virDevMonDeviceGetXMLDesc deviceGetXMLDesc;
virDevMonDeviceGetParentdeviceGetParent;
diff --git a/src/libvirt.c b/src/libvirt.c
index c50bb3d..6d4cd76 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -13559,6 +13559,65 @@ error:
return -1;
}
+/**
+ * virConnectListAllNodeDevices:
+ * @conn: Pointer to the hypervisor connection.
+ * @devices: Pointer to a variable to store the array containing the node
+ * device objects or NULL if the list is not required (just returns
+ * number of node devices).
+ * @flags: bitwise-OR of virConnectListAllNodeDevices.
+ *
+ * Collect the list of node devices, and allocate an array to store those
+ * objects.
+ *
+ * By default, this API covers all node devices; it is also possible to return
+ * the filtered objects with flags. Filters are provided in groups, where each
+ * group contains bits that describe mutually exclusive attributes of a node
+ * device.
+ *
+ *
This is to list the network fitler objects. No flags are supported
include/libvirt/libvirt.h.in: Declare enum virConnectListAllNWFilterFlags
and virConnectListAllNWFilters.
python/generator.py: Skip auto-generating
src/driver.h: (virDrvConnectListAllNWFilters)
src/libvirt.c: Implement the public API
src/libvirt_public.syms: Export the symbol to public
---
include/libvirt/libvirt.h.in |4 ++-
python/generator.py |1 +
src/driver.h |5
src/libvirt.c| 50 ++
src/libvirt_public.syms |1 +
5 files changed, 60 insertions(+), 1 deletions(-)
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index cfdb162..aea4d8a 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -4041,7 +4041,9 @@ int virConnectNumOfNWFilters
(virConnectPtr conn);
int virConnectListNWFilters (virConnectPtr conn,
char **const names,
int maxnames);
-
+int virConnectListAllNWFilters(virConnectPtr conn,
+ virNWFilterPtr **filters,
+ unsigned int flags);
/*
* Lookup nwfilter by name or uuid
*/
diff --git a/python/generator.py b/python/generator.py
index 6f50fa0..00e242f 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -461,6 +461,7 @@ skip_function = (
'virConnectListAllNetworks', # overridden in virConnect.py
'virConnectListAllInterfaces', # overridden in virConnect.py
'virConnectListAllNodeDevices', # overridden in virConnect.py
+'virConnectListAllNWFilters', # overridden in virConnect.py
'virStreamRecvAll', # Pure python libvirt-override-virStream.py
'virStreamSendAll', # Pure python libvirt-override-virStream.py
diff --git a/src/driver.h b/src/driver.h
index 102684c..5ace502 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -1611,6 +1611,10 @@ typedef int
(*virDrvConnectListNWFilters) (virConnectPtr conn,
char **const names,
int maxnames);
+typedef int
+(*virDrvConnectListAllNWFilters) (virConnectPtr conn,
+ virNWFilterPtr **filters,
+ unsigned int flags);
typedef virNWFilterPtr
(*virDrvNWFilterLookupByName) (virConnectPtr conn,
const char *name);
@@ -1648,6 +1652,7 @@ struct _virNWFilterDriver {
virDrvConnectNumOfNWFilters numOfNWFilters;
virDrvConnectListNWFilters listNWFilters;
+virDrvConnectListAllNWFilters listAllNWFilters;
virDrvNWFilterLookupByName nwfilterLookupByName;
virDrvNWFilterLookupByUUID nwfilterLookupByUUID;
virDrvNWFilterDefineXML defineXML;
diff --git a/src/libvirt.c b/src/libvirt.c
index 6d4cd76..ff02c88 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -15931,6 +15931,56 @@ error:
return -1;
}
+/**
+ * virConnectListAllNWFilters:
+ * @conn: Pointer to the hypervisor connection.
+ * @filters: Pointer to a variable to store the array containing the network
+ * filter objects or NULL if the list is not required (just returns
+ * number of network filters).
+ * @flags: extra flags; not used yet, so callers should always pass 0
+ *
+ * Collect the list of network filters, and allocate an array to store those
+ * objects.
+ *
+ * Returns the number of network filters found or -1 and sets @filters to NULL
+ * in case of error. On success, the array stored into @filters is guaranteed
to
+ * have an extra allocated element set to NULL but not included in the return
count,
+ * to make iteration easier. The caller is responsible for calling
+ * virNWFilterFree() on each array element, then calling free() on @filters.
+ */
+int
+virConnectListAllNWFilters(virConnectPtr conn,
+ virNWFilterPtr **filters,
+ unsigned int flags)
+{
+VIR_DEBUG("conn=%p, filters=%p, flags=%x", conn, filters, flags);
+
+virResetLastError();
+
+if (filters)
+*filters = NULL;
+
+if (!VIR_IS_CONNECT(conn)) {
+virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__);
+virDispatchError(NULL);
+return -1;
+}
+
+if (conn->nwfilterDriver &&
+conn->nwfilterDriver->listAllNWFilters) {
+int ret;
+ret = conn->nwfilterDriver->listAllNWFilters(conn, filters, flags);
+if (ret < 0)
+goto error;
+return ret;
+}
+
+virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__);
+
+error:
+virDispatchError(conn);
+return -1;
+}
/**
* virConnectListNWFilters:
diff --git a/src/libvirt_public.syms b/src/libvirt
This is to list the interface objects, supported filtering flags
are: active|inactive.
include/libvirt/libvirt.h.in: Declare enum virConnectListAllInterfaceFlags
and virConnectListAllInterfaces.
python/generator.py: Skip auto-generating
src/driver.h: (virDrvConnectListAllInterfaces)
src/libvirt.c: Implement the public API
src/libvirt_public.syms: Export the symbol to public
---
include/libvirt/libvirt.h.in | 13 +
python/generator.py |1 +
src/driver.h |5 +++
src/libvirt.c| 59 ++
src/libvirt_public.syms |1 +
5 files changed, 79 insertions(+), 0 deletions(-)
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index 15a9a1b..15e2363 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -2303,6 +2303,19 @@ int virConnectNumOfDefinedInterfaces
(virConnectPtr conn);
int virConnectListDefinedInterfaces (virConnectPtr conn,
char **const names,
int maxnames);
+/*
+ * virConnectListAllInterfaces:
+ *
+ * Flags used to filter the returned interfaces.
+ */
+typedef enum {
+VIR_CONNECT_LIST_INTERFACES_INACTIVE = 1 << 0,
+VIR_CONNECT_LIST_INTERFACES_ACTIVE= 1 << 1,
+} virConnectListAllInterfacesFlags;
+
+int virConnectListAllInterfaces (virConnectPtr conn,
+ virInterfacePtr **ifaces,
+ unsigned int flags);
virInterfacePtr virInterfaceLookupByName (virConnectPtr conn,
const char *name);
diff --git a/python/generator.py b/python/generator.py
index 44b56c2..51c3fce 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -459,6 +459,7 @@ skip_function = (
'virConnectListAllStoragePools', # overridden in virConnect.py
'virStoragePoolListAllVolumes', # overridden in virStoragePool.py
'virConnectListAllNetworks', # overridden in virConnect.py
+'virConnectListAllInterfaces', # overridden in virConnect.py
'virStreamRecvAll', # Pure python libvirt-override-virStream.py
'virStreamSendAll', # Pure python libvirt-override-virStream.py
diff --git a/src/driver.h b/src/driver.h
index 68a1f04..335ee86 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -1146,6 +1146,10 @@ typedef int
(*virDrvListDefinedInterfaces) (virConnectPtr conn,
char **const names,
int maxnames);
+typedef int
+(*virDrvListAllInterfaces) (virConnectPtr conn,
+ virInterfacePtr **ifaces,
+ unsigned int flags);
typedef virInterfacePtr
(*virDrvInterfaceLookupByName) (virConnectPtr conn,
const char *name);
@@ -1204,6 +1208,7 @@ struct _virInterfaceDriver {
virDrvListInterfaces listInterfaces;
virDrvNumOfDefinedInterfaces numOfDefinedInterfaces;
virDrvListDefinedInterfaces listDefinedInterfaces;
+virDrvListAllInterfaces listAllInterfaces;
virDrvInterfaceLookupByName interfaceLookupByName;
virDrvInterfaceLookupByMACString interfaceLookupByMACString;
virDrvInterfaceGetXMLDescinterfaceGetXMLDesc;
diff --git a/src/libvirt.c b/src/libvirt.c
index 622a590..c50bb3d 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -10507,6 +10507,65 @@ virInterfaceGetConnect (virInterfacePtr iface)
}
/**
+ * virConnectListAllInterfaces:
+ * @conn: Pointer to the hypervisor connection.
+ * @ifaces: Pointer to a variable to store the array containing the interface
+ * objects or NULL if the list is not required (just returns number
+ * of interfaces).
+ * @flags: bitwise-OR of virConnectListAllInterfacesFlags.
+ *
+ * Collect the list of interfaces, and allocate an array to store those
+ * objects. This API solves the race inherent between virConnectListInterfaces
+ * and virConnectListDefinedInterfaces.
+ *
+ * By default, this API covers all interfaces; it is also possible to return
+ * the filtered objects with flags. Filters are provided in groups, where each
+ * group contains bits that describe mutually exclusive attributes of a
interface.
+ *
+ * The only one group of @flags is VIR_CONNECT_LIST_INTERFACES_INACTIVE and
+ * VIR_CONNECT_LIST_INTERFACES_INACTIVE to fitler the interfaces by state.
+ *
+ * Returns the number of interfaces found or -1 and sets @ifaces to NULL in
case
+ * of error. On success, the array stored into @ifaces is guaranteed to have
an
+ * extra allocated element set to NULL but not included in the return count,
+ * to make iteration easier. The
WITH_INTERFACE is not defined, it should be WITH_NETCF there to load
the interface driver.
Eric posted patch weeks ago to resolve the problems in the whole
build system, but it's not finalised yet:
https://www.redhat.com/archives/libvir-list/2012-June/msg01299.html
I'm going to simply fix the wrong macro name here so that the
interface driver could loaded, and continue the work on the listing
API for interface driver.
---
daemon/libvirtd.c |2 +-
tests/virdrivermoduletest.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 8c434a0..6dca9b0 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -378,7 +378,7 @@ static void daemonInitialize(void)
# ifdef WITH_NWFILTER
virDriverLoadModule("nwfilter");
# endif
-# ifdef WITH_INTERFACE
+# ifdef WITH_NETCF
virDriverLoadModule("interface");
# endif
# ifdef WITH_QEMU
diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c
index 405574e..d1fd649 100644
--- a/tests/virdrivermoduletest.c
+++ b/tests/virdrivermoduletest.c
@@ -79,7 +79,7 @@ mymain(void)
#ifdef WITH_NWFILTER
TEST("nwfilter", NULL);
#endif
-#ifdef WITH_INTERFACE
+#ifdef WITH_NETCF
TEST("interface", NULL);
#endif
#ifdef WITH_QEMU
--
1.7.7.3
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
This is to list the network objects, supported filtering flags
are: active|inactive, persistent|transient, autostart|no-autostart.
include/libvirt/libvirt.h.in: Declare enum virConnectListAllNetworkFlags
and virConnectListAllNetworks.
python/generator.py: Skip auto-generating
src/driver.h: (virDrvConnectListAllNetworks)
src/libvirt.c: Implement the public API
src/libvirt_public.syms: Export the symbol to public
---
include/libvirt/libvirt.h.in | 20
python/generator.py |1 +
src/driver.h |5 +++
src/libvirt.c| 68 ++
src/libvirt_public.syms |1 +
5 files changed, 95 insertions(+), 0 deletions(-)
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index c5b16bf..15a9a1b 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -2196,6 +2196,26 @@ int virConnectNumOfDefinedNetworks
(virConnectPtr conn);
int virConnectListDefinedNetworks (virConnectPtr conn,
char **const names,
int maxnames);
+/*
+ * virConnectListAllNetworks:
+ *
+ * Flags used to filter the returned networks. Flags in each group
+ * are exclusive attributes of a network.
+ */
+typedef enum {
+VIR_CONNECT_LIST_NETWORKS_INACTIVE = 1 << 0,
+VIR_CONNECT_LIST_NETWORKS_ACTIVE= 1 << 1,
+
+VIR_CONNECT_LIST_NETWORKS_PERSISTENT= 1 << 2,
+VIR_CONNECT_LIST_NETWORKS_TRANSIENT = 1 << 3,
+
+VIR_CONNECT_LIST_NETWORKS_AUTOSTART = 1 << 4,
+VIR_CONNECT_LIST_NETWORKS_NO_AUTOSTART = 1 << 5,
+} virConnectListAllNetworksFlags;
+
+int virConnectListAllNetworks (virConnectPtr conn,
+ virNetworkPtr **nets,
+ unsigned int flags);
/*
* Lookup network by name or uuid
diff --git a/python/generator.py b/python/generator.py
index 4b3f7e6..44b56c2 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -458,6 +458,7 @@ skip_function = (
'virDomainSnapshotListAllChildren', # overridden in virDomainSnapshot.py
'virConnectListAllStoragePools', # overridden in virConnect.py
'virStoragePoolListAllVolumes', # overridden in virStoragePool.py
+'virConnectListAllNetworks', # overridden in virConnect.py
'virStreamRecvAll', # Pure python libvirt-override-virStream.py
'virStreamSendAll', # Pure python libvirt-override-virStream.py
diff --git a/src/driver.h b/src/driver.h
index ee1341f..68a1f04 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -1055,6 +1055,10 @@ typedef int
(*virDrvListDefinedNetworks)(virConnectPtr conn,
char **const names,
int maxnames);
+typedef int
+(*virDrvListAllNetworks)(virConnectPtr conn,
+ virNetworkPtr **nets,
+ unsigned int flags);
typedef virNetworkPtr
(*virDrvNetworkLookupByUUID)(virConnectPtr conn,
const unsigned char *uuid);
@@ -1113,6 +1117,7 @@ struct _virNetworkDriver {
virDrvListNetworks listNetworks;
virDrvNumOfDefinedNetworks numOfDefinedNetworks;
virDrvListDefinedNetworks listDefinedNetworks;
+virDrvListAllNetworks listAllNetworks;
virDrvNetworkLookupByUUID networkLookupByUUID;
virDrvNetworkLookupByName networkLookupByName;
virDrvNetworkCreateXML networkCreateXML;
diff --git a/src/libvirt.c b/src/libvirt.c
index 7780534..622a590 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -9588,6 +9588,74 @@ virNetworkGetConnect (virNetworkPtr net)
}
/**
+ * virConnectListAllNetworks:
+ * @conn: Pointer to the hypervisor connection.
+ * @nets: Pointer to a variable to store the array containing the network
+ *objects or NULL if the list is not required (just returns number
+ *of networks).
+ * @flags: bitwise-OR of virConnectListAllNetworksFlags.
+ *
+ * Collect the list of networks, and allocate an array to store those
+ * objects. This API solves the race inherent between virConnectListNetworks
+ * and virConnectListDefinedNetworks.
+ *
+ * By default, this API covers all networks; it is also possible to return
+ * the filtered objects with flags. Filters are provided in groups, where each
+ * group contains bits that describe mutually exclusive attributes of a
network.
+ *
+ * The first group of @flags is VIR_CONNECT_LIST_NETWORKS_INACTIVE and
+ * VIR_CONNECT_LIST_NETWORKS_INACTIVE to fitler the networks by state.
+ *
+ * The second group of @flags is VIR_CONNECT_LIST_NETWORKS_PERSITENT
+ * and VIR_CONNECT_LIST_NETWORKS_TRANSICIENT,
Simply returns the storage volume objects. No supported filter
flags.
include/libvirt/libvirt.h.in: Declare the API
python/generator.py: Skip the function for generating. virStoragePool.py
will be added in later patch.
src/driver.h: virDrvStoragePoolListVolumesFlags
src/libvirt.c: Implementation for the API.
src/libvirt_public.syms: Export the symbol to public
---
include/libvirt/libvirt.h.in |3 ++
python/generator.py |1 +
src/driver.h |6 -
src/libvirt.c| 50 ++
src/libvirt_public.syms |1 +
5 files changed, 60 insertions(+), 1 deletions(-)
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index c7e810e..c5b16bf 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -2570,6 +2570,9 @@ int virStoragePoolNumOfVolumes
(virStoragePoolPtr pool)
int virStoragePoolListVolumes (virStoragePoolPtr
pool,
char **const names,
int maxnames);
+int virStoragePoolListAllVolumes(virStoragePoolPtr
pool,
+ virStorageVolPtr
**vols,
+ unsigned int flags);
virConnectPtr virStorageVolGetConnect (virStorageVolPtr vol);
diff --git a/python/generator.py b/python/generator.py
index 5934040..4b3f7e6 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -457,6 +457,7 @@ skip_function = (
'virDomainListAllSnapshots', # overridden in virDomain.py
'virDomainSnapshotListAllChildren', # overridden in virDomainSnapshot.py
'virConnectListAllStoragePools', # overridden in virConnect.py
+'virStoragePoolListAllVolumes', # overridden in virStoragePool.py
'virStreamRecvAll', # Pure python libvirt-override-virStream.py
'virStreamSendAll', # Pure python libvirt-override-virStream.py
diff --git a/src/driver.h b/src/driver.h
index 7e3e8a1..ee1341f 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -1284,7 +1284,10 @@ typedef int
(*virDrvStoragePoolListVolumes) (virStoragePoolPtr pool,
char **const names,
int maxnames);
-
+typedef int
+(*virDrvStoragePoolListAllVolumes) (virStoragePoolPtr pool,
+ virStorageVolPtr **vols,
+ unsigned int flags);
typedef virStorageVolPtr
(*virDrvStorageVolLookupByName) (virStoragePoolPtr pool,
@@ -1392,6 +1395,7 @@ struct _virStorageDriver {
virDrvStoragePoolSetAutostart poolSetAutostart;
virDrvStoragePoolNumOfVolumes poolNumOfVolumes;
virDrvStoragePoolListVolumespoolListVolumes;
+virDrvStoragePoolListAllVolumes poolListAllVolumes;
virDrvStorageVolLookupByNamevolLookupByName;
virDrvStorageVolLookupByKey volLookupByKey;
diff --git a/src/libvirt.c b/src/libvirt.c
index 541b1c3..7780534 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -12385,6 +12385,54 @@ error:
return -1;
}
+/**
+ * virStoragePoolListAllVolumes:
+ * @pool: Pointer to storage pool
+ * @vols: Pointer to a variable to store the array containing storage volume
+ *objects or NULL if the list is not required (just returns number
+ *of volumes).
+ * @flags: extra flags; not used yet, so callers should always pass 0
+ *
+ * Collect the list of storage volumes, and allocate an array to store those
+ * objects.
+ *
+ * Returns the number of storage volumes found or -1 and sets @vols to
+ * NULL in case of error. On success, the array stored into @vols is
+ * guaranteed to have an extra allocated element set to NULL but not included
+ * in the return count, to make iteration easier. The caller is responsible
+ * for calling virStorageVolFree() on each array element, then calling
+ * free() on @vols.
+ */
+int
+virStoragePoolListAllVolumes(virStoragePoolPtr pool,
+ virStorageVolPtr **vols,
+ unsigned int flags)
+{
+VIR_DEBUG("pool=%p, vols=%p, flags=%x", pool, vols, flags);
+
+virResetLastError();
+
+if (!VIR_IS_STORAGE_POOL(pool)) {
+virLibConnError(VIR_ERR_INVALID_STORAGE_POOL, __FUNCTION__);
+virDispatchError(NULL);
+return -1;
+}
+
+if (pool->conn->storageDriver &&
+pool->conn->storageDriver->poolListAllVolumes) {
+int ret;
+ret = pool->conn->storageDriver->poolListAllVolumes(pool, vols, flags);
+if (ret < 0)
+goto error;
+return ret;
+}
+
+virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__);
+
+error:
+virDispatchError(pool-
v1 - v2:
* Fix the stupid mistake - changing the public struct, error out
if the new option '--type' for pool-list is specified, and
the libvirt is old enough without listAllStoragePools supported.
Except the already supported APIs for domain and domain snapshot,
this series add the APIs for the left objects, including storage
pool, storage vol, network, interface, node device, nwfilter, and
secret.
* Storage pool:
- Support filtering the returned pool objects by active|inactive,
persistent|transient, autostart|no-autostart, and pool types.
- New options for virsh, --type to accept multiple pool types.
* Storage vol:
- Simply returns all the vol objects of a pool.
* Network:
- Support filtering the results using flags active|inactive,
persistent|transient, autostart|no-autostart
- New options for virsh.
* Interface:
- Support filtering the results using flags active|inactive.
It's still O(n) underlying, as interface driver doesn't manage
the objects itself, but using netcf lib instead. And netcf
APIs don't support returning the struct yet.
* Node Device:
- Support filtering the results using capabilities type of
the devices.
- Extend --cap to accept multiple capability type.
* Network Filter:
- Simply returns all the objects.
* Secret:
- Simply returns all the objects.
All the affected commands are tested with both new libvirt with the
APIs support, or old libvirt without the support. But I still may
lose some scenarios. Please review carefully.
Osier Yang (49):
Fix indentions
list: Rename virdomainlist.[ch] for common use
list: Define new API virStorageListALlStoragePools
list: Add helpers for listing storage pool objects
list: Implement the RPC calls for virConnectListAllStoragePools
list: Implement listAllStoragePools for storage driver
list: Implement listAllStoragePools for test driver
list: Add helper to convert strings separated by ',' to array
virsh: Fix the wrong doc for pool-list
list: Change MATCH for common use in virsh
list: Use virConnectListAllStoragePools in virsh
virsh: Use vshPrint instead of printf
python: Expose virStorageListAllStoragePools to python binding
list: Define new API virStoragePoolListAllVolumes
list: Implemente RPC calls for virStoragePoolListAllVolumes
list: Implement virStoragePoolListAllVolumes for storage driver
list: Implement virStoragePoolListAllVolumes for test driver
list: Use virStoragePoolListAllVolumes in virsh
list: Expose virStoragePoolListAllVolumes to Python binding
list: Define new API virConnectListAllNetworks
list: Implement RPC calls for virConnectListAllNetworks
list: Add helpers to list network objects
list: Implement listAllNetworks for network driver
list: Implement listAllNetworks for test driver
list: Use virConnectListAllNetworks in virsh
list: Expose virConnectListAllNetworks to Python binding
daemon: Fix the wrong macro name
list: Define new API virConnectListAllInterfaces
list: Implemente RPC calls for virConnectListAllInterfaces
list: Implement listAllInterfaces
list: Use virConnectListAllInterfaces in virsh
list: Expose virConnectListAllInterfaces to Python binding
list: Define new API virConnectListAllNodeDevices
list: Implemente RPC calls for virConnectListAllNodeDevices
list: Add helpers for listing node devices
list: Implement listAllNodeDevices
list: Expose virConnectListAllNodeDevices to Python binding
virsh: Fix a bug of nodedev-list
list: Use virConnectListAllNodeDevices in virsh
list: Define new API virConnectListAllNWFilters
list: Implement RPC calls for virConnectListAllNWFilters
list: Implement listAllNWFilters
list: Use virConnectListAllNWFilters in virsh
list: Expose virConnectListAllNWFilters to Python binding
list: Define new API virConnectListAllSecrets
list: Implement RPC calls for virConnectListAllSecrets
list: Implement listAllSecrets
list: Use virConnectListAllSecrets in virsh
list: Expose virConnectListAllSecrets to Python binding
daemon/libvirtd.c |2 +-
daemon/remote.c | 382 +
include/libvirt/libvirt.h.in | 100 ++-
python/generator.py | 11 +-
python/libvirt-override-api.xml | 44 +-
python/libvirt-override-virConnect.py | 72 +
python/libvirt-override-virStoragePool.py | 11 +
python/libvirt-override.c | 337 +
src/Makefile.am |8 +-
src/conf/domain_conf.c|2 +-
src/conf/virdomainlist.c | 222 ---
src/conf/virdomainlist.h | 84 --
src/conf/virobjectlist.c | 535 +++
src/conf/virobjectlist.h | 162 +++
src/datatypes.h | 86 +-
src/driver.h | 35 +-
src/interface/netcf_driver.c
tools/virsh.c:
* vshStoragePoolSorter to sort the pool list by pool name.
* struct vshStoragePoolList to present the pool list, pool info
is collected by list->poolinfo if 'details' is specified by
user.
* vshStoragePoolListFree to free the pool list
* vshStoragePoolListCollect to collect the pool list, new API
virStorageListAllPools is tried first, if it's not supported,
fall back to older APIs.
* New options --persistent, --transient, --autostart, --no-autostart
and --type for pool-list. --persistent or --transient is to filter
the returned pool list by whether the pool is persistent or not.
--autostart or --no-autostart is to filter the returned pool list
by whether the pool is autostarting or not. --type is to filter
the pools by pool types. E.g.
% virsh pool-list --all --persistent --type dir,disk
tools/virsh.pod:
* Add documentations for the new options.
---
tools/virsh.c | 442 ++-
tools/virsh.pod | 24 +++-
2 files changed, 362 insertions(+), 104 deletions(-)
diff --git a/tools/virsh.c b/tools/virsh.c
index 2d4567d..ab64918 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -10868,6 +10868,233 @@ cmdPoolDumpXML(vshControl *ctl, const vshCmd *cmd)
return ret;
}
+static int
+vshStoragePoolSorter(const void *a, const void *b)
+{
+virStoragePoolPtr *pa = (virStoragePoolPtr *) a;
+virStoragePoolPtr *pb = (virStoragePoolPtr *) b;
+
+if (*pa && !*pb)
+return -1;
+
+if (!*pa)
+return *pb != NULL;
+
+return strcasecmp(virStoragePoolGetName(*pa),
+ virStoragePoolGetName(*pb));
+}
+
+struct vshStoragePoolList {
+virStoragePoolPtr *pools;
+size_t npools;
+};
+typedef struct vshStoragePoolList *vshStoragePoolListPtr;
+
+static void
+vshStoragePoolListFree(vshStoragePoolListPtr list)
+{
+int i;
+
+if (list && list->pools) {
+for (i = 0; i < list->npools; i++) {
+if (list->pools[i])
+virStoragePoolFree(list->pools[i]);
+}
+VIR_FREE(list->pools);
+}
+VIR_FREE(list);
+}
+
+static vshStoragePoolListPtr
+vshStoragePoolListCollect(vshControl *ctl,
+ unsigned int flags)
+{
+vshStoragePoolListPtr list = vshMalloc(ctl, sizeof(*list));
+int i;
+int ret;
+char **names = NULL;
+virStoragePoolPtr pool;
+bool success = false;
+size_t deleted = 0;
+int persistent;
+int autostart;
+int nActivePools = 0;
+int nInactivePools = 0;
+int nAllPools = 0;
+
+/* try the list with flags support (0.9.14 and later) */
+if ((ret = virConnectListAllStoragePools(ctl->conn,
+ &list->pools,
+ flags)) >= 0) {
+list->npools = ret;
+goto finished;
+}
+
+/* check if the command is actually supported */
+if (last_error && last_error->code == VIR_ERR_NO_SUPPORT) {
+virFreeError(last_error);
+last_error = NULL;
+goto fallback;
+}
+
+if (last_error && last_error->code == VIR_ERR_INVALID_ARG) {
+/* try the new API again but mask non-guaranteed flags */
+unsigned int newflags = flags & (VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE
|
+
VIR_CONNECT_LIST_STORAGE_POOLS_INACTIVE);
+virFreeError(last_error);
+last_error = NULL;
+if ((ret = virConnectListAllStoragePools(ctl->conn, &list->pools,
+ newflags)) >= 0) {
+list->npools = ret;
+goto filter;
+}
+}
+
+/* there was an error during the first or second call */
+vshError(ctl, "%s", _("Failed to list pools"));
+goto cleanup;
+
+
+fallback:
+/* fall back to old method (0.9.13 and older) */
+virResetLastError();
+
+/* There is no way to get the pool type */
+if (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_POOL_TYPE)) {
+vshError(ctl, "%s", _("Filtering using --type is not supported "
+ "by this libvirt"));
+goto cleanup;
+}
+
+/* Get the number of active pools */
+if (!MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE) ||
+MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE)) {
+if ((nActivePools = virConnectNumOfStoragePools(ctl->conn)) < 0) {
+vshError(ctl, "%s", _("Failed to get the number of active pools
"));
+goto cleanup;
+}
+}
+
+/* Get the number of inactive pools */
+if (!MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE) ||
+MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_INACTIVE)) {
+if ((nInactivePools = virConnectNumOfDefinedStoragePools(ctl->conn)) <
0) {
+vshError(ctl, "%s", _("Failed to get the number of inactive
pools"));
+goto cleanup;
+}
+}
+
+nAllPools = nActivePools +
The storage pool's management doesn't relate with a domain, it
probably was a intention, but not achieved yet. And the fact
is only active pools are listed by default.
---
tools/virsh.pod |9 -
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/tools/virsh.pod b/tools/virsh.pod
index 4bddf15..f79c945 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -2156,11 +2156,10 @@ Returns basic information about the I object.
=item B [I<--inactive> | I<--all>] [I<--details>]
-List pool objects known to libvirt. By default, only pools in use by
-active domains are listed; I<--inactive> lists just the inactive
-pools, and I<--all> lists all pools. The I<--details> option instructs
-virsh to additionally display pool persistence and capacity related
-information where available.
+List pool objects known to libvirt. By default, only active pools
+are listed; I<--inactive> lists just the inactive pools, and I<--all>
+lists all pools. The I<--details> option instructs virsh to additionally
+display pool persistence and capacity related information where available.
=item B I
--
1.7.7.3
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
This introduces a new API to list the storage pool objects,
4 groups of flags are provided to filter the returned pools:
* Active or not
* Autostarting or not
* Persistent or not
* And the pool type.
include/libvirt/libvirt.h.in: New enum virConnectListAllStoragePoolFlags;
Declare the API.
python/generator.py: Skip the generating
src/driver.h: (virDrvConnectListAllStoragePools)
src/libvirt.c: Implementation for the API.
src/libvirt_public.syms: Export the symbol.
---
include/libvirt/libvirt.h.in | 32 ++
python/generator.py |5 +-
src/driver.h |5 ++
src/libvirt.c| 93 +++---
src/libvirt_public.syms |5 ++
5 files changed, 132 insertions(+), 8 deletions(-)
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index e34438c..c7e810e 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -2471,6 +2471,38 @@ int
virConnectListDefinedStoragePools(virConnectPtr conn,
int maxnames);
/*
+ * virConnectListAllStoragePoolsFlags:
+ *
+ * Flags used to filter the returned pools. Flags in each group
+ * are exclusive attribute for a pool.
+ */
+typedef enum {
+VIR_CONNECT_LIST_STORAGE_POOLS_INACTIVE = 1 << 0,
+VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE= 1 << 1,
+
+VIR_CONNECT_LIST_STORAGE_POOLS_PERSISTENT= 1 << 2,
+VIR_CONNECT_LIST_STORAGE_POOLS_TRANSIENT = 1 << 3,
+
+VIR_CONNECT_LIST_STORAGE_POOLS_AUTOSTART = 1 << 4,
+VIR_CONNECT_LIST_STORAGE_POOLS_NO_AUTOSTART = 1 << 5,
+
+/* List pools by type */
+VIR_CONNECT_LIST_STORAGE_POOLS_DIR = 1 << 6,
+VIR_CONNECT_LIST_STORAGE_POOLS_FS= 1 << 7,
+VIR_CONNECT_LIST_STORAGE_POOLS_NETFS = 1 << 8,
+VIR_CONNECT_LIST_STORAGE_POOLS_LOGICAL = 1 << 9,
+VIR_CONNECT_LIST_STORAGE_POOLS_DISK = 1 << 10,
+VIR_CONNECT_LIST_STORAGE_POOLS_ISCSI = 1 << 11,
+VIR_CONNECT_LIST_STORAGE_POOLS_SCSI = 1 << 12,
+VIR_CONNECT_LIST_STORAGE_POOLS_MPATH = 1 << 13,
+VIR_CONNECT_LIST_STORAGE_POOLS_RBD = 1 << 14,
+VIR_CONNECT_LIST_STORAGE_POOLS_SHEEPDOG = 1 << 15,
+} virConnectListAllStoragePoolsFlags;
+
+int virConnectListAllStoragePools(virConnectPtr conn,
+ virStoragePoolPtr
**pools,
+ unsigned int flags);
+/*
* Query a host for storage pools of a particular type
*/
char * virConnectFindStoragePoolSources(virConnectPtr conn,
diff --git a/python/generator.py b/python/generator.py
index 2dada6e..5934040 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -337,7 +337,7 @@ foreign_encoding_args = (
#
###
-# Class methods which are written by hand in libvir.c but the Python-level
+# Class methods which are written by hand in libvirt.c but the Python-level
# code is still automatically generated (so they are not in skip_function()).
skip_impl = (
'virConnectGetVersion',
@@ -453,9 +453,10 @@ skip_function = (
'virConnectDomainEventDeregisterAny', # overridden in virConnect.py
'virSaveLastError', # We have our own python error wrapper
'virFreeError', # Only needed if we use virSaveLastError
-'virConnectListAllDomains', #overridden in virConnect.py
+'virConnectListAllDomains', # overridden in virConnect.py
'virDomainListAllSnapshots', # overridden in virDomain.py
'virDomainSnapshotListAllChildren', # overridden in virDomainSnapshot.py
+'virConnectListAllStoragePools', # overridden in virConnect.py
'virStreamRecvAll', # Pure python libvirt-override-virStream.py
'virStreamSendAll', # Pure python libvirt-override-virStream.py
diff --git a/src/driver.h b/src/driver.h
index b3c1740..7e3e8a1 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -1225,6 +1225,10 @@ typedef int
(*virDrvConnectListDefinedStoragePools) (virConnectPtr conn,
char **const names,
int maxnames);
+typedef int
+(*virDrvConnectListAllStoragePools) (virConnectPtr conn,
+ virStoragePoolPtr **pools,
+ unsigned int flags);
typedef char *
(*virDrvConnectFindStoragePoolSources) (virConnectPtr conn,
const char *type,
@@ -1369,6 +1373,7 @@ struct _virStorageDriver {
virDrvConnectListStoragePools listPools;
virDrvConnectNumOfDefinedStoragePools numOfDefinedPools;
virDrvConnectListDefinedStoragePoolslistDefinedPools;
+virDrvConnectListAllStoragePools
Some of the macros use tab, while the left use spaces, this patch
change it to always use the spaces. And a few aligning fixes.
---
src/datatypes.h | 86 +++---
1 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/src/datatypes.h b/src/datatypes.h
index fc284d2..01a8544 100644
--- a/src/datatypes.h
+++ b/src/datatypes.h
@@ -33,8 +33,8 @@
* magic value used to protect the API when pointers to connection structures
* are passed down by the users.
*/
-# define VIR_CONNECT_MAGIC 0x4F23DEAD
-# define VIR_IS_CONNECT(obj) ((obj) && (obj)->magic==VIR_CONNECT_MAGIC)
+# define VIR_CONNECT_MAGIC 0x4F23DEAD
+# define VIR_IS_CONNECT(obj) ((obj) && (obj)->magic==VIR_CONNECT_MAGIC)
/**
@@ -43,9 +43,9 @@
* magic value used to protect the API when pointers to domain structures
* are passed down by the users.
*/
-# define VIR_DOMAIN_MAGIC 0xDEAD4321
-# define VIR_IS_DOMAIN(obj)((obj) &&
(obj)->magic==VIR_DOMAIN_MAGIC)
-# define VIR_IS_CONNECTED_DOMAIN(obj) (VIR_IS_DOMAIN(obj) &&
VIR_IS_CONNECT((obj)->conn))
+# define VIR_DOMAIN_MAGIC 0xDEAD4321
+# define VIR_IS_DOMAIN(obj) ((obj) && (obj)->magic==VIR_DOMAIN_MAGIC)
+# define VIR_IS_CONNECTED_DOMAIN(obj) (VIR_IS_DOMAIN(obj) &&
VIR_IS_CONNECT((obj)->conn))
/**
* VIR_NETWORK_MAGIC:
@@ -53,9 +53,9 @@
* magic value used to protect the API when pointers to network structures
* are passed down by the users.
*/
-# define VIR_NETWORK_MAGIC 0xDEAD1234
-# define VIR_IS_NETWORK(obj) ((obj) &&
(obj)->magic==VIR_NETWORK_MAGIC)
-# define VIR_IS_CONNECTED_NETWORK(obj) (VIR_IS_NETWORK(obj) &&
VIR_IS_CONNECT((obj)->conn))
+# define VIR_NETWORK_MAGIC 0xDEAD1234
+# define VIR_IS_NETWORK(obj) ((obj) &&
(obj)->magic==VIR_NETWORK_MAGIC)
+# define VIR_IS_CONNECTED_NETWORK(obj) (VIR_IS_NETWORK(obj) &&
VIR_IS_CONNECT((obj)->conn))
/**
* VIR_INTERFACE_MAGIC:
@@ -63,9 +63,9 @@
* magic value used to protect the API when pointers to interface structures
* are passed down by the users.
*/
-# define VIR_INTERFACE_MAGIC 0xDEAD5309
-# define VIR_IS_INTERFACE(obj) ((obj) &&
(obj)->magic==VIR_INTERFACE_MAGIC)
-# define VIR_IS_CONNECTED_INTERFACE(obj) (VIR_IS_INTERFACE(obj) &&
VIR_IS_CONNECT((obj)->conn))
+# define VIR_INTERFACE_MAGIC 0xDEAD5309
+# define VIR_IS_INTERFACE(obj) ((obj) &&
(obj)->magic==VIR_INTERFACE_MAGIC)
+# define VIR_IS_CONNECTED_INTERFACE(obj) (VIR_IS_INTERFACE(obj) &&
VIR_IS_CONNECT((obj)->conn))
/**
* VIR_STORAGE_POOL_MAGIC:
@@ -73,9 +73,9 @@
* magic value used to protect the API when pointers to storage pool structures
* are passed down by the users.
*/
-# define VIR_STORAGE_POOL_MAGIC0xDEAD5678
-# define VIR_IS_STORAGE_POOL(obj) ((obj) &&
(obj)->magic==VIR_STORAGE_POOL_MAGIC)
-# define VIR_IS_CONNECTED_STORAGE_POOL(obj)(VIR_IS_STORAGE_POOL(obj) &&
VIR_IS_CONNECT((obj)->conn))
+# define VIR_STORAGE_POOL_MAGIC 0xDEAD5678
+# define VIR_IS_STORAGE_POOL(obj) ((obj) &&
(obj)->magic==VIR_STORAGE_POOL_MAGIC)
+# define VIR_IS_CONNECTED_STORAGE_POOL(obj) (VIR_IS_STORAGE_POOL(obj) &&
VIR_IS_CONNECT((obj)->conn))
/**
* VIR_STORAGE_VOL_MAGIC:
@@ -83,9 +83,9 @@
* magic value used to protect the API when pointers to storage vol structures
* are passed down by the users.
*/
-# define VIR_STORAGE_VOL_MAGIC 0xDEAD8765
-# define VIR_IS_STORAGE_VOL(obj) ((obj) &&
(obj)->magic==VIR_STORAGE_VOL_MAGIC)
-# define VIR_IS_CONNECTED_STORAGE_VOL(obj) (VIR_IS_STORAGE_VOL(obj) &&
VIR_IS_CONNECT((obj)->conn))
+# define VIR_STORAGE_VOL_MAGIC 0xDEAD8765
+# define VIR_IS_STORAGE_VOL(obj) ((obj) &&
(obj)->magic==VIR_STORAGE_VOL_MAGIC)
+# define VIR_IS_CONNECTED_STORAGE_VOL(obj) (VIR_IS_STORAGE_VOL(obj) &&
VIR_IS_CONNECT((obj)->conn))
/**
* VIR_NODE_DEVICE_MAGIC:
@@ -93,9 +93,9 @@
* magic value used to protect the API when pointers to storage vol structures
* are passed down by the users.
*/
-# define VIR_NODE_DEVICE_MAGIC 0xDEAD5679
-# define VIR_IS_NODE_DEVICE(obj) ((obj) &&
(obj)->magic==VIR_NODE_DEVICE_MAGIC)
-# define VIR_IS_CONNECTED_NODE_DEVICE(obj) (VIR_IS_NODE_DEVICE(obj) &&
VIR_IS_CONNECT((obj)->conn))
+# define VIR_NODE_DEVICE_MAGIC 0xDEAD5679
+# define VIR_IS_NODE_DEVICE(obj) ((obj) &&
(obj)->magic==VIR_NODE_DEVICE_MAGIC)
+# define VIR_IS_CONNECTED_NODE_DEVICE(obj) (VIR_IS_NODE_DEVICE(obj) &&
VIR_IS_CONNECT((obj)->conn))
/**
* VIR_SECRET_MAGIC:
@@ -103,9 +103,9 @@
* magic value used to protect the API when pointers to secret structures are
* passed down by the users.
*/
-# define VIR_SECRET_MAGIC 0x5678DEAD
-# define VIR_IS_SECRET(obj)((obj) &&
(obj)->magic==VIR_SECRET_MAGIC)
-# define VIR_IS_CONNECTED_SECRET(obj)
From: "Daniel P. Berrange"
Running libvirtd unprivileged results in a warning message from
the NWFilter driver
virNWFilterSnoopLeaseFileRefresh:1882 :
open("/var/run/libvirt/network/nwfilter.ltmp"): No such file or directory
Since it requires privileged network access, this driver should
not even run when unprivileged.
Signed-off-by: Daniel P. Berrange
---
src/nwfilter/nwfilter_driver.c |3 +++
1 file changed, 3 insertions(+)
diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 58d91f9..9034549 100644
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -68,6 +68,9 @@ static int
nwfilterDriverStartup(int privileged) {
char *base = NULL;
+if (!privileged)
+return 0;
+
if (virNWFilterIPAddrMapInit() < 0)
return -1;
if (virNWFilterLearnInit() < 0)
--
1.7.10.4
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From: "Daniel P. Berrange"
Define a new virConnectSetCloseCallback() public API which allows
registering a callback to be invoked when the connection to a
hypervisor is closed. The callback is provided with the reason for
the close, which may be 'error', 'eof' or 'keepalive'.
Signed-off-by: Daniel P. Berrange
---
include/libvirt/libvirt.h.in | 40 +---
src/datatypes.c |4 +++
src/datatypes.h |5
src/libvirt.c| 60 ++
src/libvirt_public.syms |6 +
5 files changed, 105 insertions(+), 10 deletions(-)
diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index e34438c..85d8c8a 100644
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -49,6 +49,17 @@ extern "C" {
* defines VIR_ENUM_SENTINELS. Enumerations for bit values do not
* have a *_LAST value, but additional bits may be defined. */
+/*
+ * virFreeCallback:
+ * @opaque: opaque user data provided at registration
+ *
+ * Type for a domain event callback when the event is deregistered and
+ * need to be freed, @opaque is provided along with the callback at
+ * registration time
+ */
+typedef void (*virFreeCallback)(void *opaque);
+
+
/**
* virConnect:
*
@@ -1148,6 +1159,25 @@ int virConnectSetKeepAlive(virConnectPtr conn,
int interval,
unsigned int count);
+typedef enum {
+VIR_CONNECT_CLOSE_REASON_ERROR = 0, /* Misc I/O error */
+VIR_CONNECT_CLOSE_REASON_EOF = 1, /* End-of-file from server */
+VIR_CONNECT_CLOSE_REASON_KEEPALIVE = 2, /* Keepalive timer triggered */
+VIR_CONNECT_CLOSE_REASON_CLIENT= 3, /* Client requested it */
+
+# ifdef VIR_ENUM_SENTINELS
+VIR_CONNECT_CLOSE_REASON_LAST
+# endif
+} virConnectCloseReason;
+
+typedef void (*virConnectCloseFunc)(virConnectPtr conn,
+int reason,
+void *opaque);
+
+int virConnectSetCloseCallback(virConnectPtr conn,
+ virConnectCloseFunc cb,
+ void *opaque,
+ virFreeCallback freecb);
/*
* Capabilities of the connection / driver.
@@ -2861,16 +2891,6 @@ typedef int
(*virConnectDomainEventCallback)(virConnectPtr conn,
int detail,
void *opaque);
-/*
- * virFreeCallback:
- * @opaque: opaque user data provided at registration
- *
- * Type for a domain event callback when the event is deregistered and
- * need to be freed, @opaque is provided along with the callback at
- * registration time
- */
-typedef void (*virFreeCallback)(void *opaque);
-
int virConnectDomainEventRegister(virConnectPtr conn,
virConnectDomainEventCallback cb,
void *opaque,
diff --git a/src/datatypes.c b/src/datatypes.c
index d718170..5d415b8 100644
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -115,6 +115,10 @@ virReleaseConnect(virConnectPtr conn) {
virMutexLock(&conn->lock);
+if (conn->closeOpaque &&
+conn->closeFreeCallback)
+conn->closeFreeCallback(conn->closeOpaque);
+
virResetError(&conn->err);
virURIFree(conn->uri);
diff --git a/src/datatypes.h b/src/datatypes.h
index fc284d2..af054ac 100644
--- a/src/datatypes.h
+++ b/src/datatypes.h
@@ -187,6 +187,11 @@ struct _virConnect {
virErrorFunc handler; /* associated handlet */
void *userData; /* the user data */
+/* Per-connection close callback */
+virConnectCloseFunc closeCallback;
+void *closeOpaque;
+virFreeCallback closeFreeCallback;
+
int refs; /* reference count */
};
diff --git a/src/libvirt.c b/src/libvirt.c
index df78e8a..7a4a17c 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -18613,6 +18613,66 @@ error:
/**
+ * virConnectSetCloseCallback:
+ * @conn: pointer to connection object
+ * @cb: callback to invoke upon close
+ * @opaque: user data to pass to @cb
+ * @freecb: callback to free @opaque
+ *
+ * Registers a callback to be invoked when the connection
+ * is closed. This callback is invoked when there is any
+ * condition that causes the socket connection to the
+ * hypervisor to be closed.
+ *
+ * This function is only applicable to hypervisor drivers
+ * which maintain a persistent open connection. Drivers
+ * which open a new connection for every operation will
+ * not invoke this.
+ *
+ * The @freecb must not invoke any other libvirt public
+ * APIs, since it is not called from a re-entrant safe
+ * context.
+ *
+ * Returns 0 on success, -1 on error
+ */
+int virConnectSetCloseCallback(virConnectPtr conn,
+ virConnectCloseFunc cb,
+ void *opaque,
+ virFreeCallback freecb)
+{
+
On Thu, Jul 19, 2012 at 11:57:17AM -0600, Eric Blake wrote:
> On 07/19/2012 09:04 AM, Daniel P. Berrange wrote:
> > From: "Daniel P. Berrange"
> >
> > Allow detection of socket close in virNetClient via an callback
> > function, triggered on any condition that causes the socket to
> > be close.
> >
> > Signed-off-by: Daniel P. Berrange
> > ---
>
> > @@ -463,6 +480,9 @@ void virNetClientFree(virNetClientPtr client)
> > return;
> > }
> >
> > +if (client->closeFf && client->closeOpaque)
> > +client->closeFf(client->closeOpaque);
>
> Again, you should not be forcing closeOpaque to be non-NULL. It's
> opaque, after all.
If opaque is NULL, then there's nothing that needs free'ing.
> > @@ -534,7 +561,7 @@ virNetClientCloseLocked(virNetClientPtr client)
> > static void virNetClientCloseInternal(virNetClientPtr client,
> >int reason)
> > {
> > -VIR_DEBUG("client=%p", client);
> > +VIR_DEBUG("client=%p wantclose=%d", client, client ? client->wantClose
> > : false);
>
> Passing 'false' to %d looks odd, but works. If, per my 2/5 comments,
> you merge wantClose into closeReason, then you'd have an int instead of
> a bool to print here.
>
> ACK, once you fix the non-NULL opaque limitation.
Daniel
--
|: http://berrange.com -o-http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On Thu, Jul 19, 2012 at 11:46:28AM -0600, Eric Blake wrote:
> On 07/19/2012 09:04 AM, Daniel P. Berrange wrote:
> > From: "Daniel P. Berrange"
> >
> > Define a new virConnectSetCloseCallback() public API which allows
> > registering a callback to be invoked when the connection to a
> > hypervisor is closed. The callback is provided with the reason for
> > the close, which may be 'error', 'eof' or 'keepalive'.
> >
> > Signed-off-by: Daniel P. Berrange
> > ---
> > include/libvirt/libvirt.h.in | 40 +++
> > src/datatypes.c |4
> > src/datatypes.h |5
> > src/libvirt.c| 53
> > ++
> > src/libvirt_public.syms |6 +
> > 5 files changed, 98 insertions(+), 10 deletions(-)
>
> >
> > +typedef enum {
> > +VIR_CONNECT_CLOSE_REASON_ERROR = 1, /* Misc I/O error */
>
> Any reason you skipped 0? It will make wrapping this in a VIR_ENUM harder.
No, that's a mistake.
>
>
> > +int virConnectSetCloseCallback(virConnectPtr conn,
> > + virConnectCloseFunc cb,
> > + void *opaque,
> > + virFreeCallback freecb);
>
> Do we want a 'flags' argument?
No, I don't think so for the callbacks
>
> > +++ b/src/datatypes.c
> > @@ -115,6 +115,10 @@ virReleaseConnect(virConnectPtr conn) {
> >
> > virMutexLock(&conn->lock);
> >
> > +if (conn->closeOpaque &&
>
> NACK to this half of the condition. A client should be allowed to pass
> NULL as their opaque data.
This doesn't prevent them passing NULL. The 'virFreeFunc' callback is
for free'ing the 'opaque' data. If the opaque data is NULL, there is
nothing that requires free'ing.
> > +int virConnectSetCloseCallback(virConnectPtr conn,
> > + virConnectCloseFunc cb,
> > + void *opaque,
> > + virFreeCallback freecb)
> > +{
> > +VIR_DEBUG("conn=%p", conn);
> > +
> > +virResetLastError();
> > +
> > +if (!VIR_IS_CONNECT(conn)) {
> > +virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__);
> > +virDispatchError(NULL);
> > +return -1;
> > +}
> > +
> > +virMutexLock(&conn->lock);
> > +
> > +if (conn->closeOpaque &&
> > +conn->closeFreeCallback)
> > +conn->closeFreeCallback(conn->closeOpaque);
>
> Again, no need to check closeOpaque, NULL is valid there.
Same point as above.
> > +
> > +conn->closeCallback = cb;
> > +conn->closeOpaque = opaque;
> > +conn->closeFreeCallback = freecb;
>
> So the user can call this as many times as they want to override or
> uninstall an existing registered callback? I guess that works.
Alternatively I could raise an error, probably nicer than silently
overriding an existing callback
>
> ACK, once you allow a NULL opaque pointer, and answer why a flags is not
> useful (or else add a flags).
Daniel
--
|: http://berrange.com -o-http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From: "Daniel P. Berrange"
As per the comment, the Xen hypervisor driver is considered to
be mandatory when running privileged. When it fails to open,
we should thus return an error, not ignore it.
---
src/xen/xen_driver.c |2 ++
1 file changed, 2 insertions(+)
diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 9ff3d29..43b2620 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -340,6 +340,8 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth,
unsigned int flags)
if (xenHypervisorOpen(conn, auth, flags) == VIR_DRV_OPEN_SUCCESS) {
VIR_DEBUG("Activated hypervisor sub-driver");
priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET] = 1;
+} else {
+goto fail;
}
}
--
1.7.10.4
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
