Skip to contentSkip to conversation

i440fx: do change ISA mappings under KVM

PATCH In review Jan Kiszka 3 participants 3 messages Sep 10, 2008 – Sep 11, 2008 KVM

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 i440fx: do change ISA mappings under KVM

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 <[email protected]>
---
 qemu/hw/piix_pci.c |    6 ++++++
 1 file changed, 6 insertions(+)
qemu/hw/piix_pci.c +6 -0
Index: 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;
#1 lore raw
Quoted 4 lines · 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.

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

Signature · 1 line
Do not meddle in the internals of kernels, for they are subtle and quick to panic.
#2 lore raw
Quoted 7 lines · Avi Kivity
Quoted 4 lines · 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.

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

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

Jan

Signature · 2 lines
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux