projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rhel: Don't delete bridges on boot.
[openvswitch]
/
lib
/
ovsdb-idl-provider.h
diff --git
a/lib/ovsdb-idl-provider.h
b/lib/ovsdb-idl-provider.h
index 45ea869af06bc20676fb4e7470b434866f142593..ef37d92183ae976ed384ee91d65148f124314f67 100644
(file)
--- a/
lib/ovsdb-idl-provider.h
+++ b/
lib/ovsdb-idl-provider.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009, 2010 Nicira Networks.
+/* Copyright (c) 2009, 2010
, 2011
Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-47,6
+47,7
@@
struct ovsdb_idl_column {
struct ovsdb_idl_table_class {
char *name;
struct ovsdb_idl_table_class {
char *name;
+ bool is_root;
const struct ovsdb_idl_column *columns;
size_t n_columns;
size_t allocation_size;
const struct ovsdb_idl_column *columns;
size_t n_columns;
size_t allocation_size;
@@
-54,12
+55,15
@@
struct ovsdb_idl_table_class {
struct ovsdb_idl_table {
const struct ovsdb_idl_table_class *class;
struct ovsdb_idl_table {
const struct ovsdb_idl_table_class *class;
+ unsigned char *modes; /* OVSDB_IDL_* bitmasks, indexed by column. */
+ bool need_table; /* Monitor table even if no columns? */
struct shash columns; /* Contains "const struct ovsdb_idl_column *"s. */
struct hmap rows; /* Contains "struct ovsdb_idl_row"s. */
struct ovsdb_idl *idl; /* Containing idl. */
};
struct ovsdb_idl_class {
struct shash columns; /* Contains "const struct ovsdb_idl_column *"s. */
struct hmap rows; /* Contains "struct ovsdb_idl_row"s. */
struct ovsdb_idl *idl; /* Containing idl. */
};
struct ovsdb_idl_class {
+ const char *database; /* <db-name> for this database. */
const struct ovsdb_idl_table_class *tables;
size_t n_tables;
};
const struct ovsdb_idl_table_class *tables;
size_t n_tables;
};
@@
-71,10
+75,6
@@
struct ovsdb_idl_row *ovsdb_idl_get_row_arc(
void ovsdb_idl_txn_verify(const struct ovsdb_idl_row *,
const struct ovsdb_idl_column *);
void ovsdb_idl_txn_verify(const struct ovsdb_idl_row *,
const struct ovsdb_idl_column *);
-void ovsdb_idl_txn_delete(struct ovsdb_idl_row *);
-struct ovsdb_idl_row *ovsdb_idl_txn_insert(
- struct ovsdb_idl_txn *,
- const struct ovsdb_idl_table_class *);
struct ovsdb_idl_txn *ovsdb_idl_txn_get(const struct ovsdb_idl_row *);
struct ovsdb_idl_txn *ovsdb_idl_txn_get(const struct ovsdb_idl_row *);