[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 6/9] net: qomify -netdev user
From: |
zwu . kernel |
Subject: |
[Qemu-devel] [RFC 6/9] net: qomify -netdev user |
Date: |
Mon, 26 Mar 2012 13:40:20 +0800 |
From: Zhi Yong Wu <address@hidden>
Signed-off-by: Zhi Yong Wu <address@hidden>
---
net/slirp.c | 42 ++++++++++++++++++++++++++++++++++++++----
net/slirp.h | 7 +++----
2 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/net/slirp.c b/net/slirp.c
index d3e56fc..62fea09 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -676,10 +676,7 @@ static int net_init_slirp_configs(const char *name, const
char *value, void *opa
return 0;
}
-int net_init_slirp(QemuOpts *opts,
- Monitor *mon,
- const char *name,
- NetClientState *peer)
+int net_init_slirp(NETDevice *net_dev)
{
struct slirp_config_str *config;
const char *vhost;
@@ -695,6 +692,11 @@ int net_init_slirp(QemuOpts *opts,
int restricted = 0;
int ret;
+ QemuOpts *opts = net_dev->opts;
+ //Monitor *mon = net_dev->mon;
+ char *name = g_strdup(net_dev->name);
+ NetClientState *peer = net_dev->peer;
+
vhost = qemu_opt_get(opts, "host");
vhostname = qemu_opt_get(opts, "hostname");
vdhcp_start = qemu_opt_get(opts, "dhcpstart");
@@ -777,3 +779,35 @@ int net_slirp_parse_legacy(QemuOptsList *opts_list, const
char *optarg, int *ret
return 1;
}
+static hostdevProperty net_user_properties[] = {
+ //DEFINE_HOSTDEV_PROP_INT32("link_down", NetClientState,link_down, 0),
+ DEFINE_HOSTDEV_PROP_PEER("peer", NetClientState, peer),
+ DEFINE_HOSTDEV_PROP_STRING("name", NetClientState, name),
+ //DEFINE_HOSTDEV_PROP_BIT("receive_disabled", NetClientState,
receive_disabled, 0, true),
+ DEFINE_HOSTDEV_PROP_END_OF_LIST(),
+};
+
+static void net_user_class_init(ObjectClass *klass, void *data)
+{
+ NETDeviceClass *k = NETDEV_CLASS(klass);
+ HOSTDeviceClass *dc = HOSTDEV_CLASS(klass);
+
+ k->init = net_init_slirp;
+ dc->props = net_user_properties;
+}
+
+static TypeInfo net_user_type = {
+ .name = "user",
+ .parent = TYPE_NETDEV,
+ .instance_size = sizeof(NETDevice),
+ .class_init = net_user_class_init,
+};
+
+static void net_user_register_types(void)
+{
+#ifdef CONFIG_SLIRP
+ type_register_static(&net_user_type);
+#endif
+}
+
+type_init(net_user_register_types)
diff --git a/net/slirp.h b/net/slirp.h
index e6000af..1364347 100644
--- a/net/slirp.h
+++ b/net/slirp.h
@@ -27,13 +27,12 @@
#include "qemu-common.h"
#include "qdict.h"
#include "qemu-option.h"
+#include "qemu/hostdev.h"
+#include "net.h"
#ifdef CONFIG_SLIRP
-int net_init_slirp(QemuOpts *opts,
- Monitor *mon,
- const char *name,
- NetClientState *peer);
+int net_init_slirp(NETDevice *net_dev);
void net_slirp_hostfwd_add(Monitor *mon, const QDict *qdict);
void net_slirp_hostfwd_remove(Monitor *mon, const QDict *qdict);
--
1.7.6
- [Qemu-devel] [RFC 1/9] hostdev: introduce the infrastructure for host device model, (continued)
- [Qemu-devel] [RFC 1/9] hostdev: introduce the infrastructure for host device model, zwu . kernel, 2012/03/26
- [Qemu-devel] [PATCH] net: qomify -netdev, zwu . kernel, 2012/03/26
- [Qemu-devel] [RFC 4/9] net: adjust nic init API, zwu . kernel, 2012/03/26
- [Qemu-devel] [RFC 3/9] net: adjust net common part for qomify -netdev, zwu . kernel, 2012/03/26
- [Qemu-devel] [RFC 2/9] net: introduce one net host device class, zwu . kernel, 2012/03/26
- [Qemu-devel] [RFC 6/9] net: qomify -netdev user,
zwu . kernel <=
- [Qemu-devel] [PATCH] net: qomify -netdev, zwu . kernel, 2012/03/26
- [Qemu-devel] [RFC 7/9] net: qomify -netdev socket, zwu . kernel, 2012/03/26
- [Qemu-devel] [RFC 8/9] net: qomify -netdev vde, zwu . kernel, 2012/03/26
- [Qemu-devel] [RFC 5/9] net: adjust dump init API, zwu . kernel, 2012/03/26
- [Qemu-devel] [RFC 9/9] net: qomify -netdev tap & -netdev bridge, zwu . kernel, 2012/03/26
- Re: [Qemu-devel] [RFC 0/9] QOM: qomify -netdev, Stefan Hajnoczi, 2012/03/26