From patchwork Mon Mar 7 16:46:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 548867 Delivered-To: patch@linaro.org Received: by 2002:adf:80eb:0:0:0:0:0 with SMTP id 98csp1091274wrl; Mon, 7 Mar 2022 08:48:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJweIHhf+JSII4zatoLscO1R7vOM1nbq2K3TWNIfqq7cJNp1VgrRjcj4QHhn98ma3CX17WRE X-Received: by 2002:a81:1512:0:b0:2dc:75df:f3a2 with SMTP id 18-20020a811512000000b002dc75dff3a2mr9090622ywv.139.1646671703291; Mon, 07 Mar 2022 08:48:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646671703; cv=none; d=google.com; s=arc-20160816; b=ne6n24N+aGRgAN+OiBghOd+FHDxAopIbmeHTYIUvvbfVHWqUS7zsS9J69mBPwzOM20 n0EU1rCYinn+EMPFbaUm1Gtl0yUehjGbdSim0ynw6X+uDdkK8T809jLaSzJgLVzhR1Fa Za93hn0WR1Bsdc3/8GDcg1jqNwxneS1aZD7thVXR9LlkqX7ciKW0Yz6lZUG6DQ2zQLYw ceMquQFw/lTma97TBiL0OS/mbDnrWzPm0iYY2Fv1t/WbFHseBxrL9536kmUjLDXqaJHK dDEzUFWAUiH+dcJtn2LH8LVzylMYNqtptPXuqXiv2jB59LKyrsilLLqKBKaUuaXtQoZj /NuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=khb2dSFPApkPaahIP5O1Jg4lPgEuKg6KdJgWB44Ysm4=; b=fm8cFVz3JemORyXUtAMwRmjzl8WJL3He49Pu3Vt5EoDrQ6Jk2y8NLlMm7IlRT9xNqU LFvfeH62k0Fpt5VQ8GvejY5v85aW39bkA73JB8X1KAzQm6D4JHXi//yxM8YMPxR+eYxT cL7qF7W9Bp/nAaCHdSP22LLhNHreoyDdVNClpEmLa6cMpLf1Mp1nk9khXC3qrGV9+7nW eKuK28GTKUOusCE01YV882/HDhrL6kTku2GlHS7wOqJUv+5BtEDxGPNTOsu6P1a7URjS N2CTd1+gRDsD8aEsTcrOTFtE2VtwvJuT1+fQTnFdHJEoQBEVebkA/aD6udV8QUyQxBtl wUTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mOzqoQYN; 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=pass (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 bc13-20020a05690c000d00b002d035ccf969si11983173ywb.13.2022.03.07.08.48.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 07 Mar 2022 08:48:23 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b=mOzqoQYN; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nRGX0-0001LF-O0 for patch@linaro.org; Mon, 07 Mar 2022 11:48:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRGVv-0001Kw-RH for qemu-devel@nongnu.org; Mon, 07 Mar 2022 11:47:15 -0500 Received: from [2a00:1450:4864:20::429] (port=37874 helo=mail-wr1-x429.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nRGVu-0007il-9K for qemu-devel@nongnu.org; Mon, 07 Mar 2022 11:47:15 -0500 Received: by mail-wr1-x429.google.com with SMTP id q14so8727891wrc.4 for ; Mon, 07 Mar 2022 08:47:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=khb2dSFPApkPaahIP5O1Jg4lPgEuKg6KdJgWB44Ysm4=; b=mOzqoQYNMgc1nA+71FFmo27RsIKW294IW0QHrhL0EAbzL9K08ZjeIofxkiChLbJdh8 szVPjBkIjgzs3wQJjJZGa5CMBpnUmlcER8clYcBzTUdek7WjhFXBYEwv4p+VETkgarX6 b+hRC7EJyCuJwsEFAOUG+Vxms2VJewM9X42vq5rZn1Fnps4UfhP8H4Q7imuzmsa9Z3HM gCrKLIgKG/fdqSYEai6A63uCN/XVnsh1zZJFuEVpCJSDkoAmEOuCXxe+XyBCeq+AEsjf JLRybn0lRGuR0ubhkY35dV00VbHkS8B07fYNBq/k3mQhfhIS3kyhlJjKymy/+qGViWC9 abNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=khb2dSFPApkPaahIP5O1Jg4lPgEuKg6KdJgWB44Ysm4=; b=i7mev0D5nd5eseQGSqJte/+ZqWza7k+UyGWBzpqwFJ00xQFcn1lx9J+K6gP3olNEM+ ReLRyWm0hAs+6MZ00EBuWAH7iLbzZgGGvZJE3xpUePPSGcH5qH8JGh2NqBV5jel7h5Fe r0roYAJK+kGkO0tGUeAEso7Gvd/JXNi1g8hijBJqXHdDmF84zoSDddCJOXTmT43ZJ38+ LSpqZe1Z8tCcaYRYmANzrrYguQuM3CmVtuFoHerYmToWdd815Gn2zMdfCseTHyxxtMDB dO5epTYveuBdrQoPBSi3m/RmbUNJuGw9JL7/ElFZpcX0J4yPRcGVcf4mf/D4rAEHlPzR 5qbw== X-Gm-Message-State: AOAM531rZrcxfj8JQHo83Ee1rSB7GulTpeOzzbOnTuzG4MUoFStaruFY sp+CMEzXqz3+sBreU4uTG+s08EcGLTnK7A== X-Received: by 2002:a5d:6f0d:0:b0:1f1:f897:9dc with SMTP id ay13-20020a5d6f0d000000b001f1f89709dcmr4229874wrb.32.1646671632741; Mon, 07 Mar 2022 08:47:12 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id v188-20020a1cacc5000000b00384b71a50d5sm13806652wme.24.2022.03.07.08.47.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 08:47:12 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 01/18] util: Make qemu_oom_check() a static function Date: Mon, 7 Mar 2022 16:46:52 +0000 Message-Id: <20220307164709.2503250-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220307164709.2503250-1-peter.maydell@linaro.org> References: <20220307164709.2503250-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::429 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The qemu_oom_check() function, which we define in both oslib-posix.c and oslib-win32.c, is now used only locally in that file; make it static. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-id: 20220226180723.1706285-3-peter.maydell@linaro.org --- include/qemu-common.h | 2 -- util/oslib-posix.c | 2 +- util/oslib-win32.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/qemu-common.h b/include/qemu-common.h index 68b2e3bc109..8c0d9ab0f77 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -26,8 +26,6 @@ int qemu_main(int argc, char **argv, char **envp); #endif -void *qemu_oom_check(void *ptr); - ssize_t qemu_write_full(int fd, const void *buf, size_t count) QEMU_WARN_UNUSED_RESULT; diff --git a/util/oslib-posix.c b/util/oslib-posix.c index f2be7321c59..ed5974d3845 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -199,7 +199,7 @@ fail_close: return false; } -void *qemu_oom_check(void *ptr) +static void *qemu_oom_check(void *ptr) { if (ptr == NULL) { fprintf(stderr, "Failed to allocate memory: %s\n", strerror(errno)); diff --git a/util/oslib-win32.c b/util/oslib-win32.c index af559ef3398..c87e6977246 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -44,7 +44,7 @@ /* this must come after including "trace.h" */ #include -void *qemu_oom_check(void *ptr) +static void *qemu_oom_check(void *ptr) { if (ptr == NULL) { fprintf(stderr, "Failed to allocate memory: %lu\n", GetLastError());