KVM: Sync with -mm tree

PATCH New Avi Kivity 1 participant 3 messages Nov 27, 2006 KVM

Share & tools

Avi Kivity

author

2006-11-27 08:47 UTC #0 lore raw

cover KVM: Sync with -mm tree

Following are a couple of patches I've neglected to send out and are thus not in -mm. One clarifies the KVM license and the other makes enum values explicit.

Merging them will sync my current release tree to -mm, which will help avoid fuzz in the event we have to merge a large patchset.

Signature · 8 lines

error compiling committee.c: too many arguments to function


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

Avi Kivity

author

2006-11-27 08:48 UTC #1 lore raw

PATCH 1/2 KVM: Clarify licensing

Signed-off-by Avi Kivity <avi-atKUWr5tajBWk0Htik3J/[email protected]>

drivers/kvm/kvm.h +5 -0

diff -X /home/avi/kvm/linux-2.6/Documentation/dontdiff --exclude=Makefile -ru /home/avi/kvm/linux-2.6/drivers/kvm/kvm.h /home/avi/kvm-release/kernel/kvm.h
@@ -1,6 +1,11 @@
 #ifndef __KVM_H
 #define __KVM_H
 
+/*
+ * This work is licensed under the terms of the GNU GPL, version 2.  See
+ * the COPYING file in the top-level directory.
+ */
+
 #include <linux/types.h>
 #include <linux/list.h>
 #include <linux/mutex.h>

drivers/kvm/kvm_main.c +3 -0

diff -X /home/avi/kvm/linux-2.6/Documentation/dontdiff --exclude=Makefile -ru /home/avi/kvm/linux-2.6/drivers/kvm/kvm_main.c /home/avi/kvm-release/kernel/kvm_main.c
@@ -10,6 +10,9 @@
  *   Avi Kivity   <avi-atKUWr5tajBWk0Htik3J/[email protected]>
  *   Yaniv Kamay  <yaniv-atKUWr5tajBWk0Htik3J/[email protected]>
  *
+ * This work is licensed under the terms of the GNU GPL, version 2.  See
+ * the COPYING file in the top-level directory.
+ *
  */
 
 #include "kvm.h"

drivers/kvm/mmu.c +3 -0

diff -X /home/avi/kvm/linux-2.6/Documentation/dontdiff --exclude=Makefile -ru /home/avi/kvm/linux-2.6/drivers/kvm/mmu.c /home/avi/kvm-release/kernel/mmu.c
@@ -12,6 +12,9 @@
  *   Yaniv Kamay  <yaniv-atKUWr5tajBWk0Htik3J/[email protected]>
  *   Avi Kivity   <avi-atKUWr5tajBWk0Htik3J/[email protected]>
  *
+ * This work is licensed under the terms of the GNU GPL, version 2.  See
+ * the COPYING file in the top-level directory.
+ *
  */
 #include <linux/types.h>
 #include <linux/string.h>

drivers/kvm/paging_tmpl.h +19 -0

diff -X /home/avi/kvm/linux-2.6/Documentation/dontdiff --exclude=Makefile -ru /home/avi/kvm/linux-2.6/drivers/kvm/paging_tmpl.h /home/avi/kvm-release/kernel/paging_tmpl.h
@@ -1,4 +1,23 @@
 /*
+ * Kernel-based Virtual Machine driver for Linux
+ *
+ * This module enables machines with Intel VT-x extensions to run virtual
+ * machines without emulation or binary translation.
+ *
+ * MMU support
+ *
+ * Copyright (C) 2006 Qumranet, Inc.
+ *
+ * Authors:
+ *   Yaniv Kamay  <yaniv-atKUWr5tajBWk0Htik3J/[email protected]>
+ *   Avi Kivity   <avi-atKUWr5tajBWk0Htik3J/[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2.  See
+ * the COPYING file in the top-level directory.
+ *
+ */
+
+/*
  * We need the mmu code to access both 32-bit and 64-bit guest ptes,
  * so the code in this file is compiled twice, once per pte size.
  */

drivers/kvm/x86_emulate.c +3 -0

diff -X /home/avi/kvm/linux-2.6/Documentation/dontdiff --exclude=Makefile -ru /home/avi/kvm/linux-2.6/drivers/kvm/x86_emulate.c /home/avi/kvm-release/kernel/x86_emulate.c
@@ -13,6 +13,9 @@
  *   Avi Kivity <avi-atKUWr5tajBWk0Htik3J/[email protected]>
  *   Yaniv Kamay <yaniv-atKUWr5tajBWk0Htik3J/[email protected]>
  *
+ * This work is licensed under the terms of the GNU GPL, version 2.  See
+ * the COPYING file in the top-level directory.
+ *
  * From: xen-unstable 10676:af9809f51f81a3c43f276f00c81a52ef558afda4
  */

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

Avi Kivity

author

2006-11-27 08:49 UTC #2 lore raw

PATCH 2/2 KVM: Make enum values in userspace interface explicit

In reply to Avi Kivity

Signed-off-by Avi Kivity <avi-atKUWr5tajBWk0Htik3J/[email protected]>

include/linux/kvm.h +7 -7

@@ -36,13 +36,13 @@
 #define KVM_EXIT_TYPE_VM_EXIT    2
 
 enum kvm_exit_reason {
-	KVM_EXIT_UNKNOWN,
-	KVM_EXIT_EXCEPTION,
-	KVM_EXIT_IO,
-	KVM_EXIT_CPUID,
-	KVM_EXIT_DEBUG,
-	KVM_EXIT_HLT,
-	KVM_EXIT_MMIO,
+	KVM_EXIT_UNKNOWN          = 0,
+	KVM_EXIT_EXCEPTION        = 1,
+	KVM_EXIT_IO               = 2,
+	KVM_EXIT_CPUID            = 3,
+	KVM_EXIT_DEBUG            = 4,
+	KVM_EXIT_HLT              = 5,
+	KVM_EXIT_MMIO             = 6,
 };
 
 /* for KVM_RUN */