On Tue, Feb 02, 2010 at 09:19:06AM +0100, Jan Kiszka wrote:
> Setting the boot CPU ID is arch-specific KVM stuff. So push it where it
> belongs to.
>
pc_init1 is also arch-specific, no? TCG should also be able to
have BSP apic_id != 0.
> Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
> ---
> hw/pc.c | 3 ---
> qemu-kvm-x86.c | 3 ++-
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/hw/pc.c b/hw/pc.c
> index 6c15a9f..3df6195 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -803,9 +803,6 @@ static void pc_init1(ram_addr_t ram_size,
> #endif
> }
>
> - if (kvm_enabled()) {
> - kvm_set_boot_cpu_id(0);
> - }
> for (i = 0; i < smp_cpus; i++) {
> env = pc_new_cpu(cpu_model);
> }
> diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
> index 9de018e..0f34451 100644
> --- a/qemu-kvm-x86.c
> +++ b/qemu-kvm-x86.c
> @@ -695,7 +695,8 @@ int kvm_arch_qemu_create_context(void)
> if (kvm_check_extension(kvm_state, KVM_CAP_ADJUST_CLOCK))
> vmstate_register(0, &vmstate_kvmclock, &kvmclock_data);
> #endif
> - return 0;
> +
> + return kvm_set_boot_cpu_id(0);
> }
>
> static void set_msr_entry(struct kvm_msr_entry *entry, uint32_t index,
> --
> 1.6.0.2
>
> --
> 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
--
Gleb.
--
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
