exec: move include files to include/exec/

[mirror_qemu.git] / hw / collie.c

diff --git a/hw/collie.c b/hw/collie.c
index 56f89a9f2e86b5bdc80c013da6e322dfcf940524..faf5ac9ac7d9fcf2602366b4162b62ce31caba46 100644 (file)
--- a/hw/collie.c
+++ b/hw/collie.c
@@ -16,18 +16,19 @@
 #include "arm-misc.h"
 #include "flash.h"
 #include "blockdev.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 static struct arm_boot_info collie_binfo = {
     .loader_start = SA_SDCS0,
     .ram_size = 0x20000000,
 };
 
-static void collie_init(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)
+static void collie_init(QEMUMachineInitArgs *args)
 {
+    const char *cpu_model = args->cpu_model;
+    const char *kernel_filename = args->kernel_filename;
+    const char *kernel_cmdline = args->kernel_cmdline;
+    const char *initrd_filename = args->initrd_filename;
     StrongARMState *s;
     DriveInfo *dinfo;
     MemoryRegion *sysmem = get_system_memory();