[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 14/17] convert net_init_vde() to NetClientOptions
From: |
Laszlo Ersek |
Subject: |
[Qemu-devel] [PATCH v2 14/17] convert net_init_vde() to NetClientOptions |
Date: |
Wed, 13 Jun 2012 10:22:45 +0200 |
v1->v2:
- NetdevVdeOptions::port and ::mode are of type uint16. Remove superfluous
range checks.
Signed-off-by: Laszlo Ersek <address@hidden>
---
net/vde.c | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/net/vde.c b/net/vde.c
index 8e60f68..703888c 100644
--- a/net/vde.c
+++ b/net/vde.c
@@ -110,20 +110,17 @@ static int net_vde_init(VLANState *vlan, const char
*model,
return 0;
}
-int net_init_vde(QemuOpts *opts, const NetClientOptions *new_opts,
+int net_init_vde(QemuOpts *old_opts, const NetClientOptions *opts,
const char *name, VLANState *vlan)
{
- const char *sock;
- const char *group;
- int port, mode;
+ const NetdevVdeOptions *vde;
- sock = qemu_opt_get(opts, "sock");
- group = qemu_opt_get(opts, "group");
+ assert(opts->kind == NET_CLIENT_OPTIONS_KIND_VDE);
+ vde = opts->vde;
- port = qemu_opt_get_number(opts, "port", 0);
- mode = qemu_opt_get_number(opts, "mode", 0700);
-
- if (net_vde_init(vlan, "vde", name, sock, port, group, mode) == -1) {
+ /* missing optional values have been initialized to "all bits zero" */
+ if (net_vde_init(vlan, "vde", name, vde->sock, vde->port, vde->group,
+ vde->has_mode ? vde->mode : 0700) == -1) {
return -1;
}
--
1.7.1
- [Qemu-devel] [PATCH v2 02/17] qapi: generate C types for fixed-width integers, (continued)
- [Qemu-devel] [PATCH v2 02/17] qapi: generate C types for fixed-width integers, Laszlo Ersek, 2012/06/13
- [Qemu-devel] [PATCH v2 12/17] convert net_init_slirp() to NetClientOptions, Laszlo Ersek, 2012/06/13
- [Qemu-devel] [PATCH v2 10/17] convert net_init_nic() to NetClientOptions, Laszlo Ersek, 2012/06/13
- [Qemu-devel] [PATCH v2 13/17] convert net_init_socket() to NetClientOptions, Laszlo Ersek, 2012/06/13
- [Qemu-devel] [PATCH v2 08/17] hw, net: "net_client_type" -> "NetClientOptionsKind" (qapi-generated), Laszlo Ersek, 2012/06/13
- [Qemu-devel] [PATCH v2 17/17] remove unused QemuOpts parameter from net init functions, Laszlo Ersek, 2012/06/13
- [Qemu-devel] [PATCH v2 05/17] qapi: introduce OptsVisitor, Laszlo Ersek, 2012/06/13
- [Qemu-devel] [PATCH v2 14/17] convert net_init_vde() to NetClientOptions,
Laszlo Ersek <=
- [Qemu-devel] [PATCH v2 11/17] convert net_init_dump() to NetClientOptions, Laszlo Ersek, 2012/06/13
- [Qemu-devel] [PATCH v2 15/17] convert net_init_tap() to NetClientOptions, Laszlo Ersek, 2012/06/13
- [Qemu-devel] [PATCH v2 16/17] convert net_init_bridge() to NetClientOptions, Laszlo Ersek, 2012/06/13
- [Qemu-devel] [PATCH v2 09/17] convert net_client_init() to OptsVisitor, Laszlo Ersek, 2012/06/13
- Re: [Qemu-devel] [PATCH v2 00/17] introduce OptsVisitor, rebase -net/-netdev parsing, Paolo Bonzini, 2012/06/13