projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xenserver: Update MD5 sums of scripts for 5.5.900-29381p
[openvswitch]
/
utilities
/
ovs-vsctl.c
diff --git
a/utilities/ovs-vsctl.c
b/utilities/ovs-vsctl.c
index 1c00f436ef7e4f7bd939879ce0bfbecd78d7e4c3..0bf87c2be57db0ad9f95f6a65b7bb16527df55e5 100644
(file)
--- a/
utilities/ovs-vsctl.c
+++ b/
utilities/ovs-vsctl.c
@@
-449,7
+449,7
@@
default_db(void)
{
static char *def;
if (!def) {
{
static char *def;
if (!def) {
- def = xasprintf("unix:%s/
ovsdb-server
", ovs_rundir);
+ def = xasprintf("unix:%s/
db.sock
", ovs_rundir);
}
return def;
}
}
return def;
}
@@
-2353,7
+2353,6
@@
do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands,
enum ovsdb_idl_txn_status status;
struct vsctl_command *c;
int64_t next_cfg = 0;
enum ovsdb_idl_txn_status status;
struct vsctl_command *c;
int64_t next_cfg = 0;
- char *comment;
char *error;
txn = the_idl_txn = ovsdb_idl_txn_create(idl);
char *error;
txn = the_idl_txn = ovsdb_idl_txn_create(idl);
@@
-2361,9
+2360,7
@@
do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands,
ovsdb_idl_txn_set_dry_run(txn);
}
ovsdb_idl_txn_set_dry_run(txn);
}
- comment = xasprintf("ovs-vsctl: %s", args);
- ovsdb_idl_txn_add_comment(txn, comment);
- free(comment);
+ ovsdb_idl_txn_add_comment(txn, "ovs-vsctl: %s", args);
ovs = ovsrec_open_vswitch_first(idl);
if (!ovs) {
ovs = ovsrec_open_vswitch_first(idl);
if (!ovs) {
@@
-2386,12
+2383,7
@@
do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands,
vsctl_context_done(&ctx, c);
}
vsctl_context_done(&ctx, c);
}
- while ((status = ovsdb_idl_txn_commit(txn)) == TXN_INCOMPLETE) {
- ovsdb_idl_run(idl);
- ovsdb_idl_wait(idl);
- ovsdb_idl_txn_wait(txn);
- poll_block();
- }
+ status = ovsdb_idl_txn_commit_block(txn);
if (wait_for_reload && status == TXN_SUCCESS) {
next_cfg = ovsdb_idl_txn_get_increment_new_value(txn);
}
if (wait_for_reload && status == TXN_SUCCESS) {
next_cfg = ovsdb_idl_txn_get_increment_new_value(txn);
}