err() is fatal - print a message and exit. We want init-dom0less to continue on as much as possible, so replace with returning an error.
Signed-off-by: Jason Andryuk <jason.andr...@amd.com> --- v3: New --- tools/helpers/init-dom0less.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/tools/helpers/init-dom0less.c b/tools/helpers/init-dom0less.c index a4de40aeac..d08b0b1362 100644 --- a/tools/helpers/init-dom0less.c +++ b/tools/helpers/init-dom0less.c @@ -300,8 +300,10 @@ static int configure_xenstore(libxl_dominfo *info, rc = xc_dom_gnttab_seed(xch, info->domid, true, (xen_pfn_t)-1, *xenstore_pfn, 0, 0); - if (rc) - err(1, "xc_dom_gnttab_seed"); + if (rc) { + printf("xc_dom_gnttab_seed"); + return 1; + } } return 0; @@ -329,18 +331,24 @@ static int init_domain(libxl_dominfo *info) xc_domain_sethandle(xch, info->domid, libxl_uuid_bytearray(&uuid)); rc = gen_stub_json_config(info->domid, &uuid); - if (rc) - err(1, "gen_stub_json_config"); + if (rc) { + printf("gen_stub_json_config"); + return 1; + } rc = create_xenstore(info, uuid, xenstore_pfn, xenstore_evtchn); - if (rc) - err(1, "writing to xenstore"); + if (rc) { + printf("writing to xenstore"); + return 1; + } if (!introduced) { rc = xs_introduce_domain(xsh, info->domid, xenstore_pfn, xenstore_evtchn); - if (!rc) - err(1, "xs_introduce_domain"); + if (!rc) { + printf("xs_introduce_domain"); + return 1; + } } return 0; -- 2.50.1