From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NfZRz-0004bg-HR for qemu-devel@nongnu.org; Thu, 11 Feb 2010 08:51:23 -0500 Received: from [199.232.76.173] (port=57690 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfZRz-0004bX-2b for qemu-devel@nongnu.org; Thu, 11 Feb 2010 08:51:23 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NfZRu-0006d0-LU for qemu-devel@nongnu.org; Thu, 11 Feb 2010 08:51:21 -0500 Received: from mx20.gnu.org ([199.232.41.8]:46431) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NfZRt-0006Wy-8c for qemu-devel@nongnu.org; Thu, 11 Feb 2010 08:51:18 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NfZN8-0005PG-Av for qemu-devel@nongnu.org; Thu, 11 Feb 2010 08:46:22 -0500 Received: from blackfin.pond.sub.org (pD951BCD9.dip.t-dialin.net [217.81.188.217]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 9C8C2276D96 for ; Thu, 11 Feb 2010 14:45:03 +0100 (CET) From: Markus Armbruster Date: Thu, 11 Feb 2010 14:44:58 +0100 Message-Id: <1265895902-15664-3-git-send-email-armbru@redhat.com> In-Reply-To: <1265895902-15664-1-git-send-email-armbru@redhat.com> References: <1265895902-15664-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 2/6] net: net_check_clients() runs too early to see -device, fix List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Mark McLoughlin Call it right after -device devices get created. Signed-off-by: Markus Armbruster --- 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 f51d376..38b65f4 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 ecbd812..3467c10 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 98918ac..084604f 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 */ -- 1.6.6