mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 17:34:18 +03:00
vbox: Drop support for virtualbox-5.2.0
According to VirtualBox download page [1], the 5.2.0 release is no longer supported (the support ended 2020/07). Drop it from Libvirt too. 1: https://www.virtualbox.org/wiki/Download_Old_Builds Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
parent
8a96d7b363
commit
445549af07
@ -4,7 +4,7 @@
|
||||
VirtualBox hypervisor driver
|
||||
============================
|
||||
|
||||
The libvirt VirtualBox driver can manage any VirtualBox version from version 4.0
|
||||
The libvirt VirtualBox driver can manage any VirtualBox version from version 6.0
|
||||
onwards ( :since:`since libvirt 3.0.0` ).
|
||||
|
||||
Project Links
|
||||
|
@ -1,5 +1,4 @@
|
||||
vbox_driver_sources = [
|
||||
'vbox_V5_2.c',
|
||||
'vbox_V6_0.c',
|
||||
'vbox_V6_1.c',
|
||||
'vbox_common.c',
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,13 +0,0 @@
|
||||
/** @file vbox_V5_2.c
|
||||
* C file to include support for multiple versions of VirtualBox
|
||||
* at runtime.
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
/** The API Version */
|
||||
#define VBOX_API_VERSION 5002000
|
||||
/** Version specific prefix. */
|
||||
#define NAME(name) vbox52##name
|
||||
|
||||
#include "vbox_tmpl.c"
|
@ -30,7 +30,7 @@
|
||||
# define ___VBoxXPCOMC_cglue_h
|
||||
|
||||
/* This has to be the oldest version we support. */
|
||||
# include "vbox_CAPI_v5_2.h"
|
||||
# include "vbox_CAPI_v6_0.h"
|
||||
|
||||
/** Pointer to VBoxGetXPCOMCFunctions for the loaded VBoxXPCOMC so/dylib/dll. */
|
||||
extern PFNVBOXGETXPCOMCFUNCTIONS g_pfnGetFunctions;
|
||||
|
@ -440,9 +440,7 @@ typedef nsISupports IKeyboard;
|
||||
#define installUniformedAPI(gVBoxAPI, result) \
|
||||
do { \
|
||||
result = 0; \
|
||||
if (uVersion >= 5001051 && uVersion < 5002051) { \
|
||||
vbox52InstallUniformedAPI(&gVBoxAPI); \
|
||||
} else if (uVersion >= 6000000 && uVersion < 6000051) { \
|
||||
if (uVersion >= 6000000 && uVersion < 6000051) { \
|
||||
vbox60InstallUniformedAPI(&gVBoxAPI); \
|
||||
} else if (uVersion >= 6000051 && uVersion < 6001051) { \
|
||||
vbox61InstallUniformedAPI(&gVBoxAPI); \
|
||||
|
@ -881,9 +881,7 @@ virStorageDriver *vboxGetStorageDriver(uint32_t uVersion)
|
||||
/* Install gVBoxAPI according to the vbox API version.
|
||||
* Return -1 for unsupported version.
|
||||
*/
|
||||
if (uVersion >= 5001051 && uVersion < 5002051) {
|
||||
vbox52InstallUniformedAPI(&gVBoxAPI);
|
||||
} else if (uVersion >= 6000000 && uVersion < 6000051) {
|
||||
if (uVersion >= 6000000 && uVersion < 6000051) {
|
||||
vbox60InstallUniformedAPI(&gVBoxAPI);
|
||||
} else if (uVersion >= 6000051 && uVersion < 6001051) {
|
||||
vbox61InstallUniformedAPI(&gVBoxAPI);
|
||||
|
@ -44,9 +44,7 @@
|
||||
#include "virstring.h"
|
||||
|
||||
/* This one changes from version to version. */
|
||||
#if VBOX_API_VERSION == 5002000
|
||||
# include "vbox_CAPI_v5_2.h"
|
||||
#elif VBOX_API_VERSION == 6000000
|
||||
#if VBOX_API_VERSION == 6000000
|
||||
# include "vbox_CAPI_v6_0.h"
|
||||
#elif VBOX_API_VERSION == 6001000
|
||||
# include "vbox_CAPI_v6_1.h"
|
||||
@ -729,13 +727,8 @@ _machineCreateSharedFolder(IMachine *machine, PRUnichar *name,
|
||||
PRUnichar *hostPath, PRBool writable,
|
||||
PRBool automount)
|
||||
{
|
||||
#if VBOX_API_VERSION >= 6000000
|
||||
return machine->vtbl->CreateSharedFolder(machine, name, hostPath,
|
||||
writable, automount, NULL);
|
||||
#else
|
||||
return machine->vtbl->CreateSharedFolder(machine, name, hostPath,
|
||||
writable, automount);
|
||||
#endif
|
||||
}
|
||||
|
||||
static nsresult
|
||||
|
@ -550,6 +550,5 @@ virDomainPtr vboxDomainLookupByUUID(virConnectPtr conn,
|
||||
const unsigned char *uuid);
|
||||
|
||||
/* Version specified functions for installing uniformed API */
|
||||
void vbox52InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
|
||||
void vbox60InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
|
||||
void vbox61InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);
|
||||
|
Loading…
Reference in New Issue
Block a user