From 3a959b36fde5fd232d44ca35471216b0d3c5400a Mon Sep 17 00:00:00 2001 From: Taowei Date: Mon, 11 Aug 2014 18:06:09 +0800 Subject: [PATCH] vbox: Rewrite vboxConnectIsSecure --- src/vbox/vbox_common.c | 6 ++++++ src/vbox/vbox_tmpl.c | 6 ------ src/vbox/vbox_uniformed_api.h | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 585e6b5382..f40f14d70c 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -422,3 +422,9 @@ char *vboxConnectGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED) { return virGetHostname(); } + +int vboxConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + /* Driver is using local, non-network based transport */ + return 1; +} diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index f305a94766..e43fb3f060 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -914,12 +914,6 @@ vboxSocketParseAddrUtf16(vboxGlobalData *data, const PRUnichar *utf16, return result; } -static int vboxConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) -{ - /* Driver is using local, non-network based transport */ - return 1; -} - static int vboxConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) { /* No encryption is needed, or used on the local transport*/ diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h index f56fe7ac51..d688403cbe 100644 --- a/src/vbox/vbox_uniformed_api.h +++ b/src/vbox/vbox_uniformed_api.h @@ -222,6 +222,7 @@ int vboxConnectClose(virConnectPtr conn); int vboxDomainSave(virDomainPtr dom, const char *path); int vboxConnectGetVersion(virConnectPtr conn, unsigned long *version); char *vboxConnectGetHostname(virConnectPtr conn); +int vboxConnectIsSecure(virConnectPtr conn); /* Version specified functions for installing uniformed API */ void vbox22InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);