projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xenserver: updated xen-bugtool to XenServer trunk version.
[openvswitch]
/
ofproto
/
status.c
diff --git
a/ofproto/status.c
b/ofproto/status.c
index b2cb93568abc91fc0872fd5bb914f8d8acdf6f7e..01cda01a1f498f0cf3beb682ed151a54236bfbb0 100644
(file)
--- a/
ofproto/status.c
+++ b/
ofproto/status.c
@@
-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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-130,19
+130,14
@@
static void
config_status_cb(struct status_reply *sr, void *ofproto_)
{
const struct ofproto *ofproto = ofproto_;
config_status_cb(struct status_reply *sr, void *ofproto_)
{
const struct ofproto *ofproto = ofproto_;
- uint64_t datapath_id
, mgmt_id
;
+ uint64_t datapath_id;
struct svec listeners;
int probe_interval, max_backoff;
size_t i;
datapath_id = ofproto_get_datapath_id(ofproto);
if (datapath_id) {
struct svec listeners;
int probe_interval, max_backoff;
size_t i;
datapath_id = ofproto_get_datapath_id(ofproto);
if (datapath_id) {
- status_reply_put(sr, "datapath-id=%"PRIx64, datapath_id);
- }
-
- mgmt_id = ofproto_get_mgmt_id(ofproto);
- if (mgmt_id) {
- status_reply_put(sr, "mgmt-id=%"PRIx64, mgmt_id);
+ status_reply_put(sr, "datapath-id=%016"PRIx64, datapath_id);
}
svec_init(&listeners);
}
svec_init(&listeners);
@@
-177,7
+172,7
@@
switch_status_cb(struct status_reply *sr, void *ss_)
struct switch_status *
switch_status_create(const struct ofproto *ofproto)
{
struct switch_status *
switch_status_create(const struct ofproto *ofproto)
{
- struct switch_status *ss = x
calloc(1,
sizeof *ss);
+ struct switch_status *ss = x
zalloc(
sizeof *ss);
ss->booted = time_now();
list_init(&ss->categories);
ss->config_cat = switch_status_register(ss, "config", config_status_cb,
ss->booted = time_now();
list_init(&ss->categories);
ss->config_cat = switch_status_register(ss, "config", config_status_cb,