Re: Xen "pvhvm" driver support for squeeze?
On Thu, 2010-08-19 at 16:40 +0100, Ian Campbell wrote:
>
>
> $ git reset --hard 69a73fa4836d0d701dbff7d0de3294b96583a4cf
> $ git merge 16938b03e75e70e214d053c527bc937ee8ca838a # xen/xen/next
> $ git revert -m 1 bcf16b6b4f34fb40a7aaf637947c7d3bce0be671
> $ git diff v2.6.32.17..HEAD
>
> Then trivially adjust those hunks conflict with the base kernel, gets
> me
> a kernel which precisely matches the existing tree!
>
> So I guess I should rebase the PVHVM patches on v2.6.32.17 and the
> diff against that, which should produce the right thing.
So...
$ git checkout -b pvhvm-2.6.32.19 v2.6.32.19
$ git pull git://xenbits.xensource.com/people/ianc/linux-2.6.git debian/squeeze/pvhvm
Gives me the base tree for the diff
$ git checkout -b squeeze 69a73fa4836d0d701dbff7d0de3294b96583a4cf
$ git merge 16938b03e75e70e214d053c527bc937ee8ca838a # xen/xen/next
$ git revert -m 1 bcf16b6b4f34fb40a7aaf637947c7d3bce0be671
$ git merge v2.6.32.19
Gives me the target pvops tree.
Then I regenerate pvops.patch with:
$ git diff pvhvm-2.6.32.19..squeeze
The diff of source_amd64_xen before and after adding the pvhvm patches
is then tiny (see below) and results from merging v2.6.32.19 myself
instead of just rebasing the pvops patch to e.g.
e73f4955a821f850f5b88c32d12a81714523a95f. I don't really want to mixup
the rebase and the addition of pvhvm into one commit so should I instead
do the rebase first and then do pvhvm?
Rebasing would also remove the two "git merge" from the above.
Ian.
diff -purN -X /home/ijc/development/dontdiff.txt debian/build/source_amd64_xen//arch/x86/xen/Kconfig ../build.pristine/source_amd64_xen//arch/x86/xen/Kconfig
--- debian/build/source_amd64_xen//arch/x86/xen/Kconfig 2010-08-19 17:33:41.000000000 +0100
+++ ../build.pristine/source_amd64_xen//arch/x86/xen/Kconfig 2010-08-19 14:34:54.000000000 +0100
@@ -29,10 +29,6 @@ config XEN_SAVE_RESTORE
depends on XEN && PM
default y
-config XEN_SCHED_CLOCK
- bool
- default n
-
config XEN_DEBUG_FS
bool "Enable Xen debug and tuning parameters in debugfs"
depends on XEN && DEBUG_FS
diff -purN -X /home/ijc/development/dontdiff.txt debian/build/source_amd64_xen//arch/x86/xen/time.c ../build.pristine/source_amd64_xen//arch/x86/xen/time.c
--- debian/build/source_amd64_xen//arch/x86/xen/time.c 2010-08-19 17:33:41.000000000 +0100
+++ ../build.pristine/source_amd64_xen//arch/x86/xen/time.c 2010-08-19 14:34:54.000000000 +0100
@@ -476,11 +476,7 @@ static __init void xen_time_init(void)
}
static const struct pv_time_ops xen_time_ops __initdata = {
-#ifdef CONFIG_XEN_SCHED_CLOCK
- .sched_clock = xen_sched_clock,
-#else
.sched_clock = xen_clocksource_read,
-#endif
};
__init void xen_init_time_ops(void)
--
Ian Campbell
Prejudice:
A vagrant opinion without visible means of support.
-- Ambrose Bierce
Reply to: