> On Fri, 18 Jan 2008 22:56:32 +0530 Balbir Singh <[EMAIL PROTECTED]> wrote:
> * Andrew Morton <[EMAIL PROTECTED]> [2008-01-17 02:35:14]:
>
> > - kvm probably doesn't work properly because I couldn't be bothered fixing
> > the conflicts between git-kvm and the driver tree
> >
>
> Hi, Andrew,
>
> The following changes got KVM up and running for me
>
>
> This patch fixes the kvm build on 2.6.24-rc8-mm1. First of all, it enables
> the KVM build, the second fix moves kset_set_name to the .name member.
>
> Signed-off-by: Balbir Singh <[EMAIL PROTECTED]>
> ---
>
> arch/x86/Makefile | 2 +-
> virt/kvm/kvm_main.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff -puN arch/x86/Makefile~fix-kvm-build arch/x86/Makefile
> --- linux-2.6.24-rc8/arch/x86/Makefile~fix-kvm-build 2008-01-18
> 22:42:41.000000000 +0530
> +++ linux-2.6.24-rc8-balbir/arch/x86/Makefile 2008-01-18 22:42:47.000000000
> +0530
> @@ -185,7 +185,7 @@ core-y += arch/x86/vdso/
> core-$(CONFIG_IA32_EMULATION) += arch/x86/ia32/
>
> # kvm host support - uncomment when merging
> -# core-$(CONFIG_KVM) += arch/x86/kvm/
> +core-$(CONFIG_KVM) += arch/x86/kvm/
>
> # drivers-y are linked after core-y
> drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/
> diff -puN virt/kvm/kvm_main.c~fix-kvm-build virt/kvm/kvm_main.c
> --- linux-2.6.24-rc8/virt/kvm/kvm_main.c~fix-kvm-build 2008-01-18
> 22:42:41.000000000 +0530
> +++ linux-2.6.24-rc8-balbir/virt/kvm/kvm_main.c 2008-01-18
> 22:42:47.000000000 +0530
> @@ -1260,7 +1260,7 @@ static int kvm_resume(struct sys_device
> }
>
> static struct sysdev_class kvm_sysdev_class = {
> - set_kset_name("kvm"),
> + .name = "kvm",
> .suspend = kvm_suspend,
> .resume = kvm_resume,
> };
This patch straddles such a pickle of other patches (driver tree, kvm, git-x86)
that
there doesn't seem much point in me untangling it. Presumably people will fix
things
up as various trees merge into 2.6.25-rc1.
As long as Greg remembers to try to build kvm ;)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
