Mike D. Day
2006-Jan-25 11:40 UTC
[Xen-devel] [PATCH 1/2] linux merge: omit typedefs in version.h (resubmit)
# HG changeset patch
# User mdday@dual.silverwood.home
# Node ID 9bfae3190007654e5f637b348560cb8814ead67c
# Parent 8fdb718d6c9975bc8ff4a4d4ed1af43f599b3d1c
convert version.h to omit typedefs
signed-off-by Mike D. Day <ncmike@us.ibm.com>
diff -r 8fdb718d6c99 -r 9bfae3190007 xen/arch/x86/setup.c
--- a/xen/arch/x86/setup.c Wed Jan 25 00:49:21 2006
+++ b/xen/arch/x86/setup.c Wed Jan 25 11:31:44 2006
@@ -559,7 +559,7 @@
startup_cpu_idle_loop();
}
-void arch_get_xen_caps(xen_capabilities_info_t info)
+void arch_get_xen_caps(char * info)
{
char *p = info;
@@ -596,7 +596,7 @@
*(p-1) = 0;
- BUG_ON((p - info) > sizeof(xen_capabilities_info_t));
+ BUG_ON((p - info) > sizeof(sizeof(char) * 1024 ));
}
/*
diff -r 8fdb718d6c99 -r 9bfae3190007 xen/common/kernel.c
--- a/xen/common/kernel.c Wed Jan 25 00:49:21 2006
+++ b/xen/common/kernel.c Wed Jan 25 11:31:44 2006
@@ -93,7 +93,7 @@
case XENVER_extraversion:
{
- xen_extraversion_t extraversion;
+ char extraversion[16];
safe_strcpy(extraversion, XEN_EXTRAVERSION);
if ( copy_to_user(arg, extraversion, sizeof(extraversion)) )
return -EFAULT;
@@ -114,8 +114,8 @@
case XENVER_capabilities:
{
- xen_capabilities_info_t info;
- extern void arch_get_xen_caps(xen_capabilities_info_t info);
+ char info[1024];
+ extern void arch_get_xen_caps(char * );
memset(info, 0, sizeof(info));
arch_get_xen_caps(info);
@@ -127,7 +127,7 @@
case XENVER_platform_parameters:
{
- xen_platform_parameters_t params = {
+ struct xen_platform_parameters params = {
.virt_start = HYPERVISOR_VIRT_START
};
if ( copy_to_user(arg, ¶ms, sizeof(params)) )
@@ -138,7 +138,7 @@
case XENVER_changeset:
{
- xen_changeset_info_t chgset;
+ char chgset[64];
safe_strcpy(chgset, XEN_CHANGESET);
if ( copy_to_user(arg, chgset, sizeof(chgset)) )
return -EFAULT;
diff -r 8fdb718d6c99 -r 9bfae3190007 xen/include/public/version.h
--- a/xen/include/public/version.h Wed Jan 25 00:49:21 2006
+++ b/xen/include/public/version.h Wed Jan 25 11:31:44 2006
@@ -21,10 +21,10 @@
/* arg == struct xen_compile_info */
#define XENVER_compile_info 2
struct xen_compile_info {
- char compiler[64];
+ char compiler[64];
char compile_by[16];
char compile_domain[32];
- char compile_date[32];
+ char compile_date[32];
} ;
/* arg == char capabilities_info [1024]; */
@@ -47,6 +47,6 @@
* c-set-style: "BSD"
* c-basic-offset: 4
* tab-width: 4
- * indent-tabs-mode: nil
+ * indent-tabs-mode: t
* End:
*/
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
Jon Mason
2006-Jan-25 20:56 UTC
Re: [Xen-devel] [PATCH 1/2] linux merge: omit typedefs in version.h (resubmit)
Looks like this e-mail was BCC''ed to xen-devel. On Wed, Jan 25, 2006 at 06:40:13AM -0500, Mike D. Day wrote:> > # HG changeset patch > # User mdday@dual.silverwood.home > # Node ID 9bfae3190007654e5f637b348560cb8814ead67c > # Parent 8fdb718d6c9975bc8ff4a4d4ed1af43f599b3d1c > convert version.h to omit typedefs > signed-off-by Mike D. Day <ncmike@us.ibm.com> > > diff -r 8fdb718d6c99 -r 9bfae3190007 xen/arch/x86/setup.c > --- a/xen/arch/x86/setup.c Wed Jan 25 00:49:21 2006 > +++ b/xen/arch/x86/setup.c Wed Jan 25 11:31:44 2006 > @@ -559,7 +559,7 @@ > startup_cpu_idle_loop(); > } > > -void arch_get_xen_caps(xen_capabilities_info_t info) > +void arch_get_xen_caps(char * info) > { > char *p = info; > > @@ -596,7 +596,7 @@ > > *(p-1) = 0; > > - BUG_ON((p - info) > sizeof(xen_capabilities_info_t)); > + BUG_ON((p - info) > sizeof(sizeof(char) * 1024 )); > } > > /* > diff -r 8fdb718d6c99 -r 9bfae3190007 xen/common/kernel.c > --- a/xen/common/kernel.c Wed Jan 25 00:49:21 2006 > +++ b/xen/common/kernel.c Wed Jan 25 11:31:44 2006 > @@ -93,7 +93,7 @@ > > case XENVER_extraversion: > { > - xen_extraversion_t extraversion; > + char extraversion[16]; > safe_strcpy(extraversion, XEN_EXTRAVERSION); > if ( copy_to_user(arg, extraversion, sizeof(extraversion)) ) > return -EFAULT; > @@ -114,8 +114,8 @@ > > case XENVER_capabilities: > { > - xen_capabilities_info_t info; > - extern void arch_get_xen_caps(xen_capabilities_info_t info); > + char info[1024]; > + extern void arch_get_xen_caps(char * ); > > memset(info, 0, sizeof(info)); > arch_get_xen_caps(info); > @@ -127,7 +127,7 @@ > > case XENVER_platform_parameters: > { > - xen_platform_parameters_t params = { > + struct xen_platform_parameters params = { > .virt_start = HYPERVISOR_VIRT_START > }; > if ( copy_to_user(arg, ¶ms, sizeof(params)) ) > @@ -138,7 +138,7 @@ > > case XENVER_changeset: > { > - xen_changeset_info_t chgset; > + char chgset[64]; > safe_strcpy(chgset, XEN_CHANGESET); > if ( copy_to_user(arg, chgset, sizeof(chgset)) ) > return -EFAULT; > diff -r 8fdb718d6c99 -r 9bfae3190007 xen/include/public/version.h > --- a/xen/include/public/version.h Wed Jan 25 00:49:21 2006 > +++ b/xen/include/public/version.h Wed Jan 25 11:31:44 2006 > @@ -21,10 +21,10 @@ > /* arg == struct xen_compile_info */ > #define XENVER_compile_info 2 > struct xen_compile_info { > - char compiler[64]; > + char compiler[64]; > char compile_by[16]; > char compile_domain[32]; > - char compile_date[32]; > + char compile_date[32]; > } ;Looks like this struct is tab challenged.> > /* arg == char capabilities_info [1024]; */ > @@ -47,6 +47,6 @@ > * c-set-style: "BSD" > * c-basic-offset: 4 > * tab-width: 4 > - * indent-tabs-mode: nil > + * indent-tabs-mode: t > * End: > */Thanks, Jon _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel