NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix gcc 4.6 warnings in vbox_tmpl.c

Browse Source
This commit is contained in:
Christophe Fergeau 2011-04-14 14:10:36 +02:00 committed by Matthias Bolte
parent 454e50beee
commit c59f3d8de4
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/vbox/vbox_tmpl.c
View File

@ -3915,7 +3915,9 @@ vboxAttachDrives(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
PRUnichar *mediumFileUtf16 = NULL; PRUnichar *mediumFileUtf16 = NULL;
PRUint32 storageBus = StorageBus_Null; PRUint32 storageBus = StorageBus_Null;
PRUint32 deviceType = DeviceType_Null; PRUint32 deviceType = DeviceType_Null;
# if VBOX_API_VERSION >= 4000
PRUint32 accessMode = AccessMode_ReadOnly; PRUint32 accessMode = AccessMode_ReadOnly;
# endif
PRInt32 deviceInst = 0; PRInt32 deviceInst = 0;
PRInt32 devicePort = 0; PRInt32 devicePort = 0;
PRInt32 deviceSlot = 0; PRInt32 deviceSlot = 0;
@ -3924,24 +3926,27 @@ vboxAttachDrives(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK) { if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK) {
deviceType = DeviceType_HardDisk; deviceType = DeviceType_HardDisk;
accessMode = AccessMode_ReadWrite;
# if VBOX_API_VERSION < 4000 # if VBOX_API_VERSION < 4000
data->vboxObj->vtbl->FindHardDisk(data->vboxObj, data->vboxObj->vtbl->FindHardDisk(data->vboxObj,
mediumFileUtf16, &medium); mediumFileUtf16, &medium);
# else
accessMode = AccessMode_ReadWrite;
# endif # endif
} else if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { } else if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM) {
deviceType = DeviceType_DVD; deviceType = DeviceType_DVD;
accessMode = AccessMode_ReadOnly;
# if VBOX_API_VERSION < 4000 # if VBOX_API_VERSION < 4000
data->vboxObj->vtbl->FindDVDImage(data->vboxObj, data->vboxObj->vtbl->FindDVDImage(data->vboxObj,
mediumFileUtf16, &medium); mediumFileUtf16, &medium);
# else
accessMode = AccessMode_ReadOnly;
# endif # endif
} else if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) { } else if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) {
deviceType = DeviceType_Floppy; deviceType = DeviceType_Floppy;
accessMode = AccessMode_ReadWrite;
# if VBOX_API_VERSION < 4000 # if VBOX_API_VERSION < 4000
data->vboxObj->vtbl->FindFloppyImage(data->vboxObj, data->vboxObj->vtbl->FindFloppyImage(data->vboxObj,
mediumFileUtf16, &medium); mediumFileUtf16, &medium);
# else
accessMode = AccessMode_ReadWrite;
# endif # endif
} else { } else {
VBOX_UTF16_FREE(mediumFileUtf16); VBOX_UTF16_FREE(mediumFileUtf16);