From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLaXp-0000pW-AM for qemu-devel@nongnu.org; Thu, 06 Mar 2014 10:49:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WLaXj-0003Of-BV for qemu-devel@nongnu.org; Thu, 06 Mar 2014 10:49:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57709) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLaXj-0003N4-4c for qemu-devel@nongnu.org; Thu, 06 Mar 2014 10:49:07 -0500 Date: Thu, 6 Mar 2014 17:48:49 +0200 From: "Michael S. Tsirkin" Message-ID: <1394120854-5392-2-git-send-email-mst@redhat.com> References: <1394120854-5392-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1394120854-5392-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] pc: option rom migration compatibility with 1.7 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, pbonzini@redhat.com, kraxel@redhat.com, Anthony Liguori , Marcel Apfelbaum when using 1.7 machine types, enable option ROMs in RAM to match that version. Signed-off-by: Michael S. Tsirkin --- hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 1 + 2 files changed, 2 insertions(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 1acd2b2..99c7a3a 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -260,6 +260,7 @@ static void pc_compat_1_7(QEMUMachineInitArgs *args) { smbios_type1_defaults = false; gigabyte_align = false; + option_rom_in_ram = true; } static void pc_compat_1_6(QEMUMachineInitArgs *args) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index a7f6260..36a1c0d 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -244,6 +244,7 @@ static void pc_compat_1_7(QEMUMachineInitArgs *args) { smbios_type1_defaults = false; gigabyte_align = false; + option_rom_in_ram = true; } static void pc_compat_1_6(QEMUMachineInitArgs *args) -- MST