[src/bouyer-xenpvh]: src/sys/arch Include changes in sys/arch/xen/include/ be...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e766372e8c82
branches:  bouyer-xenpvh
changeset: 982973:e766372e8c82
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Apr 25 15:01:01 2020 +0000

description:
Include changes in sys/arch/xen/include/ between bouyer-xenpvh-base1 and
bouyer-xenpvh-base2.

diffstat:

 sys/arch/amd64/include/xen/hypercalls.h |   6 +++---
 sys/arch/i386/include/xen/hypercalls.h  |  10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (48 lines):

diff -r 52e4e23337fd -r e766372e8c82 sys/arch/amd64/include/xen/hypercalls.h
--- a/sys/arch/amd64/include/xen/hypercalls.h   Sat Apr 25 13:16:48 2020 +0000
+++ b/sys/arch/amd64/include/xen/hypercalls.h   Sat Apr 25 15:01:01 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hypercalls.h,v 1.1.2.1 2020/04/16 08:46:34 bouyer Exp $ */
+/* $NetBSD: hypercalls.h,v 1.1.2.2 2020/04/25 15:01:01 bouyer Exp $ */
 /******************************************************************************
  * hypercall.h
  * 
@@ -274,9 +274,9 @@
 }
 
 static inline int
-HYPERVISOR_physdev_op(void *op)
+HYPERVISOR_physdev_op(int cmd, void *op)
 {
-       return _hypercall1(int, physdev_op_compat, op);
+       return _hypercall2(int, physdev_op, cmd, op);
 }
 
 static inline int
diff -r 52e4e23337fd -r e766372e8c82 sys/arch/i386/include/xen/hypercalls.h
--- a/sys/arch/i386/include/xen/hypercalls.h    Sat Apr 25 13:16:48 2020 +0000
+++ b/sys/arch/i386/include/xen/hypercalls.h    Sat Apr 25 15:01:01 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hypercalls.h,v 1.1.2.1 2020/04/16 08:46:34 bouyer Exp $        */
+/*     $NetBSD: hypercalls.h,v 1.1.2.2 2020/04/25 15:01:01 bouyer Exp $        */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -536,13 +536,13 @@
 }
 
 static __inline int
-HYPERVISOR_physdev_op(void *physdev_op)
+HYPERVISOR_physdev_op(int cmd, void *physdev_op)
 {
     int ret;
-    unsigned long ign1;
+    unsigned long ign1, ign2;
 
-    _hypercall(__HYPERVISOR_physdev_op, _harg("1" (physdev_op)),
-       _harg("=a" (ret), "=b" (ign1)));
+    _hypercall(__HYPERVISOR_physdev_op, _harg("1" (cmd), "2" (physdev_op)),
+       _harg("=a" (ret), "=b" (ign1), "=c" (ign2)));
 
     return ret;
 }