External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 01:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

libxl: initialize device structures

Browse Source 
Do not leave uninitialized variables, not all parameters are set in
libxlMake*.

Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
This commit is contained in:
Marek Marczykowski-Górecki 2013-06-13 03:54:10 +02:00 committed by Jim Fehlig
parent 7ed47d16dd
commit c3358d14d9
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libxl/libxl_conf.c
View File

@ -452,6 +452,8 @@ error:
int int
libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk)
{ {
libxl_device_disk_init(x_disk);
if (VIR_STRDUP(x_disk->pdev_path, l_disk->src) < 0) if (VIR_STRDUP(x_disk->pdev_path, l_disk->src) < 0)
return -1; return -1;
@ -559,6 +561,8 @@ libxlMakeNic(virDomainNetDefPtr l_nic, libxl_device_nic *x_nic)
* x_nics[i].mtu = 1492; * x_nics[i].mtu = 1492;
*/ */
libxl_device_nic_init(x_nic);
virMacAddrGetRaw(&l_nic->mac, x_nic->mac); virMacAddrGetRaw(&l_nic->mac, x_nic->mac);
if (l_nic->model && !STREQ(l_nic->model, "netfront")) { if (l_nic->model && !STREQ(l_nic->model, "netfront")) {
@ -631,6 +635,8 @@ libxlMakeVfb(libxlDriverPrivatePtr driver,
unsigned short port; unsigned short port;
const char *listenAddr; const char *listenAddr;
libxl_device_vfb_init(x_vfb);
switch (l_vfb->type) { switch (l_vfb->type) {
case VIR_DOMAIN_GRAPHICS_TYPE_SDL: case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
libxl_defbool_set(&x_vfb->sdl.enable, 1); libxl_defbool_set(&x_vfb->sdl.enable, 1);
@ -696,7 +702,6 @@ libxlMakeVfbList(libxlDriverPrivatePtr driver,
} }
for (i = 0; i < nvfbs; i++) { for (i = 0; i < nvfbs; i++) {
libxl_device_vfb_init(&x_vfbs[i]);
libxl_device_vkb_init(&x_vkbs[i]); libxl_device_vkb_init(&x_vkbs[i]);
if (libxlMakeVfb(driver, l_vfbs[i], &x_vfbs[i]) < 0) if (libxlMakeVfb(driver, l_vfbs[i], &x_vfbs[i]) < 0)
@ -757,6 +762,7 @@ int
libxlBuildDomainConfig(libxlDriverPrivatePtr driver, libxlBuildDomainConfig(libxlDriverPrivatePtr driver,
virDomainDefPtr def, libxl_domain_config *d_config) virDomainDefPtr def, libxl_domain_config *d_config)
{ {
libxl_domain_config_init(d_config);
if (libxlMakeDomCreateInfo(driver, def, &d_config->c_info) < 0) if (libxlMakeDomCreateInfo(driver, def, &d_config->c_info) < 0)
return -1; return -1;