Formatting fixes for xenstat and xentop.

Signed-off-by: Josh Triplett <josht@us.ibm.com>
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/tools/xenstat/libxenstat/src/xen-interface.c b/tools/xenstat/libxenstat/src/xen-interface.c
index 876560fd1ee4039852681d75649bab0bcb92c5d6..d3a560a69fbf49240af4fa73b17ed3c4b9b3a5af 100644 (file)
--- a/tools/xenstat/libxenstat/src/xen-interface.c
+++ b/tools/xenstat/libxenstat/src/xen-interface.c
@@ -59,14 +59,15 @@ void xi_uninit(xi_handle *handle)
 }
 
 /* Make simple xen version hypervisor calls */
-static int xi_make_xen_version_hypercall(xi_handle *handle, long *vnum, xen_extraversion_t *ver)
+static int xi_make_xen_version_hypercall(xi_handle *handle, long *vnum,
+                                        xen_extraversion_t *ver)
 {
        privcmd_hypercall_t privcmd;
        multicall_entry_t multicall[2];
        int ret = 0;
 
        /* set up for doing hypercall */
-       privcmd.op = __HYPERVISOR_multicall; 
+       privcmd.op = __HYPERVISOR_multicall;
        privcmd.arg[0] = (unsigned long)multicall;
        privcmd.arg[1] = 2;
 
@@ -75,7 +76,7 @@ static int xi_make_xen_version_hypercall(xi_handle *handle, long *vnum, xen_extr
        multicall[0].args[0] = (unsigned long)XENVER_version;
 
        /* second to get xen version flag */
-       multicall[1].op = __HYPERVISOR_xen_version; 
+       multicall[1].op = __HYPERVISOR_xen_version;
        multicall[1].args[0] = (unsigned long)XENVER_extraversion;
        multicall[1].args[1] = (unsigned long)ver;
 
@@ -104,7 +105,8 @@ static int xi_make_xen_version_hypercall(xi_handle *handle, long *vnum, xen_extr
 }
 
 /* Make Xen Dom0 op hypervisor call */
-static int xi_make_dom0_op(xi_handle *handle, dom0_op_t *dom_op, int dom_opcode)
+static int xi_make_dom0_op(xi_handle *handle, dom0_op_t *dom_op,
+                          int dom_opcode)
 {
        privcmd_hypercall_t privcmd;
        int ret = 0;
@@ -191,11 +193,10 @@ long long xi_get_vcpu_usage(xi_handle *handle, unsigned int domain,
 }
 
 /* gets xen version information from hypervisor */
-int xi_get_xen_version(xi_handle *handle, long *vnum, xen_extraversion_t *ver) 
+int xi_get_xen_version(xi_handle *handle, long *vnum, xen_extraversion_t *ver)
 {
-
-        /* gets the XENVER_version and XENVER_extraversion */
-       if (xi_make_xen_version_hypercall( handle, vnum, ver) < 0) {; 
+       /* gets the XENVER_version and XENVER_extraversion */
+       if (xi_make_xen_version_hypercall( handle, vnum, ver) < 0) {
                perror("XEN VERSION Hypercall failed");
                return -1;
        }

diff --git a/tools/xenstat/libxenstat/src/xenstat.c b/tools/xenstat/libxenstat/src/xenstat.c
index 52f3e6741b16bb5130d1777843c28f678c45df35..e87475dc62a4d4868f8e1dc3abe68b8593b2774d 100644 (file)
--- a/tools/xenstat/libxenstat/src/xenstat.c
+++ b/tools/xenstat/libxenstat/src/xenstat.c
@@ -33,7 +33,7 @@ struct xenstat_handle {
        FILE *procnetdev;
 };
 
-#define SHORT_ASC_LEN 5                /* length of 65535 */
+#define SHORT_ASC_LEN 5                 /* length of 65535 */
 #define VERSION_SIZE (2 * SHORT_ASC_LEN + 1 + sizeof(xen_extraversion_t) + 1)
 
 struct xenstat_node {
@@ -170,7 +170,7 @@ xenstat_node *xenstat_get_node(xenstat_handle * handle, unsigned int flags)
        xenstat_node *node;
        dom0_physinfo_t physinfo;
        xen_extraversion_t version;
-       long vnum = 0; 
+       long vnum = 0;
        dom0_getdomaininfo_t domaininfo[DOMAIN_CHUNK_SIZE];
        unsigned int num_domains, new_domains;
        unsigned int i;
@@ -188,11 +188,11 @@ xenstat_node *xenstat_get_node(xenstat_handle * handle, unsigned int flags)
 
        /* Get the xen version number and xen version tag */
        if (xi_get_xen_version(handle->xihandle, &vnum, &version) < 0) {
-               free(node); 
+               free(node);
                return NULL;
-       } 
-       snprintf(node->xen_version, VERSION_SIZE,
-               "%ld.%ld%s\n", ((vnum >> 16) & 0xFFFF), vnum & 0xFFFF, (char *)version); 
+       }
+       snprintf(node->xen_version, VERSION_SIZE, "%ld.%ld%s\n",
+                ((vnum >> 16) & 0xFFFF), vnum & 0xFFFF, version);
 
        node->cpu_hz = ((unsigned long long)physinfo.cpu_khz) * 1000ULL;
        node->num_cpus =

diff --git a/tools/xenstat/libxenstat/src/xenstat.h b/tools/xenstat/libxenstat/src/xenstat.h
index 2c3617e302158eee867dd4a87d4b4ea542857255..218834a0805f5d0eb96ec156085adfe44030f83d 100644 (file)
--- a/tools/xenstat/libxenstat/src/xenstat.h
+++ b/tools/xenstat/libxenstat/src/xenstat.h
@@ -51,6 +51,7 @@ xenstat_domain *xenstat_node_domain(xenstat_node * node,
 /* Get the domain with the given index; used to loop over all domains. */
 xenstat_domain *xenstat_node_domain_by_index(xenstat_node * node,
                                             unsigned index);
+
 /* Get xen version of the node */
 const char *xenstat_node_xen_ver(xenstat_node * node);
 

diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c
index a153aada0e1f4c582eec163e0072c4d7ebf60b22..2a30cd4eb8d97985b471d7642fb4f09d7eb9bfbe 100644 (file)
--- a/tools/xenstat/xentop/xentop.c
+++ b/tools/xenstat/xentop/xentop.c
@@ -519,8 +519,8 @@ static void print_nets(xenstat_domain *domain)
        print("%4u", xenstat_domain_num_networks(domain));
 }
 
-/* Compares number of total network tx bytes of two domains, returning -1,0,1 for
- * <,=,> */
+/* Compares number of total network tx bytes of two domains, returning -1,0,1
+ * for <,=,> */
 static int compare_net_tx(xenstat_domain *domain1, xenstat_domain *domain2)
 {
        return -compare(tot_net_bytes(domain1, FALSE),
@@ -533,8 +533,8 @@ static void print_net_tx(xenstat_domain *domain)
        print("%8llu", tot_net_bytes(domain, FALSE)/1024);
 }
 
-/* Compares number of total network rx bytes of two domains, returning -1,0,1 for
- * <,=,> */
+/* Compares number of total network rx bytes of two domains, returning -1,0,1
+ * for <,=,> */
 static int compare_net_rx(xenstat_domain *domain1, xenstat_domain *domain2)
 {
        return -compare(tot_net_bytes(domain1, TRUE),
@@ -555,7 +555,7 @@ static unsigned long long tot_net_bytes(xenstat_domain *domain, int rx_flag)
        int i = 0;
        xenstat_network *network;
        unsigned num_networks = 0;
-        unsigned long long total = 0;
+       unsigned long long total = 0;
 
        /* How many networks? */
        num_networks = xenstat_domain_num_networks(domain);
@@ -564,12 +564,13 @@ static unsigned long long tot_net_bytes(xenstat_domain *domain, int rx_flag)
        for (i=0; i < num_networks; i++) {
                /* Next get the network information */
                network = xenstat_domain_network(domain,i);
-                if (rx_flag) 
+               if (rx_flag)
                        total += xenstat_network_rbytes(network);
-                else 
+               else
                        total += xenstat_network_tbytes(network);
        }
-        return (total);
+
+       return total;
 }
 
 /* Compares security id (ssid) of two domains, returning -1,0,1 for <,=,> */