From patchwork Sat Mar 9 09:56:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 226324 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 73F4C2C02EB for ; Sat, 9 Mar 2013 20:57:07 +1100 (EST) Received: from localhost ([::1]:53169 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UEGWX-00009F-Oa for incoming@patchwork.ozlabs.org; Sat, 09 Mar 2013 04:57:05 -0500 Received: from eggs.gnu.org ([208.118.235.92]:44906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UEGW6-0008TP-V3 for qemu-devel@nongnu.org; Sat, 09 Mar 2013 04:56:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UEGW1-0005Br-Vy for qemu-devel@nongnu.org; Sat, 09 Mar 2013 04:56:38 -0500 Received: from mail-la0-x235.google.com ([2a00:1450:4010:c03::235]:37570) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UEGW1-0005BY-PU for qemu-devel@nongnu.org; Sat, 09 Mar 2013 04:56:33 -0500 Received: by mail-la0-f53.google.com with SMTP id fr10so2494500lab.12 for ; Sat, 09 Mar 2013 01:56:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references; bh=rALX/Y5MFOtx3fGm0Te94UwhIrJdpCgwgnz3LgRRrlY=; b=z121BByE2KYBMlGAI++f/zWOJ1Yj6withAl29fBbJWdkqQDUN6XT0gwnKlDkJ+al5E Xggg7iV23NRNYDiTmyBPD2yFcC+jZdbuIoNu+SmIzvlpjOoAB9Oz5U2lq/m64XgJcSki BBs5lUwy+qc7h2v8Q4B62O2tI3oYinsGpWQlf3iqhScxgiDallPICtnokpavCVw74JcY c/5BVF08IxX7uspsKdiFa8ofjvHmWn7HZ06Bmqu9DVHiwEBBr2U8WDfYWMEBeMfuewpz 7vpsGMYo/d/ociCVTAOjqjxopKs+FzNOxCGHJRCN8LTNBm+DL28gmcJMR29PyqL6RL2B /rbg== X-Received: by 10.152.45.140 with SMTP id n12mr4620845lam.36.1362822992727; Sat, 09 Mar 2013 01:56:32 -0800 (PST) Received: from localhost.localdomain ([2001:5c0:1500:5a00:7d18:4c66:8375:d790]) by mx.google.com with ESMTPS id oy10sm3893294lab.8.2013.03.09.01.56.29 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 09 Mar 2013 01:56:31 -0800 (PST) From: Blue Swirl To: qemu-devel@nongnu.org, aliguori@us.ibm.com, amit.shah@redhat.com Date: Sat, 9 Mar 2013 09:56:04 +0000 Message-Id: <0ba5565b1ed44380c57d4a5fab86e9549f581ebf.1362822910.git.blauwirbel@gmail.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::235 Cc: blauwirbel@gmail.com Subject: [Qemu-devel] [PATCH 2/2] qemu-char: fix win32 build X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 96c6384776d631839a9c8fe02bf135f9ba22586c did not adjust Win32 #ifdeffery properly, breaking build in later commits. Fix. Signed-off-by: Blue Swirl Tested-by: Igor Mitsyanko --- qemu-char.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index b82d643..04aa589 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -535,8 +535,6 @@ int send_all(int fd, const void *_buf, int len1) } #endif /* !_WIN32 */ -#ifndef _WIN32 - typedef struct IOWatchPoll { GSource *src; @@ -634,6 +632,7 @@ static guint io_add_watch_poll(GIOChannel *channel, return tag; } +#ifndef _WIN32 static GIOChannel *io_channel_from_fd(int fd) { GIOChannel *chan; @@ -649,6 +648,7 @@ static GIOChannel *io_channel_from_fd(int fd) return chan; } +#endif static GIOChannel *io_channel_from_socket(int fd) { @@ -699,6 +699,8 @@ static int io_channel_send_all(GIOChannel *fd, const void *_buf, int len1) return len1 - len; } +#ifndef _WIN32 + typedef struct FDCharDriver { CharDriverState *chr; GIOChannel *fd_in, *fd_out;