From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jaswinder Singh Rajput Subject: [RFC][PATCH] qemu-kvm: vl.c remove unused functions gethugepagesize() and alloc_mem_area() Date: Sat, 30 May 2009 16:00:03 +0530 Message-ID: <1243679403.6459.2.camel@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE To: Avi Kivity , KVM list Return-path: Received: from hera.kernel.org ([140.211.167.34]:39712 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753895AbZE3KaW (ORCPT ); Sat, 30 May 2009 06:30:22 -0400 Sender: kvm-owner@vger.kernel.org List-ID: No user is available for functions gethugepagesize() and alloc_mem_area= () =46ixes : CC x86_64-softmmu/vl.o /home/jaswinder/jaswinder-git/qemu-kvm/vl.c:4884: warning: =E2=80=98all= oc_mem_area=E2=80=99 defined but not used Signed-off-by: Jaswinder Singh Rajput --- vl.c | 84 ----------------------------------------------------------= -------- 1 files changed, 0 insertions(+), 84 deletions(-) diff --git a/vl.c b/vl.c index db8265b..c312e7a 100644 --- a/vl.c +++ b/vl.c @@ -4856,90 +4856,6 @@ int qemu_uuid_parse(const char *str, uint8_t *uu= id) =20 #define MAX_NET_CLIENTS 32 =20 -#ifdef USE_KVM - -#define HUGETLBFS_MAGIC 0x958458f6 - -static long gethugepagesize(const char *path) -{ - struct statfs fs; - int ret; - - do { - ret =3D statfs(path, &fs); - } while (ret !=3D 0 && errno =3D=3D EINTR); - - if (ret !=3D 0) { - perror("statfs"); - return 0; - } - - if (fs.f_type !=3D HUGETLBFS_MAGIC) - fprintf(stderr, "Warning: path not on HugeTLBFS: %s\n", path); - - return fs.f_bsize; -} - -static void *alloc_mem_area(size_t memory, unsigned long *len, const c= har *path) -{ - char *filename; - void *area; - int fd; -#ifdef MAP_POPULATE - int flags; -#endif - - if (!kvm_has_sync_mmu()) { - fprintf(stderr, "host lacks mmu notifiers, disabling --mem-pat= h\n"); - return NULL; - } - - if (asprintf(&filename, "%s/kvm.XXXXXX", path) =3D=3D -1) - return NULL; - - hpagesize =3D gethugepagesize(path); - if (!hpagesize) - return NULL; - - fd =3D mkstemp(filename); - if (fd < 0) { - perror("mkstemp"); - free(filename); - return NULL; - } - unlink(filename); - free(filename); - - memory =3D (memory+hpagesize-1) & ~(hpagesize-1); - - /* - * ftruncate is not supported by hugetlbfs in older - * hosts, so don't bother checking for errors. - * If anything goes wrong with it under other filesystems, - * mmap will fail. - */ - ftruncate(fd, memory); - -#ifdef MAP_POPULATE - /* NB: MAP_POPULATE won't exhaustively alloc all phys pages in the= case - * MAP_PRIVATE is requested. For mem_prealloc we mmap as MAP_SHAR= ED - * to sidestep this quirk. - */ - flags =3D mem_prealloc ? MAP_POPULATE|MAP_SHARED : MAP_PRIVATE; - area =3D mmap(0, memory, PROT_READ|PROT_WRITE, flags, fd, 0); -#else - area =3D mmap(0, memory, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0)= ; -#endif - if (area =3D=3D MAP_FAILED) { - perror("alloc_mem_area: can't mmap hugetlbfs pages"); - close(fd); - return (NULL); - } - *len =3D memory; - return area; -} -#endif - #ifndef _WIN32 =20 static void termsig_handler(int signal) --=20 1.6.0.6