From nobody Mon Feb 9 04:29:46 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1561390474; cv=none; d=zoho.com; s=zohoarc; b=cz5/1IqP1MHI2uVeHYWP48R4oRrwrTutqsfO65vzfwxXJfxFZJ8qC8EXKpfoaRxaZgQUFIcxSYzSsX25BAccKuZVJzTDml6pAZePp4RhVK4MAVyyNGa9aVXy7gJi3y+vdOxCr+Pwgz9vZbKPtHcK/jkaO8M9w8tZAANbeQC9okg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561390474; 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:ARC-Authentication-Results; bh=6BzWYTmJ3ytQkGMtm/q7aN0xtfAJnNHG5iADCRYzOXM=; b=XZvRUGJxshWQBWUXdNgZKSdac955l/ZayCRPrNpOBcMcTEz1NHpH58mwzBkAsdz6SzRpbm8pq+q2MU9usx7CRr5ecdYlowo1Xqb3a8c99gl0LF7pocHrRwBCS4F4FeBEIHwGd91c57nLDTKrweD8ZWnNWzUj9zqI49NPpeY1mkw= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1561390474364789.6860949416658; Mon, 24 Jun 2019 08:34:34 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hfQy3-00025b-6b; Mon, 24 Jun 2019 15:33:15 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hfQy0-00024o-Tm for xen-devel@lists.xenproject.org; Mon, 24 Jun 2019 15:33:12 +0000 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 6035229e-9695-11e9-8980-bc764e045a96; Mon, 24 Jun 2019 15:33:12 +0000 (UTC) X-Inumbo-ID: 6035229e-9695-11e9-8980-bc764e045a96 Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=anthony.perard@citrix.com; spf=Pass smtp.mailfrom=anthony.perard@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of anthony.perard@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa3.hc3370-68.iphmx.com: domain of anthony.perard@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="anthony.perard@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ~all" Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="anthony.perard@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: 8a/f3n8FrzsCNMdKRAJOtwsqjTiA0a4FLq3A2XI0xZ1DlDQZvuVaC/p1tV6/EnLfA1kf33mOz5 1uslDhMrijaO7GqLdogyXwL6HQZwIV+qmYliRtpRp1Xzb4W8cLVNbQH+uJJ0v7EqfB4j06/kBt bVklUXfDvjjFgkLrvN3FMPmByYOg8KBRgluadUaH9LXz5HeI0+2GdEvQKYpuvue96rDucnQdko 8Rle0HnjzCkMnvZQx0971bA7WoNY8ngDjF0HenocJ33ZIhzxLQd6uagwUxZW5G0LrYEqmOxPne g+Y= X-SBRS: 2.7 X-MesageID: 2148104 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.63,412,1557201600"; d="scan'208";a="2148104" From: Anthony PERARD To: Date: Mon, 24 Jun 2019 16:32:56 +0100 Message-ID: <20190624153257.20163-8-anthony.perard@citrix.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190624153257.20163-1-anthony.perard@citrix.com> References: <20190624153257.20163-1-anthony.perard@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PULL 7/8] Revert xen/io/ring.h of "Clean up a few header guard symbols" X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Anthony PERARD , xen-devel@lists.xenproject.org, Peter Maydell Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This reverts changes to include/hw/xen/io/ring.h from commit 37677d7db39a3c250ad661d00fb7c3b59d047b1f. Following 37677d7db3 "Clean up a few header guard symbols", QEMU start to fail to build: In file included from ~/xen/tools/../tools/include/xen/io/blkif.h:31:0, from ~/xen/tools/qemu-xen-dir/hw/block/xen_blkif.h:5, from ~/xen/tools/qemu-xen-dir/hw/block/xen-block.c:22: ~/xen/tools/../tools/include/xen/io/ring.h:68:0: error: "__CONST_RING_SIZE"= redefined [-Werror] #define __CONST_RING_SIZE(_s, _sz) \ In file included from ~/xen/tools/qemu-xen-dir/hw/block/xen_blkif.h:4:0, from ~/xen/tools/qemu-xen-dir/hw/block/xen-block.c:22: ~/xen/tools/qemu-xen-dir/include/hw/xen/io/ring.h:66:0: note: this is the l= ocation of the previous definition #define __CONST_RING_SIZE(_s, _sz) \ The issue is that some public xen headers have been imported (by f65eadb639 "xen: import ring.h from xen") but not all. With the change in the guards symbole, the ring.h header start to be imported twice. Signed-off-by: Anthony PERARD Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Paul Durrant Message-Id: <20190621105441.3025-2-anthony.perard@citrix.com> --- include/hw/xen/io/ring.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/hw/xen/io/ring.h b/include/hw/xen/io/ring.h index 62abfd7a6e..1adacf09f9 100644 --- a/include/hw/xen/io/ring.h +++ b/include/hw/xen/io/ring.h @@ -24,8 +24,8 @@ * Tim Deegan and Andrew Warfield November 2004. */ =20 -#ifndef XEN_PUBLIC_IO_RING_H -#define XEN_PUBLIC_IO_RING_H +#ifndef __XEN_PUBLIC_IO_RING_H__ +#define __XEN_PUBLIC_IO_RING_H__ =20 /* * When #include'ing this header, you need to provide the following @@ -469,7 +469,7 @@ struct name##_data_intf { = \ }; = \ DEFINE_XEN_FLEX_RING(name) =20 -#endif /* XEN_PUBLIC_IO_RING_H */ +#endif /* __XEN_PUBLIC_IO_RING_H__ */ =20 /* * Local variables: --=20 Anthony PERARD _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel