| Message ID | 20190702150606.24851-1-mst@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Tue, 2 Jul 2019 at 16:06, Michael S. Tsirkin <mst@redhat.com> wrote: > > The following changes since commit 7fec76a02267598a4e437ddfdaeaeb6de09b92f3: > > Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2019-06-24' into staging (2019-07-01 11:28:28 +0100) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > for you to fetch changes up to a360cd11de5ae59db55e128fd209290c777eb177: > > docs: avoid vhost-user-net specifics in multiqueue section (2019-07-01 10:39:35 -0400) > > ---------------------------------------------------------------- > virtio, pc, pci: features, fixes, cleanups > > virtio-pmem support. > libvhost user mq support. > A bunch of fixes all over the place. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > Pankaj Gupta (3): > virtio-pmem: sync linux headers Hi. This header sync doesn't look like it was a proper sync made with the update-headers script against some upstream kernel -- at least the commit message doesn't say what the sync was against and the fact that it only changes the virtio-pmem headers looks suspicious. Can you respin with a proper header sync against upstream mainline, please? thanks -- PMM
On Tue, Jul 02, 2019 at 04:56:05PM +0100, Peter Maydell wrote: > On Tue, 2 Jul 2019 at 16:06, Michael S. Tsirkin <mst@redhat.com> wrote: > > > > The following changes since commit 7fec76a02267598a4e437ddfdaeaeb6de09b92f3: > > > > Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2019-06-24' into staging (2019-07-01 11:28:28 +0100) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > > > for you to fetch changes up to a360cd11de5ae59db55e128fd209290c777eb177: > > > > docs: avoid vhost-user-net specifics in multiqueue section (2019-07-01 10:39:35 -0400) > > > > ---------------------------------------------------------------- > > virtio, pc, pci: features, fixes, cleanups > > > > virtio-pmem support. > > libvhost user mq support. > > A bunch of fixes all over the place. > > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > > > > Pankaj Gupta (3): > > virtio-pmem: sync linux headers > > Hi. This header sync doesn't look like it was a proper > sync made with the update-headers script against some > upstream kernel -- at least the commit message doesn't > say what the sync was against and the fact that it only > changes the virtio-pmem headers looks suspicious. > > Can you respin with a proper header sync against upstream > mainline, please? > > thanks > -- PMM 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. Updated the commit and re-pushed. But if you disagree pls let me know.
On Tue, 2 Jul 2019 at 18:01, Michael S. Tsirkin <mst@redhat.com> wrote: > > On Tue, Jul 02, 2019 at 04:56:05PM +0100, Peter Maydell wrote: > > On Tue, 2 Jul 2019 at 16:06, Michael S. Tsirkin <mst@redhat.com> wrote: > > Hi. This header sync doesn't look like it was a proper > > sync made with the update-headers script against some > > upstream kernel -- at least the commit message doesn't > > say what the sync was against and the fact that it only > > changes the virtio-pmem headers looks suspicious. > > > > Can you respin with a proper header sync against upstream > > mainline, please? > 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. Are the headers at least in some kvm-next or equivalent tree ? When are they expected to hit mainline? thanks -- PMM
On Tue, Jul 02, 2019 at 06:20:01PM +0100, Peter Maydell wrote: > On Tue, 2 Jul 2019 at 18:01, Michael S. Tsirkin <mst@redhat.com> wrote: > > > > On Tue, Jul 02, 2019 at 04:56:05PM +0100, Peter Maydell wrote: > > > On Tue, 2 Jul 2019 at 16:06, Michael S. Tsirkin <mst@redhat.com> wrote: > > > Hi. This header sync doesn't look like it was a proper > > > sync made with the update-headers script against some > > > upstream kernel -- at least the commit message doesn't > > > say what the sync was against and the fact that it only > > > changes the virtio-pmem headers looks suspicious. > > > > > > Can you respin with a proper header sync against upstream > > > mainline, please? > > > 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. > Are the headers at least in some kvm-next or equivalent tree ? Yes - libnvdimm maintainer's tree. > When are they expected to hit mainline? Next merge window. > > thanks > -- PMM
On Tue, 2 Jul 2019 at 19:22, Michael S. Tsirkin <mst@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 <mst@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.) > > Are the headers at least in some kvm-next or equivalent tree ? > > > Yes - libnvdimm maintainer's tree. > > > When are they expected to hit mainline? > > Next merge window. When's that? thanks -- PMM
On Tue, Jul 02, 2019 at 07:27:13PM +0100, Peter Maydell wrote: > On Tue, 2 Jul 2019 at 19:22, Michael S. Tsirkin <mst@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 <mst@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.) Right, that's the plan. > > > Are the headers at least in some kvm-next or equivalent tree ? > > > > > > Yes - libnvdimm maintainer's tree. > > > > > When are they expected to hit mainline? > > > > Next merge window. > > When's that? Likely opens next Sunday and lasts 2 weeks. So we'll know by July 23. > thanks > -- PMM
On Tue, 2 Jul 2019 at 16:06, Michael S. Tsirkin <mst@redhat.com> wrote: > > The following changes since commit 7fec76a02267598a4e437ddfdaeaeb6de09b92f3: > > Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2019-06-24' into staging (2019-07-01 11:28:28 +0100) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > for you to fetch changes up to a360cd11de5ae59db55e128fd209290c777eb177: > > docs: avoid vhost-user-net specifics in multiqueue section (2019-07-01 10:39:35 -0400) > > ---------------------------------------------------------------- > virtio, pc, pci: features, fixes, cleanups > > virtio-pmem support. > libvhost user mq support. > A bunch of fixes all over the place. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > This fails to build on all the non-Linux platforms: In file included from /Users/pm215/src/qemu-for-merges/hw/virtio/virtio-pmem.c:21: /Users/pm215/src/qemu-for-merges/include/standard-headers/linux/virtio_pmem.h:13:10: fatal error: 'linux/types.h' file not found #include <linux/types.h> ^~~~~~~~~~~~~~~ thanks -- PMM
> > > > The following changes since commit > > 7fec76a02267598a4e437ddfdaeaeb6de09b92f3: > > > > Merge remote-tracking branch > > 'remotes/maxreitz/tags/pull-block-2019-06-24' into staging (2019-07-01 > > 11:28:28 +0100) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > > > for you to fetch changes up to a360cd11de5ae59db55e128fd209290c777eb177: > > > > docs: avoid vhost-user-net specifics in multiqueue section (2019-07-01 > > 10:39:35 -0400) > > > > ---------------------------------------------------------------- > > virtio, pc, pci: features, fixes, cleanups > > > > virtio-pmem support. > > libvhost user mq support. > > A bunch of fixes all over the place. > > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > > > This fails to build on all the non-Linux platforms: > > In file included from > /Users/pm215/src/qemu-for-merges/hw/virtio/virtio-pmem.c:21: > /Users/pm215/src/qemu-for-merges/include/standard-headers/linux/virtio_pmem.h:13:10: > fatal error: 'linux/types.h' file not found > #include <linux/types.h> > ^~~~~~~~~~~~~~~ Sorry for this. Can we please apply below patch on top. I only tested this in linux but I think this will solve the issue. Let me know if you want to resend entire series. Thank you, Pankaj =================== From: Pankaj Gupta <pagupta@redhat.com> Date: Thu, 4 Jul 2019 16:27:08 +0530 Subject: [PATCH] Sync header and fix non linux build issue Signed-off-by: Pankaj Gupta <pagupta@redhat.com> --- include/standard-headers/linux/virtio_pmem.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/include/standard-headers/linux/virtio_pmem.h b/include/standard-headers/linux/virtio_pmem.h index 7a3e2fe524..a60236f63d 100644 --- a/include/standard-headers/linux/virtio_pmem.h +++ b/include/standard-headers/linux/virtio_pmem.h @@ -10,14 +10,13 @@ #ifndef _UAPI_LINUX_VIRTIO_PMEM_H #define _UAPI_LINUX_VIRTIO_PMEM_H -#include <linux/types.h> -#include <linux/virtio_types.h> -#include <linux/virtio_ids.h> -#include <linux/virtio_config.h> +#include "standard-headers/linux/virtio_types.h" +#include "standard-headers/linux/virtio_ids.h" +#include "standard-headers/linux/virtio_config.h" struct virtio_pmem_config { - __le64 start; - __le64 size; + uint64_t start; + uint64_t size; }; #define VIRTIO_PMEM_REQ_TYPE_FLUSH 0
On Thu, Jul 04, 2019 at 07:03:42AM -0400, Pankaj Gupta wrote: > > > > > > > The following changes since commit > > > 7fec76a02267598a4e437ddfdaeaeb6de09b92f3: > > > > > > Merge remote-tracking branch > > > 'remotes/maxreitz/tags/pull-block-2019-06-24' into staging (2019-07-01 > > > 11:28:28 +0100) > > > > > > are available in the Git repository at: > > > > > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > > > > > for you to fetch changes up to a360cd11de5ae59db55e128fd209290c777eb177: > > > > > > docs: avoid vhost-user-net specifics in multiqueue section (2019-07-01 > > > 10:39:35 -0400) > > > > > > ---------------------------------------------------------------- > > > virtio, pc, pci: features, fixes, cleanups > > > > > > virtio-pmem support. > > > libvhost user mq support. > > > A bunch of fixes all over the place. > > > > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > > > > > > This fails to build on all the non-Linux platforms: > > > > In file included from > > /Users/pm215/src/qemu-for-merges/hw/virtio/virtio-pmem.c:21: > > /Users/pm215/src/qemu-for-merges/include/standard-headers/linux/virtio_pmem.h:13:10: > > fatal error: 'linux/types.h' file not found > > #include <linux/types.h> > > ^~~~~~~~~~~~~~~ > > Sorry for this. > Can we please apply below patch on top. I only tested this in linux > but I think this will solve the issue. Let me know if you want to resend > entire series. > > Thank you, > Pankaj > > =================== > > From: Pankaj Gupta <pagupta@redhat.com> > Date: Thu, 4 Jul 2019 16:27:08 +0530 > Subject: [PATCH] Sync header and fix non linux build issue > > Signed-off-by: Pankaj Gupta <pagupta@redhat.com> > --- > include/standard-headers/linux/virtio_pmem.h | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/include/standard-headers/linux/virtio_pmem.h b/include/standard-headers/linux/virtio_pmem.h > index 7a3e2fe524..a60236f63d 100644 > --- a/include/standard-headers/linux/virtio_pmem.h > +++ b/include/standard-headers/linux/virtio_pmem.h > @@ -10,14 +10,13 @@ > #ifndef _UAPI_LINUX_VIRTIO_PMEM_H > #define _UAPI_LINUX_VIRTIO_PMEM_H > > -#include <linux/types.h> > -#include <linux/virtio_types.h> > -#include <linux/virtio_ids.h> > -#include <linux/virtio_config.h> > +#include "standard-headers/linux/virtio_types.h" > +#include "standard-headers/linux/virtio_ids.h" > +#include "standard-headers/linux/virtio_config.h" > > struct virtio_pmem_config { > - __le64 start; > - __le64 size; > + uint64_t start; > + uint64_t size; > }; > > #define VIRTIO_PMEM_REQ_TYPE_FLUSH 0 You need to get rid of __virtio things too. I fixed up, hopefully well. If that's not enough then I will drop pmem for now.
On Thu, Jul 04, 2019 at 10:25:48AM +0100, Peter Maydell wrote: > On Tue, 2 Jul 2019 at 16:06, Michael S. Tsirkin <mst@redhat.com> wrote: > > > > The following changes since commit 7fec76a02267598a4e437ddfdaeaeb6de09b92f3: > > > > Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2019-06-24' into staging (2019-07-01 11:28:28 +0100) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > > > for you to fetch changes up to a360cd11de5ae59db55e128fd209290c777eb177: > > > > docs: avoid vhost-user-net specifics in multiqueue section (2019-07-01 10:39:35 -0400) > > > > ---------------------------------------------------------------- > > virtio, pc, pci: features, fixes, cleanups > > > > virtio-pmem support. > > libvhost user mq support. > > A bunch of fixes all over the place. > > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > > > This fails to build on all the non-Linux platforms: > > In file included from > /Users/pm215/src/qemu-for-merges/hw/virtio/virtio-pmem.c:21: > /Users/pm215/src/qemu-for-merges/include/standard-headers/linux/virtio_pmem.h:13:10: > fatal error: 'linux/types.h' file not found > #include <linux/types.h> > ^~~~~~~~~~~~~~~ > > thanks > -- PMM Amended and re-pushed. Pls try again, sorry about that.
> > > > The following changes since commit > > > > 7fec76a02267598a4e437ddfdaeaeb6de09b92f3: > > > > > > > > Merge remote-tracking branch > > > > 'remotes/maxreitz/tags/pull-block-2019-06-24' into staging > > > > (2019-07-01 > > > > 11:28:28 +0100) > > > > > > > > are available in the Git repository at: > > > > > > > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > > > > > > > for you to fetch changes up to > > > > a360cd11de5ae59db55e128fd209290c777eb177: > > > > > > > > docs: avoid vhost-user-net specifics in multiqueue section > > > > (2019-07-01 > > > > 10:39:35 -0400) > > > > > > > > ---------------------------------------------------------------- > > > > virtio, pc, pci: features, fixes, cleanups > > > > > > > > virtio-pmem support. > > > > libvhost user mq support. > > > > A bunch of fixes all over the place. > > > > > > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > > > > > > > > > This fails to build on all the non-Linux platforms: > > > > > > In file included from > > > /Users/pm215/src/qemu-for-merges/hw/virtio/virtio-pmem.c:21: > > > /Users/pm215/src/qemu-for-merges/include/standard-headers/linux/virtio_pmem.h:13:10: > > > fatal error: 'linux/types.h' file not found > > > #include <linux/types.h> > > > ^~~~~~~~~~~~~~~ > > > > Sorry for this. > > Can we please apply below patch on top. I only tested this in linux > > but I think this will solve the issue. Let me know if you want to resend > > entire series. > > > > Thank you, > > Pankaj > > > > =================== > > > > From: Pankaj Gupta <pagupta@redhat.com> > > Date: Thu, 4 Jul 2019 16:27:08 +0530 > > Subject: [PATCH] Sync header and fix non linux build issue > > > > Signed-off-by: Pankaj Gupta <pagupta@redhat.com> > > --- > > include/standard-headers/linux/virtio_pmem.h | 11 +++++------ > > 1 file changed, 5 insertions(+), 6 deletions(-) > > > > diff --git a/include/standard-headers/linux/virtio_pmem.h > > b/include/standard-headers/linux/virtio_pmem.h > > index 7a3e2fe524..a60236f63d 100644 > > --- a/include/standard-headers/linux/virtio_pmem.h > > +++ b/include/standard-headers/linux/virtio_pmem.h > > @@ -10,14 +10,13 @@ > > #ifndef _UAPI_LINUX_VIRTIO_PMEM_H > > #define _UAPI_LINUX_VIRTIO_PMEM_H > > > > -#include <linux/types.h> > > -#include <linux/virtio_types.h> > > -#include <linux/virtio_ids.h> > > -#include <linux/virtio_config.h> > > +#include "standard-headers/linux/virtio_types.h" > > +#include "standard-headers/linux/virtio_ids.h" > > +#include "standard-headers/linux/virtio_config.h" > > > > struct virtio_pmem_config { > > - __le64 start; > > - __le64 size; > > + uint64_t start; > > + uint64_t size; > > }; > > > > #define VIRTIO_PMEM_REQ_TYPE_FLUSH 0 > > You need to get rid of __virtio things too. > I fixed up, hopefully well. o.k. Thank you Michael Best regards, Pankaj > If that's not enough then I will drop pmem for now. > > -- > MST > >
On Thu, 4 Jul 2019 at 22:29, Michael S. Tsirkin <mst@redhat.com> wrote: > > On Thu, Jul 04, 2019 at 10:25:48AM +0100, Peter Maydell wrote: > > On Tue, 2 Jul 2019 at 16:06, Michael S. Tsirkin <mst@redhat.com> wrote: > > > > > > The following changes since commit 7fec76a02267598a4e437ddfdaeaeb6de09b92f3: > > > > > > Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2019-06-24' into staging (2019-07-01 11:28:28 +0100) > > > > > > are available in the Git repository at: > > > > > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > > > > > for you to fetch changes up to a360cd11de5ae59db55e128fd209290c777eb177: > > > > > > docs: avoid vhost-user-net specifics in multiqueue section (2019-07-01 10:39:35 -0400) > > > > > > ---------------------------------------------------------------- > > > virtio, pc, pci: features, fixes, cleanups > > > > > > virtio-pmem support. > > > libvhost user mq support. > > > A bunch of fixes all over the place. > > > > > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > > > > > > This fails to build on all the non-Linux platforms: > > > > In file included from > > /Users/pm215/src/qemu-for-merges/hw/virtio/virtio-pmem.c:21: > > /Users/pm215/src/qemu-for-merges/include/standard-headers/linux/virtio_pmem.h:13:10: > > fatal error: 'linux/types.h' file not found > > #include <linux/types.h> > > ^~~~~~~~~~~~~~~ > > > > thanks > > -- PMM > > Amended and re-pushed. Pls try again, sorry about that. > Applied, thanks. Please update the changelog at https://wiki.qemu.org/ChangeLog/4.1 for any user-visible changes. -- PMM
On Tue, 2 Jul 2019 at 19:27, Peter Maydell <peter.maydell@linaro.org> wrote: > > On Tue, 2 Jul 2019 at 19:22, Michael S. Tsirkin <mst@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 <mst@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
On Fri, Jul 26, 2019 at 01:39:26PM +0100, Peter Maydell wrote: > On Tue, 2 Jul 2019 at 19:27, Peter Maydell <peter.maydell@linaro.org> wrote: > > > > On Tue, 2 Jul 2019 at 19:22, Michael S. Tsirkin <mst@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 <mst@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 <pagupta@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.
The following changes since commit 7fec76a02267598a4e437ddfdaeaeb6de09b92f3: Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2019-06-24' into staging (2019-07-01 11:28:28 +0100) are available in the Git repository at: git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream for you to fetch changes up to a360cd11de5ae59db55e128fd209290c777eb177: docs: avoid vhost-user-net specifics in multiqueue section (2019-07-01 10:39:35 -0400) ---------------------------------------------------------------- virtio, pc, pci: features, fixes, cleanups virtio-pmem support. libvhost user mq support. A bunch of fixes all over the place. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> ---------------------------------------------------------------- David Hildenbrand (4): virtio-pci: Allow to specify additional interfaces for the base type hmp: Handle virtio-pmem when printing memory device infos numa: Handle virtio-pmem in NUMA stats pc: Support for virtio-pmem-pci Eduardo Habkost (1): pc: Move compat_apic_id_mode variable to PCMachineClass Marc-André Lureau (1): virtio-pci: fix missing device properties Michael S. Tsirkin (4): pcie: don't skip multi-mask events pcie: check that slt ctrl changed before deleting pcie: work around for racy guest init pcie: minor cleanups for slot control/status Pankaj Gupta (3): virtio-pmem: add virtio device virtio-pmem: sync linux headers virtio-pci: Proxy for virtio-pmem Stefan Hajnoczi (4): libvhost-user: add vmsg_set_reply_u64() helper libvhost-user: support many virtqueues libvhost-user: implement VHOST_USER_PROTOCOL_F_MQ docs: avoid vhost-user-net specifics in multiqueue section Xie Yongji (5): virtio: add "use-started" property virtio: Set "start_on_kick" for legacy devices virtio: Set "start_on_kick" on virtio_set_features() virtio: Make sure we get correct state of device on handle_aio_output() virtio: Don't change "started" flag on virtio_vmstate_change() qapi/misc.json | 28 +++- contrib/libvhost-user/libvhost-user-glib.h | 2 +- contrib/libvhost-user/libvhost-user.h | 10 +- hw/virtio/virtio-pci.h | 1 + hw/virtio/virtio-pmem-pci.h | 34 +++++ include/hw/i386/pc.h | 3 + include/hw/pci/pci.h | 1 + include/hw/pci/pcie.h | 2 + include/hw/virtio/virtio-pmem.h | 49 +++++++ include/hw/virtio/virtio.h | 23 +++- include/standard-headers/linux/virtio_ids.h | 1 + include/standard-headers/linux/virtio_pmem.h | 35 +++++ contrib/libvhost-user/libvhost-user-glib.c | 12 +- contrib/libvhost-user/libvhost-user.c | 66 ++++++---- contrib/vhost-user-blk/vhost-user-blk.c | 16 ++- contrib/vhost-user-gpu/main.c | 9 +- contrib/vhost-user-input/main.c | 11 +- contrib/vhost-user-scsi/vhost-user-scsi.c | 21 ++- hw/block/vhost-user-blk.c | 4 +- hw/core/machine.c | 1 + hw/i386/pc.c | 94 +++++++++++-- hw/i386/pc_piix.c | 3 +- hw/pci-bridge/pcie_root_port.c | 5 +- hw/pci-bridge/xio3130_downstream.c | 5 +- hw/pci/pcie.c | 40 +++++- hw/virtio/virtio-pci.c | 29 ++-- hw/virtio/virtio-pmem-pci.c | 131 +++++++++++++++++++ hw/virtio/virtio-pmem.c | 189 +++++++++++++++++++++++++++ hw/virtio/virtio.c | 53 ++++---- monitor/hmp-cmds.c | 27 ++-- numa.c | 24 ++-- tests/vhost-user-bridge.c | 42 ++++-- docs/interop/vhost-user.rst | 21 +-- hw/i386/Kconfig | 1 + hw/virtio/Kconfig | 10 ++ hw/virtio/Makefile.objs | 2 + 36 files changed, 844 insertions(+), 161 deletions(-) create mode 100644 hw/virtio/virtio-pmem-pci.h create mode 100644 include/hw/virtio/virtio-pmem.h create mode 100644 include/standard-headers/linux/virtio_pmem.h create mode 100644 hw/virtio/virtio-pmem-pci.c create mode 100644 hw/virtio/virtio-pmem.c