From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roger Pau Monne Subject: Re: [PATCH] qemu-xen-trad: fix sys-queue.h usage on BSD systems Date: Thu, 31 May 2012 15:13:01 +0100 Message-ID: <4FC77C6D.5040704@citrix.com> References: <1338394332-22422-1-git-send-email-roger.pau@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Stefano Stabellini Cc: "xen-devel@lists.xen.org" List-Id: xen-devel@lists.xenproject.org Stefano Stabellini wrote: > On Wed, 30 May 2012, Roger Pau Monne wrote: >> BSD systems already have a sys/queue.h file, which has more macros >> than the one Qemu uses, and some header files depend on having that >> macros defined (sys/disk.h for example). Disable sys-queue.h on BSD >> systems and include the native one. >> >> This is not a backport because the original patch is too dificult to >> backport, it's commit 72cf2d4f0e181d0d3a3122e04129c58a95da713e. > > The upstream commit message states: > > "Problem: Our file sys-queue.h is a copy of the BSD file, but there are > some additions and it's not entirely compatible. Because of that, there > have been conflicts with system headers on BSD systems." > > Wouldn't this be a problem if we apply the simple patch below? Doing a diff -bB shows that the Qemu version is just a stripped version of the original NetBSD header, with many macros removed, but no new ones added, so I think the patch is safe.