From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 14D0CC4167B for ; Fri, 8 Dec 2023 10:00:09 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBXdw-0005dz-Pf; Fri, 08 Dec 2023 04:59:36 -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 1rBXdv-0005dm-1p for qemu-devel@nongnu.org; Fri, 08 Dec 2023 04:59:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBXdt-0003vT-78 for qemu-devel@nongnu.org; Fri, 08 Dec 2023 04:59:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702029572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=y+KxdY+qCST9E8+OQxXVW2cgeDlhihThVwBNplCEp+Q=; b=AU5eTmDqU/8fUbt+LBmmO9A4qlcUxIKw6LgN64MsWOfTXtF+ifV1Pv1pfXgQfA6A/LA6Qq yhnX3M4crfRaru2dW2DKuyEYnqHL3TRbYB57us043fGvqKPXGoG/I4RbqheCdDB2zekEBP 7LMln0ju4ppkMQ22dEtF5+jijcuP6+o= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-422-WeSCDRK4Ni-DyZOFlBW-_A-1; Fri, 08 Dec 2023 04:59:26 -0500 X-MC-Unique: WeSCDRK4Ni-DyZOFlBW-_A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CCAEF83106C; Fri, 8 Dec 2023 09:59:25 +0000 (UTC) Received: from localhost (unknown [10.42.28.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CF8C40C6EB9; Fri, 8 Dec 2023 09:59:25 +0000 (UTC) Date: Fri, 8 Dec 2023 09:59:24 +0000 From: "Richard W.M. Jones" To: Michael Young Cc: qemu-devel@nongnu.org, Stefano Stabellini , Anthony Perard , Paul Durrant , xen-devel@lists.xenproject.org Subject: Re: [PATCH] fix qemu build with xen-4.18.0 Message-ID: <20231208095924.GB23257@redhat.com> References: <277e21fc78b75ec459efc7f5fde628a0222c63b0.1701989261.git.m.a.young@durham.ac.uk> <20231208084707.GA23257@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20231208084707.GA23257@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 Received-SPF: pass client-ip=170.10.133.124; envelope-from=rjones@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Fri, Dec 08, 2023 at 08:47:07AM +0000, Richard W.M. Jones wrote: > (Adding Xen maintainers) > > On Thu, Dec 07, 2023 at 11:12:48PM +0000, Michael Young wrote: > > 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: ‘GUEST_VIRTIO_MMIO_SPI_LAST’ 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 I added this patch to Fedora, which has Xen 4.18 and where builds were previously failing, and now it's working: https://koji.fedoraproject.org/koji/taskinfo?taskID=110043878 So also adding: Tested-by: Richard W.M. Jones Rich. > > --- > > 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(xendevicemodel_handle *dmod, > > } > > #endif > > > > -#if CONFIG_XEN_CTRL_INTERFACE_VERSION <= 41700 > > +#if CONFIG_XEN_CTRL_INTERFACE_VERSION >= 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 > > -- > > 2.43.0 > > > > -- > Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones > Read my programming and virtualization blog: http://rwmj.wordpress.com > libguestfs lets you edit virtual machines. Supports shell scripting, > bindings from many languages. http://libguestfs.org > -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org