* [PATCH for-xen-4.5] xl: use nic global default values in network-attach
@ 2014-10-01 10:42 Roger Pau Monne
2014-10-01 10:46 ` Ian Campbell
0 siblings, 1 reply; 3+ messages in thread
From: Roger Pau Monne @ 2014-10-01 10:42 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, Ian Jackson, Ian Campbell, Roger Pau Monne
Introduce a new static function that will be used to set the initial nic
config based on the global defaults. This fixes a bug caused by
network-attach not using the default values set in xl.conf(5).
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
tools/libxl/xl_cmdimpl.c | 47 +++++++++++++++++++++++++++--------------------
1 file changed, 27 insertions(+), 20 deletions(-)
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index d205f96..94fb535 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -506,6 +506,30 @@ static void parse_vif_rate(XLU_Config **config, const char *rate,
}
}
+static void set_default_nic_values(libxl_device_nic *nic)
+{
+
+ if (default_vifscript) {
+ free(nic->script);
+ nic->script = strdup(default_vifscript);
+ }
+
+ if (default_bridge) {
+ free(nic->bridge);
+ nic->bridge = strdup(default_bridge);
+ }
+
+ if (default_gatewaydev) {
+ free(nic->gatewaydev);
+ nic->gatewaydev = strdup(default_gatewaydev);
+ }
+
+ if (default_vifbackend) {
+ free(nic->backend_domname);
+ nic->backend_domname = strdup(default_vifbackend);
+ }
+}
+
static void split_string_into_string_list(const char *str,
const char *delim,
libxl_string_list *psl)
@@ -1354,26 +1378,7 @@ static void parse_config_data(const char *config_source,
nic = d_config->nics + d_config->num_nics;
libxl_device_nic_init(nic);
nic->devid = d_config->num_nics;
-
- if (default_vifscript) {
- free(nic->script);
- nic->script = strdup(default_vifscript);
- }
-
- if (default_bridge) {
- free(nic->bridge);
- nic->bridge = strdup(default_bridge);
- }
-
- if (default_gatewaydev) {
- free(nic->gatewaydev);
- nic->gatewaydev = strdup(default_gatewaydev);
- }
-
- if (default_vifbackend) {
- free(nic->backend_domname);
- nic->backend_domname = strdup(default_vifbackend);
- }
+ set_default_nic_values(nic);
p = strtok(buf2, ",");
if (!p)
@@ -6005,6 +6010,8 @@ int main_networkattach(int argc, char **argv)
}
libxl_device_nic_init(&nic);
+ set_default_nic_values(&nic);
+
for (argv += optind+1, argc -= optind+1; argc > 0; ++argv, --argc) {
if (MATCH_OPTION("type", *argv, oparg)) {
if (!strcmp("vif", oparg)) {
--
1.9.3 (Apple Git-50)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH for-xen-4.5] xl: use nic global default values in network-attach
2014-10-01 10:42 [PATCH for-xen-4.5] xl: use nic global default values in network-attach Roger Pau Monne
@ 2014-10-01 10:46 ` Ian Campbell
2014-10-01 12:17 ` Ian Campbell
0 siblings, 1 reply; 3+ messages in thread
From: Ian Campbell @ 2014-10-01 10:46 UTC (permalink / raw)
To: Roger Pau Monne; +Cc: xen-devel, Ian Jackson, Wei Liu
On Wed, 2014-10-01 at 12:42 +0200, Roger Pau Monne wrote:
> Introduce a new static function that will be used to set the initial nic
> config based on the global defaults. This fixes a bug caused by
> network-attach not using the default values set in xl.conf(5).
>
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
I'm sure there is more unification which can be done for these things
but this is a step in the right direction, thanks!
> Cc: Wei Liu <wei.liu2@citrix.com>
> ---
> tools/libxl/xl_cmdimpl.c | 47 +++++++++++++++++++++++++++--------------------
> 1 file changed, 27 insertions(+), 20 deletions(-)
>
> diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
> index d205f96..94fb535 100644
> --- a/tools/libxl/xl_cmdimpl.c
> +++ b/tools/libxl/xl_cmdimpl.c
> @@ -506,6 +506,30 @@ static void parse_vif_rate(XLU_Config **config, const char *rate,
> }
> }
>
> +static void set_default_nic_values(libxl_device_nic *nic)
> +{
> +
> + if (default_vifscript) {
> + free(nic->script);
> + nic->script = strdup(default_vifscript);
> + }
> +
> + if (default_bridge) {
> + free(nic->bridge);
> + nic->bridge = strdup(default_bridge);
> + }
> +
> + if (default_gatewaydev) {
> + free(nic->gatewaydev);
> + nic->gatewaydev = strdup(default_gatewaydev);
> + }
> +
> + if (default_vifbackend) {
> + free(nic->backend_domname);
> + nic->backend_domname = strdup(default_vifbackend);
> + }
> +}
> +
> static void split_string_into_string_list(const char *str,
> const char *delim,
> libxl_string_list *psl)
> @@ -1354,26 +1378,7 @@ static void parse_config_data(const char *config_source,
> nic = d_config->nics + d_config->num_nics;
> libxl_device_nic_init(nic);
> nic->devid = d_config->num_nics;
> -
> - if (default_vifscript) {
> - free(nic->script);
> - nic->script = strdup(default_vifscript);
> - }
> -
> - if (default_bridge) {
> - free(nic->bridge);
> - nic->bridge = strdup(default_bridge);
> - }
> -
> - if (default_gatewaydev) {
> - free(nic->gatewaydev);
> - nic->gatewaydev = strdup(default_gatewaydev);
> - }
> -
> - if (default_vifbackend) {
> - free(nic->backend_domname);
> - nic->backend_domname = strdup(default_vifbackend);
> - }
> + set_default_nic_values(nic);
>
> p = strtok(buf2, ",");
> if (!p)
> @@ -6005,6 +6010,8 @@ int main_networkattach(int argc, char **argv)
> }
>
> libxl_device_nic_init(&nic);
> + set_default_nic_values(&nic);
> +
> for (argv += optind+1, argc -= optind+1; argc > 0; ++argv, --argc) {
> if (MATCH_OPTION("type", *argv, oparg)) {
> if (!strcmp("vif", oparg)) {
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH for-xen-4.5] xl: use nic global default values in network-attach
2014-10-01 10:46 ` Ian Campbell
@ 2014-10-01 12:17 ` Ian Campbell
0 siblings, 0 replies; 3+ messages in thread
From: Ian Campbell @ 2014-10-01 12:17 UTC (permalink / raw)
To: Roger Pau Monne; +Cc: xen-devel, Ian Jackson, Wei Liu
On Wed, 2014-10-01 at 11:46 +0100, Ian Campbell wrote:
> On Wed, 2014-10-01 at 12:42 +0200, Roger Pau Monne wrote:
> > Introduce a new static function that will be used to set the initial nic
> > config based on the global defaults. This fixes a bug caused by
> > network-attach not using the default values set in xl.conf(5).
> >
> > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> > Cc: Ian Jackson <ian.jackson@eu.citrix.com>
>
> Acked-by: Ian Campbell <ian.campbell@citrix.com>
>
> I'm sure there is more unification which can be done for these things
> but this is a step in the right direction, thanks!
Now applied.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-10-01 12:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-01 10:42 [PATCH for-xen-4.5] xl: use nic global default values in network-attach Roger Pau Monne
2014-10-01 10:46 ` Ian Campbell
2014-10-01 12:17 ` Ian Campbell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).