From patchwork Tue Jan 5 01:45:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TeLeMan X-Patchwork-Id: 42205 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5B3A9B6EEE for ; Wed, 6 Jan 2010 08:57:21 +1100 (EST) Received: from localhost ([127.0.0.1]:51807 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSHOw-0008Nz-Pr for incoming@patchwork.ozlabs.org; Tue, 05 Jan 2010 16:57:18 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NSFV5-0002er-RH for qemu-devel@nongnu.org; Tue, 05 Jan 2010 14:55:31 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NSFV1-0002cm-5S for qemu-devel@nongnu.org; Tue, 05 Jan 2010 14:55:31 -0500 Received: from [199.232.76.173] (port=43014 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSFV0-0002cY-MQ for qemu-devel@nongnu.org; Tue, 05 Jan 2010 14:55:26 -0500 Received: from mx20.gnu.org ([199.232.41.8]:36427) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NSFUx-0005C5-ON for qemu-devel@nongnu.org; Tue, 05 Jan 2010 14:55:24 -0500 Received: from mail-px0-f189.google.com ([209.85.216.189]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NRyVK-0000rb-Pd for qemu-devel@nongnu.org; Mon, 04 Jan 2010 20:46:38 -0500 Received: by pxi27 with SMTP id 27so9443067pxi.4 for ; Mon, 04 Jan 2010 17:45:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type; bh=YWS4ooGxPEGvKbmDFyfpnwO3MiY651jFxP6aLe1XCuU=; b=K7sqI4SIIbolCulJxFEtglQCnipbtAvMjLC1/rmKw2up0lPOanGdVo9m7lCbm+lYCe U6aXow3aqNWTH8u11gqJo0NSHalTyzDKwAYqEuA5HeZE8iQOiyEgWf5EN5lFfF3C8Y4O P8/n66sTR9F6MDwcjarHVml09Ao+L5LAv5Vzg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=ue0kNUjlEsflDtxHrewZijkJAMx9DOQ9v/HS3kRlo9m/larYHrv9OLFptEPMiKvSTR eSMdGyFVPCvFmI82AgmIfhVXuLEWz7zTYU2pSJPmOh1SWd9gnkERj4aiyPFMaSWtDd4j 3itk/p7WOgVqyOgiDKEzXEyosIC/1bVbGo434= MIME-Version: 1.0 Received: by 10.141.213.7 with SMTP id p7mr950073rvq.142.1262655934370; Mon, 04 Jan 2010 17:45:34 -0800 (PST) Date: Tue, 5 Jan 2010 09:45:34 +0800 Message-ID: From: TeLeMan To: qemu-devel X-detected-operating-system: by mx20.gnu.org: GNU/Linux 2.6 (newer, 2) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Subject: [Qemu-devel] [PATCH] fix chardev_init for win32 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Before calling chardev_init_func(), socket_init() should be called on win32. --- vl.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vl.c b/vl.c index 0f59142..3b39cad 100644 --- a/vl.c +++ b/vl.c @@ -5768,6 +5768,10 @@ int main(int argc, char **argv, char **envp) if (default_vga) vga_interface_type = VGA_CIRRUS; +#ifdef _WIN32 + socket_init(); +#endif + if (qemu_opts_foreach(&qemu_chardev_opts, chardev_init_func, NULL, 1) != 0) exit(1); @@ -5873,10 +5877,6 @@ int main(int argc, char **argv, char **envp) init_icount_adjust(); } -#ifdef _WIN32 - socket_init(); -#endif - if (net_init_clients() < 0) { exit(1); }