[v2,4/5] pc: add 1.6 compat type

Identical to 1.5 ATM, but changes will accumulate.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/i386/pc_piix.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

Am 30.05.2013 13:07, schrieb Michael S. Tsirkin:
> Identical to 1.5 ATM, but changes will accumulate.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

You did notice that Eduardo had a similar patch yesterday or so?
Yours does not handle q35 by comparison.

> ---
>  hw/i386/pc_piix.c | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index eaff0b6..2717d83 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -57,6 +57,7 @@ static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };
>  static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
>  
>  static bool has_pvpanic = true;
> +static bool has_pci_info = true;

I don't see this used here, and it's replaced in next patch.

Andreas

>  
>  /* PC hardware initialisation */
>  static void pc_init1(MemoryRegion *system_memory,
> @@ -340,9 +341,19 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
>  }
>  #endif
>  
> +static QEMUMachine pc_i440fx_machine_v1_6 = {
> +    .name = "pc-i440fx-1.6",
> +    .alias = "pc",
> +    .desc = "Standard PC (i440FX + PIIX, 1996)",
> +    .init = pc_init_pci,
> +    .hot_add_cpu = pc_hot_add_cpu,
> +    .max_cpus = 255,
> +    .is_default = 1,
> +    DEFAULT_MACHINE_OPTIONS,
> +};
> +
>  static QEMUMachine pc_i440fx_machine_v1_5 = {
>      .name = "pc-i440fx-1.5",
> -    .alias = "pc",
>      .desc = "Standard PC (i440FX + PIIX, 1996)",
>      .init = pc_init_pci,
>      .hot_add_cpu = pc_hot_add_cpu,
>

On Thu, May 30, 2013 at 05:55:35PM +0200, Andreas Färber wrote:
> Am 30.05.2013 13:07, schrieb Michael S. Tsirkin:
> > Identical to 1.5 ATM, but changes will accumulate.
> > 
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> 
> You did notice that Eduardo had a similar patch yesterday or so?
> Yours does not handle q35 by comparison.

Hmm I'll have to figure out the dependency.

> > ---
> >  hw/i386/pc_piix.c | 13 ++++++++++++-
> >  1 file changed, 12 insertions(+), 1 deletion(-)
> > 
> > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> > index eaff0b6..2717d83 100644
> > --- a/hw/i386/pc_piix.c
> > +++ b/hw/i386/pc_piix.c
> > @@ -57,6 +57,7 @@ static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };
> >  static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
> >  
> >  static bool has_pvpanic = true;
> > +static bool has_pci_info = true;
> 
> I don't see this used here, and it's replaced in next patch.
> 
> Andreas
> 
> >  
> >  /* PC hardware initialisation */
> >  static void pc_init1(MemoryRegion *system_memory,
> > @@ -340,9 +341,19 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
> >  }
> >  #endif
> >  
> > +static QEMUMachine pc_i440fx_machine_v1_6 = {
> > +    .name = "pc-i440fx-1.6",
> > +    .alias = "pc",
> > +    .desc = "Standard PC (i440FX + PIIX, 1996)",
> > +    .init = pc_init_pci,
> > +    .hot_add_cpu = pc_hot_add_cpu,
> > +    .max_cpus = 255,
> > +    .is_default = 1,
> > +    DEFAULT_MACHINE_OPTIONS,
> > +};
> > +
> >  static QEMUMachine pc_i440fx_machine_v1_5 = {
> >      .name = "pc-i440fx-1.5",
> > -    .alias = "pc",
> >      .desc = "Standard PC (i440FX + PIIX, 1996)",
> >      .init = pc_init_pci,
> >      .hot_add_cpu = pc_hot_add_cpu,
> > 
> 
> 
> -- 
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg