From 462564f31bbdc9939bf1d2376e2782defa7ef655 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Wed, 23 Feb 2011 13:32:37 +0100 Subject: Minor cleanups for core/ui Makefile separation. This patch contains minor cleanups that will be needed by a few future patches that will improve the way core and ui sources are separated and built. - remove a few compiler warnings - formatting - remove the memcheck CONFIG_MEMCHECK checks (they later get in the way) - refine hw/hw.h inclusion's of cpu.h (this comes from upstream) - add missing definitions for PRUd64 and PRUx64 (used later) - remove CONFIG_SHAPER test, replace with CONFIG_ANDROID instead. - add missing strdup() calls. Change-Id: Ic7d6681a51af718c298f0ee4bd884b1d8750f28e --- memcheck/memcheck.c | 6 ------ memcheck/memcheck.h | 6 ------ memcheck/memcheck_common.h | 6 ------ memcheck/memcheck_logging.h | 6 ------ memcheck/memcheck_malloc_map.c | 6 ------ memcheck/memcheck_malloc_map.h | 6 ------ memcheck/memcheck_mmrange_map.c | 6 ------ memcheck/memcheck_mmrange_map.h | 6 ------ memcheck/memcheck_proc_management.c | 6 ------ memcheck/memcheck_proc_management.h | 6 ------ memcheck/memcheck_util.c | 6 ------ memcheck/memcheck_util.h | 6 ------ 12 files changed, 72 deletions(-) (limited to 'memcheck') diff --git a/memcheck/memcheck.c b/memcheck/memcheck.c index 3c8194a..3ccb196 100644 --- a/memcheck/memcheck.c +++ b/memcheck/memcheck.c @@ -14,12 +14,6 @@ * Contains implementation of memory checking framework in the emulator. */ -/* This file should compile iff qemu is built with memory checking - * configuration turned on. */ -#ifndef CONFIG_MEMCHECK -#error CONFIG_MEMCHECK is not defined. -#endif // CONFIG_MEMCHECK - #include "qemu-queue.h" #include "qemu_file.h" #include "elff_api.h" diff --git a/memcheck/memcheck.h b/memcheck/memcheck.h index a9a6422..a7761a9 100644 --- a/memcheck/memcheck.h +++ b/memcheck/memcheck.h @@ -18,12 +18,6 @@ #ifndef QEMU_MEMCHECK_MEMCHECK_H #define QEMU_MEMCHECK_MEMCHECK_H -/* This file should compile iff qemu is built with memory checking - * configuration turned on. */ -#ifndef CONFIG_MEMCHECK -#error CONFIG_MEMCHECK is not defined. -#endif // CONFIG_MEMCHECK - #include "memcheck_common.h" #ifdef __cplusplus diff --git a/memcheck/memcheck_common.h b/memcheck/memcheck_common.h index e6d12db..e753094 100644 --- a/memcheck/memcheck_common.h +++ b/memcheck/memcheck_common.h @@ -18,12 +18,6 @@ #ifndef QEMU_MEMCHECK_MEMCHECK_COMMON_H #define QEMU_MEMCHECK_MEMCHECK_COMMON_H -/* This file should compile iff qemu is built with memory checking - * configuration turned on. */ -#ifndef CONFIG_MEMCHECK -#error CONFIG_MEMCHECK is not defined. -#endif // CONFIG_MEMCHECK - #include "qemu-common.h" #include "cpu.h" diff --git a/memcheck/memcheck_logging.h b/memcheck/memcheck_logging.h index c2ae6e9..94a3c09 100644 --- a/memcheck/memcheck_logging.h +++ b/memcheck/memcheck_logging.h @@ -17,12 +17,6 @@ #ifndef QEMU_MEMCHECK_MEMCHECK_LOGGING_H #define QEMU_MEMCHECK_MEMCHECK_LOGGING_H -/* This file should compile iff qemu is built with memory checking - * configuration turned on. */ -#ifndef CONFIG_MEMCHECK -#error CONFIG_MEMCHECK is not defined. -#endif // CONFIG_MEMCHECK - #include "qemu-common.h" #include "android/utils/debug.h" diff --git a/memcheck/memcheck_malloc_map.c b/memcheck/memcheck_malloc_map.c index 07ae889..d7e8032 100644 --- a/memcheck/memcheck_malloc_map.c +++ b/memcheck/memcheck_malloc_map.c @@ -15,12 +15,6 @@ * memory blocks allocated by the guest system. */ -/* This file should compile iff qemu is built with memory checking - * configuration turned on. */ -#ifndef CONFIG_MEMCHECK -#error CONFIG_MEMCHECK is not defined. -#endif // CONFIG_MEMCHECK - #include "memcheck_malloc_map.h" #include "memcheck_util.h" #include "memcheck_logging.h" diff --git a/memcheck/memcheck_malloc_map.h b/memcheck/memcheck_malloc_map.h index b356180..1c25738 100644 --- a/memcheck/memcheck_malloc_map.h +++ b/memcheck/memcheck_malloc_map.h @@ -24,12 +24,6 @@ #ifndef QEMU_MEMCHECK_MEMCHECK_MALLOC_MAP_H #define QEMU_MEMCHECK_MEMCHECK_MALLOC_MAP_H -/* This file should compile iff qemu is built with memory checking - * configuration turned on. */ -#ifndef CONFIG_MEMCHECK -#error CONFIG_MEMCHECK is not defined. -#endif // CONFIG_MEMCHECK - #include "sys-tree.h" #include "memcheck_common.h" diff --git a/memcheck/memcheck_mmrange_map.c b/memcheck/memcheck_mmrange_map.c index f2609df..d9a1211 100644 --- a/memcheck/memcheck_mmrange_map.c +++ b/memcheck/memcheck_mmrange_map.c @@ -15,12 +15,6 @@ * memory mappings in the guest system. */ -/* This file should compile iff qemu is built with memory checking - * configuration turned on. */ -#ifndef CONFIG_MEMCHECK -#error CONFIG_MEMCHECK is not defined. -#endif // CONFIG_MEMCHECK - #include "memcheck_mmrange_map.h" #include "memcheck_logging.h" diff --git a/memcheck/memcheck_mmrange_map.h b/memcheck/memcheck_mmrange_map.h index f2c9701..f291c95 100644 --- a/memcheck/memcheck_mmrange_map.h +++ b/memcheck/memcheck_mmrange_map.h @@ -22,12 +22,6 @@ #ifndef QEMU_MEMCHECK_MEMCHECK_MMRANGE_MAP_H #define QEMU_MEMCHECK_MEMCHECK_MMRANGE_MAP_H -/* This file should compile iff qemu is built with memory checking - * configuration turned on. */ -#ifndef CONFIG_MEMCHECK -#error CONFIG_MEMCHECK is not defined. -#endif // CONFIG_MEMCHECK - #include "sys-tree.h" #include "memcheck_common.h" diff --git a/memcheck/memcheck_proc_management.c b/memcheck/memcheck_proc_management.c index 593ba32..45cf141 100644 --- a/memcheck/memcheck_proc_management.c +++ b/memcheck/memcheck_proc_management.c @@ -15,12 +15,6 @@ * memchecker framework. */ -/* This file should compile iff qemu is built with memory checking - * configuration turned on. */ -#ifndef CONFIG_MEMCHECK -#error CONFIG_MEMCHECK is not defined. -#endif // CONFIG_MEMCHECK - #include "elff/elff_api.h" #include "memcheck.h" #include "memcheck_proc_management.h" diff --git a/memcheck/memcheck_proc_management.h b/memcheck/memcheck_proc_management.h index 68b6181..7f489cf 100644 --- a/memcheck/memcheck_proc_management.h +++ b/memcheck/memcheck_proc_management.h @@ -18,12 +18,6 @@ #ifndef QEMU_MEMCHECK_MEMCHECK_PROC_MANAGEMENT_H #define QEMU_MEMCHECK_MEMCHECK_PROC_MANAGEMENT_H -/* This file should compile iff qemu is built with memory checking - * configuration turned on. */ -#ifndef CONFIG_MEMCHECK -#error CONFIG_MEMCHECK is not defined. -#endif // CONFIG_MEMCHECK - #include "qemu-queue.h" #include "memcheck_common.h" #include "memcheck_malloc_map.h" diff --git a/memcheck/memcheck_util.c b/memcheck/memcheck_util.c index 5449488..8a59914 100644 --- a/memcheck/memcheck_util.c +++ b/memcheck/memcheck_util.c @@ -14,12 +14,6 @@ * Contains implementation of utility routines for memchecker framework. */ -/* This file should compile iff qemu is built with memory checking - * configuration turned on. */ -#ifndef CONFIG_MEMCHECK -#error CONFIG_MEMCHECK is not defined. -#endif // CONFIG_MEMCHECK - #include "stdio.h" #include "qemu-common.h" #include "android/utils/path.h" diff --git a/memcheck/memcheck_util.h b/memcheck/memcheck_util.h index b75ee53..2a9907e 100644 --- a/memcheck/memcheck_util.h +++ b/memcheck/memcheck_util.h @@ -17,12 +17,6 @@ #ifndef QEMU_MEMCHECK_MEMCHECK_UTIL_H #define QEMU_MEMCHECK_MEMCHECK_UTIL_H -/* This file should compile iff qemu is built with memory checking - * configuration turned on. */ -#ifndef CONFIG_MEMCHECK -#error CONFIG_MEMCHECK is not defined. -#endif // CONFIG_MEMCHECK - #include "memcheck_common.h" #include "elff/elff_api.h" -- cgit v1.1