Xen devel - Jul 2006 - [PATCH][QEMU] Add IA64-specific code for new qemu.

This patch adds the ia64-specific code for new Qemu .
In addition, some ia64 patches aren''t checked into xen-unstable.hg, so
I
reversed the related logic temporarily. Once sync with
xen-ia64-unstable.hg, the logic will regain automatically.
Thanks & Best Regards
-Xiantao

OTC,Intel Corporation



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

Hi, Xiantao

Is the following testandset redefine?

diff -r bbabdebc54ad tools/ioemu/exec-all.h
--- a/tools/ioemu/exec-all.h	Wed Jul 19 21:13:36 2006 +0100
+++ b/tools/ioemu/exec-all.h	Tue Jul 25 09:30:05 2006 +0800
@@ -391,6 +391,15 @@ static inline int testandset (int *p)
 }
 #endif
 
+#ifdef __ia64__
+#include "ia64_intrinsic.h"
+static inline int testandset (int *p)
+{
+    uint32_t o = 0, n = 1;
+    return (int)cmpxchg_acq(p, o, n);
+}
+#endif
+
 #ifdef __s390__
 static inline int testandset (int *p)
 {
 
Best Regards,

Akio Takebe
>This patch adds the ia64-specific code for new Qemu .
>In addition, some ia64 patches aren''t checked into xen-unstable.hg,
so I
>reversed the related logic temporarily. Once sync with
>xen-ia64-unstable.hg, the logic will regain automatically.
>Thanks & Best Regards
>-Xiantao
>
>OTC,Intel Corporation
>
>
>-------------------------------text/plain-------------------------------
>_______________________________________________
>Xen-ia64-devel mailing list
>Xen-ia64-devel@lists.xensource.com
>http://lists.xensource.com/xen-ia64-devel

_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@lists.xensource.com
http://lists.xensource.com/xen-ia64-devel

On 7/25/06, Zhang, Xiantao <xiantao.zhang@intel.com>
wrote:
> This patch adds the ia64-specific code for new Qemu .
> In addition, some ia64 patches aren''t checked into
xen-unstable.hg, so I
> reversed the related logic temporarily. Once sync with
> xen-ia64-unstable.hg, the logic will regain automatically.
> Thanks & Best Regards
> -Xiantao
>
> OTC,Intel Corporation
Applied, thanks!

    christian

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

On 7/26/06, Akio Takebe <takebe_akio@jp.fujitsu.com>
wrote:
> Hi, Xiantao
>
> Is the following testandset redefine?
>
> diff -r bbabdebc54ad tools/ioemu/exec-all.h
> --- a/tools/ioemu/exec-all.h    Wed Jul 19 21:13:36 2006 +0100
> +++ b/tools/ioemu/exec-all.h    Tue Jul 25 09:30:05 2006 +0800
> @@ -391,6 +391,15 @@ static inline int testandset (int *p)
>  }
>  #endif
>
> +#ifdef __ia64__
> +#include "ia64_intrinsic.h"
> +static inline int testandset (int *p)
> +{
> +    uint32_t o = 0, n = 1;
> +    return (int)cmpxchg_acq(p, o, n);
> +}
> +#endif
> +
>  #ifdef __s390__
>  static inline int testandset (int *p)
>  {
I''ve merged it with the existing __ia64 case.

    christian

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

On Wed, 2006-07-26 at 13:41 +0100, Christian Limpach
wrote:
> On 7/26/06, Akio Takebe <takebe_akio@jp.fujitsu.com> wrote:
> > Hi, Xiantao
> >
> > Is the following testandset redefine?
> >
> > diff -r bbabdebc54ad tools/ioemu/exec-all.h
> > --- a/tools/ioemu/exec-all.h    Wed Jul 19 21:13:36 2006 +0100
> > +++ b/tools/ioemu/exec-all.h    Tue Jul 25 09:30:05 2006 +0800
> > @@ -391,6 +391,15 @@ static inline int testandset (int *p)
> >  }
> >  #endif
> >
> > +#ifdef __ia64__
> > +#include "ia64_intrinsic.h"
> > +static inline int testandset (int *p)
> 
> I''ve merged it with the existing __ia64 case.
Hi Christian,

   Looks like we still ended up with both copies.  Can you please apply
the patch below.  Thanks,

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff -r 21918b22746e tools/ioemu/exec-all.h
--- a/tools/ioemu/exec-all.h	Wed Jul 26 10:49:32 2006 -0600
+++ b/tools/ioemu/exec-all.h	Wed Jul 26 11:16:28 2006 -0600
@@ -391,15 +391,6 @@ static inline int testandset (int *p)
 }
 #endif
 
