qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>, Anthony Liguori <aliguori@amazon.com>
Subject: [Qemu-devel] [PATCH 8/8] pc: switch 2.0 machine types to large seabios binary
Date: Fri,  6 Dec 2013 10:35:27 +0100	[thread overview]
Message-ID: <1386322527-23148-9-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1386322527-23148-1-git-send-email-kraxel@redhat.com>

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/i386/pc_piix.c | 4 +++-
 hw/i386/pc_q35.c  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 9329f04..ab56285 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -339,7 +339,9 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
     .desc = "Standard PC (i440FX + PIIX, 1996)", \
     .hot_add_cpu = pc_hot_add_cpu
 
-#define PC_I440FX_2_0_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS
+#define PC_I440FX_2_0_MACHINE_OPTIONS                           \
+    PC_I440FX_MACHINE_OPTIONS,                                  \
+    .default_machine_opts = "firmware=bios-256k.bin"
 
 static QEMUMachine pc_i440fx_machine_v2_0 = {
     PC_I440FX_2_0_MACHINE_OPTIONS,
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index ac69e5d..97aa842 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -259,7 +259,9 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *args)
     .desc = "Standard PC (Q35 + ICH9, 2009)", \
     .hot_add_cpu = pc_hot_add_cpu
 
-#define PC_Q35_2_0_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS
+#define PC_Q35_2_0_MACHINE_OPTIONS                      \
+    PC_Q35_MACHINE_OPTIONS,                             \
+    .default_machine_opts = "firmware=bios-256k.bin"
 
 static QEMUMachine pc_q35_machine_v2_0 = {
     PC_Q35_2_0_MACHINE_OPTIONS,
-- 
1.8.3.1

  parent reply	other threads:[~2013-12-06  9:36 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-06  9:35 [Qemu-devel] [PULL 0/8] seabios update Gerd Hoffmann
2013-12-06  9:35 ` [Qemu-devel] [PATCH 1/8] add pc-{i440fx,q35}-2.0 machine types Gerd Hoffmann
2013-12-06  9:35 ` [Qemu-devel] [PATCH 2/8] add firmware to machine options Gerd Hoffmann
2013-12-06  9:35 ` [Qemu-devel] [PATCH 3/8] roms: update seabios submodule to 31b8b4eea9d9ad58a73b22a6060d3ac1c419c26d Gerd Hoffmann
2013-12-06  9:35 ` [Qemu-devel] [PATCH 4/8] roms: build two seabios binaries Gerd Hoffmann
2013-12-06  9:35 ` [Qemu-devel] [PATCH 5/8] roms: enable seabios cross builds Gerd Hoffmann
2013-12-06  9:35 ` [Qemu-devel] [PATCH 6/8] roms: update seabios binaries Gerd Hoffmann
2013-12-06  9:35 ` [Qemu-devel] [PATCH 7/8] roms: update vgabios binaries Gerd Hoffmann
2014-01-05  9:35   ` Jan Kiszka
2014-01-05 11:26     ` Paolo Bonzini
2014-01-05 11:45       ` Jan Kiszka
2014-02-03 14:28         ` Paolo Bonzini
2014-02-03 14:41           ` Gerd Hoffmann
2013-12-06  9:35 ` Gerd Hoffmann [this message]
2013-12-09 23:33   ` [Qemu-devel] [PATCH] Add bios-256k.bin to BLOBS on Makefile Eduardo Habkost
2013-12-10  8:52     ` Gerd Hoffmann
2013-12-10 13:56     ` Peter Maydell
2013-12-11 17:30     ` William Dauchy
2014-01-06 13:13     ` Peter Maydell
2014-01-14 13:45       ` William Dauchy
2014-01-14 14:03         ` Michael Tokarev
  -- strict thread matches above, loose matches on Subject: below --
2013-12-02 12:24 [Qemu-devel] [PATCH 0/8] seabios update Gerd Hoffmann
2013-12-02 12:24 ` [Qemu-devel] [PATCH 8/8] pc: switch 2.0 machine types to large seabios binary Gerd Hoffmann

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=1386322527-23148-9-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=aliguori@amazon.com \
    --cc=qemu-devel@nongnu.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).