From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47865)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <imammedo@redhat.com>) id 1ZbTvU-0007n2-SM
	for qemu-devel@nongnu.org; Mon, 14 Sep 2015 09:36:12 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <imammedo@redhat.com>) id 1ZbTvQ-0005sf-R1
	for qemu-devel@nongnu.org; Mon, 14 Sep 2015 09:36:08 -0400
Received: from mx1.redhat.com ([209.132.183.28]:49560)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <imammedo@redhat.com>) id 1ZbTvQ-0005sX-La
	for qemu-devel@nongnu.org; Mon, 14 Sep 2015 09:36:04 -0400
Date: Mon, 14 Sep 2015 15:35:22 +0200
From: Igor Mammedov <imammedo@redhat.com>
Message-ID: <20150914153522.7c53f3dc@nial.brq.redhat.com>
In-Reply-To: <1442002465-31466-3-git-send-email-ehabkost@redhat.com>
References: <1442002465-31466-1-git-send-email-ehabkost@redhat.com>
	<1442002465-31466-3-git-send-email-ehabkost@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v2 2/3] q35: Move options common to all
 classes to pc_i440fx_machine_options()
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Eduardo Habkost <ehabkost@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>, Jason Wang <jasowang@redhat.com>, Richard Henderson <rth@twiddle.net>, qemu-devel@nongnu.org, "Michael S.
	Tsirkin" <mst@redhat.com>

On Fri, 11 Sep 2015 17:14:24 -0300
Eduardo Habkost <ehabkost@redhat.com> wrote:

> The existing default_machine_opts and default_display settings will
> still apply to future machine classes. So it makes sense to move them to
> pc_i440fx_machine_options() instead of keeping them in a
> version-specific machine_options function.

s/q35/piix/ or something like this, with this:

Reviewed-by: Igor Mammedov <imammedo@redhat.com>


> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>  hw/i386/pc_piix.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 3f925b2..2d9df7c 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -460,6 +460,8 @@ static void pc_i440fx_machine_options(MachineClass *m)
>      m->family = "pc_piix";
>      m->desc = "Standard PC (i440FX + PIIX, 1996)";
>      m->hot_add_cpu = pc_hot_add_cpu;
> +    m->default_machine_opts = "firmware=bios-256k.bin";
> +    m->default_display = "std";
>  }
>  
>  static void pc_i440fx_2_4_machine_options(MachineClass *m)
> @@ -467,8 +469,6 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m)
>      PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
>      pc_i440fx_machine_options(m);
>      pcmc->broken_reserved_end = true;
> -    m->default_machine_opts = "firmware=bios-256k.bin";
> -    m->default_display = "std";
>      m->alias = "pc";
>      m->is_default = 1;
>  }