Skip to contentSkip to conversation

KVM fix for 2.6.30-rc8

GIT PULL Avi Kivity 1 participant 1 message Jun 8, 2009 KVM

lore
Share & tools
lore

Avi Kivity

author
#0 lore raw

Linus, if it's not too late, please pull

git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-updates/2.6.30

this fixes a crash during reboot with the kvm modules loaded if CONFIG_SMP is selected.

If you merge the larger cpumask initializing allocator, you can drop this.

Avi Kivity (1):
KVM: Explicity initialize cpus_hardware_enabled

virt/kvm/kvm_main.c | 1 +

1 files changed, 1 insertions(+), 0 deletions(-)

commit a4c0364be3f43d3e17fe19270f8b3d64881606e6

Author: Avi Kivity <[email protected]>
Date:   Sat Jun 6 12:34:39 2009 +0300

KVM: Explicity initialize cpus_hardware_enabled

Under CONFIG_MAXSMP, cpus_hardware_enabled is allocated from the
heap and
not statically initialized. This causes a crash on reboot when kvm
thinks
vmx is enabled on random nonexistent cpus and accesses nonexistent
percpu
lists.

Fix by explicitly clearing the variable.

virt/kvm/kvm_main.c +1 -0
index 1ecbe23..4293528 100644
@@ -2305,6 +2305,7 @@ int kvm_init(void *opaque, unsigned int vcpu_size,
        r = -ENOMEM;
        goto out_free_0;
    }
+    cpumask_clear(cpus_hardware_enabled);
 
    r = kvm_arch_hardware_setup();
    if (r < 0)
Signature · 1 line
error compiling committee.c: too many arguments to function