Skip to content

Conversation

robhoes
Copy link
Member

@robhoes robhoes commented Sep 29, 2025

No description provided.

OCaml 5 is particularly picky here and wants all those dependencies
explicitly (and tediously) declared, otherwise it will print
`ocaml_deprecated_auto_include` alerts. In the case of `unix`, it is
used nearly everywhere.

Signed-off-by: Rob Hoes <[email protected]>
Comment on lines 147 to 152
CAMLprim value stub_xenctrlext_get_boot_cpufeatures(value xch_val)
{
CAMLparam1(xch_val);
#if defined(XENCTRL_HAS_GET_CPUFEATURES)
CAMLparam1(xch_val);
CAMLlocal1(v);
uint32_t a, b, c, d, e, f, g, h;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like XENCTRL_HAS_GET_CPUFEATURES and xc_get_boot_cpufeatures was always local to the XenServer patchqueue, and deleted by xenserver/xen.pg@b39aeba#diff-6c3fe5afba8527c7d13d37280dbc422a422f357c226fc8d1759031a10a32aa20L37 in 2015.

It's probably worth cleaning up the dead code here too

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, it indeed turns out that this whole function is unused in xenopsd. I'll zap it.

Copy link
Contributor

@lindig lindig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a lot of unix.

The format of the error that this test checks for is printed a little
differently by the OCaml 5 compiler (the name of the tag is now quoted).
Adapt the test a little to make it work both for OCaml 4 and 5.

Signed-off-by: Rob Hoes <[email protected]>
@last-genius
Copy link
Contributor

scheduler test is failing now, I'll rerun

@robhoes robhoes added this pull request to the merge queue Sep 30, 2025
Merged via the queue into xapi-project:master with commit 0f0775b Sep 30, 2025
16 of 19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants