From patchwork Tue Apr 22 19:26:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883082 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp2592464wrs; Tue, 22 Apr 2025 12:49:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX9XIBFMxChoXNQifQJfJmfIXKoZj/G/ddNcNujdQ+hkqOiL+ISp5MHJ07n+SzpFhtbwGoq8w==@linaro.org X-Google-Smtp-Source: AGHT+IEt/cANIHDYJhnLk1VExdvmr/B9p4EgWuYIvFulAHYRlq3YSZU0jKtmrJ222F0W6ZwY4GtW X-Received: by 2002:a05:622a:306:b0:479:1a3f:f1f0 with SMTP id d75a77b69052e-47aec49fd3bmr279765081cf.41.1745351373212; Tue, 22 Apr 2025 12:49:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745351373; cv=none; d=google.com; s=arc-20240605; b=LX6zYAZ/cblHoWkisik4WChUE2TM54tU04lwrGbAyXROjl00Z2idLF5zv+L7xRYA4x zwg6x7OJAZIpHTYbbjI2sBN7bHLb1fxUAGuP3JnaB4PHCnwEpuxcseyjmJ7e1vM9wkhE 0OmNQooWmLofGH4Vc0aw4Jrj65yvfTtVhf1PW9YrDqjuwcZu1RB3FpNiGULiW94u3qQd DbiHbOdGLwmEgk+4N4H+C0VAGeZUm8DneUyrBZG214v9WFBPvpiJsIHc1S4Wb8dTj2uo e7l84uYhASEACeK5ImzbcmLZMdcF/dNL0ys75X85hMgYjsd0oFZ0EdtRyX9E9XXZSbC0 46og== 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=DUqL4Vu3Zg3Ki/FCHrr+H5E+pEiz0tfO63NWTgJOQT5z0O1cCIgh5jdTTFAPvZQ/gA mXOSiVm2iXvAdguhIF+W+X8y302XuK25qjkgI1Ep9AnN2NZywXqSv9Ym06Hz2HzGaLaL rm5Y+CWQ59rG3HGtO5Oikc9z7SWnLugJyoZJcqX1B7CfhUy94zIxgi9phym4b2tazWoV LAszA/wn2r05VKq8qUC98IE3OQYT4sJfFDAuXw85dFs+SJAwwF8U3IQmsPHzxIIdkX30 +k/ENXABdBW2HS4JfOu8/BftJ8PrSHwtdfbTRt/QGRiLnb6jiZrbmT368RUN0FTnhHQe v+PQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CYGxF+aT; 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 d75a77b69052e-47ae9cda6c3si116534891cf.605.2025.04.22.12.49.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Apr 2025 12:49:33 -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=CYGxF+aT; 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 1u7JIW-0002WB-TQ; Tue, 22 Apr 2025 15:28:49 -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 1u7JIP-0002UP-GZ for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:28:41 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7JIG-0006BA-Pw for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:28:39 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-7370a2d1981so4558193b3a.2 for ; Tue, 22 Apr 2025 12:28:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745350109; x=1745954909; 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=CYGxF+aTAzvJqgkXo5etquzBhrqcCHxDoclgjtncgVFZVtu3eAYffSaiqkTJErZGj9 39YUyR0ktvURsQ8sK3VmlyOihJqxGh5eYanNKfamscS7Vqi3M43f7QRoliUemBkfq3Zb Bg4QGi4UZ7ke7JaXqLPFBAEGcO+J4zfMfYeBHE4r8iwHYtytb4Igb+QKIGqWsAspBrPD pPqYBBSgb7HJJ5wV4GFUYPiIE7C9FEhds3nZMUHhmOEC3UnzLxQlXVOwhfoJU7VABaPg Jaw24y80+FK8o09bNPT0i8Icv2H7MSRhXP8YgR3stK0JFI9BUEvdL1KI0xTCPqc26aTg o02g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745350109; x=1745954909; 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=ula21vBLSr50qx9Ch1ebyj/shjot2+xmQ9ONyvDGSJn1CQqH+4JhQ2TOAR6TJwhN6b Q/wWfZ9dNbUkyfblRPUpYrY9uLgehHRRvlNsyKqVDxJ9OCUqa/pT25r+6r2csSxgwgXI rwGKPnSsqNS1ihgb03oBHrsJBRJCUUzc2HPvPpyJK39TXlXzcXtFf6BicTEH8T09Xx0M MIsqUBSoVeu9+H3eo1zU4og2DOzYmx+BOzWX474IwRrmJ3DU+bN2EB/D3W6Dr4nfYtgM afViidwgs+31ykPbemCIAwUsb6fGjnJOOax+4abQTDZyfJuogKbmU96RyU8WT8gJSiKn igZA== X-Gm-Message-State: AOJu0YxNbKByANfkD3oMIlwoWrPlE4I1n7urZ/in2Z41lIyoZkxPojcG plBh9/eiQ9RWTvq2ekTHBJGzMg9gK7pMLv9jQNu+5BMIfgv+x5y2nxs3AA187zWBVd04I0GsM1A S X-Gm-Gg: ASbGncvlKWQXkXs93M7maA2Xuk4Ee6wDRQaeMcQK2lHIOsFa0Qw2Ca5NvuPMpt4Z1kc UZv1XrGXkUvrmxJq8DzyaxqIlPqy2svtcDm63QzHjS3DVMlk4OT4Ds/445b6aHOLOLilOPjk8az OBSF4INTobdLxAWK+hgyP9z/AiNHv4FCOYmRdKuZMZ8MZIpN4HyaYCqWLRdp18mDJnDGRbF+JDZ WY/nEwAMMf3Uwd7zSO0OpmWaRxJxPox/UOB3HWbjNsP8ZldZ51TVdUVz60Vq8F1FB43SJoqJG94 S4WRTuYwCvLbIO1qKDjktxN77NwUmQQOx2Pq5JiHx7sRIt0AopPGrnWhYouGNNWprqt4GM8MU/I = X-Received: by 2002:a17:90b:254d:b0:2ff:7331:18bc with SMTP id 98e67ed59e1d1-3087bbc22dbmr19855838a91.26.1745350109241; Tue, 22 Apr 2025 12:28:29 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3087df21278sm9146865a91.29.2025.04.22.12.28.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Apr 2025 12:28:28 -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: [PATCH 013/147] system/xen: remove inline stubs Date: Tue, 22 Apr 2025 12:26:02 -0700 Message-ID: <20250422192819.302784-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250422192819.302784-1-richard.henderson@linaro.org> References: <20250422192819.302784-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x429.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