David Woodhouse <dw...@infradead.org> writes:
> From: Joao Martins <joao.m.mart...@oracle.com> > > There are already some partial headers in include/hw/xen/interface/ > which will be removed once we migrate users to the new location. > > To start with, define __XEN_TOOLS__ in hw/xen/xen.h to ensure that any > internal definitions needed by Xen toolstack libraries are present > regardless of the order in which the headers are included. A reckoning > will come later, once we make the PV backends work in emulation and > untangle the headers for Xen-native vs. generic parts. > > Signed-off-by: Joao Martins <joao.m.mart...@oracle.com> > [dwmw2: Update to Xen public headers from 4.16.2 release, add some in io/, > define __XEN_TOOLS__ in hw/xen/xen.h] > Signed-off-by: David Woodhouse <d...@amazon.co.uk> > Reviewed-by: Paul Durrant <p...@xen.org> > --- > include/hw/xen/xen.h | 16 +- > include/standard-headers/xen/arch-x86/cpuid.h | 118 ++ Hmm is the sanitising done here by hand? Because for other stuff in standard-headers we have a script update-linux-headers.sh which says: # - include/standard-headers/ for files that are used for guest # device emulation and are required on all hosts. For instance, we # get our definitions of the virtio structures from the Linux # kernel headers, but we need those definitions regardless of which # host OS we are building for. This script has to be careful to # sanitize the headers to remove any use of Linux-specifics such as # types like "__u64". This work is done in the cp_portable function. Are we just trying to work around having xen-devel (or equivalent) installed which is where we get definitions for the actual Xen support. > .../xen/arch-x86/xen-x86_32.h | 194 +++ > .../xen/arch-x86/xen-x86_64.h | 241 ++++ > include/standard-headers/xen/arch-x86/xen.h | 398 ++++++ > include/standard-headers/xen/event_channel.h | 388 ++++++ > include/standard-headers/xen/features.h | 143 +++ > include/standard-headers/xen/grant_table.h | 686 ++++++++++ > include/standard-headers/xen/hvm/hvm_op.h | 395 ++++++ > include/standard-headers/xen/hvm/params.h | 318 +++++ > include/standard-headers/xen/io/blkif.h | 722 +++++++++++ > include/standard-headers/xen/io/console.h | 56 + > include/standard-headers/xen/io/fbif.h | 176 +++ > include/standard-headers/xen/io/kbdif.h | 576 +++++++++ > include/standard-headers/xen/io/netif.h | 1102 +++++++++++++++++ > include/standard-headers/xen/io/protocols.h | 42 + > include/standard-headers/xen/io/ring.h | 495 ++++++++ > include/standard-headers/xen/io/usbif.h | 425 +++++++ > include/standard-headers/xen/io/xenbus.h | 80 ++ > include/standard-headers/xen/io/xs_wire.h | 153 +++ > include/standard-headers/xen/memory.h | 754 +++++++++++ > include/standard-headers/xen/physdev.h | 383 ++++++ > include/standard-headers/xen/sched.h | 202 +++ > include/standard-headers/xen/trace.h | 341 +++++ > include/standard-headers/xen/vcpu.h | 248 ++++ > include/standard-headers/xen/version.h | 113 ++ > include/standard-headers/xen/xen-compat.h | 46 + > include/standard-headers/xen/xen.h | 1049 ++++++++++++++++ > 28 files changed, 9857 insertions(+), 3 deletions(-) > create mode 100644 include/standard-headers/xen/arch-x86/cpuid.h > create mode 100644 include/standard-headers/xen/arch-x86/xen-x86_32.h > create mode 100644 include/standard-headers/xen/arch-x86/xen-x86_64.h > create mode 100644 include/standard-headers/xen/arch-x86/xen.h > create mode 100644 include/standard-headers/xen/event_channel.h > create mode 100644 include/standard-headers/xen/features.h > create mode 100644 include/standard-headers/xen/grant_table.h > create mode 100644 include/standard-headers/xen/hvm/hvm_op.h > create mode 100644 include/standard-headers/xen/hvm/params.h > create mode 100644 include/standard-headers/xen/io/blkif.h > create mode 100644 include/standard-headers/xen/io/console.h > create mode 100644 include/standard-headers/xen/io/fbif.h > create mode 100644 include/standard-headers/xen/io/kbdif.h > create mode 100644 include/standard-headers/xen/io/netif.h > create mode 100644 include/standard-headers/xen/io/protocols.h > create mode 100644 include/standard-headers/xen/io/ring.h > create mode 100644 include/standard-headers/xen/io/usbif.h > create mode 100644 include/standard-headers/xen/io/xenbus.h > create mode 100644 include/standard-headers/xen/io/xs_wire.h > create mode 100644 include/standard-headers/xen/memory.h > create mode 100644 include/standard-headers/xen/physdev.h > create mode 100644 include/standard-headers/xen/sched.h > create mode 100644 include/standard-headers/xen/trace.h > create mode 100644 include/standard-headers/xen/vcpu.h > create mode 100644 include/standard-headers/xen/version.h > create mode 100644 include/standard-headers/xen/xen-compat.h > create mode 100644 include/standard-headers/xen/xen.h <snip> -- Alex Bennée Virtualisation Tech Lead @ Linaro