[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/8] kvm: sync vcpu state during initialization
From: |
Hollis Blanchard |
Subject: |
[Qemu-devel] [PATCH 4/8] kvm: sync vcpu state during initialization |
Date: |
Mon, 15 Dec 2008 10:44:15 -0600 |
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 <address@hidden>
---
kvm-all.c | 15 +++++++++++++++
kvm.h | 1 +
vl.c | 11 +++++++++++
3 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/kvm-all.c b/kvm-all.c
index dad80df..11034df 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -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
*/
diff --git a/kvm.h b/kvm.h
index ac464ab..efce145 100644
--- a/kvm.h
+++ b/kvm.h
@@ -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);
diff --git a/vl.c b/vl.c
index c3a8d8f..0a02151 100644
--- a/vl.c
+++ b/vl.c
@@ -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++) {
--
1.5.6.5
- [Qemu-devel] KVM PowerPC support, Hollis Blanchard, 2008/12/15
- [Qemu-devel] [PATCH 1/8] Move PPC4xx SDRAM controller emulation from ppc405_uc.c to ppc4xx_devs.c, Hollis Blanchard, 2008/12/15
- [Qemu-devel] [PATCH 2/8] Rename ppc405_sdram_init() to ppc4xx_sdram_init(), Hollis Blanchard, 2008/12/15
- [Qemu-devel] [PATCH 3/8] Create a helper function to allow more flexible RAM allocation for PPC 4xx, Hollis Blanchard, 2008/12/15
- [Qemu-devel] [PATCH 7/8] PowerPC 440EP SoC emulation, Hollis Blanchard, 2008/12/15
- [Qemu-devel] [PATCH 5/8] Implement device tree support needed for Bamboo emulation, Hollis Blanchard, 2008/12/15
- [Qemu-devel] [PATCH 4/8] kvm: sync vcpu state during initialization,
Hollis Blanchard <=
- [Qemu-devel] [PATCH 6/8] Enable KVM for ppcemb., Hollis Blanchard, 2008/12/15
- [Qemu-devel] [PATCH 8/8] IBM PowerPC 440EP Bamboo reference board emulation, Hollis Blanchard, 2008/12/15
- Re: [Qemu-devel] [PATCH 1/8] Move PPC4xx SDRAM controller emulation from ppc405_uc.c to ppc4xx_devs.c, Aurelien Jarno, 2008/12/15