Change-Id: I9446bb9dc49d36b9f07a05ff12fadc8d45a48884
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
MemoryRegion *rom_memory;
void *fw_cfg = NULL;
- pc_cpus_init(cpu_model);
+// FIXME: merge
+// pc_cpus_init(cpu_model);
if (kvmclock_enabled) {
kvmclock_create();
below_4g_mem_size,
0x100000000ULL - below_4g_mem_size,
0x100000000ULL + above_4g_mem_size,
- (sizeof(target_phys_addr_t) == 4
+ (sizeof(hwaddr) == 4
? 0
: ((uint64_t)1 << 62)),
pci_memory, ram_memory);
*
*/
-#include "pc.h"
-#include "pci.h"
+#include "hw/i386/pc.h"
+#include "hw/pci/pci.h"
#include "maru_device_ids.h"
#include "maru_overlay.h"
#include "debug_ch.h"
static uint64_t overlay_reg_read(void *opaque,
- target_phys_addr_t addr,
+ hwaddr addr,
unsigned size)
{
switch (addr) {
}
static void overlay_reg_write(void *opaque,
- target_phys_addr_t addr,
+ hwaddr addr,
uint64_t val,
unsigned size)
{
*/
#include "maru_pm.h"
-#include "hw.h"
-#include "pc.h"
-#include "apm.h"
-#include "pm_smbus.h"
-#include "pci.h"
-#include "acpi.h"
-#include "sysemu.h"
-#include "range.h"
-#include "ioport.h"
+#include "hw/hw.h"
+#include "hw/i386/pc.h"
+#include "hw/isa/apm.h"
+#include "hw/i2c/pm_smbus.h"
+#include "hw/pci/pci.h"
+#include "hw/acpi/acpi.h"
+#include "sysemu/sysemu.h"
+#include "qemu/range.h"
+#include "exec/ioport.h"
#include "debug_ch.h"
-#include "fw_cfg.h"
+#include "hw/nvram/fw_cfg.h"
//#define DEBUG