[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/19] convert net_init_slirp() to NetClientOptions
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 14/19] convert net_init_slirp() to NetClientOptions |
Date: |
Mon, 23 Jul 2012 12:50:39 +0100 |
From: Laszlo Ersek <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
net/slirp.c | 93 ++++++++++++++++-------------------------------------------
1 file changed, 25 insertions(+), 68 deletions(-)
diff --git a/net/slirp.c b/net/slirp.c
index 1243d43..44b059f 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -686,89 +686,46 @@ void do_info_usernet(Monitor *mon)
}
}
-static int net_init_slirp_configs(const char *name, const char *value, void
*opaque)
+static void
+net_init_slirp_configs(const StringList *fwd, int flags)
{
- struct slirp_config_str *config;
-
- if (strcmp(name, "hostfwd") != 0 && strcmp(name, "guestfwd") != 0) {
- return 0;
- }
-
- config = g_malloc0(sizeof(*config));
+ while (fwd) {
+ struct slirp_config_str *config;
- pstrcpy(config->str, sizeof(config->str), value);
+ config = g_malloc0(sizeof(*config));
+ pstrcpy(config->str, sizeof(config->str), fwd->value->str);
+ config->flags = flags;
+ config->next = slirp_configs;
+ slirp_configs = config;
- if (!strcmp(name, "hostfwd")) {
- config->flags = SLIRP_CFG_HOSTFWD;
+ fwd = fwd->next;
}
-
- config->next = slirp_configs;
- slirp_configs = config;
-
- return 0;
}
-int net_init_slirp(QemuOpts *opts, const NetClientOptions *new_opts,
+int net_init_slirp(QemuOpts *old_opts, const NetClientOptions *opts,
const char *name, VLANState *vlan)
{
struct slirp_config_str *config;
- const char *vhost;
- const char *vhostname;
- const char *vdhcp_start;
- const char *vnamesrv;
- const char *tftp_export;
- const char *bootfile;
- const char *smb_export;
- const char *vsmbsrv;
- const char *restrict_opt;
- char *vnet = NULL;
- int restricted = 0;
+ char *vnet;
int ret;
+ const NetdevUserOptions *user;
- vhost = qemu_opt_get(opts, "host");
- vhostname = qemu_opt_get(opts, "hostname");
- vdhcp_start = qemu_opt_get(opts, "dhcpstart");
- vnamesrv = qemu_opt_get(opts, "dns");
- tftp_export = qemu_opt_get(opts, "tftp");
- bootfile = qemu_opt_get(opts, "bootfile");
- smb_export = qemu_opt_get(opts, "smb");
- vsmbsrv = qemu_opt_get(opts, "smbserver");
-
- restrict_opt = qemu_opt_get(opts, "restrict");
- if (restrict_opt) {
- if (!strcmp(restrict_opt, "on") ||
- !strcmp(restrict_opt, "yes") || !strcmp(restrict_opt, "y")) {
- restricted = 1;
- } else if (strcmp(restrict_opt, "off") &&
- strcmp(restrict_opt, "no") && strcmp(restrict_opt, "n")) {
- error_report("invalid option: 'restrict=%s'", restrict_opt);
- return -1;
- }
- }
-
- if (qemu_opt_get(opts, "ip")) {
- const char *ip = qemu_opt_get(opts, "ip");
- int l = strlen(ip) + strlen("/24") + 1;
+ assert(opts->kind == NET_CLIENT_OPTIONS_KIND_USER);
+ user = opts->user;
- vnet = g_malloc(l);
+ vnet = user->has_net ? g_strdup(user->net) :
+ user->has_ip ? g_strdup_printf("%s/24", user->ip) :
+ NULL;
- /* emulate legacy ip= parameter */
- pstrcpy(vnet, l, ip);
- pstrcat(vnet, l, "/24");
- }
-
- if (qemu_opt_get(opts, "net")) {
- if (vnet) {
- g_free(vnet);
- }
- vnet = g_strdup(qemu_opt_get(opts, "net"));
- }
+ /* all optional fields are initialized to "all bits zero" */
- qemu_opt_foreach(opts, net_init_slirp_configs, NULL, 0);
+ net_init_slirp_configs(user->hostfwd, SLIRP_CFG_HOSTFWD);
+ net_init_slirp_configs(user->guestfwd, 0);
- ret = net_slirp_init(vlan, "user", name, restricted, vnet, vhost,
- vhostname, tftp_export, bootfile, vdhcp_start,
- vnamesrv, smb_export, vsmbsrv);
+ ret = net_slirp_init(vlan, "user", name, user->restrict, vnet, user->host,
+ user->hostname, user->tftp, user->bootfile,
+ user->dhcpstart, user->dns, user->smb,
+ user->smbserver);
while (slirp_configs) {
config = slirp_configs;
--
1.7.10.4
- [Qemu-devel] [PULL 00/19] Net patches, Stefan Hajnoczi, 2012/07/23
- [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 <=
- [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, 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