From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: qemu-kvm: drop kvm-tpr-opt BIOS region hack Date: Mon, 18 Oct 2010 12:05:50 -0200 Message-ID: <20101018140550.GA31952@amt.cnet> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:65508 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932798Ab0JRQHA (ORCPT ); Mon, 18 Oct 2010 12:07:00 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9IG70Ew001273 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 18 Oct 2010 12:07:00 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id o9IG6xVh022579 for ; Mon, 18 Oct 2010 12:06:59 -0400 Received: from amt.cnet (vpn-11-183.rdu.redhat.com [10.11.11.183]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o9IG6wuN025287 for ; Mon, 18 Oct 2010 12:06:59 -0400 Received: from amt.cnet (localhost.localdomain [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 4E07368A072 for ; Mon, 18 Oct 2010 12:05:51 -0200 (BRST) Received: (from marcelo@localhost) by amt.cnet (8.14.4/8.14.4/Submit) id o9IE5oEo032134 for kvm@vger.kernel.org; Mon, 18 Oct 2010 12:05:50 -0200 Content-Disposition: inline Sender: kvm-owner@vger.kernel.org List-ID: Commit c2333d898b52 changed kvm-tpr-opt.c to use cpu_physical_memory_write_rom for BIOS patching. BIOS map at 0xf0000 can now be registered as IO_MEM_ROM. Signed-off-by: Marcelo Tosatti diff --git a/hw/pc.c b/hw/pc.c index 9c08573..b624873 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -956,10 +956,9 @@ void pc_memory_init(ram_addr_t ram_size, isa_bios_size = 128 * 1024; cpu_register_physical_memory(0xd0000, (192 * 1024) - isa_bios_size, IO_MEM_UNASSIGNED); - /* kvm tpr optimization needs the bios accessible for write, at least to qemu itself */ cpu_register_physical_memory(0x100000 - isa_bios_size, isa_bios_size, - (bios_offset + bios_size - isa_bios_size) /* | IO_MEM_ROM */); + (bios_offset + bios_size - isa_bios_size) | IO_MEM_ROM); if (extboot_drive) { option_rom[nb_option_roms++] = qemu_strdup(EXTBOOT_FILENAME);