From patchwork Mon Apr 6 16:32:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harper X-Patchwork-Id: 16601 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 n36GWurB019871 for ; Mon, 6 Apr 2009 16:32:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752681AbZDFQcz (ORCPT ); Mon, 6 Apr 2009 12:32:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752452AbZDFQcz (ORCPT ); Mon, 6 Apr 2009 12:32:55 -0400 Received: from e6.ny.us.ibm.com ([32.97.182.146]:54176 "EHLO e6.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751939AbZDFQcy (ORCPT ); Mon, 6 Apr 2009 12:32:54 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e6.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n36GYU34016585 for ; Mon, 6 Apr 2009 12:34:30 -0400 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n36GWq7A191648 for ; Mon, 6 Apr 2009 12:32:52 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n36GWp6f017212 for ; Mon, 6 Apr 2009 12:32:52 -0400 Received: from localhost.localdomain (frylock.austin.ibm.com [9.53.41.12]) by d01av01.pok.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n36GWoA8017152 for ; Mon, 6 Apr 2009 12:32:51 -0400 Received: by localhost.localdomain (Postfix, from userid 1000) id 7BE9C1BF7C; Mon, 6 Apr 2009 11:32:48 -0500 (CDT) Date: Mon, 6 Apr 2009 11:32:48 -0500 From: Ryan Harper To: kvm@vger.kernel.org Subject: [PATCH][RESEND] kvm-userspace: fix option_rom_setup_reset address Message-ID: <20090406163248.GB11614@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;