Re: [Xen-devel] [PATCH v3 2/2] xen: Import other xen/io/*.h

[Daniel P. Berrangé <berrange@xxxxxxxxxx>]

On Fri, Jun 21, 2019 at 11:54:41AM +0100, Anthony PERARD wrote:
> A Xen public header have been imported into QEMU (by
> f65eadb639 "xen: import ring.h from xen"), but there are other header
> that depends on ring.h which come from the system when building QEMU.
> 
> This patch resolves the issue of having headers from the system
> importing a different copie of ring.h.
> 
> This patch is prompt by the build issue described in the previous
> patch: 'Revert xen/io/ring.h of "Clean up a few header guard symbols"'
> 
> ring.h and the new imported headers are moved to
> "include/hw/xen/interface" as those describe interfaces with a guest.
> 
> The imported headers are cleaned up a bit while importing them: some
> part of the file that QEMU doesn't use are removed (description
> of how to make hypercall in grant_table.h have been removed).
> 
> Other cleanup:
> - xen-mapcache.c and xen-legacy-backend.c don't need grant_table.h.
> - xenfb.c doesn't need event_channel.h.

Personally I would have just kept the headers "as is" and not
changed anything. As long as the unused pieces don't actively
cause problems for the QEMU build, removing them just makes
life more complex if you periodically refresh the headers with
new copies from future Xen releases.

Not a show stopper though - your choice as maintainer, so

Reviewed-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>

> 
> Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
> ---
> 
> Notes:
>     v3:
>     - keep original header guard
>     - squashed of "xen: Fix build with public headers" and "xen: Import
>       other xen/io/*.h" as this patch isn't the one that fix the build issue
>       anymore.

> 
>  hw/9pfs/xen-9pfs.h                       |    4 +-
>  hw/block/xen_blkif.h                     |    5 +-
>  hw/char/xen_console.c                    |    2 +-
>  hw/display/xenfb.c                       |    7 +-
>  hw/net/xen_nic.c                         |    2 +-
>  hw/usb/xen-usb.c                         |    3 +-
>  hw/xen/xen-legacy-backend.c              |    2 -
>  include/hw/xen/interface/grant_table.h   |   36 +
>  include/hw/xen/interface/io/blkif.h      |  712 +++++++++++++++
>  include/hw/xen/interface/io/console.h    |   46 +
>  include/hw/xen/interface/io/fbif.h       |  156 ++++
>  include/hw/xen/interface/io/kbdif.h      |  566 ++++++++++++
>  include/hw/xen/interface/io/netif.h      | 1010 ++++++++++++++++++++++
>  include/hw/xen/interface/io/protocols.h  |   42 +
>  include/hw/xen/{ => interface}/io/ring.h |    0
>  include/hw/xen/interface/io/usbif.h      |  254 ++++++
>  include/hw/xen/interface/io/xenbus.h     |   70 ++
>  include/hw/xen/xen_common.h              |    2 +-
>  18 files changed, 2903 insertions(+), 16 deletions(-)
>  create mode 100644 include/hw/xen/interface/grant_table.h
>  create mode 100644 include/hw/xen/interface/io/blkif.h
>  create mode 100644 include/hw/xen/interface/io/console.h
>  create mode 100644 include/hw/xen/interface/io/fbif.h
>  create mode 100644 include/hw/xen/interface/io/kbdif.h
>  create mode 100644 include/hw/xen/interface/io/netif.h
>  create mode 100644 include/hw/xen/interface/io/protocols.h
>  rename include/hw/xen/{ => interface}/io/ring.h (100%)
>  create mode 100644 include/hw/xen/interface/io/usbif.h
>  create mode 100644 include/hw/xen/interface/io/xenbus.h




Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel