From patchwork Wed Jul 22 06:28:54 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: 246966 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp267272ilg; Tue, 21 Jul 2020 23:30:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4PXTnRZoCAzVI+Kh9ChxO6risOwBEGZijSYENP7gn58gydVe6LFsjh6NYjMfuUUI1nHXL X-Received: by 2002:a25:3cc7:: with SMTP id j190mr15631905yba.255.1595399400877; Tue, 21 Jul 2020 23:30:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595399400; cv=none; d=google.com; s=arc-20160816; b=p1pO5/kpeeCMDRmpb1twaFJRQ62D75W0TmREAveGhHRPdlT75kBVqqa9oNeHbLF0jU saGJKHtzuSAE/wW7I1gXTqPTN7j8Ia3LGWJnPYP+oQoSkGqTVdAzKEKAClGkqPtPhB7U 4fuXO6D+fUVuNM+8dSJrwR/x9ox3KvsUcExWVbxKJqT5EAQtwiOZ/p5TrR/nUeoZUdw5 wJbjbPiIOKvkKZupnfSP/689fnnlzGFCuvryVXzFTGGw9bSfQRM4ajHp8pozx/WOX2WL q2c8A92JKJJA+MSG4TO/E+wH1xW21oUUo9Qjtbb7++FBOBz6aN7iDo4aUHAJsK957ist zC8g== 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=3SEE/U35Sk7kKQ9s+FBzHg3olOo/kk7QFWLZd3Yj4zo=; b=uQiymEOxVJVIxtDmsHDvAXzrlj3hQQNxz0jy7vsy289mdjfit66ZmeKk3FpMHUQICb 53lUyoWshe4aNJD3irMwYs1WFk4fdl+gUsXbk4ukAmqRgThOrpKojREtEDvbKdaXnA/X +MoP3KW55FC6mcu06ion+Dm6x3Z/A890OpP50ny7Pli5IckVInIM307KCo/d5Cj1IjOA Ca8F2NuF0HakGed/BIqLMX6Q6Im01/56r212gcgfe++f0roqhG6GTQOJoMLveW9JIfJw C4wOA5mtgvTdCDzwV8mZoGSfJguo1pKegfp69QZUGTtasiq+c6ho5a0c0YKhZHicaU22 6F3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KIvG4tOs; 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 e12si21492820ybr.208.2020.07.21.23.30.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Jul 2020 23:30:00 -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=KIvG4tOs; 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]:51238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jy8GO-00077m-Cq for patch@linaro.org; Wed, 22 Jul 2020 02:30:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41302) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy8Fe-00075j-7m for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:14 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:39997) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jy8Fc-0006ui-Kh for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:13 -0400 Received: by mail-wr1-x441.google.com with SMTP id f2so699970wrp.7 for ; Tue, 21 Jul 2020 23:29:12 -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=3SEE/U35Sk7kKQ9s+FBzHg3olOo/kk7QFWLZd3Yj4zo=; b=KIvG4tOsCATGg01BVhSb0xWejAqfS4NH7ZNobtUxrmYYxlrCpOzK0tJguGk8RAshxU 0CMvO4E7jOzdTJPyjPSFfcey/xMwrHz+i2ORhcEn2QzScZI9WYlRPKeOwPWSBr+9ziQC HETUBjeXDS6Qf4OoTQRfgJZxDXCDNgYYoTjjTzW6xOvGA3aL4BEMci/Lu1aMJBl3RlOl LOw3WRQInB5snrl8vxqUUQA9Njvc1EIzwl9Ygs3sogj6tL22zDUT4iDFnxEbxQKQyDCC bghkZzgeTH4Msv4FqHq+PVx9WUUt2Q0WwUNtSCzoioDq92n/s8rZ6UpdwBlU5r77821x g5uQ== 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=3SEE/U35Sk7kKQ9s+FBzHg3olOo/kk7QFWLZd3Yj4zo=; b=Cyf+LEQ5sCrpQkARbPkroOodMN6vTrlxRPSxp2waEEf7p1nEgVIcufcUX1Wh1MCb7n olLND6aD5zR8pnEpPvCKvHRihtdLPTcDJlfoB1XUXf+FL07tWsZA68PsoBE4B6tuY1it epDoWvCRB+0/G4oOajieu6v4b3E3Q2wgpgjRME0ry4HMetKtW7BGebx5YM8GiZwGis3x DQ72JQvUOLYxhMjcYHkUnXPEQHfLcYLYXhNs2FEOAOZb+EK3m2XgSN8izaodPizrOqsG tr2sO8yHkvacTPw9ONI//mGpACY1+yoPudcNYclbEPVwpeG3ClCmxnDBkRI/JPc8sFIw jJTg== X-Gm-Message-State: AOAM531drAA0OeCjShyU7EXgK+8kI4CnUoxxfUkh1xyumhIusyvOiOWu AzX5HxAjGZ7L/hvy6dNc4gulrA== X-Received: by 2002:a5d:6646:: with SMTP id f6mr14933699wrw.155.1595399351235; Tue, 21 Jul 2020 23:29:11 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x18sm39876727wrq.13.2020.07.21.23.29.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 23:29:08 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5AE6C1FF90; Wed, 22 Jul 2020 07:29:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 04/12] util: add qemu_get_host_physmem utility function Date: Wed, 22 Jul 2020 07:28:54 +0100 Message-Id: <20200722062902.24509-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200722062902.24509-1-alex.bennee@linaro.org> References: <20200722062902.24509-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x441.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: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, Christian Ehrhardt , cota@braap.org, Stefan Weil , Paolo Bonzini , aurelien@aurel32.net 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 Cc: BALATON Zoltan Cc: Christian Ehrhardt Message-Id: <20200717105139.25293-5-alex.bennee@linaro.org> --- v2 - fix agnostic typo - saturate to SIZE_MAX rather than overflow --- include/qemu/osdep.h | 12 ++++++++++++ util/oslib-posix.c | 15 +++++++++++++++ util/oslib-win32.c | 6 ++++++ 3 files changed, 33 insertions(+) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 4841b5c6b5f..e44547fb33e 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -665,4 +665,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; +}