From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?ISO-8859-1?Q?Roger_Pau_Monn=E9?= Subject: Re: [PATCH 2/2] libxl: Add vif.default.backend to xl.conf Date: Fri, 5 Jul 2013 13:47:22 +0200 Message-ID: <51D6B24A.7050900@citrix.com> References: <1373022835-3807-1-git-send-email-george.dunlap@eu.citrix.com> <1373022835-3807-2-git-send-email-george.dunlap@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <1373022835-3807-2-git-send-email-george.dunlap@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: George Dunlap Cc: Ian Jackson , Ian Campbell , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On 05/07/13 13:13, George Dunlap wrote: > This will allow a user to default to a network driver domain > system-wide. > = > Signed-off-by: George Dunlap > CC: Ian Campbell > CC: Ian Jackson > CC: Roger Pau Monne Acked-by: Roger Pau Monn=E9 (Just one nit below) > --- > docs/man/xl.conf.pod.5 | 6 ++++++ > tools/examples/xl.conf | 4 ++++ > tools/libxl/xl.c | 5 +++++ > tools/libxl/xl.h | 1 + > tools/libxl/xl_cmdimpl.c | 6 ++++++ > 5 files changed, 22 insertions(+) > = > diff --git a/docs/man/xl.conf.pod.5 b/docs/man/xl.conf.pod.5 > index 1229c8a..d8d1bb1 100644 > --- a/docs/man/xl.conf.pod.5 > +++ b/docs/man/xl.conf.pod.5 > @@ -93,6 +93,12 @@ The old B option is deprecated and shou= ld not be used. > = > Default: C > = > +=3Ditem B > + > +Configures the default backend to set for virtual network devices. > + > +Default: C<0> > + > =3Ditem B > = > Configures the default gateway device to set for virtual network devices. > diff --git a/tools/examples/xl.conf b/tools/examples/xl.conf > index 9c037a6..7b081d2 100644 > --- a/tools/examples/xl.conf > +++ b/tools/examples/xl.conf > @@ -19,6 +19,10 @@ > # launched by udev. > #run_hotplug_scripts=3D1 > = > +# default backend domain to connect guest vifs to. This can be any > +# valid domain identifier. > +#vif.default.backend=3D"0" > + > # default gateway device to use with vif-route hotplug script > #vif.default.gatewaydev=3D"eth0" > = > diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c > index 1ce820c..c694e8f 100644 > --- a/tools/libxl/xl.c > +++ b/tools/libxl/xl.c > @@ -45,6 +45,7 @@ char *lockfile; > char *default_vifscript =3D NULL; > char *default_bridge =3D NULL; > char *default_gatewaydev =3D NULL; > +char *default_vifbackend =3D NULL; > enum output_format default_output_format =3D OUTPUT_FORMAT_JSON; > int claim_mode =3D 0; > = > @@ -158,6 +159,10 @@ static void parse_global_config(const char *configfi= le, > if (!xlu_cfg_get_string (config, "vif.default.gatewaydev", &buf, 0)) > default_gatewaydev =3D strdup(buf); > = > + There's an extra new line here. > + if (!xlu_cfg_get_string (config, "vif.default.backend", &buf, 0)) > + default_vifbackend =3D strdup(buf); > + > if (!xlu_cfg_get_string (config, "output_format", &buf, 0)) { > if (!strcmp(buf, "json")) > default_output_format =3D OUTPUT_FORMAT_JSON; > diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h > index 5ad3e17..e72a7d2 100644 > --- a/tools/libxl/xl.h > +++ b/tools/libxl/xl.h > @@ -151,6 +151,7 @@ extern char *lockfile; > extern char *default_vifscript; > extern char *default_bridge; > extern char *default_gatewaydev; > +extern char *default_vifbackend; > extern char *blkdev_start; > = > enum output_format { > diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c > index 8a478ba..f670c6c 100644 > --- a/tools/libxl/xl_cmdimpl.c > +++ b/tools/libxl/xl_cmdimpl.c > @@ -1125,6 +1125,11 @@ static void parse_config_data(const char *config_s= ource, > nic->gatewaydev =3D strdup(default_gatewaydev); > } > = > + if (default_vifbackend) { > + free(nic->backend_domname); > + nic->backend_domname =3D strdup(default_vifbackend); > + } > + > p =3D strtok(buf2, ","); > if (!p) > goto skip_nic; > @@ -1174,6 +1179,7 @@ static void parse_config_data(const char *config_so= urce, > free(nic->ifname); > nic->ifname =3D strdup(p2 + 1); > } else if (!strcmp(p, "backend")) { > + free(nic->backend_domname); > nic->backend_domname =3D strdup(p2 + 1); > } else if (!strcmp(p, "rate")) { > parse_vif_rate(&config, (p2 + 1), nic); > =