July 2008 - Devel - libvirt List Archives

[libvirt] Re: ruby-libvirt on debian based systems
by Tom Verhaeghe 22 Jul '08

22 Jul '08

Yes it does, it works like a train on rails 2.0.2 & ruby 1.8.6 I'll keep you in touch if anything goes wrong On Tue, Jul 22, 2008 at 1:19 AM, David Lutterkort <dlutter(a)redhat.com> wrote: > On Mon, 2008-07-21 at 16:48 +0200, Tom Verhaeghe wrote: > > Solved, i had to install libxen3-dev in order to make it work. > > I assume that that contains the pkgconfig for libvirt; the extconf.rb in > ruby-libvirt needs that. > > With that ruby-libvirt works fine on Ubuntu ? I am glad to hear that. > > David > > > >

1 0

[libvirt] ruby-libvirt on debian based systems
by Tom Verhaeghe 21 Jul '08

21 Jul '08

Hello I don't know if ruby-libvirt can work in a debian-based environment. I installed kvm, libvirt, RoR, etc on Ubuntu and it all works fine. I pasted the output when installing the gem below. I think the problem could be that libvirt is called differently in Ubuntu or stored on a different location. Is there a way to get around? Thanks in advance Tom Building native extensions. This could take a while... ERROR: While executing gem ... (RuntimeError) Error instaling ruby-libvirt-0.0.7.gem: ERROR: Failed to build gem native extension. ruby extconf.rb install ruby-libvirt-0.0.7.gem *** extconf.rb failed *** Could not create Makefile due to some reason, probably lack of necessary libraries and/or headers. Check the mkmf.log file for more details. You may need configuration options. Provided configuration options: --with-opt-dir --without-opt-dir --with-opt-include --without-opt-include=${opt-dir}/include --with-opt-lib --without-opt-lib=${opt-dir}/lib --with-make-prog --without-make-prog --srcdir=. --curdir --ruby=/usr/bin/ruby1.8 --with-_libvirt-dir --without-_libvirt-dir --with-_libvirt-include --without-_libvirt-include=${_libvirt-dir}/include --with-_libvirt-lib --without-_libvirt-lib=${_libvirt-dir}/lib --with-libvirt-config --without-libvirt-config --with-pkg-config --without-pkg-config extconf.rb:16: libvirt not found (RuntimeError) Gem files will remain installed in /var/lib/gems/1.8/gems/ruby-libvirt-0.0.7 for inspection. Results logged to /var/lib/gems/1.8/gems/ruby-libvirt-0.0.7/ext/libvirt/gem_make.out

2 2

[libvirt] Problem building RPM on x86_64
by Darryl L. Pierce 21 Jul '08

21 Jul '08

I'm hitting the following problem while building an RPM for x86_64: (mcpierce@dpierce-dev:libvirt)$ make rpm Making clean in po make[1]: Entering directory `/home/mcpierce/Programming/libvirt/po' rm -f *.insert-header rm -f remove-potcdate.sed rm -f stamp-poT rm -f core core.* libvirt.po libvirt.1po libvirt.2po *.new.po rm -fr *.o ... make[2]: Leaving directory `/home/mcpierce/Programming/libvirt/gnulib/tests' make[2]: Entering directory `/home/mcpierce/Programming/libvirt/python' make[2]: *** No rule to make target `libvirt-py.c', needed by `distdir'. Stop. make[2]: Leaving directory `/home/mcpierce/Programming/libvirt/python' make[1]: *** [distdir] Error 1 make[1]: Leaving directory `/home/mcpierce/Programming/libvirt' make: *** [rpm] Error 2 However, on i386 the build works just fine. -- Darryl L. Pierce, Sr. Software Engineer Red Hat, Inc. - http://www.redhat.com/ oVirt - Virtual Machine Management - http://www.ovirt.org/ "What do you care what other people think, Mr. Feynman?"

3 7

[libvirt] [PATCH] parse container id in separate function
by Evgeniy Sokolov 21 Jul '08

21 Jul '08

There were several places with parsing container id from code. Separate function is used now.

3 8

[libvirt] Re: make fails (Kenneth Nagin)
by Kenneth Nagin 21 Jul '08

21 Jul '08

>I downloaded the latest libvirt and tried to make it but received this >error message: >make: *** No rule to make target `gnulib/m4/onceonly_2_57.m4', needed by >`Makefile.in'. Stop. The problem was related to running ./autogen.sh --prefix=$HOME/usr. I didn't notice that it did not run correctly. It requires the install gettext-devel which does not come automatically with fedora. But now the make fails due to an i386 / i386:x86-64 incompatibility. These are the error messages: /usr/bin/ld: i386 architecture of input file `.libs/libvirt_la-openvz_conf.o' is incompatible with i386:x86-64 output /usr/bin/ld: i386 architecture of input file `.libs/libvirt_la-openvz_driver.o' is incompatible with i386:x86-64 output collect2: ld returned 1 exit status make[2]: *** [libvirt.la] Error 1 make[2]: Leaving directory `/home/nagin/workspace/libvirt/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/nagin/workspace/libvirt' make: *** [all] Error 2 -- Kenneth Nagin

3 4

[libvirt] leak? xenUnifiedOpen
by Stefan de Konink 21 Jul '08

21 Jul '08

==5486== 184 bytes in 1 blocks are definitely lost in loss record 5 of 18 ==5486== at 0x4C20111: calloc (vg_replace_malloc.c:397) ==5486== by 0x4E3ADFD: __virAlloc (memory.c:100) ==5486== by 0x4E4AF21: xenUnifiedOpen (xen_unified.c:264) ==5486== by 0x4E3A005: do_open (libvirt.c:777) ==5486== by 0x4009D7: main (in /home/skinkie/development/htdocs/cherokee/experiment) Maybe valgrind is over active, because I see the free code at the close connection, and my own code is closing it... Stefan

3 5

[libvirt] [PATCH] cpu usage in OpenVZ
by Evgeniy Sokolov 21 Jul '08

21 Jul '08

OpenVZ calculate statistics and allow to get them . Added function for getting cpu usage of container.

3 3

[libvirt] [PATCH] configure.in: make --with-xen-distdir work for 64bit xen too
by David Lively 21 Jul '08

21 Jul '08

