From nobody Wed Nov 27 00:41:49 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=durham.ac.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1702003464500463.1007613782216; Thu, 7 Dec 2023 18:44:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBQqV-00012j-2u; Thu, 07 Dec 2023 21:44:07 -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 1rBNYT-0003YY-Tn for qemu-devel@nongnu.org; Thu, 07 Dec 2023 18:13:17 -0500 Received: from smtphost3.dur.ac.uk ([129.234.7.145]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBNYR-0005Dn-Gd for qemu-devel@nongnu.org; Thu, 07 Dec 2023 18:13:17 -0500 Received: from austen5.home (unknown [10.0.152.18]) by smtphost3.dur.ac.uk (Postfix) with ESMTPSA id C46B51957222; Thu, 7 Dec 2023 23:13:07 +0000 (GMT) From: Michael Young To: qemu-devel@nongnu.org Cc: Michael Young Subject: [PATCH] fix qemu build with xen-4.18.0 Date: Thu, 7 Dec 2023 23:12:48 +0000 Message-ID: <277e21fc78b75ec459efc7f5fde628a0222c63b0.1701989261.git.m.a.young@durham.ac.uk> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=129.234.7.145; envelope-from=m.a.young@durham.ac.uk; helo=smtphost3.dur.ac.uk X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Thu, 07 Dec 2023 21:44:04 -0500 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1702003468047100003 Builds of qemu-8.2.0rc2 with xen-4.18.0 are currently failing with errors like ../hw/arm/xen_arm.c:74:5: error: =E2=80=98GUEST_VIRTIO_MMIO_SPI_LAST=E2=80= =99 undeclared (first use in this function) 74 | (GUEST_VIRTIO_MMIO_SPI_LAST - GUEST_VIRTIO_MMIO_SPI_FIRST) | ^~~~~~~~~~~~~~~~~~~~~~~~~~ as there is an incorrect comparision in include/hw/xen/xen_native.h which means that settings like GUEST_VIRTIO_MMIO_SPI_LAST aren't being defined for xen-4.18.0 Signed-off-by: Michael Young Reviewed-by: Richard W.M. Jones Tested-by: Richard W.M. Jones --- include/hw/xen/xen_native.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/xen/xen_native.h b/include/hw/xen/xen_native.h index 6f09c48823..04b1ef4d34 100644 --- a/include/hw/xen/xen_native.h +++ b/include/hw/xen/xen_native.h @@ -532,7 +532,7 @@ static inline int xendevicemodel_set_irq_level(xendevic= emodel_handle *dmod, } #endif =20 -#if CONFIG_XEN_CTRL_INTERFACE_VERSION <=3D 41700 +#if CONFIG_XEN_CTRL_INTERFACE_VERSION >=3D 41700 #define GUEST_VIRTIO_MMIO_BASE xen_mk_ullong(0x02000000) #define GUEST_VIRTIO_MMIO_SIZE xen_mk_ullong(0x00100000) #define GUEST_VIRTIO_MMIO_SPI_FIRST 33 --=20 2.43.0