- Devel - libvirt List Archives

[libvirt] Bridged network (shared physical device) and libvirt
by Henrik Persson E 08 Dec '08

08 Dec '08

Hi, Are there any plans to include possibility to configure bridged networks in libvirt? I see the need to be able to actually be able create vlans on physical devices and the bridge the vlan, which I guess is a very normal case for isolating network traffic between different guests. I would be great if it would be possible to both create vlans on physical devices and then also create bridged network connected to any available network (physical/bonded/vlan) /Henrik

4 3

[libvirt] [PATCH 3/4] virsh.c: remove all "syntax" vshCmdInfo entries.
by Jim Meyering 08 Dec '08

08 Dec '08

* src/virsh.c: ... now that it's generated. --- FYI, I made this change with the following one-liner: perl -ni -e '/"syntax",/ or print' src/virsh.c src/virsh.c | 89 ----------------------------------------------------------- 1 files changed, 0 insertions(+), 89 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index d96a7d4..230a128 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -335,7 +335,6 @@ static int namesorter(const void *a, const void *b) { * "help" command */ static const vshCmdInfo info_help[] = { - {"syntax", "help [<command>]"}, {"help", gettext_noop("print help")}, {"desc", gettext_noop("Prints global help or command specific help.")}, @@ -368,7 +367,6 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd) * "autostart" command */ static const vshCmdInfo info_autostart[] = { - {"syntax", "autostart [--disable] <domain>"}, {"help", gettext_noop("autostart a domain")}, {"desc", gettext_noop("Configure a domain to be automatically started at boot.")}, @@ -420,7 +418,6 @@ cmdAutostart(vshControl *ctl, const vshCmd *cmd) * "connect" command */ static const vshCmdInfo info_connect[] = { - {"syntax", "connect [name] [--readonly]"}, {"help", gettext_noop("(re)connect to hypervisor")}, {"desc", gettext_noop("Connect to local hypervisor. This is built-in command after shell start up.")}, @@ -468,7 +465,6 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) * "console" command */ static const vshCmdInfo info_console[] = { - {"syntax", "console <domain>"}, {"help", gettext_noop("connect to the guest console")}, {"desc", gettext_noop("Connect the virtual serial console for the guest")}, @@ -545,7 +541,6 @@ cmdConsole(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "list" command */ static const vshCmdInfo info_list[] = { - {"syntax", "list [--inactive | --all]"}, {"help", gettext_noop("list domains")}, {"desc", gettext_noop("Returns list of domains.")}, {NULL, NULL} @@ -663,7 +658,6 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "domstate" command */ static const vshCmdInfo info_domstate[] = { - {"syntax", "domstate <domain>"}, {"help", gettext_noop("domain state")}, {"desc", gettext_noop("Returns state about a domain.")}, {NULL, NULL} @@ -700,7 +694,6 @@ cmdDomstate(vshControl *ctl, const vshCmd *cmd) /* "domblkstat" command */ static const vshCmdInfo info_domblkstat[] = { - {"syntax", "domblkstat <domain> <dev>"}, {"help", gettext_noop("get device block stats for a domain")}, {"desc", gettext_noop("Get device block stats for a running domain.")}, {NULL,NULL} @@ -757,7 +750,6 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) /* "domifstat" command */ static const vshCmdInfo info_domifstat[] = { - {"syntax", "domifstat <domain> <dev>"}, {"help", gettext_noop("get network interface stats for a domain")}, {"desc", gettext_noop("Get network interface stats for a running domain.")}, {NULL,NULL} @@ -824,7 +816,6 @@ cmdDomIfstat (vshControl *ctl, const vshCmd *cmd) * "suspend" command */ static const vshCmdInfo info_suspend[] = { - {"syntax", "suspend <domain>"}, {"help", gettext_noop("suspend a domain")}, {"desc", gettext_noop("Suspend a running domain.")}, {NULL, NULL} @@ -863,7 +854,6 @@ cmdSuspend(vshControl *ctl, const vshCmd *cmd) * "create" command */ static const vshCmdInfo info_create[] = { - {"syntax", "create a domain from an XML <file>"}, {"help", gettext_noop("create a domain from an XML file")}, {"desc", gettext_noop("Create a domain.")}, {NULL, NULL} @@ -911,7 +901,6 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd) * "define" command */ static const vshCmdInfo info_define[] = { - {"syntax", "define a domain from an XML <file>"}, {"help", gettext_noop("define (but don't start) a domain from an XML file")}, {"desc", gettext_noop("Define a domain.")}, {NULL, NULL} @@ -959,7 +948,6 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) * "undefine" command */ static const vshCmdInfo info_undefine[] = { - {"syntax", "undefine <domain>"}, {"help", gettext_noop("undefine an inactive domain")}, {"desc", gettext_noop("Undefine the configuration for an inactive domain.")}, {NULL, NULL} @@ -1014,7 +1002,6 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) * "start" command */ static const vshCmdInfo info_start[] = { - {"syntax", "start <domain>"}, {"help", gettext_noop("start a (previously defined) inactive domain")}, {"desc", gettext_noop("Start a domain.")}, {NULL, NULL} @@ -1059,7 +1046,6 @@ cmdStart(vshControl *ctl, const vshCmd *cmd) * "save" command */ static const vshCmdInfo info_save[] = { - {"syntax", "save <domain> <file>"}, {"help", gettext_noop("save a domain state to a file")}, {"desc", gettext_noop("Save a running domain.")}, {NULL, NULL} @@ -1103,7 +1089,6 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) * "schedinfo" command */ static const vshCmdInfo info_schedinfo[] = { - {"syntax", "schedinfo <domain>"}, {"help", gettext_noop("show/set scheduler parameters")}, {"desc", gettext_noop("Show/Set scheduler parameters.")}, {NULL, NULL} @@ -1286,7 +1271,6 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) * "restore" command */ static const vshCmdInfo info_restore[] = { - {"syntax", "restore a domain from <file>"}, {"help", gettext_noop("restore a domain from a saved state in a file")}, {"desc", gettext_noop("Restore a domain.")}, {NULL, NULL} @@ -1324,7 +1308,6 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd) * "dump" command */ static const vshCmdInfo info_dump[] = { - {"syntax", "dump <domain> <file>"}, {"help", gettext_noop("dump the core of a domain to a file for analysis")}, {"desc", gettext_noop("Core dump a domain.")}, {NULL, NULL} @@ -1369,7 +1352,6 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) * "resume" command */ static const vshCmdInfo info_resume[] = { - {"syntax", "resume <domain>"}, {"help", gettext_noop("resume a domain")}, {"desc", gettext_noop("Resume a previously suspended domain.")}, {NULL, NULL} @@ -1408,7 +1390,6 @@ cmdResume(vshControl *ctl, const vshCmd *cmd) * "shutdown" command */ static const vshCmdInfo info_shutdown[] = { - {"syntax", "shutdown <domain>"}, {"help", gettext_noop("gracefully shutdown a domain")}, {"desc", gettext_noop("Run shutdown in the target domain.")}, {NULL, NULL} @@ -1447,7 +1428,6 @@ cmdShutdown(vshControl *ctl, const vshCmd *cmd) * "reboot" command */ static const vshCmdInfo info_reboot[] = { - {"syntax", "reboot <domain>"}, {"help", gettext_noop("reboot a domain")}, {"desc", gettext_noop("Run a reboot command in the target domain.")}, {NULL, NULL} @@ -1486,7 +1466,6 @@ cmdReboot(vshControl *ctl, const vshCmd *cmd) * "destroy" command */ static const vshCmdInfo info_destroy[] = { - {"syntax", "destroy <domain>"}, {"help", gettext_noop("destroy a domain")}, {"desc", gettext_noop("Destroy a given domain.")}, {NULL, NULL} @@ -1525,7 +1504,6 @@ cmdDestroy(vshControl *ctl, const vshCmd *cmd) * "dominfo" command */ static const vshCmdInfo info_dominfo[] = { - {"syntax", "dominfo <domain>"}, {"help", gettext_noop("domain information")}, {"desc", gettext_noop("Returns basic information about the domain.")}, {NULL, NULL} @@ -1607,7 +1585,6 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) * "freecell" command */ static const vshCmdInfo info_freecell[] = { - {"syntax", "freecell [<cellno>]"}, {"help", gettext_noop("NUMA free memory")}, {"desc", gettext_noop("display available free memory for the NUMA cell.")}, {NULL, NULL} @@ -1649,7 +1626,6 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd) * "vcpuinfo" command */ static const vshCmdInfo info_vcpuinfo[] = { - {"syntax", "vcpuinfo <domain>"}, {"help", gettext_noop("domain vcpu information")}, {"desc", gettext_noop("Returns basic information about the domain virtual CPUs.")}, {NULL, NULL} @@ -1736,7 +1712,6 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd) * "vcpupin" command */ static const vshCmdInfo info_vcpupin[] = { - {"syntax", "vcpupin <domain> <vcpu> <cpulist>"}, {"help", gettext_noop("control domain vcpu affinity")}, {"desc", gettext_noop("Pin domain VCPUs to host physical CPUs.")}, {NULL, NULL} @@ -1870,7 +1845,6 @@ cmdVcpupin(vshControl *ctl, const vshCmd *cmd) * "setvcpus" command */ static const vshCmdInfo info_setvcpus[] = { - {"syntax", "setvcpus <domain> <count>"}, {"help", gettext_noop("change number of virtual CPUs")}, {"desc", gettext_noop("Change the number of virtual CPUs in the guest domain.")}, {NULL, NULL} @@ -1927,7 +1901,6 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) * "setmemory" command */ static const vshCmdInfo info_setmem[] = { - {"syntax", "setmem <domain> <kilobytes>"}, {"help", gettext_noop("change memory allocation")}, {"desc", gettext_noop("Change the current memory allocation in the guest domain.")}, {NULL, NULL} @@ -1984,7 +1957,6 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) * "setmaxmem" command */ static const vshCmdInfo info_setmaxmem[] = { - {"syntax", "setmaxmem <domain> <kilobytes>"}, {"help", gettext_noop("change maximum memory limit")}, {"desc", gettext_noop("Change the maximum memory allocation limit in the guest domain.")}, {NULL, NULL} @@ -2044,7 +2016,6 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) * "nodeinfo" command */ static const vshCmdInfo info_nodeinfo[] = { - {"syntax", "nodeinfo"}, {"help", gettext_noop("node information")}, {"desc", gettext_noop("Returns basic information about the node.")}, {NULL, NULL} @@ -2078,7 +2049,6 @@ cmdNodeinfo(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "capabilities" command */ static const vshCmdInfo info_capabilities[] = { - {"syntax", "capabilities"}, {"help", gettext_noop("capabilities")}, {"desc", gettext_noop("Returns capabilities of hypervisor/driver.")}, {NULL, NULL} @@ -2106,7 +2076,6 @@ cmdCapabilities (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "dumpxml" command */ static const vshCmdInfo info_dumpxml[] = { - {"syntax", "dumpxml <domain>"}, {"help", gettext_noop("domain information in XML")}, {"desc", gettext_noop("Output the domain information as an XML dump to stdout.")}, {NULL, NULL} @@ -2146,7 +2115,6 @@ cmdDumpXML(vshControl *ctl, const vshCmd *cmd) * "domname" command */ static const vshCmdInfo info_domname[] = { - {"syntax", "domname <domain>"}, {"help", gettext_noop("convert a domain id or UUID to domain name")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -2177,7 +2145,6 @@ cmdDomname(vshControl *ctl, const vshCmd *cmd) * "domid" command */ static const vshCmdInfo info_domid[] = { - {"syntax", "domid <domain>"}, {"help", gettext_noop("convert a domain name or UUID to domain id")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -2213,7 +2180,6 @@ cmdDomid(vshControl *ctl, const vshCmd *cmd) * "domuuid" command */ static const vshCmdInfo info_domuuid[] = { - {"syntax", "domuuid <domain>"}, {"help", gettext_noop("convert a domain name or id to domain UUID")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -2249,7 +2215,6 @@ cmdDomuuid(vshControl *ctl, const vshCmd *cmd) * "migrate" command */ static const vshCmdInfo info_migrate[] = { - {"syntax", "migrate [--live] <domain> <desturi> [<migrateuri>]"}, {"help", gettext_noop("migrate domain to another host")}, {"desc", gettext_noop("Migrate domain to another host. Add --live for live migration.")}, {NULL, NULL} @@ -2317,7 +2282,6 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) * "net-autostart" command */ static const vshCmdInfo info_network_autostart[] = { - {"syntax", "net-autostart [--disable] <network>"}, {"help", gettext_noop("autostart a network")}, {"desc", gettext_noop("Configure a network to be automatically started at boot.")}, @@ -2368,7 +2332,6 @@ cmdNetworkAutostart(vshControl *ctl, const vshCmd *cmd) * "net-create" command */ static const vshCmdInfo info_network_create[] = { - {"syntax", "net-create <file>"}, {"help", gettext_noop("create a network from an XML file")}, {"desc", gettext_noop("Create a network.")}, {NULL, NULL} @@ -2416,7 +2379,6 @@ cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd) * "net-define" command */ static const vshCmdInfo info_network_define[] = { - {"syntax", "net-define <file>"}, {"help", gettext_noop("define (but don't start) a network from an XML file")}, {"desc", gettext_noop("Define a network.")}, {NULL, NULL} @@ -2464,7 +2426,6 @@ cmdNetworkDefine(vshControl *ctl, const vshCmd *cmd) * "net-destroy" command */ static const vshCmdInfo info_network_destroy[] = { - {"syntax", "net-destroy <network>"}, {"help", gettext_noop("destroy a network")}, {"desc", gettext_noop("Destroy a given network.")}, {NULL, NULL} @@ -2504,7 +2465,6 @@ cmdNetworkDestroy(vshControl *ctl, const vshCmd *cmd) * "net-dumpxml" command */ static const vshCmdInfo info_network_dumpxml[] = { - {"syntax", "net-dumpxml <network>"}, {"help", gettext_noop("network information in XML")}, {"desc", gettext_noop("Output the network information as an XML dump to stdout.")}, {NULL, NULL} @@ -2545,7 +2505,6 @@ cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd) * "net-list" command */ static const vshCmdInfo info_network_list[] = { - {"syntax", "net-list [ --inactive | --all ]"}, {"help", gettext_noop("list networks")}, {"desc", gettext_noop("Returns list of networks.")}, {NULL, NULL} @@ -2669,7 +2628,6 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "net-name" command */ static const vshCmdInfo info_network_name[] = { - {"syntax", "net-name <network>"}, {"help", gettext_noop("convert a network UUID to network name")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -2701,7 +2659,6 @@ cmdNetworkName(vshControl *ctl, const vshCmd *cmd) * "net-start" command */ static const vshCmdInfo info_network_start[] = { - {"syntax", "net-start <network>"}, {"help", gettext_noop("start a (previously defined) inactive network")}, {"desc", gettext_noop("Start a network.")}, {NULL, NULL} @@ -2740,7 +2697,6 @@ cmdNetworkStart(vshControl *ctl, const vshCmd *cmd) * "net-undefine" command */ static const vshCmdInfo info_network_undefine[] = { - {"syntax", "net-undefine <network>"}, {"help", gettext_noop("undefine an inactive network")}, {"desc", gettext_noop("Undefine the configuration for an inactive network.")}, {NULL, NULL} @@ -2779,7 +2735,6 @@ cmdNetworkUndefine(vshControl *ctl, const vshCmd *cmd) * "net-uuid" command */ static const vshCmdInfo info_network_uuid[] = { - {"syntax", "net-uuid <network>"}, {"help", gettext_noop("convert a network name to network UUID")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -2816,7 +2771,6 @@ cmdNetworkUuid(vshControl *ctl, const vshCmd *cmd) * "pool-autostart" command */ static const vshCmdInfo info_pool_autostart[] = { - {"syntax", "pool-autostart [--disable] <pool>"}, {"help", gettext_noop("autostart a pool")}, {"desc", gettext_noop("Configure a pool to be automatically started at boot.")}, @@ -2867,7 +2821,6 @@ cmdPoolAutostart(vshControl *ctl, const vshCmd *cmd) * "pool-create" command */ static const vshCmdInfo info_pool_create[] = { - {"syntax", "pool-create <file>"}, {"help", gettext_noop("create a pool from an XML file")}, {"desc", gettext_noop("Create a pool.")}, {NULL, NULL} @@ -2915,7 +2868,6 @@ cmdPoolCreate(vshControl *ctl, const vshCmd *cmd) * "pool-create-as" command */ static const vshCmdInfo info_pool_create_as[] = { - {"syntax", "pool-create-as <name> <type>"}, {"help", gettext_noop("create a pool from a set of args")}, {"desc", gettext_noop("Create a pool.")}, {NULL, NULL} @@ -3006,7 +2958,6 @@ cmdPoolCreateAs(vshControl *ctl, const vshCmd *cmd) * "pool-define" command */ static const vshCmdInfo info_pool_define[] = { - {"syntax", "pool-define <file>"}, {"help", gettext_noop("define (but don't start) a pool from an XML file")}, {"desc", gettext_noop("Define a pool.")}, {NULL, NULL} @@ -3054,7 +3005,6 @@ cmdPoolDefine(vshControl *ctl, const vshCmd *cmd) * "pool-define-as" command */ static const vshCmdInfo info_pool_define_as[] = { - {"syntax", "pool-define-as <name> <type>"}, {"help", gettext_noop("define a pool from a set of args")}, {"desc", gettext_noop("Define a pool.")}, {NULL, NULL} @@ -3148,7 +3098,6 @@ cmdPoolDefineAs(vshControl *ctl, const vshCmd *cmd) * "pool-build" command */ static const vshCmdInfo info_pool_build[] = { - {"syntax", "pool-build <pool>"}, {"help", gettext_noop("build a pool")}, {"desc", gettext_noop("Build a given pool.")}, {NULL, NULL} @@ -3188,7 +3137,6 @@ cmdPoolBuild(vshControl *ctl, const vshCmd *cmd) * "pool-destroy" command */ static const vshCmdInfo info_pool_destroy[] = { - {"syntax", "pool-destroy <pool>"}, {"help", gettext_noop("destroy a pool")}, {"desc", gettext_noop("Destroy a given pool.")}, {NULL, NULL} @@ -3228,7 +3176,6 @@ cmdPoolDestroy(vshControl *ctl, const vshCmd *cmd) * "pool-delete" command */ static const vshCmdInfo info_pool_delete[] = { - {"syntax", "pool-delete <pool>"}, {"help", gettext_noop("delete a pool")}, {"desc", gettext_noop("Delete a given pool.")}, {NULL, NULL} @@ -3268,7 +3215,6 @@ cmdPoolDelete(vshControl *ctl, const vshCmd *cmd) * "pool-refresh" command */ static const vshCmdInfo info_pool_refresh[] = { - {"syntax", "pool-refresh <pool>"}, {"help", gettext_noop("refresh a pool")}, {"desc", gettext_noop("Refresh a given pool.")}, {NULL, NULL} @@ -3308,7 +3254,6 @@ cmdPoolRefresh(vshControl *ctl, const vshCmd *cmd) * "pool-dumpxml" command */ static const vshCmdInfo info_pool_dumpxml[] = { - {"syntax", "pool-dumpxml <pool>"}, {"help", gettext_noop("pool information in XML")}, {"desc", gettext_noop("Output the pool information as an XML dump to stdout.")}, {NULL, NULL} @@ -3349,7 +3294,6 @@ cmdPoolDumpXML(vshControl *ctl, const vshCmd *cmd) * "pool-list" command */ static const vshCmdInfo info_pool_list[] = { - {"syntax", "pool-list [ --inactive | --all ]"}, {"help", gettext_noop("list pools")}, {"desc", gettext_noop("Returns list of pools.")}, {NULL, NULL} @@ -3472,7 +3416,6 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "find-storage-pool-sources-as" command */ static const vshCmdInfo info_find_storage_pool_sources_as[] = { - {"syntax", "find-storage-pool-sources-as <type> [options]"}, {"help", gettext_noop("find potential storage pool sources")}, {"desc", gettext_noop("Returns XML <sources> document.")}, {NULL, NULL} @@ -3553,7 +3496,6 @@ cmdPoolDiscoverSourcesAs(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UNUSED) * "find-storage-pool-sources" command */ static const vshCmdInfo info_find_storage_pool_sources[] = { - {"syntax", "find-storage-pool-sources <type> [srcSpec]"}, {"help", gettext_noop("discover potential storage pool sources")}, {"desc", gettext_noop("Returns XML <sources> document.")}, {NULL, NULL} @@ -3626,7 +3568,6 @@ prettyCapacity(unsigned long long val, * "pool-info" command */ static const vshCmdInfo info_pool_info[] = { - {"syntax", "pool-info <pool>"}, {"help", gettext_noop("storage pool information")}, {"desc", gettext_noop("Returns basic information about the storage pool.")}, {NULL, NULL} @@ -3702,7 +3643,6 @@ cmdPoolInfo(vshControl *ctl, const vshCmd *cmd) * "pool-name" command */ static const vshCmdInfo info_pool_name[] = { - {"syntax", "pool-name <pool>"}, {"help", gettext_noop("convert a pool UUID to pool name")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -3734,7 +3674,6 @@ cmdPoolName(vshControl *ctl, const vshCmd *cmd) * "pool-start" command */ static const vshCmdInfo info_pool_start[] = { - {"syntax", "pool-start <pool>"}, {"help", gettext_noop("start a (previously defined) inactive pool")}, {"desc", gettext_noop("Start a pool.")}, {NULL, NULL} @@ -3773,7 +3712,6 @@ cmdPoolStart(vshControl *ctl, const vshCmd *cmd) * "vol-create-as" command */ static const vshCmdInfo info_vol_create_as[] = { - {"syntax", "vol-create-as <pool> <name> <capacity>"}, {"help", gettext_noop("create a volume from a set of args")}, {"desc", gettext_noop("Create a vol.")}, {NULL, NULL} @@ -3895,7 +3833,6 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) * "pool-undefine" command */ static const vshCmdInfo info_pool_undefine[] = { - {"syntax", "pool-undefine <pool>"}, {"help", gettext_noop("undefine an inactive pool")}, {"desc", gettext_noop("Undefine the configuration for an inactive pool.")}, {NULL, NULL} @@ -3934,7 +3871,6 @@ cmdPoolUndefine(vshControl *ctl, const vshCmd *cmd) * "pool-uuid" command */ static const vshCmdInfo info_pool_uuid[] = { - {"syntax", "pool-uuid <pool>"}, {"help", gettext_noop("convert a pool name to pool UUID")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -3973,7 +3909,6 @@ cmdPoolUuid(vshControl *ctl, const vshCmd *cmd) * "vol-create" command */ static const vshCmdInfo info_vol_create[] = { - {"syntax", "vol-create <file>"}, {"help", gettext_noop("create a vol from an XML file")}, {"desc", gettext_noop("Create a vol.")}, {NULL, NULL} @@ -4032,7 +3967,6 @@ cmdVolCreate(vshControl *ctl, const vshCmd *cmd) * "vol-delete" command */ static const vshCmdInfo info_vol_delete[] = { - {"syntax", "vol-delete <vol>"}, {"help", gettext_noop("delete a vol")}, {"desc", gettext_noop("Delete a given vol.")}, {NULL, NULL} @@ -4074,7 +4008,6 @@ cmdVolDelete(vshControl *ctl, const vshCmd *cmd) * "vol-info" command */ static const vshCmdInfo info_vol_info[] = { - {"syntax", "vol-info <vol>"}, {"help", gettext_noop("storage vol information")}, {"desc", gettext_noop("Returns basic information about the storage vol.")}, {NULL, NULL} @@ -4126,7 +4059,6 @@ cmdVolInfo(vshControl *ctl, const vshCmd *cmd) * "vol-dumpxml" command */ static const vshCmdInfo info_vol_dumpxml[] = { - {"syntax", "vol-dumpxml <vol>"}, {"help", gettext_noop("vol information in XML")}, {"desc", gettext_noop("Output the vol information as an XML dump to stdout.")}, {NULL, NULL} @@ -4168,7 +4100,6 @@ cmdVolDumpXML(vshControl *ctl, const vshCmd *cmd) * "vol-list" command */ static const vshCmdInfo info_vol_list[] = { - {"syntax", "vol-list <pool>"}, {"help", gettext_noop("list vols")}, {"desc", gettext_noop("Returns list of vols by pool.")}, {NULL, NULL} @@ -4247,7 +4178,6 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "vol-name" command */ static const vshCmdInfo info_vol_name[] = { - {"syntax", "vol-name <vol>"}, {"help", gettext_noop("convert a vol UUID to vol name")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -4281,7 +4211,6 @@ cmdVolName(vshControl *ctl, const vshCmd *cmd) * "vol-key" command */ static const vshCmdInfo info_vol_key[] = { - {"syntax", "vol-key <vol>"}, {"help", gettext_noop("convert a vol UUID to vol key")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -4315,7 +4244,6 @@ cmdVolKey(vshControl *ctl, const vshCmd *cmd) * "vol-path" command */ static const vshCmdInfo info_vol_path[] = { - {"syntax", "vol-path <pool> <vol>"}, {"help", gettext_noop("convert a vol UUID to vol path")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -4353,7 +4281,6 @@ cmdVolPath(vshControl *ctl, const vshCmd *cmd) * "version" command */ static const vshCmdInfo info_version[] = { - {"syntax", "version"}, {"help", gettext_noop("show version")}, {"desc", gettext_noop("Display the system version information.")}, {NULL, NULL} @@ -4433,7 +4360,6 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "nodedev-list" command */ static const vshCmdInfo info_node_list_devices[] = { - {"syntax", "nodedev-list [--cap <capability>]"}, {"help", gettext_noop("enumerate devices on this host")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -4487,7 +4413,6 @@ cmdNodeListDevices (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "nodedev-dumpxml" command */ static const vshCmdInfo info_node_device_dumpxml[] = { - {"syntax", "nodedev-dumpxml <device>"}, {"help", gettext_noop("node device details in XML")}, {"desc", gettext_noop("Output the node device details as an XML dump to stdout.")}, {NULL, NULL} @@ -4523,7 +4448,6 @@ cmdNodeDeviceDumpXML (vshControl *ctl, const vshCmd *cmd) * "hostkey" command */ static const vshCmdInfo info_hostname[] = { - {"syntax", "hostname"}, {"help", gettext_noop("print the hypervisor hostname")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -4553,7 +4477,6 @@ cmdHostname (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "uri" command */ static const vshCmdInfo info_uri[] = { - {"syntax", "uri"}, {"help", gettext_noop("print the hypervisor canonical URI")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -4583,7 +4506,6 @@ cmdURI (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "vncdisplay" command */ static const vshCmdInfo info_vncdisplay[] = { - {"syntax", "vncdisplay <domain>"}, {"help", gettext_noop("vnc display")}, {"desc", gettext_noop("Output the IP address and port number for the VNC display.")}, {NULL, NULL} @@ -4659,7 +4581,6 @@ cmdVNCDisplay(vshControl *ctl, const vshCmd *cmd) * "ttyconsole" command */ static const vshCmdInfo info_ttyconsole[] = { - {"syntax", "ttyconsole <domain>"}, {"help", gettext_noop("tty console")}, {"desc", gettext_noop("Output the device for the TTY console.")}, {NULL, NULL} @@ -4720,7 +4641,6 @@ cmdTTYConsole(vshControl *ctl, const vshCmd *cmd) * "attach-device" command */ static const vshCmdInfo info_attach_device[] = { - {"syntax", "attach-device <domain> <file> "}, {"help", gettext_noop("attach device from an XML file")}, {"desc", gettext_noop("Attach device from an XML <file>.")}, {NULL, NULL} @@ -4779,7 +4699,6 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) * "detach-device" command */ static const vshCmdInfo info_detach_device[] = { - {"syntax", "detach-device <domain> <file> "}, {"help", gettext_noop("detach device from an XML file")}, {"desc", gettext_noop("Detach device from an XML <file>")}, {NULL, NULL} @@ -4838,7 +4757,6 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) * "attach-interface" command */ static const vshCmdInfo info_attach_interface[] = { - {"syntax", "attach-interface <domain> <type> <source> [--target <target>] [--mac <mac>] [--script <script>] "}, {"help", gettext_noop("attach network interface")}, {"desc", gettext_noop("Attach new network interface.")}, {NULL, NULL} @@ -4955,7 +4873,6 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) * "detach-interface" command */ static const vshCmdInfo info_detach_interface[] = { - {"syntax", "detach-interface <domain> <type> [--mac <mac>] "}, {"help", gettext_noop("detach network interface")}, {"desc", gettext_noop("Detach network interface.")}, {NULL, NULL} @@ -5076,7 +4993,6 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) * "attach-disk" command */ static const vshCmdInfo info_attach_disk[] = { - {"syntax", "attach-disk <domain> <source> <target> [--driver <driver>] [--subdriver <subdriver>] [--type <type>] [--mode <mode>] "}, {"help", gettext_noop("attach disk device")}, {"desc", gettext_noop("Attach new disk device.")}, {NULL, NULL} @@ -5241,7 +5157,6 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) * "detach-disk" command */ static const vshCmdInfo info_detach_disk[] = { - {"syntax", "detach-disk <domain> <target> "}, {"help", gettext_noop("detach disk device")}, {"desc", gettext_noop("Detach disk device.")}, {NULL, NULL} @@ -5472,7 +5387,6 @@ editReadBackFile (vshControl *ctl, const char *filename) * "edit" command */ static const vshCmdInfo info_edit[] = { - {"syntax", "edit <domain>"}, {"help", gettext_noop("edit XML configuration for a domain")}, {"desc", gettext_noop("Edit the XML configuration for a domain.")}, {NULL, NULL} @@ -5575,7 +5489,6 @@ cmdEdit (vshControl *ctl, const vshCmd *cmd) * "net-edit" command */ static const vshCmdInfo info_network_edit[] = { - {"syntax", "net-edit <network>"}, {"help", gettext_noop("edit XML configuration for a network")}, {"desc", gettext_noop("Edit the XML configuration for a network.")}, {NULL, NULL} @@ -5593,7 +5506,6 @@ static const vshCmdOptDef opts_network_edit[] = { * "pool-edit" command */ static const vshCmdInfo info_pool_edit[] = { - {"syntax", "pool-edit <domain>"}, {"help", gettext_noop("edit XML configuration for a storage pool")}, {"desc", gettext_noop("Edit the XML configuration for a storage pool.")}, {NULL, NULL} @@ -5611,7 +5523,6 @@ static const vshCmdOptDef opts_pool_edit[] = { * "quit" command */ static const vshCmdInfo info_quit[] = { - {"syntax", "quit"}, {"help", gettext_noop("quit this interactive terminal")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} -- 1.6.0.4.1101.g642f8

