External/libvirt
1
0
Fork 0
Code

vbox: Drop code supporting old VBox version

Browse Source 
Now that only supported version of VirtualBox is 7.0.x the code
that supports older versions can be dropped.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Michal Privoznik 2024-09-27 09:04:17 +02:00
parent 335bceb115
commit da9a804f4e
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/vbox/vbox_tmpl.c
View File

@ -604,11 +604,7 @@ _virtualboxGetMachine(IVirtualBox *vboxObj, vboxIID *iid, IMachine **machine)
static nsresult static nsresult
_virtualboxOpenMachine(IVirtualBox *vboxObj, PRUnichar *settingsFile, IMachine **machine) _virtualboxOpenMachine(IVirtualBox *vboxObj, PRUnichar *settingsFile, IMachine **machine)
{ {
#if VBOX_API_VERSION >= 7000000
return vboxObj->vtbl->OpenMachine(vboxObj, settingsFile, NULL, machine); return vboxObj->vtbl->OpenMachine(vboxObj, settingsFile, NULL, machine);
#else
return vboxObj->vtbl->OpenMachine(vboxObj, settingsFile, machine);
#endif
} }
static nsresult static nsresult
@ -636,7 +632,6 @@ _virtualboxCreateMachine(struct _vboxDriver *data, virDomainDef *def, IMachine *
vboxIIDFromUUID(&iid, def->uuid); vboxIIDFromUUID(&iid, def->uuid);
createFlags = g_strdup_printf("UUID=%s,forceOverwrite=0", uuidstr); createFlags = g_strdup_printf("UUID=%s,forceOverwrite=0", uuidstr);
VBOX_UTF8_TO_UTF16(createFlags, &createFlagsUtf16); VBOX_UTF8_TO_UTF16(createFlags, &createFlagsUtf16);
#if VBOX_API_VERSION >= 7000000
rc = data->vboxObj->vtbl->CreateMachine(data->vboxObj, rc = data->vboxObj->vtbl->CreateMachine(data->vboxObj,
NULL, NULL,
machineNameUtf16, machineNameUtf16,
@ -648,16 +643,6 @@ _virtualboxCreateMachine(struct _vboxDriver *data, virDomainDef *def, IMachine *
NULL, NULL,
NULL, NULL,
machine); machine);
#else
rc = data->vboxObj->vtbl->CreateMachine(data->vboxObj,
NULL,
machineNameUtf16,
0,
nsnull,
nsnull,
createFlagsUtf16,
machine);
#endif
VIR_FREE(createFlags); VIR_FREE(createFlags);
VBOX_UTF16_FREE(machineNameUtf16); VBOX_UTF16_FREE(machineNameUtf16);
VBOX_UTF16_FREE(createFlagsUtf16); VBOX_UTF16_FREE(createFlagsUtf16);
@ -840,7 +825,6 @@ _machineGetBIOSSettings(IMachine *machine, IBIOSSettings **bios)
static nsresult static nsresult
_machineGetAudioAdapter(IMachine *machine, IAudioAdapter **audioadapter) _machineGetAudioAdapter(IMachine *machine, IAudioAdapter **audioadapter)
{ {
#if VBOX_API_VERSION >= 7000000
IAudioSettings *audioSettings = NULL; IAudioSettings *audioSettings = NULL;
nsresult rc; nsresult rc;
@ -848,9 +832,6 @@ _machineGetAudioAdapter(IMachine *machine, IAudioAdapter **audioadapter)
if (NS_FAILED(rc)) if (NS_FAILED(rc))
return rc; return rc;
return audioSettings->vtbl->GetAdapter(audioSettings, audioadapter); return audioSettings->vtbl->GetAdapter(audioSettings, audioadapter);
#else
return machine->vtbl->GetAudioAdapter(machine, audioadapter);
#endif
} }
static nsresult static nsresult