mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kvm: sync vcpu state during initialization (Hollis Blanchard)

Browse Source 
Currently on x86, qemu initializes CPUState but KVM ignores it and does its
own vcpu initialization. However, PowerPC KVM needs to be able to set the
initial register state to support the -kernel and -append options.

Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6060 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2008-12-15 22:20:42 +00:00
parent 8d6c92b6b1
commit f5d6f51ba6
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kvm-all.c
View File

@ -141,6 +141,21 @@ err:
return ret;
}
int kvm_sync_vcpus(void)
{
CPUState *env;
for (env = first_cpu; env != NULL; env = env->next_cpu) {
int ret;
ret = kvm_arch_put_registers(env);
if (ret)
return ret;
}
return 0;
}
/*
* dirty pages logging control
*/

1
kvm.h
View File

@ -31,6 +31,7 @@ struct kvm_run;
int kvm_init(int smp_cpus);
int kvm_init_vcpu(CPUState *env);
int kvm_sync_vcpus(void);
int kvm_cpu_exec(CPUState *env);

11
vl.c
View File

@ -5456,6 +5456,17 @@ int main(int argc, char **argv, char **envp)
machine->init(ram_size, vga_ram_size, boot_devices, ds,
kernel_filename, kernel_cmdline, initrd_filename, cpu_model);
/* Set KVM's vcpu state to qemu's initial CPUState. */
if (kvm_enabled()) {
int ret;
ret = kvm_sync_vcpus();
if (ret < 0) {
fprintf(stderr, "failed to initialize vcpus\n");
exit(1);
}
}
/* init USB devices */
if (usb_enabled) {
for(i = 0; i < usb_devices_index; i++) {