From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L8bOp-0004TA-SA
	for qemu-devel@nongnu.org; Fri, 05 Dec 2008 09:11:19 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L8bOn-0004Sy-DU
	for qemu-devel@nongnu.org; Fri, 05 Dec 2008 09:11:18 -0500
Received: from [199.232.76.173] (port=58713 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L8bOn-0004Sv-8Y
	for qemu-devel@nongnu.org; Fri, 05 Dec 2008 09:11:17 -0500
Received: from igw2.watson.ibm.com ([129.34.20.6]:50097)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <stefanb@us.ibm.com>) id 1L8bOm-0000Gu-Vk
	for qemu-devel@nongnu.org; Fri, 05 Dec 2008 09:11:17 -0500
Received: from mailhub4.watson.ibm.com (mailhub4.watson.ibm.com [129.34.20.46])
	by igw2.watson.ibm.com (8.13.1/8.13.1/8.13.1-2008-04-22 igw) with ESMTP
	id mB5EBKtJ027713
	for <qemu-devel@nongnu.org>; Fri, 5 Dec 2008 09:11:20 -0500
Received: from mailhub4.watson.ibm.com (localhost.localdomain [127.0.0.1])
	by mailhub4.watson.ibm.com (8.13.1/8.13.1/8.13.1-01-23-2007-Delivery)
	with ESMTP id mB5EBETT023663
	for <qemu-devel@nongnu.org>; Fri, 5 Dec 2008 09:11:14 -0500
Received: from [9.2.17.82] (gsal-3.watson.ibm.com [9.2.17.82])
	by mailhub4.watson.ibm.com (8.13.1/8.13.1/8.13.1-01-23-2007-IMSS) with
	ESMTP id mB5EBEqJ023660
	for <qemu-devel@nongnu.org>; Fri, 5 Dec 2008 09:11:14 -0500
From: Stefan Berger <stefanb@us.ibm.com>
Content-Type: multipart/mixed; boundary="=-CYdkXLsEOhBqlPTLHK9h"
Date: Fri, 05 Dec 2008 09:11:13 -0500
Message-Id: <1228486273.1245.1.camel@gsal-3.watson.ibm.com>
Mime-Version: 1.0
Subject: [Qemu-devel] More Win32 build fixes
Reply-To: stefanb@us.ibm.com, qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org


--=-CYdkXLsEOhBqlPTLHK9h
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

This fixes one more current build problem on Win32.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>



--=-CYdkXLsEOhBqlPTLHK9h
Content-Disposition: attachment; filename=win32_build_fix.diff
Content-Type: text/x-patch; name=win32_build_fix.diff; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: work/qemu/hw/pc.c
===================================================================
--- work.orig/qemu/hw/pc.c
+++ work/qemu/hw/pc.c
@@ -33,8 +33,10 @@
 #include "boards.h"
 #include "console.h"
 #include "fw_cfg.h"
+#ifndef _WIN32
 #include "virtio-blk.h"
 #include "virtio-balloon.h"
+#endif
 
 /* output Bochs bios info messages */
 #define DEBUG_BIOS
@@ -1100,6 +1102,7 @@ static void pc_init1(ram_addr_t ram_size
         }
     }
 
+#ifndef _WIN32
     /* Add virtio block devices */
     if (pci_enabled) {
         int index;
@@ -1115,6 +1118,7 @@ static void pc_init1(ram_addr_t ram_size
     /* Add virtio balloon device */
     if (pci_enabled)
         virtio_balloon_init(pci_bus);
+#endif
 }
 
 static void pc_init_pci(ram_addr_t ram_size, int vga_ram_size,

--=-CYdkXLsEOhBqlPTLHK9h--