Currently running autogen.sh with --with-xen-distdir=something fails to find libxenstore if there's only a 64-bit version, and subsequently fails to enable xen support (i.e., ends up with WITH_XEN=0). This one-line patch fixes that by telling it to search both lib and lib64. I guess it would be better to search only the appropriate directory (lib OR lib64) rather than both, but I'm not sure (being an autoconf-dummy) how to ask about the target architecture. Dave configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[libvirt] [PATCH] fix lookup
by Evgeniy Sokolov 21 Jul '08

21 Jul '08

I am often catching error related with that stoped VM has ID = -1. 1. If I create/define VM with existing ID of stoped VM. Creation failed, but error message is wrong. Detection is fixed. 2. Dominfo command may show info about some another VM. And report error that can't get autostart state. Current patch shoud fix problems.

3 2

[libvirt] make fails
by Kenneth Nagin 20 Jul '08

20 Jul '08

I downloaded the latest libvirt and tried to make it but received this error message: make: *** No rule to make target `gnulib/m4/onceonly_2_57.m4', needed by `Makefile.in'. Stop. Kenneth Nagin

1 0

[libvirt] Inconsistency with documentation virDomainGetMaxMemory(NULL)
by Stefan de Konink 19 Jul '08

19 Jul '08

I was making a some test code to checkout some code before I start on my brand new Invite/Tender cluster distribution engine(tm ;) From docs: Retrieve the maximum amount of physical memory allocated to a domain. If domain is NULL, then this get the amount of memory reserved to Domain0 i.e. the domain where the application runs. skinkie@xenapi ~/development/htdocs/cherokee $ ./experiment libvir: Domain error : invalid domain pointer in virDomainGetMaxMemory 0 262144 Code: printf("%ld\n", virDomainGetMaxMemory(NULL)); virDomainPtr domu = virDomainLookupByName(conn, "klant1_gentoo"); printf("%ld\n", virDomainGetMaxMemory(domu)); virDomainFree(domu); Stefan

1 3

[libvirt] [PATCH] remove unnecessary "V = NULL; " stmts after VIR_FREE(V)
by Jim Meyering 19 Jul '08

19 Jul '08

Doing a review (in progress), I spotted one of these, so went in search of others. They're harmless, so this is more a heads up than anything else. I am happy to defer application until the patch queue has been reduced. >From d97af7667699529c216835d806d1f0c6f698a70d Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 17 Jul 2008 12:05:44 +0200 Subject: [PATCH] remove unnecessary "V = NULL;" stmts after VIR_FREE(V) * src/domain_conf.c (virDomainChrDefParseXML) (virDomainNetDefParseXML): Likewise. * src/iptables.c (iptRuleFree): Likewise. * src/storage_backend.c (virStorageBackendRunProgRegex): Likewise. * src/test.c (testOpenFromFile): Likewise. * src/xm_internal.c (xenXMAttachInterface): Likewise. * src/xml.c (virDomainParseXMLOSDescHVM): Likewise. * src/xmlrpc.c (xmlRpcCallRaw): Likewise. --- src/domain_conf.c | 5 +---- src/iptables.c | 2 -- src/storage_backend.c | 4 +--- src/test.c | 8 ++------ src/xm_internal.c | 1 - src/xml.c | 1 - src/xmlrpc.c | 1 - 7 files changed, 4 insertions(+), 18 deletions(-) diff --git a/src/domain_conf.c b/src/domain_conf.c index 82c0ee6..6340c2a 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -696,7 +696,6 @@ virDomainNetDefParseXML(virConnectPtr conn, if (STRPREFIX((const char*)ifname, "vnet")) { /* An auto-generated target name, blank it out */ VIR_FREE(ifname); - ifname = NULL; } } else if ((script == NULL) && (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET) && @@ -954,10 +953,8 @@ virDomainChrDefParseXML(virConnectPtr conn, bindService = virXMLPropString(cur, "service"); } - if (def->type == VIR_DOMAIN_CHR_TYPE_UDP) { + if (def->type == VIR_DOMAIN_CHR_TYPE_UDP) VIR_FREE(mode); - mode = NULL; - } } } else if (xmlStrEqual(cur->name, BAD_CAST "protocol")) { if (protocol == NULL) diff --git a/src/iptables.c b/src/iptables.c index e7613e2..3e3a1a2 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -266,14 +266,12 @@ static void iptRuleFree(iptRule *rule) { VIR_FREE(rule->rule); - rule->rule = NULL; if (rule->argv) { int i = 0; while (rule->argv[i]) VIR_FREE(rule->argv[i++]); VIR_FREE(rule->argv); - rule->argv = NULL; } } diff --git a/src/storage_backend.c b/src/storage_backend.c index 3e4e39c..a164a08 100644 --- a/src/storage_backend.c +++ b/src/storage_backend.c @@ -444,10 +444,8 @@ virStorageBackendRunProgRegex(virConnectPtr conn, goto cleanup; /* Release matches & restart to matching the first regex */ - for (j = 0 ; j < totgroups ; j++) { + for (j = 0 ; j < totgroups ; j++) VIR_FREE(groups[j]); - groups[j] = NULL; - } maxReg = 0; ngroup = 0; } diff --git a/src/test.c b/src/test.c index d0bb003..b7b9df0 100644 --- a/src/test.c +++ b/src/test.c @@ -461,10 +461,8 @@ static int testOpenFromFile(virConnectPtr conn, dom->def->id = privconn->nextDomID++; dom->persistent = 1; } - if (domains != NULL) { + if (domains != NULL) VIR_FREE(domains); - domains = NULL; - } ret = virXPathNodeSet("/node/network", ctxt, &networks); if (ret < 0) { @@ -498,10 +496,8 @@ static int testOpenFromFile(virConnectPtr conn, net->persistent = 1; } - if (networks != NULL) { + if (networks != NULL) VIR_FREE(networks); - networks = NULL; - } xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); diff --git a/src/xm_internal.c b/src/xm_internal.c index 3b264a8..60f32fe 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -2925,7 +2925,6 @@ xenXMAttachInterface(virDomainPtr domain, xmlXPathContextPtr ctxt, int hvm, if (virMacAddrCompare (dommac, (const char *) mac) == 0) { if (autoassign) { VIR_FREE(mac); - mac = NULL; if (!(mac = (xmlChar *)xenXMAutoAssignMac())) goto cleanup; /* initialize the list */ diff --git a/src/xml.c b/src/xml.c index d5730ed..477d466 100644 --- a/src/xml.c +++ b/src/xml.c @@ -1200,7 +1200,6 @@ virDomainParseXMLOSDescHVM(virConnectPtr conn, xmlNodePtr node, xmlFree(bus); } VIR_FREE(nodes); - nodes = NULL; } cur = virXPathNode("/domain/devices/parallel[1]", ctxt); diff --git a/src/xmlrpc.c b/src/xmlrpc.c index d627607..cbca389 100644 --- a/src/xmlrpc.c +++ b/src/xmlrpc.c @@ -443,7 +443,6 @@ static char *xmlRpcCallRaw(const char *url, const char *request) if (ret != len) { errno = EINVAL; VIR_FREE(response); - response = NULL; xmlRpcError(VIR_ERR_POST_FAILED, _("read response"), 0); } -- 1.5.6.3.385.g9f9af

