Incorrect Prototypes

Incorrect Prototypes

[Robert VanVossen]

[-- Attachment #1.1: Type: text/plain, Size: 743 bytes --]

do_kexec_op and compat_set_timer_op are both prototyped in xen/include/xen/hypercall.h, but are different than their implemented functions. This appears to be a bug.

do_kexec_op:
xen/common/kexec.c: 889
long do_kexec_op(unsigned long op, XEN_GUEST_HANDLE(void) uarg)
{
    return do_kexec_op_internal(op, uarg, 0);
}

xen/include/xen/hypercall.h: 126
extern long
do_kexec_op(
    unsigned long op,
    int arg1,
    XEN_GUEST_HANDLE(void) arg);



compat_set_timer_op:
xen/common/compat/schedule.c: 38
int compat_set_timer_op(u32 lo, s32 hi)
{
    return do_set_timer_op(((s64)hi << 32) | lo);
}

xen/include/xen/hypercall.h:175
extern int
compat_set_timer_op(
    s_time_t timeout);

Thanks,
Robbie VanVossen

[-- Attachment #1.2: Type: text/html, Size: 4809 bytes --]

[-- Attachment #2: Type: text/plain, Size: 126 bytes --]

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

Re: Incorrect Prototypes

[Jan Beulich]

>>> On 26.02.13 at 15:23, Robert VanVossen <Robert.VanVossen@dornerworks.com> wrote:
> do_kexec_op and compat_set_timer_op are both prototyped in 
> xen/include/xen/hypercall.h, but are different than their implemented 
> functions. This appears to be a bug.

Care to send a patch?

Jan

> do_kexec_op:
> xen/common/kexec.c: 889
> long do_kexec_op(unsigned long op, XEN_GUEST_HANDLE(void) uarg)
> {
>     return do_kexec_op_internal(op, uarg, 0);
> }
> 
> xen/include/xen/hypercall.h: 126
> extern long
> do_kexec_op(
>     unsigned long op,
>     int arg1,
>     XEN_GUEST_HANDLE(void) arg);
> 
> 
> 
> compat_set_timer_op:
> xen/common/compat/schedule.c: 38
> int compat_set_timer_op(u32 lo, s32 hi)
> {
>     return do_set_timer_op(((s64)hi << 32) | lo);
> }
> 
> xen/include/xen/hypercall.h:175
> extern int
> compat_set_timer_op(
>     s_time_t timeout);
> 
> Thanks,
> Robbie VanVossen

Re: Incorrect Prototypes

[Robert VanVossen]

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

Patch is attached.

-----Original Message-----
From: Jan Beulich [mailto:JBeulich@suse.com] 
Sent: Tuesday, February 26, 2013 11:00 AM
To: Robert VanVossen
Cc: xen-devel@lists.xen.org
Subject: Re: [Xen-devel] Incorrect Prototypes

>>> On 26.02.13 at 15:23, Robert VanVossen <Robert.VanVossen@dornerworks.com> wrote:
> do_kexec_op and compat_set_timer_op are both prototyped in 
> xen/include/xen/hypercall.h, but are different than their implemented 
> functions. This appears to be a bug.

Care to send a patch?

Jan

> do_kexec_op:
> xen/common/kexec.c: 889
> long do_kexec_op(unsigned long op, XEN_GUEST_HANDLE(void) uarg) {
>     return do_kexec_op_internal(op, uarg, 0); }
> 
> xen/include/xen/hypercall.h: 126
> extern long
> do_kexec_op(
>     unsigned long op,
>     int arg1,
>     XEN_GUEST_HANDLE(void) arg);
> 
> 
> 
> compat_set_timer_op:
> xen/common/compat/schedule.c: 38
> int compat_set_timer_op(u32 lo, s32 hi) {
>     return do_set_timer_op(((s64)hi << 32) | lo); }
> 
> xen/include/xen/hypercall.h:175
> extern int
> compat_set_timer_op(
>     s_time_t timeout);
> 
> Thanks,
> Robbie VanVossen




[-- Attachment #2: hypercall_prototypes.patch --]
[-- Type: application/octet-stream, Size: 758 bytes --]

# HG changeset patch
# Parent 66f563be41d90b480eb99e3e842d4e9ab260861c
Changed arguments of do_kexec_op and compat_set_timer_op prototypes to match the actual functions.

Signed-off-by: Robbie VanVossen <robert.vanvossen@dornerworks.com>

diff -r 66f563be41d9 xen/include/xen/hypercall.h
--- a/xen/include/xen/hypercall.h	Tue Feb 19 10:49:53 2013 +0100
+++ b/xen/include/xen/hypercall.h	Tue Feb 26 12:58:42 2013 -0500
@@ -126,8 +126,7 @@ do_hvm_op(
 extern long
 do_kexec_op(
     unsigned long op,
-    int arg1,
-    XEN_GUEST_HANDLE_PARAM(void) arg);
+    XEN_GUEST_HANDLE_PARAM(void) uarg);
 
 extern long
 do_xsm_op(
@@ -174,7 +173,8 @@ compat_sched_op(
 
 extern int
 compat_set_timer_op(
-    s_time_t timeout);
+    u32 lo,
+    s32 hi);
 
 #endif
 

[-- Attachment #3: Type: text/plain, Size: 126 bytes --]

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

[PATCH v2] change arguments of do_kexec_op and compat_set_timer_op prototypes

[Jan Beulich]

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

... to match the actual functions.

Signed-off-by: Robbie VanVossen <robert.vanvossen@dornerworks.com>

Also make sure the source files defining these symbols include the
header declaring them (had we done so, the problem would have been
noticed long ago).

Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- a/xen/common/kexec.c
+++ b/xen/common/kexec.c
@@ -15,6 +15,7 @@
 #include <xen/nmi.h>
 #include <xen/sched.h>
 #include <xen/types.h>
+#include <xen/hypercall.h>
 #include <xen/kexec.h>
 #include <xen/keyhandler.h>
 #include <public/kexec.h>
--- a/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@ -30,6 +30,7 @@
 #include <xen/mm.h>
 #include <xen/err.h>
 #include <xen/guest_access.h>
+#include <xen/hypercall.h>
 #include <xen/multicall.h>
 #include <xen/cpu.h>
 #include <xen/preempt.h>
--- a/xen/include/xen/hypercall.h
+++ b/xen/include/xen/hypercall.h
@@ -126,8 +126,7 @@ do_hvm_op(
 extern long
 do_kexec_op(
     unsigned long op,
-    int arg1,
-    XEN_GUEST_HANDLE_PARAM(void) arg);
+    XEN_GUEST_HANDLE_PARAM(void) uarg);
 
 extern long
 do_xsm_op(
@@ -174,7 +173,8 @@ compat_sched_op(
 
 extern int
 compat_set_timer_op(
-    s_time_t timeout);
+    u32 lo,
+    s32 hi);
 
 #endif
 




[-- Attachment #2: hypercall-prototypes.patch --]
[-- Type: text/plain, Size: 1334 bytes --]

change arguments of do_kexec_op and compat_set_timer_op prototypes

... to match the actual functions.

Signed-off-by: Robbie VanVossen <robert.vanvossen@dornerworks.com>

Also make sure the source files defining these symbols include the
header declaring them (had we done so, the problem would have been
noticed long ago).

Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- a/xen/common/kexec.c
+++ b/xen/common/kexec.c
@@ -15,6 +15,7 @@
 #include <xen/nmi.h>
 #include <xen/sched.h>
 #include <xen/types.h>
+#include <xen/hypercall.h>
 #include <xen/kexec.h>
 #include <xen/keyhandler.h>
 #include <public/kexec.h>
--- a/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@ -30,6 +30,7 @@
 #include <xen/mm.h>
 #include <xen/err.h>
 #include <xen/guest_access.h>
+#include <xen/hypercall.h>
 #include <xen/multicall.h>
 #include <xen/cpu.h>
 #include <xen/preempt.h>
--- a/xen/include/xen/hypercall.h
+++ b/xen/include/xen/hypercall.h
@@ -126,8 +126,7 @@ do_hvm_op(
 extern long
 do_kexec_op(
     unsigned long op,
-    int arg1,
-    XEN_GUEST_HANDLE_PARAM(void) arg);
+    XEN_GUEST_HANDLE_PARAM(void) uarg);
 
 extern long
 do_xsm_op(
@@ -174,7 +173,8 @@ compat_sched_op(
 
 extern int
 compat_set_timer_op(
-    s_time_t timeout);
+    u32 lo,
+    s32 hi);
 
 #endif
 

[-- Attachment #3: Type: text/plain, Size: 126 bytes --]

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

Re: [PATCH v2] change arguments of do_kexec_op and compat_set_timer_op prototypes

[Keir Fraser]

On 28/02/2013 16:44, "Jan Beulich" <JBeulich@suse.com> wrote:

> ... to match the actual functions.
> 
> Signed-off-by: Robbie VanVossen <robert.vanvossen@dornerworks.com>
> 
> Also make sure the source files defining these symbols include the
> header declaring them (had we done so, the problem would have been
> noticed long ago).
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Acked-by: Keir Fraser <keir@xen.org>

> --- a/xen/common/kexec.c
> +++ b/xen/common/kexec.c
> @@ -15,6 +15,7 @@
>  #include <xen/nmi.h>
>  #include <xen/sched.h>
>  #include <xen/types.h>
> +#include <xen/hypercall.h>
>  #include <xen/kexec.h>
>  #include <xen/keyhandler.h>
>  #include <public/kexec.h>
> --- a/xen/common/schedule.c
> +++ b/xen/common/schedule.c
> @@ -30,6 +30,7 @@
>  #include <xen/mm.h>
>  #include <xen/err.h>
>  #include <xen/guest_access.h>
> +#include <xen/hypercall.h>
>  #include <xen/multicall.h>
>  #include <xen/cpu.h>
>  #include <xen/preempt.h>
> --- a/xen/include/xen/hypercall.h
> +++ b/xen/include/xen/hypercall.h
> @@ -126,8 +126,7 @@ do_hvm_op(
>  extern long
>  do_kexec_op(
>      unsigned long op,
> -    int arg1,
> -    XEN_GUEST_HANDLE_PARAM(void) arg);
> +    XEN_GUEST_HANDLE_PARAM(void) uarg);
>  
>  extern long
>  do_xsm_op(
> @@ -174,7 +173,8 @@ compat_sched_op(
>  
>  extern int
>  compat_set_timer_op(
> -    s_time_t timeout);
> +    u32 lo,
> +    s32 hi);
>  
>  #endif
>  
> 
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel