Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

[qemu.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 73dc49a3a412e7f1b4c328d17d3805c8b7b60ada..9fa2cd8d516775e92d4150cc9fd0cc9214bbf8cb 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -26,6 +26,7 @@
 #include "net/net.h"
 #include "clients.h"
 #include "monitor/monitor.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qemu/option.h"
@@ -704,7 +705,7 @@ int net_init_socket(const NetClientOptions *opts, const char *name,
     const NetdevSocketOptions *sock;
 
     assert(opts->type == NET_CLIENT_OPTIONS_KIND_SOCKET);
-    sock = opts->u.socket;
+    sock = opts->u.socket.data;
 
     if (sock->has_fd + sock->has_listen + sock->has_connect + sock->has_mcast +
         sock->has_udp != 1) {