[kernel] r16188 - in dists/sid/linux-2.6/debian: . patches/features/all/xen patches/features/all/xen/pvhvm patches/series
Ian Campbell
ijc-guest at alioth.debian.org
Fri Aug 27 09:50:57 UTC 2010
Author: ijc-guest
Date: Fri Aug 27 09:50:53 2010
New Revision: 16188
Log:
Reenable Xen pvhvm driver, refreshed to fix KVM crash.
Added:
dists/sid/linux-2.6/debian/patches/series/22
- copied, changed from r16184, dists/sid/linux-2.6/debian/patches/series/21-extra
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0002-x86-early-PV-on-HVM-features-initialization.patch
dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0003-x86-xen-event-channels-delivery-on-HVM.patch
dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0004-xen-Xen-PCI-platform-device-driver.patch
dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0005-xen-Add-suspend-resume-support-for-PV-on-HVM-guests.patch
dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0006-xen-Fix-find_unbound_irq-in-presence-of-ioapic-irqs.patch
dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0007-x86-Use-xen_vcpuop_clockevent-xen_clocksource-and.patch
dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0008-x86-Unplug-emulated-disks-and-nics.patch
dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0009-x86-Call-HVMOP_pagetable_dying-on-exit_mmap.patch
dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0010-xenfs-enable-for-HVM-domains-too.patch
dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0011-support-multiple-.discard.-sections-to-avoid-sectio.patch
dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0012-blkfront-do-not-create-a-PV-cdrom-device-if-xen_hvm.patch
dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0013-Introduce-CONFIG_XEN_PVHVM-compile-option.patch
dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0014-pvops-do-not-notify-callers-from-register_xenstore_.patch
dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0015-xen-pvhvm-allow-user-to-request-no-emulated-device.patch
dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0016-xen-pvhvm-rename-xen_emul_unplug-ignore-to-unnnec.patch
dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0017-xen-pvhvm-make-it-clearer-that-XEN_UNPLUG_-define.patch
dists/sid/linux-2.6/debian/patches/features/all/xen/pvops.patch
dists/sid/linux-2.6/debian/patches/series/21-extra
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog Fri Aug 27 04:24:38 2010 (r16187)
+++ dists/sid/linux-2.6/debian/changelog Fri Aug 27 09:50:53 2010 (r16188)
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.32-22) UNRELEASED; urgency=low
+
+ [ Ian Campbell ]
+ * xen: backport pvhvm drivers from upstream.
+
+ -- Ben Hutchings <ben at decadent.org.uk> Fri, 27 Aug 2010 08:38:26 +0100
+
linux-2.6 (2.6.32-21) unstable; urgency=high
[ Ben Hutchings ]
Modified: dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0002-x86-early-PV-on-HVM-features-initialization.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0002-x86-early-PV-on-HVM-features-initialization.patch Fri Aug 27 04:24:38 2010 (r16187)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0002-x86-early-PV-on-HVM-features-initialization.patch Fri Aug 27 09:50:53 2010 (r16188)
@@ -1,4 +1,4 @@
-From 79bec05f7773879d51ff89e221713c86c2311c6c Mon Sep 17 00:00:00 2001
+From d1d33440ff3851e3e3937ef16c94e238e7b6209b Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng at linux.intel.com>
Date: Fri, 14 May 2010 12:39:33 +0100
Subject: [PATCH] x86: early PV on HVM features initialization.
@@ -17,11 +17,11 @@
---
arch/x86/include/asm/xen/hypervisor.h | 2 +
arch/x86/kernel/setup.c | 2 +
- arch/x86/xen/enlighten.c | 85 +++++++++++++++++++++++++++++++++
+ arch/x86/xen/enlighten.c | 88 +++++++++++++++++++++++++++++++++
drivers/input/xen-kbdfront.c | 2 +-
drivers/video/xen-fbfront.c | 2 +-
drivers/xen/xenbus/xenbus_probe.c | 21 +++++++-
- 6 files changed, 109 insertions(+), 5 deletions(-)
+ 6 files changed, 112 insertions(+), 5 deletions(-)
diff --git a/arch/x86/include/asm/xen/hypervisor.h b/arch/x86/include/asm/xen/hypervisor.h
index d5b7e90..5d298fd 100644
@@ -59,7 +59,7 @@
e820_reserve_resources();
e820_mark_nosave_regions(max_low_pfn);
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 942ccf1..6bfbd45 100644
+index 942ccf1..e054644 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -32,6 +32,7 @@
@@ -89,7 +89,7 @@
/*
* Point at some empty memory to start with. We map the real shared_info
* page as soon as fixmap is up and running.
-@@ -1197,3 +1202,83 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1197,3 +1202,86 @@ asmlinkage void __init xen_start_kernel(void)
x86_64_start_reservations((char *)__pa_symbol(&boot_params));
#endif
}
@@ -119,6 +119,9 @@
+ u64 pfn;
+
+ base = xen_cpuid_base();
++ if (!base)
++ return -EINVAL;
++
+ cpuid(base + 1, &eax, &ebx, &ecx, &edx);
+
+ *major = eax >> 16;
Modified: dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0003-x86-xen-event-channels-delivery-on-HVM.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0003-x86-xen-event-channels-delivery-on-HVM.patch Fri Aug 27 04:24:38 2010 (r16187)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0003-x86-xen-event-channels-delivery-on-HVM.patch Fri Aug 27 09:50:53 2010 (r16188)
@@ -1,4 +1,4 @@
-From 48a0a3d35ae1c2b5851620b46713f536bf6978f8 Mon Sep 17 00:00:00 2001
+From b1a340f0801b0cb7225436fdd115b4d162f3fb4f Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng at linux.intel.com>
Date: Fri, 14 May 2010 12:40:51 +0100
Subject: [PATCH] x86/xen: event channels delivery on HVM.
@@ -74,7 +74,7 @@
/*
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 6bfbd45..786fd94 100644
+index e054644..a8ab101 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -11,6 +11,7 @@
@@ -102,7 +102,7 @@
/*
* Point at some empty memory to start with. We map the real shared_info
-@@ -1268,6 +1272,24 @@ static void __init init_shared_info(void)
+@@ -1271,6 +1275,24 @@ static void __init init_shared_info(void)
per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0];
}
@@ -127,7 +127,7 @@
void __init xen_hvm_guest_init(void)
{
int r;
-@@ -1281,4 +1303,10 @@ void __init xen_hvm_guest_init(void)
+@@ -1284,4 +1306,10 @@ void __init xen_hvm_guest_init(void)
return;
init_shared_info();
Modified: dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0004-xen-Xen-PCI-platform-device-driver.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0004-xen-Xen-PCI-platform-device-driver.patch Fri Aug 27 04:24:38 2010 (r16187)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0004-xen-Xen-PCI-platform-device-driver.patch Fri Aug 27 09:50:53 2010 (r16188)
@@ -1,4 +1,4 @@
-From 6bbaa5ed0ec08dd8f30d271956dc8f1db8a92fca Mon Sep 17 00:00:00 2001
+From 06fdafa2eb7de1a800febb62d302fe72ddba033e Mon Sep 17 00:00:00 2001
From: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
Date: Mon, 17 May 2010 17:08:21 +0100
Subject: [PATCH] xen: Xen PCI platform device driver.
Modified: dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0005-xen-Add-suspend-resume-support-for-PV-on-HVM-guests.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0005-xen-Add-suspend-resume-support-for-PV-on-HVM-guests.patch Fri Aug 27 04:24:38 2010 (r16187)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0005-xen-Add-suspend-resume-support-for-PV-on-HVM-guests.patch Fri Aug 27 09:50:53 2010 (r16188)
@@ -1,4 +1,4 @@
-From 4c3557c9741ce066ef6bdbd678d02a4afba9540b Mon Sep 17 00:00:00 2001
+From 86e23db6cf392fe26d24653d64ef39586fd8dc5a Mon Sep 17 00:00:00 2001
From: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
Date: Fri, 14 May 2010 12:45:07 +0100
Subject: [PATCH] xen: Add suspend/resume support for PV on HVM guests.
@@ -21,7 +21,7 @@
6 files changed, 89 insertions(+), 12 deletions(-)
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 786fd94..7f2cfe7 100644
+index a8ab101..bd0bc39 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -78,7 +78,6 @@ struct shared_info xen_dummy_shared_info;
@@ -32,7 +32,7 @@
__read_mostly int xen_have_vector_callback;
EXPORT_SYMBOL_GPL(xen_have_vector_callback);
-@@ -1253,13 +1252,15 @@ static int init_hvm_pv_info(int *major, int *minor)
+@@ -1256,13 +1255,15 @@ static int init_hvm_pv_info(int *major, int *minor)
return 0;
}
@@ -52,7 +52,7 @@
xatp.domid = DOMID_SELF;
xatp.idx = 0;
xatp.space = XENMAPSPACE_shared_info;
-@@ -1269,7 +1270,17 @@ static void __init init_shared_info(void)
+@@ -1272,7 +1273,17 @@ static void __init init_shared_info(void)
HYPERVISOR_shared_info = (struct shared_info *)shared_info_page;
@@ -71,7 +71,7 @@
}
static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self,
-@@ -1302,7 +1313,7 @@ void __init xen_hvm_guest_init(void)
+@@ -1305,7 +1316,7 @@ void __init xen_hvm_guest_init(void)
if (r < 0)
return;
Modified: dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0006-xen-Fix-find_unbound_irq-in-presence-of-ioapic-irqs.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0006-xen-Fix-find_unbound_irq-in-presence-of-ioapic-irqs.patch Fri Aug 27 04:24:38 2010 (r16187)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0006-xen-Fix-find_unbound_irq-in-presence-of-ioapic-irqs.patch Fri Aug 27 09:50:53 2010 (r16188)
@@ -1,4 +1,4 @@
-From 26f6c2b5b7b31e4a93aca248361ac2b07789ce25 Mon Sep 17 00:00:00 2001
+From 3dc94dc81f56fec4a409b049c12413e847d05056 Mon Sep 17 00:00:00 2001
From: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
Date: Fri, 14 May 2010 12:41:20 +0100
Subject: [PATCH] xen: Fix find_unbound_irq in presence of ioapic irqs.
Modified: dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0007-x86-Use-xen_vcpuop_clockevent-xen_clocksource-and.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0007-x86-Use-xen_vcpuop_clockevent-xen_clocksource-and.patch Fri Aug 27 04:24:38 2010 (r16187)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0007-x86-Use-xen_vcpuop_clockevent-xen_clocksource-and.patch Fri Aug 27 09:50:53 2010 (r16188)
@@ -1,4 +1,4 @@
-From 57a140eb75d2d3f6fded1cb807d22b3aa414d714 Mon Sep 17 00:00:00 2001
+From fa466b657a6fcd885010a11181facc7b546d304d Mon Sep 17 00:00:00 2001
From: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
Date: Fri, 14 May 2010 12:48:19 +0100
Subject: [PATCH] x86: Use xen_vcpuop_clockevent, xen_clocksource and xen wallclock.
@@ -29,7 +29,7 @@
5 files changed, 65 insertions(+), 21 deletions(-)
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 7f2cfe7..f41ae25 100644
+index bd0bc39..3445640 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -931,10 +931,6 @@ static const struct pv_init_ops xen_init_ops __initdata = {
@@ -66,7 +66,7 @@
/*
* Set up some pagetable state before starting to set any ptes.
-@@ -1320,4 +1309,5 @@ void __init xen_hvm_guest_init(void)
+@@ -1323,4 +1312,5 @@ void __init xen_hvm_guest_init(void)
register_cpu_notifier(&xen_hvm_cpu_notifier);
have_vcpu_info_placement = 0;
x86_init.irqs.intr_init = xen_init_IRQ;
Modified: dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0008-x86-Unplug-emulated-disks-and-nics.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0008-x86-Unplug-emulated-disks-and-nics.patch Fri Aug 27 04:24:38 2010 (r16187)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0008-x86-Unplug-emulated-disks-and-nics.patch Fri Aug 27 09:50:53 2010 (r16188)
@@ -1,4 +1,4 @@
-From 67f3b6d66143353ca4536c643cef70941ecaade0 Mon Sep 17 00:00:00 2001
+From 2028bd4b38952279d585c8cb9c4fcf20dbe49f8d Mon Sep 17 00:00:00 2001
From: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
Date: Fri, 14 May 2010 12:44:30 +0100
Subject: [PATCH] x86: Unplug emulated disks and nics.
@@ -73,10 +73,10 @@
obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index f41ae25..bb2b65f 100644
+index 3445640..6705a91 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
-@@ -1307,6 +1307,7 @@ void __init xen_hvm_guest_init(void)
+@@ -1310,6 +1310,7 @@ void __init xen_hvm_guest_init(void)
if (xen_feature(XENFEAT_hvm_callback_vector))
xen_have_vector_callback = 1;
register_cpu_notifier(&xen_hvm_cpu_notifier);
Modified: dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0009-x86-Call-HVMOP_pagetable_dying-on-exit_mmap.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0009-x86-Call-HVMOP_pagetable_dying-on-exit_mmap.patch Fri Aug 27 04:24:38 2010 (r16187)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0009-x86-Call-HVMOP_pagetable_dying-on-exit_mmap.patch Fri Aug 27 09:50:53 2010 (r16188)
@@ -1,4 +1,4 @@
-From eb5d901cbe6cfb1f9ca7835995af8634fd34bc3a Mon Sep 17 00:00:00 2001
+From 433c1fcf01da8d4e860c8632d6173fa7e71131f4 Mon Sep 17 00:00:00 2001
From: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
Date: Thu, 17 Jun 2010 14:22:52 +0100
Subject: [PATCH] x86: Call HVMOP_pagetable_dying on exit_mmap.
@@ -17,10 +17,10 @@
4 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index bb2b65f..bdb6d66 100644
+index 6705a91..334e58d 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
-@@ -1311,4 +1311,5 @@ void __init xen_hvm_guest_init(void)
+@@ -1314,4 +1314,5 @@ void __init xen_hvm_guest_init(void)
have_vcpu_info_placement = 0;
x86_init.irqs.intr_init = xen_init_IRQ;
xen_hvm_init_time_ops();
Modified: dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0010-xenfs-enable-for-HVM-domains-too.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0010-xenfs-enable-for-HVM-domains-too.patch Fri Aug 27 04:24:38 2010 (r16187)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0010-xenfs-enable-for-HVM-domains-too.patch Fri Aug 27 09:50:53 2010 (r16188)
@@ -1,4 +1,4 @@
-From bda530187b0fb9dc0ea7dc38537adeb245bebb2b Mon Sep 17 00:00:00 2001
+From 35d88765e6e1d7f823321197374de2eb8dff49a2 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Wed, 21 Jul 2010 22:51:39 -0700
Subject: [PATCH] xenfs: enable for HVM domains too
Modified: dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0011-support-multiple-.discard.-sections-to-avoid-sectio.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0011-support-multiple-.discard.-sections-to-avoid-sectio.patch Fri Aug 27 04:24:38 2010 (r16187)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0011-support-multiple-.discard.-sections-to-avoid-sectio.patch Fri Aug 27 09:50:53 2010 (r16188)
@@ -1,4 +1,4 @@
-From 52d1c46dfd7f8e562ae5e3fa3ac21468d4ac4d9a Mon Sep 17 00:00:00 2001
+From a543c647ea71c2888c989424c2931419dd269a34 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Date: Thu, 22 Jul 2010 22:58:01 -0700
Subject: [PATCH] support multiple .discard.* sections to avoid section type conflicts
Modified: dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0012-blkfront-do-not-create-a-PV-cdrom-device-if-xen_hvm.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0012-blkfront-do-not-create-a-PV-cdrom-device-if-xen_hvm.patch Fri Aug 27 04:24:38 2010 (r16187)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0012-blkfront-do-not-create-a-PV-cdrom-device-if-xen_hvm.patch Fri Aug 27 09:50:53 2010 (r16188)
@@ -1,4 +1,4 @@
-From ea861bd95ad4f8a2bc15d244f475a3b91e9fb877 Mon Sep 17 00:00:00 2001
+From f1626eb8756c2aae216e3f1e56008013876cdee8 Mon Sep 17 00:00:00 2001
From: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
Date: Thu, 29 Jul 2010 14:53:16 +0100
Subject: [PATCH] blkfront: do not create a PV cdrom device if xen_hvm_guest
Modified: dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0013-Introduce-CONFIG_XEN_PVHVM-compile-option.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0013-Introduce-CONFIG_XEN_PVHVM-compile-option.patch Fri Aug 27 04:24:38 2010 (r16187)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0013-Introduce-CONFIG_XEN_PVHVM-compile-option.patch Fri Aug 27 09:50:53 2010 (r16188)
@@ -1,4 +1,4 @@
-From 978759a28b039bc1e9d09e110bf85b1940731fbb Mon Sep 17 00:00:00 2001
+From 5a949a535944f82ae85d56c7fabb232a61499273 Mon Sep 17 00:00:00 2001
From: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
Date: Thu, 29 Jul 2010 14:37:48 +0100
Subject: [PATCH] Introduce CONFIG_XEN_PVHVM compile option
@@ -36,10 +36,10 @@
int "Maximum allowed size of a domain in gigabytes"
default 8 if X86_32
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index bdb6d66..50fbf65 100644
+index 334e58d..37d30e4 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
-@@ -1272,6 +1272,7 @@ void xen_hvm_init_shared_info(void)
+@@ -1275,6 +1275,7 @@ void xen_hvm_init_shared_info(void)
}
}
@@ -47,7 +47,7 @@
static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
-@@ -1313,3 +1314,4 @@ void __init xen_hvm_guest_init(void)
+@@ -1316,3 +1317,4 @@ void __init xen_hvm_guest_init(void)
xen_hvm_init_time_ops();
xen_hvm_init_mmu_ops();
}
Modified: dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0014-pvops-do-not-notify-callers-from-register_xenstore_.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0014-pvops-do-not-notify-callers-from-register_xenstore_.patch Fri Aug 27 04:24:38 2010 (r16187)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0014-pvops-do-not-notify-callers-from-register_xenstore_.patch Fri Aug 27 09:50:53 2010 (r16188)
@@ -1,4 +1,4 @@
-From c49e45c5f96592d6ddf3635d6003b26492704dac Mon Sep 17 00:00:00 2001
+From 2444ef2cef95949d2f429d5e0dfef2e987a2c491 Mon Sep 17 00:00:00 2001
From: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
Date: Fri, 16 Jul 2010 17:30:19 +0100
Subject: [PATCH] pvops: do not notify callers from register_xenstore_notifier
Modified: dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0015-xen-pvhvm-allow-user-to-request-no-emulated-device.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0015-xen-pvhvm-allow-user-to-request-no-emulated-device.patch Fri Aug 27 04:24:38 2010 (r16187)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0015-xen-pvhvm-allow-user-to-request-no-emulated-device.patch Fri Aug 27 09:50:53 2010 (r16188)
@@ -1,4 +1,4 @@
-From daf8551f0285e86805dace2fb548a9d177040c1b Mon Sep 17 00:00:00 2001
+From fb9586290f3fe27d154394c8f899d3f09f999721 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell at citrix.com>
Date: Mon, 23 Aug 2010 11:59:28 +0100
Subject: [PATCH] xen: pvhvm: allow user to request no emulated device unplug
Modified: dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0016-xen-pvhvm-rename-xen_emul_unplug-ignore-to-unnnec.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0016-xen-pvhvm-rename-xen_emul_unplug-ignore-to-unnnec.patch Fri Aug 27 04:24:38 2010 (r16187)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0016-xen-pvhvm-rename-xen_emul_unplug-ignore-to-unnnec.patch Fri Aug 27 09:50:53 2010 (r16188)
@@ -1,4 +1,4 @@
-From 124f4ffc5885803e2c0bf6f4c228830ab795b80b Mon Sep 17 00:00:00 2001
+From 8ea5516badd9ccaa6088e8d1c634bb146f0125da Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell at citrix.com>
Date: Mon, 23 Aug 2010 11:59:29 +0100
Subject: [PATCH] xen: pvhvm: rename xen_emul_unplug=ignore to =unnnecessary
Modified: dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0017-xen-pvhvm-make-it-clearer-that-XEN_UNPLUG_-define.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0017-xen-pvhvm-make-it-clearer-that-XEN_UNPLUG_-define.patch Fri Aug 27 04:24:38 2010 (r16187)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvhvm/0017-xen-pvhvm-make-it-clearer-that-XEN_UNPLUG_-define.patch Fri Aug 27 09:50:53 2010 (r16188)
@@ -1,4 +1,4 @@
-From 75e8559d8971ac8bb36d535621a8df432b4f8508 Mon Sep 17 00:00:00 2001
+From 416d0512ba8d717ce996a89ab1e900208feebe46 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell at citrix.com>
Date: Mon, 23 Aug 2010 12:01:35 +0100
Subject: [PATCH] xen: pvhvm: make it clearer that XEN_UNPLUG_* define bits in a bitfield
Modified: dists/sid/linux-2.6/debian/patches/features/all/xen/pvops.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/pvops.patch Fri Aug 27 04:24:38 2010 (r16187)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvops.patch Fri Aug 27 09:50:53 2010 (r16188)
@@ -3527,7 +3527,7 @@
+#endif
+}
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 50fbf65..56b85d2 100644
+index 37d30e4..56b85d2 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -29,6 +29,7 @@
@@ -3858,17 +3858,7 @@
}
xen_raw_console_write("about to get started...\n");
-@@ -1220,6 +1316,9 @@ static int init_hvm_pv_info(int *major, int *minor)
- u64 pfn;
-
- base = xen_cpuid_base();
-+ if (!base)
-+ return -EINVAL;
-+
- cpuid(base + 1, &eax, &ebx, &ecx, &edx);
-
- *major = eax >> 16;
-@@ -1249,7 +1348,6 @@ void xen_hvm_init_shared_info(void)
+@@ -1252,7 +1348,6 @@ void xen_hvm_init_shared_info(void)
if (!shared_info_page)
shared_info_page = (struct shared_info *) alloc_bootmem_pages(PAGE_SIZE);
@@ -3876,7 +3866,7 @@
xatp.domid = DOMID_SELF;
xatp.idx = 0;
xatp.space = XENMAPSPACE_shared_info;
-@@ -1272,7 +1370,6 @@ void xen_hvm_init_shared_info(void)
+@@ -1275,7 +1370,6 @@ void xen_hvm_init_shared_info(void)
}
}
@@ -3884,7 +3874,7 @@
static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
-@@ -1314,4 +1411,3 @@ void __init xen_hvm_guest_init(void)
+@@ -1317,4 +1411,3 @@ void __init xen_hvm_guest_init(void)
xen_hvm_init_time_ops();
xen_hvm_init_mmu_ops();
}
Modified: dists/sid/linux-2.6/debian/patches/series/21-extra
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/21-extra Fri Aug 27 04:24:38 2010 (r16187)
+++ dists/sid/linux-2.6/debian/patches/series/21-extra Fri Aug 27 09:50:53 2010 (r16188)
@@ -1,19 +1,2 @@
-+ features/all/xen/pvhvm/0001-xen-Add-support-for-HVM-hypercalls.patch featureset=xen
-+ features/all/xen/pvhvm/0002-x86-early-PV-on-HVM-features-initialization.patch featureset=xen
-+ features/all/xen/pvhvm/0003-x86-xen-event-channels-delivery-on-HVM.patch featureset=xen
-+ features/all/xen/pvhvm/0004-xen-Xen-PCI-platform-device-driver.patch featureset=xen
-+ features/all/xen/pvhvm/0005-xen-Add-suspend-resume-support-for-PV-on-HVM-guests.patch featureset=xen
-+ features/all/xen/pvhvm/0006-xen-Fix-find_unbound_irq-in-presence-of-ioapic-irqs.patch featureset=xen
-+ features/all/xen/pvhvm/0007-x86-Use-xen_vcpuop_clockevent-xen_clocksource-and.patch featureset=xen
-+ features/all/xen/pvhvm/0008-x86-Unplug-emulated-disks-and-nics.patch featureset=xen
-+ features/all/xen/pvhvm/0009-x86-Call-HVMOP_pagetable_dying-on-exit_mmap.patch featureset=xen
-+ features/all/xen/pvhvm/0010-xenfs-enable-for-HVM-domains-too.patch featureset=xen
-+ features/all/xen/pvhvm/0011-support-multiple-.discard.-sections-to-avoid-sectio.patch featureset=xen
-+ features/all/xen/pvhvm/0012-blkfront-do-not-create-a-PV-cdrom-device-if-xen_hvm.patch featureset=xen
-+ features/all/xen/pvhvm/0013-Introduce-CONFIG_XEN_PVHVM-compile-option.patch featureset=xen
-+ features/all/xen/pvhvm/0014-pvops-do-not-notify-callers-from-register_xenstore_.patch featureset=xen
-+ features/all/xen/pvhvm/0015-xen-pvhvm-allow-user-to-request-no-emulated-device.patch featureset=xen
-+ features/all/xen/pvhvm/0016-xen-pvhvm-rename-xen_emul_unplug-ignore-to-unnnec.patch featureset=xen
-+ features/all/xen/pvhvm/0017-xen-pvhvm-make-it-clearer-that-XEN_UNPLUG_-define.patch featureset=xen
+ features/all/xen/pvops.patch featureset=xen
+ features/all/xen/revert-stack-guard.patch featureset=xen
Copied and modified: dists/sid/linux-2.6/debian/patches/series/22 (from r16184, dists/sid/linux-2.6/debian/patches/series/21-extra)
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/21-extra Wed Aug 25 12:10:34 2010 (r16184, copy source)
+++ dists/sid/linux-2.6/debian/patches/series/22 Fri Aug 27 09:50:53 2010 (r16188)
@@ -1,19 +1,17 @@
-+ features/all/xen/pvhvm/0001-xen-Add-support-for-HVM-hypercalls.patch featureset=xen
-+ features/all/xen/pvhvm/0002-x86-early-PV-on-HVM-features-initialization.patch featureset=xen
-+ features/all/xen/pvhvm/0003-x86-xen-event-channels-delivery-on-HVM.patch featureset=xen
-+ features/all/xen/pvhvm/0004-xen-Xen-PCI-platform-device-driver.patch featureset=xen
-+ features/all/xen/pvhvm/0005-xen-Add-suspend-resume-support-for-PV-on-HVM-guests.patch featureset=xen
-+ features/all/xen/pvhvm/0006-xen-Fix-find_unbound_irq-in-presence-of-ioapic-irqs.patch featureset=xen
-+ features/all/xen/pvhvm/0007-x86-Use-xen_vcpuop_clockevent-xen_clocksource-and.patch featureset=xen
-+ features/all/xen/pvhvm/0008-x86-Unplug-emulated-disks-and-nics.patch featureset=xen
-+ features/all/xen/pvhvm/0009-x86-Call-HVMOP_pagetable_dying-on-exit_mmap.patch featureset=xen
-+ features/all/xen/pvhvm/0010-xenfs-enable-for-HVM-domains-too.patch featureset=xen
-+ features/all/xen/pvhvm/0011-support-multiple-.discard.-sections-to-avoid-sectio.patch featureset=xen
-+ features/all/xen/pvhvm/0012-blkfront-do-not-create-a-PV-cdrom-device-if-xen_hvm.patch featureset=xen
-+ features/all/xen/pvhvm/0013-Introduce-CONFIG_XEN_PVHVM-compile-option.patch featureset=xen
-+ features/all/xen/pvhvm/0014-pvops-do-not-notify-callers-from-register_xenstore_.patch featureset=xen
-+ features/all/xen/pvhvm/0015-xen-pvhvm-allow-user-to-request-no-emulated-device.patch featureset=xen
-+ features/all/xen/pvhvm/0016-xen-pvhvm-rename-xen_emul_unplug-ignore-to-unnnec.patch featureset=xen
-+ features/all/xen/pvhvm/0017-xen-pvhvm-make-it-clearer-that-XEN_UNPLUG_-define.patch featureset=xen
-+ features/all/xen/pvops.patch featureset=xen
-+ features/all/xen/revert-stack-guard.patch featureset=xen
++ features/all/xen/pvhvm/0001-xen-Add-support-for-HVM-hypercalls.patch
++ features/all/xen/pvhvm/0002-x86-early-PV-on-HVM-features-initialization.patch
++ features/all/xen/pvhvm/0003-x86-xen-event-channels-delivery-on-HVM.patch
++ features/all/xen/pvhvm/0004-xen-Xen-PCI-platform-device-driver.patch
++ features/all/xen/pvhvm/0005-xen-Add-suspend-resume-support-for-PV-on-HVM-guests.patch
++ features/all/xen/pvhvm/0006-xen-Fix-find_unbound_irq-in-presence-of-ioapic-irqs.patch
++ features/all/xen/pvhvm/0007-x86-Use-xen_vcpuop_clockevent-xen_clocksource-and.patch
++ features/all/xen/pvhvm/0008-x86-Unplug-emulated-disks-and-nics.patch
++ features/all/xen/pvhvm/0009-x86-Call-HVMOP_pagetable_dying-on-exit_mmap.patch
++ features/all/xen/pvhvm/0010-xenfs-enable-for-HVM-domains-too.patch
++ features/all/xen/pvhvm/0011-support-multiple-.discard.-sections-to-avoid-sectio.patch
++ features/all/xen/pvhvm/0012-blkfront-do-not-create-a-PV-cdrom-device-if-xen_hvm.patch
++ features/all/xen/pvhvm/0013-Introduce-CONFIG_XEN_PVHVM-compile-option.patch
++ features/all/xen/pvhvm/0014-pvops-do-not-notify-callers-from-register_xenstore_.patch
++ features/all/xen/pvhvm/0015-xen-pvhvm-allow-user-to-request-no-emulated-device.patch
++ features/all/xen/pvhvm/0016-xen-pvhvm-rename-xen_emul_unplug-ignore-to-unnnec.patch
++ features/all/xen/pvhvm/0017-xen-pvhvm-make-it-clearer-that-XEN_UNPLUG_-define.patch
More information about the Kernel-svn-changes
mailing list