* [Qemu-devel] [PATCH/RFC 0/2] update-linux-headers.sh and virtio
@ 2015-02-12 13:08 Jens Freimann
2015-02-12 13:08 ` [Qemu-devel] [PATCH 1/2] update-linux-headers.sh: also grap virtio_types.h Jens Freimann
2015-02-12 13:08 ` [Qemu-devel] [PATCH 2/2] virtio: remove QEMU definition of VIRTIO_TRANSPORT_F_START/_END Jens Freimann
0 siblings, 2 replies; 6+ messages in thread
From: Jens Freimann @ 2015-02-12 13:08 UTC (permalink / raw
To: Michael S. Tsirkin, Paolo Bonzini; +Cc: Jens Freimann, qemu-devel
Hi,
currently when sync'ing linux-headers against kvm/next, qemu/master won't build
because of two problems:
1. virtio_types.h needs to be copied to QEMU linux-headers, as it is now included by virtio_ring.h
Patch 2 adds virtio_types.h two update-linux-headers.sh.
2. VIRTIO_TRANSPORT_F_END has changed in the kernel. We have this define twice
in QEMU, once in include/hw/virtio/virtio.h and then in linux-headers/linux/virtio_config.h
It changed in the kernel and now we have two different values after a header sync.
Can we get rid of the duplicate define for VIRTIO_TRANSPORT_F_START/_END in QEMU? We still
have it in the kernel headers.
Jens Freimann (2):
update-linux-headers.sh: also grap virtio_types.h
virtio: remove QEMU definition of VIRTIO_TRANSPORT_F_START/_END
include/hw/virtio/virtio.h | 5 -----
scripts/update-linux-headers.sh | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
--
2.1.4
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH 1/2] update-linux-headers.sh: also grap virtio_types.h
2015-02-12 13:08 [Qemu-devel] [PATCH/RFC 0/2] update-linux-headers.sh and virtio Jens Freimann
@ 2015-02-12 13:08 ` Jens Freimann
2015-02-12 13:08 ` [Qemu-devel] [PATCH 2/2] virtio: remove QEMU definition of VIRTIO_TRANSPORT_F_START/_END Jens Freimann
1 sibling, 0 replies; 6+ messages in thread
From: Jens Freimann @ 2015-02-12 13:08 UTC (permalink / raw
To: Michael S. Tsirkin, Paolo Bonzini; +Cc: Jens Freimann, qemu-devel
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
---
| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index c8e026d..0b2e117 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -62,7 +62,7 @@ done
rm -rf "$output/linux-headers/linux"
mkdir -p "$output/linux-headers/linux"
for header in kvm.h kvm_para.h vfio.h vhost.h virtio_config.h virtio_ring.h \
- psci.h; do
+ psci.h virtio_types.h; do
cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux"
done
rm -rf "$output/linux-headers/asm-generic"
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH 2/2] virtio: remove QEMU definition of VIRTIO_TRANSPORT_F_START/_END
2015-02-12 13:08 [Qemu-devel] [PATCH/RFC 0/2] update-linux-headers.sh and virtio Jens Freimann
2015-02-12 13:08 ` [Qemu-devel] [PATCH 1/2] update-linux-headers.sh: also grap virtio_types.h Jens Freimann
@ 2015-02-12 13:08 ` Jens Freimann
2015-02-12 14:41 ` Peter Maydell
1 sibling, 1 reply; 6+ messages in thread
From: Jens Freimann @ 2015-02-12 13:08 UTC (permalink / raw
To: Michael S. Tsirkin, Paolo Bonzini; +Cc: Jens Freimann, qemu-devel
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
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
---
include/hw/virtio/virtio.h | 5 -----
1 file changed, 5 deletions(-)
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index f24997d..f0350db 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -35,11 +35,6 @@
/* We've given up on this device. */
#define VIRTIO_CONFIG_S_FAILED 0x80
-/* Some virtio feature bits (currently bits 28 through 31) are reserved for the
- * transport being used (eg. virtio_ring), the rest are per-device feature bits. */
-#define VIRTIO_TRANSPORT_F_START 28
-#define VIRTIO_TRANSPORT_F_END 32
-
/* We notify when the ring is completely used, even if the guest is suppressing
* callbacks */
#define VIRTIO_F_NOTIFY_ON_EMPTY 24
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH 2/2] virtio: remove QEMU definition of VIRTIO_TRANSPORT_F_START/_END
2015-02-12 13:08 ` [Qemu-devel] [PATCH 2/2] virtio: remove QEMU definition of VIRTIO_TRANSPORT_F_START/_END Jens Freimann
@ 2015-02-12 14:41 ` Peter Maydell
2015-02-12 14:53 ` Jens Freimann
0 siblings, 1 reply; 6+ messages in thread
From: Peter Maydell @ 2015-02-12 14:41 UTC (permalink / raw
To: Jens Freimann; +Cc: Paolo Bonzini, QEMU Developers, Michael S. Tsirkin
On 12 February 2015 at 13:08, Jens Freimann <jfrei@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...
-- PMM
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH 2/2] virtio: remove QEMU definition of VIRTIO_TRANSPORT_F_START/_END
2015-02-12 14:41 ` Peter Maydell
@ 2015-02-12 14:53 ` Jens Freimann
2015-02-19 10:07 ` Cornelia Huck
0 siblings, 1 reply; 6+ messages in thread
From: Jens Freimann @ 2015-02-12 14:53 UTC (permalink / raw
To: Peter Maydell; +Cc: Paolo Bonzini, QEMU Developers, Michael S. Tsirkin
On Thu, Feb 12, 2015 at 02:41:15PM +0000, Peter Maydell wrote:
> On 12 February 2015 at 13:08, Jens Freimann <jfrei@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)?
Jens
>
> -- PMM
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH 2/2] virtio: remove QEMU definition of VIRTIO_TRANSPORT_F_START/_END
2015-02-12 14:53 ` Jens Freimann
@ 2015-02-19 10:07 ` Cornelia Huck
0 siblings, 0 replies; 6+ messages in thread
From: Cornelia Huck @ 2015-02-19 10:07 UTC (permalink / raw
To: Jens Freimann
Cc: Peter Maydell, Michael S. Tsirkin, QEMU Developers, Paolo Bonzini
On Thu, 12 Feb 2015 15:53:49 +0100
Jens Freimann <jfrei@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 <jfrei@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.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-02-19 10:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-12 13:08 [Qemu-devel] [PATCH/RFC 0/2] update-linux-headers.sh and virtio Jens Freimann
2015-02-12 13:08 ` [Qemu-devel] [PATCH 1/2] update-linux-headers.sh: also grap virtio_types.h Jens Freimann
2015-02-12 13:08 ` [Qemu-devel] [PATCH 2/2] virtio: remove QEMU definition of VIRTIO_TRANSPORT_F_START/_END Jens Freimann
2015-02-12 14:41 ` Peter Maydell
2015-02-12 14:53 ` Jens Freimann
2015-02-19 10:07 ` Cornelia Huck
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.