[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 17/18] convert net_init_bridge() to NetClientOpti
From: |
Laszlo Ersek |
Subject: |
[Qemu-devel] [PATCH v3 17/18] convert net_init_bridge() to NetClientOptions |
Date: |
Tue, 17 Jul 2012 16:17:20 +0200 |
Signed-off-by: Laszlo Ersek <address@hidden>
---
net/tap.c | 23 ++++++++++++-----------
1 files 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.1
- [Qemu-devel] [PATCH v3 06/18] qapi: introduce OptsVisitor, (continued)
- [Qemu-devel] [PATCH v3 06/18] qapi: introduce OptsVisitor, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 08/18] qapi schema: add Netdev types, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 09/18] hw, net: "net_client_type" -> "NetClientOptionsKind" (qapi-generated), Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 10/18] convert net_client_init() to OptsVisitor, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 13/18] convert net_init_slirp() to NetClientOptions, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 11/18] convert net_init_nic() to NetClientOptions, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 12/18] convert net_init_dump() to NetClientOptions, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 18/18] remove unused QemuOpts parameter from net init functions, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 16/18] convert net_init_tap() to NetClientOptions, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 15/18] convert net_init_vde() to NetClientOptions, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 17/18] convert net_init_bridge() to NetClientOptions,
Laszlo Ersek <=
- [Qemu-devel] [PATCH v3 14/18] convert net_init_socket() to NetClientOptions, Laszlo Ersek, 2012/07/17
- Re: [Qemu-devel] [PATCH v3 00/18] introduce OptsVisitor, rebase -net/-netdev parsing, Stefan Hajnoczi, 2012/07/20