From patchwork Mon Jul 27 12:23:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 247164 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp4753692ilg; Mon, 27 Jul 2020 05:24:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy1ta7xK1+AjUn7bJOx8RSOWWePqFLne2bh37+k0gwR6ar708B9kXsZ87Ttidpx3LV3XXsx X-Received: by 2002:a25:7283:: with SMTP id n125mr3624830ybc.28.1595852659662; Mon, 27 Jul 2020 05:24:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595852659; cv=none; d=google.com; s=arc-20160816; b=MWBvq6G9JQ3K4TfmdSyweMLNPacmCXwXREXFFtcvC1hnqLgpsn8UpcmU5jTzfJ30G7 t2VP6D7OrmHbOVf5YhlTS8kWkN5B9lmrtJPuu3TYiCjZt0W3YbWfRMxSOrBdMGUvSMA9 g+yZ3rYmxAYvbfZuus+1TwFPFWQFQqDfnVlLDhZGOwHvIQCwAvio+K5qlRQQU91gwL6s eWVi5PDbSKdr8cF822uQ2FpbaR5+S0oDmS7V8J4PGCaE301rLpSSn4JVeIjtOjW4jKkv oKWV/REtbJa3w9TPffSlJm8A6pNoeI3P18ECIaB2cLeqn5wWhLPhlVVHcZnT+2taLA1g /pDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=4DkH+HsKr59a1msZyNsGwSRnaJGoXL2y3SWKWzOhSpU=; b=vO19Vi7+sVWMz2T0g+BUVcTukhWwhn+nEd71iiHHF/O4ryZKnt/+wpCj6KJUAqSXwW UrORTJRp5saXBnXWoa+MUP/y+njJiPW4OzsgufKf0ppmS6NYxeZYdJbYIiycR0muSeb+ 4IhG8fNnUFuiMHZmFBi4IjHbSRdTjAryjAHIsoPY3hBLurH06OIWA3OF46k/0pW/quJE FOyqKWHm0WTDcMBMXMW1/z57y0NN1UF++l/EybH4PsqodnzJl1y2ScIaqkQeejOKsTNh zPVKHR+iU9tkybDZQy958KIRTlNsuJxpQpI2e6HgJ9Nsaz5FOjgKAzcaUv7RvZpYByw3 J1bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ivz7bepB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p82si9670876yba.69.2020.07.27.05.24.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Jul 2020 05:24:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ivz7bepB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k02B1-0006xB-55 for patch@linaro.org; Mon, 27 Jul 2020 08:24:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36962) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k02Ao-0006uP-UA for qemu-devel@nongnu.org; Mon, 27 Jul 2020 08:24:06 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:40034) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k02An-0006QD-8h for qemu-devel@nongnu.org; Mon, 27 Jul 2020 08:24:06 -0400 Received: by mail-wr1-x442.google.com with SMTP id l2so4115412wrc.7 for ; Mon, 27 Jul 2020 05:24:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4DkH+HsKr59a1msZyNsGwSRnaJGoXL2y3SWKWzOhSpU=; b=Ivz7bepBEmniKPvFEH8tB/o+eAqzW/oFlp7mg/i9blICyxhA1aNpA+DxYBbf/JF94G g8RXFZ0+oGq148PVBbjW0n8MEaLcgda8xj8ovrO+uNF25Fl8EbNoGd+zjtKHiJREwKAW bKEpeJjwniXV3d3DHWFXtaU9+2yjPOvq8iUYVVq3EYetCBjqLtni4x1P3y99/6WIgSpl gGpi6RYAp5PcoP8U/naRBC7foGjpTybY2Wj82Rdpl0q1v2M08OS2MBXPIXrxCdru+4B6 oRrPx+FT/GbgH6Ha12Wf1p2NIDxeFiz1I1yB9f6OOSnlcrku421dI9z0A2EJHWLTXkf7 wNUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4DkH+HsKr59a1msZyNsGwSRnaJGoXL2y3SWKWzOhSpU=; b=qV+JhOOehBj+V356wl4S7i7K1RQVzHitq/EyvEQBY84/0H0Ydzh+OUY3YuokvMI48D EWOpQikQ3PVAt6HlhxWDhdfrt4m8ou2ph3cK8I+zZNh7P3HhrNAV99W0woQ6OgRPbmpA 13NXtZjCsx+b/LxmC6mcORKH0U6do03iNyIRcNswdX5ldKpSBjHqQpuALeyPJM1kKuRD tBHxBP1I7K1K904oL2VJFVghuyjmJHpaTjfOLgqduW+kTx8iQ23HNlXtF0BH3w76De9P nKpC4v1QzDli2tpxpcvLkFyxDdZz4COuEKaB56PvkLvRWlUyMfw4j6lOiRvkMfECee07 KubQ== X-Gm-Message-State: AOAM532YJf46Q7byhBDp7zzo9sq3za+cyAB0DvBTpJo1j0YltkzFdUEC RMxqNfMyMFZQ7aQGx+y8Hub9mQ== X-Received: by 2002:adf:83c5:: with SMTP id 63mr19833097wre.321.1595852643909; Mon, 27 Jul 2020 05:24:03 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z11sm12067528wrw.93.2020.07.27.05.23.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2020 05:24:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BC7A21FF90; Mon, 27 Jul 2020 13:23:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 04/16] util: add qemu_get_host_physmem utility function Date: Mon, 27 Jul 2020 13:23:45 +0100 Message-Id: <20200727122357.31263-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200727122357.31263-1-alex.bennee@linaro.org> References: <20200727122357.31263-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Weil , Richard Henderson , qemu-devel@nongnu.org, Christian Ehrhardt , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This will be used in a future patch. For POSIX systems _SC_PHYS_PAGES isn't standardised but at least appears in the man pages for Open/FreeBSD. The result is advisory so any users of it shouldn't just fail if we can't work it out. The win32 stub currently returns 0 until someone with a Windows system can develop and test a patch. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Cc: BALATON Zoltan Cc: Christian Ehrhardt Message-Id: <20200724064509.331-5-alex.bennee@linaro.org> -- 2.20.1 diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 45c217aa280..0b1298b3c91 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -668,4 +668,16 @@ static inline void qemu_reset_optind(void) */ char *qemu_get_host_name(Error **errp); +/** + * qemu_get_host_physmem: + * + * Operating system agnostic way of querying host memory. + * + * Returns amount of physical memory on the system. This is purely + * advisery and may return 0 if we can't work it out. At the other + * end we saturate to SIZE_MAX if you are lucky enough to have that + * much memory. + */ +size_t qemu_get_host_physmem(void); + #endif diff --git a/util/oslib-posix.c b/util/oslib-posix.c index d9236746248..ad8001a4ad8 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -841,3 +841,18 @@ char *qemu_get_host_name(Error **errp) return g_steal_pointer(&hostname); } + +size_t qemu_get_host_physmem(void) +{ +#ifdef _SC_PHYS_PAGES + long pages = sysconf(_SC_PHYS_PAGES); + if (pages > 0) { + if (pages > SIZE_MAX / qemu_real_host_page_size) { + return SIZE_MAX; + } else { + return pages * qemu_real_host_page_size; + } + } +#endif + return 0; +} diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 7eedbe5859a..31030463cc9 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -828,3 +828,9 @@ char *qemu_get_host_name(Error **errp) return g_utf16_to_utf8(tmp, size, NULL, NULL, NULL); } + +size_t qemu_get_host_physmem(void) +{ + /* currently unimplemented */ + return 0; +}