From: Igor Mammedov <imammedo@redhat.com>
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>
Subject: Re: [Qemu-devel] [PATCH v2 2/3] q35: Move options common to all classes to pc_i440fx_machine_options()
Date: Mon, 14 Sep 2015 15:36:10 +0200 [thread overview]
Message-ID: <20150914153610.2ea5d35a@nial.brq.redhat.com> (raw)
In-Reply-To: <1442002465-31466-3-git-send-email-ehabkost@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;
> }
next prev parent reply other threads:[~2015-09-14 13:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-11 20:14 [Qemu-devel] [PATCH v2 0/3] pc-*-2.5 machine-types Eduardo Habkost
2015-09-11 20:14 ` [Qemu-devel] [PATCH v2 1/3] q35: Move options common to all classes to pc_q35_machine_options() Eduardo Habkost
2015-09-14 13:32 ` Igor Mammedov
2015-09-11 20:14 ` [Qemu-devel] [PATCH v2 2/3] q35: Move options common to all classes to pc_i440fx_machine_options() Eduardo Habkost
2015-09-14 13:35 ` Igor Mammedov
2015-09-14 13:36 ` Igor Mammedov [this message]
2015-09-11 20:14 ` [Qemu-devel] [PATCH v2 3/3] pc: Introduce pc-*-2.5 machine classes Eduardo Habkost
2015-09-14 13:43 ` Igor Mammedov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150914153610.2ea5d35a@nial.brq.redhat.com \
--to=imammedo@redhat.com \
--cc=ehabkost@redhat.com \
--cc=jasowang@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.