From: Ian Jackson Date: Fri, 11 Oct 2019 16:16:44 +0000 (+0100) Subject: libxl: Move domain_create_info_setdefault earlier X-Git-Tag: 4.13.0-rc2~67 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=95596f6ab18feb825006ef8f272041f1d94e6bd1;p=xen.git libxl: Move domain_create_info_setdefault earlier We need this before we start to figure out the passthrough mode. I have checked that nothing in libxl__domain_create_info_setdefault nor the two implementations of ..._arch_... accesses anything else, other than (i) the domain type (which this function is responsible for setting and nothing before it looks at) (ii) c_info->ssidref (which is defaulted by flask code near the top of libxl__domain_config_setdefault and not accessed afterwards). So no functional change. Signed-off-by: Ian Jackson Acked-by: Anthony PERARD Release-acked-by: Juergen Gross --- diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 0670ef90ed..7869d54b32 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -972,6 +972,13 @@ int libxl__domain_config_setdefault(libxl__gc *gc, goto error_out; } + ret = libxl__domain_create_info_setdefault(gc, &d_config->c_info, + &physinfo); + if (ret) { + LOGD(ERROR, domid, "Unable to set domain create info defaults"); + goto error_out; + } + /* If target_memkb is smaller than max_memkb, the subsequent call * to libxc when building HVM domain will enable PoD mode. */ @@ -1011,13 +1018,6 @@ int libxl__domain_config_setdefault(libxl__gc *gc, goto error_out; } - ret = libxl__domain_create_info_setdefault(gc, &d_config->c_info, - &physinfo); - if (ret) { - LOGD(ERROR, domid, "Unable to set domain create info defaults"); - goto error_out; - } - if (d_config->b_info.shadow_memkb == LIBXL_MEMKB_DEFAULT && ok_to_default_memkb_in_create(gc)) d_config->b_info.shadow_memkb =