[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/19] convert net_init_bridge() to NetClientOptions
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 18/19] convert net_init_bridge() to NetClientOptions |
Date: |
Mon, 23 Jul 2012 12:50:43 +0100 |
From: Laszlo Ersek <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
net/tap.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/net/tap.c b/net/tap.c
index c5563c0..d2736ea 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -513,21 +513,22 @@ static int net_bridge_run_helper(const char *helper,
const char *bridge)
return -1;
}
-int net_init_bridge(QemuOpts *opts, const NetClientOptions *new_opts,
+int net_init_bridge(QemuOpts *old_opts, const NetClientOptions *opts,
const char *name, VLANState *vlan)
{
+ const NetdevBridgeOptions *bridge;
+ const char *helper, *br;
+
TAPState *s;
int fd, vnet_hdr;
- if (!qemu_opt_get(opts, "br")) {
- qemu_opt_set(opts, "br", DEFAULT_BRIDGE_INTERFACE);
- }
- if (!qemu_opt_get(opts, "helper")) {
- qemu_opt_set(opts, "helper", DEFAULT_BRIDGE_HELPER);
- }
+ assert(opts->kind == NET_CLIENT_OPTIONS_KIND_BRIDGE);
+ bridge = opts->bridge;
+
+ helper = bridge->has_helper ? bridge->helper : DEFAULT_BRIDGE_HELPER;
+ br = bridge->has_br ? bridge->br : DEFAULT_BRIDGE_INTERFACE;
- fd = net_bridge_run_helper(qemu_opt_get(opts, "helper"),
- qemu_opt_get(opts, "br"));
+ fd = net_bridge_run_helper(helper, br);
if (fd == -1) {
return -1;
}
@@ -542,8 +543,8 @@ int net_init_bridge(QemuOpts *opts, const NetClientOptions
*new_opts,
return -1;
}
- snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s,br=%s",
- qemu_opt_get(opts, "helper"), qemu_opt_get(opts, "br"));
+ snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s,br=%s", helper,
+ br);
return 0;
}
--
1.7.10.4
- [Qemu-devel] [PATCH 12/19] convert net_init_nic() to NetClientOptions, (continued)
- [Qemu-devel] [PATCH 12/19] convert net_init_nic() to NetClientOptions, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 19/19] remove unused QemuOpts parameter from net init functions, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 08/19] qapi schema: remove trailing whitespace, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 14/19] convert net_init_slirp() to NetClientOptions, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 11/19] convert net_client_init() to OptsVisitor, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 10/19] hw, net: "net_client_type" -> "NetClientOptionsKind" (qapi-generated), Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 16/19] convert net_init_vde() to NetClientOptions, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 15/19] convert net_init_socket() to NetClientOptions, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 17/19] convert net_init_tap() to NetClientOptions, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 05/19] qapi: introduce "size" type, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 18/19] convert net_init_bridge() to NetClientOptions,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 13/19] convert net_init_dump() to NetClientOptions, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 06/19] expose QemuOpt and QemuOpts struct definitions to interested parties, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 07/19] qapi: introduce OptsVisitor, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 09/19] qapi schema: add Netdev types, Stefan Hajnoczi, 2012/07/23