All the mail mirrored from lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] libxc: remove useless stuff from domain builder
@ 2015-09-14 12:54 Juergen Gross
  2015-09-14 13:23 ` Wei Liu
  0 siblings, 1 reply; 4+ messages in thread
From: Juergen Gross @ 2015-09-14 12:54 UTC (permalink / raw)
  To: xen-devel, Ian.Campbell, ian.jackson, stefano.stabellini,
	wei.liu2
  Cc: Juergen Gross

Remove unused fields from the domain builder and associated functions.

Signed-off-by: Juergen Gross <jgross@suse.com>
---
 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, "iiiis|ssisii", kwd_list,
                                       &domid, &store_evtchn, &mem_mb,
                                       &console_evtchn, &image,
                                       /* optional */
                                       &ramdisk, &cmdline, &flags,
-                                      &features, &vhpt, &superpages) )
+                                      &features, &superpages) )
         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

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] libxc: remove useless stuff from domain builder
  2015-09-14 12:54 [PATCH] libxc: remove useless stuff from domain builder Juergen Gross
@ 2015-09-14 13:23 ` Wei Liu
  2015-09-14 13:29   ` Juergen Gross
  0 siblings, 1 reply; 4+ messages in thread
From: Wei Liu @ 2015-09-14 13:23 UTC (permalink / raw)
  To: Juergen Gross
  Cc: wei.liu2, stefano.stabellini, ian.jackson, Ian.Campbell,
	xen-devel

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 <jgross@suse.com>
> ---
>  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, "iiiis|ssisii", kwd_list,
                                                      ^
This format string needs to be changed, too. It should be "iiis|ssisi",
i.e. one "i" needs to be removed.

>                                        &domid, &store_evtchn, &mem_mb,
>                                        &console_evtchn, &image,
>                                        /* optional */
>                                        &ramdisk, &cmdline, &flags,
> -                                      &features, &vhpt, &superpages) )
> +                                      &features, &superpages) )
>          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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] libxc: remove useless stuff from domain builder
  2015-09-14 13:23 ` Wei Liu
@ 2015-09-14 13:29   ` Juergen Gross
  2015-09-14 13:33     ` Wei Liu
  0 siblings, 1 reply; 4+ messages in thread
From: Juergen Gross @ 2015-09-14 13:29 UTC (permalink / raw)
  To: Wei Liu; +Cc: stefano.stabellini, ian.jackson, Ian.Campbell, xen-devel

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 <jgross@suse.com>
>> ---
>>   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, "iiiis|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 "iiiis|ssisi".


Juergen

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] libxc: remove useless stuff from domain builder
  2015-09-14 13:29   ` Juergen Gross
@ 2015-09-14 13:33     ` Wei Liu
  0 siblings, 0 replies; 4+ messages in thread
From: Wei Liu @ 2015-09-14 13:33 UTC (permalink / raw)
  To: Juergen Gross
  Cc: ian.jackson, stefano.stabellini, Wei Liu, Ian.Campbell, xen-devel

On Mon, Sep 14, 2015 at 03:29:57PM +0200, Juergen Gross wrote:
> 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 <jgross@suse.com>
> >>---
> >>  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, "iiiis|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 "iiiis|ssisi".
> 

Heh, right. Fortunately you got my idea. :-)

Wei.

> 
> Juergen

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2015-09-14 13:33 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-14 12:54 [PATCH] libxc: remove useless stuff from domain builder Juergen Gross
2015-09-14 13:23 ` Wei Liu
2015-09-14 13:29   ` Juergen Gross
2015-09-14 13:33     ` Wei Liu

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.