Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt

体验新版 GitCode，发现更多精彩内容 >>

提交 5a5c6de3 编写于 作者: D Dawid Zamirski 提交者： John Ferlan
浏览文件
操作

vbox: IVRDxServer to IVRDEServer. 

The IVRDxServer was used because vbox < 4 used to have IVRDPServer
whereas vbox >= 4 has IVRDEServer. Now that support for legacy
versions is being removed, we can use IVRDEServer.
上级 f2f70c21
显示空白变更内容
内联 并排
Showing with 72 addition and 74 deletion
src/vbox/vbox_common.c
浏览文件 @ 5a5c6de3
...@@ -1586,27 +1586,27 @@ vboxAttachDisplay(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine) ...@@ -1586,27 +1586,27 @@ vboxAttachDisplay(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine)
virDomainGraphicsListenDefPtr glisten; virDomainGraphicsListenDefPtr glisten;
for (i = 0; i < def->ngraphics; i++) { for (i = 0; i < def->ngraphics; i++) {
IVRDxServer *VRDxServer = NULL; IVRDEServer *VRDEServer = NULL;
if ((def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_RDP) && if ((def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_RDP) &&
(vrdpPresent == 0)) { (vrdpPresent == 0)) {
vrdpPresent = 1; vrdpPresent = 1;
gVBoxAPI.UIMachine.GetVRDxServer(machine, &VRDxServer); gVBoxAPI.UIMachine.GetVRDEServer(machine, &VRDEServer);
if (VRDxServer) { if (VRDEServer) {
gVBoxAPI.UIVRDxServer.SetEnabled(VRDxServer, PR_TRUE); gVBoxAPI.UIVRDEServer.SetEnabled(VRDEServer, PR_TRUE);
VIR_DEBUG("VRDP Support turned ON."); VIR_DEBUG("VRDP Support turned ON.");
gVBoxAPI.UIVRDxServer.SetPorts(data, VRDxServer, def->graphics[i]); gVBoxAPI.UIVRDEServer.SetPorts(data, VRDEServer, def->graphics[i]);
if (def->graphics[i]->data.rdp.replaceUser) { if (def->graphics[i]->data.rdp.replaceUser) {
gVBoxAPI.UIVRDxServer.SetReuseSingleConnection(VRDxServer, gVBoxAPI.UIVRDEServer.SetReuseSingleConnection(VRDEServer,
PR_TRUE); PR_TRUE);
VIR_DEBUG("VRDP set to reuse single connection"); VIR_DEBUG("VRDP set to reuse single connection");
} }
if (def->graphics[i]->data.rdp.multiUser) { if (def->graphics[i]->data.rdp.multiUser) {
gVBoxAPI.UIVRDxServer.SetAllowMultiConnection(VRDxServer, gVBoxAPI.UIVRDEServer.SetAllowMultiConnection(VRDEServer,
PR_TRUE); PR_TRUE);
VIR_DEBUG("VRDP set to allow multiple connection"); VIR_DEBUG("VRDP set to allow multiple connection");
} }
...@@ -1616,7 +1616,7 @@ vboxAttachDisplay(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine) ...@@ -1616,7 +1616,7 @@ vboxAttachDisplay(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine)
PRUnichar *netAddressUtf16 = NULL; PRUnichar *netAddressUtf16 = NULL;
VBOX_UTF8_TO_UTF16(glisten->address, &netAddressUtf16); VBOX_UTF8_TO_UTF16(glisten->address, &netAddressUtf16);
gVBoxAPI.UIVRDxServer.SetNetAddress(data, VRDxServer, gVBoxAPI.UIVRDEServer.SetNetAddress(data, VRDEServer,
netAddressUtf16); netAddressUtf16);
VIR_DEBUG("VRDP listen address is set to: %s", VIR_DEBUG("VRDP listen address is set to: %s",
glisten->address); glisten->address);
...@@ -1624,7 +1624,7 @@ vboxAttachDisplay(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine) ...@@ -1624,7 +1624,7 @@ vboxAttachDisplay(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine)
VBOX_UTF16_FREE(netAddressUtf16); VBOX_UTF16_FREE(netAddressUtf16);
} }
VBOX_RELEASE(VRDxServer); VBOX_RELEASE(VRDEServer);
} }
} }
...@@ -3263,7 +3263,7 @@ vboxDumpDisplay(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine) ...@@ -3263,7 +3263,7 @@ vboxDumpDisplay(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine)
PRUnichar *valueTypeUtf16 = NULL; PRUnichar *valueTypeUtf16 = NULL;
char *valueTypeUtf8 = NULL; char *valueTypeUtf8 = NULL;
char *netAddressUtf8 = NULL; char *netAddressUtf8 = NULL;
IVRDxServer *VRDxServer = NULL; IVRDEServer *VRDEServer = NULL;
PRBool VRDxEnabled = PR_FALSE; PRBool VRDxEnabled = PR_FALSE;
virDomainGraphicsDefPtr graphics = NULL; virDomainGraphicsDefPtr graphics = NULL;
int ret = -1; int ret = -1;
...@@ -3325,9 +3325,9 @@ vboxDumpDisplay(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine) ...@@ -3325,9 +3325,9 @@ vboxDumpDisplay(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine)
VIR_APPEND_ELEMENT(def->graphics, def->ngraphics, graphics) < 0) VIR_APPEND_ELEMENT(def->graphics, def->ngraphics, graphics) < 0)
goto cleanup; goto cleanup;
gVBoxAPI.UIMachine.GetVRDxServer(machine, &VRDxServer); gVBoxAPI.UIMachine.GetVRDEServer(machine, &VRDEServer);
if (VRDxServer) if (VRDEServer)
gVBoxAPI.UIVRDxServer.GetEnabled(VRDxServer, &VRDxEnabled); gVBoxAPI.UIVRDEServer.GetEnabled(VRDEServer, &VRDxEnabled);
if (VRDxEnabled) { if (VRDxEnabled) {
PRUnichar *netAddressUtf16 = NULL; PRUnichar *netAddressUtf16 = NULL;
...@@ -3337,11 +3337,11 @@ vboxDumpDisplay(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine) ...@@ -3337,11 +3337,11 @@ vboxDumpDisplay(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine)
if (VIR_ALLOC(graphics) < 0) if (VIR_ALLOC(graphics) < 0)
goto cleanup; goto cleanup;
gVBoxAPI.UIVRDxServer.GetPorts(data, VRDxServer, graphics); gVBoxAPI.UIVRDEServer.GetPorts(data, VRDEServer, graphics);
graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_RDP; graphics->type = VIR_DOMAIN_GRAPHICS_TYPE_RDP;
gVBoxAPI.UIVRDxServer.GetNetAddress(data, VRDxServer, &netAddressUtf16); gVBoxAPI.UIVRDEServer.GetNetAddress(data, VRDEServer, &netAddressUtf16);
if (netAddressUtf16) { if (netAddressUtf16) {
VBOX_UTF16_TO_UTF8(netAddressUtf16, &netAddressUtf8); VBOX_UTF16_TO_UTF8(netAddressUtf16, &netAddressUtf8);
VBOX_UTF16_FREE(netAddressUtf16); VBOX_UTF16_FREE(netAddressUtf16);
...@@ -3353,11 +3353,11 @@ vboxDumpDisplay(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine) ...@@ -3353,11 +3353,11 @@ vboxDumpDisplay(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine)
if (virDomainGraphicsListenAppendAddress(graphics, netAddressUtf8) < 0) if (virDomainGraphicsListenAppendAddress(graphics, netAddressUtf8) < 0)
goto cleanup; goto cleanup;
gVBoxAPI.UIVRDxServer.GetAllowMultiConnection(VRDxServer, &allowMultiConnection); gVBoxAPI.UIVRDEServer.GetAllowMultiConnection(VRDEServer, &allowMultiConnection);
if (allowMultiConnection) if (allowMultiConnection)
graphics->data.rdp.multiUser = true; graphics->data.rdp.multiUser = true;
gVBoxAPI.UIVRDxServer.GetReuseSingleConnection(VRDxServer, &reuseSingleConnection); gVBoxAPI.UIVRDEServer.GetReuseSingleConnection(VRDEServer, &reuseSingleConnection);
if (reuseSingleConnection) if (reuseSingleConnection)
graphics->data.rdp.replaceUser = true; graphics->data.rdp.replaceUser = true;
...@@ -3368,7 +3368,7 @@ vboxDumpDisplay(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine) ...@@ -3368,7 +3368,7 @@ vboxDumpDisplay(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine)
ret = 0; ret = 0;
cleanup: cleanup:
VBOX_RELEASE(VRDxServer); VBOX_RELEASE(VRDEServer);
VBOX_UTF8_FREE(valueTypeUtf8); VBOX_UTF8_FREE(valueTypeUtf8);
VBOX_UTF8_FREE(netAddressUtf8); VBOX_UTF8_FREE(netAddressUtf8);
virDomainGraphicsDefFree(graphics); virDomainGraphicsDefFree(graphics);
......
src/vbox/vbox_common.h
浏览文件 @ 5a5c6de3
...@@ -328,7 +328,7 @@ typedef nsISupports IAudioAdapter; ...@@ -328,7 +328,7 @@ typedef nsISupports IAudioAdapter;
typedef nsISupports INetworkAdapter; typedef nsISupports INetworkAdapter;
typedef nsISupports ISerialPort; typedef nsISupports ISerialPort;
typedef nsISupports IParallelPort; typedef nsISupports IParallelPort;
typedef nsISupports IVRDxServer; typedef nsISupports IVRDEServer;
typedef nsISupports IUSBCommon; typedef nsISupports IUSBCommon;
typedef nsISupports IUSBDeviceFilter; typedef nsISupports IUSBDeviceFilter;
typedef nsISupports IMedium; typedef nsISupports IMedium;
......
src/vbox/vbox_tmpl.c
浏览文件 @ 5a5c6de3
...@@ -72,8 +72,6 @@ ...@@ -72,8 +72,6 @@
/* Include this *last* or we'll get the wrong vbox_CAPI_*.h. */ /* Include this *last* or we'll get the wrong vbox_CAPI_*.h. */
#include "vbox_glue.h" #include "vbox_glue.h"
typedef IVRDEServer IVRDxServer;
#if VBOX_API_VERSION < 4003000 #if VBOX_API_VERSION < 4003000
typedef IUSBController IUSBCommon; typedef IUSBController IUSBCommon;
#else /* VBOX_API_VERSION >= 4003000 */ #else /* VBOX_API_VERSION >= 4003000 */
...@@ -919,9 +917,9 @@ _machineGetParallelPort(IMachine *machine, PRUint32 slot, IParallelPort **port) ...@@ -919,9 +917,9 @@ _machineGetParallelPort(IMachine *machine, PRUint32 slot, IParallelPort **port)
} }
static nsresult static nsresult
_machineGetVRDxServer(IMachine *machine, IVRDxServer **VRDxServer) _machineGetVRDEServer(IMachine *machine, IVRDEServer **VRDEServer)
{ {
return machine->vtbl->GetVRDEServer(machine, VRDxServer); return machine->vtbl->GetVRDEServer(machine, VRDEServer);
} }
static nsresult static nsresult
...@@ -1607,27 +1605,27 @@ _parallelPortSetIOBase(IParallelPort *port, PRUint32 IOBase) ...@@ -1607,27 +1605,27 @@ _parallelPortSetIOBase(IParallelPort *port, PRUint32 IOBase)
} }
static nsresult static nsresult
_vrdxServerGetEnabled(IVRDxServer *VRDxServer, PRBool *enabled) _vrdeServerGetEnabled(IVRDEServer *VRDEServer, PRBool *enabled)
{ {
return VRDxServer->vtbl->GetEnabled(VRDxServer, enabled); return VRDEServer->vtbl->GetEnabled(VRDEServer, enabled);
} }
static nsresult static nsresult
_vrdxServerSetEnabled(IVRDxServer *VRDxServer, PRBool enabled) _vrdeServerSetEnabled(IVRDEServer *VRDEServer, PRBool enabled)
{ {
return VRDxServer->vtbl->SetEnabled(VRDxServer, enabled); return VRDEServer->vtbl->SetEnabled(VRDEServer, enabled);
} }
static nsresult static nsresult
_vrdxServerGetPorts(vboxDriverPtr data ATTRIBUTE_UNUSED, _vrdeServerGetPorts(vboxDriverPtr data ATTRIBUTE_UNUSED,
IVRDxServer *VRDxServer, virDomainGraphicsDefPtr graphics) IVRDEServer *VRDEServer, virDomainGraphicsDefPtr graphics)
{ {
nsresult rc; nsresult rc;
PRUnichar *VRDEPortsKey = NULL; PRUnichar *VRDEPortsKey = NULL;
PRUnichar *VRDEPortsValue = NULL; PRUnichar *VRDEPortsValue = NULL;
VBOX_UTF8_TO_UTF16("TCP/Ports", &VRDEPortsKey); VBOX_UTF8_TO_UTF16("TCP/Ports", &VRDEPortsKey);
rc = VRDxServer->vtbl->GetVRDEProperty(VRDxServer, VRDEPortsKey, &VRDEPortsValue); rc = VRDEServer->vtbl->GetVRDEProperty(VRDEServer, VRDEPortsKey, &VRDEPortsValue);
VBOX_UTF16_FREE(VRDEPortsKey); VBOX_UTF16_FREE(VRDEPortsKey);
if (VRDEPortsValue) { if (VRDEPortsValue) {
/* even if vbox supports mutilpe ports, single port for now here */ /* even if vbox supports mutilpe ports, single port for now here */
...@@ -1641,8 +1639,8 @@ _vrdxServerGetPorts(vboxDriverPtr data ATTRIBUTE_UNUSED, ...@@ -1641,8 +1639,8 @@ _vrdxServerGetPorts(vboxDriverPtr data ATTRIBUTE_UNUSED,
} }
static nsresult static nsresult
_vrdxServerSetPorts(vboxDriverPtr data ATTRIBUTE_UNUSED, _vrdeServerSetPorts(vboxDriverPtr data ATTRIBUTE_UNUSED,
IVRDxServer *VRDxServer, virDomainGraphicsDefPtr graphics) IVRDEServer *VRDEServer, virDomainGraphicsDefPtr graphics)
{ {
nsresult rc = 0; nsresult rc = 0;
PRUnichar *VRDEPortsKey = NULL; PRUnichar *VRDEPortsKey = NULL;
...@@ -1650,7 +1648,7 @@ _vrdxServerSetPorts(vboxDriverPtr data ATTRIBUTE_UNUSED, ...@@ -1650,7 +1648,7 @@ _vrdxServerSetPorts(vboxDriverPtr data ATTRIBUTE_UNUSED,
VBOX_UTF8_TO_UTF16("TCP/Ports", &VRDEPortsKey); VBOX_UTF8_TO_UTF16("TCP/Ports", &VRDEPortsKey);
VRDEPortsValue = PRUnicharFromInt(data->pFuncs, graphics->data.rdp.port); VRDEPortsValue = PRUnicharFromInt(data->pFuncs, graphics->data.rdp.port);
rc = VRDxServer->vtbl->SetVRDEProperty(VRDxServer, VRDEPortsKey, rc = VRDEServer->vtbl->SetVRDEProperty(VRDEServer, VRDEPortsKey,
VRDEPortsValue); VRDEPortsValue);
VBOX_UTF16_FREE(VRDEPortsKey); VBOX_UTF16_FREE(VRDEPortsKey);
VBOX_UTF16_FREE(VRDEPortsValue); VBOX_UTF16_FREE(VRDEPortsValue);
...@@ -1659,52 +1657,52 @@ _vrdxServerSetPorts(vboxDriverPtr data ATTRIBUTE_UNUSED, ...@@ -1659,52 +1657,52 @@ _vrdxServerSetPorts(vboxDriverPtr data ATTRIBUTE_UNUSED,
} }
static nsresult static nsresult
_vrdxServerGetReuseSingleConnection(IVRDxServer *VRDxServer, PRBool *enabled) _vrdeServerGetReuseSingleConnection(IVRDEServer *VRDEServer, PRBool *enabled)
{ {
return VRDxServer->vtbl->GetReuseSingleConnection(VRDxServer, enabled); return VRDEServer->vtbl->GetReuseSingleConnection(VRDEServer, enabled);
} }
static nsresult static nsresult
_vrdxServerSetReuseSingleConnection(IVRDxServer *VRDxServer, PRBool enabled) _vrdeServerSetReuseSingleConnection(IVRDEServer *VRDEServer, PRBool enabled)
{ {
return VRDxServer->vtbl->SetReuseSingleConnection(VRDxServer, enabled); return VRDEServer->vtbl->SetReuseSingleConnection(VRDEServer, enabled);
} }
static nsresult static nsresult
_vrdxServerGetAllowMultiConnection(IVRDxServer *VRDxServer, PRBool *enabled) _vrdeServerGetAllowMultiConnection(IVRDEServer *VRDEServer, PRBool *enabled)
{ {
return VRDxServer->vtbl->GetAllowMultiConnection(VRDxServer, enabled); return VRDEServer->vtbl->GetAllowMultiConnection(VRDEServer, enabled);
} }
static nsresult static nsresult
_vrdxServerSetAllowMultiConnection(IVRDxServer *VRDxServer, PRBool enabled) _vrdeServerSetAllowMultiConnection(IVRDEServer *VRDEServer, PRBool enabled)
{ {
return VRDxServer->vtbl->SetAllowMultiConnection(VRDxServer, enabled); return VRDEServer->vtbl->SetAllowMultiConnection(VRDEServer, enabled);
} }
static nsresult static nsresult
_vrdxServerGetNetAddress(vboxDriverPtr data ATTRIBUTE_UNUSED, _vrdeServerGetNetAddress(vboxDriverPtr data ATTRIBUTE_UNUSED,
IVRDxServer *VRDxServer, PRUnichar **netAddress) IVRDEServer *VRDEServer, PRUnichar **netAddress)
{ {
PRUnichar *VRDENetAddressKey = NULL; PRUnichar *VRDENetAddressKey = NULL;
nsresult rc; nsresult rc;
VBOX_UTF8_TO_UTF16("TCP/Address", &VRDENetAddressKey); VBOX_UTF8_TO_UTF16("TCP/Address", &VRDENetAddressKey);
rc = VRDxServer->vtbl->GetVRDEProperty(VRDxServer, VRDENetAddressKey, netAddress); rc = VRDEServer->vtbl->GetVRDEProperty(VRDEServer, VRDENetAddressKey, netAddress);
VBOX_UTF16_FREE(VRDENetAddressKey); VBOX_UTF16_FREE(VRDENetAddressKey);
return rc; return rc;
} }
static nsresult static nsresult
_vrdxServerSetNetAddress(vboxDriverPtr data ATTRIBUTE_UNUSED, _vrdeServerSetNetAddress(vboxDriverPtr data ATTRIBUTE_UNUSED,
IVRDxServer *VRDxServer, PRUnichar *netAddress) IVRDEServer *VRDEServer, PRUnichar *netAddress)
{ {
PRUnichar *netAddressKey = NULL; PRUnichar *netAddressKey = NULL;
nsresult rc; nsresult rc;
VBOX_UTF8_TO_UTF16("TCP/Address", &netAddressKey); VBOX_UTF8_TO_UTF16("TCP/Address", &netAddressKey);
rc = VRDxServer->vtbl->SetVRDEProperty(VRDxServer, netAddressKey, rc = VRDEServer->vtbl->SetVRDEProperty(VRDEServer, netAddressKey,
netAddress); netAddress);
VBOX_UTF16_FREE(netAddressKey); VBOX_UTF16_FREE(netAddressKey);
...@@ -2346,7 +2344,7 @@ static vboxUniformedIMachine _UIMachine = { ...@@ -2346,7 +2344,7 @@ static vboxUniformedIMachine _UIMachine = {
.GetChipsetType = _machineGetChipsetType, .GetChipsetType = _machineGetChipsetType,
.GetSerialPort = _machineGetSerialPort, .GetSerialPort = _machineGetSerialPort,
.GetParallelPort = _machineGetParallelPort, .GetParallelPort = _machineGetParallelPort,
.GetVRDxServer = _machineGetVRDxServer, .GetVRDEServer = _machineGetVRDEServer,
.GetUSBCommon = _machineGetUSBCommon, .GetUSBCommon = _machineGetUSBCommon,
.GetCurrentSnapshot = _machineGetCurrentSnapshot, .GetCurrentSnapshot = _machineGetCurrentSnapshot,
.GetSettingsFilePath = _machineGetSettingsFilePath, .GetSettingsFilePath = _machineGetSettingsFilePath,
...@@ -2468,17 +2466,17 @@ static vboxUniformedIParallelPort _UIParallelPort = { ...@@ -2468,17 +2466,17 @@ static vboxUniformedIParallelPort _UIParallelPort = {
.SetIOBase = _parallelPortSetIOBase, .SetIOBase = _parallelPortSetIOBase,
}; };
static vboxUniformedIVRDxServer _UIVRDxServer = { static vboxUniformedIVRDEServer _UIVRDEServer = {
.GetEnabled = _vrdxServerGetEnabled, .GetEnabled = _vrdeServerGetEnabled,
.SetEnabled = _vrdxServerSetEnabled, .SetEnabled = _vrdeServerSetEnabled,
.GetPorts = _vrdxServerGetPorts, .GetPorts = _vrdeServerGetPorts,
.SetPorts = _vrdxServerSetPorts, .SetPorts = _vrdeServerSetPorts,
.GetReuseSingleConnection = _vrdxServerGetReuseSingleConnection, .GetReuseSingleConnection = _vrdeServerGetReuseSingleConnection,
.SetReuseSingleConnection = _vrdxServerSetReuseSingleConnection, .SetReuseSingleConnection = _vrdeServerSetReuseSingleConnection,
.GetAllowMultiConnection = _vrdxServerGetAllowMultiConnection, .GetAllowMultiConnection = _vrdeServerGetAllowMultiConnection,
.SetAllowMultiConnection = _vrdxServerSetAllowMultiConnection, .SetAllowMultiConnection = _vrdeServerSetAllowMultiConnection,
.GetNetAddress = _vrdxServerGetNetAddress, .GetNetAddress = _vrdeServerGetNetAddress,
.SetNetAddress = _vrdxServerSetNetAddress, .SetNetAddress = _vrdeServerSetNetAddress,
}; };
static vboxUniformedIUSBCommon _UIUSBCommon = { static vboxUniformedIUSBCommon _UIUSBCommon = {
...@@ -2617,7 +2615,7 @@ void NAME(InstallUniformedAPI)(vboxUniformedAPI *pVBoxAPI) ...@@ -2617,7 +2615,7 @@ void NAME(InstallUniformedAPI)(vboxUniformedAPI *pVBoxAPI)
pVBoxAPI->UINetworkAdapter = _UINetworkAdapter; pVBoxAPI->UINetworkAdapter = _UINetworkAdapter;
pVBoxAPI->UISerialPort = _UISerialPort; pVBoxAPI->UISerialPort = _UISerialPort;
pVBoxAPI->UIParallelPort = _UIParallelPort; pVBoxAPI->UIParallelPort = _UIParallelPort;
pVBoxAPI->UIVRDxServer = _UIVRDxServer; pVBoxAPI->UIVRDEServer = _UIVRDEServer;
pVBoxAPI->UIUSBCommon = _UIUSBCommon; pVBoxAPI->UIUSBCommon = _UIUSBCommon;
pVBoxAPI->UIUSBDeviceFilter = _UIUSBDeviceFilter; pVBoxAPI->UIUSBDeviceFilter = _UIUSBDeviceFilter;
pVBoxAPI->UIMedium = _UIMedium; pVBoxAPI->UIMedium = _UIMedium;
......
src/vbox/vbox_uniformed_api.h
浏览文件 @ 5a5c6de3
...@@ -224,7 +224,7 @@ typedef struct { ...@@ -224,7 +224,7 @@ typedef struct {
nsresult (*GetChipsetType)(IMachine *machine, PRUint32 *chipsetType); nsresult (*GetChipsetType)(IMachine *machine, PRUint32 *chipsetType);
nsresult (*GetSerialPort)(IMachine *machine, PRUint32 slot, ISerialPort **port); nsresult (*GetSerialPort)(IMachine *machine, PRUint32 slot, ISerialPort **port);
nsresult (*GetParallelPort)(IMachine *machine, PRUint32 slot, IParallelPort **port); nsresult (*GetParallelPort)(IMachine *machine, PRUint32 slot, IParallelPort **port);
nsresult (*GetVRDxServer)(IMachine *machine, IVRDxServer **VRDxServer); nsresult (*GetVRDEServer)(IMachine *machine, IVRDEServer **VRDEServer);
nsresult (*GetUSBCommon)(IMachine *machine, IUSBCommon **USBCommon); nsresult (*GetUSBCommon)(IMachine *machine, IUSBCommon **USBCommon);
nsresult (*GetCurrentSnapshot)(IMachine *machine, ISnapshot **currentSnapshot); nsresult (*GetCurrentSnapshot)(IMachine *machine, ISnapshot **currentSnapshot);
nsresult (*GetSettingsFilePath)(IMachine *machine, PRUnichar **settingsFilePath); nsresult (*GetSettingsFilePath)(IMachine *machine, PRUnichar **settingsFilePath);
...@@ -359,23 +359,23 @@ typedef struct { ...@@ -359,23 +359,23 @@ typedef struct {
nsresult (*SetIOBase)(IParallelPort *port, PRUint32 IOBase); nsresult (*SetIOBase)(IParallelPort *port, PRUint32 IOBase);
} vboxUniformedIParallelPort; } vboxUniformedIParallelPort;
/* Functions for IVRDPServer and IVRDEServer */ /* Functions for IVRDEServer */
typedef struct { typedef struct {
nsresult (*GetEnabled)(IVRDxServer *VRDxServer, PRBool *enabled); nsresult (*GetEnabled)(IVRDEServer *VRDEServer, PRBool *enabled);
nsresult (*SetEnabled)(IVRDxServer *VRDxServer, PRBool enabled); nsresult (*SetEnabled)(IVRDEServer *VRDEServer, PRBool enabled);
nsresult (*GetPorts)(vboxDriverPtr driver, IVRDxServer *VRDxServer, nsresult (*GetPorts)(vboxDriverPtr driver, IVRDEServer *VRDEServer,
virDomainGraphicsDefPtr graphics); virDomainGraphicsDefPtr graphics);
nsresult (*SetPorts)(vboxDriverPtr driver, IVRDxServer *VRDxServer, nsresult (*SetPorts)(vboxDriverPtr driver, IVRDEServer *VRDEServer,
virDomainGraphicsDefPtr graphics); virDomainGraphicsDefPtr graphics);
nsresult (*GetReuseSingleConnection)(IVRDxServer *VRDxServer, PRBool *enabled); nsresult (*GetReuseSingleConnection)(IVRDEServer *VRDEServer, PRBool *enabled);
nsresult (*SetReuseSingleConnection)(IVRDxServer *VRDxServer, PRBool enabled); nsresult (*SetReuseSingleConnection)(IVRDEServer *VRDEServer, PRBool enabled);
nsresult (*GetAllowMultiConnection)(IVRDxServer *VRDxServer, PRBool *enabled); nsresult (*GetAllowMultiConnection)(IVRDEServer *VRDEServer, PRBool *enabled);
nsresult (*SetAllowMultiConnection)(IVRDxServer *VRDxServer, PRBool enabled); nsresult (*SetAllowMultiConnection)(IVRDEServer *VRDEServer, PRBool enabled);
nsresult (*GetNetAddress)(vboxDriverPtr driver, IVRDxServer *VRDxServer, nsresult (*GetNetAddress)(vboxDriverPtr driver, IVRDEServer *VRDEServer,
PRUnichar **netAddress); PRUnichar **netAddress);
nsresult (*SetNetAddress)(vboxDriverPtr driver, IVRDxServer *VRDxServer, nsresult (*SetNetAddress)(vboxDriverPtr driver, IVRDEServer *VRDEServer,
PRUnichar *netAddress); PRUnichar *netAddress);
} vboxUniformedIVRDxServer; } vboxUniformedIVRDEServer;
/* Common Functions for IUSBController and IUSBDeviceFilters */ /* Common Functions for IUSBController and IUSBDeviceFilters */
typedef struct { typedef struct {
...@@ -553,7 +553,7 @@ typedef struct { ...@@ -553,7 +553,7 @@ typedef struct {
vboxUniformedINetworkAdapter UINetworkAdapter; vboxUniformedINetworkAdapter UINetworkAdapter;
vboxUniformedISerialPort UISerialPort; vboxUniformedISerialPort UISerialPort;
vboxUniformedIParallelPort UIParallelPort; vboxUniformedIParallelPort UIParallelPort;
vboxUniformedIVRDxServer UIVRDxServer; vboxUniformedIVRDEServer UIVRDEServer;
vboxUniformedIUSBCommon UIUSBCommon; vboxUniformedIUSBCommon UIUSBCommon;
vboxUniformedIUSBDeviceFilter UIUSBDeviceFilter; vboxUniformedIUSBDeviceFilter UIUSBDeviceFilter;
vboxUniformedIMedium UIMedium; vboxUniformedIMedium UIMedium;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或