[PATCH v5 0/4] tools: move most libraries into tools/libs

Juergen Gross posted 4 patches 1 week ago
Failed in applying to current master (apply log)
.gitignore                                    |  37 +-
tools/Makefile                                |   1 -
tools/Rules.mk                                |  19 +-
tools/configure                               |   2 +-
tools/configure.ac                            |   2 +-
tools/golang/xenlight/Makefile                |   2 +-
tools/libs/Makefile                           |   2 +
tools/libs/libs.mk                            |  41 +-
tools/{libxl => libs/light}/CODING_STYLE      |   0
tools/libs/light/Makefile                     | 277 +++++++++++++
.../light}/check-libxl-api-rules              |   0
tools/{libxl => libs/light}/flexarray.c       |   0
tools/{libxl => libs/light}/flexarray.h       |   0
tools/{libxl => libs/light}/gentest.py        |   0
tools/{libxl => libs/light}/gentypes.py       |   0
tools/{libxl => libs/light}/idl.py            |   0
tools/{libxl => libs/light}/idl.txt           |   0
tools/{libxl => libs/light/include}/libxl.h   |   0
.../light/include}/libxl_event.h              |   0
.../light/include}/libxl_json.h               |   0
.../light/include}/libxl_utils.h              |   0
.../light/include}/libxl_uuid.h               |   0
tools/{libxl => libs/light}/libxl.c           |   0
tools/{libxl => libs/light}/libxl_9pfs.c      |   0
tools/{libxl => libs/light}/libxl_aoutils.c   |   0
tools/{libxl => libs/light}/libxl_arch.h      |   0
tools/{libxl => libs/light}/libxl_arm.c       |   0
tools/{libxl => libs/light}/libxl_arm.h       |   0
tools/{libxl => libs/light}/libxl_arm_acpi.c  |   0
.../{libxl => libs/light}/libxl_arm_no_acpi.c |   0
.../{libxl => libs/light}/libxl_bootloader.c  |   0
.../light}/libxl_checkpoint_device.c          |   0
tools/{libxl => libs/light}/libxl_colo.h      |   0
tools/{libxl => libs/light}/libxl_colo_nic.c  |   0
.../{libxl => libs/light}/libxl_colo_proxy.c  |   0
.../{libxl => libs/light}/libxl_colo_qdisk.c  |   0
.../light}/libxl_colo_restore.c               |   0
tools/{libxl => libs/light}/libxl_colo_save.c |   0
tools/{libxl => libs/light}/libxl_console.c   |   0
.../light}/libxl_convert_callout.c            |   0
tools/{libxl => libs/light}/libxl_cpuid.c     |   0
tools/{libxl => libs/light}/libxl_cpupool.c   |   0
tools/{libxl => libs/light}/libxl_create.c    |   0
tools/{libxl => libs/light}/libxl_device.c    |   0
tools/{libxl => libs/light}/libxl_disk.c      |   0
tools/{libxl => libs/light}/libxl_dm.c        |   0
tools/{libxl => libs/light}/libxl_dom.c       |   0
tools/{libxl => libs/light}/libxl_dom_save.c  |   0
.../{libxl => libs/light}/libxl_dom_suspend.c |   0
tools/{libxl => libs/light}/libxl_domain.c    |   0
tools/{libxl => libs/light}/libxl_event.c     |   0
tools/{libxl => libs/light}/libxl_exec.c      |   0
tools/{libxl => libs/light}/libxl_flask.c     |   0
tools/{libxl => libs/light}/libxl_fork.c      |   0
tools/{libxl => libs/light}/libxl_freebsd.c   |   0
tools/{libxl => libs/light}/libxl_genid.c     |   0
tools/{libxl => libs/light}/libxl_internal.c  |   0
tools/{libxl => libs/light}/libxl_internal.h  |   0
tools/{libxl => libs/light}/libxl_json.c      |   0
.../light}/libxl_libfdt_compat.c              |   0
.../light}/libxl_libfdt_compat.h              |   0
tools/{libxl => libs/light}/libxl_linux.c     |   0
tools/{libxl => libs/light}/libxl_mem.c       |   0
tools/{libxl => libs/light}/libxl_netbsd.c    |   0
tools/{libxl => libs/light}/libxl_netbuffer.c |   0
tools/{libxl => libs/light}/libxl_nic.c       |   0
tools/{libxl => libs/light}/libxl_no_colo.c   |   0
.../light}/libxl_no_convert_callout.c         |   0
tools/{libxl => libs/light}/libxl_nocpuid.c   |   0
.../{libxl => libs/light}/libxl_nonetbuffer.c |   0
tools/{libxl => libs/light}/libxl_numa.c      |   0
tools/{libxl => libs/light}/libxl_osdeps.h    |   0
tools/{libxl => libs/light}/libxl_paths.c     |   0
tools/{libxl => libs/light}/libxl_pci.c       |   0
tools/{libxl => libs/light}/libxl_psr.c       |   0
tools/{libxl => libs/light}/libxl_pvcalls.c   |   0
tools/{libxl => libs/light}/libxl_qmp.c       |   0
tools/{libxl => libs/light}/libxl_remus.c     |   0
.../light}/libxl_remus_disk_drbd.c            |   0
.../light}/libxl_save_callout.c               |   0
.../{libxl => libs/light}/libxl_save_helper.c |   0
.../light}/libxl_save_msgs_gen.pl             |   0
tools/{libxl => libs/light}/libxl_sched.c     |   0
.../light}/libxl_sr_stream_format.h           |   0
.../{libxl => libs/light}/libxl_stream_read.c |   0
.../light}/libxl_stream_write.c               |   0
.../light}/libxl_test_fdevent.c               |   0
.../light}/libxl_test_fdevent.h               |   0
.../light}/libxl_test_timedereg.c             |   0
.../light}/libxl_test_timedereg.h             |   0
tools/{libxl => libs/light}/libxl_tmem.c      |   0
tools/{libxl => libs/light}/libxl_types.idl   |   0
.../light}/libxl_types_internal.idl           |   0
tools/{libxl => libs/light}/libxl_usb.c       |   0
tools/{libxl => libs/light}/libxl_utils.c     |   0
tools/{libxl => libs/light}/libxl_uuid.c      |   0
tools/{libxl => libs/light}/libxl_vdispl.c    |   0
tools/{libxl => libs/light}/libxl_vkb.c       |   0
tools/{libxl => libs/light}/libxl_vnuma.c     |   0
tools/{libxl => libs/light}/libxl_vsnd.c      |   0
tools/{libxl => libs/light}/libxl_vtpm.c      |   0
tools/{libxl => libs/light}/libxl_x86.c       |   0
tools/{libxl => libs/light}/libxl_x86_acpi.c  |   0
tools/{libxl => libs/light}/libxl_x86_acpi.h  |   0
tools/{libxl => libs/light}/libxl_xshelp.c    |   0
tools/{libxl => libs/light}/osdeps.c          |   0
tools/{libxl => libs/light}/test_common.c     |   0
tools/{libxl => libs/light}/test_common.h     |   0
.../{libxl => libs/light}/test_fdderegrace.c  |   0
tools/{libxl => libs/light}/test_timedereg.c  |   0
tools/libs/uselibs.mk                         |   5 +
tools/libs/util/CODING_STYLE                  | 330 +++++++++++++++
tools/libs/util/Makefile                      |  63 +++
.../{libxl => libs/util/include}/libxlutil.h  |   0
tools/{libxl => libs/util}/libxlu_cfg.c       |   0
tools/{libxl => libs/util}/libxlu_cfg_i.h     |   0
tools/{libxl => libs/util}/libxlu_cfg_l.c     |   0
tools/{libxl => libs/util}/libxlu_cfg_l.h     |   0
tools/{libxl => libs/util}/libxlu_cfg_l.l     |   0
tools/{libxl => libs/util}/libxlu_cfg_y.c     |   0
tools/{libxl => libs/util}/libxlu_cfg_y.h     |   0
tools/{libxl => libs/util}/libxlu_cfg_y.y     |   0
tools/{libxl => libs/util}/libxlu_disk.c      |   0
tools/{libxl => libs/util}/libxlu_disk_i.h    |   0
tools/{libxl => libs/util}/libxlu_disk_l.c    |   0
tools/{libxl => libs/util}/libxlu_disk_l.h    |   0
tools/{libxl => libs/util}/libxlu_disk_l.l    |   0
tools/{libxl => libs/util}/libxlu_internal.h  |   0
tools/{libxl => libs/util}/libxlu_pci.c       |   0
tools/{libxl => libs/util}/libxlu_vif.c       |   0
tools/libxl/Makefile                          | 384 ------------------
tools/ocaml/libs/xl/Makefile                  |   8 +-
tools/xl/Makefile                             |   4 +-
133 files changed, 731 insertions(+), 446 deletions(-)
rename tools/{libxl => libs/light}/CODING_STYLE (100%)
create mode 100644 tools/libs/light/Makefile
rename tools/{libxl => libs/light}/check-libxl-api-rules (100%)
rename tools/{libxl => libs/light}/flexarray.c (100%)
rename tools/{libxl => libs/light}/flexarray.h (100%)
rename tools/{libxl => libs/light}/gentest.py (100%)
rename tools/{libxl => libs/light}/gentypes.py (100%)
rename tools/{libxl => libs/light}/idl.py (100%)
rename tools/{libxl => libs/light}/idl.txt (100%)
rename tools/{libxl => libs/light/include}/libxl.h (100%)
rename tools/{libxl => libs/light/include}/libxl_event.h (100%)
rename tools/{libxl => libs/light/include}/libxl_json.h (100%)
rename tools/{libxl => libs/light/include}/libxl_utils.h (100%)
rename tools/{libxl => libs/light/include}/libxl_uuid.h (100%)
rename tools/{libxl => libs/light}/libxl.c (100%)
rename tools/{libxl => libs/light}/libxl_9pfs.c (100%)
rename tools/{libxl => libs/light}/libxl_aoutils.c (100%)
rename tools/{libxl => libs/light}/libxl_arch.h (100%)
rename tools/{libxl => libs/light}/libxl_arm.c (100%)
rename tools/{libxl => libs/light}/libxl_arm.h (100%)
rename tools/{libxl => libs/light}/libxl_arm_acpi.c (100%)
rename tools/{libxl => libs/light}/libxl_arm_no_acpi.c (100%)
rename tools/{libxl => libs/light}/libxl_bootloader.c (100%)
rename tools/{libxl => libs/light}/libxl_checkpoint_device.c (100%)
rename tools/{libxl => libs/light}/libxl_colo.h (100%)
rename tools/{libxl => libs/light}/libxl_colo_nic.c (100%)
rename tools/{libxl => libs/light}/libxl_colo_proxy.c (100%)
rename tools/{libxl => libs/light}/libxl_colo_qdisk.c (100%)
rename tools/{libxl => libs/light}/libxl_colo_restore.c (100%)
rename tools/{libxl => libs/light}/libxl_colo_save.c (100%)
rename tools/{libxl => libs/light}/libxl_console.c (100%)
rename tools/{libxl => libs/light}/libxl_convert_callout.c (100%)
rename tools/{libxl => libs/light}/libxl_cpuid.c (100%)
rename tools/{libxl => libs/light}/libxl_cpupool.c (100%)
rename tools/{libxl => libs/light}/libxl_create.c (100%)
rename tools/{libxl => libs/light}/libxl_device.c (100%)
rename tools/{libxl => libs/light}/libxl_disk.c (100%)
rename tools/{libxl => libs/light}/libxl_dm.c (100%)
rename tools/{libxl => libs/light}/libxl_dom.c (100%)
rename tools/{libxl => libs/light}/libxl_dom_save.c (100%)
rename tools/{libxl => libs/light}/libxl_dom_suspend.c (100%)
rename tools/{libxl => libs/light}/libxl_domain.c (100%)
rename tools/{libxl => libs/light}/libxl_event.c (100%)
rename tools/{libxl => libs/light}/libxl_exec.c (100%)
rename tools/{libxl => libs/light}/libxl_flask.c (100%)
rename tools/{libxl => libs/light}/libxl_fork.c (100%)
rename tools/{libxl => libs/light}/libxl_freebsd.c (100%)
rename tools/{libxl => libs/light}/libxl_genid.c (100%)
rename tools/{libxl => libs/light}/libxl_internal.c (100%)
rename tools/{libxl => libs/light}/libxl_internal.h (100%)
rename tools/{libxl => libs/light}/libxl_json.c (100%)
rename tools/{libxl => libs/light}/libxl_libfdt_compat.c (100%)
rename tools/{libxl => libs/light}/libxl_libfdt_compat.h (100%)
rename tools/{libxl => libs/light}/libxl_linux.c (100%)
rename tools/{libxl => libs/light}/libxl_mem.c (100%)
rename tools/{libxl => libs/light}/libxl_netbsd.c (100%)
rename tools/{libxl => libs/light}/libxl_netbuffer.c (100%)
rename tools/{libxl => libs/light}/libxl_nic.c (100%)
rename tools/{libxl => libs/light}/libxl_no_colo.c (100%)
rename tools/{libxl => libs/light}/libxl_no_convert_callout.c (100%)
rename tools/{libxl => libs/light}/libxl_nocpuid.c (100%)
rename tools/{libxl => libs/light}/libxl_nonetbuffer.c (100%)
rename tools/{libxl => libs/light}/libxl_numa.c (100%)
rename tools/{libxl => libs/light}/libxl_osdeps.h (100%)
rename tools/{libxl => libs/light}/libxl_paths.c (100%)
rename tools/{libxl => libs/light}/libxl_pci.c (100%)
rename tools/{libxl => libs/light}/libxl_psr.c (100%)
rename tools/{libxl => libs/light}/libxl_pvcalls.c (100%)
rename tools/{libxl => libs/light}/libxl_qmp.c (100%)
rename tools/{libxl => libs/light}/libxl_remus.c (100%)
rename tools/{libxl => libs/light}/libxl_remus_disk_drbd.c (100%)
rename tools/{libxl => libs/light}/libxl_save_callout.c (100%)
rename tools/{libxl => libs/light}/libxl_save_helper.c (100%)
rename tools/{libxl => libs/light}/libxl_save_msgs_gen.pl (100%)
rename tools/{libxl => libs/light}/libxl_sched.c (100%)
rename tools/{libxl => libs/light}/libxl_sr_stream_format.h (100%)
rename tools/{libxl => libs/light}/libxl_stream_read.c (100%)
rename tools/{libxl => libs/light}/libxl_stream_write.c (100%)
rename tools/{libxl => libs/light}/libxl_test_fdevent.c (100%)
rename tools/{libxl => libs/light}/libxl_test_fdevent.h (100%)
rename tools/{libxl => libs/light}/libxl_test_timedereg.c (100%)
rename tools/{libxl => libs/light}/libxl_test_timedereg.h (100%)
rename tools/{libxl => libs/light}/libxl_tmem.c (100%)
rename tools/{libxl => libs/light}/libxl_types.idl (100%)
rename tools/{libxl => libs/light}/libxl_types_internal.idl (100%)
rename tools/{libxl => libs/light}/libxl_usb.c (100%)
rename tools/{libxl => libs/light}/libxl_utils.c (100%)
rename tools/{libxl => libs/light}/libxl_uuid.c (100%)
rename tools/{libxl => libs/light}/libxl_vdispl.c (100%)
rename tools/{libxl => libs/light}/libxl_vkb.c (100%)
rename tools/{libxl => libs/light}/libxl_vnuma.c (100%)
rename tools/{libxl => libs/light}/libxl_vsnd.c (100%)
rename tools/{libxl => libs/light}/libxl_vtpm.c (100%)
rename tools/{libxl => libs/light}/libxl_x86.c (100%)
rename tools/{libxl => libs/light}/libxl_x86_acpi.c (100%)
rename tools/{libxl => libs/light}/libxl_x86_acpi.h (100%)
rename tools/{libxl => libs/light}/libxl_xshelp.c (100%)
rename tools/{libxl => libs/light}/osdeps.c (100%)
rename tools/{libxl => libs/light}/test_common.c (100%)
rename tools/{libxl => libs/light}/test_common.h (100%)
rename tools/{libxl => libs/light}/test_fdderegrace.c (100%)
rename tools/{libxl => libs/light}/test_timedereg.c (100%)
create mode 100644 tools/libs/util/CODING_STYLE
create mode 100644 tools/libs/util/Makefile
rename tools/{libxl => libs/util/include}/libxlutil.h (100%)
rename tools/{libxl => libs/util}/libxlu_cfg.c (100%)
rename tools/{libxl => libs/util}/libxlu_cfg_i.h (100%)
rename tools/{libxl => libs/util}/libxlu_cfg_l.c (100%)
rename tools/{libxl => libs/util}/libxlu_cfg_l.h (100%)
rename tools/{libxl => libs/util}/libxlu_cfg_l.l (100%)
rename tools/{libxl => libs/util}/libxlu_cfg_y.c (100%)
rename tools/{libxl => libs/util}/libxlu_cfg_y.h (100%)
rename tools/{libxl => libs/util}/libxlu_cfg_y.y (100%)
rename tools/{libxl => libs/util}/libxlu_disk.c (100%)
rename tools/{libxl => libs/util}/libxlu_disk_i.h (100%)
rename tools/{libxl => libs/util}/libxlu_disk_l.c (100%)
rename tools/{libxl => libs/util}/libxlu_disk_l.h (100%)
rename tools/{libxl => libs/util}/libxlu_disk_l.l (100%)
rename tools/{libxl => libs/util}/libxlu_internal.h (100%)
rename tools/{libxl => libs/util}/libxlu_pci.c (100%)
rename tools/{libxl => libs/util}/libxlu_vif.c (100%)
delete mode 100644 tools/libxl/Makefile

[PATCH v5 0/4] tools: move most libraries into tools/libs

Posted by Juergen Gross 1 week ago
The rest batch of the library build rework: the two remaining main
libraries libxenlight and libxlutil are moved to tools/libs/ directory.

Changes in V5:
- removed already applied patches (1-27)
- rebased to current xen staging

Changes in V4:
- removed already applied patches (1-8, 10)
- added new patches 1, 29
- replaced (old) patch 37 with new patch 30
- especially fixed qemu build and parallel make
- rebased to current staging

Changes in V3:
- more cleanup added
- added moving libxenguest, libxl and libxlutil
- split out dependencies into uselibs.mk
- use uselibs.mk for stubdoms build

Juergen Gross (4):
  tools/libxl: move libxenlight to tools/libs/light
  tools: rename global libxlutil make variables
  tools/libs: add option for library names not starting with libxen
  tools: move libxlutil to tools/libs/util

 .gitignore                                    |  37 +-
 tools/Makefile                                |   1 -
 tools/Rules.mk                                |  19 +-
 tools/configure                               |   2 +-
 tools/configure.ac                            |   2 +-
 tools/golang/xenlight/Makefile                |   2 +-
 tools/libs/Makefile                           |   2 +
 tools/libs/libs.mk                            |  41 +-
 tools/{libxl => libs/light}/CODING_STYLE      |   0
 tools/libs/light/Makefile                     | 277 +++++++++++++
 .../light}/check-libxl-api-rules              |   0
 tools/{libxl => libs/light}/flexarray.c       |   0
 tools/{libxl => libs/light}/flexarray.h       |   0
 tools/{libxl => libs/light}/gentest.py        |   0
 tools/{libxl => libs/light}/gentypes.py       |   0
 tools/{libxl => libs/light}/idl.py            |   0
 tools/{libxl => libs/light}/idl.txt           |   0
 tools/{libxl => libs/light/include}/libxl.h   |   0
 .../light/include}/libxl_event.h              |   0
 .../light/include}/libxl_json.h               |   0
 .../light/include}/libxl_utils.h              |   0
 .../light/include}/libxl_uuid.h               |   0
 tools/{libxl => libs/light}/libxl.c           |   0
 tools/{libxl => libs/light}/libxl_9pfs.c      |   0
 tools/{libxl => libs/light}/libxl_aoutils.c   |   0
 tools/{libxl => libs/light}/libxl_arch.h      |   0
 tools/{libxl => libs/light}/libxl_arm.c       |   0
 tools/{libxl => libs/light}/libxl_arm.h       |   0
 tools/{libxl => libs/light}/libxl_arm_acpi.c  |   0
 .../{libxl => libs/light}/libxl_arm_no_acpi.c |   0
 .../{libxl => libs/light}/libxl_bootloader.c  |   0
 .../light}/libxl_checkpoint_device.c          |   0
 tools/{libxl => libs/light}/libxl_colo.h      |   0
 tools/{libxl => libs/light}/libxl_colo_nic.c  |   0
 .../{libxl => libs/light}/libxl_colo_proxy.c  |   0
 .../{libxl => libs/light}/libxl_colo_qdisk.c  |   0
 .../light}/libxl_colo_restore.c               |   0
 tools/{libxl => libs/light}/libxl_colo_save.c |   0
 tools/{libxl => libs/light}/libxl_console.c   |   0
 .../light}/libxl_convert_callout.c            |   0
 tools/{libxl => libs/light}/libxl_cpuid.c     |   0
 tools/{libxl => libs/light}/libxl_cpupool.c   |   0
 tools/{libxl => libs/light}/libxl_create.c    |   0
 tools/{libxl => libs/light}/libxl_device.c    |   0
 tools/{libxl => libs/light}/libxl_disk.c      |   0
 tools/{libxl => libs/light}/libxl_dm.c        |   0
 tools/{libxl => libs/light}/libxl_dom.c       |   0
 tools/{libxl => libs/light}/libxl_dom_save.c  |   0
 .../{libxl => libs/light}/libxl_dom_suspend.c |   0
 tools/{libxl => libs/light}/libxl_domain.c    |   0
 tools/{libxl => libs/light}/libxl_event.c     |   0
 tools/{libxl => libs/light}/libxl_exec.c      |   0
 tools/{libxl => libs/light}/libxl_flask.c     |   0
 tools/{libxl => libs/light}/libxl_fork.c      |   0
 tools/{libxl => libs/light}/libxl_freebsd.c   |   0
 tools/{libxl => libs/light}/libxl_genid.c     |   0
 tools/{libxl => libs/light}/libxl_internal.c  |   0
 tools/{libxl => libs/light}/libxl_internal.h  |   0
 tools/{libxl => libs/light}/libxl_json.c      |   0
 .../light}/libxl_libfdt_compat.c              |   0
 .../light}/libxl_libfdt_compat.h              |   0
 tools/{libxl => libs/light}/libxl_linux.c     |   0
 tools/{libxl => libs/light}/libxl_mem.c       |   0
 tools/{libxl => libs/light}/libxl_netbsd.c    |   0
 tools/{libxl => libs/light}/libxl_netbuffer.c |   0
 tools/{libxl => libs/light}/libxl_nic.c       |   0
 tools/{libxl => libs/light}/libxl_no_colo.c   |   0
 .../light}/libxl_no_convert_callout.c         |   0
 tools/{libxl => libs/light}/libxl_nocpuid.c   |   0
 .../{libxl => libs/light}/libxl_nonetbuffer.c |   0
 tools/{libxl => libs/light}/libxl_numa.c      |   0
 tools/{libxl => libs/light}/libxl_osdeps.h    |   0
 tools/{libxl => libs/light}/libxl_paths.c     |   0
 tools/{libxl => libs/light}/libxl_pci.c       |   0
 tools/{libxl => libs/light}/libxl_psr.c       |   0
 tools/{libxl => libs/light}/libxl_pvcalls.c   |   0
 tools/{libxl => libs/light}/libxl_qmp.c       |   0
 tools/{libxl => libs/light}/libxl_remus.c     |   0
 .../light}/libxl_remus_disk_drbd.c            |   0
 .../light}/libxl_save_callout.c               |   0
 .../{libxl => libs/light}/libxl_save_helper.c |   0
 .../light}/libxl_save_msgs_gen.pl             |   0
 tools/{libxl => libs/light}/libxl_sched.c     |   0
 .../light}/libxl_sr_stream_format.h           |   0
 .../{libxl => libs/light}/libxl_stream_read.c |   0
 .../light}/libxl_stream_write.c               |   0
 .../light}/libxl_test_fdevent.c               |   0
 .../light}/libxl_test_fdevent.h               |   0
 .../light}/libxl_test_timedereg.c             |   0
 .../light}/libxl_test_timedereg.h             |   0
 tools/{libxl => libs/light}/libxl_tmem.c      |   0
 tools/{libxl => libs/light}/libxl_types.idl   |   0
 .../light}/libxl_types_internal.idl           |   0
 tools/{libxl => libs/light}/libxl_usb.c       |   0
 tools/{libxl => libs/light}/libxl_utils.c     |   0
 tools/{libxl => libs/light}/libxl_uuid.c      |   0
 tools/{libxl => libs/light}/libxl_vdispl.c    |   0
 tools/{libxl => libs/light}/libxl_vkb.c       |   0
 tools/{libxl => libs/light}/libxl_vnuma.c     |   0
 tools/{libxl => libs/light}/libxl_vsnd.c      |   0
 tools/{libxl => libs/light}/libxl_vtpm.c      |   0
 tools/{libxl => libs/light}/libxl_x86.c       |   0
 tools/{libxl => libs/light}/libxl_x86_acpi.c  |   0
 tools/{libxl => libs/light}/libxl_x86_acpi.h  |   0
 tools/{libxl => libs/light}/libxl_xshelp.c    |   0
 tools/{libxl => libs/light}/osdeps.c          |   0
 tools/{libxl => libs/light}/test_common.c     |   0
 tools/{libxl => libs/light}/test_common.h     |   0
 .../{libxl => libs/light}/test_fdderegrace.c  |   0
 tools/{libxl => libs/light}/test_timedereg.c  |   0
 tools/libs/uselibs.mk                         |   5 +
 tools/libs/util/CODING_STYLE                  | 330 +++++++++++++++
 tools/libs/util/Makefile                      |  63 +++
 .../{libxl => libs/util/include}/libxlutil.h  |   0
 tools/{libxl => libs/util}/libxlu_cfg.c       |   0
 tools/{libxl => libs/util}/libxlu_cfg_i.h     |   0
 tools/{libxl => libs/util}/libxlu_cfg_l.c     |   0
 tools/{libxl => libs/util}/libxlu_cfg_l.h     |   0
 tools/{libxl => libs/util}/libxlu_cfg_l.l     |   0
 tools/{libxl => libs/util}/libxlu_cfg_y.c     |   0
 tools/{libxl => libs/util}/libxlu_cfg_y.h     |   0
 tools/{libxl => libs/util}/libxlu_cfg_y.y     |   0
 tools/{libxl => libs/util}/libxlu_disk.c      |   0
 tools/{libxl => libs/util}/libxlu_disk_i.h    |   0
 tools/{libxl => libs/util}/libxlu_disk_l.c    |   0
 tools/{libxl => libs/util}/libxlu_disk_l.h    |   0
 tools/{libxl => libs/util}/libxlu_disk_l.l    |   0
 tools/{libxl => libs/util}/libxlu_internal.h  |   0
 tools/{libxl => libs/util}/libxlu_pci.c       |   0
 tools/{libxl => libs/util}/libxlu_vif.c       |   0
 tools/libxl/Makefile                          | 384 ------------------
 tools/ocaml/libs/xl/Makefile                  |   8 +-
 tools/xl/Makefile                             |   4 +-
 133 files changed, 731 insertions(+), 446 deletions(-)
 rename tools/{libxl => libs/light}/CODING_STYLE (100%)
 create mode 100644 tools/libs/light/Makefile
 rename tools/{libxl => libs/light}/check-libxl-api-rules (100%)
 rename tools/{libxl => libs/light}/flexarray.c (100%)
 rename tools/{libxl => libs/light}/flexarray.h (100%)
 rename tools/{libxl => libs/light}/gentest.py (100%)
 rename tools/{libxl => libs/light}/gentypes.py (100%)
 rename tools/{libxl => libs/light}/idl.py (100%)
 rename tools/{libxl => libs/light}/idl.txt (100%)
 rename tools/{libxl => libs/light/include}/libxl.h (100%)
 rename tools/{libxl => libs/light/include}/libxl_event.h (100%)
 rename tools/{libxl => libs/light/include}/libxl_json.h (100%)
 rename tools/{libxl => libs/light/include}/libxl_utils.h (100%)
 rename tools/{libxl => libs/light/include}/libxl_uuid.h (100%)
 rename tools/{libxl => libs/light}/libxl.c (100%)
 rename tools/{libxl => libs/light}/libxl_9pfs.c (100%)
 rename tools/{libxl => libs/light}/libxl_aoutils.c (100%)
 rename tools/{libxl => libs/light}/libxl_arch.h (100%)
 rename tools/{libxl => libs/light}/libxl_arm.c (100%)
 rename tools/{libxl => libs/light}/libxl_arm.h (100%)
 rename tools/{libxl => libs/light}/libxl_arm_acpi.c (100%)
 rename tools/{libxl => libs/light}/libxl_arm_no_acpi.c (100%)
 rename tools/{libxl => libs/light}/libxl_bootloader.c (100%)
 rename tools/{libxl => libs/light}/libxl_checkpoint_device.c (100%)
 rename tools/{libxl => libs/light}/libxl_colo.h (100%)
 rename tools/{libxl => libs/light}/libxl_colo_nic.c (100%)
 rename tools/{libxl => libs/light}/libxl_colo_proxy.c (100%)
 rename tools/{libxl => libs/light}/libxl_colo_qdisk.c (100%)
 rename tools/{libxl => libs/light}/libxl_colo_restore.c (100%)
 rename tools/{libxl => libs/light}/libxl_colo_save.c (100%)
 rename tools/{libxl => libs/light}/libxl_console.c (100%)
 rename tools/{libxl => libs/light}/libxl_convert_callout.c (100%)
 rename tools/{libxl => libs/light}/libxl_cpuid.c (100%)
 rename tools/{libxl => libs/light}/libxl_cpupool.c (100%)
 rename tools/{libxl => libs/light}/libxl_create.c (100%)
 rename tools/{libxl => libs/light}/libxl_device.c (100%)
 rename tools/{libxl => libs/light}/libxl_disk.c (100%)
 rename tools/{libxl => libs/light}/libxl_dm.c (100%)
 rename tools/{libxl => libs/light}/libxl_dom.c (100%)
 rename tools/{libxl => libs/light}/libxl_dom_save.c (100%)
 rename tools/{libxl => libs/light}/libxl_dom_suspend.c (100%)
 rename tools/{libxl => libs/light}/libxl_domain.c (100%)
 rename tools/{libxl => libs/light}/libxl_event.c (100%)
 rename tools/{libxl => libs/light}/libxl_exec.c (100%)
 rename tools/{libxl => libs/light}/libxl_flask.c (100%)
 rename tools/{libxl => libs/light}/libxl_fork.c (100%)
 rename tools/{libxl => libs/light}/libxl_freebsd.c (100%)
 rename tools/{libxl => libs/light}/libxl_genid.c (100%)
 rename tools/{libxl => libs/light}/libxl_internal.c (100%)
 rename tools/{libxl => libs/light}/libxl_internal.h (100%)
 rename tools/{libxl => libs/light}/libxl_json.c (100%)
 rename tools/{libxl => libs/light}/libxl_libfdt_compat.c (100%)
 rename tools/{libxl => libs/light}/libxl_libfdt_compat.h (100%)
 rename tools/{libxl => libs/light}/libxl_linux.c (100%)
 rename tools/{libxl => libs/light}/libxl_mem.c (100%)
 rename tools/{libxl => libs/light}/libxl_netbsd.c (100%)
 rename tools/{libxl => libs/light}/libxl_netbuffer.c (100%)
 rename tools/{libxl => libs/light}/libxl_nic.c (100%)
 rename tools/{libxl => libs/light}/libxl_no_colo.c (100%)
 rename tools/{libxl => libs/light}/libxl_no_convert_callout.c (100%)
 rename tools/{libxl => libs/light}/libxl_nocpuid.c (100%)
 rename tools/{libxl => libs/light}/libxl_nonetbuffer.c (100%)
 rename tools/{libxl => libs/light}/libxl_numa.c (100%)
 rename tools/{libxl => libs/light}/libxl_osdeps.h (100%)
 rename tools/{libxl => libs/light}/libxl_paths.c (100%)
 rename tools/{libxl => libs/light}/libxl_pci.c (100%)
 rename tools/{libxl => libs/light}/libxl_psr.c (100%)
 rename tools/{libxl => libs/light}/libxl_pvcalls.c (100%)
 rename tools/{libxl => libs/light}/libxl_qmp.c (100%)
 rename tools/{libxl => libs/light}/libxl_remus.c (100%)
 rename tools/{libxl => libs/light}/libxl_remus_disk_drbd.c (100%)
 rename tools/{libxl => libs/light}/libxl_save_callout.c (100%)
 rename tools/{libxl => libs/light}/libxl_save_helper.c (100%)
 rename tools/{libxl => libs/light}/libxl_save_msgs_gen.pl (100%)
 rename tools/{libxl => libs/light}/libxl_sched.c (100%)
 rename tools/{libxl => libs/light}/libxl_sr_stream_format.h (100%)
 rename tools/{libxl => libs/light}/libxl_stream_read.c (100%)
 rename tools/{libxl => libs/light}/libxl_stream_write.c (100%)
 rename tools/{libxl => libs/light}/libxl_test_fdevent.c (100%)
 rename tools/{libxl => libs/light}/libxl_test_fdevent.h (100%)
 rename tools/{libxl => libs/light}/libxl_test_timedereg.c (100%)
 rename tools/{libxl => libs/light}/libxl_test_timedereg.h (100%)
 rename tools/{libxl => libs/light}/libxl_tmem.c (100%)
 rename tools/{libxl => libs/light}/libxl_types.idl (100%)
 rename tools/{libxl => libs/light}/libxl_types_internal.idl (100%)
 rename tools/{libxl => libs/light}/libxl_usb.c (100%)
 rename tools/{libxl => libs/light}/libxl_utils.c (100%)
 rename tools/{libxl => libs/light}/libxl_uuid.c (100%)
 rename tools/{libxl => libs/light}/libxl_vdispl.c (100%)
 rename tools/{libxl => libs/light}/libxl_vkb.c (100%)
 rename tools/{libxl => libs/light}/libxl_vnuma.c (100%)
 rename tools/{libxl => libs/light}/libxl_vsnd.c (100%)
 rename tools/{libxl => libs/light}/libxl_vtpm.c (100%)
 rename tools/{libxl => libs/light}/libxl_x86.c (100%)
 rename tools/{libxl => libs/light}/libxl_x86_acpi.c (100%)
 rename tools/{libxl => libs/light}/libxl_x86_acpi.h (100%)
 rename tools/{libxl => libs/light}/libxl_xshelp.c (100%)
 rename tools/{libxl => libs/light}/osdeps.c (100%)
 rename tools/{libxl => libs/light}/test_common.c (100%)
 rename tools/{libxl => libs/light}/test_common.h (100%)
 rename tools/{libxl => libs/light}/test_fdderegrace.c (100%)
 rename tools/{libxl => libs/light}/test_timedereg.c (100%)
 create mode 100644 tools/libs/util/CODING_STYLE
 create mode 100644 tools/libs/util/Makefile
 rename tools/{libxl => libs/util/include}/libxlutil.h (100%)
 rename tools/{libxl => libs/util}/libxlu_cfg.c (100%)
 rename tools/{libxl => libs/util}/libxlu_cfg_i.h (100%)
 rename tools/{libxl => libs/util}/libxlu_cfg_l.c (100%)
 rename tools/{libxl => libs/util}/libxlu_cfg_l.h (100%)
 rename tools/{libxl => libs/util}/libxlu_cfg_l.l (100%)
 rename tools/{libxl => libs/util}/libxlu_cfg_y.c (100%)
 rename tools/{libxl => libs/util}/libxlu_cfg_y.h (100%)
 rename tools/{libxl => libs/util}/libxlu_cfg_y.y (100%)
 rename tools/{libxl => libs/util}/libxlu_disk.c (100%)
 rename tools/{libxl => libs/util}/libxlu_disk_i.h (100%)
 rename tools/{libxl => libs/util}/libxlu_disk_l.c (100%)
 rename tools/{libxl => libs/util}/libxlu_disk_l.h (100%)
 rename tools/{libxl => libs/util}/libxlu_disk_l.l (100%)
 rename tools/{libxl => libs/util}/libxlu_internal.h (100%)
 rename tools/{libxl => libs/util}/libxlu_pci.c (100%)
 rename tools/{libxl => libs/util}/libxlu_vif.c (100%)
 delete mode 100644 tools/libxl/Makefile

-- 
2.26.2