From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Tue, 9 Jul 2013 05:23:01 +0000 (+0900)
Subject: Merging...
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~900^2~47
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e0342a1c7b96eff3c6184f332803249d173a92ca;p=sdk%2Femulator%2Fqemu.git

Merging...

Change-Id: I9446bb9dc49d36b9f07a05ff12fadc8d45a48884
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
---

diff --git a/tizen/src/hw/maru_board.c b/tizen/src/hw/maru_board.c
index 8f52d0f7b0..4f0c116a44 100644
--- a/tizen/src/hw/maru_board.c
+++ b/tizen/src/hw/maru_board.c
@@ -178,7 +178,8 @@ static void maru_x86_machine_init(MemoryRegion *system_memory,
     MemoryRegion *rom_memory;
     void *fw_cfg = NULL;
 
-    pc_cpus_init(cpu_model);
+// FIXME: merge
+//    pc_cpus_init(cpu_model);
 
     if (kvmclock_enabled) {
         kvmclock_create();
@@ -233,7 +234,7 @@ static void maru_x86_machine_init(MemoryRegion *system_memory,
                               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);
diff --git a/tizen/src/hw/maru_overlay.c b/tizen/src/hw/maru_overlay.c
index 7072f586c3..f7ffa468a9 100644
--- a/tizen/src/hw/maru_overlay.c
+++ b/tizen/src/hw/maru_overlay.c
@@ -30,8 +30,8 @@
  *
  */
 
-#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"
@@ -74,7 +74,7 @@ typedef struct OverlayState {
 
 
 static uint64_t overlay_reg_read(void *opaque,
-                                 target_phys_addr_t addr,
+                                 hwaddr addr,
                                  unsigned size)
 {
     switch (addr) {
@@ -115,7 +115,7 @@ static uint64_t overlay_reg_read(void *opaque,
 }
 
 static void overlay_reg_write(void *opaque,
-                              target_phys_addr_t addr,
+                              hwaddr addr,
                               uint64_t val,
                               unsigned size)
 {
diff --git a/tizen/src/hw/maru_pm.c b/tizen/src/hw/maru_pm.c
index d1d29f44f3..9eb978669c 100644
--- a/tizen/src/hw/maru_pm.c
+++ b/tizen/src/hw/maru_pm.c
@@ -29,17 +29,17 @@
  */
 
 #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