Fix compilation errors on VIGS/YaGL sources

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

diff --git a/hw/vigs_device.c b/hw/vigs_device.c
index 28192febee41a985bf38bdcbc116f92f4521e1d7..1ec0da8ec88dfd5fee7f7aa4d58a63f9e1f9b77d 100644 (file)
--- a/hw/vigs_device.c
+++ b/hw/vigs_device.c
@@ -206,15 +206,15 @@ static int vigs_device_init(PCIDevice *dev)
 
     pci_config_set_interrupt_pin(dev->config, 1);
 
-    memory_region_init_ram(&s->vram_bar,
+    memory_region_init_ram(&s->vram_bar, OBJECT(s),
                            TYPE_VIGS_DEVICE ".vram",
                            s->vram_size);
 
-    memory_region_init_ram(&s->ram_bar,
+    memory_region_init_ram(&s->ram_bar, OBJECT(s),
                            TYPE_VIGS_DEVICE ".ram",
                            s->ram_size);
 
-    memory_region_init_io(&s->io_bar,
+    memory_region_init_io(&s->io_bar, OBJECT(s),
                           &vigs_io_ops,
                           s,
                           TYPE_VIGS_DEVICE ".io",

diff --git a/hw/yagl_device.c b/hw/yagl_device.c
index 8bbb5aeff828f514905d5ffad4cfd174be9eff79..1d805a28cff90357e0550c420058802ce5887e3c 100644 (file)
--- a/hw/yagl_device.c
+++ b/hw/yagl_device.c
@@ -227,7 +227,7 @@ static int yagl_device_init(PCIDevice *dev)
 
     YAGL_LOG_FUNC_ENTER(yagl_device_init, NULL);
 
-    memory_region_init_io(&s->iomem,
+    memory_region_init_io(&s->iomem, OBJECT(s),
                           &yagl_device_ops,
                           s,
                           TYPE_YAGL_DEVICE,

diff --git a/hw/yagl_process.c b/hw/yagl_process.c
index 6fc526ca5bc2ec71989787548db277e14b1000fe..3e384288e7939b767f9a6de63b182bdaf6e59014 100644 (file)
--- a/hw/yagl_process.c
+++ b/hw/yagl_process.c
@@ -17,8 +17,8 @@ struct yagl_process_state
     QLIST_INIT(&ps->threads);
 
 #ifdef CONFIG_KVM
-    cpu_synchronize_state(cpu_single_env);
-    memcpy(&ps->cr[0], &((CPUX86State*)cpu_single_env)->cr[0], sizeof(ps->cr));
+    cpu_synchronize_state(current_cpu);
+    memcpy(&ps->cr[0], &((CPUX86State*)current_cpu)->cr[0], sizeof(ps->cr));
 #endif
 
     return ps;

diff --git a/hw/yagl_thread.c b/hw/yagl_thread.c
index 2efb266fa67918af2492189e81e5d5b80847df00..b497ccdc93392b2b3cccdbb33d83e6c9f414b893 100644 (file)
--- a/hw/yagl_thread.c
+++ b/hw/yagl_thread.c
@@ -15,7 +15,7 @@ YAGL_DEFINE_TLS(struct yagl_thread_state*, cur_ts);
 static __inline void yagl_cpu_synchronize_state(struct yagl_process_state *ps)
 {
     if (kvm_enabled()) {
-        memcpy(&((CPUX86State*)cpu_single_env)->cr[0], &ps->cr[0], sizeof(ps->cr));
+        memcpy(&((CPUX86State*)current_cpu)->cr[0], &ps->cr[0], sizeof(ps->cr));
     }
 }
 #else
@@ -282,11 +282,11 @@ void yagl_thread_call(struct yagl_thread_state *ts,
                       uint8_t *out_buff,
                       uint8_t *in_buff)
 {
-    assert(cpu_single_env);
+    assert(current_cpu);
 
     ts->current_out_buff = out_buff;
     ts->current_in_buff = in_buff;
-    ts->current_env = cpu_single_env;
+    ts->current_env = current_cpu;
 
     yagl_cpu_synchronize_state(ts->ps);