[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/19] convert net_init_vde() to NetClientOptions
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 16/19] convert net_init_vde() to NetClientOptions |
Date: |
Mon, 23 Jul 2012 12:50:41 +0100 |
From: Laszlo Ersek <address@hidden>
v1->v2:
- NetdevVdeOptions::port and ::mode are of type uint16. Remove superfluous
range checks.
Signed-off-by: Laszlo Ersek <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
net/vde.c | 17 +++++++----------
1 file 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.10.4
- [Qemu-devel] [PATCH 03/19] qapi: add test case for deallocating traversal of incomplete structure, (continued)
- [Qemu-devel] [PATCH 03/19] qapi: add test case for deallocating traversal of incomplete structure, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 02/19] qapi: fix error propagation, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 04/19] qapi: generate C types for fixed-width integers, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 01/19] MAINTAINERS: Replace net maintainer Mark McLoughlin with Stefan Hajnoczi, Stefan Hajnoczi, 2012/07/23
- [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 <=
- [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, 2012/07/23
- [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