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

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4763 c046a42c-6fe2-441c-8c8c-71466251a162

2 files changed, 6 insertions, 7 deletions

diff --git a/hw/hw.h b/hw/hw.h
index 2a461026e1..b84ace07fc 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -94,9 +94,8 @@ void qemu_register_reset(QEMUResetHandler *func, void *opaque);
 
 /* handler to set the boot_device for a specific type of QEMUMachine */
 /* return 0 if success */
-typedef int QEMUBootSetHandler(const char *boot_device);
-extern QEMUBootSetHandler *qemu_boot_set_handler;
-void qemu_register_boot_set(QEMUBootSetHandler *func);
+typedef int QEMUBootSetHandler(void *opaque, const char *boot_device);
+void qemu_register_boot_set(QEMUBootSetHandler *func, void *opaque);
 
 /* These should really be in isa.h, but are here to make pc.h happy.  */
 typedef void (IOPortWriteFunc)(void *opaque, uint32_t address, uint32_t data);
diff --git a/hw/pc.c b/hw/pc.c
index 3edeb502c7..4c5e1c3437 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -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);