From patchwork Tue Nov 14 14:38:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 743786 Delivered-To: patch@linaro.org Received: by 2002:a5d:67cf:0:b0:32d:baff:b0ca with SMTP id n15csp2209306wrw; Tue, 14 Nov 2023 06:45:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IGmz3/NwVA+QLmoesf4awIwtLoaa3nHqVcoaHPAPqcPCOg7lJXkzO9j6Zy2M3rLkRBvqpWS X-Received: by 2002:adf:ebca:0:b0:32c:ea14:89e5 with SMTP id v10-20020adfebca000000b0032cea1489e5mr6311307wrn.39.1699973145930; Tue, 14 Nov 2023 06:45:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699973145; cv=none; d=google.com; s=arc-20160816; b=XGR5Z23y2RnR57m6CZhKS1KLLHaIbsAYR4287l804Lnw8BELfexVDx1ybbco4b+YaW B3ldXH1JLTG11vaBV94TnJHiC6kac5VRnbFgtPa05JU6daQLsHXJYOvv8l8B+fFky8b1 gnGp7vgSDuQRdcrcEuylyDBKVHDK+dHbwdBObNw+ktw98RFE2GhLS5fBP3I0oJBfdHvm qLLvTURwkO62fdBlaDKM9tM4ZFG+TRJ8ouiMenmc8ukIMR+OkRUynqSFlpuWP1AuMl+M hxobL+/T/2WdCaKMRKpjyWh58nqSASMuFB9L2cXB4PMREIyF3H/vKig+6uX1wthAVb6A DaEA== 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:cc:to :from:dkim-signature; bh=6XE67RaqwP19rEjPR9cmWaIkbDnma1jGWKj3qDcuG2M=; fh=8PS3Hy0DxHmOgUJ3YqzgHibVab/EASfDmwtZOBvIi2A=; b=E84sHT5uSoWgvhKuGQLucbpO0MY7frPGgYQEmEws59LBm0ZafibgAsz40u7sRNQV9j fY/dWSMJS4V7Rx61ZjqtXPGOWAUMnFPB5VS468rRiTeXeJJPFh0C8Yf8qhdV0ULI11fO lMHHj4oiQ0AB+Z+PCMd3JRqyD61EQ98xc4BRGXvo5A7T/MLrSRwWBYPy72pF/Hsx2NW0 MhwJyJvaA2VH6rCCYZyULmBZhqIYXNuDEKqTX3UFR0JbloTPR15qvUUN0vqn9R1Yub2A jhrCoMojcG5letKERQHGqCXU5i+FkrXpWnrlp1OjAs3g6FSTEGJArwMRFzycDVFNJgry ui2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="T/ICPmyf"; 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 w11-20020a5d404b000000b0032db169d32esi4493853wrp.681.2023.11.14.06.45.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Nov 2023 06:45:45 -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="T/ICPmyf"; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r2uaL-0005HJ-QZ; Tue, 14 Nov 2023 09:40:17 -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 1r2uZp-0004YK-GM for qemu-devel@nongnu.org; Tue, 14 Nov 2023 09:39:45 -0500 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r2uZk-0007w4-Ah for qemu-devel@nongnu.org; Tue, 14 Nov 2023 09:39:38 -0500 Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-9be02fcf268so853378466b.3 for ; Tue, 14 Nov 2023 06:39:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699972774; x=1700577574; 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=6XE67RaqwP19rEjPR9cmWaIkbDnma1jGWKj3qDcuG2M=; b=T/ICPmyfsrFjMiZkCn266Mdd00NiRZcxqt8rUfwotXheChrvheE2VDZ/NMsp7bf75R WePQJRGmGVjrtxSMWBpayRpvXwGGRRydop2ew6NSjxqIgR9JCeqTAYAyyZXRjQkdAxIK 1WzoMgy+piHxXZ5JInrYCK8evokrXJGEaadX1/usX6KgwCHoipgIbbkjMXQCj0+caRv5 TzNq9AJI41xVDHBH4Tlrt1D31lnDD1IQVnP/mqqHETKYbAHAiRl3I/As2ecN2aS+mYuV XbXw+R9fORxJD+5BDb90TPFd0cI43nEfdpvuJivd1Rm1p7nsveGd/9MtLPgIWG80dHQx sx9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699972774; x=1700577574; 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=6XE67RaqwP19rEjPR9cmWaIkbDnma1jGWKj3qDcuG2M=; b=Kra1CrkWKZJjP0cnqAflPYnUxiyo3OtfuZHdL6F25Z3wj0mnD0YdO072gR7d1I/BUe /Awyh4CnRSfgqmNOCmTXGPrYPYuABE2o/1uhOiL7OarlnYMkPp7EhAv9scMUKFV52nlR aATYIV4zP1TOvCoj49psE8h8MFYvo7Ca0laCsOLzdLPJVeTaQecsV6RFNhNaUYnXS63S NdNvBvBjmaPLGS0c22Yn1wQQ3e4mlCLKVkzdEkSH6Nmc1vKKdRsmXVSkZmA6CaXpuZ6v g4xm1tzDCqkhKnkC6AVuh+p7pwwIwL9URzCX7zaSQpIsmy3XOSt/aP6lt9z/o0r7iDxY f2hg== X-Gm-Message-State: AOJu0YyCcdhyDezpQ7pSh/nba2o7E6vIqu7JBfgWXqBDb9qWlEsOX1q+ u6iTd9ciQxRuaUo1ffOycQBvtg== X-Received: by 2002:a17:906:899:b0:9df:e457:cef6 with SMTP id n25-20020a170906089900b009dfe457cef6mr5737290eje.77.1699972774671; Tue, 14 Nov 2023 06:39:34 -0800 (PST) Received: from m1x-phil.lan (cac94-h02-176-184-25-155.dsl.sta.abo.bbox.fr. [176.184.25.155]) by smtp.gmail.com with ESMTPSA id qx25-20020a170906fcd900b0098e34446464sm5684531ejb.25.2023.11.14.06.39.32 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 14 Nov 2023 06:39:34 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: David Woodhouse , qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Paul Durrant , qemu-arm@nongnu.org, Paolo Bonzini , David Woodhouse , Stefano Stabellini , Richard Henderson , xen-devel@lists.xenproject.org, qemu-block@nongnu.org, Anthony Perard , kvm@vger.kernel.org, Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , "Michael S. Tsirkin" , Marcel Apfelbaum , Eduardo Habkost Subject: [PATCH-for-9.0 v2 11/19] hw/xen/xen_arch_hvm: Rename prototypes using 'xen_arch_' prefix Date: Tue, 14 Nov 2023 15:38:07 +0100 Message-ID: <20231114143816.71079-12-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231114143816.71079-1-philmd@linaro.org> References: <20231114143816.71079-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=philmd@linaro.org; helo=mail-ej1-x634.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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 Use a common 'xen_arch_' prefix for architecture-specific functions. Rename xen_arch_set_memory() and xen_arch_handle_ioreq(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: David Woodhouse Reviewed-by: Richard Henderson Acked-by: Anthony PERARD --- include/hw/arm/xen_arch_hvm.h | 4 ++-- include/hw/i386/xen_arch_hvm.h | 4 ++-- hw/arm/xen_arm.c | 4 ++-- hw/i386/xen/xen-hvm.c | 6 +++--- hw/xen/xen-hvm-common.c | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/hw/arm/xen_arch_hvm.h b/include/hw/arm/xen_arch_hvm.h index 8fd645e723..6a974f2020 100644 --- a/include/hw/arm/xen_arch_hvm.h +++ b/include/hw/arm/xen_arch_hvm.h @@ -2,8 +2,8 @@ #define HW_XEN_ARCH_ARM_HVM_H #include -void arch_handle_ioreq(XenIOState *state, ioreq_t *req); -void arch_xen_set_memory(XenIOState *state, +void xen_arch_handle_ioreq(XenIOState *state, ioreq_t *req); +void xen_arch_set_memory(XenIOState *state, MemoryRegionSection *section, bool add); #endif diff --git a/include/hw/i386/xen_arch_hvm.h b/include/hw/i386/xen_arch_hvm.h index 1000f8f543..2822304955 100644 --- a/include/hw/i386/xen_arch_hvm.h +++ b/include/hw/i386/xen_arch_hvm.h @@ -4,8 +4,8 @@ #include #include "hw/xen/xen-hvm-common.h" -void arch_handle_ioreq(XenIOState *state, ioreq_t *req); -void arch_xen_set_memory(XenIOState *state, +void xen_arch_handle_ioreq(XenIOState *state, ioreq_t *req); +void xen_arch_set_memory(XenIOState *state, MemoryRegionSection *section, bool add); #endif diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c index 8a185da193..bf19407879 100644 --- a/hw/arm/xen_arm.c +++ b/hw/arm/xen_arm.c @@ -129,14 +129,14 @@ static void xen_init_ram(MachineState *machine) } } -void arch_handle_ioreq(XenIOState *state, ioreq_t *req) +void xen_arch_handle_ioreq(XenIOState *state, ioreq_t *req) { hw_error("Invalid ioreq type 0x%x\n", req->type); return; } -void arch_xen_set_memory(XenIOState *state, MemoryRegionSection *section, +void xen_arch_set_memory(XenIOState *state, MemoryRegionSection *section, bool add) { } diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 1ae943370b..5150984e46 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -659,8 +659,8 @@ void qmp_xen_set_global_dirty_log(bool enable, Error **errp) } } -void arch_xen_set_memory(XenIOState *state, MemoryRegionSection *section, - bool add) +void xen_arch_set_memory(XenIOState *state, MemoryRegionSection *section, + bool add) { hwaddr start_addr = section->offset_within_address_space; ram_addr_t size = int128_get64(section->size); @@ -700,7 +700,7 @@ void arch_xen_set_memory(XenIOState *state, MemoryRegionSection *section, } } -void arch_handle_ioreq(XenIOState *state, ioreq_t *req) +void xen_arch_handle_ioreq(XenIOState *state, ioreq_t *req) { switch (req->type) { case IOREQ_TYPE_VMWARE_PORT: diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c index cf4053c9f2..cf6ed11f70 100644 --- a/hw/xen/xen-hvm-common.c +++ b/hw/xen/xen-hvm-common.c @@ -65,7 +65,7 @@ static void xen_set_memory(struct MemoryListener *listener, } } - arch_xen_set_memory(state, section, add); + xen_arch_set_memory(state, section, add); } void xen_region_add(MemoryListener *listener, @@ -452,7 +452,7 @@ static void handle_ioreq(XenIOState *state, ioreq_t *req) cpu_ioreq_config(state, req); break; default: - arch_handle_ioreq(state, req); + xen_arch_handle_ioreq(state, req); } if (req->dir == IOREQ_READ) { trace_handle_ioreq_read(req, req->type, req->df, req->data_is_ptr,