motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 15:53:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add an opaque parameter to boot_set API, move function to monitor.c

Browse source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4763 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2008-06-20 16:25:06 +00:00
parent 3f05d3dc14
commit 3b4366de39
4 changed files with 17 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hw/pc.c
View file

@ -192,10 +192,10 @@ static int boot_device2nibble(char boot_device)
/* copy/pasted from cmos_init, should be made a general function
and used there as well */
int pc_boot_set(const char *boot_device)
static int pc_boot_set(void *opaque, const char *boot_device)
{
#define PC_MAX_BOOT_DEVICES 3
RTCState *s = rtc_state;
RTCState *s = (RTCState *)opaque;
int nbds, bds[3] = { 0, };
int i;
@ -741,8 +741,6 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
below_4g_mem_size = ram_size;
}
qemu_register_boot_set(pc_boot_set);
linux_boot = (kernel_filename != NULL);
/* init CPUs */
@ -917,6 +915,8 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
rtc_state = rtc_init(0x70, i8259[8]);
qemu_register_boot_set(pc_boot_set, rtc_state);
register_ioport_read(0x92, 1, 1, ioport92_read, NULL);
register_ioport_write(0x92, 1, 1, ioport92_write, NULL);