-#ifdef __ia64__
-#include "ia64_intrinsic.h"
-static inline int testandset (int *p)
-{
-    uint32_t o = 0, n = 1;
-    return (int)cmpxchg_acq(p, o, n);
-}
-#endif
-
 #ifdef __s390__
 static inline int testandset (int *p)
 {



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

On Wed, 2006-07-26 at 11:20 -0600, Alex Williamson wrote:
>    Looks like we still ended up with both copies.  Can you please apply
> the patch below.  Thanks,
   Testing my quilt-foo based on your previous description, here''s a
patch that should do the whole thing.  Thanks,

	Alex

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff -r 21918b22746e tools/ioemu/exec-all.h
--- a/tools/ioemu/exec-all.h	Wed Jul 26 10:49:32 2006 -0600
+++ b/tools/ioemu/exec-all.h	Wed Jul 26 12:30:21 2006 -0600
@@ -391,15 +391,6 @@ static inline int testandset (int *p)
 }
 #endif
 
-#ifdef __ia64__
-#include "ia64_intrinsic.h"
-static inline int testandset (int *p)
-{
-    uint32_t o = 0, n = 1;
-    return (int)cmpxchg_acq(p, o, n);
-}
-#endif
-
 #ifdef __s390__
 static inline int testandset (int *p)
 {
diff -r 21918b22746e tools/ioemu/patches/ioemu-ia64
--- a/tools/ioemu/patches/ioemu-ia64	Wed Jul 26 10:49:32 2006 -0600
+++ b/tools/ioemu/patches/ioemu-ia64	Wed Jul 26 12:30:21 2006 -0600
@@ -1,7 +1,7 @@ Index: ioemu/hw/iommu.c
 Index: ioemu/hw/iommu.c
 ==================================================================----
ioemu.orig/hw/iommu.c	2006-07-14 13:43:45.000000000 +0100
-+++ ioemu/hw/iommu.c	2006-07-26 13:34:50.039997837 +0100
+--- ioemu.orig/hw/iommu.c	2006-07-26 12:17:13.000000000 -0600
++++ ioemu/hw/iommu.c	2006-07-26 12:17:53.000000000 -0600
 @@ -82,7 +82,11 @@
  #define IOPTE_VALID         0x00000002 /* IOPTE is valid */
  #define IOPTE_WAZ           0x00000001 /* Write as zeros */
@@ -16,8 +16,8 @@ Index: ioemu/hw/iommu.c
  
 Index: ioemu/cpu-all.h
 ==================================================================----
ioemu.orig/cpu-all.h	2006-07-26 13:33:45.946834283 +0100
-+++ ioemu/cpu-all.h	2006-07-26 13:34:50.038997944 +0100
+--- ioemu.orig/cpu-all.h	2006-07-26 12:17:53.000000000 -0600
++++ ioemu/cpu-all.h	2006-07-26 12:17:53.000000000 -0600
 @@ -835,6 +835,31 @@
                  :"=m" (*(volatile long *)addr)
                  :"dIr" (nr));
@@ -52,8 +52,8 @@ Index: ioemu/cpu-all.h
  /* memory API */
 Index: ioemu/vl.c
 ==================================================================----
ioemu.orig/vl.c	2006-07-26 13:33:45.996828953 +0100
-+++ ioemu/vl.c	2006-07-26 13:34:50.044997304 +0100
+--- ioemu.orig/vl.c	2006-07-26 12:17:53.000000000 -0600
++++ ioemu/vl.c	2006-07-26 12:26:38.000000000 -0600
 @@ -5577,6 +5577,7 @@
          exit(-1);
      }
@@ -99,8 +99,8 @@ Index: ioemu/vl.c
  #ifdef CONFIG_SOFTMMU
 Index: ioemu/target-i386-dm/exec-dm.c
 ==================================================================----
ioemu.orig/target-i386-dm/exec-dm.c	2006-07-26 13:33:45.882841107 +0100
-+++ ioemu/target-i386-dm/exec-dm.c	2006-07-26 13:34:50.040997731 +0100
+--- ioemu.orig/target-i386-dm/exec-dm.c	2006-07-26 12:17:53.000000000 -0600
++++ ioemu/target-i386-dm/exec-dm.c	2006-07-26 12:17:53.000000000 -0600
 @@ -340,6 +340,23 @@
      return io_mem_read[io_index >> IO_MEM_SHIFT];
  }
