[Xen-devel] [PATCH] libxc: remove useless stuff from domain builder

2015-09-14 Thread Juergen Gross 
Remove unused fields from the domain builder and associated functions.

Signed-off-by: Juergen Gross 
---
 tools/libxc/include/xc_dom.h  | 2 --
 tools/python/xen/lowlevel/xc/xc.c | 8 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/tools/libxc/include/xc_dom.h b/tools/libxc/include/xc_dom.h
index 6192fba..5731098 100644
--- a/tools/libxc/include/xc_dom.h
+++ b/tools/libxc/include/xc_dom.h
@@ -132,7 +132,6 @@ struct xc_dom_image {
 xen_pfn_t total_pages;
 xen_pfn_t p2m_size; /* number of pfns covered by p2m */
 struct xc_dom_phys *phys_pages;
-int realmodearea_log;
 #if defined (__arm__) || defined(__aarch64__)
 xen_pfn_t rambank_size[GUEST_RAM_BANKS];
 #endif
@@ -157,7 +156,6 @@ struct xc_dom_image {
 
 xc_interface *xch;
 domid_t guest_domid;
-int8_t vhpt_size_log2; /* for IA64 */
 int8_t superpages;
 int claim_enabled; /* 0 by default, 1 enables it */
 int shadow_enabled;
diff --git a/tools/python/xen/lowlevel/xc/xc.c 
b/tools/python/xen/lowlevel/xc/xc.c
index 9ab53fb..668e875 100644
--- a/tools/python/xen/lowlevel/xc/xc.c
+++ b/tools/python/xen/lowlevel/xc/xc.c
@@ -463,7 +463,6 @@ static PyObject *pyxc_linux_build(XcObject *self,
 char *image, *ramdisk = NULL, *cmdline = "", *features = NULL;
 int flags = 0;
 int store_evtchn, console_evtchn;
-int vhpt = 0;
 int superpages = 0;
 unsigned int mem_mb;
 unsigned long store_mfn = 0;
@@ -477,23 +476,20 @@ static PyObject *pyxc_linux_build(XcObject *self,
 "console_evtchn", "image",
 /* optional */
 "ramdisk", "cmdline", "flags",
-"features", "vhpt", "superpages", NULL };
+"features", "superpages", NULL };
 
 if ( !PyArg_ParseTupleAndKeywords(args, kwds, "s|ssisii", kwd_list,
   , _evtchn, _mb,
   _evtchn, ,
   /* optional */
   , , ,
-  , , ) )
+  , ) )
 return NULL;
 
 xc_dom_loginit(self->xc_handle);
 if (!(dom = xc_dom_allocate(self->xc_handle, cmdline, features)))
 return pyxc_error_to_exception(self->xc_handle);
 
