I like the improvements for the build process but I wonder whether these should be mixed with functional code changes. But that is only a cosmetic concern as it might impact identifying patches when they are backported. The code change looks good to me, too. I support moving to Dune for building the OCaml part in the future.
Acked-by: Christian Lindig <christian.lindig@citrix.com>
________________________________________
From: Edwin Török <edvin.torok@citrix.com>
Sent: 17 November 2020 18:24
To: xen-devel@lists.xenproject.org
Cc: Edwin Torok; Doug Goldstein; Andrew Cooper; George Dunlap; Ian Jackson; Jan Beulich; Julien Grall; Stefano Stabellini; Wei Liu; Christian Lindig; David Scott
Subject: [PATCH v1 0/4] tools/ocaml/libs/xc: domid control at domain creation time
The xl toolstack allows some control over the domid at VM creation time,
allow xenopsd similar control by exposing the appropriate domid field in the OCaml xenctrl bindings.
A new API function is introduced to preserve backwards compatibility without merge ordering
requirements between the Xen and xenopsd patches: Xen can merge the patch and xenopsd will keep
building with the old function, and a new version of xenopsd will start using the new function.
I've also included some build system fixes to allow me to test the build
in an upstream build environment:
```
cd automation/build
podman build -t registry.gitlab.com/xen-project/xen/ubuntu:focal -f ubuntu/focal.dockerfile ubuntu
DOCKER_CMD=podman CONTAINER_NO_PULL=1 CONTAINER=registry.gitlab.com/xen-project/xen/ubuntu:focal automation/scripts/containerize make build-tools-oxenstored
```
It'd be good if someone could test whether containerize still works on non-SELinux systems now, or
whether we need more detection logic in the script.
This works around bugs in the OCaml makefiles that end up in "inconsistent assumptions" by doing a
'make clean' before building the OCaml files every time. This is inefficient, but works.
Long term it would be beneficial to switch to Dune as build system,
which can do correct incremental builds with minimal configuration.
I'll send a separate patch series for that.
Edwin Török (4):
automation/scripts/containerize: fix DOCKER_CMD=podman
automation/: add Ubuntu:focal container
Makefile: add build-tools-oxenstored
tools/ocaml/libs/xc: backward compatible domid control at domain
creation time
Makefile | 6 +++
automation/build/ubuntu/focal.dockerfile | 50 ++++++++++++++++++++++++
automation/scripts/containerize | 7 ++--
tools/ocaml/Makefile | 8 ++++
tools/ocaml/libs/xc/xenctrl.ml | 3 ++
tools/ocaml/libs/xc/xenctrl.mli | 2 +
tools/ocaml/libs/xc/xenctrl_stubs.c | 9 ++++-
7 files changed, 80 insertions(+), 5 deletions(-)
create mode 100644 automation/build/ubuntu/focal.dockerfile
--
2.18.4