[patch] final header fixes

[patch] final header fixes

[Hollis Blanchard]

[-- Attachment #1: Type: text/plain, Size: 290 bytes --]

I think this is the last of the header fixes I've run across. Though it's 
sometimes difficult to tell, I believe Xen/ia64 has asm/mm.h, flushtlb.h, 
page.h, and shadow.h. Please apply.

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>

-- 
Hollis Blanchard
IBM Linux Technology Center

[-- Attachment #2: xen-headers.diff --]
[-- Type: text/x-diff, Size: 721 bytes --]

===== xen/include/xen/sched.h 1.162 vs edited =====
--- 1.162/xen/include/xen/sched.h	2005-03-09 03:01:45 -06:00
+++ edited/xen/include/xen/sched.h	2005-03-11 12:53:01 -06:00
@@ -22,6 +22,7 @@
 #include <xen/grant_table.h>
 #include <asm/hardirq.h>
 #include <asm/domain.h>
+#include <asm/bitops.h>
 
 extern unsigned long volatile jiffies;
 extern rwlock_t domlist_lock;
===== xen/include/xen/softirq.h 1.23 vs edited =====
--- 1.23/xen/include/xen/softirq.h	2004-11-01 08:33:52 -06:00
+++ edited/xen/include/xen/softirq.h	2005-03-11 13:01:23 -06:00
@@ -14,6 +14,7 @@
 #include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/smp.h>
+#include <xen/irq_cpustat.h>
 #include <asm/bitops.h>
 #include <asm/hardirq.h>
 

Re: [patch] final header fixes

[Keir Fraser]

One of the two additions was already applied. I think the other, to 
softirq.h, was a problem for ia64?

  -- Keir


On 23 Mar 2005, at 22:01, Hollis Blanchard wrote:

> I think this is the last of the header fixes I've run across. Though 
> it's
> sometimes difficult to tell, I believe Xen/ia64 has asm/mm.h, 
> flushtlb.h,
> page.h, and shadow.h. Please apply.
>
> Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
>
> -- 
> Hollis Blanchard
> IBM Linux Technology Center
> <xen-headers.diff>



-------------------------------------------------------
This SF.net email is sponsored by Microsoft Mobile & Embedded DevCon 2005
Attend MEDC 2005 May 9-12 in Vegas. Learn more about the latest Windows
Embedded(r) & Windows Mobile(tm) platforms, applications & content.  Register
by 3/29 & save $300 http://ads.osdn.com/?ad_id=6883&alloc_id=15149&op=click

Re: [patch] final header fixes

[Hollis Blanchard]

[-- Attachment #1: Type: text/plain, Size: 326 bytes --]

On Mar 24, 2005, at 2:54 AM, Keir Fraser wrote:

> One of the two additions was already applied. I think the other, to 
> softirq.h, was a problem for ia64?

Sorry, I sent the wrong patch. The correct one is attached now.

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>

-- 
Hollis Blanchard
IBM Linux Technology Center

[-- Attachment #2: xen-more-headers.diff --]
[-- Type: application/octet-stream, Size: 1924 bytes --]

diff -Nru a/xen/common/grant_table.c b/xen/common/grant_table.c
--- a/xen/common/grant_table.c	2005-03-23 15:26:33 -06:00
+++ b/xen/common/grant_table.c	2005-03-23 15:26:33 -06:00
@@ -26,8 +26,8 @@
 
 #include <xen/config.h>
 #include <xen/sched.h>
-#include <asm-x86/mm.h>
-#include <asm-x86/shadow.h>
+#include <asm/mm.h>
+#include <asm/shadow.h>
 
 #define PIN_FAIL(_rc, _f, _a...)   \
     do {                           \
diff -Nru a/xen/include/xen/keyhandler.h b/xen/include/xen/keyhandler.h
--- a/xen/include/xen/keyhandler.h	2005-03-23 15:26:33 -06:00
+++ b/xen/include/xen/keyhandler.h	2005-03-23 15:26:33 -06:00
@@ -10,6 +10,8 @@
 #ifndef __XEN_KEYHANDLER_H__
 #define __XEN_KEYHANDLER_H__
 
+struct xen_regs;
+
 /*
  * Register a callback function for key @key. The callback occurs in
  * softirq context with no locks held and interrupts enabled.
diff -Nru a/xen/include/xen/list.h b/xen/include/xen/list.h
--- a/xen/include/xen/list.h	2005-03-23 15:26:33 -06:00
+++ b/xen/include/xen/list.h	2005-03-23 15:26:33 -06:00
@@ -2,6 +2,7 @@
 #define _LINUX_LIST_H
 
 #include <xen/lib.h>
+#include <xen/prefetch.h>
 
 /*
  * Simple doubly linked list implementation.
diff -Nru a/xen/common/page_alloc.c b/xen/common/page_alloc.c
--- a/xen/common/page_alloc.c	2005-03-23 15:51:09 -06:00
+++ b/xen/common/page_alloc.c	2005-03-23 15:51:09 -06:00
@@ -32,6 +32,7 @@
 #include <xen/softirq.h>
 #include <asm/domain_page.h>
 #include <asm/page.h>
+#include <asm/flushtlb.h>
 
 /*
  * Comma-separated list of hexadecimal page numbers containing bad bytes.
diff -Nru a/xen/common/xmalloc.c b/xen/common/xmalloc.c
--- a/xen/common/xmalloc.c	2005-03-23 15:51:09 -06:00
+++ b/xen/common/xmalloc.c	2005-03-23 15:51:09 -06:00
@@ -33,6 +33,7 @@
 #include <xen/ac_timer.h>
 #include <xen/cache.h>
 #include <xen/prefetch.h>
+#include <asm/page.h>
 
 static LIST_HEAD(freelist);
 static spinlock_t freelist_lock = SPIN_LOCK_UNLOCKED;

Re: [patch] final header fixes

[Dan Magenheimer]

Sorry for the delay in comment... I was traveling and am a bit
behind on email.

This second patch looks good to me, though I would prefer
to change to '#include <asm/regs.h>' from 'struct xen_regs;'
as xen_regs is #define'd to pt_regs on ia64 and the explicit
use of struct xen_regs in a header could cause header ordering
problems later.  Will that work for ppc?

Dan




-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click

Re: Re: [patch] final header fixes

[Hollis Blanchard]

On Thursday 24 March 2005 14:40, Dan Magenheimer wrote:
> This second patch looks good to me, though I would prefer
> to change to '#include <asm/regs.h>' from 'struct xen_regs;'
> as xen_regs is #define'd to pt_regs on ia64 and the explicit
> use of struct xen_regs in a header could cause header ordering
> problems later.  Will that work for ppc?

Ah, sure... I was just trying to avoid extra dependency trees where possible. 
Apparently it is not possible here. :)

So that should be #include <public/xen.h> (which includes arch-*.h which 
defines xen_regs). It looks like we may want to move ia64's #define to 
arch-ia64.h ...

-- 
Hollis Blanchard
IBM Linux Technology Center


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click

RE: Re: [patch] final header fixes

[Magenheimer, Dan (HP Labs Fort Collins)]

arch-ia64.h doesn't declare/define struct xen_regs so
this wouldn't work very well on ia64.  I would prefer
<asm/regs.h> (or even just leaving it as the forward
struct reference).

> -----Original Message-----
> From: Hollis Blanchard [mailto:hollisb@us.ibm.com] 
> Sent: Thursday, March 24, 2005 2:03 PM
> To: xen-devel@lists.sourceforge.net
> Cc: Magenheimer, Dan (HP Labs Fort Collins)
> Subject: Re: [Xen-devel] Re: [patch] final header fixes
> 
> On Thursday 24 March 2005 14:40, Dan Magenheimer wrote:
> > This second patch looks good to me, though I would prefer
> > to change to '#include <asm/regs.h>' from 'struct xen_regs;'
> > as xen_regs is #define'd to pt_regs on ia64 and the explicit
> > use of struct xen_regs in a header could cause header ordering
> > problems later.  Will that work for ppc?
> 
> Ah, sure... I was just trying to avoid extra dependency trees 
> where possible. 
> Apparently it is not possible here. :)
> 
> So that should be #include <public/xen.h> (which includes 
> arch-*.h which 
> defines xen_regs). It looks like we may want to move ia64's 
> #define to 
> arch-ia64.h ...
> 
> -- 
> Hollis Blanchard
> IBM Linux Technology Center
> 


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_ide95&alloc_id\x14396&op=click

Re: Re: [patch] final header fixes

[Christian Limpach]

On Thu, 24 Mar 2005 15:03:19 -0600, Hollis Blanchard <hollisb@us.ibm.com> wrote:
> On Thursday 24 March 2005 14:40, Dan Magenheimer wrote:
> > This second patch looks good to me, though I would prefer
> > to change to '#include <asm/regs.h>' from 'struct xen_regs;'
> > as xen_regs is #define'd to pt_regs on ia64 and the explicit
> > use of struct xen_regs in a header could cause header ordering
> > problems later.  Will that work for ppc?
> 
> Ah, sure... I was just trying to avoid extra dependency trees where possible.
> Apparently it is not possible here. :)
> 
> So that should be #include <public/xen.h> (which includes arch-*.h which
> defines xen_regs). It looks like we may want to move ia64's #define to
> arch-ia64.h ...

Could you please include asm/regs.h or public/xen.h wherever you want
to include keyhandler.h?  Thanks.

    christian


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click

Re: Re: [patch] final header fixes

[Hollis Blanchard]

On Thu, 2005-03-24 at 21:24 +0000, Christian Limpach wrote:
> On Thu, 24 Mar 2005 15:03:19 -0600, Hollis Blanchard <hollisb@us.ibm.com> wrote:
> > On Thursday 24 March 2005 14:40, Dan Magenheimer wrote:
> > > This second patch looks good to me, though I would prefer
> > > to change to '#include <asm/regs.h>' from 'struct xen_regs;'
> > > as xen_regs is #define'd to pt_regs on ia64 and the explicit
> > > use of struct xen_regs in a header could cause header ordering
> > > problems later.  Will that work for ppc?
> > 
> > Ah, sure... I was just trying to avoid extra dependency trees where possible.
> > Apparently it is not possible here. :)
> > 
> > So that should be #include <public/xen.h> (which includes arch-*.h which
> > defines xen_regs). It looks like we may want to move ia64's #define to
> > arch-ia64.h ...
> 
> Could you please include asm/regs.h or public/xen.h wherever you want
> to include keyhandler.h?  Thanks.

That works great, until somebody other than me includes or modifies
keyhandler.h (or any of the other headers we've been talking about).

I guess I don't see the difficulty in making sure you include what you
use...?

-- 
Hollis Blanchard
IBM Linux Technology Center



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click

RE: Re: [patch] final header fixes

[Hollis Blanchard]

On Thu, 2005-03-24 at 13:17 -0800, Magenheimer, Dan (HP Labs Fort
Collins) wrote:
> arch-ia64.h doesn't declare/define struct xen_regs so
> this wouldn't work very well on ia64.  I would prefer
> <asm/regs.h> (or even just leaving it as the forward
> struct reference).

That's why I suggested moving the define to arch-ia64.h.

Let me put it this way...
ia64: asm/regs.h
x86_32: public/xen.h
x86_64: public/xen.h
ppc64 will follow x86: public/xen.h

Why should ia64 be different? Won't it make all of our lives easier if
all the ports define structures in asm header files of the same name?

-- 
Hollis Blanchard
IBM Linux Technology Center



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click

Re: Re: [patch] final header fixes

[Christian Limpach]

On Fri, 25 Mar 2005 10:22:50 -0600, Hollis Blanchard <hollisb@us.ibm.com> wrote:
> On Thu, 2005-03-24 at 21:24 +0000, Christian Limpach wrote:
> > On Thu, 24 Mar 2005 15:03:19 -0600, Hollis Blanchard <hollisb@us.ibm.com> wrote:
> > > On Thursday 24 March 2005 14:40, Dan Magenheimer wrote:
> > > > This second patch looks good to me, though I would prefer
> > > > to change to '#include <asm/regs.h>' from 'struct xen_regs;'
> > > > as xen_regs is #define'd to pt_regs on ia64 and the explicit
> > > > use of struct xen_regs in a header could cause header ordering
> > > > problems later.  Will that work for ppc?
> > >
> > > Ah, sure... I was just trying to avoid extra dependency trees where possible.
> > > Apparently it is not possible here. :)
> > >
> > > So that should be #include <public/xen.h> (which includes arch-*.h which
> > > defines xen_regs). It looks like we may want to move ia64's #define to
> > > arch-ia64.h ...
> >
> > Could you please include asm/regs.h or public/xen.h wherever you want
> > to include keyhandler.h?  Thanks.
> 
> That works great, until somebody other than me includes or modifies
> keyhandler.h (or any of the other headers we've been talking about).
> 
> I guess I don't see the difficulty in making sure you include what you
> use...?

I think we have too many header files which include other header files
already -- to the point that a lot of .c files don't include all the
header files they need because some random header file includes it for
them.

keyhandler.c is one of the header files you probably want to include
in source code level add-on software, software which might be require
using a header set which is not compatible with Xen's header set.

     christian


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click