From 668680f75feea79704c603b96126c0833e1ed9a9 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 11 Feb 2010 14:44:58 +0100 Subject: [PATCH] net: net_check_clients() runs too early to see -device, fix Call it right after -device devices get created. Signed-off-by: Markus Armbruster Signed-off-by: Anthony Liguori --- net.c | 4 +--- net.h | 1 + vl.c | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/net.c b/net.c index f51d376130..38b65f4905 100644 --- 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 ecbd8122a0..3467c10878 100644 --- a/net.h +++ b/net.h @@ -165,6 +165,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 98918ac49d..084604ff9e 100644 --- a/vl.c +++ b/vl.c @@ -5897,6 +5897,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 */ -- GitLab