[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 7/9] net: qomify -netdev socket
From: |
zwu . kernel |
Subject: |
[Qemu-devel] [RFC 7/9] net: qomify -netdev socket |
Date: |
Mon, 26 Mar 2012 13:40:21 +0800 |
From: Zhi Yong Wu <address@hidden>
Signed-off-by: Zhi Yong Wu <address@hidden>
---
net/socket.c | 38 ++++++++++++++++++++++++++++++++++----
net/socket.h | 4 ++--
2 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/net/socket.c b/net/socket.c
index 55d9820..fe18e87 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -31,6 +31,7 @@
#include "qemu-error.h"
#include "qemu-option.h"
#include "qemu_socket.h"
+#include "qemu/hostdev.h"
typedef struct NetSocketState {
NetClientState nc;
@@ -587,11 +588,13 @@ static int net_socket_udp_init(NetClientState *peer,
return 0;
}
-int net_init_socket(QemuOpts *opts,
- Monitor *mon,
- const char *name,
- NetClientState *peer)
+int net_init_socket(NETDevice *net_dev)
{
+ QemuOpts *opts = net_dev->opts;
+ Monitor *mon = net_dev->mon;
+ char *name = g_strdup(net_dev->name);
+ NetClientState *peer = net_dev->peer;
+
if (qemu_opt_get(opts, "fd")) {
int fd;
@@ -690,3 +693,30 @@ int net_init_socket(QemuOpts *opts,
}
return 0;
}
+
+static hostdevProperty net_socket_properties[] = {
+ DEFINE_HOSTDEV_PROP_END_OF_LIST(),
+};
+
+static void net_socket_class_init(ObjectClass *klass, void *data)
+{
+ NETDeviceClass *k = NETDEV_CLASS(klass);
+ HOSTDeviceClass *dc = HOSTDEV_CLASS(klass);
+
+ k->init = net_init_socket;
+ dc->props = net_socket_properties;
+}
+
+static TypeInfo net_socket_type = {
+ .name = "socket",
+ .parent = TYPE_NETDEV,
+ .instance_size = sizeof(NetClientState),
+ .class_init = net_socket_class_init,
+};
+
+static void net_socket_register_types(void)
+{
+ type_register_static(&net_socket_type);
+}
+
+type_init(net_socket_register_types)
diff --git a/net/socket.h b/net/socket.h
index 5edf17c..1ac7c85 100644
--- a/net/socket.h
+++ b/net/socket.h
@@ -26,8 +26,8 @@
#include "net.h"
#include "qemu-common.h"
+#include "qemu/hostdev.h"
-int net_init_socket(QemuOpts *opts, Monitor *mon,
- const char *name, NetClientState *peer);
+int net_init_socket(NETDevice *net_dev);
#endif /* QEMU_NET_SOCKET_H */
--
1.7.6
- Re: [Qemu-devel] [RFC 1/9] hostdev: introduce the infrastructure for host device model, (continued)
- [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, 2012/03/26
- [Qemu-devel] [PATCH] net: qomify -netdev, zwu . kernel, 2012/03/26
- [Qemu-devel] [RFC 7/9] net: qomify -netdev socket,
zwu . kernel <=
- [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
- Re: [Qemu-devel] [RFC 0/9] QOM: qomify -netdev, Andreas Färber, 2012/03/26