CVS commit: [bouyer-xenpvh] src/sys/arch

[Manuel Bouyer]

Module Name:    src
Committed By:   bouyer
Date:           Sat Apr 25 15:01:01 UTC 2020

Modified Files:
        src/sys/arch/amd64/include/xen [bouyer-xenpvh]: hypercalls.h
        src/sys/arch/i386/include/xen [bouyer-xenpvh]: hypercalls.h

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


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/amd64/include/xen/hypercalls.h
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/i386/include/xen/hypercalls.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/amd64/include/xen/hypercalls.h
diff -u src/sys/arch/amd64/include/xen/hypercalls.h:1.1.2.1 src/sys/arch/amd64/include/xen/hypercalls.h:1.1.2.2
--- src/sys/arch/amd64/include/xen/hypercalls.h:1.1.2.1	Thu Apr 16 08:46:34 2020
+++ src/sys/arch/amd64/include/xen/hypercalls.h	Sat Apr 25 15:01:01 2020
@@ -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 @@ HYPERVISOR_console_io(
 }
 
 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

Index: src/sys/arch/i386/include/xen/hypercalls.h
diff -u src/sys/arch/i386/include/xen/hypercalls.h:1.1.2.1 src/sys/arch/i386/include/xen/hypercalls.h:1.1.2.2
--- src/sys/arch/i386/include/xen/hypercalls.h:1.1.2.1	Thu Apr 16 08:46:34 2020
+++ src/sys/arch/i386/include/xen/hypercalls.h	Sat Apr 25 15:01:01 2020
@@ -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 @@ HYPERVISOR_console_io(int cmd, int count
 }
 
 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;
 }