> > > > 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 <m...@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 <pagu...@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 <pagu...@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