From nobody Thu Oct 30 00:21:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass header.i=teddy.astie@vates.tech; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=vates.tech ARC-Seal: i=1; a=rsa-sha256; t=1761126714; cv=none; d=zohomail.com; s=zohoarc; b=WnMBBH5Nx0t97+eXUo3Ppk/l8FTotRp7nEIfnhnsLu57moS/Lk3Ou6K75t9PEgGbdL6a+UPPQLUzvq6Lb86Hk1W9l21guqlFD6u/HWjHDlGA5Gqgl8K2Y4H6Ob/kSgHpiDoWzznt9s8oedgdNpf10OIKsU4PURzjlLlarXu3kPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761126714; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pnFV+fDDYcmdoekdKwaFpxr/OuJxPCuCxIvebF8I08Q=; b=JTVvhtkAMDHjBN8cJNFULIl2yPhlE5wYYeWjypyLnN4Lm5ILduhxqfbmjVpztSd9mFVtSiWT9FOqsinPKzC5oekdrsSxH0R3lzh/cptm5sR8vZb25gZGBK+6Rec8V/e/o5SYXcxyfI3ql0yPnbd2rOVCZTyzs4/AuT03nOQKuUY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=teddy.astie@vates.tech; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1761126714231628.0425075134306; Wed, 22 Oct 2025 02:51:54 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1147746.1479938 (Exim 4.92) (envelope-from ) id 1vBVVG-0007f4-Jw; Wed, 22 Oct 2025 09:51:34 +0000 Received: by outflank-mailman (output) from mailman id 1147746.1479938; Wed, 22 Oct 2025 09:51:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vBVVG-0007el-Gr; Wed, 22 Oct 2025 09:51:34 +0000 Received: by outflank-mailman (input) for mailman id 1147746; Wed, 22 Oct 2025 09:51:32 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vBVVE-0007BN-Py for xen-devel@lists.xenproject.org; Wed, 22 Oct 2025 09:51:32 +0000 Received: from mail180-10.suw31.mandrillapp.com (mail180-10.suw31.mandrillapp.com [198.2.180.10]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id aa4d1956-af2c-11f0-980a-7dc792cee155; Wed, 22 Oct 2025 11:51:22 +0200 (CEST) Received: from pmta11.mandrill.prod.suw01.rsglab.com (localhost [127.0.0.1]) by mail180-10.suw31.mandrillapp.com (Mailchimp) with ESMTP id 4cs4Dn5Pydz5QlDfF for ; Wed, 22 Oct 2025 09:51:21 +0000 (GMT) Received: from [37.26.189.201] by mandrillapp.com id f0bf9ec886ff408dbd4f0076b9aef2da; Wed, 22 Oct 2025 09:51:21 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: aa4d1956-af2c-11f0-980a-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandrillapp.com; s=mte1; t=1761126681; x=1761396681; bh=pnFV+fDDYcmdoekdKwaFpxr/OuJxPCuCxIvebF8I08Q=; h=From:Subject:To:Cc:Message-Id:In-Reply-To:References:Feedback-ID: Date:MIME-Version:Content-Type:Content-Transfer-Encoding:CC:Date: Subject:From; b=CInwWjjIfzU+YNFapjTNtvc/9G+d8E1dr2qA9M4ydqM3jD3dZd6A4+pT6zPlqtVD4 Jt5n75IxSrl8vkFvzmJX0iHmQm5RriW6tFiZ1au0/JhGKqdWdy3IcGTNBAj9qLOdKO TwbOXKRviLtIwv675vOohC1dNkw/cMo8GK/mV9ybLIUAiDpNWxke276+cx3V640zpb ivEW9OYrZy5jMWtdQdLwVs+yoMk1RJvceC4AXSykFDyPc39mjWbzGnURnwK6VpHOhS bfCuoPy7MFU0NrIw1HFdbH21y/tuSPklWOq02eqpwy4kmHetfue6vyNsRQGi58mqnR PkVE9pOXC26DA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vates.tech; s=mte1; t=1761126681; x=1761387181; i=teddy.astie@vates.tech; bh=pnFV+fDDYcmdoekdKwaFpxr/OuJxPCuCxIvebF8I08Q=; h=From:Subject:To:Cc:Message-Id:In-Reply-To:References:Feedback-ID: Date:MIME-Version:Content-Type:Content-Transfer-Encoding:CC:Date: Subject:From; b=furiCssd/WYkv5hqSYcS8H86H7vKyIY88mZ6x3F19QbKn0EROQQDSPeRpDHIdDd1N 5kXN4U3NV+SI0oH1Ww+HLyQBeS8lBAuG04OaOxhjWr01uP/guoGteB7HGkHGmFswpn SYaP9Ef4YpyryIwnxZ0+CdMmk7koEohTRbUpREwKxjjcLNHhL3gnIHgyKFFmNjLolx Umk1gu4eauPUkWVUscL4uoLLix2+2ZJolR+rRylhMdnJ24j9ENKbfyMOI8RuQNBy45 Ppl8HI7bWVifYg7B9UhCTfwbpt9x/mDmoqS5WVWLxVvJ7Y+VaOIGaEw+ZtkBvfAJgQ WtS2pt+KDP4NA== From: "Teddy Astie" Subject: =?utf-8?Q?[PATCH=203/4]=20vtd:=20Remove=20IO=5FxAPIC=5Froute=5Fentry=20macro?= X-Mailer: git-send-email 2.51.1 X-Bm-Disclaimer: Yes X-Bm-Milter-Handled: 4ffbd6c1-ee69-4e1b-aabd-f977039bd3e2 X-Bm-Transport-Timestamp: 1761126680904 To: xen-devel@lists.xenproject.org Cc: "Teddy Astie" , "Jan Beulich" , "Andrew Cooper" , "=?utf-8?Q?Roger=20Pau=20Monn=C3=A9?=" Message-Id: <540db157df0f0f6e27c7b50edc6a7d82fe668608.1761124632.git.teddy.astie@vates.tech> In-Reply-To: References: X-Native-Encoded: 1 X-Report-Abuse: =?UTF-8?Q?Please=20forward=20a=20copy=20of=20this=20message,=20including=20all=20headers,=20to=20abuse@mandrill.com.=20You=20can=20also=20report=20abuse=20here:=20https://mandrillapp.com/contact/abuse=3Fid=3D30504962.f0bf9ec886ff408dbd4f0076b9aef2da?= X-Mandrill-User: md_30504962 Feedback-ID: 30504962:30504962.20251022:md Date: Wed, 22 Oct 2025 09:51:21 +0000 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @mandrillapp.com) (identity teddy.astie@vates.tech) X-ZM-MESSAGEID: 1761126720161158500 Content-Type: text/plain; charset="utf-8" This macro was introduced to abstract between IO-APIC and IO-SAPIC (ia64), now that ia64 isn't supported anymore, this macro now only refers to IO-API= C. Signed-off-by: Teddy Astie Acked-by: Andrew Cooper --- xen/drivers/passthrough/vtd/intremap.c | 10 +++++----- xen/drivers/passthrough/vtd/vtd.h | 3 --- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/xen/drivers/passthrough/vtd/intremap.c b/xen/drivers/passthrou= gh/vtd/intremap.c index 7726ee618a..e0314aa469 100644 --- a/xen/drivers/passthrough/vtd/intremap.c +++ b/xen/drivers/passthrough/vtd/intremap.c @@ -268,7 +268,7 @@ static unsigned int alloc_remap_entry(struct vtd_iommu = *iommu, unsigned int nr) } =20 static int remap_entry_to_ioapic_rte( - struct vtd_iommu *iommu, int index, struct IO_xAPIC_route_entry *old_r= te) + struct vtd_iommu *iommu, int index, struct IO_APIC_route_entry *old_rt= e) { struct iremap_entry *iremap_entry =3D NULL, *iremap_entries; unsigned long flags; @@ -316,8 +316,8 @@ static int remap_entry_to_ioapic_rte( } =20 static int ioapic_rte_to_remap_entry(struct vtd_iommu *iommu, - int apic, unsigned int ioapic_pin, struct IO_xAPIC_route_entry *old_rt= e, - struct IO_xAPIC_route_entry new_rte) + int apic, unsigned int ioapic_pin, struct IO_APIC_route_entry *old_rte, + struct IO_APIC_route_entry new_rte) { struct iremap_entry *iremap_entry =3D NULL, *iremap_entries; struct iremap_entry new_ire; @@ -398,7 +398,7 @@ unsigned int cf_check io_apic_read_remap_rte( { unsigned int ioapic_pin =3D (reg - 0x10) / 2; int index; - struct IO_xAPIC_route_entry old_rte =3D { }; + struct IO_APIC_route_entry old_rte =3D { }; int rte_upper =3D (reg & 1) ? 1 : 0; struct vtd_iommu *iommu =3D ioapic_to_iommu(IO_APIC_ID(apic)); =20 @@ -420,7 +420,7 @@ unsigned int cf_check io_apic_read_remap_rte( void cf_check io_apic_write_remap_rte( unsigned int apic, unsigned int pin, uint64_t rte) { - struct IO_xAPIC_route_entry old_rte =3D {}, new_rte; + struct IO_APIC_route_entry old_rte =3D {}, new_rte; struct vtd_iommu *iommu =3D ioapic_to_iommu(IO_APIC_ID(apic)); int rc; =20 diff --git a/xen/drivers/passthrough/vtd/vtd.h b/xen/drivers/passthrough/vt= d/vtd.h index b95124517b..f0286b40c3 100644 --- a/xen/drivers/passthrough/vtd/vtd.h +++ b/xen/drivers/passthrough/vtd/vtd.h @@ -31,9 +31,6 @@ #define MAP_ERROR_RECOVERY (1u << 2) #define UNMAP_ME_PHANTOM_FUNC (1u << 3) =20 -/* Allow for both IOAPIC and IOSAPIC. */ -#define IO_xAPIC_route_entry IO_APIC_route_entry - struct IO_APIC_route_remap_entry { union { u64 val; --=20 2.51.1 -- Teddy Astie | Vates XCP-ng Developer XCP-ng & Xen Orchestra - Vates solutions web: https://vates.tech