From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MsweB-00032i-G0 for qemu-devel@nongnu.org; Wed, 30 Sep 2009 06:42:59 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mswe6-0002yX-6N for qemu-devel@nongnu.org; Wed, 30 Sep 2009 06:42:58 -0400 Received: from [199.232.76.173] (port=41727 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mswe4-0002y1-HO for qemu-devel@nongnu.org; Wed, 30 Sep 2009 06:42:52 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:55570) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mswe3-0000JD-2t for qemu-devel@nongnu.org; Wed, 30 Sep 2009 06:42:52 -0400 From: Isaku Yamahata Date: Wed, 30 Sep 2009 19:17:46 +0900 Message-Id: <1254305917-14784-11-git-send-email-yamahata@valinux.co.jp> In-Reply-To: <1254305917-14784-1-git-send-email-yamahata@valinux.co.jp> References: <1254305917-14784-1-git-send-email-yamahata@valinux.co.jp> Subject: [Qemu-devel] [PATCH 10/61] pc: remove a global variable, RTCState *rtc_state. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, anthony@codemonkey.ws Cc: yamahata@valinux.co.jp, Paolo Bonzini remove a global variable, RTCState *rtc_state. Only the cmos_set_s3_resume_init() needs it global. So introduce a registering function and make it local. As for other function which references the variable, pass it as a function argument. Signed-off-by: Isaku Yamahata Cc: Paolo Bonzini --- hw/pc.c | 25 ++++++++++++++++--------- hw/pc.h | 1 + 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 4d301ff..432f14b 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -61,8 +61,6 @@ #define MAX_IDE_BUS 2 -static RTCState *rtc_state; - typedef struct rom_reset_data { uint8_t *data; target_phys_addr_t addr; @@ -212,9 +210,9 @@ static int cmos_get_fd_drive_type(int fd0) return val; } -static void cmos_init_hd(int type_ofs, int info_ofs, BlockDriverState *hd) +static void cmos_init_hd(int type_ofs, int info_ofs, BlockDriverState *hd, + RTCState *s) { - RTCState *s = rtc_state; int cylinders, heads, sectors; bdrv_get_geometry_hint(hd, &cylinders, &heads, §ors); rtc_set_memory(s, type_ofs, 47); @@ -277,9 +275,8 @@ static int pc_boot_set(void *opaque, const char *boot_device) /* hd_table must contain 4 block drivers */ static void cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, const char *boot_device, DriveInfo **hd_table, - fdctrl_t *floppy_controller) + fdctrl_t *floppy_controller, RTCState *s) { - RTCState *s = rtc_state; int nbds, bds[3] = { 0, }; int val; int fd0, fd1, nb; @@ -368,9 +365,9 @@ static void cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, rtc_set_memory(s, 0x12, (hd_table[0] ? 0xf0 : 0) | (hd_table[1] ? 0x0f : 0)); if (hd_table[0]) - cmos_init_hd(0x19, 0x1b, hd_table[0]->bdrv); + cmos_init_hd(0x19, 0x1b, hd_table[0]->bdrv, s); if (hd_table[1]) - cmos_init_hd(0x1a, 0x24, hd_table[1]->bdrv); + cmos_init_hd(0x1a, 0x24, hd_table[1]->bdrv, s); val = 0; for (i = 0; i < 4; i++) { @@ -1151,6 +1148,7 @@ static void pc_init1(ram_addr_t ram_size, int using_vga = cirrus_vga_enabled || std_vga_enabled || vmsvga_enabled; void *fw_cfg; fdctrl_t *floppy_controller; + RTCState *rtc_state; PITState *pit; if (ram_size >= 0xe0000000 ) { @@ -1330,6 +1328,7 @@ static void pc_init1(ram_addr_t ram_size, } rtc_state = rtc_init(2000); + cmos_set_s3_resume_init(rtc_state); qemu_register_boot_set(pc_boot_set, rtc_state); @@ -1401,7 +1400,7 @@ static void pc_init1(ram_addr_t ram_size, floppy_controller = fdctrl_init_isa(fd); cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device, hd, - floppy_controller); + floppy_controller, rtc_state); if (pci_enabled && usb_enabled) { usb_uhci_piix3_init(pci_bus, piix3_devfn + 2); @@ -1475,10 +1474,18 @@ static void pc_init_isa(ram_addr_t ram_size, /* set CMOS shutdown status register (index 0xF) as S3_resume(0xFE) BIOS will read it and start S3 resume at POST Entry */ +static RTCState *rtc_state; +void cmos_set_s3_resume_init(RTCState *s) +{ + rtc_state = s; +} + void cmos_set_s3_resume(void) { +#if defined(TARGET_I386) if (rtc_state) rtc_set_memory(rtc_state, 0xF, 0xFE); +#endif } static QEMUMachine pc_machine = { diff --git a/hw/pc.h b/hw/pc.h index 818323e..d381a86 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -86,6 +86,7 @@ RTCState *rtc_mm_init(target_phys_addr_t base, int it_shift, qemu_irq irq, int base_year); void rtc_set_memory(RTCState *s, int addr, int val); void rtc_set_date(RTCState *s, const struct tm *tm); +void cmos_set_s3_resume_init(RTCState *s); void cmos_set_s3_resume(void); /* pc.c */ -- 1.6.0.2