@@ -137,25 +137,9 @@ Index: ioemu/target-i386-dm/exec-dm.c
          len -= l;
 Index: ioemu/exec-all.h
 ==================================================================----
ioemu.orig/exec-all.h	2006-07-26 13:33:45.861843346 +0100
-+++ ioemu/exec-all.h	2006-07-26 13:38:30.096491388 +0100
-@@ -391,6 +391,15 @@
- }
- #endif
- 
-+#ifdef __ia64__
-+#include "ia64_intrinsic.h"
-+static inline int testandset (int *p)
-+{
-+    uint32_t o = 0, n = 1;
-+    return (int)cmpxchg_acq(p, o, n);
-+}
-+#endif
-+
- #ifdef __s390__
- static inline int testandset (int *p)
- {
-@@ -462,12 +471,13 @@
+--- ioemu.orig/exec-all.h	2006-07-26 12:17:53.000000000 -0600
++++ ioemu/exec-all.h	2006-07-26 12:26:59.000000000 -0600
+@@ -462,12 +462,13 @@
  }
  #endif
  
@@ -174,8 +158,8 @@ Index: ioemu/exec-all.h
  
 Index: ioemu/target-i386-dm/cpu.h
 ==================================================================----
ioemu.orig/target-i386-dm/cpu.h	2006-07-26 13:33:45.882841107 +0100
-+++ ioemu/target-i386-dm/cpu.h	2006-07-26 13:34:50.040997731 +0100
+--- ioemu.orig/target-i386-dm/cpu.h	2006-07-26 12:17:53.000000000 -0600
++++ ioemu/target-i386-dm/cpu.h	2006-07-26 12:17:53.000000000 -0600
 @@ -80,7 +80,11 @@
  /* helper2.c */
  int main_loop(void);
@@ -191,7 +175,7 @@ Index: ioemu/ia64_intrinsic.h
 Index: ioemu/ia64_intrinsic.h
 ================================================================== ---
/dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ioemu/ia64_intrinsic.h	2006-07-26 13:34:50.038997944 +0100
++++ ioemu/ia64_intrinsic.h	2006-07-26 12:17:53.000000000 -0600
 @@ -0,0 +1,276 @@
 +#ifndef IA64_INTRINSIC_H
 +#define IA64_INTRINSIC_H



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

On 7/26/06, Alex Williamson <alex.williamson@hp.com>
wrote:
> On Wed, 2006-07-26 at 13:41 +0100, Christian Limpach wrote:
> > On 7/26/06, Akio Takebe <takebe_akio@jp.fujitsu.com> wrote:
> > > Hi, Xiantao
> > >
> > > Is the following testandset redefine?
> > >
> > > diff -r bbabdebc54ad tools/ioemu/exec-all.h
> > > --- a/tools/ioemu/exec-all.h    Wed Jul 19 21:13:36 2006 +0100
> > > +++ b/tools/ioemu/exec-all.h    Tue Jul 25 09:30:05 2006 +0800
> > > @@ -391,6 +391,15 @@ static inline int testandset (int *p)
> > >  }
> > >  #endif
> > >
> > > +#ifdef __ia64__
> > > +#include "ia64_intrinsic.h"
> > > +static inline int testandset (int *p)
> >
> > I''ve merged it with the existing __ia64 case.
>
> Hi Christian,
>
>    Looks like we still ended up with both copies.  Can you please apply
> the patch below.  Thanks,
Oops yeah, looks like I forgot to remove the added copy after changing
the other one to match.

     christian
>
> Signed-off-by: Alex Williamson <alex.williamson@hp.com>
> ---
>
> diff -r 21918b22746e tools/ioemu/exec-all.h
> --- a/tools/ioemu/exec-all.h    Wed Jul 26 10:49:32 2006 -0600
> +++ b/tools/ioemu/exec-all.h    Wed Jul 26 11:16:28 2006 -0600
> @@ -391,15 +391,6 @@ static inline int testandset (int *p)
>  }
>  #endif
>
> -#ifdef __ia64__
> -#include "ia64_intrinsic.h"
> -static inline int testandset (int *p)
> -{
> -    uint32_t o = 0, n = 1;
> -    return (int)cmpxchg_acq(p, o, n);
> -}
> -#endif
> -
>  #ifdef __s390__
>  static inline int testandset (int *p)
>  {
>
>
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel