Skip to contentSkip to conversation

tools: move most libraries into tools/libs

PATCH In review Juergen Gross 1 participant 6 messages Sep 9, 2020 – Sep 24, 2020

lore
Share & tools
lore
#0 lore raw

v5 cover tools: move most libraries into tools/libs

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
Signature · 1 line
2.26.2
#1 lore raw

PATCH v5 1/4 tools/libxl: move libxenlight to tools/libs/light

Carve out all libxenlight related sources and move them to tools/libs/light in order to use the generic library build environment.

The closely related sources for libxl-save-helper and the libxl test environment are being moved, too.

---
 .gitignore                                    |  31 +-
 tools/Rules.mk                                |  11 +-
 tools/configure                               |   2 +-
 tools/configure.ac                            |   2 +-
 tools/golang/xenlight/Makefile                |   2 +-
 tools/libs/Makefile                           |   1 +
 tools/libs/light/CODING_STYLE                 | 330 ++++++++++++++++++
 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                         |   2 +
 tools/libxl/Makefile                          | 278 +--------------
 tools/ocaml/libs/xl/Makefile                  |   8 +-
 111 files changed, 645 insertions(+), 299 deletions(-)
 create mode 100644 tools/libs/light/CODING_STYLE
 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%)
.gitignore +16 -15
index 5e8c47e2db..f30550255f 100644
@@ -128,6 +128,22 @@ tools/libs/guest/xc_core.h
 tools/libs/guest/xc_core_arm.h
 tools/libs/guest/xc_core_x86.h
 tools/libs/guest/xc_private.h
+tools/libs/light/_*.[ch]
+tools/libs/light/*.pyc
+tools/libs/light/_libxl.api-for-check
+tools/libs/light/*.api-ok
+tools/libs/light/libxenlight.map
+tools/libs/light/libxl-save-helper
+tools/libs/light/dsdt*
+tools/libs/light/mk_dsdt
+tools/libs/light/ssdt*
+tools/libs/light/testidl
+tools/libs/light/testidl.c
+tools/libs/light/test_timedereg
+tools/libs/light/test_fdderegrace
+tools/libs/light/tmp.*
+tools/libs/light/xenlight.pc
+tools/libs/light/include/_*.h
 tools/libs/stat/_paths.h
 tools/libs/stat/headers.chk
 tools/libs/stat/libxenstat.map
@@ -216,16 +232,8 @@ tools/include/xen/*
 tools/include/xen-xsm/*
 tools/include/xen-foreign/*.(c|h|size)
 tools/include/xen-foreign/checker
-tools/libxl/_libxl.api-for-check
-tools/libxl/*.api-ok
 tools/libxl/*.pc
-tools/libxl/dsdt*
 tools/libxl/libxlu_cfg_y.output
-tools/libxl/mk_dsdt
-tools/libxl/ssdt*
-tools/libxl/testenum
-tools/libxl/testenum.c
-tools/libxl/tmp.*
 tools/misc/cpuperf/cpuperf-perfcntr
 tools/misc/cpuperf/cpuperf-xen
 tools/misc/xc_shadow
@@ -380,13 +388,6 @@ tools/include/xen-foreign/arm64.h
 tools/misc/xen-hptool
 tools/misc/xen-mfndump
 tools/libs/toolcore/include/_*.h
-tools/libxl/_*.[ch]
-tools/libxl/testidl
-tools/libxl/testidl.c
-tools/libxl/*.pyc
-tools/libxl/libxl-save-helper
-tools/libxl/test_timedereg
-tools/libxl/test_fdderegrace
 tools/firmware/etherboot/eb-roms.h
 tools/firmware/etherboot/gpxe-git-snapshot.tar.gz
 tools/misc/xenhypfs
tools/Rules.mk +3 -8
index 4fd91fa444..94a736a231 100644
@@ -15,9 +15,7 @@ XEN_INCLUDE        = $(XEN_ROOT)/tools/include
 
 include $(XEN_ROOT)/tools/libs/uselibs.mk
 
-XEN_libxenlight    = $(XEN_ROOT)/tools/libxl
-# Currently libxlutil lives in the same directory as libxenlight
-XEN_libxlutil      = $(XEN_libxenlight)
+XEN_libxlutil      = $(XEN_ROOT)/tools/libxl
 
 CFLAGS_xeninclude = -I$(XEN_INCLUDE)
 
@@ -107,6 +105,8 @@ ifeq ($(CONFIG_Linux),y)
 LDLIBS_libxenstore += -ldl
 endif
 
+CFLAGS_libxenlight += $(CFLAGS_libxenctrl)
+
 ifeq ($(debug),y)
 # Disable optimizations
 CFLAGS += -O0 -fno-omit-frame-pointer
@@ -116,11 +116,6 @@ else
 CFLAGS += -O2 -fomit-frame-pointer
 endif
 
-CFLAGS_libxenlight = -I$(XEN_libxenlight) $(CFLAGS_libxenctrl) $(CFLAGS_xeninclude)
-SHDEPS_libxenlight = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(SHLIB_libxenhypfs) $(SHLIB_libxenguest)
-LDLIBS_libxenlight = $(SHDEPS_libxenlight) $(XEN_libxenlight)/libxenlight$(libextension)
-SHLIB_libxenlight  = $(SHDEPS_libxenlight) -Wl,-rpath-link=$(XEN_libxenlight)
-
 CFLAGS_libxlutil = -I$(XEN_libxlutil)
 SHDEPS_libxlutil = $(SHLIB_libxenlight)
 LDLIBS_libxlutil = $(SHDEPS_libxlutil) $(XEN_libxlutil)/libxlutil$(libextension)
tools/configure +1 -1
index edcdcf4f73..8a708e9baa 100755
@@ -585,7 +585,7 @@ PACKAGE_STRING='Xen Hypervisor Tools 4.15'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL='https://www.xen.org/'
 
-ac_unique_file="libxl/libxl.c"
+ac_unique_file="libs/light/libxl.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
tools/configure.ac +1 -1
index 6614a4f130..ee8ba5ff24 100644
@@ -4,7 +4,7 @@
 AC_PREREQ([2.67])
 AC_INIT([Xen Hypervisor Tools], m4_esyscmd([../version.sh ../xen/Makefile]),
     [[email protected]], [xen], [https://www.xen.org/])
-AC_CONFIG_SRCDIR([libxl/libxl.c])
+AC_CONFIG_SRCDIR([libs/light/libxl.c])
 AC_CONFIG_FILES([
 ../config/Tools.mk
 hotplug/FreeBSD/rc.d/xencommons
tools/golang/xenlight/Makefile +1 -1
index b17095e64b..fd8e4893db 100644
@@ -8,7 +8,7 @@ GOXL_INSTALL_DIR = $(GOCODE_DIR)/src/$(XEN_GOCODE_URL)/xenlight/
 
 GO ?= go
 
-LIBXL_SRC_DIR = ../../libxl
+LIBXL_SRC_DIR = $(XEN_ROOT)/tools/libs/light
 
 .PHONY: all
 all: build
tools/libs/Makefile +1 -0
index e8fcd59214..c41455c604 100644
@@ -15,6 +15,7 @@ SUBDIRS-y += hypfs
 SUBDIRS-y += store
 SUBDIRS-y += stat
 SUBDIRS-$(CONFIG_Linux) += vchan
+SUBDIRS-y += light
 
 ifeq ($(CONFIG_RUMP),y)
 SUBDIRS-y := toolcore
tools/libs/light/CODING_STYLE new file +330 -0

330 lines not on this page · raw message

tools/libs/light/Makefile new file +277 -0

277 lines not on this page · raw message

tools/libs/light/check-libxl-api-rules renamed from tools/libxl/check-libxl-api-rules +0 -0
similarity index 100%
rename from tools/libxl/check-libxl-api-rules
rename to tools/libs/light/check-libxl-api-rules
tools/libs/light/flexarray.c renamed from tools/libxl/flexarray.c +0 -0
similarity index 100%
rename from tools/libxl/flexarray.c
rename to tools/libs/light/flexarray.c
tools/libs/light/flexarray.h renamed from tools/libxl/flexarray.h +0 -0
similarity index 100%
rename from tools/libxl/flexarray.h
rename to tools/libs/light/flexarray.h
tools/libs/light/gentest.py renamed from tools/libxl/gentest.py +0 -0
similarity index 100%
rename from tools/libxl/gentest.py
rename to tools/libs/light/gentest.py
tools/libs/light/gentypes.py renamed from tools/libxl/gentypes.py +0 -0
similarity index 100%
rename from tools/libxl/gentypes.py
rename to tools/libs/light/gentypes.py
tools/libs/light/idl.py renamed from tools/libxl/idl.py +0 -0
similarity index 100%
rename from tools/libxl/idl.py
rename to tools/libs/light/idl.py
tools/libs/light/idl.txt renamed from tools/libxl/idl.txt +0 -0
similarity index 100%
rename from tools/libxl/idl.txt
rename to tools/libs/light/idl.txt
tools/libs/light/include/libxl.h renamed from tools/libxl/libxl.h +0 -0
similarity index 100%
rename from tools/libxl/libxl.h
rename to tools/libs/light/include/libxl.h
tools/libs/light/include/libxl_event.h renamed from tools/libxl/libxl_event.h +0 -0
similarity index 100%
rename from tools/libxl/libxl_event.h
rename to tools/libs/light/include/libxl_event.h
tools/libs/light/include/libxl_json.h renamed from tools/libxl/libxl_json.h +0 -0
similarity index 100%
rename from tools/libxl/libxl_json.h
rename to tools/libs/light/include/libxl_json.h
tools/libs/light/include/libxl_utils.h renamed from tools/libxl/libxl_utils.h +0 -0
similarity index 100%
rename from tools/libxl/libxl_utils.h
rename to tools/libs/light/include/libxl_utils.h
tools/libs/light/include/libxl_uuid.h renamed from tools/libxl/libxl_uuid.h +0 -0
similarity index 100%
rename from tools/libxl/libxl_uuid.h
rename to tools/libs/light/include/libxl_uuid.h
tools/libs/light/libxl.c renamed from tools/libxl/libxl.c +0 -0
similarity index 100%
rename from tools/libxl/libxl.c
rename to tools/libs/light/libxl.c
tools/libs/light/libxl_9pfs.c renamed from tools/libxl/libxl_9pfs.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_9pfs.c
rename to tools/libs/light/libxl_9pfs.c
tools/libs/light/libxl_aoutils.c renamed from tools/libxl/libxl_aoutils.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_aoutils.c
rename to tools/libs/light/libxl_aoutils.c
tools/libs/light/libxl_arch.h renamed from tools/libxl/libxl_arch.h +0 -0
similarity index 100%
rename from tools/libxl/libxl_arch.h
rename to tools/libs/light/libxl_arch.h
tools/libs/light/libxl_arm.c renamed from tools/libxl/libxl_arm.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_arm.c
rename to tools/libs/light/libxl_arm.c
tools/libs/light/libxl_arm.h renamed from tools/libxl/libxl_arm.h +0 -0
similarity index 100%
rename from tools/libxl/libxl_arm.h
rename to tools/libs/light/libxl_arm.h
tools/libs/light/libxl_arm_acpi.c renamed from tools/libxl/libxl_arm_acpi.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_arm_acpi.c
rename to tools/libs/light/libxl_arm_acpi.c
tools/libs/light/libxl_arm_no_acpi.c renamed from tools/libxl/libxl_arm_no_acpi.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_arm_no_acpi.c
rename to tools/libs/light/libxl_arm_no_acpi.c
tools/libs/light/libxl_bootloader.c renamed from tools/libxl/libxl_bootloader.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_bootloader.c
rename to tools/libs/light/libxl_bootloader.c
tools/libs/light/libxl_checkpoint_device.c renamed from tools/libxl/libxl_checkpoint_device.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_checkpoint_device.c
rename to tools/libs/light/libxl_checkpoint_device.c
tools/libs/light/libxl_colo.h renamed from tools/libxl/libxl_colo.h +0 -0
similarity index 100%
rename from tools/libxl/libxl_colo.h
rename to tools/libs/light/libxl_colo.h
tools/libs/light/libxl_colo_nic.c renamed from tools/libxl/libxl_colo_nic.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_colo_nic.c
rename to tools/libs/light/libxl_colo_nic.c
tools/libs/light/libxl_colo_proxy.c renamed from tools/libxl/libxl_colo_proxy.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_colo_proxy.c
rename to tools/libs/light/libxl_colo_proxy.c
tools/libs/light/libxl_colo_qdisk.c renamed from tools/libxl/libxl_colo_qdisk.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_colo_qdisk.c
rename to tools/libs/light/libxl_colo_qdisk.c
tools/libs/light/libxl_colo_restore.c renamed from tools/libxl/libxl_colo_restore.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_colo_restore.c
rename to tools/libs/light/libxl_colo_restore.c
tools/libs/light/libxl_colo_save.c renamed from tools/libxl/libxl_colo_save.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_colo_save.c
rename to tools/libs/light/libxl_colo_save.c
tools/libs/light/libxl_console.c renamed from tools/libxl/libxl_console.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_console.c
rename to tools/libs/light/libxl_console.c
tools/libs/light/libxl_convert_callout.c renamed from tools/libxl/libxl_convert_callout.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_convert_callout.c
rename to tools/libs/light/libxl_convert_callout.c
tools/libs/light/libxl_cpuid.c renamed from tools/libxl/libxl_cpuid.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_cpuid.c
rename to tools/libs/light/libxl_cpuid.c
tools/libs/light/libxl_cpupool.c renamed from tools/libxl/libxl_cpupool.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_cpupool.c
rename to tools/libs/light/libxl_cpupool.c
tools/libs/light/libxl_create.c renamed from tools/libxl/libxl_create.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_create.c
rename to tools/libs/light/libxl_create.c
tools/libs/light/libxl_device.c renamed from tools/libxl/libxl_device.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_device.c
rename to tools/libs/light/libxl_device.c
tools/libs/light/libxl_disk.c renamed from tools/libxl/libxl_disk.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_disk.c
rename to tools/libs/light/libxl_disk.c
tools/libs/light/libxl_dm.c renamed from tools/libxl/libxl_dm.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_dm.c
rename to tools/libs/light/libxl_dm.c
tools/libs/light/libxl_dom.c renamed from tools/libxl/libxl_dom.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_dom.c
rename to tools/libs/light/libxl_dom.c
tools/libs/light/libxl_dom_save.c renamed from tools/libxl/libxl_dom_save.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_dom_save.c
rename to tools/libs/light/libxl_dom_save.c
tools/libs/light/libxl_dom_suspend.c renamed from tools/libxl/libxl_dom_suspend.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_dom_suspend.c
rename to tools/libs/light/libxl_dom_suspend.c
tools/libs/light/libxl_domain.c renamed from tools/libxl/libxl_domain.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_domain.c
rename to tools/libs/light/libxl_domain.c
tools/libs/light/libxl_event.c renamed from tools/libxl/libxl_event.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_event.c
rename to tools/libs/light/libxl_event.c
tools/libs/light/libxl_exec.c renamed from tools/libxl/libxl_exec.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_exec.c
rename to tools/libs/light/libxl_exec.c
tools/libs/light/libxl_flask.c renamed from tools/libxl/libxl_flask.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_flask.c
rename to tools/libs/light/libxl_flask.c
tools/libs/light/libxl_fork.c renamed from tools/libxl/libxl_fork.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_fork.c
rename to tools/libs/light/libxl_fork.c
tools/libs/light/libxl_freebsd.c renamed from tools/libxl/libxl_freebsd.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_freebsd.c
rename to tools/libs/light/libxl_freebsd.c
tools/libs/light/libxl_genid.c renamed from tools/libxl/libxl_genid.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_genid.c
rename to tools/libs/light/libxl_genid.c
tools/libs/light/libxl_internal.c renamed from tools/libxl/libxl_internal.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_internal.c
rename to tools/libs/light/libxl_internal.c
tools/libs/light/libxl_internal.h renamed from tools/libxl/libxl_internal.h +0 -0
similarity index 100%
rename from tools/libxl/libxl_internal.h
rename to tools/libs/light/libxl_internal.h
tools/libs/light/libxl_json.c renamed from tools/libxl/libxl_json.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_json.c
rename to tools/libs/light/libxl_json.c
tools/libs/light/libxl_libfdt_compat.c renamed from tools/libxl/libxl_libfdt_compat.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_libfdt_compat.c
rename to tools/libs/light/libxl_libfdt_compat.c
tools/libs/light/libxl_libfdt_compat.h renamed from tools/libxl/libxl_libfdt_compat.h +0 -0
similarity index 100%
rename from tools/libxl/libxl_libfdt_compat.h
rename to tools/libs/light/libxl_libfdt_compat.h
tools/libs/light/libxl_linux.c renamed from tools/libxl/libxl_linux.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_linux.c
rename to tools/libs/light/libxl_linux.c
tools/libs/light/libxl_mem.c renamed from tools/libxl/libxl_mem.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_mem.c
rename to tools/libs/light/libxl_mem.c
tools/libs/light/libxl_netbsd.c renamed from tools/libxl/libxl_netbsd.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_netbsd.c
rename to tools/libs/light/libxl_netbsd.c
tools/libs/light/libxl_netbuffer.c renamed from tools/libxl/libxl_netbuffer.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_netbuffer.c
rename to tools/libs/light/libxl_netbuffer.c
tools/libs/light/libxl_nic.c renamed from tools/libxl/libxl_nic.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_nic.c
rename to tools/libs/light/libxl_nic.c
tools/libs/light/libxl_no_colo.c renamed from tools/libxl/libxl_no_colo.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_no_colo.c
rename to tools/libs/light/libxl_no_colo.c
tools/libs/light/libxl_no_convert_callout.c renamed from tools/libxl/libxl_no_convert_callout.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_no_convert_callout.c
rename to tools/libs/light/libxl_no_convert_callout.c
tools/libs/light/libxl_nocpuid.c renamed from tools/libxl/libxl_nocpuid.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_nocpuid.c
rename to tools/libs/light/libxl_nocpuid.c
tools/libs/light/libxl_nonetbuffer.c renamed from tools/libxl/libxl_nonetbuffer.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_nonetbuffer.c
rename to tools/libs/light/libxl_nonetbuffer.c
tools/libs/light/libxl_numa.c renamed from tools/libxl/libxl_numa.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_numa.c
rename to tools/libs/light/libxl_numa.c
tools/libs/light/libxl_osdeps.h renamed from tools/libxl/libxl_osdeps.h +0 -0
similarity index 100%
rename from tools/libxl/libxl_osdeps.h
rename to tools/libs/light/libxl_osdeps.h
tools/libs/light/libxl_paths.c renamed from tools/libxl/libxl_paths.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_paths.c
rename to tools/libs/light/libxl_paths.c
tools/libs/light/libxl_pci.c renamed from tools/libxl/libxl_pci.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_pci.c
rename to tools/libs/light/libxl_pci.c
tools/libs/light/libxl_psr.c renamed from tools/libxl/libxl_psr.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_psr.c
rename to tools/libs/light/libxl_psr.c
tools/libs/light/libxl_pvcalls.c renamed from tools/libxl/libxl_pvcalls.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_pvcalls.c
rename to tools/libs/light/libxl_pvcalls.c
tools/libs/light/libxl_qmp.c renamed from tools/libxl/libxl_qmp.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_qmp.c
rename to tools/libs/light/libxl_qmp.c
tools/libs/light/libxl_remus.c renamed from tools/libxl/libxl_remus.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_remus.c
rename to tools/libs/light/libxl_remus.c
tools/libs/light/libxl_remus_disk_drbd.c renamed from tools/libxl/libxl_remus_disk_drbd.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_remus_disk_drbd.c
rename to tools/libs/light/libxl_remus_disk_drbd.c
tools/libs/light/libxl_save_callout.c renamed from tools/libxl/libxl_save_callout.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_save_callout.c
rename to tools/libs/light/libxl_save_callout.c
tools/libs/light/libxl_save_helper.c renamed from tools/libxl/libxl_save_helper.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_save_helper.c
rename to tools/libs/light/libxl_save_helper.c
tools/libs/light/libxl_save_msgs_gen.pl renamed from tools/libxl/libxl_save_msgs_gen.pl +0 -0
similarity index 100%
rename from tools/libxl/libxl_save_msgs_gen.pl
rename to tools/libs/light/libxl_save_msgs_gen.pl
tools/libs/light/libxl_sched.c renamed from tools/libxl/libxl_sched.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_sched.c
rename to tools/libs/light/libxl_sched.c
tools/libs/light/libxl_sr_stream_format.h renamed from tools/libxl/libxl_sr_stream_format.h +0 -0
similarity index 100%
rename from tools/libxl/libxl_sr_stream_format.h
rename to tools/libs/light/libxl_sr_stream_format.h
tools/libs/light/libxl_stream_read.c renamed from tools/libxl/libxl_stream_read.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_stream_read.c
rename to tools/libs/light/libxl_stream_read.c
tools/libs/light/libxl_stream_write.c renamed from tools/libxl/libxl_stream_write.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_stream_write.c
rename to tools/libs/light/libxl_stream_write.c
tools/libs/light/libxl_test_fdevent.c renamed from tools/libxl/libxl_test_fdevent.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_test_fdevent.c
rename to tools/libs/light/libxl_test_fdevent.c
tools/libs/light/libxl_test_fdevent.h renamed from tools/libxl/libxl_test_fdevent.h +0 -0
similarity index 100%
rename from tools/libxl/libxl_test_fdevent.h
rename to tools/libs/light/libxl_test_fdevent.h
tools/libs/light/libxl_test_timedereg.c renamed from tools/libxl/libxl_test_timedereg.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_test_timedereg.c
rename to tools/libs/light/libxl_test_timedereg.c
tools/libs/light/libxl_test_timedereg.h renamed from tools/libxl/libxl_test_timedereg.h +0 -0
similarity index 100%
rename from tools/libxl/libxl_test_timedereg.h
rename to tools/libs/light/libxl_test_timedereg.h
tools/libs/light/libxl_tmem.c renamed from tools/libxl/libxl_tmem.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_tmem.c
rename to tools/libs/light/libxl_tmem.c
tools/libs/light/libxl_types.idl renamed from tools/libxl/libxl_types.idl +0 -0
similarity index 100%
rename from tools/libxl/libxl_types.idl
rename to tools/libs/light/libxl_types.idl
tools/libs/light/libxl_types_internal.idl renamed from tools/libxl/libxl_types_internal.idl +0 -0
similarity index 100%
rename from tools/libxl/libxl_types_internal.idl
rename to tools/libs/light/libxl_types_internal.idl
tools/libs/light/libxl_usb.c renamed from tools/libxl/libxl_usb.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_usb.c
rename to tools/libs/light/libxl_usb.c
tools/libs/light/libxl_utils.c renamed from tools/libxl/libxl_utils.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_utils.c
rename to tools/libs/light/libxl_utils.c
tools/libs/light/libxl_uuid.c renamed from tools/libxl/libxl_uuid.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_uuid.c
rename to tools/libs/light/libxl_uuid.c
tools/libs/light/libxl_vdispl.c renamed from tools/libxl/libxl_vdispl.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_vdispl.c
rename to tools/libs/light/libxl_vdispl.c
tools/libs/light/libxl_vkb.c renamed from tools/libxl/libxl_vkb.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_vkb.c
rename to tools/libs/light/libxl_vkb.c
tools/libs/light/libxl_vnuma.c renamed from tools/libxl/libxl_vnuma.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_vnuma.c
rename to tools/libs/light/libxl_vnuma.c
tools/libs/light/libxl_vsnd.c renamed from tools/libxl/libxl_vsnd.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_vsnd.c
rename to tools/libs/light/libxl_vsnd.c
tools/libs/light/libxl_vtpm.c renamed from tools/libxl/libxl_vtpm.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_vtpm.c
rename to tools/libs/light/libxl_vtpm.c
tools/libs/light/libxl_x86.c renamed from tools/libxl/libxl_x86.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_x86.c
rename to tools/libs/light/libxl_x86.c
tools/libs/light/libxl_x86_acpi.c renamed from tools/libxl/libxl_x86_acpi.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_x86_acpi.c
rename to tools/libs/light/libxl_x86_acpi.c
tools/libs/light/libxl_x86_acpi.h renamed from tools/libxl/libxl_x86_acpi.h +0 -0
similarity index 100%
rename from tools/libxl/libxl_x86_acpi.h
rename to tools/libs/light/libxl_x86_acpi.h
tools/libs/light/libxl_xshelp.c renamed from tools/libxl/libxl_xshelp.c +0 -0
similarity index 100%
rename from tools/libxl/libxl_xshelp.c
rename to tools/libs/light/libxl_xshelp.c
tools/libs/light/osdeps.c renamed from tools/libxl/osdeps.c +0 -0
similarity index 100%
rename from tools/libxl/osdeps.c
rename to tools/libs/light/osdeps.c
tools/libs/light/test_common.c renamed from tools/libxl/test_common.c +0 -0
similarity index 100%
rename from tools/libxl/test_common.c
rename to tools/libs/light/test_common.c
tools/libs/light/test_common.h renamed from tools/libxl/test_common.h +0 -0
similarity index 100%
rename from tools/libxl/test_common.h
rename to tools/libs/light/test_common.h
tools/libs/light/test_fdderegrace.c renamed from tools/libxl/test_fdderegrace.c +0 -0
similarity index 100%
rename from tools/libxl/test_fdderegrace.c
rename to tools/libs/light/test_fdderegrace.c
tools/libs/light/test_timedereg.c renamed from tools/libxl/test_timedereg.c +0 -0
similarity index 100%
rename from tools/libxl/test_timedereg.c
rename to tools/libs/light/test_timedereg.c
tools/libs/uselibs.mk +2 -0
index a9dc2ce994..685f368aed 100644
@@ -26,3 +26,5 @@ LIBS_LIBS += vchan
 USELIBS_vchan := toollog store gnttab evtchn
 LIBS_LIBS += stat
 USELIBS_stat := ctrl store
+LIBS_LIBS += light
+USELIBS_light := toollog evtchn toolcore ctrl store hypfs guest
tools/libxl/Makefile +9 -269

360 lines not on this page · raw message

tools/ocaml/libs/xl/Makefile +4 -4
index 0d1549dd3a..cbe1569cc5 100644
@@ -50,10 +50,10 @@ xenlight.mli: xenlight.mli.in _libxl_types.mli.in
 	  < xenlight.mli.in > xenlight.mli.tmp
 	$(Q)mv xenlight.mli.tmp xenlight.mli
 
-_libxl_types.ml.in _libxl_types.mli.in _libxl_types.inc: genwrap.py $(XEN_ROOT)/tools/libxl/libxl_types.idl \
-                $(XEN_ROOT)/tools/libxl/idl.py
-	PYTHONPATH=$(XEN_ROOT)/tools/libxl $(PYTHON) genwrap.py \
-		$(XEN_ROOT)/tools/libxl/libxl_types.idl \
+_libxl_types.ml.in _libxl_types.mli.in _libxl_types.inc: genwrap.py $(XEN_ROOT)/tools/libs/light/libxl_types.idl \
+                $(XEN_ROOT)/tools/libs/light/idl.py
+	PYTHONPATH=$(XEN_ROOT)/tools/libs/light $(PYTHON) genwrap.py \
+		$(XEN_ROOT)/tools/libs/light/libxl_types.idl \
 		_libxl_types.mli.in _libxl_types.ml.in _libxl_types.inc
 
 libs: $(LIBS)
Signature · 1 line
2.26.2
#2 lore raw

PATCH v5 2/4 tools: rename global libxlutil make variables

In reply to Juergen Gross

Rename *_libxlutil make variables to *_libxenutil in order to avoid nasty indirections when moving libxlutil under the tools/libs infrastructure.

---
 tools/Rules.mk       | 10 +++++-----
 tools/libxl/Makefile |  4 ++--
 tools/xl/Makefile    |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)
tools/Rules.mk +5 -5
index 94a736a231..fef6986ab3 100644
@@ -15,7 +15,7 @@ XEN_INCLUDE        = $(XEN_ROOT)/tools/include
 
 include $(XEN_ROOT)/tools/libs/uselibs.mk
 
-XEN_libxlutil      = $(XEN_ROOT)/tools/libxl
+XEN_libxenutil     = $(XEN_ROOT)/tools/libxl
 
 CFLAGS_xeninclude = -I$(XEN_INCLUDE)
 
@@ -116,10 +116,10 @@ else
 CFLAGS += -O2 -fomit-frame-pointer
 endif
 
-CFLAGS_libxlutil = -I$(XEN_libxlutil)
-SHDEPS_libxlutil = $(SHLIB_libxenlight)
-LDLIBS_libxlutil = $(SHDEPS_libxlutil) $(XEN_libxlutil)/libxlutil$(libextension)
-SHLIB_libxlutil  = $(SHDEPS_libxlutil) -Wl,-rpath-link=$(XEN_libxlutil)
+CFLAGS_libxenutil = -I$(XEN_libxenutil)
+SHDEPS_libxenutil = $(SHLIB_libxenlight)
+LDLIBS_libxenutil = $(SHDEPS_libxenutil) $(XEN_libxenutil)/libxlutil$(libextension)
+SHLIB_libxenutil  = $(SHDEPS_libxenutil) -Wl,-rpath-link=$(XEN_libxenutil)
 
 CFLAGS += -D__XEN_INTERFACE_VERSION__=__XEN_LATEST_INTERFACE_VERSION__
 
tools/libxl/Makefile +2 -2
index 8ab7c9d3f0..51da1d5be4 100644
@@ -42,7 +42,7 @@ PKG_CONFIG_INST := $(PKG_CONFIG)
 xlutil.pc: PKG_CONFIG_NAME = Xlutil
 xlutil.pc: PKG_CONFIG_DESC = The xl utility library for Xen hypervisor
 xlutil.pc: PKG_CONFIG_VERSION = $(XLUMAJOR).$(XLUMINOR)
-xlutil.pc: PKG_CONFIG_USELIBS = $(SHLIB_libxlutil)
+xlutil.pc: PKG_CONFIG_USELIBS = $(SHLIB_libxenutil)
 xlutil.pc: PKG_CONFIG_LIB = xlutil
 xlutil.pc: PKG_CONFIG_REQPRIV = xenlight
 $(PKG_CONFIG_INST): PKG_CONFIG_PREFIX = $(prefix)
@@ -55,7 +55,7 @@ PKG_CONFIG_LOCAL := $(foreach pc,$(PKG_CONFIG),$(PKG_CONFIG_DIR)/$(pc))
 $(PKG_CONFIG_DIR)/xlutil.pc: PKG_CONFIG_NAME = Xlutil
 $(PKG_CONFIG_DIR)/xlutil.pc: PKG_CONFIG_DESC = The xl utility library for Xen hypervisor
 $(PKG_CONFIG_DIR)/xlutil.pc: PKG_CONFIG_VERSION = $(XLUMAJOR).$(XLUMINOR)
-$(PKG_CONFIG_DIR)/xlutil.pc: PKG_CONFIG_USELIBS = $(SHLIB_libxlutil)
+$(PKG_CONFIG_DIR)/xlutil.pc: PKG_CONFIG_USELIBS = $(SHLIB_libxenutil)
 $(PKG_CONFIG_DIR)/xlutil.pc: PKG_CONFIG_LIB = xlutil
 $(PKG_CONFIG_DIR)/xlutil.pc: PKG_CONFIG_REQPRIV = xenlight
 $(PKG_CONFIG_LOCAL): PKG_CONFIG_PREFIX = $(XEN_ROOT)
tools/xl/Makefile +2 -2
index 407dd7554c..bdf67c8464 100644
@@ -13,7 +13,7 @@ CFLAGS += $(PTHREAD_CFLAGS)
 LDFLAGS += $(PTHREAD_LDFLAGS)
 
 CFLAGS_XL += $(CFLAGS_libxenlight)
-CFLAGS_XL += $(CFLAGS_libxlutil)
+CFLAGS_XL += $(CFLAGS_libxenutil)
 CFLAGS_XL += -Wshadow
 
 XL_OBJS-$(CONFIG_X86) = xl_psr.o
@@ -38,7 +38,7 @@ $(XL_OBJS): _paths.h
 all: xl
 
 xl: $(XL_OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(XL_OBJS) $(LDLIBS_libxlutil) $(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -lyajl $(APPEND_LDFLAGS)
+	$(CC) $(LDFLAGS) -o $@ $(XL_OBJS) $(LDLIBS_libxenutil) $(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -lyajl $(APPEND_LDFLAGS)
 
 .PHONY: install
 install: all
Signature · 1 line
2.26.2
#3 lore raw

PATCH v5 3/4 tools/libs: add option for library names not starting with libxen

In reply to Juergen Gross

libxlutil doesn't follow the standard name pattern of all other Xen libraries, so add another make variable which can be used to allow other names.

---
 tools/Rules.mk     |  3 ++-
 tools/libs/libs.mk | 41 +++++++++++++++++++++--------------------
 2 files changed, 23 insertions(+), 21 deletions(-)
tools/Rules.mk +2 -1
index fef6986ab3..36094155b7 100644
@@ -87,10 +87,11 @@ endif
 # $(SHLIB_libfoo)
 
 define LIB_defs
+ FILENAME_$(1) ?= xen$(1)
  XEN_libxen$(1) = $$(XEN_ROOT)/tools/libs/$(1)
  CFLAGS_libxen$(1) = -I$$(XEN_libxen$(1))/include $$(CFLAGS_xeninclude)
  SHDEPS_libxen$(1) = $$(foreach use,$$(USELIBS_$(1)),$$(SHLIB_libxen$$(use)))
- LDLIBS_libxen$(1) = $$(SHDEPS_libxen$(1)) $$(XEN_libxen$(1))/libxen$(1)$$(libextension)
+ LDLIBS_libxen$(1) = $$(SHDEPS_libxen$(1)) $$(XEN_libxen$(1))/lib$$(FILENAME_$(1))$$(libextension)
  SHLIB_libxen$(1) = $$(SHDEPS_libxen$(1)) -Wl,-rpath-link=$$(XEN_libxen$(1))
 endef
 
tools/libs/libs.mk +21 -20

91 lines not on this page · raw message

Signature · 1 line
2.26.2
#4 lore raw

PATCH v5 4/4 tools: move libxlutil to tools/libs/util

In reply to Juergen Gross

Move the libxlutil source to tools/libs/util and delete tools/libxl.

---
 .gitignore                                    |   6 +-
 tools/Makefile                                |   1 -
 tools/Rules.mk                                |   7 -
 tools/libs/Makefile                           |   1 +
 tools/libs/uselibs.mk                         |   3 +
 tools/{libxl => libs/util}/CODING_STYLE       |   0
 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                          | 124 ------------------
 25 files changed, 71 insertions(+), 134 deletions(-)
 rename tools/{libxl => libs/util}/CODING_STYLE (100%)
 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
.gitignore +4 -2
index f30550255f..188495783e 100644
@@ -154,6 +154,10 @@ tools/libs/store/utils.h
 tools/libs/store/xenstore.pc
 tools/libs/store/xs_lib.c
 tools/libs/store/include/xenstore_lib.h
+tools/libs/util/*.pc
+tools/libs/util/_paths.h
+tools/libs/util/libxlu_cfg_y.output
+tools/libs/util/libxenutil.map
 tools/libs/vchan/headers.chk
 tools/libs/vchan/libxenvchan.map
 tools/libs/vchan/xenvchan.pc
@@ -232,8 +236,6 @@ tools/include/xen/*
 tools/include/xen-xsm/*
 tools/include/xen-foreign/*.(c|h|size)
 tools/include/xen-foreign/checker
-tools/libxl/*.pc
-tools/libxl/libxlu_cfg_y.output
 tools/misc/cpuperf/cpuperf-perfcntr
 tools/misc/cpuperf/cpuperf-xen
 tools/misc/xc_shadow
tools/Makefile +0 -1
index ea69675cca..9c77ee6763 100644
@@ -29,7 +29,6 @@ SUBDIRS-$(CONFIG_QEMU_XEN) += qemu-xen-dir
 endif
 
 SUBDIRS-y += xenpmd
-SUBDIRS-y += libxl
 SUBDIRS-$(CONFIG_GOLANG) += golang
 SUBDIRS-y += xl
 SUBDIRS-y += helpers
tools/Rules.mk +0 -7
index 36094155b7..ccb197596e 100644
@@ -15,8 +15,6 @@ XEN_INCLUDE        = $(XEN_ROOT)/tools/include
 
 include $(XEN_ROOT)/tools/libs/uselibs.mk
 
-XEN_libxenutil     = $(XEN_ROOT)/tools/libxl
-
 CFLAGS_xeninclude = -I$(XEN_INCLUDE)
 
 XENSTORE_XENSTORED ?= y
@@ -117,11 +115,6 @@ else
 CFLAGS += -O2 -fomit-frame-pointer
 endif
 
-CFLAGS_libxenutil = -I$(XEN_libxenutil)
-SHDEPS_libxenutil = $(SHLIB_libxenlight)
-LDLIBS_libxenutil = $(SHDEPS_libxenutil) $(XEN_libxenutil)/libxlutil$(libextension)
-SHLIB_libxenutil  = $(SHDEPS_libxenutil) -Wl,-rpath-link=$(XEN_libxenutil)
-
 CFLAGS += -D__XEN_INTERFACE_VERSION__=__XEN_LATEST_INTERFACE_VERSION__
 
 # Get gcc to generate the dependencies for us.
tools/libs/Makefile +1 -0
index c41455c604..1afcd12e2b 100644
@@ -16,6 +16,7 @@ SUBDIRS-y += store
 SUBDIRS-y += stat
 SUBDIRS-$(CONFIG_Linux) += vchan
 SUBDIRS-y += light
+SUBDIRS-y += util
 
 ifeq ($(CONFIG_RUMP),y)
 SUBDIRS-y := toolcore
tools/libs/uselibs.mk +3 -0
index 685f368aed..efd7a475ba 100644
@@ -28,3 +28,6 @@ LIBS_LIBS += stat
 USELIBS_stat := ctrl store
 LIBS_LIBS += light
 USELIBS_light := toollog evtchn toolcore ctrl store hypfs guest
+LIBS_LIBS += util
+USELIBS_util := light
+FILENAME_util := xlutil
tools/libs/util/CODING_STYLE renamed from tools/libxl/CODING_STYLE +0 -0
similarity index 100%
rename from tools/libxl/CODING_STYLE
rename to tools/libs/util/CODING_STYLE
tools/libs/util/Makefile new file +63 -0

63 lines not on this page · raw message

tools/libs/util/include/libxlutil.h renamed from tools/libxl/libxlutil.h +0 -0
similarity index 100%
rename from tools/libxl/libxlutil.h
rename to tools/libs/util/include/libxlutil.h
tools/libs/util/libxlu_cfg.c renamed from tools/libxl/libxlu_cfg.c +0 -0
similarity index 100%
rename from tools/libxl/libxlu_cfg.c
rename to tools/libs/util/libxlu_cfg.c
tools/libs/util/libxlu_cfg_i.h renamed from tools/libxl/libxlu_cfg_i.h +0 -0
similarity index 100%
rename from tools/libxl/libxlu_cfg_i.h
rename to tools/libs/util/libxlu_cfg_i.h
tools/libs/util/libxlu_cfg_l.c renamed from tools/libxl/libxlu_cfg_l.c +0 -0
similarity index 100%
rename from tools/libxl/libxlu_cfg_l.c
rename to tools/libs/util/libxlu_cfg_l.c
tools/libs/util/libxlu_cfg_l.h renamed from tools/libxl/libxlu_cfg_l.h +0 -0
similarity index 100%
rename from tools/libxl/libxlu_cfg_l.h
rename to tools/libs/util/libxlu_cfg_l.h
tools/libs/util/libxlu_cfg_l.l renamed from tools/libxl/libxlu_cfg_l.l +0 -0
similarity index 100%
rename from tools/libxl/libxlu_cfg_l.l
rename to tools/libs/util/libxlu_cfg_l.l
tools/libs/util/libxlu_cfg_y.c renamed from tools/libxl/libxlu_cfg_y.c +0 -0
similarity index 100%
rename from tools/libxl/libxlu_cfg_y.c
rename to tools/libs/util/libxlu_cfg_y.c
tools/libs/util/libxlu_cfg_y.h renamed from tools/libxl/libxlu_cfg_y.h +0 -0
similarity index 100%
rename from tools/libxl/libxlu_cfg_y.h
rename to tools/libs/util/libxlu_cfg_y.h
tools/libs/util/libxlu_cfg_y.y renamed from tools/libxl/libxlu_cfg_y.y +0 -0
similarity index 100%
rename from tools/libxl/libxlu_cfg_y.y
rename to tools/libs/util/libxlu_cfg_y.y
tools/libs/util/libxlu_disk.c renamed from tools/libxl/libxlu_disk.c +0 -0
similarity index 100%
rename from tools/libxl/libxlu_disk.c
rename to tools/libs/util/libxlu_disk.c
tools/libs/util/libxlu_disk_i.h renamed from tools/libxl/libxlu_disk_i.h +0 -0
similarity index 100%
rename from tools/libxl/libxlu_disk_i.h
rename to tools/libs/util/libxlu_disk_i.h
tools/libs/util/libxlu_disk_l.c renamed from tools/libxl/libxlu_disk_l.c +0 -0
similarity index 100%
rename from tools/libxl/libxlu_disk_l.c
rename to tools/libs/util/libxlu_disk_l.c
tools/libs/util/libxlu_disk_l.h renamed from tools/libxl/libxlu_disk_l.h +0 -0
similarity index 100%
rename from tools/libxl/libxlu_disk_l.h
rename to tools/libs/util/libxlu_disk_l.h
tools/libs/util/libxlu_disk_l.l renamed from tools/libxl/libxlu_disk_l.l +0 -0
similarity index 100%
rename from tools/libxl/libxlu_disk_l.l
rename to tools/libs/util/libxlu_disk_l.l
tools/libs/util/libxlu_internal.h renamed from tools/libxl/libxlu_internal.h +0 -0
similarity index 100%
rename from tools/libxl/libxlu_internal.h
rename to tools/libs/util/libxlu_internal.h
tools/libs/util/libxlu_pci.c renamed from tools/libxl/libxlu_pci.c +0 -0
similarity index 100%
rename from tools/libxl/libxlu_pci.c
rename to tools/libs/util/libxlu_pci.c
tools/libs/util/libxlu_vif.c renamed from tools/libxl/libxlu_vif.c +0 -0
similarity index 100%
rename from tools/libxl/libxlu_vif.c
rename to tools/libs/util/libxlu_vif.c
tools/libxl/Makefile deleted +0 -124

124 lines not on this page · raw message

Signature · 1 line
2.26.2
#5 lore raw
In reply to Juergen Gross

Ping?

Patches 2-4 could need some Acks...

Juergen

Quoted 283 lines · Juergen Gross

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