From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Lfyn9-0008Re-71
	for qemu-devel@nongnu.org; Sat, 07 Mar 2009 10:50:23 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Lfyn8-0008RF-7E
	for qemu-devel@nongnu.org; Sat, 07 Mar 2009 10:50:22 -0500
Received: from [199.232.76.173] (port=54134 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Lfyn8-0008RC-3j
	for qemu-devel@nongnu.org; Sat, 07 Mar 2009 10:50:22 -0500
Received: from savannah.gnu.org ([199.232.41.3]:53755 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <blauwirbel@gmail.com>)
	id 1Lfyn7-0002kl-Ot
	for qemu-devel@nongnu.org; Sat, 07 Mar 2009 10:50:21 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <blauwirbel@gmail.com>) id 1Lfyn5-0007qO-No
	for qemu-devel@nongnu.org; Sat, 07 Mar 2009 15:50:21 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1Lfyn4-0007qJ-Uk
	for qemu-devel@nongnu.org; Sat, 07 Mar 2009 15:50:19 +0000
MIME-Version: 1.0
Errors-To: blueswir1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Blue Swirl <blauwirbel@gmail.com>
Message-Id: <E1Lfyn4-0007qJ-Uk@cvs.savannah.gnu.org>
Date: Sat, 07 Mar 2009 15:50:18 +0000
Subject: [Qemu-devel] [6738] Sparse fixes: move ACPI table definitions to
	pc.h
Reply-To: 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

Revision: 6738
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6738
Author:   blueswir1
Date:     2009-03-07 15:50:18 +0000 (Sat, 07 Mar 2009)
Log Message:
-----------
Sparse fixes: move ACPI table definitions to pc.h

Modified Paths:
--------------
    trunk/hw/pc.c
    trunk/hw/pc.h

Modified: trunk/hw/pc.c
===================================================================
--- trunk/hw/pc.c	2009-03-07 15:46:23 UTC (rev 6737)
+++ trunk/hw/pc.c	2009-03-07 15:50:18 UTC (rev 6738)
@@ -54,9 +54,6 @@
 
 #define MAX_IDE_BUS 2
 
-extern uint8_t *acpi_tables;
-extern size_t acpi_tables_len;
-
 static fdctrl_t *floppy_controller;
 static RTCState *rtc_state;
 static PITState *pit;
@@ -443,7 +440,8 @@
     fw_cfg = fw_cfg_init(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 1, 0, 0);
     fw_cfg_add_i32(fw_cfg, FW_CFG_ID, 1);
     fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
-    fw_cfg_add_bytes(fw_cfg, FW_CFG_ACPI_TABLES, acpi_tables, acpi_tables_len);
+    fw_cfg_add_bytes(fw_cfg, FW_CFG_ACPI_TABLES, (uint8_t *)acpi_tables,
+                     acpi_tables_len);
 }
 
 /* Generate an initial boot sector which sets state and jump to

Modified: trunk/hw/pc.h
===================================================================
--- trunk/hw/pc.h	2009-03-07 15:46:23 UTC (rev 6737)
+++ trunk/hw/pc.h	2009-03-07 15:50:18 UTC (rev 6738)
@@ -101,6 +101,9 @@
 
 /* acpi.c */
 extern int acpi_enabled;
+extern char *acpi_tables;
+extern size_t acpi_tables_len;
+
 i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
                        qemu_irq sci_irq);
 void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr);