1:58 p.m.
Maxim Nestratov (3):
parallels: Fix connecting to parallels driver
parallels: better bridge network interface support
parallels: don't forget to unlock domain if unregister fails
Mikhail Feoktistov (1):
parallels: set cpu mode when applying xml configuration
1:58 p.m.
New subject: [libvirt] [PATCH 1/4] parallels: Fix connecting to parallels driver
After 55ea7be7, failures of parallelsLoadNetworks and parallelsStorageOpen
started to fail establishing a new connection to parallels driver.
Before this patch we simply ignored such errors.
This patch restores the ability to connect to parallels driver
even if parallelsLoadNetworks fails to get information about
Parallels Bridged networks. This can happen when it is unconfigured
(which is a common case on developers hosts for instance) or configured
incompletely. In any case it is not a severe error and we can ignore it.
Failures of parallelsStorageOpen occured because we incorrectly treated
path to VM' configuration file as a directory. Now initialization of
parallels VM domains home directory is fixed.
Signed-off-by: Maxim Nestratov <mnestratov(a)parallels.com>
---
src/parallels/parallels_network.c | 2 +-
src/parallels/parallels_sdk.c | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c
index 3e7087d..033b347 100644
--- a/src/parallels/parallels_network.c
+++ b/src/parallels/parallels_network.c
@@ -304,7 +304,7 @@ static int parallelsLoadNetworks(parallelsConnPtr privconn)
net = parallelsLoadNetwork(privconn, jobj2);
if (!net)
- goto cleanup;
+ continue;
}
diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c
index d0d2ce2..b9d5ddf 100644
--- a/src/parallels/parallels_sdk.c
+++ b/src/parallels/parallels_sdk.c
@@ -1247,6 +1247,14 @@ prlsdkLoadDomain(parallelsConnPtr privconn,
pret = PrlVmCfg_GetHomePath(sdkdom, pdom->home, &buflen);
prlsdkCheckRetGoto(pret, error);
+ // For VMs pdom->home is actually /directory/config.pvs
+ if(!IS_CT(def)){
+ // Get rid of /config.pvs in path string
+ char *s = strrchr(pdom->home, '/');
+ if (s)
+ *s = '\0';
+ }
+
if (olddom) {
/* assign new virDomainDef without any checks */
/* we can't use virDomainObjAssignDef, because it checks
--
1.7.1
7:02 a.m.
New subject: [libvirt] [PATCH 1/4] parallels: Fix connecting to parallels driver
On 30.01.2015 20:58, Maxim Nestratov wrote:
After 55ea7be7, failures of parallelsLoadNetworks and
parallelsStorageOpen
started to fail establishing a new connection to parallels driver.
Before this patch we simply ignored such errors.
This patch restores the ability to connect to parallels driver
even if parallelsLoadNetworks fails to get information about
Parallels Bridged networks. This can happen when it is unconfigured
(which is a common case on developers hosts for instance) or configured
incompletely. In any case it is not a severe error and we can ignore it.
Failures of parallelsStorageOpen occured because we incorrectly treated
path to VM' configuration file as a directory. Now initialization of
parallels VM domains home directory is fixed.
Signed-off-by: Maxim Nestratov <mnestratov(a)parallels.com>
---
src/parallels/parallels_network.c | 2 +-
src/parallels/parallels_sdk.c | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c
index 3e7087d..033b347 100644
--- a/src/parallels/parallels_network.c
+++ b/src/parallels/parallels_network.c
@@ -304,7 +304,7 @@ static int parallelsLoadNetworks(parallelsConnPtr privconn)
net = parallelsLoadNetwork(privconn, jobj2);
if (!net)
- goto cleanup;
+ continue;
I'm not sure this is correct. I mean, parallelsLoadNetwork() could have
failed for so many reasons. And some of them are show stoppers (e.g. OOM).
}
diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c
index d0d2ce2..b9d5ddf 100644
--- a/src/parallels/parallels_sdk.c
+++ b/src/parallels/parallels_sdk.c
@@ -1247,6 +1247,14 @@ prlsdkLoadDomain(parallelsConnPtr privconn,
pret = PrlVmCfg_GetHomePath(sdkdom, pdom->home, &buflen);
prlsdkCheckRetGoto(pret, error);
+ // For VMs pdom->home is actually /directory/config.pvs
+ if(!IS_CT(def)){
+ // Get rid of /config.pvs in path string
+ char *s = strrchr(pdom->home, '/');
+ if (s)
+ *s = '\0';
+ }
+
We like comments in old way /* */, and we even like spaces around
brackets and after 'if'-s.
if (olddom) {
/* assign new virDomainDef without any checks */
/* we can't use virDomainObjAssignDef, because it checks
Michal
8:08 a.m.
New subject: [libvirt] [PATCH 1/4] parallels: Fix connecting to parallels driver
09.02.2015 16:02, Michal Privoznik пишет:
On 30.01.2015 20:58, Maxim Nestratov wrote:
> After 55ea7be7, failures of parallelsLoadNetworks and parallelsStorageOpen
> started to fail establishing a new connection to parallels driver.
> Before this patch we simply ignored such errors.
> This patch restores the ability to connect to parallels driver
> even if parallelsLoadNetworks fails to get information about
> Parallels Bridged networks. This can happen when it is unconfigured
> (which is a common case on developers hosts for instance) or configured
> incompletely. In any case it is not a severe error and we can ignore it.
> Failures of parallelsStorageOpen occured because we incorrectly treated
> path to VM' configuration file as a directory. Now initialization of
> parallels VM domains home directory is fixed.
>
> Signed-off-by: Maxim Nestratov <mnestratov(a)parallels.com>
> ---
> src/parallels/parallels_network.c | 2 +-
> src/parallels/parallels_sdk.c | 8 ++++++++
> 2 files changed, 9 insertions(+), 1 deletions(-)
>
> diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c
> index 3e7087d..033b347 100644
> --- a/src/parallels/parallels_network.c
> +++ b/src/parallels/parallels_network.c
> @@ -304,7 +304,7 @@ static int parallelsLoadNetworks(parallelsConnPtr privconn)
>
> net = parallelsLoadNetwork(privconn, jobj2);
> if (!net)
> - goto cleanup;
> + continue;
I'm not sure this is correct. I mean, parallelsLoadNetwork() could have
failed for so many reasons. And some of them are show stoppers (e.g. OOM).
Here I
only wanted to say that failure of loading Bridged Virtual
Network information is not a show stopper.
Maybe I had better sort out things inside parallelsLoadNetworks.
>
> }
>
> diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c
> index d0d2ce2..b9d5ddf 100644
> --- a/src/parallels/parallels_sdk.c
> +++ b/src/parallels/parallels_sdk.c
> @@ -1247,6 +1247,14 @@ prlsdkLoadDomain(parallelsConnPtr privconn,
> pret = PrlVmCfg_GetHomePath(sdkdom, pdom->home, &buflen);
> prlsdkCheckRetGoto(pret, error);
>
> + // For VMs pdom->home is actually /directory/config.pvs
> + if(!IS_CT(def)){
> + // Get rid of /config.pvs in path string
> + char *s = strrchr(pdom->home, '/');
> + if (s)
> + *s = '\0';
> + }
> +
We like comments in old way /* */, and we even like spaces around
brackets and after 'if'-s.
Ok. I'll fix it.
> if (olddom) {
> /* assign new virDomainDef without any checks */
> /* we can't use virDomainObjAssignDef, because it checks
>
Michal
1:58 p.m.
New subject: [libvirt] [PATCH 2/4] parallels: set cpu mode when applying xml configuration
From: Mikhail Feoktistov <mfeoktistov(a)parallels.com>
Otherwise exporting existing domain config and defining a new one like this:
virsh -c parallels:///system dumpxml instance01 > my.xml
virsh -c parallels:///system define my.xml
leads to an error because PCS default x64 mode turns to x32.
Thus, we need to set correct cpuMode in prlsdkDoApplyConfig() explicitly.
Signed-off-by: Mikhail Feoktistov <mfeoktistov(a)parallels.com>
Signed-off-by: Maxim Nestratov <mnestratov(a)parallels.com>
---
src/parallels/parallels_sdk.c | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c
index b9d5ddf..795ba31 100644
--- a/src/parallels/parallels_sdk.c
+++ b/src/parallels/parallels_sdk.c
@@ -2802,6 +2802,19 @@ prlsdkDoApplyConfig(PRL_HANDLE sdkdom,
pret = PrlVmCfg_SetCpuCount(sdkdom, def->vcpus);
prlsdkCheckRetGoto(pret, error);
+ switch (def->os.arch) {
+ case VIR_ARCH_X86_64:
+ pret = PrlVmCfg_SetCpuMode(sdkdom, PCM_CPU_MODE_64);
+ break;
+ case VIR_ARCH_I686:
+ pret = PrlVmCfg_SetCpuMode(sdkdom, PCM_CPU_MODE_32);
+ break;
+ default:
+ virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown CPU mode: %X"),
def->os.arch);
+ goto error;
+ }
+ prlsdkCheckRetGoto(pret, error);
+
if (prlsdkClearDevices(sdkdom) < 0)
goto error;
--
1.7.1
7:03 a.m.
New subject: [libvirt] [PATCH 2/4] parallels: set cpu mode when applying xml configuration
On 30.01.2015 20:58, Maxim Nestratov wrote:
From: Mikhail Feoktistov <mfeoktistov(a)parallels.com>
Otherwise exporting existing domain config and defining a new one like this:
virsh -c parallels:///system dumpxml instance01 > my.xml
virsh -c parallels:///system define my.xml
leads to an error because PCS default x64 mode turns to x32.
Thus, we need to set correct cpuMode in prlsdkDoApplyConfig() explicitly.
Signed-off-by: Mikhail Feoktistov <mfeoktistov(a)parallels.com>
Signed-off-by: Maxim Nestratov <mnestratov(a)parallels.com>
---
src/parallels/parallels_sdk.c | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c
index b9d5ddf..795ba31 100644
--- a/src/parallels/parallels_sdk.c
+++ b/src/parallels/parallels_sdk.c
@@ -2802,6 +2802,19 @@ prlsdkDoApplyConfig(PRL_HANDLE sdkdom,
pret = PrlVmCfg_SetCpuCount(sdkdom, def->vcpus);
prlsdkCheckRetGoto(pret, error);
+ switch (def->os.arch) {
+ case VIR_ARCH_X86_64:
+ pret = PrlVmCfg_SetCpuMode(sdkdom, PCM_CPU_MODE_64);
+ break;
+ case VIR_ARCH_I686:
+ pret = PrlVmCfg_SetCpuMode(sdkdom, PCM_CPU_MODE_32);
+ break;
+ default:
+ virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown CPU mode: %X"),
def->os.arch);
+ goto error;
+ }
+ prlsdkCheckRetGoto(pret, error);
+
if (prlsdkClearDevices(sdkdom) < 0)
goto error;
ACK
Michal
1:58 p.m.
New subject: [libvirt] [PATCH 3/4] parallels: better bridge network interface support
In order to support 'bridge' network adapters in parallels
driver we need to plug our veth devices into corresponding
linux bridges.
We are going to do this by reusing our abstraction of
Virtual Networks in terms of PCS. On a domain creation, we
create a new Virtual Network naming it with the same name
as a source bridge for each network interface.
Thus, we plug PCS veth interfaces created with names of
target dev with specified bridges using our standard PCS
procedures.
Signed-off-by: Maxim Nestratov <mnestratov(a)parallels.com>
---
src/parallels/parallels_sdk.c | 112 ++++++++++++++++++++++++++++++++-------
src/parallels/parallels_utils.h | 1 +
2 files changed, 94 insertions(+), 19 deletions(-)
diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c
index 795ba31..f200074 100644
--- a/src/parallels/parallels_sdk.c
+++ b/src/parallels/parallels_sdk.c
@@ -689,12 +689,8 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool
isCt)
net->type = VIR_DOMAIN_NET_TYPE_NETWORK;
-
/* use device name, shown by prlctl as target device
* for identifying network adapter in virDomainDefineXML */
- pret = PrlVmDev_GetIndex(netAdapter, &netAdapterIndex);
- prlsdkCheckRetGoto(pret, cleanup);
-
pret = PrlVmDevNet_GetHostInterfaceName(netAdapter, NULL, &buflen);
prlsdkCheckRetGoto(pret, cleanup);
@@ -702,7 +698,10 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool
isCt)
goto cleanup;
pret = PrlVmDevNet_GetHostInterfaceName(netAdapter, net->ifname, &buflen);
- prlsdkCheckRetGoto(pret, cleanup);
+ prlsdkCheckRetGoto(pret, cleanup);
+
+ pret = PrlVmDev_GetIndex(netAdapter, &netAdapterIndex);
+ prlsdkCheckRetGoto(pret, cleanup);
if (isCt && netAdapterIndex == (PRL_UINT32) -1) {
/* venet devices don't have mac address and
@@ -741,6 +740,14 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool
isCt)
net->data.network.name,
&buflen);
prlsdkCheckRetGoto(pret, cleanup);
+
+ // We use VIR_DOMAIN_NET_TYPE_NETWORK for all network adapters
+ // except those whose Virtual Network Id differ from Parallels
+ // predefined ones such as PARALLELS_BRIDGED_NETWORK_NAME and
PARALLELS_ROUTED_NETWORK_NAME
+ if (!STREQ(net->data.network.name, PARALLELS_BRIDGED_NETWORK_NAME)) {
+ net->type = VIR_DOMAIN_NET_TYPE_BRIDGE;
+ }
+
}
pret = PrlVmDev_IsConnected(netAdapter, &isConnected);
@@ -1352,7 +1359,6 @@ prlsdkLoadDomains(parallelsConnPtr privconn)
error:
PrlHandle_Free(result);
- PrlHandle_Free(job);
return -1;
}
@@ -1732,8 +1738,6 @@ prlsdkDomainChangeState(virDomainPtr domain,
pdom = dom->privateData;
pret = chstate(privconn, pdom->sdkdom);
- virReportError(VIR_ERR_OPERATION_FAILED,
- _("Can't change domain state: %d"), pret);
if (PRL_FAILED(pret)) {
virResetLastError();
@@ -2562,10 +2566,12 @@ static const char * prlsdkFormatMac(virMacAddrPtr mac, char
*macstr)
return macstr;
}
-static int prlsdkAddNet(PRL_HANDLE sdkdom, virDomainNetDefPtr net)
+static int prlsdkAddNet(PRL_HANDLE sdkdom, parallelsConnPtr privconn, virDomainNetDefPtr
net)
{
PRL_RESULT pret;
PRL_HANDLE sdknet = PRL_INVALID_HANDLE;
+ PRL_HANDLE vnet = PRL_INVALID_HANDLE;
+ PRL_HANDLE job = PRL_INVALID_HANDLE;
int ret = -1;
char macstr[PRL_MAC_STRING_BUFNAME];
@@ -2578,7 +2584,7 @@ static int prlsdkAddNet(PRL_HANDLE sdkdom, virDomainNetDefPtr net)
pret = PrlVmDev_SetEnabled(sdknet, 1);
prlsdkCheckRetGoto(pret, cleanup);
- pret = PrlVmDev_SetConnected(sdknet, net->linkstate);
+ pret = PrlVmDev_SetConnected(sdknet, 1);
prlsdkCheckRetGoto(pret, cleanup);
if (net->ifname) {
@@ -2590,10 +2596,41 @@ static int prlsdkAddNet(PRL_HANDLE sdkdom, virDomainNetDefPtr
net)
pret = PrlVmDevNet_SetMacAddress(sdknet, macstr);
prlsdkCheckRetGoto(pret, cleanup);
- if (STREQ(net->data.network.name, PARALLELS_ROUTED_NETWORK_NAME)) {
- pret = PrlVmDev_SetEmulatedType(sdknet, PNA_ROUTED);
+ // Other alternatives: PNT_VIRTIO, PNT_RTL
+ pret = PrlVmDevNet_SetAdapterType(sdknet, PNT_E1000);
+ prlsdkCheckRetGoto(pret, cleanup);
+
+ if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
+ if (STREQ(net->data.network.name, PARALLELS_ROUTED_NETWORK_NAME)) {
+ pret = PrlVmDev_SetEmulatedType(sdknet, PNA_ROUTED);
+ prlsdkCheckRetGoto(pret, cleanup);
+ } else if (STREQ(net->data.network.name, PARALLELS_BRIDGED_NETWORK_NAME)) {
+ pret = PrlVmDev_SetEmulatedType(sdknet, PNA_BRIDGED_ETHERNET);
+ prlsdkCheckRetGoto(pret, cleanup);
+
+ pret = PrlVmDevNet_SetVirtualNetworkId(sdknet, net->data.network.name);
+ prlsdkCheckRetGoto(pret, cleanup);
+ }
+ } else if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE) {
+ // For this type of adapter we create a new
+ // Virtual Network assuming that bridge with given name exists
+ // Failing creating this means domain creation failure
+ pret = PrlVirtNet_Create(&vnet);
+ prlsdkCheckRetGoto(pret, cleanup);
+
+ pret = PrlVirtNet_SetNetworkId(vnet, net->data.network.name);
prlsdkCheckRetGoto(pret, cleanup);
- } else {
+
+ pret = PrlVirtNet_SetNetworkType(vnet, PVN_BRIDGED_ETHERNET);
+ prlsdkCheckRetGoto(pret, cleanup);
+
+ job = PrlSrv_AddVirtualNetwork(privconn->server, vnet, 0);
+ if(PRL_FAILED(pret = waitJob(job, privconn->jobTimeout)))
+ goto cleanup;
+
+ pret = PrlVmDev_SetEmulatedType(sdknet, PNA_BRIDGED_ETHERNET);
+ prlsdkCheckRetGoto(pret, cleanup);
+
pret = PrlVmDevNet_SetVirtualNetworkId(sdknet, net->data.network.name);
prlsdkCheckRetGoto(pret, cleanup);
}
@@ -2606,10 +2643,35 @@ static int prlsdkAddNet(PRL_HANDLE sdkdom, virDomainNetDefPtr
net)
ret = 0;
cleanup:
+ PrlHandle_Free(vnet);
PrlHandle_Free(sdknet);
return ret;
}
+static void prlsdkDelNet(parallelsConnPtr privconn, virDomainNetDefPtr net)
+{
+ PRL_RESULT pret;
+ PRL_HANDLE vnet = PRL_INVALID_HANDLE;
+ PRL_HANDLE job = PRL_INVALID_HANDLE;
+
+ if(net->type != VIR_DOMAIN_NET_TYPE_BRIDGE)
+ // nothing to do
+ return;
+
+ pret = PrlVirtNet_Create(&vnet);
+ prlsdkCheckRetGoto(pret, cleanup);
+
+ pret = PrlVirtNet_SetNetworkId(vnet, net->data.network.name);
+ prlsdkCheckRetGoto(pret, cleanup);
+
+ PrlSrv_DeleteVirtualNetwork(privconn->server, vnet, 0);
+ if(PRL_FAILED(pret = waitJob(job, privconn->jobTimeout)))
+ goto cleanup;
+
+cleanup:
+ PrlHandle_Free(vnet);
+}
+
static int prlsdkAddDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk)
{
PRL_RESULT pret;
@@ -2769,7 +2831,8 @@ prlsdkAddFS(PRL_HANDLE sdkdom, virDomainFSDefPtr fs)
return ret;
}
static int
-prlsdkDoApplyConfig(PRL_HANDLE sdkdom,
+prlsdkDoApplyConfig(virConnectPtr conn,
+ PRL_HANDLE sdkdom,
virDomainDefPtr def)
{
PRL_RESULT pret;
@@ -2830,7 +2893,7 @@ prlsdkDoApplyConfig(PRL_HANDLE sdkdom,
}
for (i = 0; i < def->nnets; i++) {
- if (prlsdkAddNet(sdkdom, def->nets[i]) < 0)
+ if (prlsdkAddNet(sdkdom, conn->privateData, def->nets[i]) < 0)
goto error;
}
@@ -2847,7 +2910,10 @@ prlsdkDoApplyConfig(PRL_HANDLE sdkdom,
return 0;
error:
- return -1;
+ for (i = 0; i < def->nnets; i++)
+ prlsdkDelNet(conn->privateData, def->nets[i]);
+
+ return -1;
}
int
@@ -2868,7 +2934,7 @@ prlsdkApplyConfig(virConnectPtr conn,
if (PRL_FAILED(waitJob(job, privconn->jobTimeout)))
return -1;
- ret = prlsdkDoApplyConfig(sdkdom, new);
+ ret = prlsdkDoApplyConfig(conn, sdkdom, new);
if (ret == 0) {
job = PrlVm_CommitEx(sdkdom, PVCF_DETACH_HDD_BUNDLE);
@@ -2905,7 +2971,10 @@ prlsdkCreateVm(virConnectPtr conn, virDomainDefPtr def)
pret = PrlVmCfg_SetDefaultConfig(sdkdom, srvconf, PVS_GUEST_VER_LIN_REDHAT, 0);
prlsdkCheckRetGoto(pret, cleanup);
- ret = prlsdkDoApplyConfig(sdkdom, def);
+ pret = PrlVmCfg_SetOfflineManagementEnabled(sdkdom, 0);
+ prlsdkCheckRetGoto(pret, cleanup);
+
+ ret = prlsdkDoApplyConfig(conn, sdkdom, def);
if (ret)
goto cleanup;
@@ -2967,7 +3036,7 @@ prlsdkCreateCt(virConnectPtr conn, virDomainDefPtr def)
}
- ret = prlsdkDoApplyConfig(sdkdom, def);
+ ret = prlsdkDoApplyConfig(conn, sdkdom, def);
if (ret)
goto cleanup;
@@ -2986,8 +3055,13 @@ prlsdkUnregisterDomain(parallelsConnPtr privconn, virDomainObjPtr
dom)
{
parallelsDomObjPtr privdom = dom->privateData;
PRL_HANDLE job;
+ int i;
+ for (i = 0; i < dom->def->nnets; i++) {
+ prlsdkDelNet(privconn, dom->def->nets[i]);
+ }
job = PrlVm_Unreg(privdom->sdkdom);
+
if (PRL_FAILED(waitJob(job, privconn->jobTimeout)))
return -1;
diff --git a/src/parallels/parallels_utils.h b/src/parallels/parallels_utils.h
index bebf841..7296c89 100644
--- a/src/parallels/parallels_utils.h
+++ b/src/parallels/parallels_utils.h
@@ -48,6 +48,7 @@
} while (0)
# define PARALLELS_ROUTED_NETWORK_NAME "Routed"
+# define PARALLELS_BRIDGED_NETWORK_NAME "Bridged"
struct _parallelsConn {
virMutex lock;
--
1.7.1
7:02 a.m.
New subject: [libvirt] [PATCH 3/4] parallels: better bridge network interface support
On 30.01.2015 20:58, Maxim Nestratov wrote:
In order to support 'bridge' network adapters in parallels
driver we need to plug our veth devices into corresponding
linux bridges.
We are going to do this by reusing our abstraction of
Virtual Networks in terms of PCS. On a domain creation, we
create a new Virtual Network naming it with the same name
as a source bridge for each network interface.
Thus, we plug PCS veth interfaces created with names of
target dev with specified bridges using our standard PCS
procedures.
Signed-off-by: Maxim Nestratov <mnestratov(a)parallels.com>
---
src/parallels/parallels_sdk.c | 112 ++++++++++++++++++++++++++++++++-------
src/parallels/parallels_utils.h | 1 +
2 files changed, 94 insertions(+), 19 deletions(-)
I'm seeing some syntax-check errors:
Curly brackets around single-line body:
src/parallels/parallels_sdk.c:747-749:
if (!STREQ(net->data.network.name, PARALLELS_BRIDGED_NETWORK_NAME)) {
net->type = VIR_DOMAIN_NET_TYPE_BRIDGE;
}
No whitespace after keyword:
src/parallels/parallels_sdk.c:2628: if(PRL_FAILED(pret = waitJob(job,
privconn->jobTimeout)))
No whitespace after keyword:
src/parallels/parallels_sdk.c:2657: if(net->type != VIR_DOMAIN_NET_TYPE_BRIDGE)
No whitespace after keyword:
src/parallels/parallels_sdk.c:2668: if(PRL_FAILED(pret = waitJob(job,
privconn->jobTimeout)))
Curly brackets around single-line body:
src/parallels/parallels_sdk.c:3060-3062:
for (i = 0; i < dom->def->nnets; i++) {
prlsdkDelNet(privconn, dom->def->nets[i]);
}
Michal
8:53 a.m.
New subject: [libvirt] [PATCH 3/4] parallels: better bridge network interface support
09.02.2015 16:02, Michal Privoznik пишет:
On 30.01.2015 20:58, Maxim Nestratov wrote:
> In order to support 'bridge' network adapters in parallels
> driver we need to plug our veth devices into corresponding
> linux bridges.
> We are going to do this by reusing our abstraction of
> Virtual Networks in terms of PCS. On a domain creation, we
> create a new Virtual Network naming it with the same name
> as a source bridge for each network interface.
> Thus, we plug PCS veth interfaces created with names of
> target dev with specified bridges using our standard PCS
> procedures.
>
> Signed-off-by: Maxim Nestratov <mnestratov(a)parallels.com>
> ---
> src/parallels/parallels_sdk.c | 112 ++++++++++++++++++++++++++++++++-------
> src/parallels/parallels_utils.h | 1 +
> 2 files changed, 94 insertions(+), 19 deletions(-)
I'm seeing some syntax-check errors:
Curly brackets around single-line body:
src/parallels/parallels_sdk.c:747-749:
if (!STREQ(net->data.network.name, PARALLELS_BRIDGED_NETWORK_NAME)) {
net->type = VIR_DOMAIN_NET_TYPE_BRIDGE;
}
No whitespace after keyword:
src/parallels/parallels_sdk.c:2628: if(PRL_FAILED(pret = waitJob(job,
privconn->jobTimeout)))
No whitespace after keyword:
src/parallels/parallels_sdk.c:2657: if(net->type != VIR_DOMAIN_NET_TYPE_BRIDGE)
No whitespace after keyword:
src/parallels/parallels_sdk.c:2668: if(PRL_FAILED(pret = waitJob(job,
privconn->jobTimeout)))
Curly brackets around single-line body:
src/parallels/parallels_sdk.c:3060-3062:
for (i = 0; i < dom->def->nnets; i++) {
prlsdkDelNet(privconn, dom->def->nets[i]);
}
Michal
Hm, I thought 'make check' implies calling 'make
syntax-check' also.
I'll fix this.
1:58 p.m.
New subject: [libvirt] [PATCH 4/4] parallels: don't forget to unlock domain if unregister fails
Signed-off-by: Maxim Nestratov <mnestratov(a)parallels.com>
---
src/parallels/parallels_driver.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
index b569160..2f9cb5f 100644
--- a/src/parallels/parallels_driver.c
+++ b/src/parallels/parallels_driver.c
@@ -938,6 +938,7 @@ parallelsDomainUndefineFlags(virDomainPtr domain,
{
parallelsConnPtr privconn = domain->conn->privateData;
virDomainObjPtr dom = NULL;
+ int ret;
virCheckFlags(0, -1);
@@ -947,7 +948,11 @@ parallelsDomainUndefineFlags(virDomainPtr domain,
return -1;
}
- return prlsdkUnregisterDomain(privconn, dom);
+ ret = prlsdkUnregisterDomain(privconn, dom);
+ if(ret)
+ virObjectUnlock(dom);
+
+ return ret;
}
static int
--
1.7.1
3573
days inactive
3583
days old
9 comments
2 participants
participants (2)
-
Maxim Nestratov -
Michal Privoznik