Skip to contentSkip to conversation

kvm-userspace: fix option_rom_setup_reset address

PATCH RESEND Applied Ryan Harper 3 participants 3 messages Apr 6, 2009 – Apr 13, 2009 KVM

lore
Share & tools
lore

Ryan Harper

author
#0 lore raw

PATCH RESEND 1/1 kvm-userspace: fix option_rom_setup_reset address

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.

Signature · 12 lines
Ryan Harper
Software Engineer; Linux Technology Center
IBM Corp., Austin, Tx
[email protected]


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

Signed-off-by: Ryan Harper <[email protected]>
---
qemu/hw/pc.c +1 -1
index d4a4320..a649ecf 100644
@@ -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;
#1 lore raw
Quoted 7 lines · 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.

looks good to me.

Signature · 5 lines
Glauber  Costa.
"Free as in Freedom"
http://glommer.net

"The less confident you are, the more serious you have to act."
Applied
#2 lore raw
In reply to Ryan Harper
Quoted 8 lines · 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.

Applied, thanks.

Signature · 1 line
error compiling committee.c: too many arguments to function