From 4a7428c5a7e82f4dde3646e4a8cc8e54f3257e2a Mon Sep 17 00:00:00 2001 From: Christopher Covington Date: Fri, 25 Sep 2015 10:42:21 -0400 Subject: s/cpu_get_real_ticks/cpu_get_host_ticks/ This should help clarify the purpose of the function that returns the host system's CPU cycle count. Signed-off-by: Christopher Covington Acked-by: Paolo Bonzini ppc portion Acked-by: David Gibson Signed-off-by: Michael Tokarev --- linux-user/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux-user/main.c') diff --git a/linux-user/main.c b/linux-user/main.c index 1f60ff2a1f..d6af7cadd9 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -215,7 +215,7 @@ void cpu_list_unlock(void) uint64_t cpu_get_tsc(CPUX86State *env) { - return cpu_get_real_ticks(); + return cpu_get_host_ticks(); } static void write_dt(void *ptr, unsigned long addr, unsigned long limit, @@ -1425,7 +1425,7 @@ void cpu_loop (CPUSPARCState *env) #ifdef TARGET_PPC static inline uint64_t cpu_ppc_get_tb(CPUPPCState *env) { - return cpu_get_real_ticks(); + return cpu_get_host_ticks(); } uint64_t cpu_ppc_load_tbl(CPUPPCState *env) -- cgit 1.4.1 From c78d65e8a7d87badf46eda3a0b41330f5d239132 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 14 Sep 2015 13:53:03 +0200 Subject: linux-user: Use g_new() & friends where that makes obvious sense g_new(T, n) is neater than g_malloc(sizeof(T) * n). It's also safer, for two reasons. One, it catches multiplication overflowing size_t. Two, it returns T * rather than void *, which lets the compiler catch more type errors. This commit only touches allocations with size arguments of the form sizeof(T). Same Coccinelle semantic patch as in commit b45c03f. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Stefan Weil Signed-off-by: Michael Tokarev --- linux-user/elfload.c | 2 +- linux-user/main.c | 2 +- linux-user/syscall.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'linux-user/main.c') diff --git a/linux-user/elfload.c b/linux-user/elfload.c index fdae6a6cd1..d68f5a16ca 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2853,7 +2853,7 @@ static int fill_note_info(struct elf_note_info *info, TaskState *ts = (TaskState *)cpu->opaque; int i; - info->notes = g_malloc0(NUMNOTES * sizeof (struct memelfnote)); + info->notes = g_new0(struct memelfnote, NUMNOTES); if (info->notes == NULL) return (-ENOMEM); info->prstatus = g_malloc0(sizeof (*info->prstatus)); diff --git a/linux-user/main.c b/linux-user/main.c index d6af7cadd9..8acfe0fdf4 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -4270,7 +4270,7 @@ int main(int argc, char **argv, char **envp) } target_argv[target_argc] = NULL; - ts = g_malloc0 (sizeof(TaskState)); + ts = g_new0(TaskState, 1); init_task_state(ts); /* build Task State */ ts->info = info; diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 98b5766d4a..b8ce208d7d 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4566,7 +4566,7 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp, new_thread_info info; pthread_attr_t attr; - ts = g_malloc0(sizeof(TaskState)); + ts = g_new0(TaskState, 1); init_task_state(ts); /* we create a new CPU instance. */ new_env = cpu_copy(env); -- cgit 1.4.1