From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org,
Richard Henderson <richard.henderson@linaro.org>,
Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-s390x@nongnu.org
Subject: [PULL 6/6] util/mmap-alloc: Remove qemu_mempath_getpagesize()
Date: Tue, 30 Aug 2022 19:19:47 +0200 [thread overview]
Message-ID: <20220830171947.71464-7-thuth@redhat.com> (raw)
In-Reply-To: <20220830171947.71464-1-thuth@redhat.com>
The last user of this function has just been removed, so we can
drop this function now, too.
Message-Id: <20220810125720.3849835-4-thuth@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
include/qemu/mmap-alloc.h | 2 --
util/mmap-alloc.c | 31 -------------------------------
2 files changed, 33 deletions(-)
diff --git a/include/qemu/mmap-alloc.h b/include/qemu/mmap-alloc.h
index 5076695cc8..2825e231a7 100644
--- a/include/qemu/mmap-alloc.h
+++ b/include/qemu/mmap-alloc.h
@@ -4,8 +4,6 @@
size_t qemu_fd_getpagesize(int fd);
-size_t qemu_mempath_getpagesize(const char *mem_path);
-
/**
* qemu_ram_mmap: mmap anonymous memory, the specified file or device.
*
diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
index 5b90cb68ea..5ed7d29183 100644
--- a/util/mmap-alloc.c
+++ b/util/mmap-alloc.c
@@ -53,37 +53,6 @@ size_t qemu_fd_getpagesize(int fd)
return qemu_real_host_page_size();
}
-size_t qemu_mempath_getpagesize(const char *mem_path)
-{
-#ifdef CONFIG_LINUX
- struct statfs fs;
- int ret;
-
- if (mem_path) {
- do {
- ret = statfs(mem_path, &fs);
- } while (ret != 0 && errno == EINTR);
-
- if (ret != 0) {
- fprintf(stderr, "Couldn't statfs() memory path: %s\n",
- strerror(errno));
- exit(1);
- }
-
- if (fs.f_type == HUGETLBFS_MAGIC) {
- /* It's hugepage, return the huge page size */
- return fs.f_bsize;
- }
- }
-#ifdef __sparc__
- /* SPARC Linux needs greater alignment than the pagesize */
- return QEMU_VMALLOC_ALIGN;
-#endif
-#endif
-
- return qemu_real_host_page_size();
-}
-
#define OVERCOMMIT_MEMORY_PATH "/proc/sys/vm/overcommit_memory"
static bool map_noreserve_effective(int fd, uint32_t qemu_map_flags)
{
--
2.31.1
next prev parent reply other threads:[~2022-08-30 17:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-30 17:19 [PULL 0/6] First s390x updates for QEMU 7.2 Thomas Huth
2022-08-30 17:19 ` [PULL 1/6] hw: Add compat machines for 7.2 Thomas Huth
2022-08-30 17:19 ` [PULL 2/6] s390x/cpumodel: add stfl197 processor-activity-instrumentation extension 1 Thomas Huth
2022-08-30 17:19 ` [PULL 3/6] target/s390x: Fix CLFIT and CLGIT immediate size Thomas Huth
2022-08-30 17:19 ` [PULL 4/6] backends/hostmem: Fix support of memory-backend-memfd in qemu_maxrampagesize() Thomas Huth
2022-08-30 17:19 ` [PULL 5/6] softmmu/physmem: Remove the ifdef __linux__ around the pagesize functions Thomas Huth
2022-08-30 17:19 ` Thomas Huth [this message]
2022-08-31 22:16 ` [PULL 0/6] First s390x updates for QEMU 7.2 Stefan Hajnoczi
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=20220830171947.71464-7-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.