External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-29 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

"Host only" and "Internal" network support for vbox

Browse Source 
* src/vbox/vbox_tmpl.c: "Host only" and "Internal" network support
  for vbox, patch by Pritesh Kothari
daniel
This commit is contained in:
Daniel Veillard 2009-05-11 09:56:04 +00:00
parent 070c1c82b0
commit 2e878906e4
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon May 11 11:54:53 CEST 2009 Daniel Veillard <veillard@redhat.com>
* src/vbox/vbox_tmpl.c: "Host only" and "Internal" network support
for vbox, patch by Pritesh Kothari
Mon May 11 11:47:51 CEST 2009 Daniel Veillard <veillard@redhat.com> Mon May 11 11:47:51 CEST 2009 Daniel Veillard <veillard@redhat.com>
* src/domain_conf.[ch] docs/schemas/domain.rng: add support * src/domain_conf.[ch] docs/schemas/domain.rng: add support

27
src/vbox/vbox_tmpl.c
View File

@ -1714,7 +1714,6 @@ static char *vboxDomainDumpXML(virDomainPtr dom, int flags) {
data->pFuncs->pfnUtf8Free(hostInt); data->pFuncs->pfnUtf8Free(hostInt);
data->pFuncs->pfnUtf16Free(hostIntUtf16); data->pFuncs->pfnUtf16Free(hostIntUtf16);
#if 0
} else if (attachmentType == NetworkAttachmentType_Internal) { } else if (attachmentType == NetworkAttachmentType_Internal) {
PRUnichar *intNetUtf16 = NULL; PRUnichar *intNetUtf16 = NULL;
char *intNet = NULL; char *intNet = NULL;
@ -1733,17 +1732,16 @@ static char *vboxDomainDumpXML(virDomainPtr dom, int flags) {
PRUnichar *hostIntUtf16 = NULL; PRUnichar *hostIntUtf16 = NULL;
char *hostInt = NULL; char *hostInt = NULL;
def->nets[netAdpIncCnt]->type = VIR_DOMAIN_NET_TYPE_HOSTONLY; def->nets[netAdpIncCnt]->type = VIR_DOMAIN_NET_TYPE_NETWORK;
adapter->vtbl->GetHostInterface(adapter, &hostIntUtf16); adapter->vtbl->GetHostInterface(adapter, &hostIntUtf16);
data->pFuncs->pfnUtf16ToUtf8(hostIntUtf16, &hostInt); data->pFuncs->pfnUtf16ToUtf8(hostIntUtf16, &hostInt);
def->nets[netAdpIncCnt]->data.hostonly.name = strdup(hostInt); def->nets[netAdpIncCnt]->data.network.name = strdup(hostInt);
data->pFuncs->pfnUtf8Free(hostInt); data->pFuncs->pfnUtf8Free(hostInt);
data->pFuncs->pfnUtf16Free(hostIntUtf16); data->pFuncs->pfnUtf16Free(hostIntUtf16);
#endif
} else { } else {
/* default to user type i.e. NAT in VirtualBox if this /* default to user type i.e. NAT in VirtualBox if this
* dump is ever used to create a machine. * dump is ever used to create a machine.
@ -2814,14 +2812,11 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) {
DEBUG("NIC(%d): Model: %s", i, def->nets[i]->model); DEBUG("NIC(%d): Model: %s", i, def->nets[i]->model);
DEBUG("NIC(%d): Mac: %s", i, macaddr); DEBUG("NIC(%d): Mac: %s", i, macaddr);
DEBUG("NIC(%d): ifname: %s", i, def->nets[i]->ifname); DEBUG("NIC(%d): ifname: %s", i, def->nets[i]->ifname);
#if 0 if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_HOSTONLY) { DEBUG("NIC(%d): name: %s", i, def->nets[i]->data.network.name);
DEBUG("NIC(%d): name: %s", i, def->nets[i]->data.hostonly.name);
} else if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_INTERNAL) { } else if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_INTERNAL) {
DEBUG("NIC(%d): name: %s", i, def->nets[i]->data.internal.name); DEBUG("NIC(%d): name: %s", i, def->nets[i]->data.internal.name);
} else } else if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_USER) {
#endif
if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_USER) {
DEBUG("NIC(%d): NAT.", i); DEBUG("NIC(%d): NAT.", i);
} else if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_BRIDGE) { } else if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_BRIDGE) {
DEBUG("NIC(%d): brname: %s", i, def->nets[i]->data.bridge.brname); DEBUG("NIC(%d): brname: %s", i, def->nets[i]->data.bridge.brname);
@ -2860,19 +2855,18 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) {
adapter->vtbl->SetHostInterface(adapter, hostInterface); adapter->vtbl->SetHostInterface(adapter, hostInterface);
data->pFuncs->pfnUtf16Free(hostInterface); data->pFuncs->pfnUtf16Free(hostInterface);
} }
#if 0
} else if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_INTERNAL) { } else if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_INTERNAL) {
PRUnichar *internalNetwork = NULL; PRUnichar *internalNetwork = NULL;
/* Internal Network */ /* Internal Network */
adapter->vtbl->AttachToInternalNetwork(adapter); adapter->vtbl->AttachToInternalNetwork(adapter);
if (def->nets[i]->data.network.name) { if (def->nets[i]->data.internal.name) {
data->pFuncs->pfnUtf8ToUtf16(def->nets[i]->data.network.name, &internalNetwork); data->pFuncs->pfnUtf8ToUtf16(def->nets[i]->data.internal.name, &internalNetwork);
adapter->vtbl->SetInternalNetwork(adapter, internalNetwork); adapter->vtbl->SetInternalNetwork(adapter, internalNetwork);
data->pFuncs->pfnUtf16Free(internalNetwork); data->pFuncs->pfnUtf16Free(internalNetwork);
} }
} else if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_HOSTONLY) { } else if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
PRUnichar *hostInterface = NULL; PRUnichar *hostInterface = NULL;
/* Host Only Networking (currently only vboxnet0 available /* Host Only Networking (currently only vboxnet0 available
* on *nix and mac, on windows you can create and configure * on *nix and mac, on windows you can create and configure
@ -2880,12 +2874,11 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) {
*/ */
adapter->vtbl->AttachToHostOnlyInterface(adapter); adapter->vtbl->AttachToHostOnlyInterface(adapter);
if (def->nets[i]->data.ethernet.dev) { if (def->nets[i]->data.network.name) {
g_pVBoxFuncs->pfnUtf8ToUtf16(def->nets[i]->data.hostonly.name, &hostInterface); g_pVBoxFuncs->pfnUtf8ToUtf16(def->nets[i]->data.network.name, &hostInterface);
adapter->vtbl->SetHostInterface(adapter, hostInterface); adapter->vtbl->SetHostInterface(adapter, hostInterface);
data->pFuncs->pfnUtf16Free(hostInterface); data->pFuncs->pfnUtf16Free(hostInterface);
} }
#endif
} else if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_USER) { } else if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_USER) {
/* NAT */ /* NAT */
adapter->vtbl->AttachToNAT(adapter); adapter->vtbl->AttachToNAT(adapter);