Acked-By: Yin Lin <li...@vmware.com>
On Wed, Jul 13, 2016 at 4:38 PM, Sairam Venugopal <vsai...@vmware.com>
wrote:
> OVS_EVENT_ENTRY currently handles only Vport related events. Updating the
> name of the struct to OVS_VPORT_EVENT_ENTRY. This will assist in
> introducing other structs to manage other events.
>
> Remove OVS_EVENT_STATUS since it's currently not in use.
>
> Signed-off-by: Sairam Venugopal <vsai...@vmware.com>
> ---
> datapath-windows/ovsext/Datapath.c | 4 ++--
> datapath-windows/ovsext/DpInternal.h | 10 ++--------
> datapath-windows/ovsext/Event.c | 4 ++--
> datapath-windows/ovsext/Event.h | 6 +++---
> datapath-windows/ovsext/Vport.c | 6 +++---
> 5 files changed, 12 insertions(+), 18 deletions(-)
>
> diff --git a/datapath-windows/ovsext/Datapath.c
> b/datapath-windows/ovsext/Datapath.c
> index 4f47be5..42af450 100644
> --- a/datapath-windows/ovsext/Datapath.c
> +++ b/datapath-windows/ovsext/Datapath.c
> @@ -1582,7 +1582,7 @@ MapIrpOutputBuffer(PIRP irp,
> */
> static NTSTATUS
> OvsPortFillInfo(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
> - POVS_EVENT_ENTRY eventEntry,
> + POVS_VPORT_EVENT_ENTRY eventEntry,
> PNL_BUFFER nlBuf)
> {
> NTSTATUS status;
> @@ -1659,7 +1659,7 @@ OvsReadEventCmdHandler(POVS_USER_PARAMS_CONTEXT
> usrParamsCtx,
> #endif
> NL_BUFFER nlBuf;
> NTSTATUS status;
> - OVS_EVENT_ENTRY eventEntry;
> + OVS_VPORT_EVENT_ENTRY eventEntry;
>
> ASSERT(usrParamsCtx->devOp == OVS_READ_DEV_OP);
>
> diff --git a/datapath-windows/ovsext/DpInternal.h
> b/datapath-windows/ovsext/DpInternal.h
> index 42b5ec9..8abe61d 100644
> --- a/datapath-windows/ovsext/DpInternal.h
> +++ b/datapath-windows/ovsext/DpInternal.h
> @@ -328,19 +328,13 @@ enum {
> };
>
>
> -typedef struct _OVS_EVENT_ENTRY {
> +typedef struct _OVS_VPORT_EVENT_ENTRY {
> UINT32 portNo;
> OVS_VPORT_TYPE ovsType;
> UINT32 upcallPid;
> CHAR ovsName[OVS_MAX_PORT_NAME_LENGTH];
> UINT32 type;
> -} OVS_EVENT_ENTRY, *POVS_EVENT_ENTRY;
> -
> -
> -typedef struct _OVS_EVENT_STATUS {
> - uint32_t numberEntries;
> - OVS_EVENT_ENTRY eventEntries[0];
> -} OVS_EVENT_STATUS, *POVS_EVENT_STATUS;
> +} OVS_VPORT_EVENT_ENTRY, *POVS_VPORT_EVENT_ENTRY;
>
> #pragma pack(pop)
>
> diff --git a/datapath-windows/ovsext/Event.c
> b/datapath-windows/ovsext/Event.c
> index f9bea7f..53ee556 100644
> --- a/datapath-windows/ovsext/Event.c
> +++ b/datapath-windows/ovsext/Event.c
> @@ -109,7 +109,7 @@ OvsCleanupEvent(POVS_OPEN_INSTANCE instance)
> *
> --------------------------------------------------------------------------
> */
> VOID
> -OvsPostEvent(POVS_EVENT_ENTRY event)
> +OvsPostEvent(POVS_VPORT_EVENT_ENTRY event)
> {
> POVS_EVENT_QUEUE_ELEM elem;
> POVS_EVENT_QUEUE queue;
> @@ -410,7 +410,7 @@ unlock:
> */
> NTSTATUS
> OvsRemoveEventEntry(POVS_OPEN_INSTANCE instance,
> - POVS_EVENT_ENTRY entry)
> + POVS_VPORT_EVENT_ENTRY entry)
> {
> NTSTATUS status = STATUS_UNSUCCESSFUL;
> POVS_EVENT_QUEUE queue;
> diff --git a/datapath-windows/ovsext/Event.h
> b/datapath-windows/ovsext/Event.h
> index b087875..fe03f0e 100644
> --- a/datapath-windows/ovsext/Event.h
> +++ b/datapath-windows/ovsext/Event.h
> @@ -19,7 +19,7 @@
>
> typedef struct _OVS_EVENT_QUEUE_ELEM {
> LIST_ENTRY link;
> - OVS_EVENT_ENTRY event;
> + OVS_VPORT_EVENT_ENTRY event;
> } OVS_EVENT_QUEUE_ELEM, *POVS_EVENT_QUEUE_ELEM;
>
> typedef struct _OVS_EVENT_QUEUE {
> @@ -38,7 +38,7 @@ VOID OvsCleanupEventQueue(VOID);
> struct _OVS_OPEN_INSTANCE;
>
> VOID OvsCleanupEvent(struct _OVS_OPEN_INSTANCE *instance);
> -VOID OvsPostEvent(POVS_EVENT_ENTRY event);
> +VOID OvsPostEvent(POVS_VPORT_EVENT_ENTRY event);
> NTSTATUS OvsSubscribeEventIoctl(PFILE_OBJECT fileObject, PVOID
> inputBuffer,
> UINT32 inputLength);
> NTSTATUS OvsPollEventIoctl(PFILE_OBJECT fileObject, PVOID inputBuffer,
> @@ -46,6 +46,6 @@ NTSTATUS OvsPollEventIoctl(PFILE_OBJECT fileObject,
> PVOID inputBuffer,
> UINT32 outputLength, UINT32 *replyLen);
> NTSTATUS OvsWaitEventIoctl(PIRP irp, PFILE_OBJECT fileObject,
> PVOID inputBuffer, UINT32 inputLength);
> -NTSTATUS OvsRemoveEventEntry(PVOID instance, POVS_EVENT_ENTRY entry);
> +NTSTATUS OvsRemoveEventEntry(PVOID instance, POVS_VPORT_EVENT_ENTRY
> entry);
>
> #endif /* __EVENT_H_ */
> diff --git a/datapath-windows/ovsext/Vport.c
> b/datapath-windows/ovsext/Vport.c
> index 1462453..534d76a 100644
> --- a/datapath-windows/ovsext/Vport.c
> +++ b/datapath-windows/ovsext/Vport.c
> @@ -292,7 +292,7 @@ HvDeletePort(POVS_SWITCH_CONTEXT switchContext,
> * delete will delete the vport.
> */
> if (vport) {
> - OVS_EVENT_ENTRY event;
> + OVS_VPORT_EVENT_ENTRY event;
>
> event.portNo = vport->portNo;
> event.ovsType = vport->ovsType;
> @@ -531,7 +531,7 @@ HvUpdateNic(POVS_SWITCH_CONTEXT switchContext,
> vport->numaNodeId = nicParam->NumaNodeId;
>
> if (nameChanged) {
> - OVS_EVENT_ENTRY evt;
> + OVS_VPORT_EVENT_ENTRY evt;
> evt.portNo = vport->portNo;
> evt.ovsType = vport->ovsType;
> evt.upcallPid = vport->upcallPid;
> @@ -567,7 +567,7 @@ HvDisconnectNic(POVS_SWITCH_CONTEXT switchContext,
> POVS_VPORT_ENTRY vport;
> LOCK_STATE_EX lockState;
> BOOLEAN isInternalPort = FALSE;
> - OVS_EVENT_ENTRY event;
> + OVS_VPORT_EVENT_ENTRY event;
>
> VPORT_NIC_ENTER(nicParam);
>
> --
> 2.9.0.windows.1
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
>
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
