Re: [libvirt PATCH 4/8] libxl: allocate d_config

[Jim Fehlig]

On 10/4/20 4:21 PM, Ján Tomko wrote:

clang reports:

   stack frame size of 2152 bytes in function 'libxlDomainStart'

This is mostly due to the d_config variable:

   sizeof(libxl_domain_config) = 1232

Use g_new0 to allocate it and bring the frame size down.

Signed-off-by: Ján Tomko 
---
  src/libxl/libxl_domain.c | 24 +---
  1 file changed, 13 insertions(+), 11 deletions(-)


Reviewed-by: Jim Fehlig 

Regards,
Jim



diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index b49ca83c10..6336c87746 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -1260,7 +1260,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver,
   int restore_fd,
   uint32_t restore_ver LIBXL_DOMSTART_RESTORE_VER_ATTR)
  {
-libxl_domain_config d_config;
+g_autofree libxl_domain_config *d_config = NULL;
  g_autoptr(virDomainDef) def = NULL;
  virObjectEventPtr event = NULL;
  libxlSavefileHeader hdr;
@@ -1281,7 +1281,9 @@ libxlDomainStart(libxlDriverPrivatePtr driver,
  hostdev_flags |= VIR_HOSTDEV_SP_USB;
  #endif
  
-libxl_domain_config_init(_config);

+d_config = g_new0(libxl_domain_config, 1);
+
+libxl_domain_config_init(d_config);
  
  /* If there is a managed saved state restore it instead of starting

   * from scratch. The old state is removed once the restoring succeeded. */
@@ -1356,10 +1358,10 @@ libxlDomainStart(libxlDriverPrivatePtr driver,
  goto cleanup_dom;
  
  if (libxlBuildDomainConfig(driver->reservedGraphicsPorts, vm->def,

-   cfg, _config) < 0)
+   cfg, d_config) < 0)
  goto cleanup_dom;
  
-if (cfg->autoballoon && libxlDomainFreeMem(cfg->ctx, _config) < 0)

+if (cfg->autoballoon && libxlDomainFreeMem(cfg->ctx, d_config) < 0)
  goto cleanup_dom;
  
  if (virHostdevPrepareDomainDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_NAME,

@@ -1399,14 +1401,14 @@ libxlDomainStart(libxlDriverPrivatePtr driver,
  aop_console_how.for_callback = vm;
  aop_console_how.callback = libxlConsoleCallback;
  if (restore_fd < 0) {
-ret = libxl_domain_create_new(cfg->ctx, _config,
+ret = libxl_domain_create_new(cfg->ctx, d_config,
, NULL, _console_how);
  } else {
  libxl_domain_restore_params_init();
  #ifdef LIBXL_HAVE_SRM_V2
  params.stream_version = restore_ver;
  #endif
-ret = libxl_domain_create_restore(cfg->ctx, _config, ,
+ret = libxl_domain_create_restore(cfg->ctx, d_config, ,
restore_fd, , NULL,
_console_how);
  libxl_domain_restore_params_dispose();
@@ -1417,11 +1419,11 @@ libxlDomainStart(libxlDriverPrivatePtr driver,
  if (restore_fd < 0)
  virReportError(VIR_ERR_INTERNAL_ERROR,
 _("libxenlight failed to create new domain '%s'"),
-   d_config.c_info.name);
+   d_config->c_info.name);
  else
  virReportError(VIR_ERR_INTERNAL_ERROR,
 _("libxenlight failed to restore domain '%s'"),
-   d_config.c_info.name);
+   d_config->c_info.name);
  goto cleanup_dom;
  }
  
@@ -1430,7 +1432,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver,

   * be cleaned up if there are any subsequent failures.
   */
  vm->def->id = domid;
-config_json = libxl_domain_config_to_json(cfg->ctx, _config);
+config_json = libxl_domain_config_to_json(cfg->ctx, d_config);
  
  libxlLoggerOpenFile(cfg->logger, domid, vm->def->name, config_json);
  
@@ -1445,7 +1447,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver,

  if (libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, >deathW))
  goto destroy_dom;
  
-libxlDomainCreateIfaceNames(vm->def, _config);

+libxlDomainCreateIfaceNames(vm->def, d_config);
  libxlDomainUpdateDiskParams(vm->def, cfg->ctx);
  
  #ifdef LIBXL_HAVE_DEVICE_CHANNEL

@@ -1515,7 +1517,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver,
  libxlDomainCleanup(driver, vm);
  
   cleanup:

-libxl_domain_config_dispose(_config);
+libxl_domain_config_dispose(d_config);
  return ret;
  }
  

[libvirt PATCH 4/8] libxl: allocate d_config

[Ján Tomko]

clang reports:

  stack frame size of 2152 bytes in function 'libxlDomainStart'

This is mostly due to the d_config variable:

  sizeof(libxl_domain_config) = 1232

Use g_new0 to allocate it and bring the frame size down.

Signed-off-by: Ján Tomko 
---
 src/libxl/libxl_domain.c | 24 +---
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index b49ca83c10..6336c87746 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -1260,7 +1260,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver,
  int restore_fd,
  uint32_t restore_ver LIBXL_DOMSTART_RESTORE_VER_ATTR)
 {
-libxl_domain_config d_config;
+g_autofree libxl_domain_config *d_config = NULL;
 g_autoptr(virDomainDef) def = NULL;
 virObjectEventPtr event = NULL;
 libxlSavefileHeader hdr;
@@ -1281,7 +1281,9 @@ libxlDomainStart(libxlDriverPrivatePtr driver,
 hostdev_flags |= VIR_HOSTDEV_SP_USB;
 #endif
 
-libxl_domain_config_init(_config);
+d_config = g_new0(libxl_domain_config, 1);
+
+libxl_domain_config_init(d_config);
 
 /* If there is a managed saved state restore it instead of starting
  * from scratch. The old state is removed once the restoring succeeded. */
@@ -1356,10 +1358,10 @@ libxlDomainStart(libxlDriverPrivatePtr driver,
 goto cleanup_dom;
 
 if (libxlBuildDomainConfig(driver->reservedGraphicsPorts, vm->def,
-   cfg, _config) < 0)
+   cfg, d_config) < 0)
 goto cleanup_dom;
 
-if (cfg->autoballoon && libxlDomainFreeMem(cfg->ctx, _config) < 0)
+if (cfg->autoballoon && libxlDomainFreeMem(cfg->ctx, d_config) < 0)
 goto cleanup_dom;
 
 if (virHostdevPrepareDomainDevices(hostdev_mgr, LIBXL_DRIVER_INTERNAL_NAME,
@@ -1399,14 +1401,14 @@ libxlDomainStart(libxlDriverPrivatePtr driver,
 aop_console_how.for_callback = vm;
 aop_console_how.callback = libxlConsoleCallback;
 if (restore_fd < 0) {
-ret = libxl_domain_create_new(cfg->ctx, _config,
+ret = libxl_domain_create_new(cfg->ctx, d_config,
   , NULL, _console_how);
 } else {
 libxl_domain_restore_params_init();
 #ifdef LIBXL_HAVE_SRM_V2
 params.stream_version = restore_ver;
 #endif
-ret = libxl_domain_create_restore(cfg->ctx, _config, ,
+ret = libxl_domain_create_restore(cfg->ctx, d_config, ,
   restore_fd, , NULL,
   _console_how);
 libxl_domain_restore_params_dispose();
@@ -1417,11 +1419,11 @@ libxlDomainStart(libxlDriverPrivatePtr driver,
 if (restore_fd < 0)
 virReportError(VIR_ERR_INTERNAL_ERROR,
_("libxenlight failed to create new domain '%s'"),
-   d_config.c_info.name);
+   d_config->c_info.name);
 else
 virReportError(VIR_ERR_INTERNAL_ERROR,
_("libxenlight failed to restore domain '%s'"),
-   d_config.c_info.name);
+   d_config->c_info.name);
 goto cleanup_dom;
 }
 
@@ -1430,7 +1432,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver,
  * be cleaned up if there are any subsequent failures.
  */
 vm->def->id = domid;
-config_json = libxl_domain_config_to_json(cfg->ctx, _config);
+config_json = libxl_domain_config_to_json(cfg->ctx, d_config);
 
 libxlLoggerOpenFile(cfg->logger, domid, vm->def->name, config_json);
 
@@ -1445,7 +1447,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver,
 if (libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, >deathW))
 goto destroy_dom;
 
-libxlDomainCreateIfaceNames(vm->def, _config);
+libxlDomainCreateIfaceNames(vm->def, d_config);
 libxlDomainUpdateDiskParams(vm->def, cfg->ctx);
 
 #ifdef LIBXL_HAVE_DEVICE_CHANNEL
@@ -1515,7 +1517,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver,
 libxlDomainCleanup(driver, vm);
 
  cleanup:
-libxl_domain_config_dispose(_config);
+libxl_domain_config_dispose(d_config);
 return ret;
 }
 
-- 
2.26.2