From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] i440fx: do change ISA mappings under KVM Date: Wed, 10 Sep 2008 21:34:44 +0200 Message-ID: <48C82154.4030109@web.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit To: kvm-devel Return-path: Received: from fmmailgate01.web.de ([217.72.192.221]:41709 "EHLO fmmailgate01.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751559AbYIJTeq (ORCPT ); Wed, 10 Sep 2008 15:34:46 -0400 Received: from smtp05.web.de (fmsmtp05.dlan.cinetic.de [172.20.4.166]) by fmmailgate01.web.de (Postfix) with ESMTP id C4DADEF47D28 for ; Wed, 10 Sep 2008 21:34:44 +0200 (CEST) Received: from [88.64.7.148] (helo=[192.168.1.198]) by smtp05.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.109 #226) id 1KdVSe-0001Wm-00 for kvm@vger.kernel.org; Wed, 10 Sep 2008 21:34:44 +0200 Sender: kvm-owner@vger.kernel.org List-ID: 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 --- 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;