From patchwork Tue Feb 8 20:08:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 540804 Delivered-To: patch@linaro.org Received: by 2002:ad5:420f:0:0:0:0:0 with SMTP id e15csp779367imo; Tue, 8 Feb 2022 12:13:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJzQw5e8nv6b7uGPb5/I9K+PCsAu+2V0VveJZ3xk+9JZvRh3tfzyjEHXaNliCSnpEjMCBGed X-Received: by 2002:a25:44c4:: with SMTP id r187mr6216162yba.51.1644351185228; Tue, 08 Feb 2022 12:13:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644351185; cv=none; d=google.com; s=arc-20160816; b=ey1UPXsOYL7W/DlQQvHrsYFAr2D94u0DoHwXyZRo8uwTdr//bNK3boejAyRh0OvRxd RsdYqTYSWXcXueh0qbNqKCLAZg+nhzvPbH05NR4DvpCuGk8e1ymvN+3ql9RuyhAHNoZE fjIYlbcwPOZX48eemKv0iTl9+tiOHMA9poo7bRwXS36CwgalxajOJVcotHLAyRF4DAt1 GYgYxSTkOfI/TwUdgkVI03Q1pgZ3mL5+tYws4YoX313PjW13WcP/Oq+ZjfZWUouiDXGf 49NkkMza715ewJMEUj9d3zkniCS/8oIGZFpEfbnpf25WvIfz1958enQqXExhtEMgNzhE qm3w== 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=Kvt1TfUvKKE2DWl3Q8+xXwyGqPqxYFhXR1/NgDzzilg=; b=uPfz1y9+sVvNfwUuGbx3ClJVEUQqa6mhrnoDdGx7JwWhoGz2x9gUrWwWqIrbVP25+P svGY1vXl6+eX2LeugKsBEj6TTueZmsRr+0szeO/ThEAFjOm8GvCqC4nPiThibaVKHukJ kLTSmR0mFIdVp9FlEmqxZea1f8f9Fc6h2WO5nI0zpvpXEYuB1G65fVpPUZhvae/TFjxX Tk8FoomZyB03gEnqP941KiNOhGJOUgtC2oXJ/bnAq18YMpu01g/sgwuUtyC4bsll1BSu 4OVaXEbCc24nTw86kCA6rfY/2luYSOC1v8pQ8ksFMcRoym8LlYE8qJgAYssU7Ct4I3rx lH9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XfRZ9eXJ; 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 a128si11192100ywh.34.2022.02.08.12.13.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Feb 2022 12:13:05 -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=XfRZ9eXJ; 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]:58290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHWrI-0003AC-LA for patch@linaro.org; Tue, 08 Feb 2022 15:13:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWnX-00032E-83 for qemu-devel@nongnu.org; Tue, 08 Feb 2022 15:09:13 -0500 Received: from [2a00:1450:4864:20::435] (port=47095 helo=mail-wr1-x435.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWnT-00066b-4b for qemu-devel@nongnu.org; Tue, 08 Feb 2022 15:09:10 -0500 Received: by mail-wr1-x435.google.com with SMTP id q7so277640wrc.13 for ; Tue, 08 Feb 2022 12:09:00 -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=Kvt1TfUvKKE2DWl3Q8+xXwyGqPqxYFhXR1/NgDzzilg=; b=XfRZ9eXJkcIeBR4roww+GdKRs5Wx0H8FCzovdbN4IBRtDg++jFP8cohPRxipRFiZKI C16EA+jC2vf7w4Ni7SxcahAf4p+1gwkM6AfhQ9eG4j/uWMeLtX+LEy1y35eB//so+DlN gxxt7rLqGPSmIjhMHq4MXBbN1wPtK3y4f4/H8J8okFTuPwwN5uiktuP/jYCR0iwJFXAl qPp8j+S55YH1jBrvn10093G3bRO76gh80svjTixvj/1WoQ2Mjv8iUrRLQIfedI2GBMvh 4PCdk1w+dJjtvDJ+4GoSH5qaqXNiwiE6flie3uq1l7PxnKZkaxB3hsSJCn4TkXs3+kq+ HhKw== 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=Kvt1TfUvKKE2DWl3Q8+xXwyGqPqxYFhXR1/NgDzzilg=; b=wxK6QqzjBtrXjuYUUe8dNY3+72tRxGf/YWCjkOo/7zdwoDiSg3TsoF19NwA25Uk1WX ymjNKeNSWQQBoKt2GFEgMFcYC0eifv7IwIT2Q01S6xYB2t5eLxN2yjPLvM2BbQUpPqPf TMReZ1jYpTToz02diFsm1FJTntsE5uP/76sqftMSzFevYp8bh+3wHxynIAEDwpIxuzkD xRUoIlz/xMB1XK2EvugM26OZ6zcnWbYehrLnkOSVEyIlaP/srH2bX8ujeciswWClbcEj tj0dDegPAiAtk1j3+4k195dwZeyEQeiFxqABOGaG8Q/YMwr57SArz0c2ch+O+pfnYK72 dOCA== X-Gm-Message-State: AOAM531uIA0VmUWncVXCcY10l9MKgI7hxSmkXzKpmozVlo7T41VjiPgs BYwz38MjwZIqhy12FKzAyA8my3sMfYZzpw== X-Received: by 2002:a05:6000:1869:: with SMTP id d9mr4784644wri.432.1644350939909; Tue, 08 Feb 2022 12:08:59 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id r2sm4098170wmq.24.2022.02.08.12.08.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 12:08:59 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 2/5] include: Move qemu_mprotect_*() to new qemu/mprotect.h Date: Tue, 8 Feb 2022 20:08:53 +0000 Message-Id: <20220208200856.3558249-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220208200856.3558249-1-peter.maydell@linaro.org> References: <20220208200856.3558249-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::435 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x435.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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.001, 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_mprotect_*() family of functions are used in very few files; move them from osdep.h to a new qemu/mprotect.h. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- include/qemu/mprotect.h | 14 ++++++++++++++ include/qemu/osdep.h | 4 ---- tcg/region.c | 1 + util/osdep.c | 1 + 4 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 include/qemu/mprotect.h diff --git a/include/qemu/mprotect.h b/include/qemu/mprotect.h new file mode 100644 index 00000000000..1e83d1433ee --- /dev/null +++ b/include/qemu/mprotect.h @@ -0,0 +1,14 @@ +/* + * QEMU mprotect functions + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ +#ifndef QEMU_MPROTECT_H +#define QEMU_MPROTECT_H + +int qemu_mprotect_rw(void *addr, size_t size); +int qemu_mprotect_rwx(void *addr, size_t size); +int qemu_mprotect_none(void *addr, size_t size); + +#endif diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index cb74f4571a3..2a52933ce0e 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -496,10 +496,6 @@ void sigaction_invoke(struct sigaction *action, struct qemu_signalfd_siginfo *info); #endif -int qemu_mprotect_rw(void *addr, size_t size); -int qemu_mprotect_rwx(void *addr, size_t size); -int qemu_mprotect_none(void *addr, size_t size); - /* * Don't introduce new usage of this function, prefer the following * qemu_open/qemu_create that take an "Error **errp" diff --git a/tcg/region.c b/tcg/region.c index c46021d1604..7b4e65a52e8 100644 --- a/tcg/region.c +++ b/tcg/region.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "qemu/madvise.h" +#include "qemu/mprotect.h" #include "qapi/error.h" #include "exec/exec-all.h" #include "tcg/tcg.h" diff --git a/util/osdep.c b/util/osdep.c index 1999f42f6fc..72b678ca2e3 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -38,6 +38,7 @@ extern int madvise(char *, size_t, int); #include "qemu/sockets.h" #include "qemu/error-report.h" #include "qemu/madvise.h" +#include "qemu/mprotect.h" #include "monitor/monitor.h" static bool fips_enabled = false;