From patchwork Thu Apr 24 00:47:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883778 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3198690wrs; Wed, 23 Apr 2025 17:54:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVG9SLzSG88tEctTlT/F0ySR1AYiXRqE4eZI3bvV/gvEx+/nZKPa0Rrn8yo39EG3mhfeZFJwg==@linaro.org X-Google-Smtp-Source: AGHT+IHJGZvJoHtUA6caKc/pX2aEas1ecegjV8PdpQq0K73CeDKBCVwDHcOrQQz4Icp2FiWDjSKq X-Received: by 2002:a05:620a:5d90:b0:7c4:bca3:6372 with SMTP id af79cd13be357-7c95844d1ccmr69523685a.0.1745456051989; Wed, 23 Apr 2025 17:54:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745456051; cv=none; d=google.com; s=arc-20240605; b=c5/JdMWa3P23aD0LYkKMo/Ps764BTwwCBmKuxxH1WQuEOm+UpAF7mVFHkow48sNR71 mXAAxWqid5tbeKGKJj8wRWA9Hb5XuNEJHba7HjgitgY9p1fj1YqbjdLXAdcENGa9/Eg3 wT62ddIbLuCFt46G7u46CGlDHbvYpfBheZSf97deXC1kLZqp15ZiWKWjmDz11lskVaxL gQdGFTkevKxKghIeAmaIBxtC/Q2fNvTDFlMohLdArTuWuxpH9kUL2AxgRLKO0LvVRS9W 7ZgjC4HZI/PqcwPk3pFxFbzeiFeKRoZooBNVWswJyP6Mhj5YDTxIINHevgnkgxW3/Pkm Ob3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:cc:to :from:dkim-signature; bh=tJ+EfqFiptMAQIqFH9MrlUuf9tOxdmhxubkBN2YjdQI=; fh=6Iy23zC9AdgEjl8BT287tms7OsCTNhvcMTX6iUEgWw0=; b=dCzVjtaj5YFeWfh0qT2CZQ6U+BisOogjb53bHNG5EjYgkNvx0bjyygGmQor4eZHG1S Qj4iBChz8tKUgOQ5Q0TajuTXM7LqBUvx0Y35drrsawzkfB67E1235hcYanM4NjuC3k9H +VwkTCN8Htw0dXTAFD3r7QArJmljBpfUdBM3Oh9bpZt341Qtwv3yfRhqkYbKh2Z623X3 9+bY53lvMZJpjo66aDeK9E4ERtmmizGEMaFDMhVk711sSThq5c9jMO4U3AGF9R9gPEoT lO4AgyPUJxS+cexVM5L3wm1Kqc1sTA3mw8IvG6bMsvMXpwwOqucV9r3EyQA5HUborz5f Ubeg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Gw1pNs7i; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c958eb8753si18195885a.488.2025.04.23.17.54.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Apr 2025 17:54:11 -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=pass header.i=@linaro.org header.s=google header.b=Gw1pNs7i; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7kmk-0005Cr-R8; Wed, 23 Apr 2025 20:49:50 -0400 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 1u7kmh-0005Ay-1w for qemu-devel@nongnu.org; Wed, 23 Apr 2025 20:49:47 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7kmf-0004Jr-AM for qemu-devel@nongnu.org; Wed, 23 Apr 2025 20:49:46 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-7399838db7fso508909b3a.0 for ; Wed, 23 Apr 2025 17:49:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745455784; x=1746060584; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tJ+EfqFiptMAQIqFH9MrlUuf9tOxdmhxubkBN2YjdQI=; b=Gw1pNs7i1lfKSmriOnQ5d848YHWSRj3mSIPhviN1hDkp3CvTZyScxQDTSqf8Dl2wNV B9Jrm6lxtArWoiv4/BIfG/1/nYurkl2t0zxobXMbv7GO3FaBi2aJJX9THUvXz+A6aNjW K2iue060iNNuRL/Ovu5+Kmb2fXISBrQ+TmOOTSw1+K0D3AmZhF2yJ0oK2BFzOpwDOR3O bjduvMrYDYvnnt11l+UTEWUg8cHxWhMTBEzn4QUh7sNKJxusQ+GtnRNah3H54n5oLy09 Ry33rW6YzKDpSZEBY7xwKyVNc85CfrFnoAVX85YmLw9TIt2Su8AAXgXI1jd6XUModvTS gAiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745455784; x=1746060584; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tJ+EfqFiptMAQIqFH9MrlUuf9tOxdmhxubkBN2YjdQI=; b=l/A46OpUYSZ7/Qb5cMEDC++7KGJnuPijlR44q0UjB3wjRXfGiaJCdA+znX+kA9UFce /qdn94fWcRuh+9efkZ0FqeGkg2ATH0vrQEhFEJo872DnI+glcVv9MoWLSYWw+pRt2M1c piSlid7JIfLXXmAIdfuofFc/eBFjgeqKVnTfKn5mOGu7qlgBMaR5F1AHI6300PmN9BwD hNABROq7xkwr47QIO8EnS3goie4XgwEYiBmBbPfACdUZChcwDKGOqlNjAaX5JsyxkulW GjFzS309hWH8p8Igtq71z7VGRVdIzB7aM1xK8E3ZRNAICV2OcOA4IdniS0Os7xm5OjKI /4Kg== X-Gm-Message-State: AOJu0YwtQQomND23sGMaVYkd2OS2exz6itrEziaKHbwyh5KT9W6L8abL hPZv9R67yHOICaxmgof1iQKkZzUuVRFqyOuHp2+9NWleYiU4/CEBqJrLsGMais5o5rLKyw1ZKHE Q X-Gm-Gg: ASbGncs2Qa4Jxwun3cnN1TadVr2flo3iBlpyJ70tVufRxRJeunyfz5VWydjNXjBoV8V OejDpMoQNHDUHJe+WglyJdS1YTqwHWbS3OppB48aT6JzkOb4WI3tr6jkoaObx8bAcl//vFFDN0k H9R8Ca9J8JRqdkj5er+EtO+cXi2ovBIUTATOdbV7EO1jn3m7EBhfAgob7icwvmswy08/HwRWKen pqps+mmSVCZlJW2a43I33rWZVE7nbHBzwpqfI2/3Hgmpcyu1Z6qganc02JwosbqMxyAC3vavrP7 8dTHc5fAQWZjQGSjNgwX3dXjd2hfFTM7YVnTA+dSh5A6NfscjKm07oKnmariJZz9GmjRM2BLoic ZCj1dmqjOhw== X-Received: by 2002:a05:6a00:928b:b0:725:4a1b:38ec with SMTP id d2e1a72fcca58-73e267b8cf9mr690382b3a.3.1745455784056; Wed, 23 Apr 2025 17:49:44 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25a9a0f1sm207344b3a.137.2025.04.23.17.49.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 17:49:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= Subject: [PULL 013/148] system/xen: remove inline stubs Date: Wed, 23 Apr 2025 17:47:18 -0700 Message-ID: <20250424004934.598783-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250424004934.598783-1-richard.henderson@linaro.org> References: <20250424004934.598783-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x432.google.com 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.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-bounces+patch=linaro.org@nongnu.org From: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Pierrick Bouvier Reviewed-by: Richard Henderson Signed-off-by: Richard Henderson Message-ID: <20250317183417.285700-14-pierrick.bouvier@linaro.org> --- include/system/xen-mapcache.h | 41 ----------------------------------- include/system/xen.h | 21 +++--------------- 2 files changed, 3 insertions(+), 59 deletions(-) diff --git a/include/system/xen-mapcache.h b/include/system/xen-mapcache.h index b68f196ddd..bb454a7c96 100644 --- a/include/system/xen-mapcache.h +++ b/include/system/xen-mapcache.h @@ -14,8 +14,6 @@ typedef hwaddr (*phys_offset_to_gaddr_t)(hwaddr phys_offset, ram_addr_t size); -#ifdef CONFIG_XEN_IS_POSSIBLE - void xen_map_cache_init(phys_offset_to_gaddr_t f, void *opaque); uint8_t *xen_map_cache(MemoryRegion *mr, hwaddr phys_addr, hwaddr size, @@ -28,44 +26,5 @@ void xen_invalidate_map_cache(void); uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr, hwaddr new_phys_addr, hwaddr size); -#else - -static inline void xen_map_cache_init(phys_offset_to_gaddr_t f, - void *opaque) -{ -} - -static inline uint8_t *xen_map_cache(MemoryRegion *mr, - hwaddr phys_addr, - hwaddr size, - ram_addr_t ram_addr_offset, - uint8_t lock, - bool dma, - bool is_write) -{ - abort(); -} - -static inline ram_addr_t xen_ram_addr_from_mapcache(void *ptr) -{ - abort(); -} - -static inline void xen_invalidate_map_cache_entry(uint8_t *buffer) -{ -} - -static inline void xen_invalidate_map_cache(void) -{ -} - -static inline uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr, - hwaddr new_phys_addr, - hwaddr size) -{ - abort(); -} - -#endif #endif /* XEN_MAPCACHE_H */ diff --git a/include/system/xen.h b/include/system/xen.h index 990c19a8ef..5f41915732 100644 --- a/include/system/xen.h +++ b/include/system/xen.h @@ -25,30 +25,15 @@ #endif /* COMPILING_PER_TARGET */ #ifdef CONFIG_XEN_IS_POSSIBLE - extern bool xen_allowed; - #define xen_enabled() (xen_allowed) +#else /* !CONFIG_XEN_IS_POSSIBLE */ +#define xen_enabled() 0 +#endif /* CONFIG_XEN_IS_POSSIBLE */ void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length); void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, struct MemoryRegion *mr, Error **errp); - -#else /* !CONFIG_XEN_IS_POSSIBLE */ - -#define xen_enabled() 0 -static inline void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length) -{ - /* 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 /* CONFIG_XEN_IS_POSSIBLE */ - bool xen_mr_is_memory(MemoryRegion *mr); bool xen_mr_is_grants(MemoryRegion *mr); #endif