From: Jaswinder Singh Rajput <jaswinder@kernel.org>
To: Avi Kivity <avi@redhat.com>, KVM list <kvm@vger.kernel.org>
Subject: [RFC][PATCH] qemu-kvm: vl.c remove unused functions gethugepagesize() and alloc_mem_area()
Date: Sat, 30 May 2009 16:00:03 +0530 [thread overview]
Message-ID: <1243679403.6459.2.camel@localhost.localdomain> (raw)
No user is available for functions gethugepagesize() and alloc_mem_area()
Fixes :
CC x86_64-softmmu/vl.o
/home/jaswinder/jaswinder-git/qemu-kvm/vl.c:4884: warning: ‘alloc_mem_area’ defined but not used
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
---
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 *uuid)
#define MAX_NET_CLIENTS 32
-#ifdef USE_KVM
-
-#define HUGETLBFS_MAGIC 0x958458f6
-
-static long gethugepagesize(const char *path)
-{
- struct statfs fs;
- int ret;
-
- do {
- ret = statfs(path, &fs);
- } while (ret != 0 && errno == EINTR);
-
- if (ret != 0) {
- perror("statfs");
- return 0;
- }
-
- if (fs.f_type != 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 char *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-path\n");
- return NULL;
- }
-
- if (asprintf(&filename, "%s/kvm.XXXXXX", path) == -1)
- return NULL;
-
- hpagesize = gethugepagesize(path);
- if (!hpagesize)
- return NULL;
-
- fd = mkstemp(filename);
- if (fd < 0) {
- perror("mkstemp");
- free(filename);
- return NULL;
- }
- unlink(filename);
- free(filename);
-
- memory = (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_SHARED
- * to sidestep this quirk.
- */
- flags = mem_prealloc ? MAP_POPULATE|MAP_SHARED : MAP_PRIVATE;
- area = mmap(0, memory, PROT_READ|PROT_WRITE, flags, fd, 0);
-#else
- area = mmap(0, memory, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
-#endif
- if (area == MAP_FAILED) {
- perror("alloc_mem_area: can't mmap hugetlbfs pages");
- close(fd);
- return (NULL);
- }
- *len = memory;
- return area;
-}
-#endif
-
#ifndef _WIN32
static void termsig_handler(int signal)
--
1.6.0.6
next reply other threads:[~2009-05-30 10:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-30 10:30 Jaswinder Singh Rajput [this message]
2009-05-31 8:12 ` [RFC][PATCH] qemu-kvm: vl.c remove unused functions gethugepagesize() and alloc_mem_area() Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1243679403.6459.2.camel@localhost.localdomain \
--to=jaswinder@kernel.org \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox