Re: [Qemu-devel] [PATCH 1/6] pc: add machine type for 0.12

[Anthony Liguori <anthony@codemonkey.ws>]

On 01/08/2010 08:25 AM, Gerd Hoffmann wrote:
> Add a new machine type for qemu 0.12.
>
> Also fixup the 0.11 machine type: msi for virtio-blk-pci was enabled
> after the 0.11 release, so turn it off in the 0.11 machine type.
>
> Signed-off-by: Gerd Hoffmann<kraxel@redhat.com>
>    

Applied all.  Thanks.

Regards,

Anthony Liguori
> ---
>   hw/pc.c |   18 +++++++++++++++++-
>   1 files changed, 17 insertions(+), 1 deletions(-)
>
> diff --git a/hw/pc.c b/hw/pc.c
> index 83f8dd0..ea5ac8e 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -1298,7 +1298,7 @@ void cmos_set_s3_resume(void)
>   }
>
>   static QEMUMachine pc_machine = {
> -    .name = "pc-0.11",
> +    .name = "pc-0.12",
>       .alias = "pc",
>       .desc = "Standard PC",
>       .init = pc_init_pci,
> @@ -1306,6 +1306,21 @@ static QEMUMachine pc_machine = {
>       .is_default = 1,
>   };
>
> +static QEMUMachine pc_machine_v0_11 = {
> +    .name = "pc-0.11",
> +    .desc = "Standard PC, qemu 0.11",
> +    .init = pc_init_pci,
> +    .max_cpus = 255,
> +    .compat_props = (GlobalProperty[]) {
> +        {
> +            .driver   = "virtio-blk-pci",
> +            .property = "vectors",
> +            .value    = stringify(0),
> +        },
> +        { /* end of list */ }
> +    }
> +};
> +
>   static QEMUMachine pc_machine_v0_10 = {
>       .name = "pc-0.10",
>       .desc = "Standard PC, qemu 0.10",
> @@ -1343,6 +1358,7 @@ static QEMUMachine isapc_machine = {
>   static void pc_machine_init(void)
>   {
>       qemu_register_machine(&pc_machine);
> +    qemu_register_machine(&pc_machine_v0_11);
>       qemu_register_machine(&pc_machine_v0_10);
>       qemu_register_machine(&isapc_machine);
>   }
>