net: net_check_clients() runs too early to see -device, fix

Call it right after -device devices get created.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 668680f75feea79704c603b96126c0833e1ed9a9)

diff --git a/net.c b/net.c
index f51d3761301aead39902df5b7edfbd20b2cd7ea1..38b65f49050869f672598f7c33d72ef647a02f16 100644 (file)
--- a/net.c
+++ b/net.c
@@ -1275,7 +1275,7 @@ void net_cleanup(void)
     }
 }
 
-static void net_check_clients(void)
+void net_check_clients(void)
 {
     VLANState *vlan;
 
@@ -1323,8 +1323,6 @@ int net_init_clients(void)
         return -1;
     }
 
-    net_check_clients();
-
     return 0;
 }
 

diff --git a/net.h b/net.h
index a9dc826706eeee487704126e828f792b48591181..7919967107d2e7b7fd8ac7f9d062ea19e196050c 100644 (file)
--- a/net.h
+++ b/net.h
@@ -162,6 +162,7 @@ extern const char *legacy_bootp_filename;
 int net_client_init(Monitor *mon, QemuOpts *opts, int is_netdev);
 int net_client_parse(QemuOptsList *opts_list, const char *str);
 int net_init_clients(void);
+void net_check_clients(void);
 void net_cleanup(void);
 void net_set_boot_mask(int boot_mask);
 void net_host_device_add(Monitor *mon, const QDict *qdict);

diff --git a/vl.c b/vl.c
index 3b5a8e01bfebcbd4ebf6da5e57c6f160955b00a8..40b07fe9349d5f093abe8954804dca283ddfa2a1 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -5969,6 +5969,8 @@ int main(int argc, char **argv, char **envp)
     if (qemu_opts_foreach(&qemu_device_opts, device_init_func, NULL, 1) != 0)
         exit(1);
 
+    net_check_clients();
+
     if (!display_state)
         dumb_display_init();
     /* just use the first displaystate for the moment */