From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uby0I-00007R-GG for qemu-devel@nongnu.org; Mon, 13 May 2013 15:01:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uby0H-0004k9-4m for qemu-devel@nongnu.org; Mon, 13 May 2013 15:01:46 -0400 Received: from mail-wi0-x234.google.com ([2a00:1450:400c:c05::234]:52635) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uby0G-0004jw-L9 for qemu-devel@nongnu.org; Mon, 13 May 2013 15:01:45 -0400 Received: by mail-wi0-f180.google.com with SMTP id hn14so945161wib.7 for ; Mon, 13 May 2013 12:01:43 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <51913892.5000607@redhat.com> Date: Mon, 13 May 2013 21:01:38 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1368464653-3842-1-git-send-email-jordan.l.justen@intel.com> In-Reply-To: <1368464653-3842-1-git-send-email-jordan.l.justen@intel.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2] isapc: Fix non-KVM qemu boot (read/write memory for isapc BIOS) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jordan Justen Cc: qemu-devel@nongnu.org, Anthony Liguori Il 13/05/2013 19:04, Jordan Justen ha scritto: > 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. Not your fault, it conflicted semantically with another patch that was committed in the meanwhile. Paolo > 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, >