[SerialICE] r61 - in trunk/qemu-0.11.0: . hw
svn at coresystems.de
svn at coresystems.de
Sat Nov 21 00:59:55 CET 2009
Author: stepan
Date: 2009-11-21 00:59:54 +0100 (Sat, 21 Nov 2009)
New Revision: 61
Modified:
trunk/qemu-0.11.0/hw/pc.c
trunk/qemu-0.11.0/serialice.c
Log:
Drop requirement for SerialICE specific machine type in Qemu.
NOTE: This still means that there are SerialICE specific changes in hw/pc.c but
we can now start qemu without -M serialice and it will pick up the SerialICE
target just by specifying -serialice /dev/ttyS0
Signed-off-by: Stefan Reinauer <stepan at coresystems.de>
Modified: trunk/qemu-0.11.0/hw/pc.c
===================================================================
--- trunk/qemu-0.11.0/hw/pc.c 2009-11-20 22:16:48 UTC (rev 60)
+++ trunk/qemu-0.11.0/hw/pc.c 2009-11-20 23:59:54 UTC (rev 61)
@@ -1481,24 +1481,6 @@
initrd_filename, cpu_model, 0);
}
-#ifdef CONFIG_SERIALICE
-static void serialice_init_pci(ram_addr_t ram_size,
- const char *boot_device,
- const char *kernel_filename,
- const char *kernel_cmdline,
- const char *initrd_filename,
- const char *cpu_model)
-{
- serialice_active = 1;
-
- pc_init1(ram_size, boot_device,
- kernel_filename, kernel_cmdline,
- initrd_filename, cpu_model, 1);
-
- serialice_init();
-}
-#endif
-
/* set CMOS shutdown status register (index 0xF) as S3_resume(0xFE)
BIOS will read it and start S3 resume at POST Entry */
void cmos_set_s3_resume(void)
@@ -1546,23 +1528,11 @@
.max_cpus = 1,
};
-#ifdef CONFIG_SERIALICE
-static QEMUMachine serialice_machine = {
- .name = "serialice",
- .desc = "SerialICE",
- .init = serialice_init_pci,
- .max_cpus = 255,
-};
-#endif
-
static void pc_machine_init(void)
{
qemu_register_machine(&pc_machine);
qemu_register_machine(&pc_machine_v0_10);
qemu_register_machine(&isapc_machine);
-#ifdef CONFIG_SERIALICE
- qemu_register_machine(&serialice_machine);
-#endif
}
machine_init(pc_machine_init);
Modified: trunk/qemu-0.11.0/serialice.c
===================================================================
--- trunk/qemu-0.11.0/serialice.c 2009-11-20 22:16:48 UTC (rev 60)
+++ trunk/qemu-0.11.0/serialice.c 2009-11-20 23:59:54 UTC (rev 61)
@@ -810,7 +810,7 @@
}
// **************************************************************************
-// external initialization and exit
+// initialization and exit
void serialice_init(void)
{
@@ -909,6 +909,9 @@
printf("SerialICE: LUA init...\n");
serialice_lua_init();
+
+ /* Let the rest of Qemu know we're alife */
+ serialice_active = 1;
}
void serialice_exit(void)
@@ -919,3 +922,6 @@
qemu_free(s);
}
+device_init(serialice_init)
+// no exit function
+
More information about the SerialICE
mailing list