- Devel - libvirt List Archives

[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