From patchwork Fri Apr 3 02:48:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harper X-Patchwork-Id: 16026 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n332mB6F000565 for ; Fri, 3 Apr 2009 02:48:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753382AbZDCCsK (ORCPT ); Thu, 2 Apr 2009 22:48:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753026AbZDCCsI (ORCPT ); Thu, 2 Apr 2009 22:48:08 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:44235 "EHLO e36.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752069AbZDCCsH (ORCPT ); Thu, 2 Apr 2009 22:48:07 -0400 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e36.co.us.ibm.com (8.13.1/8.13.1) with ESMTP id n332ke6h020822 for ; Thu, 2 Apr 2009 20:46:40 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n332m5GG223196 for ; Thu, 2 Apr 2009 20:48:05 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n332m4GC010075 for ; Thu, 2 Apr 2009 20:48:05 -0600 Received: from localhost.localdomain (frylock.austin.ibm.com [9.53.41.12]) by d03av02.boulder.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n332m4GC010071 for ; Thu, 2 Apr 2009 20:48:04 -0600 Received: by localhost.localdomain (Postfix, from userid 1000) id 032541BF83; Thu, 2 Apr 2009 21:48:04 -0500 (CDT) Date: Thu, 2 Apr 2009 21:48:03 -0500 From: Ryan Harper To: kvm@vger.kernel.org Subject: [PATCH] kvm-userspace: fix option_rom_setup_reset address Message-ID: <20090403024803.GC20681@us.ibm.com> Mime-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.6+20040907i Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Commit f2b690ba461971fb8b04354de8717a73fd08b945 changed the target address for option roms, but failed to use the same address when registering an option rom reset. This manifests itself when using extboot (boot=on) and reseting a guest via reboot or system_reset on monitor and the guest fails to boot. This patch register the correct region for each option rom. diffstat output: pc.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Ryan Harper --- diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c index d4a4320..a649ecf 100644 --- a/qemu/hw/pc.c +++ b/qemu/hw/pc.c @@ -985,7 +985,7 @@ vga_bios_error: before INT 19h. See the PNPBIOS specification, appendix B. DDIM support is mandatory for proper PCI expansion ROM support. */ cpu_register_physical_memory(offset, size, option_rom_offset /* | IO_MEM_ROM */); - option_rom_setup_reset(0xd0000 + offset, size); + option_rom_setup_reset(offset, size); offset += size; } pci_option_rom_offset = offset;