[PATCH][RESEND] kvm-userspace: fix option_rom_setup_reset address

[PATCH][RESEND] kvm-userspace: fix option_rom_setup_reset address

[Ryan Harper]

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.


-- 
Ryan Harper
Software Engineer; Linux Technology Center
IBM Corp., Austin, Tx
ryanh@us.ibm.com


diffstat output:
 pc.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Signed-off-by: Ryan Harper <ryanh@us.ibm.com>
---
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;

Re: [PATCH][RESEND] kvm-userspace: fix option_rom_setup_reset address

[Glauber Costa]

On Mon, Apr 6, 2009 at 1:32 PM, Ryan Harper <ryanh@us.ibm.com> wrote:
> 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.
>
looks good to me.


-- 
Glauber  Costa.
"Free as in Freedom"
http://glommer.net

"The less confident you are, the more serious you have to act."

Re: [PATCH][RESEND] kvm-userspace: fix option_rom_setup_reset address

[Avi Kivity]

Ryan Harper wrote:
> 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.
>
>   

Applied, thanks.

-- 
error compiling committee.c: too many arguments to function