External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-01 23:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

virhostmem: Get total memory on macOS properly

Browse Source 
Problem with HW_PHYSMEM sysctl on 64-bit macOS is that it
returns a 32-bit signed value. Thus it overflows. Switching to
HW_MEMSIZE is recommended as it's of an uint_64 type [1].

1: https://github.com/apple-oss-distributions/xnu/blob/xnu-10002.1.13/bsd/sys/sysctl.h

Reported-by: Jaroslav Suchanek <jsuchane@redhat.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Michal Privoznik 2023-10-20 10:14:39 +02:00
parent bbb2332f7e
commit 69cdb11fba
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/util/virhostmem.c
View File

@ -617,7 +617,10 @@ virHostMemGetTotal(void)
unsigned long long physmem = 0;
size_t len = sizeof(physmem);
if (sysctlbyname("hw.physmem", &physmem, &len, NULL, 0) < 0) {
/* On macOS hw.physmem is int32_t which doesn't fly with >4GiB of memory.
* But hw.memsize is uint64_t. */
if (sysctlbyname("hw.memsize", &physmem, &len, NULL, 0) < 0 &&
sysctlbyname("hw.physmem", &physmem, &len, NULL, 0) < 0) {
virReportSystemError(errno, "%s",
_("Unable to query memory total"));
return 0;