Acked-by: Eitan Eliahu <elia...@vmware.com>
-----Original Message-----
From: Samuel Ghinet [mailto:sghi...@cloudbasesolutions.com]
Sent: Tuesday, September 30, 2014 7:44 AM
To: dev@openvswitch.org
Cc: Alin Serdean; Nithin Raju; Eitan Eliahu; Ankur Sharma
Subject: [PATCH 02/14] datapath-windows: Rename hyper-v switch port and nic
handlers
Functions such as OvsCreatePort are vague in regard to who creates it or when.
It wasn't a problem thus far, since the vports were created, updated and
destroyed from one place only (hyper-v switch part). But now, with the netlink
implementation of the vport commands, a part of the vport is constructed by the
netlink vport add, and the other part is constructed by the hyper-v switch nic
and port handlers.
This patch renames the hyper-v switch nic and port handlers, so that they are
now prefixed by "HvOn" instead of "Ovs", in order to clarify which of the
functions are nic or port handlers. This will make more clear the usages from
netlink vport commands side and from hyper-v switch side. It will also make
more obvious which nic and port functions are helper functions.
Signed-off-by: Samuel Ghinet <sghi...@cloudbasesolutions.com>
---
datapath-windows/ovsext/Oid.c | 24 ++++++++++++------------
datapath-windows/ovsext/Vport.c | 32 ++++++++++++++++----------------
datapath-windows/ovsext/Vport.h | 30 +++++++++++++++---------------
3 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/datapath-windows/ovsext/Oid.c b/datapath-windows/ovsext/Oid.c
index a675347..39e47c2 100644
--- a/datapath-windows/ovsext/Oid.c
+++ b/datapath-windows/ovsext/Oid.c
@@ -161,13 +161,13 @@ OvsProcessSetOidPort(POVS_SWITCH_CONTEXT switchObject,
switch(setInfo->Oid) {
case OID_SWITCH_PORT_CREATE:
- status = OvsCreatePort(switchObject, portParam);
+ status = HvOnCreatePort(switchObject, portParam);
break;
case OID_SWITCH_PORT_TEARDOWN:
- OvsTeardownPort(switchObject, portParam);
+ HvOnTeardownPort(switchObject, portParam);
break;
case OID_SWITCH_PORT_DELETE:
- OvsDeletePort(switchObject, portParam);
+ HvOnDeletePort(switchObject, portParam);
break;
default:
break;
@@ -193,19 +193,19 @@ OvsProcessSetOidNic(POVS_SWITCH_CONTEXT switchObject,
switch(setInfo->Oid) {
case OID_SWITCH_NIC_CREATE:
- status = OvsCreateNic(switchObject, nicParam);
+ status = HvOnCreateNic(switchObject, nicParam);
break;
case OID_SWITCH_NIC_CONNECT:
- OvsConnectNic(switchObject, nicParam);
+ HvOnConnectNic(switchObject, nicParam);
break;
case OID_SWITCH_NIC_UPDATED:
- OvsUpdateNic(switchObject, nicParam);
+ HvOnUpdateNic(switchObject, nicParam);
break;
case OID_SWITCH_NIC_DISCONNECT:
- OvsDisconnectNic(switchObject, nicParam);
+ HvOnDisconnectNic(switchObject, nicParam);
break;
case OID_SWITCH_NIC_DELETE:
- OvsDeleteNic(switchObject, nicParam);
+ HvOnDeleteNic(switchObject, nicParam);
break;
default:
break;
@@ -518,13 +518,13 @@ OvsOidRequestCompleteSetInfo(POVS_SWITCH_CONTEXT
switchObject,
switch(setInfo->Oid) {
case OID_SWITCH_PORT_CREATE:
- OvsDeletePort(switchObject,
- (PNDIS_SWITCH_PORT_PARAMETERS)origHeader);
+ HvOnDeletePort(switchObject,
+ (PNDIS_SWITCH_PORT_PARAMETERS)origHeader);
break;
case OID_SWITCH_NIC_CREATE:
- OvsDeleteNic(switchObject,
- (PNDIS_SWITCH_NIC_PARAMETERS)origHeader);
+ HvOnDeleteNic(switchObject,
+ (PNDIS_SWITCH_NIC_PARAMETERS)origHeader);
break;
default:
diff --git a/datapath-windows/ovsext/Vport.c b/datapath-windows/ovsext/Vport.c
index bd28606..198acdf 100644
--- a/datapath-windows/ovsext/Vport.c
+++ b/datapath-windows/ovsext/Vport.c
@@ -72,8 +72,8 @@ static __inline VOID OvsWaitActivate(POVS_SWITCH_CONTEXT
switchContext,
* Functions implemented in relaton to NDIS port manipulation.
*/
NDIS_STATUS
-OvsCreatePort(POVS_SWITCH_CONTEXT switchContext,
- PNDIS_SWITCH_PORT_PARAMETERS portParam)
+HvOnCreatePort(POVS_SWITCH_CONTEXT switchContext,
+ PNDIS_SWITCH_PORT_PARAMETERS portParam)
{
POVS_VPORT_ENTRY vport;
LOCK_STATE_EX lockState;
@@ -103,8 +103,8 @@ create_port_done:
}
VOID
-OvsTeardownPort(POVS_SWITCH_CONTEXT switchContext,
- PNDIS_SWITCH_PORT_PARAMETERS portParam)
+HvOnTeardownPort(POVS_SWITCH_CONTEXT switchContext,
+ PNDIS_SWITCH_PORT_PARAMETERS portParam)
{
POVS_VPORT_ENTRY vport;
LOCK_STATE_EX lockState;
@@ -130,8 +130,8 @@ OvsTeardownPort(POVS_SWITCH_CONTEXT switchContext,
VOID
-OvsDeletePort(POVS_SWITCH_CONTEXT switchContext,
- PNDIS_SWITCH_PORT_PARAMETERS portParam)
+HvOnDeletePort(POVS_SWITCH_CONTEXT switchContext,
+ PNDIS_SWITCH_PORT_PARAMETERS portParam)
{
POVS_VPORT_ENTRY vport;
LOCK_STATE_EX lockState;
@@ -156,8 +156,8 @@ OvsDeletePort(POVS_SWITCH_CONTEXT switchContext,
* Functions implemented in relaton to NDIS NIC manipulation.
*/
NDIS_STATUS
-OvsCreateNic(POVS_SWITCH_CONTEXT switchContext,
- PNDIS_SWITCH_NIC_PARAMETERS nicParam)
+HvOnCreateNic(POVS_SWITCH_CONTEXT switchContext,
+ PNDIS_SWITCH_NIC_PARAMETERS nicParam)
{
POVS_VPORT_ENTRY vport;
UINT32 portNo = 0;
@@ -228,8 +228,8 @@ done:
/* Mark already created NIC as connected. */ VOID
-OvsConnectNic(POVS_SWITCH_CONTEXT switchContext,
- PNDIS_SWITCH_NIC_PARAMETERS nicParam)
+HvOnConnectNic(POVS_SWITCH_CONTEXT switchContext,
+ PNDIS_SWITCH_NIC_PARAMETERS nicParam)
{
LOCK_STATE_EX lockState;
POVS_VPORT_ENTRY vport;
@@ -274,8 +274,8 @@ done:
}
VOID
-OvsUpdateNic(POVS_SWITCH_CONTEXT switchContext,
- PNDIS_SWITCH_NIC_PARAMETERS nicParam)
+HvOnUpdateNic(POVS_SWITCH_CONTEXT switchContext,
+ PNDIS_SWITCH_NIC_PARAMETERS nicParam)
{
POVS_VPORT_ENTRY vport;
LOCK_STATE_EX lockState;
@@ -348,8 +348,8 @@ update_nic_done:
VOID
-OvsDisconnectNic(POVS_SWITCH_CONTEXT switchContext,
- PNDIS_SWITCH_NIC_PARAMETERS nicParam)
+HvOnDisconnectNic(POVS_SWITCH_CONTEXT switchContext,
+ PNDIS_SWITCH_NIC_PARAMETERS nicParam)
{
POVS_VPORT_ENTRY vport;
UINT32 portNo = 0;
@@ -399,8 +399,8 @@ done:
VOID
-OvsDeleteNic(POVS_SWITCH_CONTEXT switchContext,
- PNDIS_SWITCH_NIC_PARAMETERS nicParam)
+HvOnDeleteNic(POVS_SWITCH_CONTEXT switchContext,
+ PNDIS_SWITCH_NIC_PARAMETERS nicParam)
{
LOCK_STATE_EX lockState;
POVS_VPORT_ENTRY vport;
diff --git a/datapath-windows/ovsext/Vport.h b/datapath-windows/ovsext/Vport.h
index 3e28a74..b65b4ed 100644
--- a/datapath-windows/ovsext/Vport.h
+++ b/datapath-windows/ovsext/Vport.h
@@ -116,22 +116,22 @@ NDIS_STATUS OvsAddConfiguredSwitchPorts(struct
_OVS_SWITCH_CONTEXT *switchContex NDIS_STATUS
OvsInitConfiguredSwitchNics(struct _OVS_SWITCH_CONTEXT *switchContext);
VOID OvsClearAllSwitchVports(struct _OVS_SWITCH_CONTEXT *switchContext);
-NDIS_STATUS OvsCreateNic(POVS_SWITCH_CONTEXT switchContext,
- PNDIS_SWITCH_NIC_PARAMETERS nicParam);
-NDIS_STATUS OvsCreatePort(POVS_SWITCH_CONTEXT switchContext,
- PNDIS_SWITCH_PORT_PARAMETERS portParam);
-VOID OvsTeardownPort(POVS_SWITCH_CONTEXT switchContext,
- PNDIS_SWITCH_PORT_PARAMETERS portParam);
-VOID OvsDeletePort(POVS_SWITCH_CONTEXT switchContext,
- PNDIS_SWITCH_PORT_PARAMETERS portParam);
-VOID OvsConnectNic(POVS_SWITCH_CONTEXT switchContext,
+NDIS_STATUS HvOnCreateNic(POVS_SWITCH_CONTEXT switchContext,
+ PNDIS_SWITCH_NIC_PARAMETERS nicParam);
+NDIS_STATUS HvOnCreatePort(POVS_SWITCH_CONTEXT switchContext,
+ PNDIS_SWITCH_PORT_PARAMETERS portParam);
+VOID HvOnTeardownPort(POVS_SWITCH_CONTEXT switchContext,
+ PNDIS_SWITCH_PORT_PARAMETERS portParam); VOID
+HvOnDeletePort(POVS_SWITCH_CONTEXT switchContext,
+ PNDIS_SWITCH_PORT_PARAMETERS portParam); VOID
+HvOnConnectNic(POVS_SWITCH_CONTEXT switchContext,
+ PNDIS_SWITCH_NIC_PARAMETERS nicParam); VOID
+HvOnUpdateNic(POVS_SWITCH_CONTEXT switchContext,
PNDIS_SWITCH_NIC_PARAMETERS nicParam); -VOID
OvsUpdateNic(POVS_SWITCH_CONTEXT switchContext,
- PNDIS_SWITCH_NIC_PARAMETERS nicParam);
-VOID OvsDeleteNic(POVS_SWITCH_CONTEXT switchContext,
- PNDIS_SWITCH_NIC_PARAMETERS nicParam);
-VOID OvsDisconnectNic(POVS_SWITCH_CONTEXT switchContext,
- PNDIS_SWITCH_NIC_PARAMETERS nicParam);
+VOID HvOnDeleteNic(POVS_SWITCH_CONTEXT switchContext,
+ PNDIS_SWITCH_NIC_PARAMETERS nicParam); VOID
+HvOnDisconnectNic(POVS_SWITCH_CONTEXT switchContext,
+ PNDIS_SWITCH_NIC_PARAMETERS nicParam);
static __inline BOOLEAN
OvsIsTunnelVportType(OVS_VPORT_TYPE ovsType)
--
1.8.3.msysgit.0
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
