On Fri, Jul 26, 2019 at 01:39:26PM +0100, Peter Maydell wrote: > On Tue, 2 Jul 2019 at 19:27, Peter Maydell <peter.mayd...@linaro.org> wrote: > > > > On Tue, 2 Jul 2019 at 19:22, Michael S. Tsirkin <m...@redhat.com> wrote: > > > > > > On Tue, Jul 02, 2019 at 06:20:01PM +0100, Peter Maydell wrote: > > > > On Tue, 2 Jul 2019 at 18:01, Michael S. Tsirkin <m...@redhat.com> wrote: > > > > > This isn't from mainline. We have a bit of a deadlock with linux merge > > > > > window opening soon. I think it's reasonable temporarily > > > > > and then before release either virtio-pmem gets there or I will > > > > > revert it and drop the header. > > > > > > > > It's definitely not ideal: until the headers are actually > > > > upstream there's no guarantee that they won't change ABI. > > > > > > But then I'm watching it, if I see that I'll drop the device from qemu for > > > now. > > > > OK; I guess we can take this for now if we make sure we revert > > if the headers aren't upstream by the time we get to say rc2 > > (23rd July). (That is, we'd want to do any revert shortly after > > rc2, since rc3 might be the last rc before release.) > > Ping for status update -- have the headers hit the mainline > kernel yet? Do they match the versions we put into QEMU? > > thanks > -- PMM
Yes they do: here's the diff: diff --git a/include/standard-headers/linux/virtio_pmem.h b/include/standard-headers/linux/virtio_pmem.h index 7e3d43b121..c5f610ed6b 100644 --- a/include/standard-headers/linux/virtio_pmem.h +++ b/include/standard-headers/linux/virtio_pmem.h @@ -7,8 +7,8 @@ * Author(s): Pankaj Gupta <pagu...@redhat.com> */ -#ifndef _UAPI_LINUX_VIRTIO_PMEM_H -#define _UAPI_LINUX_VIRTIO_PMEM_H +#ifndef _LINUX_VIRTIO_PMEM_H +#define _LINUX_VIRTIO_PMEM_H #include "standard-headers/linux/types.h" #include "standard-headers/linux/virtio_ids.h" Didn't decide whether I want to update it now or after the pull, but it shouldn't matter. If you want to do an update now, go ahead. -- MST