3 2

[libvirt] [PATCH 4/4] virsh.c: tweak options to produce more accurate help
by Jim Meyering 08 Dec '08

08 Dec '08

* src/virsh.c: Adjust some vshCmdOptDef command option flags to improve auto-generated help command syntax. --- src/virsh.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index 230a128..bb81f25 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -1008,7 +1008,7 @@ static const vshCmdInfo info_start[] = { }; static const 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} }; @@ -3680,7 +3680,7 @@ static const vshCmdInfo info_pool_start[] = { }; static const 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} }; @@ -3721,8 +3721,8 @@ static const vshCmdOptDef opts_vol_create_as[] = { {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("pool name")}, {"name", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the volume")}, {"capacity", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("size of the vol with optional k,M,G,T suffix")}, - {"allocation", VSH_OT_DATA, 0, gettext_noop("initial allocation size with optional k,M,G,T suffix")}, - {"format", VSH_OT_DATA, 0, gettext_noop("file format type raw,bochs,qcow,qcow2,vmdk")}, + {"allocation", VSH_OT_STRING, 0, gettext_noop("initial allocation size with optional k,M,G,T suffix")}, + {"format", VSH_OT_STRING, 0, gettext_noop("file format type raw,bochs,qcow,qcow2,vmdk")}, {NULL, 0, 0, NULL} }; @@ -4881,7 +4881,7 @@ static const vshCmdInfo info_detach_interface[] = { static const vshCmdOptDef opts_detach_interface[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")}, {"type", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("network interface type")}, - {"mac", VSH_OT_DATA, 0, gettext_noop("MAC address")}, + {"mac", VSH_OT_STRING, 0, gettext_noop("MAC address")}, {NULL, 0, 0, NULL} }; @@ -5002,10 +5002,10 @@ static const vshCmdOptDef opts_attach_disk[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")}, {"source", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("source of disk device")}, {"target", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("target of disk device")}, - {"driver", VSH_OT_DATA, 0, gettext_noop("driver of disk device")}, - {"subdriver", VSH_OT_DATA, 0, gettext_noop("subdriver of disk device")}, - {"type", VSH_OT_DATA, 0, gettext_noop("target device type")}, - {"mode", VSH_OT_DATA, 0, gettext_noop("mode of device reading and writing")}, + {"driver", VSH_OT_STRING, 0, gettext_noop("driver of disk device")}, + {"subdriver", VSH_OT_STRING, 0, gettext_noop("subdriver of disk device")}, + {"type", VSH_OT_STRING, 0, gettext_noop("target device type")}, + {"mode", VSH_OT_STRING, 0, gettext_noop("mode of device reading and writing")}, {NULL, 0, 0, NULL} }; -- 1.6.0.4.1101.g642f8

2 1

[libvirt] [PATCH 2/4] virsh.c: add missing (yet empty) "desc" strings
by Jim Meyering 08 Dec '08

08 Dec '08

* src/virsh.c: Now, every command must have a "desc" string, even if it has zero length. Mark these, so they'll be filled in. --- src/virsh.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index 96a7132..d96a7d4 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -2148,6 +2148,7 @@ cmdDumpXML(vshControl *ctl, const vshCmd *cmd) static const vshCmdInfo info_domname[] = { {"syntax", "domname <domain>"}, {"help", gettext_noop("convert a domain id or UUID to domain name")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -2178,6 +2179,7 @@ cmdDomname(vshControl *ctl, const vshCmd *cmd) static const vshCmdInfo info_domid[] = { {"syntax", "domid <domain>"}, {"help", gettext_noop("convert a domain name or UUID to domain id")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -2213,6 +2215,7 @@ cmdDomid(vshControl *ctl, const vshCmd *cmd) static const vshCmdInfo info_domuuid[] = { {"syntax", "domuuid <domain>"}, {"help", gettext_noop("convert a domain name or id to domain UUID")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -2668,6 +2671,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) static const vshCmdInfo info_network_name[] = { {"syntax", "net-name <network>"}, {"help", gettext_noop("convert a network UUID to network name")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -2777,6 +2781,7 @@ cmdNetworkUndefine(vshControl *ctl, const vshCmd *cmd) static const vshCmdInfo info_network_uuid[] = { {"syntax", "net-uuid <network>"}, {"help", gettext_noop("convert a network name to network UUID")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -3699,6 +3704,7 @@ cmdPoolInfo(vshControl *ctl, const vshCmd *cmd) static const vshCmdInfo info_pool_name[] = { {"syntax", "pool-name <pool>"}, {"help", gettext_noop("convert a pool UUID to pool name")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -3930,6 +3936,7 @@ cmdPoolUndefine(vshControl *ctl, const vshCmd *cmd) static const vshCmdInfo info_pool_uuid[] = { {"syntax", "pool-uuid <pool>"}, {"help", gettext_noop("convert a pool name to pool UUID")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -4242,6 +4249,7 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) static const vshCmdInfo info_vol_name[] = { {"syntax", "vol-name <vol>"}, {"help", gettext_noop("convert a vol UUID to vol name")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -4275,6 +4283,7 @@ cmdVolName(vshControl *ctl, const vshCmd *cmd) static const vshCmdInfo info_vol_key[] = { {"syntax", "vol-key <vol>"}, {"help", gettext_noop("convert a vol UUID to vol key")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -4308,6 +4317,7 @@ cmdVolKey(vshControl *ctl, const vshCmd *cmd) static const vshCmdInfo info_vol_path[] = { {"syntax", "vol-path <pool> <vol>"}, {"help", gettext_noop("convert a vol UUID to vol path")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -4425,6 +4435,7 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) static const vshCmdInfo info_node_list_devices[] = { {"syntax", "nodedev-list [--cap <capability>]"}, {"help", gettext_noop("enumerate devices on this host")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -4514,6 +4525,7 @@ cmdNodeDeviceDumpXML (vshControl *ctl, const vshCmd *cmd) static const vshCmdInfo info_hostname[] = { {"syntax", "hostname"}, {"help", gettext_noop("print the hypervisor hostname")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -4543,6 +4555,7 @@ cmdHostname (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) static const vshCmdInfo info_uri[] = { {"syntax", "uri"}, {"help", gettext_noop("print the hypervisor canonical URI")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -5600,6 +5613,7 @@ static const vshCmdOptDef opts_pool_edit[] = { static const vshCmdInfo info_quit[] = { {"syntax", "quit"}, {"help", gettext_noop("quit this interactive terminal")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; -- 1.6.0.4.1101.g642f8

2 1

[libvirt] [PATCH 1/4] virsh.c: generate each "virsh help COMMAND"s synopsis
by Jim Meyering 08 Dec '08

08 Dec '08

* src/virsh.c: Also, diagnose extra arguments after --help (-h). --- src/virsh.c | 102 +++++++++++++++++++++++++++++++++------------------------- 1 files changed, 58 insertions(+), 44 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index df12b8b..96a7132 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -224,7 +224,7 @@ static void vshError(vshControl *ctl, int doexit, const char *format, ...) ATTRIBUTE_FORMAT(printf, 3, 4); static int vshInit(vshControl *ctl); static int vshDeinit(vshControl *ctl); -static void vshUsage(vshControl *ctl, const char *cmdname); +static void vshUsage(void); static void vshOpenLogFile(vshControl *ctl); static void vshOutputLogFile(vshControl *ctl, int log_level, const char *format, va_list ap); static void vshCloseLogFile(vshControl *ctl); @@ -233,7 +233,7 @@ static int vshParseArgv(vshControl *ctl, int argc, char **argv); static const char *vshCmddefGetInfo(const vshCmdDef *cmd, const char *info); static const vshCmdDef *vshCmddefSearch(const char *cmdname); -static int vshCmddefHelp(vshControl *ctl, const char *name, int withprog); +static int vshCmddefHelp(vshControl *ctl, const char *name); static vshCmdOpt *vshCommandOpt(const vshCmd *cmd, const char *name); static int vshCommandOptInt(const vshCmd *cmd, const char *name, int *found); @@ -361,7 +361,7 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd) N_(vshCmddefGetInfo(def, "help"))); return TRUE; } - return vshCmddefHelp(ctl, cmdname, FALSE); + return vshCmddefHelp(ctl, cmdname); } /* @@ -5803,7 +5803,7 @@ vshCmddefSearch(const char *cmdname) } static int -vshCmddefHelp(vshControl *ctl, const char *cmdname, int withprog) +vshCmddefHelp(vshControl *ctl, const char *cmdname) { const vshCmdDef *def = vshCmddefSearch(cmdname); @@ -5811,30 +5811,46 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname, int withprog) vshError(ctl, FALSE, _("command '%s' doesn't exist"), cmdname); return FALSE; } else { - const vshCmdOptDef *opt; const char *desc = N_(vshCmddefGetInfo(def, "desc")); const char *help = N_(vshCmddefGetInfo(def, "help")); - const char *syntax = vshCmddefGetInfo(def, "syntax"); + char buf[256]; fputs(_(" NAME\n"), stdout); fprintf(stdout, " %s - %s\n", def->name, help); - if (syntax) { - fputs(_("\n SYNOPSIS\n"), stdout); - if (!withprog) - fprintf(stdout, " %s\n", syntax); - else - fprintf(stdout, " %s %s\n", progname, syntax); + fputs(_("\n SYNOPSIS\n"), stdout); + fprintf(stdout, " %s", def->name); + if (def->opts) { + const vshCmdOptDef *opt; + for (opt = def->opts; opt->name; opt++) { + const char *fmt; + if (opt->type == VSH_OT_BOOL) + fmt = "[--%s]"; + else if (opt->type == VSH_OT_INT) + fmt = N_("[--%s <number>]"); + else if (opt->type == VSH_OT_STRING) + fmt = N_("[--%s <string>]"); + else if (opt->type == VSH_OT_DATA) + fmt = ((opt->flag & VSH_OFLAG_REQ) ? "<%s>" : "[<%s>]"); + else + assert(0); + fputc(' ', stdout); + fprintf(stdout, _(fmt), opt->name); + } } - if (desc) { + fputc('\n', stdout); + + if (desc[0]) { + /* FIXME: remove this test once all of the empty descriptions + have been removed; see `FIXME: describe' lines. */ fputs(_("\n DESCRIPTION\n"), stdout); fprintf(stdout, " %s\n", desc); } + if (def->opts) { + const vshCmdOptDef *opt; fputs(_("\n OPTIONS\n"), stdout); for (opt = def->opts; opt->name; opt++) { - char buf[256]; - if (opt->type == VSH_OT_BOOL) snprintf(buf, sizeof(buf), "--%s", opt->name); else if (opt->type == VSH_OT_INT) @@ -6912,35 +6928,29 @@ vshDeinit(vshControl *ctl) * Print usage */ static void -vshUsage(vshControl *ctl, const char *cmdname) +vshUsage(void) { const vshCmdDef *cmd; - - /* global help */ - if (!cmdname) { - fprintf(stdout, _("\n%s [options] [commands]\n\n" - " options:\n" - " -c | --connect <uri> hypervisor connection URI\n" - " -r | --readonly connect readonly\n" - " -d | --debug <num> debug level [0-5]\n" - " -h | --help this help\n" - " -q | --quiet quiet mode\n" - " -t | --timing print timing information\n" - " -l | --log <file> output logging to file\n" - " -v | --version program version\n\n" - " commands (non interactive mode):\n"), progname); - - for (cmd = commands; cmd->name; cmd++) - fprintf(stdout, - " %-15s %s\n", cmd->name, N_(vshCmddefGetInfo(cmd, - "help"))); - - fprintf(stdout, "%s", - _("\n (specify help <command> for details about the command)\n\n")); - return; - } - if (!vshCmddefHelp(ctl, cmdname, TRUE)) - exit(EXIT_FAILURE); + fprintf(stdout, _("\n%s [options] [commands]\n\n" + " options:\n" + " -c | --connect <uri> hypervisor connection URI\n" + " -r | --readonly connect readonly\n" + " -d | --debug <num> debug level [0-5]\n" + " -h | --help this help\n" + " -q | --quiet quiet mode\n" + " -t | --timing print timing information\n" + " -l | --log <file> output logging to file\n" + " -v | --version program version\n\n" + " commands (non interactive mode):\n"), progname); + + for (cmd = commands; cmd->name; cmd++) + fprintf(stdout, + " %-15s %s\n", cmd->name, N_(vshCmddefGetInfo(cmd, + "help"))); + + fprintf(stdout, "%s", + _("\n (specify help <command> for details about the command)\n\n")); + return; } /* @@ -7038,8 +7048,12 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) } if (help) { - /* global or command specific help */ - vshUsage(ctl, argc > end ? argv[end] : NULL); + if (end < argc) + vshError(ctl, TRUE, + _("extra argument '%s'. See --help."), argv[end]); + + /* list all command */ + vshUsage(); exit(EXIT_SUCCESS); } -- 1.6.0.4.1101.g642f8

2 1

[libvirt] [PATCH] small compilation problem with old dbus versions
by Daniel Veillard 08 Dec '08

08 Dec '08

dbus_watch_get_unix_fd() was added in dbus >= 1.1.1, it deprecate dbus_watch_get_fd(), so we should use the later if compiling against the old stuff, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 4

[libvirt] broken pipe?
by Itamar Heim 08 Dec '08

08 Dec '08

Hi, I have a problem with a small python script (using fedora 10 with its shipped rpm's - libvirt-0.4.6-3.fc10.x86_64, libvirt-python-0.4.6-3.fc10.x86_64) I'm running a simple stupid libvirt python script. I happen to want to use SDL, and it fails on "Could not initialize SDL - exiting". While I need to solve this error (i.e., find out in which version this patch was included to allow me to specify the DISPLAY http://www.mail-archive.com/libvir-list@redhat.com/msg08764.html) I am more troubled by the fact that running the script again gives a socket/pipe error until I restart libvirtd: Run #1: ./test_libvirt.py libvir: QEMU error : internal error QEMU quit during console startup Could not initialize SDL - exiting Traceback (most recent call last): File "./test_libvirt.py", line 37, in <module> vm = c.createLinux(x, 0) File "/usr/lib64/python2.5/site-packages/libvirt.py", line 892, in createLinux if ret is None:raise libvirtError('virDomainCreateLinux() failed', conn=self) libvirt.libvirtError: internal error QEMU quit during console startup Run #2: ./test_libvirt.py libvir: Remote error : socket closed unexpectedly Traceback (most recent call last): File "./test_libvirt.py", line 37, in <module> vm = c.createLinux(x, 0) # what a lousy function name File "/usr/lib64/python2.5/site-packages/libvirt.py", line 892, in createLinux if ret is None:raise libvirtError('virDomainCreateLinux() failed', conn=self) libvirt.libvirtError: socket closed unexpectedly libvir: Remote error : Broken pipe Code: #!/usr/bin/env python import libvirt c = libvirt.open('qemu:///system') x = """<domain type='kvm'> <name>yossi2</name> <memory>512000</memory> <currentMemory>512000</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> </features> <clock offset='utc'/> <devices> <emulator>/usr/bin/qemu-kvm</emulator> <disk type='file' device='disk'> <source file='/mnt/sda2/images/winxp-acpi.vmdk'/> <target dev='hda' bus='ide'/> </disk> <input type='tablet' bus='usb'/> <input type='mouse' bus='ps2'/> <graphics type='sdl'/> </devices> </domain>""" vm = c.createLinux(x, 0) Thanks, Itamar

4 10

[libvirt] FYI: Fixed multiple test driver crashes/flaws
by Daniel P. Berrange 07 Dec '08

07 Dec '08

The virt-install test suite exposed a number of bugs in the test driver storage APIs, partly due to my threading changes. There was one deadlock (calling unneccessary PoolRefresh op), one crash (deferencing a variable we just set to NULL), and integer long long overflow on 32-bit, and missing return value I've committed the following patch which fixes these and makes virt=install test suite work again Daniel diff -u -p -r1.103 -r1.106 --- src/test.c 4 Dec 2008 21:00:50 -0000 1.103 +++ src/test.c 7 Dec 2008 20:45:28 -0000 1.106 @@ -191,7 +191,7 @@ static const char *defaultPoolXML = " </target>" "</pool>"; -static const unsigned long long defaultPoolCap = (100 * 1024 * 1024 * 1024ul); +static const unsigned long long defaultPoolCap = (100 * 1024 * 1024 * 1024ull); static const unsigned long long defaultPoolAlloc = 0; static int testStoragePoolObjSetDefaults(virStoragePoolObjPtr pool); @@ -2323,9 +2323,6 @@ no_memory: return -1; } -static int -testStoragePoolRefresh(virStoragePoolPtr obj, - unsigned int flags ATTRIBUTE_UNUSED); static int testStoragePoolStart(virStoragePoolPtr pool, @@ -2350,8 +2347,6 @@ testStoragePoolStart(virStoragePoolPtr p goto cleanup; } - if (testStoragePoolRefresh(pool, 0) == 0) - goto cleanup; privpool->active = 1; ret = 0; @@ -2506,6 +2501,7 @@ testStoragePoolBuild(virStoragePoolPtr p _("storage pool '%s' is already active"), pool->name); goto cleanup; } + ret = 0; cleanup: if (privpool) @@ -3001,10 +2997,10 @@ testStorageVolumeCreateXML(virStoragePoo privpool->def->allocation); privpool->volumes.objs[privpool->volumes.count++] = privvol; - privvol = NULL; ret = virGetStorageVol(pool->conn, privpool->def->name, privvol->name, privvol->key); + privvol = NULL; cleanup: virStorageVolDefFree(privvol); -- |: 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 :|

1 0

[libvirt] PATCH: Workaround limits.h bug on Debian
by Daniel P. Berrange 05 Dec '08

05 Dec '08

The Debian Etch /usr/include/limits.h has an #endif in the wrong place, making it fail to define ULLONG_MAX. This works around the brokenness Daniel diff -u -r1.32 storage_conf.c --- storage_conf.c 4 Dec 2008 22:00:14 -0000 1.32 +++ storage_conf.c 5 Dec 2008 14:17:23 -0000 @@ -43,6 +43,11 @@ #include "util.h" #include "memory.h" +/* Work around broken limits.h on debian etch */ +#if defined __GNUC__ && defined _GCC_LIMITS_H_ && ! defined ULLONG_MAX +# define ULLONG_MAX ULONG_LONG_MAX +#endif + #define virStorageLog(msg...) fprintf(stderr, msg) VIR_ENUM_IMPL(virStoragePool, -- |: 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 :|

2 1

[libvirt] [PATCH] Makefile.am compile fix
by Paolo Borelli 05 Dec '08

05 Dec '08

Hi, also filed as https://bugzilla.redhat.com/show_bug.cgi?id=474211 but I have been asked to send it to the list. The attached patches fixes Makefile.am and let's me compile libvirt. Ciao Paolo

1 0

[libvirt] how to install updated python bindings
by ente linux 05 Dec '08

05 Dec '08

hi i was trying to install libvirt 0.5 on my centos 5 machine which by default have libvirt 0.4. But after installing from the source of libvirt, still the output of i get from python remains that of 0.4 >>>import libvirt >>> libvirt.getVersion() 4006 how could i install the new version... Do i need to give any option while configuring or making. thanks and regards visco

5 4

[libvirt] [RFC PATCH] Let network bridge MTU to be configured on XML
by Eduardo Habkost 04 Dec '08

04 Dec '08

Hi, Below is an incomplete patch for letting the MTU of a libvirt virtual network to be configured on XML. This implementation has an issue: it works when trying to set the MTU below 1500, but the kernel bridge code doesn't let us to set the bridge MTU above 1500 if there is no interface attached to the bridge yet. To allow setting the bridge MTU higher than 1500, we need to save the configured value somewhere and set it only when attaching tap interface to it. To solve that, I propose changing the way the network driver interface expose things for the domain network code. Today we do the following (src/qemu_conf.c): virNetworkPtr network; virDomainNetDefPtr net; char *brname; int tapfd; brname = virNetworkGetBridgeName(network); brAddTap(brctl, brname, &net->ifname, &tapfd))) With this code, the only information that can flow between the network driver and the bridge code is the bridge name. I was going to suggest having something like this: virNetworkAddTap(network, &net->ifname, &tapfd); However, we wouldn't be able to return an FD when using the 'remote' network driver. But we can split the creation of the tap interface and attaching it to the network bridge, like this: brNewTap(brctl, &net->ifname, &tapfd); virNetworkAttachInterface(network, net->ifname); This way, the network driver code can do anything needed to attach the new tap interface to the virtual network, including but not limited to MTU setting. Another alternative could be creating a virNetworkGetBridgeMtu() function. That would solve our problem for the MTU settings, but in my opinion, attaching interfaces to the network is a task for the network driver. Having the qemu code calling brAddTap() directly was just a shortcut we won't be able to use anymore. What do you think? --- src/bridge.c | 19 +++++++++++++++++++ src/bridge.h | 4 ++++ src/libvirt_sym.version.in | 1 + src/network_conf.c | 5 +++++ src/network_conf.h | 2 ++ src/network_driver.c | 10 ++++++++++ 6 files changed, 41 insertions(+), 0 deletions(-) diff --git a/src/bridge.c b/src/bridge.c index 13d81bc..ed9023b 100644 --- a/src/bridge.c +++ b/src/bridge.c @@ -452,6 +452,25 @@ brAddTap(brControl *ctl, return errno; } + +/** + * brSetMtu + * @ctl: bridge control pointer + * @bridge: the bridge name + * @mtu: the MTU value to be set + * + * Sets the MTU of a bridge. + * + * Returns 0 in case of success or an errno code in case of failure. + */ +int +brSetMtu(brControl *ctl, + const char *bridge, + int mtu) +{ + return ifSetMtu(ctl, bridge, mtu); +} + /** * brSetInterfaceUp: * @ctl: bridge control pointer diff --git a/src/bridge.h b/src/bridge.h index 7eb6166..194e96f 100644 --- a/src/bridge.h +++ b/src/bridge.h @@ -58,6 +58,10 @@ int brDeleteInterface (brControl *ctl, const char *bridge, const char *iface); +int brSetMtu (brControl *ctl, + const char *bridge, + int mtu); + int brAddTap (brControl *ctl, const char *bridge, char **ifname, diff --git a/src/libvirt_sym.version.in b/src/libvirt_sym.version.in index ec9ff3d..668b902 100644 --- a/src/libvirt_sym.version.in +++ b/src/libvirt_sym.version.in @@ -274,6 +274,7 @@ LIBVIRT_PRIVATE_@VERSION@ { global: /* bridge.h */ brAddBridge; + brSetMtu; brAddInterface; brAddTap; brDeleteBridge; diff --git a/src/network_conf.c b/src/network_conf.c index 5add62e..b7ec87e 100644 --- a/src/network_conf.c +++ b/src/network_conf.c @@ -295,6 +295,7 @@ virNetworkDefParseXML(virConnectPtr conn, { virNetworkDefPtr def; char *tmp; + long mtu; if (VIR_ALLOC(def) < 0) { virNetworkReportError(conn, VIR_ERR_NO_MEMORY, NULL); @@ -332,6 +333,8 @@ virNetworkDefParseXML(virConnectPtr conn, /* Parse bridge information */ def->bridge = virXPathString(conn, "string(./bridge[1]/@name)", ctxt); + if (virXPathLong(conn, "number(./bridge[1]/@mtu)", ctxt, &mtu) == 0) + def->bridgeMtu = mtu; tmp = virXPathString(conn, "string(./bridge[1]/@stp)", ctxt); def->stp = (tmp && STREQ(tmp, "off")) ? 0 : 1; VIR_FREE(tmp); @@ -570,6 +573,8 @@ char *virNetworkDefFormat(virConnectPtr conn, virBufferAddLit(&buf, " <bridge"); if (def->bridge) virBufferEscapeString(&buf, " name='%s'", def->bridge); + if (def->bridgeMtu > 0) + virBufferVSprintf(&buf, " mtu='%d'", def->bridgeMtu); virBufferVSprintf(&buf, " stp='%s' forwardDelay='%ld' />\n", def->stp ? "on" : "off", def->delay); diff --git a/src/network_conf.h b/src/network_conf.h index 2614e47..a30cc8d 100644 --- a/src/network_conf.h +++ b/src/network_conf.h @@ -61,6 +61,8 @@ struct _virNetworkDef { char *name; char *bridge; /* Name of bridge device */ + int bridgeMtu; /* MTU of the bridge */ + char *domain; unsigned long delay; /* Bridge forward delay (ms) */ int stp : 1; /* Spanning tree protocol */ diff --git a/src/network_driver.c b/src/network_driver.c index 96d3ddf..10bdd10 100644 --- a/src/network_driver.c +++ b/src/network_driver.c @@ -684,6 +684,16 @@ static int networkStartNetworkDaemon(virConnectPtr conn, return -1; } + if (network->def->bridgeMtu> 0) { + if ((err = brSetMtu(driver->brctl, network->def->bridge, network->def->bridgeMtu))) { + networkReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("cannot set MTU of bridge '%s' to %d: %s"), + network->def->bridge, network->def->bridgeMtu, + strerror(err)); + goto err_delbr; + } + } + if (brSetForwardDelay(driver->brctl, network->def->bridge, network->def->delay) < 0) goto err_delbr; -- 1.5.5.GIT -- Eduardo

3 6

[libvirt] Release of libvirt-0.5.1
by Daniel Veillard 04 Dec '08

04 Dec '08

Mostly a bug fix one, as promised when 0.5.0 came out :-) Available as usual from: ftp://libvirt.org/libvirt/ Some bug fixes and local improvements: + Portability: - fix missing dep in spec file - fix compilation with new NUMA libraries (Daniel Berrange) - udev compatibility for RHEL (Chris Lalancette) - + Documentation: - documentation copy and paste errors and typo (Cole Robinson) + Bug fixes: - add a delay in storage backend for disks to show up (Chris Lalancette) - fix parsing for CDRom device with no source (Daniel Berrange) - use xenstore to list domains to avoid some bugs (Guido Gunther) - remove a leak in xen inotify code (Daniel Berrange) - UML driver freeing of uninitialialized variable (Ron Yorston) - fix UML inotify code (Daniel Berrange) - crash when adding storage without a format (Cole Robinson) + Improvements: - use xend preferably to hypervisor call to set Xen max memory (Jim Fehlig) - allow remote://hostname/ URI for automatic probe of hypervisors (Daniel Berrange) - fix daemon configuration regression testing (Jim Meyering ) - check /usr/bin/kvm for QEmu driver init (Guido Gunther) - proper active vs. inactive differentiation (Guido Gunther) - improve MTU setting on tap interfaces (Eduardo Habkost) - increase timeout for initial QEmu monitor poll (Cole Robinson) + Cleanups: - fix improper initialisations (Jim Meyering) thanks everybody for the contributions, whatever the way ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] Add default format info for storage volumes
by Cole Robinson 04 Dec '08

04 Dec '08

The attached patch adds default format info for storage volumes. This fixes a regression in the latest release, where defining a storage volume without a format crashed libvirtd: https://bugzilla.redhat.com/show_bug.cgi?id=473071 This is similar to how we handle things with storage pools as well. This fixes the crash for me. Thanks, Cole

3 2

[libvirt] [PATCH] Increase initial qemu monitor read timeout
by Cole Robinson 04 Dec '08

04 Dec '08

See https://bugzilla.redhat.com/show_bug.cgi?id=453491 We've been getting bug reports like the above against virt-manager for a while now: installing new VMs consistently throws an error 'Timed out while reading monitor startup output'. The user can then just retry the install and it will go off without a hitch. I only just realized that the common thread between the reports is physical install media: apparently the qemu monitor isn't too responsive while it's waiting for a cold cd drive to spin up. The attached patch jacks up the timeout from 3 seconds to 10 seconds when doing the initial monitor read. I verified that this fixes the issue. Thanks, Cole

2 2

[libvirt] [PATCH] Fix a few docs errors
by Cole Robinson 04 Dec '08

04 Dec '08

The attached patch fixes a few cut and paste docs errors I've stumbled upon, and a spelling error in a virsh command output. Thanks, Cole

2 2

[libvirt] [PATCH] bridge: set MTU of tap iface to the same value of the bridge
by Eduardo Habkost 04 Dec '08

04 Dec '08

Hi, This is a follow-up to the RFC patch sent by Chris Wright, at: https://www.redhat.com/archives/libvir-list/2008-November/msg00225.html With this patch, instead of hardcoding the MTU to an high value, we set the MTU of the tap interface to the same MTU value set on the bridge interface. The current code uses the default tap MTU value and lowers the bridge interface MTU without any need, killing performance. I will send another patch later for allowing the tap MTU to be configured on the XML, but the behavior added by this patch will be kept as the default. The default behavior should be enough for most use cases where a larger MTU is wanted for the bridged interfaces. Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com> --- src/bridge.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/src/bridge.c b/src/bridge.c index 4090163..60334b6 100644 --- a/src/bridge.c +++ b/src/bridge.c @@ -276,6 +276,98 @@ brDeleteInterface(brControl *ctl ATTRIBUTE_UNUSED, #endif /** + * ifGetMtu + * @ctl: bridge control pointer + * @ifname: interface name get MTU for + * + * This function gets the @mtu value set for a given interface @ifname. + * + * Returns the MTU value in case of success. + * On error, returns -1 and sets errno accordingly + */ +static int ifGetMtu(brControl *ctl, const char *ifname) +{ + struct ifreq ifr; + int len; + + if (!ctl || !ifname) { + errno = EINVAL; + return -1; + } + + if ((len = strlen(ifname)) >= BR_IFNAME_MAXLEN) { + errno = EINVAL; + return -1; + } + + memset(&ifr, 0, sizeof(struct ifreq)); + + strncpy(ifr.ifr_name, ifname, len); + ifr.ifr_name[len] = '\0'; + + if (ioctl(ctl->fd, SIOCGIFMTU, &ifr)) + return -1; + + return ifr.ifr_mtu; + +} + +/** + * ifSetMtu: + * @ctl: bridge control pointer + * @ifname: interface name to set MTU for + * @mtu: MTU value + * + * This function sets the @mtu for a given interface @ifname. Typically + * used on a tap device to set up for Jumbo Frames. + * + * Returns 0 in case of success or an errno code in case of failure. + */ +static int ifSetMtu(brControl *ctl, const char *ifname, int mtu) +{ + struct ifreq ifr; + int len; + + if (!ctl || !ifname) + return EINVAL; + + if ((len = strlen(ifname)) >= BR_IFNAME_MAXLEN) + return EINVAL; + + memset(&ifr, 0, sizeof(struct ifreq)); + + strncpy(ifr.ifr_name, ifname, len); + ifr.ifr_name[len] = '\0'; + ifr.ifr_mtu = mtu; + + return ioctl(ctl->fd, SIOCSIFMTU, &ifr) == 0 ? 0 : errno; +} + +/** + * brSetInterfaceMtu + * @ctl: bridge control pointer + * @bridge: name of the bridge interface + * @ifname: name of the interface whose MTU we want to set + * + * Sets the interface mtu to the same MTU of the bridge + * + * Returns 0 in case of success or an errno code in case of failure. + */ +static int brSetInterfaceMtu(brControl *ctl, + const char *bridge, + const char *ifname) +{ + int mtu = ifGetMtu(ctl, bridge); + + fprintf(stderr, "mtu: %d\n", mtu); + + if (mtu < 0) + return errno; + + return ifSetMtu(ctl, ifname, mtu); +} + +/** * brAddTap: * @ctl: bridge control pointer * @bridge: the bridge name @@ -334,6 +426,12 @@ brAddTap(brControl *ctl, } if (ioctl(fd, TUNSETIFF, &try) == 0) { + /* We need to set the interface MTU before adding it + * to the bridge, because the bridge will have its + * MTU adjusted automatically when we add the new interface. + */ + if ((errno = brSetInterfaceMtu(ctl, bridge, try.ifr_name))) + goto error; if ((errno = brAddInterface(ctl, bridge, try.ifr_name))) goto error; if ((errno = brSetInterfaceUp(ctl, try.ifr_name, 1))) -- 1.5.5.GIT

5 8

[libvirt] [PATCH] also look for /usr/bin/kvm
by Guido Günther 04 Dec '08

04 Dec '08

We do so in qemudCapsInitGuest() but not in qemudProbe(). O.k. to apply? -- Guido

3 3

[libvirt] is libvirt-python default in libvirt compilation from source?
by Shanmuga Rajan 03 Dec '08

03 Dec '08

I was trying to install libvirt 0.5.0 from source.. It seems it went well. but when i tried to import libvirt module in python i got error no module named libvirt then i searched entire system for libvirt.py then i came to know that python bindings for libvirt is not installed. is it that python bindings for libvirt not default in compilation....? if i have to install python bindings then what option should i use? i tried to find option from ./configure --help from libvirt source directory but i didnt get anything. Can any one help me in this. Thanks and Regards, Shan

2 1

[libvirt] Allowing <interface type="none"> for network interface definition
by Gihan Munasinghe 03 Dec '08

03 Dec '08

Hi I am writing a management stack for our platform using libvirt. We have many DomU images which all have PV drivers loaded for network.I want to start these DomU guests with only the PV network device being visible from within the DomU. This is a requirement in the platform and hopefully, I presume there are other people with the same requirement.. But when creating a server, libvirt sends (type ioemu) tag to xend. Which make all of our vm's to have 2 network cards. Using the normal xm command I can send type=none ( vif = [ "mac=00:16:3e:00:a5:57,bridge=eth0,script=vif-bridge,type=none"]) to xend. Which will send qeum-dm "-net none" switch which solves the problem. After doing some investigation, I did some code change in libvirt0.5.0 to support a attribute called "none" with in <interface type="">, that will send xend the tag (type none). Allowing qeum-dm to be configured with "-net none" switch. ;-) So you can define your network tag as <interface type='none'>   <mac address='00:16:3e:00:a5:57'/> <source bridge='eth0'/> <target dev='vif47.0'/> </interface> I this the proper way of doing it? :-\ Would this be a general functionality that libvirt community will be interested in (I think this add bit more flexibility to libvirt of the way user want to write their own management stack). If so could I contribute the patch to the mailing list. Looking forward to hearing from you all, I am new to libvirt therefore any comments will be greatly appreciated :-) Thanks Gihan -- Gihan Munasinghe R&D Team Leader XCalibre Communications Ltd. www.flexiscale.com

2 2

[libvirt] [PATCH 1/2] Java bindings for domain events
by David Lively 02 Dec '08

02 Dec '08

The attached patch (against libvirt-java) implements Java bindings for libvirt domain events. This version provides a libvirt EventImpl running in its own Java Thread, and provides per-Connect synchronization that makes using the bindings thread-safe. (Note the Domain, Network, StoragePool, and StorageVol methods also synchronize on their Connect object, as required by libvirt. I have similar changes for NodeDevice.java that need to be made when that code is checked in.) This version of the patch also implements and uses an enum class (DomainEvent.Type), as suggested by Tóth István. IMPORTANT: THIS PATCH WILL BREAK THINGS UNLESS THE NEXT [PATCH 2/2] IS APPLIED TO libvirt FIRST. Also, libvirt must be compiled WITH_PTHREADS for Java events to work. Dave

3 12

[libvirt] [PATCH] post-release patch for symbols
by Daniel Veillard 02 Dec '08

02 Dec '08

Assuming we release a 0.5.1 soon. Maybe the code with threading should be on a 0.6.0 considering the amount of changes though. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 3

[libvirt] review fallout: short memset
by Jim Meyering 02 Dec '08

02 Dec '08

While reviewing unrelated changes, I spotted a short memset: char **names; ... memset(names, 0, maxnames); That zeros out 1/4 or 1/8 of the memory than it should. It should be doing this: memset(names, 0, maxnames * sizeof (*names)); I checked all memset uses and found a total of 6 uses like that. This fixes them: >From 614b0064eadc3ecef0690d5c65bb531844a3091d Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 2 Dec 2008 14:49:03 +0100 Subject: [PATCH] fix inadequate initialization in storage and test drivers * src/storage_driver.c (storageListPools): Set all "names" entries to 0. (storageListDefinedPools, storagePoolListVolumes): Likewise. * src/test.c (testStoragePoolListVolumes): Likewise. --- src/storage_driver.c | 8 ++++---- src/test.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/storage_driver.c b/src/storage_driver.c index 366820b..53388f1 100644 --- a/src/storage_driver.c +++ b/src/storage_driver.c @@ -347,7 +347,7 @@ storageListPools(virConnectPtr conn, free(names[i]); names[i] = NULL; } - memset(names, 0, nnames); + memset(names, 0, nnames * sizeof(*names)); return -1; } @@ -389,7 +389,7 @@ storageListDefinedPools(virConnectPtr conn, free(names[i]); names[i] = NULL; } - memset(names, 0, nnames); + memset(names, 0, nnames * sizeof(*names)); return -1; } @@ -880,7 +880,7 @@ storagePoolListVolumes(virStoragePoolPtr obj, return -1; } - memset(names, 0, maxnames); + memset(names, 0, maxnames * sizeof(*names)); for (i = 0 ; i < pool->volumes.count && n < maxnames ; i++) { if ((names[n++] = strdup(pool->volumes.objs[i]->name)) == NULL) { virStorageReportError(obj->conn, VIR_ERR_NO_MEMORY, @@ -895,7 +895,7 @@ storagePoolListVolumes(virStoragePoolPtr obj, for (n = 0 ; n < maxnames ; n++) VIR_FREE(names[i]); - memset(names, 0, maxnames); + memset(names, 0, maxnames * sizeof(*names)); return -1; } diff --git a/src/test.c b/src/test.c index 7998886..3e942da 100644 --- a/src/test.c +++ b/src/test.c @@ -1951,7 +1951,7 @@ testStoragePoolListVolumes(virStoragePoolPtr obj, POOL_IS_ACTIVE(privpool, -1); int i = 0, n = 0; - memset(names, 0, maxnames); + memset(names, 0, maxnames * sizeof(*names)); for (i = 0 ; i < privpool->volumes.count && n < maxnames ; i++) { if ((names[n++] = strdup(privpool->volumes.objs[i]->name)) == NULL) { testError(obj->conn, VIR_ERR_NO_MEMORY, "%s", _("name")); @@ -1965,7 +1965,7 @@ testStoragePoolListVolumes(virStoragePoolPtr obj, for (n = 0 ; n < maxnames ; n++) VIR_FREE(names[i]); - memset(names, 0, maxnames); + memset(names, 0, maxnames * sizeof(*names)); return -1; } -- 1.6.0.4.1044.g77718

3 2

[libvirt] [PATCH 2/2]: Call udevsettle in the appropriate places
by Chris Lalancette 02 Dec '08

02 Dec '08

Instead of relying solely on polling for /dev devices to appear in libvirt, we really should be synchronizing against udev. This is generally done by a call to udevsettle, which is exactly what this patch implements for the storage backends that are likely to create new /dev nodes. I believe I've read that even after udevsettle, you are not guaranteed that devices are all the way created, so we still need the polling in the rest of the sources, but this should give us a much better chance of things existing as we expect. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> Index: src/storage_backend.c =================================================================== RCS file: /data/cvs/libvirt/src/storage_backend.c,v retrieving revision 1.29 diff -u -r1.29 storage_backend.c --- a/src/storage_backend.c 17 Nov 2008 11:19:33 -0000 1.29 +++ b/src/storage_backend.c 26 Nov 2008 12:40:19 -0000 @@ -270,6 +270,20 @@ return 0; } +void virStorageBackendWaitForDevices(virConnectPtr conn) +{ + const char *const settleprog[] = { UDEVSETTLE, NULL }; + int exitstatus; + + /* + * NOTE: we ignore errors here; this is just to make sure that any device + * nodes that are being created finish before we try to + * scan them. If this fails (udevsettle exits badly, or doesn't exist + * at all), then we still have a fallback mechanism anyway. + */ + virRun(conn, settleprog, &exitstatus); +} + /* * Given a volume path directly in /dev/XXX, iterate over the * entries in the directory pool->def->target.path and find the Index: src/storage_backend.h =================================================================== RCS file: /data/cvs/libvirt/src/storage_backend.h,v retrieving revision 1.13 diff -u -r1.13 storage_backend.h --- a/src/storage_backend.h 17 Nov 2008 11:19:33 -0000 1.13 +++ b/src/storage_backend.h 26 Nov 2008 12:40:19 -0000 @@ -69,6 +69,8 @@ int fd, int withCapacity); +void virStorageBackendWaitForDevices(virConnectPtr conn); + char *virStorageBackendStablePath(virConnectPtr conn, virStoragePoolObjPtr pool, const char *devpath); Index: src/storage_backend_logical.c =================================================================== RCS file: /data/cvs/libvirt/src/storage_backend_logical.c,v retrieving revision 1.26 diff -u -r1.26 storage_backend_logical.c --- a/src/storage_backend_logical.c 17 Nov 2008 11:19:33 -0000 1.26 +++ b/src/storage_backend_logical.c 26 Nov 2008 12:40:19 -0000 @@ -470,6 +470,8 @@ }; int exitstatus; + virStorageBackendWaitForDevices(conn); + /* Get list of all logical volumes */ if (virStorageBackendLogicalFindLVs(conn, pool, NULL) < 0) { virStoragePoolObjClearVols(pool); Index: src/storage_backend_disk.c =================================================================== RCS file: /data/cvs/libvirt/src/storage_backend_disk.c,v retrieving revision 1.20 diff -u -r1.20 storage_backend_disk.c --- a/src/storage_backend_disk.c 17 Nov 2008 11:19:33 -0000 1.20 +++ b/src/storage_backend_disk.c 26 Nov 2008 12:40:19 -0000 @@ -262,6 +262,8 @@ VIR_FREE(pool->def->source.devices[0].freeExtents); pool->def->source.devices[0].nfreeExtent = 0; + virStorageBackendWaitForDevices(conn); + return virStorageBackendDiskReadPartitions(conn, pool, NULL); } Index: src/storage_backend_iscsi.c =================================================================== RCS file: /data/cvs/libvirt/src/storage_backend_iscsi.c,v retrieving revision 1.18 diff -u -r1.18 storage_backend_iscsi.c --- a/src/storage_backend_iscsi.c 17 Nov 2008 11:19:33 -0000 1.18 +++ b/src/storage_backend_iscsi.c 26 Nov 2008 12:40:19 -0000 @@ -603,6 +603,8 @@ pool->def->allocation = pool->def->capacity = pool->def->available = 0; + virStorageBackendWaitForDevices(conn); + if ((session = virStorageBackendISCSISession(conn, pool)) == NULL) goto cleanup; if (virStorageBackendISCSIRescanLUNs(conn, pool, session) < 0) Index: configure.in =================================================================== RCS file: /data/cvs/libvirt/configure.in,v retrieving revision 1.187 diff -u -r1.187 configure.in --- a/configure.in 25 Nov 2008 15:48:11 -0000 1.187 +++ b/configure.in 26 Nov 2008 12:40:19 -0000 @@ -115,11 +115,15 @@ [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_PATH_PROG([BRCTL], [brctl], [brctl], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) +AC_PATH_PROG([UDEVSETTLE], [udevsettle], [udevsettle], + [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_DEFINE_UNQUOTED([DNSMASQ],["$DNSMASQ"], [Location or name of the dnsmasq program]) AC_DEFINE_UNQUOTED([BRCTL],["$BRCTL"], [Location or name of the brctl program (see bridge-utils)]) +AC_DEFINE_UNQUOTED([UDEVSETTLE],["$UDEVSETTLE"], + [Location or name of the udevsettle program (see udev)]) dnl Specific dir for HTML output ? AC_ARG_WITH([html-dir], [AC_HELP_STRING([--with-html-dir=path],

5 13

[libvirt] Concerning umlInotifyEvent
by Ron Yorston 02 Dec '08

02 Dec '08

At the top of umlInotifyEvent in uml_driver.c there is this test: if (watch != driver->inotifyWatch) return; This doesn't seem to be correct. I have to comment out the test to get libvirtd to work with UML. Ron

2 3