mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-03 11:35:19 +00:00
Initialize couple of variables.
While trying to build with -Os couple of compile errors showed
up.
conf/domain_conf.c: In function 'virDomainChrRemove':
conf/domain_conf.c:13666:24: error: 'ret' may be used uninitialized in this function [-Werror=maybe-uninitialized]
virDomainChrDefPtr ret, **arrPtr = NULL;
^
Compiler fails to see that @ret is used only if set in the loop,
but whatever, there's no harm in initializing the variable.
In vboxAttachDrivesNew and _vboxAttachDrivesOld compiler thinks
that @rc may be used uninitialized. Well, not directly, but maybe
after some optimization. Yet again, no harm in initializing a
variable.
In file included from ./util/virthread.h:26:0,
from ./datatypes.h:28,
from vbox/vbox_tmpl.c:43,
from vbox/vbox_V3_1.c:37:
vbox/vbox_tmpl.c: In function '_vboxAttachDrivesOld':
./util/virerror.h:181:5: error: 'rc' may be used uninitialized in this function [-Werror=maybe-uninitialized]
virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \
^
In file included from vbox/vbox_V3_1.c:37:0:
vbox/vbox_tmpl.c:1041:14: note: 'rc' was declared here
nsresult rc;
^
Yet again, one uninitialized variable:
qemu/qemu_driver.c: In function 'qemuDomainBlockCommit':
qemu/qemu_driver.c:17194:9: error: 'baseSource' may be used uninitialized in this function [-Werror=maybe-uninitialized]
qemuDomainPrepareDiskChainElement(driver, vm, baseSource,
^
And another one:
storage/storage_backend_logical.c: In function 'virStorageBackendLogicalMatchPoolSource.isra.2':
storage/storage_backend_logical.c:618:33: error: 'thisSource' may be used uninitialized in this function [-Werror=maybe-uninitialized]
thisSource->devices[j].path))
^
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
(cherry picked from commit bde6e002b5
)
This commit is contained in:
parent
e33e7139f0
commit
d02edccb73
@ -13485,7 +13485,7 @@ virDomainChrDefPtr
|
|||||||
virDomainChrRemove(virDomainDefPtr vmdef,
|
virDomainChrRemove(virDomainDefPtr vmdef,
|
||||||
virDomainChrDefPtr chr)
|
virDomainChrDefPtr chr)
|
||||||
{
|
{
|
||||||
virDomainChrDefPtr ret, **arrPtr = NULL;
|
virDomainChrDefPtr ret = NULL, **arrPtr = NULL;
|
||||||
size_t i, *cntPtr = NULL;
|
size_t i, *cntPtr = NULL;
|
||||||
|
|
||||||
virDomainChrGetDomainPtrsInternal(vmdef, chr->deviceType, &arrPtr, &cntPtr);
|
virDomainChrGetDomainPtrsInternal(vmdef, chr->deviceType, &arrPtr, &cntPtr);
|
||||||
|
@ -17017,7 +17017,7 @@ qemuDomainBlockCommit(virDomainPtr dom,
|
|||||||
virDomainDiskDefPtr disk = NULL;
|
virDomainDiskDefPtr disk = NULL;
|
||||||
virStorageSourcePtr topSource;
|
virStorageSourcePtr topSource;
|
||||||
unsigned int topIndex = 0;
|
unsigned int topIndex = 0;
|
||||||
virStorageSourcePtr baseSource;
|
virStorageSourcePtr baseSource = NULL;
|
||||||
unsigned int baseIndex = 0;
|
unsigned int baseIndex = 0;
|
||||||
virStorageSourcePtr top_parent = NULL;
|
virStorageSourcePtr top_parent = NULL;
|
||||||
bool clean_access = false;
|
bool clean_access = false;
|
||||||
|
@ -984,7 +984,7 @@ vboxAttachDrivesNew(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine
|
|||||||
{
|
{
|
||||||
/* AttachDrives for 3.0 and later */
|
/* AttachDrives for 3.0 and later */
|
||||||
size_t i;
|
size_t i;
|
||||||
nsresult rc;
|
nsresult rc = 0;
|
||||||
PRUint32 maxPortPerInst[StorageBus_Floppy + 1] = {};
|
PRUint32 maxPortPerInst[StorageBus_Floppy + 1] = {};
|
||||||
PRUint32 maxSlotPerPort[StorageBus_Floppy + 1] = {};
|
PRUint32 maxSlotPerPort[StorageBus_Floppy + 1] = {};
|
||||||
PRUnichar *storageCtlName = NULL;
|
PRUnichar *storageCtlName = NULL;
|
||||||
|
@ -1037,7 +1037,7 @@ static void
|
|||||||
_vboxAttachDrivesOld(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
|
_vboxAttachDrivesOld(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
|
||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
nsresult rc;
|
nsresult rc = 0;
|
||||||
|
|
||||||
PRUint32 maxPortPerInst[StorageBus_Floppy + 1] = {};
|
PRUint32 maxPortPerInst[StorageBus_Floppy + 1] = {};
|
||||||
PRUint32 maxSlotPerPort[StorageBus_Floppy + 1] = {};
|
PRUint32 maxSlotPerPort[StorageBus_Floppy + 1] = {};
|
||||||
|
Loading…
Reference in New Issue
Block a user