# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 939fd35d58da459ecae6a79c710617e3d7d2dabc
# Parent 03b9919f655e5dce0959bfb96a08f8a3c398fd90
Xen_version hypercalls takes two args, not one.
Signed-off-by: Ian Pratt <ian@xxxxxxxxxxxxx>
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
diff -r 03b9919f655e -r 939fd35d58da extras/mini-os/include/hypervisor.h
--- a/extras/mini-os/include/hypervisor.h Mon Sep 12 12:17:31 2005
+++ b/extras/mini-os/include/hypervisor.h Mon Sep 12 12:29:40 2005
@@ -414,15 +414,15 @@
static inline int
HYPERVISOR_xen_version(
- int cmd)
-{
- int ret;
- unsigned long ignore;
-
- __asm__ __volatile__ (
- TRAP_INSTR
- : "=a" (ret), "=b" (ignore)
- : "0" (__HYPERVISOR_xen_version), "1" (cmd)
+ int cmd, void *arg)
+{
+ int ret;
+ unsigned long ignore, ign2;
+
+ __asm__ __volatile__ (
+ TRAP_INSTR
+ : "=a" (ret), "=b" (ignore), "=c" (ign2)
+ : "0" (__HYPERVISOR_xen_version), "1" (cmd), "2" (arg)
: "memory" );
return ret;
diff -r 03b9919f655e -r 939fd35d58da
linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c
--- a/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c Mon Sep 12 12:17:31 2005
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c Mon Sep 12 12:29:40 2005
@@ -123,7 +123,7 @@
*/
void force_evtchn_callback(void)
{
- (void)HYPERVISOR_xen_version(0);
+ (void)HYPERVISOR_xen_version(0, NULL);
}
EXPORT_SYMBOL(force_evtchn_callback);
diff -r 03b9919f655e -r 939fd35d58da
linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypercall.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypercall.h Mon Sep 12
12:17:31 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypercall.h Mon Sep 12
12:29:40 2005
@@ -270,9 +270,9 @@
static inline int
HYPERVISOR_xen_version(
- int cmd)
-{
- return _hypercall1(int, xen_version, cmd);
+ int cmd, void *arg)
+{
+ return _hypercall2(int, xen_version, cmd, arg);
}
static inline int
diff -r 03b9919f655e -r 939fd35d58da
linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/hypercall.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/hypercall.h Mon Sep
12 12:17:31 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/hypercall.h Mon Sep
12 12:29:40 2005
@@ -260,9 +260,9 @@
static inline int
HYPERVISOR_xen_version(
- int cmd)
-{
- return _hypercall1(int, xen_version, cmd);
+ int cmd, void *arg)
+{
+ return _hypercall2(int, xen_version, cmd, arg);
}
static inline int
diff -r 03b9919f655e -r 939fd35d58da xen/arch/x86/x86_32/entry.S
--- a/xen/arch/x86/x86_32/entry.S Mon Sep 12 12:17:31 2005
+++ b/xen/arch/x86/x86_32/entry.S Mon Sep 12 12:29:40 2005
@@ -834,7 +834,7 @@
.byte 4 /* do_update_va_mapping */
.byte 2 /* do_set_timer_op */ /* 15 */
.byte 1 /* do_event_channel_op */
- .byte 1 /* do_xen_version */
+ .byte 2 /* do_xen_version */
.byte 3 /* do_console_io */
.byte 1 /* do_physdev_op */
.byte 3 /* do_grant_table_op */ /* 20 */
diff -r 03b9919f655e -r 939fd35d58da xen/arch/x86/x86_64/entry.S
--- a/xen/arch/x86/x86_64/entry.S Mon Sep 12 12:17:31 2005
+++ b/xen/arch/x86/x86_64/entry.S Mon Sep 12 12:29:40 2005
@@ -655,7 +655,7 @@
.byte 3 /* do_update_va_mapping */
.byte 1 /* do_set_timer_op */ /* 15 */
.byte 1 /* do_event_channel_op */
- .byte 1 /* do_xen_version */
+ .byte 2 /* do_xen_version */
.byte 3 /* do_console_io */
.byte 1 /* do_physdev_op */
.byte 3 /* do_grant_table_op */ /* 20 */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home