From patchwork Mon Oct 18 08:15:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 68143 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7FF29B7103 for ; Mon, 18 Oct 2010 19:36:31 +1100 (EST) Received: from localhost ([127.0.0.1]:49384 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P7lCj-0006fW-Sa for incoming@patchwork.ozlabs.org; Mon, 18 Oct 2010 04:36:26 -0400 Received: from [140.186.70.92] (port=55321 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P7ktA-0003yY-ER for qemu-devel@nongnu.org; Mon, 18 Oct 2010 04:16:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P7kt9-0000xP-9o for qemu-devel@nongnu.org; Mon, 18 Oct 2010 04:16:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9840) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P7kt9-0000xI-2f for qemu-devel@nongnu.org; Mon, 18 Oct 2010 04:16:11 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9I8G9Jm022191 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 18 Oct 2010 04:16:09 -0400 Received: from localhost6.localdomain6 (ovpn-113-37.phx2.redhat.com [10.3.113.37]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o9I8FuO8012414; Mon, 18 Oct 2010 04:16:08 -0400 From: Jes.Sorensen@redhat.com To: qemu-devel@nongnu.org Date: Mon, 18 Oct 2010 10:15:53 +0200 Message-Id: <1287389754-985-9-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1287389754-985-1-git-send-email-Jes.Sorensen@redhat.com> References: <1287389754-985-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: blauwirbel@gmail.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 8/9] Consolidate oom_check() functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jes Sorensen This consolidates the duplicated oom_check() functions, as well as splitting them into OS dependant versions to avoid the #ifdef grossness that was present in the old osdep.c version. Signed-off-by: Jes Sorensen --- Makefile.target | 2 +- oslib-posix.c | 8 +++----- oslib-win32.c | 6 +++--- qemu-common.h | 1 + qemu-malloc.c | 14 +++----------- 5 files changed, 11 insertions(+), 20 deletions(-) diff --git a/Makefile.target b/Makefile.target index c48cbcc..91e6e74 100644 --- a/Makefile.target +++ b/Makefile.target @@ -88,7 +88,7 @@ $(call set-vpath, $(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) obj-y = main.o syscall.o strace.o mmap.o signal.o thunk.o \ elfload.o linuxload.o uaccess.o gdbstub.o cpu-uname.o \ - qemu-malloc.o + qemu-malloc.o $(oslib-obj-y) obj-$(TARGET_HAS_BFLT) += flatload.o diff --git a/oslib-posix.c b/oslib-posix.c index ad44b17..6e9b0c3 100644 --- a/oslib-posix.c +++ b/oslib-posix.c @@ -31,8 +31,7 @@ #include "trace.h" #include "qemu_socket.h" -#if !defined(_POSIX_C_SOURCE) || defined(__sun__) -static void *oom_check(void *ptr) +void *qemu_oom_check(void *ptr) { if (ptr == NULL) { fprintf(stderr, "Failed to allocate memory: %s\n", strerror(errno)); @@ -40,7 +39,6 @@ static void *oom_check(void *ptr) } return ptr; } -#endif void *qemu_memalign(size_t alignment, size_t size) { @@ -54,9 +52,9 @@ void *qemu_memalign(size_t alignment, size_t size) abort(); } #elif defined(CONFIG_BSD) - ptr = oom_check(valloc(size)); + ptr = qemu_oom_check(valloc(size)); #else - ptr = oom_check(memalign(alignment, size)); + ptr = qemu_oom_check(memalign(alignment, size)); #endif trace_qemu_memalign(alignment, size, ptr); return ptr; diff --git a/oslib-win32.c b/oslib-win32.c index e03c472..ab29eae 100644 --- a/oslib-win32.c +++ b/oslib-win32.c @@ -31,7 +31,7 @@ #include "trace.h" #include "qemu_socket.h" -static void *oom_check(void *ptr) +void *qemu_oom_check(void *ptr) { if (ptr == NULL) { fprintf(stderr, "Failed to allocate memory: %lu\n", GetLastError()); @@ -47,7 +47,7 @@ void *qemu_memalign(size_t alignment, size_t size) if (!size) { abort(); } - ptr = oom_check(VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE)); + ptr = qemu_oom_check(VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE)); trace_qemu_memalign(alignment, size, ptr); return ptr; } @@ -62,7 +62,7 @@ void *qemu_vmalloc(size_t size) if (!size) { abort(); } - ptr = oom_check(VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE)); + ptr = qemu_oom_check(VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE)); trace_qemu_vmalloc(size, ptr); return ptr; } diff --git a/qemu-common.h b/qemu-common.h index 1f01a44..82fb59f 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -179,6 +179,7 @@ const char *path(const char *pathname); int ffs(int i); #endif +void *qemu_oom_check(void *ptr); void *qemu_malloc(size_t size); void *qemu_realloc(void *ptr, size_t size); void *qemu_mallocz(size_t size); diff --git a/qemu-malloc.c b/qemu-malloc.c index ecffb67..28fb05a 100644 --- a/qemu-malloc.c +++ b/qemu-malloc.c @@ -25,14 +25,6 @@ #include "trace.h" #include -static void *oom_check(void *ptr) -{ - if (ptr == NULL) { - abort(); - } - return ptr; -} - void qemu_free(void *ptr) { trace_qemu_free(ptr); @@ -54,7 +46,7 @@ void *qemu_malloc(size_t size) if (!size && !allow_zero_malloc()) { abort(); } - ptr = oom_check(malloc(size ? size : 1)); + ptr = qemu_oom_check(malloc(size ? size : 1)); trace_qemu_malloc(size, ptr); return ptr; } @@ -65,7 +57,7 @@ void *qemu_realloc(void *ptr, size_t size) if (!size && !allow_zero_malloc()) { abort(); } - newptr = oom_check(realloc(ptr, size ? size : 1)); + newptr = qemu_oom_check(realloc(ptr, size ? size : 1)); trace_qemu_realloc(ptr, size, newptr); return newptr; } @@ -75,7 +67,7 @@ void *qemu_mallocz(size_t size) if (!size && !allow_zero_malloc()) { abort(); } - return oom_check(calloc(1, size ? size : 1)); + return qemu_oom_check(calloc(1, size ? size : 1)); } char *qemu_strdup(const char *str)