chardev: add qmp hotplug commands, with null chardev support

[qemu.git] / hw / collie.c

diff --git a/hw/collie.c b/hw/collie.c
index 695982a99fef93befc0f28af373d9db05c75e243..d19db590febf8189681e15de72b15a0628b0fe5c 100644 (file)
--- a/hw/collie.c
+++ b/hw/collie.c
@@ -15,8 +15,8 @@
 #include "strongarm.h"
 #include "arm-misc.h"
 #include "flash.h"
-#include "blockdev.h"
-#include "exec-memory.h"
+#include "sysemu/blockdev.h"
+#include "exec/address-spaces.h"
 
 static struct arm_boot_info collie_binfo = {
     .loader_start = SA_SDCS0,
@@ -62,6 +62,7 @@ static QEMUMachine collie_machine = {
     .name = "collie",
     .desc = "Collie PDA (SA-1110)",
     .init = collie_init,
+    DEFAULT_MACHINE_OPTIONS,
 };
 
 static void collie_machine_init(void)