Move CPUID setup and CPU reset code to kvm_cpu__start() so that CPU state is
setup in one place.
Cc: Asias He <asias.hejun@xxxxxxxxx>
Cc: Cyrill Gorcunov <gorcunov@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
tools/kvm/kvm-cpu.c | 3 +++
tools/kvm/kvm-run.c | 10 +++-------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/tools/kvm/kvm-cpu.c b/tools/kvm/kvm-cpu.c
index 392fad3..4cbe597 100644
--- a/tools/kvm/kvm-cpu.c
+++ b/tools/kvm/kvm-cpu.c
@@ -373,6 +373,9 @@ void kvm_cpu__run(struct kvm_cpu *self)
int kvm_cpu__start(struct kvm_cpu *cpu)
{
+ kvm_cpu__setup_cpuid(cpu);
+ kvm_cpu__reset_vcpu(cpu);
+
for (;;) {
kvm_cpu__run(cpu);
diff --git a/tools/kvm/kvm-run.c b/tools/kvm/kvm-run.c
index 9a0400b..8a9747b 100644
--- a/tools/kvm/kvm-run.c
+++ b/tools/kvm/kvm-run.c
@@ -143,8 +143,6 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix)
die("unable to load disk image %s", image_filename);
}
- kvm_cpu__setup_cpuid(cpu);
-
strcpy(real_cmdline, "notsc nolapic noacpi pci=conf1 console=ttyS0 ");
if (!kernel_cmdline || !strstr(kernel_cmdline, "root=")) {
strlcat(real_cmdline, "root=/dev/vda rw ",
@@ -160,13 +158,8 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix)
real_cmdline))
die("unable to load kernel %s", kernel_filename);
- kvm_cpu__reset_vcpu(cpu);
-
kvm__setup_bios(kvm);
- if (single_step)
- kvm_cpu__enable_singlestep(cpu);
-
serial8250__init(kvm);
pci__init();
@@ -177,6 +170,9 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix)
kvm__start_timer(kvm);
+ if (single_step)
+ kvm_cpu__enable_singlestep(cpu);
+
if (kvm_cpu__start(cpu))
goto panic_kvm;
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
