Re: [Qemu-devel] [PATCH v10 7/8] hw/pc_piix: add pc-1.1

[Alexander Graf]

On 08.01.2012, at 20:51, Jordan Justen wrote:

> Signed-off-by: Jordan Justen <address@hidden>
> ---
> hw/pc_piix.c |   11 +++++++++--
> 1 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/pc_piix.c b/hw/pc_piix.c
> index 00f525e..aea95e4 100644
> --- a/hw/pc_piix.c
> +++ b/hw/pc_piix.c
> @@ -314,8 +314,8 @@ static void pc_xen_hvm_init(ram_addr_t ram_size,
> }
> #endif
> 
> -static QEMUMachine pc_machine_v1_0 = {
> -    .name = "pc-1.0",
> +static QEMUMachine pc_machine_v1_1 = {
> +    .name = "pc-1.1",
>     .alias = "pc",
>     .desc = "Standard PC",
>     .init = pc_init_pci,
> @@ -323,6 +323,13 @@ static QEMUMachine pc_machine_v1_0 = {
>     .is_default = 1,
> };
> 
> +static QEMUMachine pc_machine_v1_0 = {
> +    .name = "pc-1.0",
> +    .desc = "Standard PC",
> +    .init = pc_init_pci,
> +    .max_cpus = 255,
> +};
> +
> static QEMUMachine pc_machine_v0_15 = {
>     .name = "pc-0.15",
>     .desc = "Standard PC",

This is missing registration of the v1.1 machine, no? Please see my -cpu best 
default patch I just posted.


Alex