Merge remote-tracking branch 'remotes/agraf/tags/signed-s390-for-upstream' into staging

[qemu.git] / net / dump.c

diff --git a/net/dump.c b/net/dump.c
index 41f7673efdb8ec41627729e6d8c1f1de17a46343..89a149b5ddbc8fba055a8f9d70017a04a20c48a8 100644 (file)
--- a/net/dump.c
+++ b/net/dump.c
@@ -172,14 +172,14 @@ static void dumpclient_cleanup(NetClientState *nc)
 }
 
 static NetClientInfo net_dump_info = {
 }
 
 static NetClientInfo net_dump_info = {

-    .type = NET_CLIENT_OPTIONS_KIND_DUMP,
+    .type = NET_CLIENT_DRIVER_DUMP,

     .size = sizeof(DumpNetClient),
     .receive = dumpclient_receive,
     .receive_iov = dumpclient_receive_iov,
     .cleanup = dumpclient_cleanup,
 };
 
     .size = sizeof(DumpNetClient),
     .receive = dumpclient_receive,
     .receive_iov = dumpclient_receive_iov,
     .cleanup = dumpclient_cleanup,
 };
 

-int net_init_dump(const NetClientOptions *opts, const char *name,
+int net_init_dump(const Netdev *netdev, const char *name,

                   NetClientState *peer, Error **errp)
 {
     int len, rc;
                   NetClientState *peer, Error **errp)
 {
     int len, rc;


@@ -189,8 +189,8 @@ int net_init_dump(const NetClientOptions *opts, const char *name,
     NetClientState *nc;
     DumpNetClient *dnc;
 
     NetClientState *nc;
     DumpNetClient *dnc;
 

-    assert(opts->type == NET_CLIENT_OPTIONS_KIND_DUMP);
-    dump = opts->u.dump.data;
+    assert(netdev->type == NET_CLIENT_DRIVER_DUMP);
+    dump = &netdev->u.dump;

 
     assert(peer);
 
 
     assert(peer);