diff options
| author | SeokYeon Hwang <syeon.hwang@samsung.com> | 2016-09-12 15:41:37 +0900 |
|---|---|---|
| committer | SeokYeon Hwang <syeon.hwang@samsung.com> | 2016-09-12 15:41:37 +0900 |
| commit | 590861b31f5f1f7140d637173d8d9bac8d41ccc6 (patch) | |
| tree | 7e2e5afd3ac4d896b310de7a980c509e6dddfd2b /tizen | |
| parent | 64d5068524fc31f8941aeba31d6a34f935adf479 (diff) | |
| parent | 1dc33ed90bf1fe1c2014dffa0d9e863c520d953a (diff) | |
| download | qemu-590861b31f5f1f7140d637173d8d9bac8d41ccc6.tar.gz qemu-590861b31f5f1f7140d637173d8d9bac8d41ccc6.tar.bz2 qemu-590861b31f5f1f7140d637173d8d9bac8d41ccc6.zip | |
Merge tag 'v2.7.0' into develop_qemu_2.7
v2.7.0 release
Change-Id: Id5feb5a9404ab064f9ea3d0aa0d95eef17020fa3
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Diffstat (limited to 'tizen')
| -rw-r--r-- | tizen/src/ecs/ecs_hds.c | 1 | ||||
| -rw-r--r-- | tizen/src/emul_state.c | 8 | ||||
| -rw-r--r-- | tizen/src/hw/pci/maru_tuner.c | 3 |
3 files changed, 6 insertions, 6 deletions
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 43fdb5010b..8e6b7ea7c0 100644 --- a/tizen/src/emul_state.c +++ b/tizen/src/emul_state.c @@ -546,13 +546,13 @@ 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 && - (ncs[i]->peer->info->type == NET_CLIENT_OPTIONS_KIND_NIC || + if (ncs[i]->info->type == NET_CLIENT_DRIVER_TAP && + (ncs[i]->peer->info->type == NET_CLIENT_DRIVER_NIC || // for legacy -net option. - ncs[i]->peer->info->type == NET_CLIENT_OPTIONS_KIND_HUBPORT)) { + ncs[i]->peer->info->type == NET_CLIENT_DRIVER_HUBPORT)) { return true; } } 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); } |