On 2/3/26 20:45, 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. > > Additionally, the loader could be configured in bhyve.conf. > By default, it uses the loader installed by the > sysutils/u-boot-bhyve-arm64 port or a corresponding package. > > Signed-off-by: Roman Bogorodskiy <[email protected]> > Reviewed-by: Michal Privoznik <[email protected]> > --- > src/bhyve/bhyve.conf | 5 ++++ > src/bhyve/bhyve_conf.c | 8 +++++++ > src/bhyve/bhyve_domain.c | 23 +++++++++++++++++++ > src/bhyve/bhyve_utils.h | 2 ++ > src/bhyve/libvirtd_bhyve.aug | 3 ++- > src/bhyve/test_libvirtd_bhyve.aug.in | 1 + > .../aarch64/bhyvexml2argv-base.args | 1 + > .../aarch64/bhyvexml2argv-base.ldargs | 8 +------ > .../aarch64/bhyvexml2argv-console.args | 1 + > .../aarch64/bhyvexml2argv-console.ldargs | 8 +------ > tests/bhyvexml2argvmock.c | 20 +++++++++++++++- > tests/bhyvexml2argvtest.c | 2 ++ > .../aarch64/bhyvexml2xmlout-base.xml | 1 + > .../aarch64/bhyvexml2xmlout-console.xml | 1 + > tests/bhyvexml2xmltest.c | 7 ++++++ > 15 files changed, 75 insertions(+), 16 deletions(-)
Reviewed-by: Michal Privoznik <[email protected]> Michal
