From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: [PATCH 2/8] test: move memset() to libcflat Date: Wed, 28 Jul 2010 13:18:21 +0300 Message-ID: <1280312307-16686-3-git-send-email-avi@redhat.com> References: <1280312307-16686-1-git-send-email-avi@redhat.com> To: Joerg Roedel , Marcelo Tosatti , kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:63121 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753260Ab0G1KS3 (ORCPT ); Wed, 28 Jul 2010 06:18:29 -0400 In-Reply-To: <1280312307-16686-1-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Signed-off-by: Avi Kivity --- kvm/test/lib/libcflat.h | 3 +++ kvm/test/lib/string.c | 11 +++++++++++ kvm/test/x86/access.c | 8 -------- kvm/test/x86/idt.c | 8 -------- kvm/test/x86/vm.c | 10 ---------- 5 files changed, 14 insertions(+), 26 deletions(-) diff --git a/kvm/test/lib/libcflat.h b/kvm/test/lib/libcflat.h index 7274fed..2e2a8bf 100644 --- a/kvm/test/lib/libcflat.h +++ b/kvm/test/lib/libcflat.h @@ -27,6 +27,7 @@ typedef unsigned short u16; typedef unsigned u32; typedef unsigned long ulong; typedef unsigned long long u64; +typedef unsigned long size_t; extern void exit(int code); extern void panic(char *fmt, ...); @@ -39,6 +40,8 @@ extern int vsnprintf(char *buf, int size, const char *fmt, va_list va); extern void puts(const char *s); +extern void *memset(void *s, int c, size_t n); + #define ARRAY_SIZE(_a) (sizeof(_a)/sizeof((_a)[0])) #endif diff --git a/kvm/test/lib/string.c b/kvm/test/lib/string.c index 42be946..acac3c0 100644 --- a/kvm/test/lib/string.c +++ b/kvm/test/lib/string.c @@ -19,3 +19,14 @@ char *strcat(char *dest, const char *src) ; return dest; } + +void *memset(void *s, int c, size_t n) +{ + size_t i; + char *a = s; + + for (i = 0; i < n; ++i) + a[i] = c; + + return s; +} diff --git a/kvm/test/x86/access.c b/kvm/test/x86/access.c index 3338fbc..7e6ffb0 100644 --- a/kvm/test/x86/access.c +++ b/kvm/test/x86/access.c @@ -160,14 +160,6 @@ void lidt(idt_entry_t *idt, int nentries) asm volatile ("lidt %0" : : "m"(dt)); } -void memset(void *a, unsigned char v, int n) -{ - unsigned char *x = a; - - while (n--) - *x++ = v; -} - unsigned short read_cs() { unsigned short r; diff --git a/kvm/test/x86/idt.c b/kvm/test/x86/idt.c index 999b3f0..590839f 100644 --- a/kvm/test/x86/idt.c +++ b/kvm/test/x86/idt.c @@ -39,14 +39,6 @@ unsigned short read_cs() return r; } -void memset(void *a, unsigned char v, int n) -{ - unsigned char *x = a; - - while (n--) - *x++ = v; -} - void set_idt_entry(idt_entry_t *e, void *addr, int dpl) { memset(e, 0, sizeof *e); diff --git a/kvm/test/x86/vm.c b/kvm/test/x86/vm.c index 0596d9c..c8f1553 100644 --- a/kvm/test/x86/vm.c +++ b/kvm/test/x86/vm.c @@ -14,16 +14,6 @@ static void *free = 0; static void *vfree_top = 0; -void *memset(void *data, int c, unsigned long len) -{ - char *s = data; - - while (len--) - *s++ = c; - - return data; -} - static void free_memory(void *mem, unsigned long size) { while (size >= PAGE_SIZE) { -- 1.7.1