[Xen-changelog] [xen-unstable] sysctl: Remove sockets_per_node field from physinfo command.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1271144236 -3600
# Node ID d2d8805868f1ee2359d7f5be665af1dde610f1ee
# Parent  9471200daee46c5a6f3b054b0a53f95545386029
sysctl: Remove sockets_per_node field from physinfo command.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@xxxxxxxxx>
---
 tools/python/xen/lowlevel/xc/xc.c |    1 -
 tools/python/xen/xend/XendNode.py |    1 -
 xen/arch/x86/sysctl.c             |    3 ---
 xen/include/public/sysctl.h       |    1 -
 4 files changed, 6 deletions(-)

diff -r 9471200daee4 -r d2d8805868f1 tools/python/xen/lowlevel/xc/xc.c
--- a/tools/python/xen/lowlevel/xc/xc.c Mon Apr 12 18:28:33 2010 +0100
+++ b/tools/python/xen/lowlevel/xc/xc.c Tue Apr 13 08:37:16 2010 +0100
@@ -1179,7 +1179,6 @@ static PyObject *pyxc_physinfo(XcObject 
                             "nr_nodes",         pinfo.nr_nodes,
                             "threads_per_core", pinfo.threads_per_core,
                             "cores_per_socket", pinfo.cores_per_socket,
-                            "sockets_per_node", pinfo.sockets_per_node,
                             "nr_cpus",          pinfo.nr_cpus, 
                             "total_memory",     
pages_to_kib(pinfo.total_pages),
                             "free_memory",      pages_to_kib(pinfo.free_pages),
diff -r 9471200daee4 -r d2d8805868f1 tools/python/xen/xend/XendNode.py
--- a/tools/python/xen/xend/XendNode.py Mon Apr 12 18:28:33 2010 +0100
+++ b/tools/python/xen/xend/XendNode.py Tue Apr 13 08:37:16 2010 +0100
@@ -931,7 +931,6 @@ class XendNode:
                       'nr_nodes',
                       'cores_per_socket',
                       'threads_per_core',
-                      'sockets_per_node',
                       'cpu_mhz',
                       'hw_caps',
                       'virt_caps',
diff -r 9471200daee4 -r d2d8805868f1 xen/arch/x86/sysctl.c
--- a/xen/arch/x86/sysctl.c     Mon Apr 12 18:28:33 2010 +0100
+++ b/xen/arch/x86/sysctl.c     Tue Apr 13 08:37:16 2010 +0100
@@ -63,9 +63,6 @@ long arch_do_sysctl(
         pi->nr_nodes = num_online_nodes();
         pi->max_node_id = last_node(node_online_map);
         pi->max_cpu_id = last_cpu(cpu_online_map);
-        pi->sockets_per_node = 
-            pi->nr_cpus / 
-            (pi->nr_nodes * pi->cores_per_socket * pi->threads_per_core);
         pi->total_pages = total_pages;
         pi->free_pages = avail_domheap_pages();
         pi->scrub_pages = 0;
diff -r 9471200daee4 -r d2d8805868f1 xen/include/public/sysctl.h
--- a/xen/include/public/sysctl.h       Mon Apr 12 18:28:33 2010 +0100
+++ b/xen/include/public/sysctl.h       Tue Apr 13 08:37:16 2010 +0100
@@ -93,7 +93,6 @@ struct xen_sysctl_physinfo {
 struct xen_sysctl_physinfo {
     uint32_t threads_per_core;
     uint32_t cores_per_socket;
-    uint32_t sockets_per_node;
     uint32_t nr_cpus, max_cpu_id;
     uint32_t nr_nodes, max_node_id;
     uint32_t cpu_khz;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog