xenserver: In vif script, tolerate port existing when we (re)add it.

[openvswitch] / include / openflow / nicira-ext.h

diff --git a/include/openflow/nicira-ext.h b/include/openflow/nicira-ext.h
index c4c60622638264b9c5bcdfc7bf8cc974d8e80dcb..7232d570723c8c54ab23ce95e931e82af67d56bc 100644 (file)
--- a/include/openflow/nicira-ext.h
+++ b/include/openflow/nicira-ext.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009 Nicira Networks
+ * Copyright (c) 2008, 2009, 2010 Nicira Networks
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,30 +37,14 @@ enum nicira_type {
      * pairs in the form "key=value\n". */
     NXT_STATUS_REPLY,
 
-    /* Configure an action.  Most actions do not require configuration
-     * beyond that supplied in the actual action call. */
-    NXT_ACT_SET_CONFIG,
-
-    /* Get configuration of action. */
-    NXT_ACT_GET_CONFIG,
-
-    /* Remote command execution.  The request body is a sequence of strings
-     * delimited by null bytes.  The first string is a command name.
-     * Subsequent strings are command arguments. */
-    NXT_COMMAND_REQUEST,
-
-    /* Remote command execution reply, sent when the command's execution
-     * completes.  The reply body is struct nx_command_reply. */
-    NXT_COMMAND_REPLY,
-
     /* No longer used. */
+    NXT_ACT_SET_CONFIG__OBSOLETE,
+    NXT_ACT_GET_CONFIG__OBSOLETE,
+    NXT_COMMAND_REQUEST__OBSOLETE,
+    NXT_COMMAND_REPLY__OBSOLETE,
     NXT_FLOW_END_CONFIG__OBSOLETE,
-
-    /* No longer used. */
     NXT_FLOW_END__OBSOLETE,
-
-    /* Management protocol.  See "openflow-mgmt.h". */
-    NXT_MGMT,
+    NXT_MGMT__OBSOLETE,
 };
 
 struct nicira_header {
@@ -68,7 +52,7 @@ struct nicira_header {
     uint32_t vendor;            /* NX_VENDOR_ID. */
     uint32_t subtype;           /* One of NXT_* above. */
 };
-OFP_ASSERT(sizeof(struct nicira_header) == sizeof(struct ofp_vendor_header) + 4);
+OFP_ASSERT(sizeof(struct nicira_header) == 16);
 
 
 enum nx_action_subtype {
@@ -97,24 +81,4 @@ struct nx_action_header {
 };
 OFP_ASSERT(sizeof(struct nx_action_header) == 16);
 
-/* Status bits for NXT_COMMAND_REPLY. */
-enum {
-    NXT_STATUS_EXITED = 1 << 31,   /* Exited normally. */
-    NXT_STATUS_SIGNALED = 1 << 30, /* Exited due to signal. */
-    NXT_STATUS_UNKNOWN = 1 << 29,  /* Exited for unknown reason. */
-    NXT_STATUS_COREDUMP = 1 << 28, /* Exited with core dump. */
-    NXT_STATUS_ERROR = 1 << 27,    /* Command could not be executed. */
-    NXT_STATUS_STARTED = 1 << 26,  /* Command was started. */
-    NXT_STATUS_EXITSTATUS = 0xff,  /* Exit code mask if NXT_STATUS_EXITED. */
-    NXT_STATUS_TERMSIG = 0xff,     /* Signal number if NXT_STATUS_SIGNALED. */
-};
-
-/* NXT_COMMAND_REPLY. */
-struct nx_command_reply {
-    struct nicira_header nxh;
-    uint32_t status;            /* Status bits defined above. */
-    /* Followed by any number of bytes of process output. */
-};
-OFP_ASSERT(sizeof(struct nx_command_reply) == 20);
-
 #endif /* openflow/nicira-ext.h */