-/* for IA64 */
-dom->vhpt_size_log2 = vhpt;
-
 dom->superpages = superpages;
 
 if ( xc_dom_linux_build(self->xc_handle, dom, domid, mem_mb, image,
-- 
2.1.4


___
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [Xen-devel] [PATCH] libxc: remove useless stuff from domain builder

2015-09-14 Thread Wei Liu 
On Mon, Sep 14, 2015 at 02:54:09PM +0200, Juergen Gross wrote:
> Remove unused fields from the domain builder and associated functions.
> 
> Signed-off-by: Juergen Gross 
> ---
>  tools/libxc/include/xc_dom.h  | 2 --
>  tools/python/xen/lowlevel/xc/xc.c | 8 ++--
>  2 files changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/tools/libxc/include/xc_dom.h b/tools/libxc/include/xc_dom.h
> index 6192fba..5731098 100644
> --- a/tools/libxc/include/xc_dom.h
> +++ b/tools/libxc/include/xc_dom.h
> @@ -132,7 +132,6 @@ struct xc_dom_image {
>  xen_pfn_t total_pages;
>  xen_pfn_t p2m_size; /* number of pfns covered by p2m */
>  struct xc_dom_phys *phys_pages;
> -int realmodearea_log;
>  #if defined (__arm__) || defined(__aarch64__)
>  xen_pfn_t rambank_size[GUEST_RAM_BANKS];
>  #endif
> @@ -157,7 +156,6 @@ struct xc_dom_image {
>  
>  xc_interface *xch;
>  domid_t guest_domid;
> -int8_t vhpt_size_log2; /* for IA64 */
>  int8_t superpages;
>  int claim_enabled; /* 0 by default, 1 enables it */
>  int shadow_enabled;
> diff --git a/tools/python/xen/lowlevel/xc/xc.c 
> b/tools/python/xen/lowlevel/xc/xc.c
> index 9ab53fb..668e875 100644
> --- a/tools/python/xen/lowlevel/xc/xc.c
> +++ b/tools/python/xen/lowlevel/xc/xc.c
> @@ -463,7 +463,6 @@ static PyObject *pyxc_linux_build(XcObject *self,
>  char *image, *ramdisk = NULL, *cmdline = "", *features = NULL;
>  int flags = 0;
>  int store_evtchn, console_evtchn;
> -int vhpt = 0;
>  int superpages = 0;
>  unsigned int mem_mb;
>  unsigned long store_mfn = 0;
> @@ -477,23 +476,20 @@ static PyObject *pyxc_linux_build(XcObject *self,
>  "console_evtchn", "image",
>  /* optional */
>  "ramdisk", "cmdline", "flags",
> -"features", "vhpt", "superpages", NULL };
> +"features", "superpages", NULL };
>  
>  if ( !PyArg_ParseTupleAndKeywords(args, kwds, "s|ssisii", kwd_list,
  ^
This format string needs to be changed, too. It should be "iiis|ssisi",
i.e. one "i" needs to be removed.

>, _evtchn, _mb,
>_evtchn, ,
>/* optional */
>, , ,
> -  , , ) )
> +  , ) )
>  return NULL;
>  
>  xc_dom_loginit(self->xc_handle);
>  if (!(dom = xc_dom_allocate(self->xc_handle, cmdline, features)))
>  return pyxc_error_to_exception(self->xc_handle);
>  
> -/* for IA64 */
> -dom->vhpt_size_log2 = vhpt;
> -
>  dom->superpages = superpages;
>  
>  if ( xc_dom_linux_build(self->xc_handle, dom, domid, mem_mb, image,
> -- 
> 2.1.4

___
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [Xen-devel] [PATCH] libxc: remove useless stuff from domain builder

2015-09-14 Thread Juergen Gross 

On 09/14/2015 03:23 PM, Wei Liu wrote:

On Mon, Sep 14, 2015 at 02:54:09PM +0200, Juergen Gross wrote:

Remove unused fields from the domain builder and associated functions.

Signed-off-by: Juergen Gross 
---
  tools/libxc/include/xc_dom.h  | 2 --
  tools/python/xen/lowlevel/xc/xc.c | 8 ++--
  2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/tools/libxc/include/xc_dom.h b/tools/libxc/include/xc_dom.h
index 6192fba..5731098 100644
--- a/tools/libxc/include/xc_dom.h
+++ b/tools/libxc/include/xc_dom.h
@@ -132,7 +132,6 @@ struct xc_dom_image {
  xen_pfn_t total_pages;
  xen_pfn_t p2m_size; /* number of pfns covered by p2m */
  struct xc_dom_phys *phys_pages;
-int realmodearea_log;
  #if defined (__arm__) || defined(__aarch64__)
  xen_pfn_t rambank_size[GUEST_RAM_BANKS];
  #endif
@@ -157,7 +156,6 @@ struct xc_dom_image {

  xc_interface *xch;
  domid_t guest_domid;
-int8_t vhpt_size_log2; /* for IA64 */
  int8_t superpages;
  int claim_enabled; /* 0 by default, 1 enables it */
  int shadow_enabled;
diff --git a/tools/python/xen/lowlevel/xc/xc.c 
b/tools/python/xen/lowlevel/xc/xc.c
index 9ab53fb..668e875 100644
--- a/tools/python/xen/lowlevel/xc/xc.c
+++ b/tools/python/xen/lowlevel/xc/xc.c
@@ -463,7 +463,6 @@ static PyObject *pyxc_linux_build(XcObject *self,
  char *image, *ramdisk = NULL, *cmdline = "", *features = NULL;
  int flags = 0;
  int store_evtchn, console_evtchn;
-int vhpt = 0;
  int superpages = 0;
  unsigned int mem_mb;
  unsigned long store_mfn = 0;
@@ -477,23 +476,20 @@ static PyObject *pyxc_linux_build(XcObject *self,
  "console_evtchn", "image",
  /* optional */
  "ramdisk", "cmdline", "flags",
-"features", "vhpt", "superpages", NULL };
+"features", "superpages", NULL };

  if ( !PyArg_ParseTupleAndKeywords(args, kwds, "s|ssisii", kwd_list,

   ^
This format string needs to be changed, too. It should be "iiis|ssisi",
i.e. one "i" needs to be removed.


Indeed.

BTW: you've removed two "i"s. It has to be "s|ssisi".


Juergen

___
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel