From patchwork Mon May 13 17:04:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jordan.l.justen@intel.com X-Patchwork-Id: 243468 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C1A712C00A9 for ; Tue, 14 May 2013 03:35:38 +1000 (EST) Received: from localhost ([::1]:44882 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ubweu-00043H-Qw for incoming@patchwork.ozlabs.org; Mon, 13 May 2013 13:35:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ubwea-000434-8I for qemu-devel@nongnu.org; Mon, 13 May 2013 13:35:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UbwAg-0003Yq-2h for qemu-devel@nongnu.org; Mon, 13 May 2013 13:04:32 -0400 Received: from mga14.intel.com ([143.182.124.37]:29578) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UbwAf-0003XP-IT for qemu-devel@nongnu.org; Mon, 13 May 2013 13:04:21 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by azsmga102.ch.intel.com with ESMTP; 13 May 2013 10:04:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,663,1363158000"; d="scan'208";a="333362678" Received: from jljusten-ivy.jf.intel.com ([10.24.1.77]) by fmsmga001.fm.intel.com with ESMTP; 13 May 2013 10:04:15 -0700 From: Jordan Justen To: qemu-devel@nongnu.org Date: Mon, 13 May 2013 10:04:13 -0700 Message-Id: <1368464653-3842-1-git-send-email-jordan.l.justen@intel.com> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 143.182.124.37 Cc: Jordan Justen , Anthony Liguori Subject: [Qemu-devel] [PATCH v2] isapc: Fix non-KVM qemu boot (read/write memory for isapc BIOS) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The isapc machine with seabios currently requires the BIOS region to be read/write memory rather than read-only memory. KVM currently cannot support the BIOS as a ROM region, but qemu in non-KVM mode can. Based on this, isapc machine currently only works with KVM. To work-around this isapc issue, this change avoids marking the BIOS as readonly for isapc. This change also will allow KVM to start supporting ROM mode via KVM_CAP_READONLY_MEM. Signed-off-by: Jordan Justen Reviewed-by: Paolo Bonzini --- v2: * Fix build issue with this patch. Apologies for not testing this patch outside of my kvm-flash series. hw/block/pc_sysfw.c | 16 +++++++++++----- hw/i386/pc_piix.c | 5 +++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/hw/block/pc_sysfw.c b/hw/block/pc_sysfw.c index aad8614..a02f320 100644 --- a/hw/block/pc_sysfw.c +++ b/hw/block/pc_sysfw.c @@ -39,6 +39,7 @@ typedef struct PcSysFwDevice { SysBusDevice busdev; uint8_t rom_only; + uint8_t isapc_ram_fw; } PcSysFwDevice; static void pc_isa_bios_init(MemoryRegion *rom_memory, @@ -139,7 +140,7 @@ static void pc_system_flash_init(MemoryRegion *rom_memory, pc_isa_bios_init(rom_memory, flash_mem, size); } -static void old_pc_system_rom_init(MemoryRegion *rom_memory) +static void old_pc_system_rom_init(MemoryRegion *rom_memory, bool isapc_ram_fw) { char *filename; MemoryRegion *bios, *isa_bios; @@ -163,7 +164,9 @@ static void old_pc_system_rom_init(MemoryRegion *rom_memory) bios = g_malloc(sizeof(*bios)); memory_region_init_ram(bios, "pc.bios", bios_size); vmstate_register_ram_global(bios); - memory_region_set_readonly(bios, true); + if (!isapc_ram_fw) { + memory_region_set_readonly(bios, true); + } ret = rom_add_file_fixed(bios_name, (uint32_t)(-bios_size), -1); if (ret != 0) { bios_error: @@ -186,7 +189,9 @@ static void old_pc_system_rom_init(MemoryRegion *rom_memory) 0x100000 - isa_bios_size, isa_bios, 1); - memory_region_set_readonly(isa_bios, true); + if (!isapc_ram_fw) { + memory_region_set_readonly(isa_bios, true); + } /* map all the bios at the top of memory */ memory_region_add_subregion(rom_memory, @@ -216,7 +221,7 @@ void pc_system_firmware_init(MemoryRegion *rom_memory) qdev_init_nofail(DEVICE(sysfw_dev)); if (sysfw_dev->rom_only) { - old_pc_system_rom_init(rom_memory); + old_pc_system_rom_init(rom_memory, sysfw_dev->isapc_ram_fw); return; } @@ -234,7 +239,7 @@ void pc_system_firmware_init(MemoryRegion *rom_memory) exit(1); } else { sysfw_dev->rom_only = 1; - old_pc_system_rom_init(rom_memory); + old_pc_system_rom_init(rom_memory, sysfw_dev->isapc_ram_fw); return; } } @@ -255,6 +260,7 @@ void pc_system_firmware_init(MemoryRegion *rom_memory) } static Property pcsysfw_properties[] = { + DEFINE_PROP_UINT8("isapc_ram_fw", PcSysFwDevice, isapc_ram_fw, 0), DEFINE_PROP_UINT8("rom_only", PcSysFwDevice, rom_only, 1), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index f7c80ad..c1a49ec 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -716,6 +716,11 @@ static QEMUMachine isapc_machine = { .property = "rom_only", .value = stringify(1), }, + { + .driver = "pc-sysfw", + .property = "isapc_ram_fw", + .value = stringify(1), + }, { /* end of list */ } }, DEFAULT_MACHINE_OPTIONS,