From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: fam@euphon.net, berrange@redhat.com,
"Alex Bennée" <alex.bennee@linaro.org>,
richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org,
"Stefan Weil" <sw@weilnetz.de>,
aurelien@aurel32.net
Subject: [PATCH v2 05/12] util/oslib-win32: add qemu_get_host_physmem implementation
Date: Wed, 22 Jul 2020 07:28:55 +0100 [thread overview]
Message-ID: <20200722062902.24509-6-alex.bennee@linaro.org> (raw)
In-Reply-To: <20200722062902.24509-1-alex.bennee@linaro.org>
It seems GetPhysicallyInstalledSystemMemory isn't available in the
MinGW headers so we have to declare it ourselves. Compile tested only.
Cc: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
util/oslib-win32.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index 31030463cc9..f0f94833197 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -43,6 +43,8 @@
/* this must come after including "trace.h" */
#include <shlobj.h>
+WINBASEAPI BOOL WINAPI GetPhysicallyInstalledSystemMemory (PULONGLONG);
+
void *qemu_oom_check(void *ptr)
{
if (ptr == NULL) {
@@ -831,6 +833,15 @@ char *qemu_get_host_name(Error **errp)
size_t qemu_get_host_physmem(void)
{
- /* currently unimplemented */
- return 0;
+ ULONGLONG mem;
+
+ if (GetPhysicallyInstalledSystemMemory(&mem)) {
+ if (mem > SIZE_MAX) {
+ return SIZE_MAX;
+ } else {
+ return mem;
+ }
+ } else {
+ return 0;
+ }
}
--
2.20.1
next prev parent reply other threads:[~2020-07-22 6:34 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-22 6:28 [PATCH v2 00/12] candidate fixes for 5.1-rc1 (testing, semihosting, OOM tcg, x86 fpu) Alex Bennée
2020-07-22 6:28 ` [PATCH v2 01/12] shippable: add one more qemu to registry url Alex Bennée
2020-07-22 6:28 ` [PATCH v2 02/12] semihosting: defer connect_chardevs a little more to use serialx Alex Bennée
2020-07-22 6:28 ` [PATCH v2 03/12] semihosting: don't send the trailing '\0' Alex Bennée
2020-07-22 6:28 ` [PATCH v2 04/12] util: add qemu_get_host_physmem utility function Alex Bennée
2020-07-22 15:51 ` Richard Henderson
2020-07-22 6:28 ` Alex Bennée [this message]
2020-07-22 6:49 ` [PATCH v2 05/12] util/oslib-win32: add qemu_get_host_physmem implementation Philippe Mathieu-Daudé
2020-07-22 10:03 ` Stefan Weil
2020-07-22 10:13 ` Daniel P. Berrangé
2020-07-22 11:33 ` Alex Bennée
2020-07-22 11:38 ` Daniel P. Berrangé
2020-07-22 10:32 ` 罗勇刚(Yonggang Luo)
2020-07-22 10:50 ` Stefan Weil
2020-07-22 11:31 ` Alex Bennée
2020-07-22 11:41 ` Daniel P. Berrangé
2020-07-22 6:28 ` [PATCH v2 06/12] accel/tcg: better handle memory constrained systems Alex Bennée
2020-07-22 15:57 ` Richard Henderson
2020-07-22 16:29 ` Alex Bennée
2020-07-22 16:44 ` Daniel P. Berrangé
2020-07-22 19:02 ` Richard Henderson
2020-07-23 9:00 ` Daniel P. Berrangé
2020-07-23 9:22 ` Alex Bennée
2020-07-23 9:31 ` Daniel P. Berrangé
2020-07-23 10:06 ` Alex Bennée
2020-07-22 6:28 ` [PATCH v2 07/12] target/i386: floatx80: avoid compound literals in static initializers Alex Bennée
2020-07-22 6:45 ` Philippe Mathieu-Daudé
2020-07-22 6:28 ` [PATCH v2 08/12] linux-user: don't use MAP_FIXED in pgd_find_hole_fallback Alex Bennée
2020-07-22 16:00 ` Richard Henderson
2020-07-22 6:28 ` [PATCH v2 09/12] tests/docker: fix update command due to python3 str/bytes distinction Alex Bennée
2020-07-22 6:29 ` [PATCH v2 10/12] tests/docker: fix binfmt_misc image building Alex Bennée
2020-07-22 6:35 ` Philippe Mathieu-Daudé
2020-07-22 6:29 ` [PATCH v2 11/12] tests/docker: add support for DEB_KEYRING Alex Bennée
2020-07-22 14:27 ` Philippe Mathieu-Daudé
2020-07-22 16:03 ` Richard Henderson
2020-07-22 6:29 ` [PATCH v2 12/12] linux-user: fix clock_nanosleep() Alex Bennée
2020-07-22 6:49 ` Laurent Vivier
2020-07-22 8:33 ` Laurent Vivier
2020-07-22 8:55 ` Alex Bennée
2020-07-22 12:03 ` Laurent Vivier
2020-07-22 7:05 ` Philippe Mathieu-Daudé
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=20200722062902.24509-6-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=cota@braap.org \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=sw@weilnetz.de \
/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;
as well as URLs for NNTP newsgroup(s).