On 2012-02-16 00:16, Igor Mammedov wrote:
> If cpu model wasn't specified at startup or hot-plug set it to default
> value for the target.
>
> Signed-off-by: Igor Mammedov <imamm...@redhat.com>
> ---
> hw/pc.c | 8 ++++++++
> 1 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/hw/pc.c b/hw/pc.c
> index 3d35d78..ec50f16 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -933,6 +933,14 @@ static int cpu_device_init(ICCBusDevice *dev)
> CPUPC* cpu = DO_UPCAST(CPUPC, busdev, dev);
> CPUState *env = &cpu->state;
>
> + if (cpu->model == NULL) {
> +#ifdef TARGET_X86_64
> + qdev_prop_set_string(&dev->qdev, "model", g_strdup("qemu64"));
> +#else
> + qdev_prop_set_string(&dev->qdev, "model", g_strdup("qemu32"));
> +#endif
> + }
> +
> if (cpu_x86_init_inplace(env, cpu->model) < 0) {
> return -1;
> }
This obsoletes a similar logic in pc_cpus_init. Please consolidate.
Jan
--
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
