Skip to contentSkip to conversation

Fixing KVM/ARM breakage in mainline

DISCUSSION Marc Zyngier 3 participants 4 messages Feb 25, 2013 – Mar 3, 2013 KVM

lore
Share & tools
lore

Marc Zyngier

author
#0 lore raw

Russell, Marcelo, Gleb,

Commit 89f8833 (Merge tag 'kvm-3.9-1' of
git://git.kernel.org/pub/scm/virt/kvm/kvm) broke KVM/ARM. Nothing fundamental, just annoying enough.

I've posted patches against next-20130215 some time ago:
http://comments.gmane.org/gmane.comp.emulators.kvm.devel/105019

I've now created a branch based off mainline as of this morning, and containing these fixes:
git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git
kvm-arm/core-3.9-rc1-fixes

Now the question is: who wants to merge this? The diffstat looks like this:

Marc Zyngier (3):
ARM: KVM: fix kvm_arch_{prepare,commit}_memory_region
ARM: KVM: Rename KVM_MEMORY_SLOTS -> KVM_USER_MEM_SLOTS
ARM: KVM: fix compilation after removal of user_alloc from struct
kvm_memory_slot

 arch/arm/include/asm/kvm_host.h | 2 +-
 arch/arm/kvm/arm.c              | 4 ++--
 arch/arm/kvm/mmu.c              | 5 -----
 3 files changed, 3 insertions(+), 8 deletions(-)

Thanks,

	M.
Signature · 1 line
Jazz is not dead. It just smells funny...
#1 lore raw
Quoted 9 lines · Marc Zyngier

Russell, Marcelo, Gleb,

Commit 89f8833 (Merge tag 'kvm-3.9-1' of
git://git.kernel.org/pub/scm/virt/kvm/kvm) broke KVM/ARM. Nothing fundamental, just annoying enough.

I've posted patches against next-20130215 some time ago:
http://comments.gmane.org/gmane.comp.emulators.kvm.devel/105019

Quoted 7 lines

I've now created a branch based off mainline as of this morning, and containing these fixes:
git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git
kvm-arm/core-3.9-rc1-fixes

Now the question is: who wants to merge this? The diffstat looks like this:

I was going to merge it today.

--
Gleb.

#2 lore raw
Quoted 10 lines · Gleb Natapov
Quoted 9 lines · Marc Zyngier

Russell, Marcelo, Gleb,

Commit 89f8833 (Merge tag 'kvm-3.9-1' of
git://git.kernel.org/pub/scm/virt/kvm/kvm) broke KVM/ARM. Nothing fundamental, just annoying enough.

I've posted patches against next-20130215 some time ago:
http://comments.gmane.org/gmane.comp.emulators.kvm.devel/105019

Quoted 8 lines
Quoted 7 lines

I've now created a branch based off mainline as of this morning, and containing these fixes:
git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git
kvm-arm/core-3.9-rc1-fixes

Now the question is: who wants to merge this? The diffstat looks like this:

I was going to merge it today.

I notice that my randconfig build last night tripped over the:

include/linux/kvm_host.h:333:34: error: 'KVM_USER_MEM_SLOTS' undeclared here (not in a function)

error which Marc's patches fix.

#3 lore raw
Quoted 18 lines · Russell King - ARM Linux
Quoted 17 lines · Gleb Natapov
Quoted 16 lines · Marc Zyngier

Russell, Marcelo, Gleb,

Commit 89f8833 (Merge tag 'kvm-3.9-1' of
git://git.kernel.org/pub/scm/virt/kvm/kvm) broke KVM/ARM. Nothing fundamental, just annoying enough.

I've posted patches against next-20130215 some time ago:
http://comments.gmane.org/gmane.comp.emulators.kvm.devel/105019

I've now created a branch based off mainline as of this morning, and containing these fixes:
git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git
kvm-arm/core-3.9-rc1-fixes

Now the question is: who wants to merge this? The diffstat looks like this:

Quoted 7 lines
Quoted 1 line

I was going to merge it today.

I notice that my randconfig build last night tripped over the:

include/linux/kvm_host.h:333:34: error: 'KVM_USER_MEM_SLOTS' undeclared here (not in a function)

error which Marc's patches fix.

The patches that were send to the kvm mailing list are in Linus tree for quite a while now:

3b8cd8a015f3db85624c0fdb591956aed7f61b65 ARM: KVM: fix compilation after removal of user_alloc from struct kvm_memory 2b5e1e474fd7b0f2540a052d15465ba953dd30b1 ARM: KVM: Rename KVM_MEMORY_SLOTS -> KVM_USER_MEM_SLOTS bef103aa7dd75121f66848d91f6b6179d40c1a71 ARM: KVM: fix kvm_arch_{prepare,commit}_memory_region

Are there additional patches that I missed?

--
Gleb.