On 1/26/26 14:46, Roman Bogorodskiy wrote: > Michal Prívozník wrote: > >> On 1/25/26 07:54, Roman Bogorodskiy wrote: >>> Bhyve on arm64 does not have the bhyveload(8) tool. >>> That means that it cannot be used as a default if the loader is not >>> configured for the domain. >>> >>> To prevent users from getting unusable configurations, handle loader >>> configuration on arm64 like that: >>> >>> - if loader is specified in the domain XML, just use it >>> - if not specified, try to check whether the default uboot loader >>> is available on the system. In case it is, set is as the loader, >>> otherwise fail with the error. >>> >>> Signed-off-by: Roman Bogorodskiy <[email protected]> >>> --- >>> src/bhyve/bhyve_domain.c | 22 +++++++++++++++++++ >>> .../aarch64/bhyvexml2argv-base.args | 1 + >>> .../aarch64/bhyvexml2argv-base.ldargs | 8 +------ >>> .../aarch64/bhyvexml2argv-console.args | 1 + >>> .../aarch64/bhyvexml2argv-console.ldargs | 8 +------ >>> tests/bhyvexml2argvmock.c | 20 ++++++++++++++++- >>> .../aarch64/bhyvexml2xmlout-base.xml | 1 + >>> .../aarch64/bhyvexml2xmlout-console.xml | 1 + >>> 8 files changed, 47 insertions(+), 15 deletions(-) >> >> You'll need to regenerate tests too. Squash this in: >> >> >> diff --git i/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args >> w/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args >> index 1079beee52..d01f62ff5c 100644 >> --- i/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args >> +++ w/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args >> @@ -2,7 +2,7 @@ bhyve \ >> -c 1 \ >> -m 214 \ >> -s 0:0,hostbridge \ >> --o bootrom=/usr/local/share/u-boot/u-boot-bhyve-arm64/u-boot.bin \ >> +-o bootrom=/usr/share/u-boot/u-boot-bhyve-arm64/u-boot.bin \ > > Oh, I guess it's because DATADIR on your system resolves to /usr/share > and on my system it is /usr/local/share. > > Should make tests not depend on that.
Indeed. So post that patch first, I'll review it and then merge this one? Michal
