diff options
| author | SeokYeon Hwang <syeon.hwang@samsung.com> | 2016-11-30 14:11:48 +0900 |
|---|---|---|
| committer | SeokYeon Hwang <syeon.hwang@samsung.com> | 2016-11-30 14:11:58 +0900 |
| commit | 2371603ef207b015cc29728296b21cb1722d8ae6 (patch) | |
| tree | 25cbb62daf29066fa874b9a4b8f754bc18187806 /tizen | |
| parent | d5df306aedcc13cf5a2463ddf858c8d718a788d5 (diff) | |
| parent | d4dcb59384ab4433702f015fdddda1eff8e3927f (diff) | |
| download | qemu-2371603ef207b015cc29728296b21cb1722d8ae6.tar.gz qemu-2371603ef207b015cc29728296b21cb1722d8ae6.tar.bz2 qemu-2371603ef207b015cc29728296b21cb1722d8ae6.zip | |
Merge branch 'develop_qemu_2.7' into develop
Change-Id: Ibae70e3c0d1d88632903f98be114f47af9ca7502
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Diffstat (limited to 'tizen')
| -rwxr-xr-x | tizen/src/Makefile | 1 | ||||
| -rw-r--r-- | tizen/src/ecs/ecs_hds.c | 1 | ||||
| -rw-r--r-- | tizen/src/emul_state.c | 4 | ||||
| -rw-r--r-- | tizen/src/hw/maru_board.c | 10 | ||||
| -rw-r--r-- | tizen/src/hw/pci/maru_tuner.c | 3 |
5 files changed, 15 insertions, 4 deletions
diff --git a/tizen/src/Makefile b/tizen/src/Makefile index f7185f52c0..e5cd5eef23 100755 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -52,6 +52,7 @@ install: all mkdir -p $(EMUL_DIR)/data/bios cp -pP ../../pc-bios/bios-256k.bin $(EMUL_DIR)/data/bios cp -pP ../../pc-bios/linuxboot.bin $(EMUL_DIR)/data/bios + cp -pP ../../pc-bios/linuxboot_dma.bin $(EMUL_DIR)/data/bios cp -pP ../../pc-bios/efi-virtio.rom $(EMUL_DIR)/data/bios cp -pP ../../pc-bios/acpi-dsdt.aml $(EMUL_DIR)/data/bios diff --git a/tizen/src/ecs/ecs_hds.c b/tizen/src/ecs/ecs_hds.c index c6a86b32ec..614cc62e6c 100644 --- a/tizen/src/ecs/ecs_hds.c +++ b/tizen/src/ecs/ecs_hds.c @@ -31,6 +31,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" +#include "qemu/thread.h" #include "fsdev/qemu-fsdev.h" #include "emul_state.h" diff --git a/tizen/src/emul_state.c b/tizen/src/emul_state.c index 4152993d14..eff41e8ee5 100644 --- a/tizen/src/emul_state.c +++ b/tizen/src/emul_state.c @@ -547,10 +547,10 @@ bool is_netclient_tap_attached(void) int queues, i; queues = qemu_find_net_clients_except(NULL, ncs, - NET_CLIENT_OPTIONS_KIND_NIC, + NET_CLIENT_DRIVER_NIC, MAX_QUEUE_NUM); for (i = 0; i < queues; ++i) { - if (ncs[i]->info->type == NET_CLIENT_OPTIONS_KIND_TAP) { + if (ncs[i]->info->type == NET_CLIENT_DRIVER_TAP) { return true; } } diff --git a/tizen/src/hw/maru_board.c b/tizen/src/hw/maru_board.c index 760dd4b441..ea5798c4dd 100644 --- a/tizen/src/hw/maru_board.c +++ b/tizen/src/hw/maru_board.c @@ -48,6 +48,13 @@ static void maru_x86_board_init(MachineState *machine) maru_device_init(); } +#define HAX_HW_COMPAT_2_6 \ + {\ + .driver = "virtio-pci",\ + .property = "disable-modern",\ + .value = "on",\ + }, + static void maru_x86_machine_options(MachineClass *m) { m->family = "pc_piix"; @@ -60,6 +67,9 @@ static void maru_x86_machine_options(MachineClass *m) m->no_cdrom = 1; m->no_sdcard = 1; m->default_boot_order = "c"; +#ifdef CONFIG_HAX + SET_MACHINE_COMPAT(m, HAX_HW_COMPAT_2_6); +#endif } DEFINE_PC_MACHINE(maru, "maru-x86-machine", maru_x86_board_init, diff --git a/tizen/src/hw/pci/maru_tuner.c b/tizen/src/hw/pci/maru_tuner.c index 8e28f870d3..ad2845cdd4 100644 --- a/tizen/src/hw/pci/maru_tuner.c +++ b/tizen/src/hw/pci/maru_tuner.c @@ -34,7 +34,6 @@ #include "qemu/osdep.h" #include "exec/memory.h" #include "exec/memory-internal.h" -#include "exec/ram_addr.h" #include "tizen/src/emulator.h" #include "qemu/config-file.h" #include "qemu/main-loop.h" @@ -1198,7 +1197,7 @@ out: static void marutuner_setdma(MaruTunerState *s, uint64_t val) { // XXX : is 'val' ok? should init memory_region_init? - s->vaddr = qemu_get_ram_ptr(NULL, (ram_addr_t)val); + s->vaddr = qemu_map_ram_ptr(NULL, (ram_addr_t)val); memset(s->vaddr, 0, MARUTUNER_MEM_SIZE); } |