On Thu, 12 Feb 2015 15:53:49 +0100 Jens Freimann <jf...@linux.vnet.ibm.com> wrote:
> On Thu, Feb 12, 2015 at 02:41:15PM +0000, Peter Maydell wrote: > > On 12 February 2015 at 13:08, Jens Freimann <jf...@linux.vnet.ibm.com> > > wrote: > > > We have defines for VIRTIO_TRANSPORT_F_START/_END in two places. > > > In include/hw/virtio/virtio.h and in linux-headers/linux/virtio_config.h > > > > > > Since we already get virtio_config.h via update-linux-headers.sh, > > > there's no need to have duplicate defines in QEMU headers files. > > > > > > Let's remove this define from include/hw/virtio/virtio.h > > > > Isn't this going to break compilation on non-linux hosts? > > They don't get linux-headers/ on their include path, so > > our virtio.h is their only source for this define... > > Ok, that's a fair point that I didn't think of. What's the correct way > to fix this then? Change our virtio.h manually? In a separate commit > or in the one generated by update-linux-headers (so we don't break bisect)? I think this is fixed by MST's standard headers patch series.