Merge branch 'features/smp' into tizen_next

Conflicts:
	exec.c
	target-i386/hax-all.c
	target-i386/hax-darwin.c
	target-i386/hax-windows.c
	tizen/src/emulator.c
	tizen/src/emulator.h
	vl.c

Change-Id: Iba98ee338dc385c4d1129eed0c37e2a185b4d851

diff --cc Makefile.target
Simple merge

diff --cc configure
Simple merge

diff --cc target-i386/hax-windows.c
index ae2ea2e,d6f402a..eee7684
--- 1/target-i386/hax-windows.c
--- 2/target-i386/hax-windows.c
+++ b/target-i386/hax-windows.c
@@@ -121,8 -121,8 +121,7 @@@ int hax_set_phys_mem(MemoryRegionSectio
  
      info.pa_start = start_addr;
      info.size = size;
--    info.va = (uint64_t)(intptr_t)(memory_region_get_ram_ptr(mr) +
-               section->offset_within_region);
 -            section->offset_within_region);
++    info.va = (uint64_t)(intptr_t)(memory_region_get_ram_ptr(mr) + section->offset_within_region);
      info.flags = memory_region_is_rom(mr) ? 1 : 0;
  
      hDeviceVM = hax_global.vm->fd;

diff --cc target-i386/translate.c
Simple merge

diff --cc tizen/src/skin/maruskin_operation.c
Simple merge

diff --cc vl.c
Simple merge