Re: [Xen-devel] [PATCH WIP 1/6] xen/arm: fix the shared_info and vcpu_info structs

[Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>]

On Mon, 16 Jul 2012, Konrad Rzeszutek Wilk wrote:
> On Fri, Jul 13, 2012 at 11:08:58AM -0600, Ian Campbell wrote:
> > On Fri, 2012-07-13 at 12:48 -0400, Stefano Stabellini wrote:
> > > On Mon, 9 Jul 2012, Konrad Rzeszutek Wilk wrote:
> > > > On Fri, Jun 22, 2012 at 05:14:40PM +0100, Stefano Stabellini wrote:
> > > > > Fix the shared_info and vcpu_info struct definitions to match the ones
> > > > > in Xen.
> > > > 
> > > > Is there a corresponding c/s in the Xen tree for this?
> > > 
> > > That's the problem: arch_vcpu_info and arch_shared_info haven't been
> > > defined in Xen yet on ARM.
> > 
> > Strictly speaking they are defined (in xen/include/public/arch-arm.h),
> > they are just empty ;-)
> > 
> > > I think the ones below have been copied from xen/x86 by mistake.
> > 
> > Yes, it does look that way.
> 
> Ah, pls mention that in the git commit description.

OK, see below.

I am not sending out a second version of this patch series because I
still consider it a work in progress.
I'll send out a new up-to-date patch series with all the fixes as soon
as I have it.


---

xen/arm: fix the shared_info and vcpu_info structs

Fix the shared_info and vcpu_info struct definitions to match the ones
in Xen: the current arch_vcpu_info and arch_shared_info have been copied
from x86 by mistake (the Xen version of these structs are just empty).

Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>

diff --git a/arch/arm/include/asm/xen/interface.h 
b/arch/arm/include/asm/xen/interface.h
index 3ad2d4b..8ab7cebb 100644
--- a/arch/arm/include/asm/xen/interface.h
+++ b/arch/arm/include/asm/xen/interface.h
@@ -40,19 +40,10 @@ DEFINE_GUEST_HANDLE(xen_pfn_t);
 #endif
 
 /* Maximum number of virtual CPUs in multi-processor guests. */
-#define MAX_VIRT_CPUS 32
+#define MAX_VIRT_CPUS 1
 
-struct arch_vcpu_info {
-    unsigned long cr2;
-    unsigned long pad; /* sizeof(vcpu_info_t) == 64 */
-};
-
-struct arch_shared_info {
-    unsigned long max_pfn;                  /* max pfn that appears in table */
-    /* Frame containing list of mfns containing list of mfns containing p2m. */
-    unsigned long pfn_to_mfn_frame_list_list;
-    unsigned long nmi_reason;
-};
+struct arch_vcpu_info { };
+struct arch_shared_info { };
 
 /* XXX: Move pvclock definitions some place arch independent */
 struct pvclock_vcpu_time_info {

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