2 2

[libvirt] Libvirtd default.xml (in qemu/networks/autostart) breaks XEN
by Stefan de Konink 18 Jul '08

18 Jul '08

The desire to automatically install the autostarted network configuration of libvirt broke my (and some other users on xen-users) setup. I suggest to *remove* this network configuration as default and *not* put it into xenstore as a stateful config. *It does not work by default* Worse is that it is almost impossible to debug if you don't know where to find it. Stefan

2 5

[libvirt] virStorageVolCreateXML vs virStorageVolCloneXML
by Stefan de Konink 18 Jul '08

18 Jul '08

Hi, There is currently no implementation in the api to clone snapshots or images. I wonder if we could add an XML node to specify a backed device. Or add a new function that allows to clone. Like the create is not supported by all pools, cloning should also be based on best effort, falling back to cp for non sparse images. (Probably a good configuration option) Now the new XML parser is in place I have still the desire to create this type of configuration: <disk type='pool'> <source pool='netapp' volume='lun-3' /> <target dev='xvda'/> </disk> And it might be a useful source tag for cloning too. Stefan

2 2

[libvirt] [PATCH]: Add floppy support to xm_internal
by Chris Lalancette 18 Jul '08

18 Jul '08

Yes, you read the subject right; add floppy support to xm internal. Let's just say I didn't do this by choice. In any case, there was a cryptic comment in xenXMParseXMLDisks() that said: /* Xend (all versions) put the floppy device config * under the hvm (image (os)) block */ What this actually means is that we shouldn't parse the floppy stuff to put it in the "disks =" section of the /etc/xen configuration file, since it doesn't have meaning there. Instead, floppy disks go at the top-level of a Xen config file, like: fda = '/var/lib/xen/images/floppy.img' fdb = '/var/lib/xen/images/floppy2.img' That's exactly what this patch does. In combination with a couple of other small patches to virt-install (which I will post to the appropriate list), I was able to use a floppy disk to hold the kickstart for a fully virtualized Xen guest install. Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

3 4

[libvirt] RFC? finding potential storage pool resources
by David Lively 18 Jul '08

18 Jul '08

Hi - I'm looking into using (which I think means extending) libvirt to enumerate "potential" storage pool resources, in particular: * existing physical disk device names (for creating "disk" pools) * existing logical volume group names (for creating "logical" pools) Note that List{Defined,Active}StorageGroups don't do the trick. Suppose this is a new host and I'm trying to start defining the storage pools (and I want to be able to use existing volume groups, for example). I don't see how to do that within the current libvirt framework. If I'm missing something, please let me know (and ignore the rest of this message ...). This could be done by adding some new calls like: int virConnectListPhysDisks(virConnectPtr conn, char ** const name, int maxnames) int virConnectListLogicalVolGroups(virConnectPtr conn, char ** const name, int maxnames) ... plus a pair of NumOf functions ... But these are each storage-driver specific. For example, if I'm not using the "logical" storage driver, I have no need (or means) of listing volume groups. So maybe it's cleaner to fold these two functions into one, now parameterized by storage driver type: int virConnectListStorageSources(virConnectPtr conn, const char *type, char ** const name, int maxnames) ... plus a NumOf function ... where <type> is one of the supported storage pool types. So, if <type> is "disk", ListStorageSources acts like ListPhysDisks, and if <type> is "logical", ListStorageSources acts like ListLogicalVolumeGroups, (and we return empty lists or some sort of "unsupported" error for any other types ... can't list all possible network servers, for instance). What do you all think? Thanks, Dave

2 2

[libvirt] attach device on a defined (non-active) vm
by Stefan de Konink 18 Jul '08

18 Jul '08

It seems that the attach device function really 'attaches' a (live) device to a non-active domain. Is this by design? Otherwise I would not have a clue how to interpreted this message: libvir: Xen Daemon error : POST operation failed: (xend.err 'Device /dev/xvdp (51952, tap) is already connected.') (when I try to start the domain) So what I did; I have created an empty domain without any devices. Loaded that and added a disk. Stefan

2 1

[libvirt] [PATCH] enable format-safety checks for virDomainReportError
by Jim Meyering 18 Jul '08

18 Jul '08

This enables format-safety checks for virDomainReportError, so that if you try to print e.g., an int via "%s", gcc will detect it. The Makefile.maint check ensures that all string arguments to virDomainReportError are marked for translation with _(...). >From 65c7fc8bdbf491a02d1d14fcdef429ba1c9e0dea Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 18 Jul 2008 12:46:38 +0200 Subject: [PATCH] enable format-safety checks for virDomainReportError * src/domain_conf.c (virDomainReportError): Declare using ATTRIBUTE_FORMAT(printf, 3, 4). * Makefile.maint (msg_gen_function): Add virDomainReportError. --- Makefile.maint | 1 + src/domain_conf.c | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Makefile.maint b/Makefile.maint index 5da2984..03800f8 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -352,6 +352,7 @@ msg_gen_function += ReportError msg_gen_function += qemudReportError msg_gen_function += openvzLog msg_gen_function += openvzError +msg_gen_function += virDomainReportError # Uncomment the following and run "make syntax-check" to see diagnostics # that are not yet marked for translation, but that need to be rewritten diff --git a/src/domain_conf.c b/src/domain_conf.c index 82c0ee6..2ff5d1a 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -128,6 +128,10 @@ VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST, static void virDomainReportError(virConnectPtr conn, int code, const char *fmt, ...) + ATTRIBUTE_FORMAT(printf, 3, 4); + +static void virDomainReportError(virConnectPtr conn, + int code, const char *fmt, ...) { va_list args; char errorMessage[1024]; -- 1.5.6.3.440.ge3a8d

2 2

[libvirt] [PATCH]: Add MIGRATE_LIVE definition to ruby-libvirt bindings
by Chris Lalancette 18 Jul '08

18 Jul '08

Attached is a trivial patch to add the MIGRATE_LIVE flag into the ruby-libvirt bindings. Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

2 2

[libvirt] [PATCH] Fix pool-create for netfs format 'auto'
by Cole Robinson 17 Jul '08

17 Jul '08

Trying to pool-create a netfs pool with the format type 'auto' (as in, to autodetect the format) runs the command mount -t auto munged-source-path '-t auto' seems to do its job for regular file systems, but actually fails with nfs or cifs (I assume anything that required an external mount program). Strangely though, the command mount munged-source-path will do the right thing. The attached patch fixes the generated command to work in the above case, fully removing the '-t type' piece if auto is specified for a netfs pool. I tested the intended case, as well as regular fs pools format=auto, and netfs format=nfs, and all seemed to work fine. Thanks, Cole diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c index 9926493..f195034 100644 --- a/src/storage_backend_fs.c +++ b/src/storage_backend_fs.c @@ -487,7 +487,23 @@ static int virStorageBackendFileSystemMount(virConnectPtr conn, virStoragePoolObjPtr pool) { char *src; - const char *mntargv[] = { + const char **mntargv; + + /* 'mount -t auto' doesn't seem to auto determine nfs (or cifs), + * while plain 'mount' does. We have to craft separate argvs to + * accommodate this */ + int netauto = (pool->def->type == VIR_STORAGE_POOL_NETFS && + pool->def->source.format == VIR_STORAGE_POOL_NETFS_AUTO); + int source_index; + + const char *netfs_auto_argv[] = { + MOUNT, + NULL, /* source path */ + pool->def->target.path, + NULL, + }; + + const char *fs_argv[] = { MOUNT, "-t", pool->def->type == VIR_STORAGE_POOL_FS ? @@ -495,10 +511,20 @@ virStorageBackendFileSystemMount(virConnectPtr conn, pool->def->source.format) : virStorageBackendFileSystemNetPoolFormatToString(conn, pool->def->source.format), - NULL, /* Fill in shortly - careful not to add extra fields before this */ + NULL, /* Fill in shortly - careful not to add extra fields + before this */ pool->def->target.path, NULL, }; + + if (netauto) { + mntargv = netfs_auto_argv; + source_index = 1; + } else { + mntargv = fs_argv; + source_index = 3; + } + int ret; if (pool->def->type == VIR_STORAGE_POOL_NETFS) { @@ -543,7 +569,7 @@ virStorageBackendFileSystemMount(virConnectPtr conn, return -1; } } - mntargv[3] = src; + mntargv[source_index] = src; if (virRun(conn, (char**)mntargv, NULL) < 0) { VIR_FREE(src);

4 3

[libvirt] some unsorted questions
by Stefan de Konink 17 Jul '08

17 Jul '08

Hi, Currently I'm working on my webserver thingie. And I notice some annoying error messages. Generally I use a predefined host to do the basic setup of defining a domain. So a client can shoot its XML directly into a post request, or we set it up by parsing some parameters from the URI. Now personally I think it is smart to check if a domain is already defined, or in use. If this is not the case libvirtd and the client get this message: libvir: Xen Daemon error : GET operation failed: That doesn't seem to fit the scenario at all :) Why does lookupbyname behave so bad? Secondly; I am a bit distracted by the domids concept. These ids are not available before a domain is launched. I think it would be interesting to allow signed values. In this way the 'defined' not active domains would get a negative value and a running domain a positive value. (Dom0 gets 0) This would have far less implications than using an uuid through the codebase consistently (not speaking the about the extra overhead). If this gets implemented I would suggest a call that fetches all domains from a running system and not only the defined or only the active ones. Stefan

4 6

[libvirt] PATCH: 0/5: Refactoring LXC & switching to generic domain APIs
by Daniel P. Berrange 16 Jul '08

16 Jul '08

The following series of 5 patches perform some general re-factoring of the LXC driver, the relationship between libvirtd & the processes it spawns, and finally switches LXC over to the generic domain XML APIs. This is just basically 1 day's work, so its a little rough around the edges in places, but I can confim that the core functionality is still all operational - by which I mean, start, stop, list, console, & re-start of daemon. Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 8

[libvirt] Updating xml (cmdline)
by Stefan de Konink 16 Jul '08

16 Jul '08

Hi, Is it possible to 'update' a defined domain before it is started. I have run into a chicken and egg problem related to the <cmdline> and the first ethernet interface, I cannot create the interface before I have a domain and visa versa. Stefan

2 1

[libvirt] PATCH: Bash auto-completion for virsh
by Daniel P. Berrange 16 Jul '08

16 Jul '08

Everyone[1] seems to be doing funky bash auto-completion for commands these days, so I thought I'd make a stab at doing something for virsh. First of all I needed the command line help in an easier format to deal with, so I've added virsh _complete-command commands|arguments|options eg, $ virsh _complete-command commands help attach-device attach-disk attach-interface autostart capabilities connect console ...snip rest... $ virsh _complete-command arguments vcpupin domain vcpu cpulist $ virsh _complete-command options -c --connect -r --readonly -d --debug -h --help -q --quiet -t --timing -l --log -v --version $ virsh _complete-command options net-list --inactive --all That's enough to get all the basic commands & options auto-completing. For the arguments though I wanted to be able to auto-complete domain names, ids and UUIDs. likewise for storage pools and networks. I also wanted to auto-complete connect URIs ,eg test://default, qemu:///system $ virsh _complete-domain ISCSIServer 35e5efcc-f6a3-b489-fc33-99f2e4792e6d untangle dc502cb8-4bdd-7a15-f35a-cf76287ea2bd VirtTest 82038f2a-1344-aaf7-1a85-2a7250be2076 xenner 18c23d31-4d74-0bff-986d-e4251d2a2ff0 And $ virsh _complete-uri test:///default qemu:///system lxc:/// For this latter command, I needed to add a new API /** * virConnectURIs: * uris: pointer to a list to be filled with URI strings * * This functions returns the list of available connection * URIs. The caller is responsible for freeing the returned * strings, and the array they're stored in. * * Returns the number of URIs in case of success or -1 in * case of error. */ int virConnectURIs(char ***uris); This simply calls the existing probe() method for each driver and stores the list of URIs returned. Finally to tie this all together simply needs a little helper script which by convention is added to the /etc/bash_completion.d/. On Fedora this isn't enable by default, so you have to turn it on with source /etc/bash_completion.d/virsh To your $HOME/.bashrc Daniel [1] For a definition of 'everyone' which includes git & mercurial b/src/virsh.bash | 79 +++++++ include/libvirt/libvirt.h | 1 include/libvirt/libvirt.h.in | 1 libvirt.spec.in | 1 src/Makefile.am | 10 src/libvirt.c | 54 +++++ src/libvirt_sym.version | 2 src/test.c | 6 src/virsh.c | 442 ++++++++++++++++++++++++++++++++++++++++++- 9 files changed, 581 insertions(+), 15 deletions(-) diff -r f3413463b3ff include/libvirt/libvirt.h --- a/include/libvirt/libvirt.h Sun Jul 13 13:14:50 2008 +0100 +++ b/include/libvirt/libvirt.h Mon Jul 14 11:54:10 2008 +0100 @@ -397,6 +397,7 @@ virConnectAuthPtr auth, int flags); int virConnectClose (virConnectPtr conn); +int virConnectURIs (char ***uris); const char * virConnectGetType (virConnectPtr conn); int virConnectGetVersion (virConnectPtr conn, unsigned long *hvVer); diff -r f3413463b3ff include/libvirt/libvirt.h.in --- a/include/libvirt/libvirt.h.in Sun Jul 13 13:14:50 2008 +0100 +++ b/include/libvirt/libvirt.h.in Mon Jul 14 11:54:10 2008 +0100 @@ -397,6 +397,7 @@ virConnectAuthPtr auth, int flags); int virConnectClose (virConnectPtr conn); +int virConnectURIs (char ***uris); const char * virConnectGetType (virConnectPtr conn); int virConnectGetVersion (virConnectPtr conn, unsigned long *hvVer); diff -r f3413463b3ff libvirt.spec.in --- a/libvirt.spec.in Sun Jul 13 13:14:50 2008 +0100 +++ b/libvirt.spec.in Mon Jul 14 11:54:10 2008 +0100 @@ -227,6 +227,7 @@ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart +%{_sysconfdir}/bash_completion.d/virsh %{_sysconfdir}/rc.d/init.d/libvirtd %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf diff -r f3413463b3ff src/Makefile.am --- a/src/Makefile.am Sun Jul 13 13:14:50 2008 +0100 +++ b/src/Makefile.am Mon Jul 14 11:54:10 2008 +0100 @@ -25,8 +25,9 @@ confdir = $(sysconfdir)/libvirt/ conf_DATA = qemu.conf +bashdir = $(sysconfdir)/bash_completion.d -EXTRA_DIST = libvirt_sym.version $(conf_DATA) +EXTRA_DIST = libvirt_sym.version $(conf_DATA) virsh.bash lib_LTLIBRARIES = libvirt.la @@ -153,7 +154,12 @@ endif # Create the /var/cache/libvirt directory when installing. -install-exec-local: +install-exec-local:: $(MKDIR_P) $(DESTDIR)$(localstatedir)/cache/libvirt + $(MKDIR_P) $(DESTDIR)$(bashdir) + $(INSTALL_SCRIPT) virsh.bash $(bashdir)/virsh + +uninstall-local:: + $(RM) -f $(bashdir)/virsh CLEANFILES = *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda diff -r f3413463b3ff src/libvirt.c --- a/src/libvirt.c Sun Jul 13 13:14:50 2008 +0100 +++ b/src/libvirt.c Mon Jul 14 11:54:10 2008 +0100 @@ -37,6 +37,7 @@ #include "uuid.h" #include "util.h" #include "test.h" +#include "memory.h" #include "xen_unified.h" #include "remote_internal.h" #include "qemu_driver.h" @@ -701,7 +702,8 @@ int probes = 0; for (i = 0; i < virDriverTabCount; i++) { if ((virDriverTab[i]->probe != NULL) && - ((latest = virDriverTab[i]->probe()) != NULL)) { + ((latest = virDriverTab[i]->probe()) != NULL) && + STRNEQ(latest, "test:///default")) { probes++; DEBUG("Probed %s", latest); @@ -946,6 +948,56 @@ if (virUnrefConnect(conn) < 0) return (-1); return (0); +} + + +/** + * virConnectURIs: + * uris: pointer to a list to be filled with URI strings + * + * This functions returns the list of available connection + * URIs. The caller is responsible for freeing the returned + * strings, and the array they're stored in. + * + * Returns the number of URIs in case of success or -1 in + * case of error. + */ +int +virConnectURIs(char ***uris) +{ + const char *uri; + char **ret = NULL; + int nuris = 0, i; + DEBUG("uris=%p", uris); + + if (!initialized) + if (virInitialize() < 0) + return -1; + + if (!uris) + return -1; + + for (i = 0; i < virDriverTabCount; i++) { + if ((virDriverTab[i]->probe != NULL) && + ((uri = virDriverTab[i]->probe()) != NULL)) { + if (VIR_REALLOC_N(ret, nuris + 1) < 0) + goto no_memory; + if ((ret[nuris++] = strdup(uri)) == NULL) + goto no_memory; + + DEBUG("Probed %s", uri); + } + } + + *uris = ret; + return (nuris); + +no_memory: + for (i = 0 ; i < nuris ; i++) + VIR_FREE(ret[i]); + VIR_FREE(ret); + virLibConnError(NULL, VIR_ERR_NO_MEMORY, NULL); + return -1; } /* Not for public use. This function is part of the internal diff -r f3413463b3ff src/libvirt_sym.version --- a/src/libvirt_sym.version Sun Jul 13 13:14:50 2008 +0100 +++ b/src/libvirt_sym.version Mon Jul 14 11:54:10 2008 +0100 @@ -5,7 +5,7 @@ virConnectOpenReadOnly; virConnectOpenAuth; virConnectAuthPtrDefault; - + virConnectURIs; virConnectClose; virConnectGetType; virConnectGetVersion; diff -r f3413463b3ff src/test.c --- a/src/test.c Sun Jul 13 13:14:50 2008 +0100 +++ b/src/test.c Mon Jul 14 11:54:10 2008 +0100 @@ -215,6 +215,10 @@ " </ip>" "</network>"; + +static const char *testProbe(void) { + return "test:///default"; +} static int testOpenDefault(virConnectPtr conn) { int u; @@ -1545,7 +1549,7 @@ VIR_DRV_TEST, "Test", LIBVIR_VERSION_NUMBER, - NULL, /* probe */ + testProbe, /* probe */ testOpen, /* open */ testClose, /* close */ NULL, /* supports_feature */ diff -r f3413463b3ff src/virsh.bash --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/virsh.bash Mon Jul 14 11:54:10 2008 +0100 @@ -0,0 +1,79 @@ + +_virsh() +{ + local cur prev cmd cmd_index arg arg_index i results + local virsh="$1" + local canonical=0 + + COMPREPLY=() + cur="$2" + prev="$3" + + if [[ $COMP_CWORD > 1 && ${COMP_WORDS[COMP_CWORD-1]} = '--connect' ]]; then + results="$("$virsh" _complete-uri)" || nets="" + fi + + if [ -z "$results" ]; then + # searching for the command name + for ((i=1; $i<=$COMP_CWORD; i++)); do + if [[ ${COMP_WORDS[i]} != -* ]]; then + if [[ ${COMP_WORDS[i-1]} != '--connect' ]]; then + if [[ $i < $COMP_CWORD ]]; then + cmd="${COMP_WORDS[i]}" + cmd_index=$i + arg_index=`expr $COMP_CWORD - $cmd_index` + break + fi + fi + fi + done + + if [[ "$cur" == -* ]]; then + # Generate args - global or command specific + results="$("$virsh" _complete-command options "$cmd")" + else + if [ -z "$cmd" ]; then + # No command set, so generate list of all commands + results="$("$virsh" _complete-command commands)" || commands="" + else + # Command set, to generate command specific args + n=0 + for i in "$("$virsh" _complete-command arguments "$cmd")" + do + n=`expr $n + 1` + if [ $n = $arg_index ]; then + arg=$i + break + fi + done + + case $arg in + file) + COMPREPLY=(${COMPREPLY[@]:-} $(compgen -o "default" -- "$cur")) + ;; + + domain) + results="$("$virsh" _complete-domain)" || doms="" + ;; + + network) + results="$("$virsh" _complete-network)" || nets="" + ;; + + pool) + results="$("$virsh" _complete-pool)" || nets="" + ;; + + uri) + results="$("$virsh" _complete-uri)" || nets="" + ;; + esac + fi + fi + fi + if [ ! -z "$results" ]; then + COMPREPLY=(${COMPREPLY[@]:-} $(compgen -W '$results' -- "$cur")) + fi +} + +complete -F _virsh virsh diff -r f3413463b3ff src/virsh.c --- a/src/virsh.c Sun Jul 13 13:14:50 2008 +0100 +++ b/src/virsh.c Mon Jul 14 11:54:10 2008 +0100 @@ -329,6 +329,409 @@ * --------------- */ + + +/* + * "_compcmds" command + */ +static vshCmdInfo info_compcommand[] = { + {"syntax", "_complete-command [commands|arguments|options] [<command>]"}, + {"help", gettext_noop("print shell completion data")}, + {"desc", gettext_noop("Prints data useful for shell autocompletion of commands.")}, + + {NULL, NULL} +}; + +static vshCmdOptDef opts_compcommand[] = { + {"type", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("type of data")}, + {"cmd", VSH_OT_DATA, 0, gettext_noop("command name")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdCompCommand(vshControl * ctl, vshCmd * cmd) +{ + const char *type = vshCommandOptString(cmd, "type", NULL); + const char *name = vshCommandOptString(cmd, "cmd", NULL); + + if (STREQ(type, "commands")) { + vshCmdDef *def; + for (def = commands; def->name; def++) + if (def->name[0] != '_') + vshPrint(ctl, "%s\n", def->name); + } else if (STREQ(type, "options")) { + if (name) { + vshCmdDef *def = vshCmddefSearch(name); + if (!def) { + vshError(ctl, FALSE, _("command '%s' doesn't exist"), name); + return FALSE; + } else if (def->opts) { + vshCmdOptDef *opt; + for (opt = def->opts; opt->name; opt++) + if (opt->type == VSH_OT_BOOL || + opt->type == VSH_OT_INT || + opt->type == VSH_OT_STRING) + vshPrint(ctl, "--%s\n", opt->name); + } + } else { + vshPrint(ctl, + "-c\n--connect\n" + "-r\n--readonly\n" + "-d\n--debug\n" + "-h\n--help\n" + "-q\n--quiet\n" + "-t\n--timing\n" + "-l\n--log\n" + "-v\n--version\n"); + } + } else if (STREQ(type, "arguments")) { + if (!name) { + vshError(ctl, FALSE, "%s", _("no command specified")); + return FALSE; + } else { + vshCmdDef *def = vshCmddefSearch(name); + if (!def) { + vshError(ctl, FALSE, _("command '%s' doesn't exist"), name); + return FALSE; + } else if (def->opts) { + vshCmdOptDef *opt; + for (opt = def->opts; opt->name; opt++) + if (opt->type == VSH_OT_DATA) + vshPrint(ctl, "%s\n", opt->name); + } + } + } + return TRUE; +} + +/* + * "_compuris" command + */ +static vshCmdInfo info_compuri[] = { + {"syntax", "_complete-uri"}, + {"help", gettext_noop("print shell completion data for URIs")}, + {"desc", gettext_noop("Prints data useful for shell autocompletion of URIs.")}, + + {NULL, NULL} +}; + +static vshCmdOptDef opts_compuri[] = { + {NULL, 0, 0, NULL} +}; + +static int +cmdCompUri(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) +{ + char **uris = NULL; + int nuris, i; + + nuris = virConnectURIs(&uris); + if (nuris < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list connection URIs")); + return FALSE; + } + for (i = 0 ; i < nuris ; i++) { + vshPrint(ctl, "%s\n", uris[i]); + free(uris[i]); + } + + free(uris); + return TRUE; +} +/* + * "_compdomains" command + */ +static vshCmdInfo info_compdomain[] = { + {"syntax", "_complete-domain"}, + {"help", gettext_noop("print shell completion data for domains")}, + {"desc", gettext_noop("Prints data useful for shell autocompletion of domains.")}, + + {NULL, NULL} +}; + +static vshCmdOptDef opts_compdomain[] = { + {NULL, 0, 0, NULL} +}; + +static int +cmdCompDomain(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) +{ + int *ids = NULL; + char **names = NULL; + int maxname = 0, maxid = 0, i; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + maxid = virConnectNumOfDomains(ctl->conn); + if (maxid < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list active domains")); + return FALSE; + } + if (maxid) { + ids = vshMalloc(ctl, sizeof(int) * maxid); + + if ((maxid = virConnectListDomains(ctl->conn, &ids[0], maxid)) < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list active domains")); + free(ids); + return FALSE; + } + + qsort(&ids[0], maxid, sizeof(int), idsorter); + } + maxname = virConnectNumOfDefinedDomains(ctl->conn); + if (maxname < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list inactive domains")); + free(ids); + return FALSE; + } + if (maxname) { + names = vshMalloc(ctl, sizeof(char *) * maxname); + + if ((maxname = virConnectListDefinedDomains(ctl->conn, names, maxname)) < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list inactive domains")); + free(ids); + free(names); + return FALSE; + } + + qsort(&names[0], maxname, sizeof(char*), namesorter); + } + + for (i = 0; i < maxid; i++) { + char uuid[VIR_UUID_STRING_BUFLEN]; + virDomainPtr dom = virDomainLookupByID(ctl->conn, ids[i]); + /* this kind of work with domains is not atomic operation */ + if (!dom) + continue; + virDomainGetUUIDString(dom, uuid); + vshPrint(ctl, "%d\n%s\n%s\n", + virDomainGetID(dom), + virDomainGetName(dom), + uuid); + virDomainFree(dom); + } + for (i = 0; i < maxname; i++) { + char uuid[VIR_UUID_STRING_BUFLEN]; + virDomainPtr dom = virDomainLookupByName(ctl->conn, names[i]); + + /* this kind of work with domains is not atomic operation */ + if (!dom) { + free(names[i]); + continue; + } + virDomainGetUUIDString(dom, uuid); + vshPrint(ctl, "%s\n%s\n", + virDomainGetName(dom), + uuid); + virDomainFree(dom); + free(names[i]); + } + free(ids); + free(names); + return TRUE; +} + +/* + * "_compnetworks" command + */ +static vshCmdInfo info_compnetwork[] = { + {"syntax", "_complete-network"}, + {"help", gettext_noop("print shell completion data for networks")}, + {"desc", gettext_noop("Prints data useful for shell autocompletion of networks.")}, + + {NULL, NULL} +}; + +static vshCmdOptDef opts_compnetwork[] = { + {NULL, 0, 0, NULL} +}; + +static int +cmdCompNetwork(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) +{ + char **activeNames = NULL, **inactiveNames = NULL; + int maxactive = 0, maxinactive = 0, i; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + maxactive = virConnectNumOfNetworks(ctl->conn); + if (maxactive < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list active networks")); + return FALSE; + } + if (maxactive) { + activeNames = vshMalloc(ctl, sizeof(char *) * maxactive); + + if ((maxactive = virConnectListNetworks(ctl->conn, activeNames, + maxactive)) < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list active networks")); + free(activeNames); + return FALSE; + } + + qsort(&activeNames[0], maxactive, sizeof(char *), namesorter); + } + maxinactive = virConnectNumOfDefinedNetworks(ctl->conn); + if (maxinactive < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list inactive networks")); + free(activeNames); + return FALSE; + } + if (maxinactive) { + inactiveNames = vshMalloc(ctl, sizeof(char *) * maxinactive); + + if ((maxinactive = virConnectListDefinedNetworks(ctl->conn, inactiveNames, maxinactive)) < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list inactive networks")); + free(activeNames); + free(inactiveNames); + return FALSE; + } + + qsort(&inactiveNames[0], maxinactive, sizeof(char*), namesorter); + } + + for (i = 0; i < maxactive; i++) { + char uuid[VIR_UUID_STRING_BUFLEN]; + virNetworkPtr network = virNetworkLookupByName(ctl->conn, activeNames[i]); + + /* this kind of work with networks is not atomic operation */ + if (!network) { + free(activeNames[i]); + continue; + } + virNetworkGetUUIDString(network, uuid); + vshPrint(ctl, "%s\n%s\n", + virNetworkGetName(network), + uuid); + virNetworkFree(network); + free(activeNames[i]); + } + for (i = 0; i < maxinactive; i++) { + char uuid[VIR_UUID_STRING_BUFLEN]; + virNetworkPtr network = virNetworkLookupByName(ctl->conn, inactiveNames[i]); + + /* this kind of work with networks is not atomic operation */ + if (!network) { + free(inactiveNames[i]); + continue; + } + virNetworkGetUUIDString(network, uuid); + vshPrint(ctl, "%s\n%s\n", + virNetworkGetName(network), + uuid); + + virNetworkFree(network); + free(inactiveNames[i]); + } + free(activeNames); + free(inactiveNames); + + return TRUE; +} + + +/* + * "_comppools" command + */ +static vshCmdInfo info_comppool[] = { + {"syntax", "_complete-pool"}, + {"help", gettext_noop("print shell completion data for pools")}, + {"desc", gettext_noop("Prints data useful for shell autocompletion of pools.")}, + + {NULL, NULL} +}; + +static vshCmdOptDef opts_comppool[] = { + {NULL, 0, 0, NULL} +}; + +static int +cmdCompPool(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) +{ + char **activeNames = NULL, **inactiveNames = NULL; + int maxactive = 0, maxinactive = 0, i; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + maxactive = virConnectNumOfStoragePools(ctl->conn); + if (maxactive < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list active pools")); + return FALSE; + } + if (maxactive) { + activeNames = vshMalloc(ctl, sizeof(char *) * maxactive); + + if ((maxactive = virConnectListStoragePools(ctl->conn, activeNames, + maxactive)) < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list active pools")); + free(activeNames); + return FALSE; + } + + qsort(&activeNames[0], maxactive, sizeof(char *), namesorter); + } + maxinactive = virConnectNumOfDefinedStoragePools(ctl->conn); + if (maxinactive < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list inactive pools")); + free(activeNames); + return FALSE; + } + if (maxinactive) { + inactiveNames = vshMalloc(ctl, sizeof(char *) * maxinactive); + + if ((maxinactive = virConnectListDefinedStoragePools(ctl->conn, inactiveNames, maxinactive)) < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list inactive pools")); + free(activeNames); + free(inactiveNames); + return FALSE; + } + + qsort(&inactiveNames[0], maxinactive, sizeof(char*), namesorter); + } + + for (i = 0; i < maxactive; i++) { + char uuid[VIR_UUID_STRING_BUFLEN]; + virStoragePoolPtr pool = virStoragePoolLookupByName(ctl->conn, activeNames[i]); + + /* this kind of work with pools is not atomic operation */ + if (!pool) { + free(activeNames[i]); + continue; + } + virStoragePoolGetUUIDString(pool, uuid); + vshPrint(ctl, "%s\n%s\n", + virStoragePoolGetName(pool), + uuid); + virStoragePoolFree(pool); + free(activeNames[i]); + } + for (i = 0; i < maxinactive; i++) { + char uuid[VIR_UUID_STRING_BUFLEN]; + virStoragePoolPtr pool = virStoragePoolLookupByName(ctl->conn, inactiveNames[i]); + + /* this kind of work with pools is not atomic operation */ + if (!pool) { + free(inactiveNames[i]); + continue; + } + virStoragePoolGetUUIDString(pool, uuid); + vshPrint(ctl, "%s\n%s\n", + virStoragePoolGetName(pool), + uuid); + + virStoragePoolFree(pool); + free(inactiveNames[i]); + } + free(activeNames); + free(inactiveNames); + + return TRUE; +} + + /* * "help" command */ @@ -355,8 +758,9 @@ vshPrint(ctl, "%s", _("Commands:\n\n")); for (def = commands; def->name; def++) - vshPrint(ctl, " %-15s %s\n", def->name, - N_(vshCmddefGetInfo(def, "help"))); + if (def->name[0] != '_') + vshPrint(ctl, " %-15s %s\n", def->name, + N_(vshCmddefGetInfo(def, "help"))); return TRUE; } return vshCmddefHelp(ctl, cmdname, FALSE); @@ -426,7 +830,7 @@ }; static vshCmdOptDef opts_connect[] = { - {"name", VSH_OT_DATA, 0, gettext_noop("hypervisor connection URI")}, + {"uri", VSH_OT_DATA, 0, gettext_noop("hypervisor connection URI")}, {"readonly", VSH_OT_BOOL, 0, gettext_noop("read-only connection")}, {NULL, 0, 0, NULL} }; @@ -446,7 +850,7 @@ } free(ctl->name); - ctl->name = vshStrdup(ctl, vshCommandOptString(cmd, "name", NULL)); + ctl->name = vshStrdup(ctl, vshCommandOptString(cmd, "uri", NULL)); if (!ro) { ctl->conn = virConnectOpen(ctl->name); @@ -1004,7 +1408,7 @@ }; static vshCmdOptDef opts_start[] = { - {"name", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive domain")}, + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive domain")}, {NULL, 0, 0, NULL} }; @@ -1017,7 +1421,7 @@ if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomainBy(ctl, cmd, "name", NULL, VSH_BYNAME))) + if (!(dom = vshCommandOptDomainBy(ctl, cmd, "domain", NULL, VSH_BYNAME))) return FALSE; if (virDomainGetID(dom) != (unsigned int)-1) { @@ -2650,7 +3054,7 @@ }; static vshCmdOptDef opts_network_start[] = { - {"name", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive network")}, + {"network", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive network")}, {NULL, 0, 0, NULL} }; @@ -2663,7 +3067,7 @@ if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(network = vshCommandOptNetworkBy(ctl, cmd, "name", NULL, VSH_BYNAME))) + if (!(network = vshCommandOptNetworkBy(ctl, cmd, "network", NULL, VSH_BYNAME))) return FALSE; if (virNetworkCreate(network) == 0) { @@ -3554,7 +3958,7 @@ }; static vshCmdOptDef opts_pool_start[] = { - {"name", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive pool")}, + {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive pool")}, {NULL, 0, 0, NULL} }; @@ -3567,7 +3971,7 @@ if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(pool = vshCommandOptPoolBy(ctl, cmd, "name", NULL, VSH_BYNAME))) + if (!(pool = vshCommandOptPoolBy(ctl, cmd, "pool", NULL, VSH_BYNAME))) return FALSE; if (virStoragePoolCreate(pool, 0) == 0) { @@ -5074,6 +5478,12 @@ * Commands */ static vshCmdDef commands[] = { + {"_complete-command", cmdCompCommand, opts_compcommand, info_compcommand}, + {"_complete-uri", cmdCompUri, opts_compuri, info_compuri}, + {"_complete-domain", cmdCompDomain, opts_compdomain, info_compdomain}, + {"_complete-network", cmdCompNetwork, opts_compnetwork, info_compnetwork}, + {"_complete-pool", cmdCompPool, opts_comppool, info_comppool}, + {"help", cmdHelp, opts_help, info_help}, {"attach-device", cmdAttachDevice, opts_attach_device, info_attach_device}, {"attach-disk", cmdAttachDisk, opts_attach_disk, info_attach_disk}, @@ -6514,6 +6924,18 @@ ret = vshCommandParse(ctl, cmdstr); free(cmdstr); + + /* Special case 'help' to avoid virConnectOpen */ + if (ctl->cmd && + ctl->cmd->def && + ctl->cmd->def->name && + (STREQ(ctl->cmd->def->name, "help") || + STREQ(ctl->cmd->def->name, "_complete-command") || + STREQ(ctl->cmd->def->name, "_complete-uri"))) { + ret = vshCommandRun(ctl, ctl->cmd); + exit(ret ? EXIT_SUCCESS : EXIT_FAILURE); + } + return ret; } return TRUE; -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 4

[libvirt] [PATCH] cleanup functions which exec OpenVZ tools
by Evgeniy Sokolov 16 Jul '08

16 Jul '08

Patch improve code which execute external OpenVZ tools.

3 3