On Mon, Oct 06, 2014 at 10:48:15AM -0700, Jarno Rajahalme wrote: > > On Sep 30, 2014, at 5:47 PM, Ben Pfaff <b...@nicira.com> wrote: > > > This is a first step toward improving the abstraction of OXM and NXM in the > > tree. As an immediate improvement, this commit removes all of the > > definitions of the OXM and NXM constants from the top-level header files, > > because they are no longer used anywhere. > > > > Signed-off-by: Ben Pfaff <b...@nicira.com> > > --- > > v1->v2: Avoid shadowing global 'line' in extract-ofp-fields. > > --- > > build-aux/extract-ofp-fields | 458 +++++++++++++ > > include/openflow/nicira-ext.h | 464 +------------ > > include/openflow/openflow-1.2.h | 123 ---- > > lib/automake.mk | 8 +- > > lib/meta-flow.c | 769 +-------------------- > > lib/meta-flow.h | 1398 > > ++++++++++++++++++++++++++++++++++++--- > > lib/ofp-actions.c | 2 +- > > 7 files changed, 1773 insertions(+), 1449 deletions(-) > > create mode 100755 build-aux/extract-ofp-fields > > > > (snip) > > > diff --git a/lib/meta-flow.h b/lib/meta-flow.h > > index c11f7ab..c443c9c 100644 > > --- a/lib/meta-flow.h > > +++ b/lib/meta-flow.h > > @@ -29,116 +29,1309 @@ > > struct ds; > > struct match; > > (snip) > > > + * Field specifications > > + * ==================== > > + * > > + * Each of the enumeration values below represents a field. The comments > > + * preceding each enum must be in a stylized form that is parsed at compile > > + * time by the extract-ofp-fields program. The comment itself consists of > > a > > + * series of paragraphs separate by blank lines. The paragraphs consist > > of: > > + * > > + * - The first paragraph gives the user-visible name of the field as a > > + * quoted string. This is the name used for parsing and formatting > > the > > + * field. > > + * > > + * For historical reasons, some fields have an additional name that > > is > > + * accepted as an alternative in parsing. This name, when there is > > one, > > + * is given as a quoted string in parentheses along with "aka". For > > + * example: > > + * > > + * "tun_id" (aka "tunnel_id"). > > + * > > + * New fields should have only one name. > > + * > > + * - Any number of paragraphs of free text that describe the field. > > This > > + * is meant for human readers, so extract-ofp-fields ignores it. > > + * > > + * - A final paragraph that consists of a series of key-value pairs, > > one > > + * per line, in the form "key: value." where the period at the end > > of the > > + * line is a mandatory part of the syntax. > > + * > > + * Every field must specify:the following key-value pairs: > > ?specify the" > > > + * > > + * Type: > > + * > > + * The format and size of the field's value. Some possible values are > > + * generic: > > + * > > + * u8: A one-byte field. > > + * be16: A two-byte field. > > + * be32: A four-byte field. > > + * be64: An eight-byte field. > > + * > > + > > (snip) > > > + /* "metadata". > > + * > > + * A scratch pad value standardized in OpenFlow 1.1+. > > Would be good to state that the initial value (in the beginning of the > pipeline) is zero? > > > + * > > + * Type: be64. > > + * Maskable: bitwise. > > + * Formatting: hexadecimal. > > + * Prerequisites: none. > > + * Access: read/write. > > + * NXM: none. > > + * OXM: OXM_OF_METADATA(2) since OF1.2 and v1.8. > > + * OF1.1: bitwise mask. > > + */ > > + MFF_METADATA, > > + > > (snip) > > Acked-by: Jarno Rajahalme <jrajaha...@nicira.com>
Thanks! I applied both of those fixes and I will apply this in a few minutes after running the tests again. _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
