From nobody Sat May 4 07:47:35 2024 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; 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=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1628685161; cv=none; d=zohomail.com; s=zohoarc; b=C6FjnN6ycWUd6pHIqTt8VM9sDEV/7eyEen/t1trXqbPMr+XqFPlGeENsx7s0lSgNJixSqDmkJVq/lh/3YrRQVu183oaJvv+iG9AFuuVMnnOkgYHvQOk6TD0aaLWRrwuI4JucWwwgea8lrChM42/V39Ow+gxAUDudilF9+6QD2G0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628685161; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eQOqhGvAsU0bx+gwCVQRqo9hOCfV4KrCRcbNuivkv6Y=; b=ZLSJpuC2+RyczXfEhSJOKl7cHrqo/N86L3m33MlU+quVnoQTUCuSjNwkkRoxQaVk7Xft7PgaK1VUJs16SjzjIhs5DdLGnSI8VNcoJ5xbQNIYJEETtzBRzakRcNJEKO7zmBzsSaJB8K6YgxSIq/1howBB0WNeh8UI7hGcg7AEQJI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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 162868516108370.58817484285237; Wed, 11 Aug 2021 05:32:41 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.166032.303239 (Exim 4.92) (envelope-from ) id 1mDnPD-0004EU-Li; Wed, 11 Aug 2021 12:32:23 +0000 Received: by outflank-mailman (output) from mailman id 166032.303239; Wed, 11 Aug 2021 12:32:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mDnPD-0004EK-HE; Wed, 11 Aug 2021 12:32:23 +0000 Received: by outflank-mailman (input) for mailman id 166032; Wed, 11 Aug 2021 12:32:22 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mDnPC-0003bF-It for xen-devel@lists.xenproject.org; Wed, 11 Aug 2021 12:32:22 +0000 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 26f9ca29-faa0-11eb-a06f-12813bfff9fa; Wed, 11 Aug 2021 12:32:13 +0000 (UTC) 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: 26f9ca29-faa0-11eb-a06f-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1628685133; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TGd9oCbPhWLBkQ8whA4VOs8vPrbai8+dznFmO2B/H0w=; b=hw+ktms0wlKu7Bbs8WM38dPxBptjcJd3Z3MpuctyOI0vwL1FB99O6jpE Hf0b/AjIekGAbY20ylTnVNxCuh0Hpe2VITpllUObq7AUwZ5aOvTkPFlv4 aZ6qTzU8DG2xlqMRmP6YL9v2OEsuMQesFj2+n9ZJn/FQO8nA3bVc3fQ+j w=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: 0Pr+/cXMiNF+ductPW+UauNj+pLbwi+9Quh/Ktpe1IXnqZVPorHwVoA3nTd1jbH6rlvbJMgOMb zd/CuEpGoRoJGgqReD7rlzpBR1NtrVserPTme3xNaiUKYTR5wd0DoNCKzrpUVfFrUEdVp+i4jx 6rBDM+x1eCGQkFJPHX5UYEt1sbCWLZ/1HUPaAzrb61s+bBMXQ1240oG2WpTGJOhUlMLJ4GKvgu eGfuXfdsXYQBFIAvCf7oAOmH29E1DreBPSsIZHGcGjsepbBw7561IV0FI4UMGqt1QgUyg7QQ5S /j8fTwDPnhcEoAkrw3NHZNsm X-SBRS: 5.1 X-MesageID: 51909393 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED IronPort-HdrOrdr: A9a23:j9dgbqpEV4v1NQiFn5gA3YUaV5oReYIsimQD101hICG8cqSj9v xG+85rrCMc6QxhI03I9urwW5VoLUmyyXcx2/h0AV7AZniBhILLFvAB0WKK+VSJcEeSmtK1l5 0QFJSWYOeAdWSS5vyb3ODXKbgdKaG8gcWVuds= X-IronPort-AV: E=Sophos;i="5.84,311,1620705600"; d="scan'208";a="51909393" From: Kevin Stefanov To: Xen-devel CC: Kevin Stefanov , Andrew Cooper , Jan Beulich Subject: [PATCH v2 1/2] xen/kexec: Remove use of TRUE/FALSE Date: Wed, 11 Aug 2021 13:31:34 +0100 Message-ID: <20210811123135.18195-2-kevin.stefanov@citrix.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210811123135.18195-1-kevin.stefanov@citrix.com> References: <20210811123135.18195-1-kevin.stefanov@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1628685162190100001 Content-Type: text/plain; charset="utf-8" Whilst fixing this, also changed bool_t to bool, and use __read_mostly. Suggested-by: Andrew Cooper Signed-off-by: Kevin Stefanov Acked-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Andrew Cooper CC: Jan Beulich v2: *Use __read_mostly --- xen/common/kexec.c | 6 +++--- xen/include/xen/kexec.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/common/kexec.c b/xen/common/kexec.c index ebeee6405a..c63db618a7 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -35,7 +35,7 @@ #include #endif =20 -bool_t kexecing =3D FALSE; +bool __read_mostly kexecing; =20 /* Memory regions to store the per cpu register state etc. on a crash. */ typedef struct { Elf_Note * start; size_t size; } crash_note_range_t; @@ -383,7 +383,7 @@ void kexec_crash(enum crash_reason reason) if ( !test_bit(KEXEC_IMAGE_CRASH_BASE + pos, &kexec_flags) ) return; =20 - kexecing =3D TRUE; + kexecing =3D true; =20 if ( kexec_common_shutdown() !=3D 0 ) return; @@ -399,7 +399,7 @@ static long kexec_reboot(void *_image) { struct kexec_image *image =3D _image; =20 - kexecing =3D TRUE; + kexecing =3D true; =20 kexec_common_shutdown(); machine_reboot_kexec(image); diff --git a/xen/include/xen/kexec.h b/xen/include/xen/kexec.h index 9f7a912e97..e66eb6a8e5 100644 --- a/xen/include/xen/kexec.h +++ b/xen/include/xen/kexec.h @@ -17,7 +17,7 @@ typedef struct xen_kexec_reserve { extern xen_kexec_reserve_t kexec_crash_area; extern paddr_t kexec_crash_area_limit; =20 -extern bool_t kexecing; +extern bool kexecing; =20 void set_kexec_crash_area_size(u64 system_ram); =20 @@ -81,7 +81,7 @@ void vmcoreinfo_append_str(const char *fmt, ...) #else /* !CONFIG_KEXEC */ =20 #define crashinfo_maxaddr_bits 0 -#define kexecing 0 +#define kexecing false =20 static inline void kexec_early_calculations(void) {} static inline void kexec_crash(enum crash_reason reason) --=20 2.25.1 From nobody Sat May 4 07:47:35 2024 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; 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=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1628685154; cv=none; d=zohomail.com; s=zohoarc; b=J2y9Te2waUUL/vrMZvJ+wDEvo84ictkX8XUjiWm2n2u+zylULG1djC43peWGFh/VkU/cGZU/QeNT7AfVIUypeJud7qYCDA3OyIEdyoyuqqFXNmXsxqesYtpWAQKZ5T+TZBQYK4Gt79uGm74ZvHYfuSGspnFn4vGP9CFWEBlyrsM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628685154; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BbN2dFSDWYaRl5bUKSt4SBUqGDAYvWx1fjwUIhOk63Y=; b=dwVoxLrzJTaxo5S+VCjtEZ/Ln/0c5JKFKnVjBD8DB6n7/T2OiUJWgwPPF03Q24IeCTw5FqC30Q64MVn5xhZtHHfh1yJraPF6TYlSjFTWnbOjagDZit1Ml8evC7EP/a8pBDf2i7+Uv8tyHo1QZ4cjm7NzOyya6RJE550IOfkfGGw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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 1628685154409634.5110952064381; Wed, 11 Aug 2021 05:32:34 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.166030.303216 (Exim 4.92) (envelope-from ) id 1mDnP5-0003bX-2l; Wed, 11 Aug 2021 12:32:15 +0000 Received: by outflank-mailman (output) from mailman id 166030.303216; Wed, 11 Aug 2021 12:32:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mDnP4-0003bQ-VG; Wed, 11 Aug 2021 12:32:14 +0000 Received: by outflank-mailman (input) for mailman id 166030; Wed, 11 Aug 2021 12:32:12 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mDnP2-0003bF-MO for xen-devel@lists.xenproject.org; Wed, 11 Aug 2021 12:32:12 +0000 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 25bf3fef-faa0-11eb-a06f-12813bfff9fa; Wed, 11 Aug 2021 12:32:11 +0000 (UTC) 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: 25bf3fef-faa0-11eb-a06f-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1628685131; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Nx5yYUhmyEa/UaDBpvCZ3Y7OdjIpDO3h5T9oWTcQpY4=; b=cZ+8u4NnnlE1bUM8wL/Mwfze/UwMAjyNAIRqJT1s/OGlMcsfNJ3qG9eb qE9DOXlQUT8V2lSJC+dKvAvS826letQRX7k0ozUQz3vIx53CMwbA65RtC hAmMpmfCUkedH4eo2m+8Gr/PTbYtiuPw+tIIgnJEnIXviWKi5PoYDxWiQ A=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: xhOju8A7bIEUu0OD6IU9MfpoiIhyLmm3UTZ/uSLVdDYo1g82fLCcc9XDWgra/FyB2l0qXCJGOF b6kURIOB3j73CNEuaHXh/dl/T4buI4idaS1gP6tynG+aVTcVUOoyMll3xxFviURycvdZPKx0gI VidVmR8YwAyuYHEOV9aDHmKoNDgjLoukxXZ20nLju9zoym5ZW5xqaDX4CllBhNZqM/6BbGHRyG HKUib0sVn0yTxMJBX6M795HpW4kbTfBQK/FrTutltMBgBNi3LU4/b70vjdVnpQBEC1ExrXL2iS ioMIuomh30enFwhqh2PHnvze X-SBRS: 5.1 X-MesageID: 51909380 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED IronPort-HdrOrdr: A9a23:TIhvFKqTrwGp4Dslikw+G7UaV5rveYIsimQD101hICG9Evb0qy nOpoV/6faQslwssR4b9uxoVJPvfZq+z+8W3WByB9eftWDd0QPFEGgL1+DfKlbbak7DH4BmtJ uJc8JFeafN5VoRt7eG3OFveexQvOVu88qT9JjjJ28Gd3APV0n5hT0JcjpyFCdNNW57LKt8Lr WwzOxdqQGtfHwGB/7LfUXsD4D41rv2fIuNW29+OyIa X-IronPort-AV: E=Sophos;i="5.84,311,1620705600"; d="scan'208";a="51909380" From: Kevin Stefanov To: Xen-devel CC: Kevin Stefanov , Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu , Kevin Tian Subject: [PATCH v2 2/2] x86/ioapic: Remove use of TRUE/FALSE/1/0 Date: Wed, 11 Aug 2021 13:31:35 +0100 Message-ID: <20210811123135.18195-3-kevin.stefanov@citrix.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210811123135.18195-1-kevin.stefanov@citrix.com> References: <20210811123135.18195-1-kevin.stefanov@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1628685155328100004 Also fix stray usage in VT-d. Suggested-by: Andrew Cooper Signed-off-by: Kevin Stefanov --- CC: Jan Beulich CC: Andrew Cooper CC: "Roger Pau Monn=C3=A9" CC: Wei Liu CC: Kevin Tian v2: * Also replace literal 1/0 --- xen/arch/x86/io_apic.c | 38 +++++++++++++------------- xen/drivers/passthrough/vtd/intremap.c | 6 ++-- xen/drivers/passthrough/vtd/utils.c | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 58b26d962c..c3ad9efac8 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -289,7 +289,7 @@ static void __io_apic_eoi(unsigned int apic, unsigned i= nt vector, unsigned int p { /* If vector is unknown, read it from the IO-APIC */ if ( vector =3D=3D IRQ_VECTOR_UNASSIGNED ) - vector =3D __ioapic_read_entry(apic, pin, TRUE).vector; + vector =3D __ioapic_read_entry(apic, pin, true).vector; =20 *(IO_APIC_BASE(apic)+16) =3D vector; } @@ -300,28 +300,28 @@ static void __io_apic_eoi(unsigned int apic, unsigned= int vector, unsigned int p struct IO_APIC_route_entry entry; bool need_to_unmask =3D false; =20 - entry =3D __ioapic_read_entry(apic, pin, TRUE); + entry =3D __ioapic_read_entry(apic, pin, true); =20 if ( ! entry.mask ) { /* If entry is not currently masked, mask it and make * a note to unmask it later */ entry.mask =3D 1; - __ioapic_write_entry(apic, pin, TRUE, entry); + __ioapic_write_entry(apic, pin, true, entry); need_to_unmask =3D true; } =20 /* Flip the trigger mode to edge and back */ entry.trigger =3D 0; - __ioapic_write_entry(apic, pin, TRUE, entry); + __ioapic_write_entry(apic, pin, true, entry); entry.trigger =3D 1; - __ioapic_write_entry(apic, pin, TRUE, entry); + __ioapic_write_entry(apic, pin, true, entry); =20 if ( need_to_unmask ) { /* Unmask if neccesary */ entry.mask =3D 0; - __ioapic_write_entry(apic, pin, TRUE, entry); + __ioapic_write_entry(apic, pin, true, entry); } } } @@ -344,7 +344,7 @@ int save_IO_APIC_setup(struct IO_APIC_route_entry **ioa= pic_entries) return -ENOMEM; =20 for (pin =3D 0; pin < nr_ioapic_entries[apic]; pin++) - ioapic_entries[apic][pin] =3D __ioapic_read_entry(apic, pin, 1); + ioapic_entries[apic][pin] =3D __ioapic_read_entry(apic, pin, true); } =20 return 0; @@ -374,7 +374,7 @@ void mask_IO_APIC_setup(struct IO_APIC_route_entry **io= apic_entries) if (!entry.mask) { entry.mask =3D 1; =20 - ioapic_write_entry(apic, pin, 1, entry); + ioapic_write_entry(apic, pin, true, entry); } } } @@ -1047,7 +1047,7 @@ static void __init setup_IO_APIC_irqs(void) =20 SET_DEST(entry, logical, cpu_mask_to_apicid(TARGET_CPUS)); spin_lock_irqsave(&ioapic_lock, flags); - __ioapic_write_entry(apic, pin, 0, entry); + __ioapic_write_entry(apic, pin, false, entry); spin_unlock_irqrestore(&ioapic_lock, flags); } } @@ -1091,7 +1091,7 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int= apic, unsigned int pin, in /* * Add it to the IO-APIC irq-routing table: */ - ioapic_write_entry(apic, pin, 0, entry); + ioapic_write_entry(apic, pin, false, entry); =20 enable_8259A_irq(irq_to_desc(0)); } @@ -1203,7 +1203,7 @@ static void /*__init*/ __print_IO_APIC(bool boot) for (i =3D 0; i <=3D reg_01.bits.entries; i++) { struct IO_APIC_route_entry entry; =20 - entry =3D ioapic_read_entry(apic, i, 0); + entry =3D ioapic_read_entry(apic, i, false); =20 if ( x2apic_enabled && iommu_intremap ) printk(KERN_DEBUG " %02x %08x", i, entry.dest.dest32); @@ -1290,7 +1290,7 @@ static void __init enable_IO_APIC(void) int pin; /* See if any of the pins is in ExtINT mode */ for (pin =3D 0; pin < nr_ioapic_entries[apic]; pin++) { - struct IO_APIC_route_entry entry =3D ioapic_read_entry(apic, p= in, 0); + struct IO_APIC_route_entry entry =3D ioapic_read_entry(apic, p= in, false); =20 /* If the interrupt line is enabled and in ExtInt mode * I have found the pin where the i8259 is connected. @@ -1361,7 +1361,7 @@ void disable_IO_APIC(void) /* * Add it to the IO-APIC irq-routing table: */ - ioapic_write_entry(ioapic_i8259.apic, ioapic_i8259.pin, 0, entry); + ioapic_write_entry(ioapic_i8259.apic, ioapic_i8259.pin, false, ent= ry); } disconnect_bsp_APIC(ioapic_i8259.pin !=3D -1); } @@ -1841,7 +1841,7 @@ static void __init unlock_ExtINT_logic(void) if ( pin =3D=3D -1 || apic =3D=3D -1 ) return; =20 - entry0 =3D ioapic_read_entry(apic, pin, 0); + entry0 =3D ioapic_read_entry(apic, pin, false); clear_IO_APIC_pin(apic, pin); =20 memset(&entry1, 0, sizeof(entry1)); @@ -1854,7 +1854,7 @@ static void __init unlock_ExtINT_logic(void) entry1.trigger =3D 0; entry1.vector =3D 0; =20 - ioapic_write_entry(apic, pin, 0, entry1); + ioapic_write_entry(apic, pin, false, entry1); =20 save_control =3D CMOS_READ(RTC_CONTROL); save_freq_select =3D CMOS_READ(RTC_FREQ_SELECT); @@ -1873,7 +1873,7 @@ static void __init unlock_ExtINT_logic(void) CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT); clear_IO_APIC_pin(apic, pin); =20 - ioapic_write_entry(apic, pin, 0, entry0); + ioapic_write_entry(apic, pin, false, entry0); } =20 /* @@ -2287,7 +2287,7 @@ int io_apic_set_pci_routing (int ioapic, int pin, int= irq, int edge_level, int a disable_8259A_irq(desc); =20 spin_lock_irqsave(&ioapic_lock, flags); - __ioapic_write_entry(ioapic, pin, 0, entry); + __ioapic_write_entry(ioapic, pin, false, entry); spin_unlock(&ioapic_lock); =20 spin_lock(&desc->lock); @@ -2476,7 +2476,7 @@ int ioapic_guest_write(unsigned long physbase, unsign= ed int reg, u32 val) rte.mask =3D 1; } =20 - __ioapic_write_entry(apic, pin, 0, rte); + __ioapic_write_entry(apic, pin, false, rte); =20 spin_unlock_irqrestore(&ioapic_lock, flags); =20 @@ -2529,7 +2529,7 @@ void dump_ioapic_irq_info(void) =20 printk(" Apic 0x%02x, Pin %2d: ", entry->apic, pin); =20 - rte =3D ioapic_read_entry(entry->apic, pin, 0); + rte =3D ioapic_read_entry(entry->apic, pin, false); =20 printk("vec=3D%02x delivery=3D%-5s dest=3D%c status=3D%d " "polarity=3D%d irr=3D%d trig=3D%c mask=3D%d dest_id:%0*= x\n", diff --git a/xen/drivers/passthrough/vtd/intremap.c b/xen/drivers/passthrou= gh/vtd/intremap.c index d0f70d90eb..12e647f05a 100644 --- a/xen/drivers/passthrough/vtd/intremap.c +++ b/xen/drivers/passthrough/vtd/intremap.c @@ -427,7 +427,7 @@ unsigned int io_apic_read_remap_rte( ( (index =3D apic_pin_2_ir_idx[apic][ioapic_pin]) < 0 ) ) return __io_apic_read(apic, reg); =20 - old_rte =3D __ioapic_read_entry(apic, ioapic_pin, 1); + old_rte =3D __ioapic_read_entry(apic, ioapic_pin, true); =20 if ( remap_entry_to_ioapic_rte(iommu, index, &old_rte) ) return __io_apic_read(apic, reg); @@ -448,7 +448,7 @@ void io_apic_write_remap_rte( struct vtd_iommu *iommu =3D ioapic_to_iommu(IO_APIC_ID(apic)); int saved_mask; =20 - old_rte =3D __ioapic_read_entry(apic, ioapic_pin, 1); + old_rte =3D __ioapic_read_entry(apic, ioapic_pin, false); =20 remap_rte =3D (struct IO_APIC_route_remap_entry *) &old_rte; =20 @@ -468,7 +468,7 @@ void io_apic_write_remap_rte( __io_apic_write(apic, reg & ~1, *(u32 *)&old_rte); } else - __ioapic_write_entry(apic, ioapic_pin, 1, old_rte); + __ioapic_write_entry(apic, ioapic_pin, true, old_rte); } =20 static void set_msi_source_id(struct pci_dev *pdev, struct iremap_entry *i= re) diff --git a/xen/drivers/passthrough/vtd/utils.c b/xen/drivers/passthrough/= vtd/utils.c index 4febcf506d..70add3cc8e 100644 --- a/xen/drivers/passthrough/vtd/utils.c +++ b/xen/drivers/passthrough/vtd/utils.c @@ -281,7 +281,7 @@ void vtd_dump_iommu_info(unsigned char key) for ( i =3D 0; i <=3D reg_01.bits.entries; i++ ) { struct IO_APIC_route_entry rte =3D - __ioapic_read_entry(apic, i, TRUE); + __ioapic_read_entry(apic, i, true); =20 remap =3D (struct IO_APIC_route_remap_entry *) &rte; if ( !remap->format ) --=20 2.25.1