Post-merge compilation fixes

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/hw/pc.c b/hw/pc.c
index 5b59dfaf8223f5f07e4138728b676f68612e8094..9a5637ceee5bb75c2f7e282713d33e75d3ad2684 100644 (file)
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -461,7 +461,9 @@ static void bochs_bios_init(void)
     fw_cfg = fw_cfg_init(BIOS_CFG_IOPORT, BIOS_CFG_IOPORT + 1, 0, 0);
     fw_cfg_add_i32(fw_cfg, FW_CFG_ID, 1);
     fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
+#ifndef CONFIG_DM
     fw_cfg_add_bytes(fw_cfg, FW_CFG_ACPI_TABLES, acpi_tables, acpi_tables_len);
+#endif /*CONFIG_DM*/
 }
 
 /* Generate an initial boot sector which sets state and jump to

diff --git a/hw/piix4acpi.c b/hw/piix4acpi.c
index 001f98dff1d61e730781d75319692c0d31914cd8..7844cb8a9cb0017c729e3619a91b267b09bda1d6 100644 (file)
--- a/hw/piix4acpi.c
+++ b/hw/piix4acpi.c
@@ -575,6 +575,12 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
     return NULL;
 }
 
+void qemu_system_hot_add_init() { }
+void qemu_system_device_hot_add(int bus, int slot, int state) {
+    fputs("qemu-upstream PCI hotplug not supported in qemu-dm\n",stderr);
+    exit(-1);
+}
+
 void i440fx_init_memory_mappings(PCIDevice *d) {
     /* our implementation doesn't need this */
 }

diff --git a/i386-dm/exec-dm.c b/i386-dm/exec-dm.c
index a509fc56e9b8e3c6a9365e05d1a2d257c4fafd62..2e4b5afc53eedb1a44c35e20d93c56d717c24102 100644 (file)
--- a/i386-dm/exec-dm.c
+++ b/i386-dm/exec-dm.c
@@ -340,6 +340,25 @@ int cpu_register_io_memory(int io_index,
     return io_index << IO_MEM_SHIFT;
 }
 
+void cpu_unregister_io_memory(int io_table_address)
+{
+    int i;
+    int io_index = io_table_address >> IO_MEM_SHIFT;
+
+    for (i = 0; i < mmio_cnt; i++) {
+       if (mmio[i].size && mmio[i].io_index == io_index) {
+          mmio[i].start = mmio[i].size = 0;
+          break;
+       }
+    }
+
+    for (i=0;i < 3; i++) {
+        io_mem_read[io_index][i] = NULL;
+        io_mem_write[io_index][i] = NULL;
+    }
+    io_mem_opaque[io_index] = NULL;
+}
+
 CPUWriteMemoryFunc **cpu_get_io_memory_write(int io_index)
 {
     return io_mem_write[io_index >> IO_MEM_SHIFT];

diff --git a/vl.c b/vl.c
index 40b3b6eb7a86535498eb3a2c7388ae8b1d90088d..fc83867d30955b36b508cd331147dc76ee60c6fd 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -4436,7 +4436,7 @@ static const QEMUOption qemu_options[] = {
     { "pciemulation", HAS_ARG, QEMU_OPTION_pci_emulation },
     { "vncunused", 0, QEMU_OPTION_vncunused },
     { "vcpus", HAS_ARG, QEMU_OPTION_vcpus },
-#ifdef CONFIG_XEN
+#if defined(CONFIG_XEN) && !defined(CONFIG_DM)
     { "xen-domid", HAS_ARG, QEMU_OPTION_xen_domid },
     { "xen-create", 0, QEMU_OPTION_xen_create },
     { "xen-attach", 0, QEMU_OPTION_xen_attach },
@@ -5323,7 +5323,7 @@ int main(int argc, char **argv, char **envp)
             case QEMU_OPTION_vncunused:
                 vncunused = 1;
                 break;
-#ifdef CONFIG_XEN
+#if defined(CONFIG_XEN) && !defined(CONFIG_DM)
             case QEMU_OPTION_xen_domid:
                 xen_domid = domid = atoi(optarg);
                 break;
@@ -5345,12 +5345,14 @@ int main(int argc, char **argv, char **envp)
             case QEMU_OPTION_rtc_td_hack:
                 rtc_td_hack = 1;
                 break;
+#ifndef CONFIG_DM
             case QEMU_OPTION_acpitable:
                 if(acpi_table_add(optarg) < 0) {
                     fprintf(stderr, "Wrong acpi table provided\n");
                     exit(1);
                 }
                 break;
+#endif /*CONFIG_DM*/
 #endif
 #ifdef USE_KQEMU
             case QEMU_OPTION_no_kqemu:

diff --git a/xen-config-host.h b/xen-config-host.h
index 3a3d7a48b3051eaecf352c9d36e3ef9fa071399e..5b1f4d7db0dedd4e099cdc0bbb90a64ed65d3cb0 100644 (file)
--- a/xen-config-host.h
+++ b/xen-config-host.h
@@ -8,6 +8,7 @@
 #endif
 
 #define CONFIG_DM
+#define CONFIG_XEN
 
 extern char domain_name[64];
 extern int domid, domid_backend;