From nobody Tue Nov 26 18:30:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1705675366; cv=none; d=zohomail.com; s=zohoarc; b=knBNtKADcheyQb8SIfx5sSfPlR8sG9WkRJgoBHEVGe+ObHdqVq+8L1cY68Mova//9d8bZebq07ngG3N88Q97VN+lYxrDrmba3eQkKyEsX9OerSfQWRiSs+3QZMUgG0uFN4NZsUpLoW/ZmJyPzbUa6J59NKlKkq0FIMqZeKMcdzM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705675366; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=6AVkUode0/nFErUFeXqxbWUts2uWARq/IxNNk6oJatw=; b=lHAvVTeBjvjX9oo4rcxTV6JzHTVV1rQSuNhe6/uiVuhAdSqjd8igzIec/zTWomKv0+gSrQ+OJIhNVKlHGLaMM8cEEsFbw4v/7N0nm0wwTr75lXzrgVLH0LUSsECmInVbR2lqhl+X2hJsOogjztz+mq8Gh+9BUIO8HXfoxS/AuUs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1705675366440401.1916550439488; Fri, 19 Jan 2024 06:42:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQq2z-0005tM-N0; Fri, 19 Jan 2024 09:40:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQq2r-0005q6-1K for qemu-devel@nongnu.org; Fri, 19 Jan 2024 09:40:35 -0500 Received: from rev.ng ([5.9.113.41]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQq2o-0003tr-La for qemu-devel@nongnu.org; Fri, 19 Jan 2024 09:40:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=rev.ng; s=dkim; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=6AVkUode0/nFErUFeXqxbWUts2uWARq/IxNNk6oJatw=; b=RhvwCsMCzhEtIQ8fyEh8bpOIps kfOC4idAY8mF4Eizmz0oGyEFNr7lOo1ffnEIkqL8i1Kh+dqvjJdupkUsoBmGKT5dTfXHOWIcmKRfV ZyCK9FaMN9c2UuCyVGDUeh+bE9Icg8TQmn2TfGMxpw82WmqA/1jMjRPTNqoUq5+KNIdg=; To: qemu-devel@nongnu.org Cc: ale@rev.ng, richard.henderson@linaro.org, philmd@linaro.org Subject: [RFC PATCH 18/34] accel/stubs: [CPUTLB] Move xen.h stubs to xen-stub.c Date: Fri, 19 Jan 2024 15:40:08 +0100 Message-ID: <20240119144024.14289-19-anjo@rev.ng> In-Reply-To: <20240119144024.14289-1-anjo@rev.ng> References: <20240119144024.14289-1-anjo@rev.ng> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=5.9.113.41; envelope-from=anjo@rev.ng; helo=rev.ng 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Reply-to: Anton Johansson From: Anton Johansson via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1705675367121100007 Content-Type: text/plain; charset="utf-8" Makes xen.h header independent of softmmu target. Note: CONFIG_XEN_IS_POSSIBLE is only used define stubs in xen.h and optimize xen_enabled(). Required by cpu_physical_memory_set_dirty_range() in ram_addr.h. Signed-off-by: Anton Johansson Reviewed-by: Richard Henderson --- include/sysemu/xen.h | 27 --------------------------- accel/stubs/xen-stub.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/include/sysemu/xen.h b/include/sysemu/xen.h index bc13ad5692..838bb5a003 100644 --- a/include/sysemu/xen.h +++ b/include/sysemu/xen.h @@ -12,16 +12,6 @@ =20 #include "exec/cpu-common.h" =20 -#ifdef NEED_CPU_H -# ifdef CONFIG_XEN -# define CONFIG_XEN_IS_POSSIBLE -# endif -#else -# define CONFIG_XEN_IS_POSSIBLE -#endif - -#ifdef CONFIG_XEN_IS_POSSIBLE - extern bool xen_allowed; =20 #define xen_enabled() (xen_allowed) @@ -32,21 +22,4 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, struct MemoryRegion *mr, Error **errp); #endif =20 -#else /* !CONFIG_XEN_IS_POSSIBLE */ - -#define xen_enabled() 0 -#ifndef CONFIG_USER_ONLY -static inline void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t le= ngth) -{ - /* nothing */ -} -static inline void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, - MemoryRegion *mr, Error **errp) -{ - g_assert_not_reached(); -} -#endif - -#endif /* CONFIG_XEN_IS_POSSIBLE */ - #endif diff --git a/accel/stubs/xen-stub.c b/accel/stubs/xen-stub.c index 7054965c48..73cfa2d291 100644 --- a/accel/stubs/xen-stub.c +++ b/accel/stubs/xen-stub.c @@ -14,3 +14,15 @@ bool xen_allowed; void qmp_xen_set_global_dirty_log(bool enable, Error **errp) { } + +#ifndef CONFIG_USER_ONLY +void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length) +{ + /* nothing */ +} +void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, + MemoryRegion *mr, Error **errp) +{ + g_assert_not_reached(); +} +#endif --=20 2.43.0