[PATCH] i440fx: do change ISA mappings under KVM

[PATCH] i440fx: do change ISA mappings under KVM

[Jan Kiszka]

As long as KVM does not support remapping or protection state changes of
guest memory, do not fiddle with the ISA mappings that QEMU see,
confusing both the monitor and the gdbstub.

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
---
 qemu/hw/piix_pci.c |    6 ++++++
 1 file changed, 6 insertions(+)

Index: b/qemu/hw/piix_pci.c
===================================================================
--- a/qemu/hw/piix_pci.c
+++ b/qemu/hw/piix_pci.c
@@ -26,6 +26,8 @@
 #include "pc.h"
 #include "pci.h"
 
+#include "qemu-kvm.h"
+
 typedef uint32_t pci_addr_t;
 #include "pci_host.h"
 
@@ -91,6 +93,10 @@ static void i440fx_update_memory_mapping
     int i, r;
     uint32_t smram, addr;
 
+    if (kvm_enabled()) {
+        /* FIXME: Support remappings and protection changes. */
+        return;
+    }
     update_pam(d, 0xf0000, 0x100000, (d->config[0x59] >> 4) & 3);
     for(i = 0; i < 12; i++) {
         r = (d->config[(i >> 1) + 0x5a] >> ((i & 1) * 4)) & 3;

Re: [PATCH] i440fx: do change ISA mappings under KVM

[Avi Kivity]

Jan Kiszka wrote:
> As long as KVM does not support remapping or protection state changes of
> guest memory, do not fiddle with the ISA mappings that QEMU see,
> confusing both the monitor and the gdbstub.
>   

Applied, thanks.  What guest triggers this?  Or is it the standard bios?



-- 
Do not meddle in the internals of kernels, for they are subtle and quick to panic.

Re: [PATCH] i440fx: do change ISA mappings under KVM

[Jan Kiszka]

Avi Kivity wrote:
> Jan Kiszka wrote:
>> As long as KVM does not support remapping or protection state changes of
>> guest memory, do not fiddle with the ISA mappings that QEMU see,
>> confusing both the monitor and the gdbstub.
>>   
> 
> Applied, thanks.  What guest triggers this?  Or is it the standard bios?

bios_shadow_init() and bios_lock_shadow_ram() in rombios32.c.

Jan

-- 
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux