From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:39443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbD5W-0008EO-O1 for qemu-devel@nongnu.org; Thu, 15 Dec 2011 10:19:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RbD5F-0003mo-2I for qemu-devel@nongnu.org; Thu, 15 Dec 2011 10:19:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60572) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbD5E-0003mK-IL for qemu-devel@nongnu.org; Thu, 15 Dec 2011 10:18:56 -0500 From: Avi Kivity Date: Thu, 15 Dec 2011 17:18:38 +0200 Message-Id: <1323962319-13762-7-git-send-email-avi@redhat.com> In-Reply-To: <1323962319-13762-1-git-send-email-avi@redhat.com> References: <1323962319-13762-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH 6/7] piix_pci: adapt smram mapping to use memory mutators List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org Eliminates fake state ->smram_enabled. Signed-off-by: Avi Kivity --- hw/piix_pci.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/hw/piix_pci.c b/hw/piix_pci.c index d183443..ac3d898 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -81,7 +81,6 @@ struct PCII440FXState { PAMMemoryRegion pam_regions[13]; MemoryRegion smram_region; uint8_t smm_enabled; - bool smram_enabled; PIIX3State *piix3; }; @@ -141,6 +140,7 @@ static void i440fx_update_memory_mappings(PCII440FXState *d) { int i, r; uint32_t smram; + bool smram_enabled; memory_region_transaction_begin(); update_pam(d, 0xf0000, 0x100000, (d->dev.config[I440FX_PAM] >> 4) & 3, @@ -151,18 +151,8 @@ static void i440fx_update_memory_mappings(PCII440FXState *d) &d->pam_regions[i+1]); } smram = d->dev.config[I440FX_SMRAM]; - if ((d->smm_enabled && (smram & 0x08)) || (smram & 0x40)) { - if (!d->smram_enabled) { - memory_region_del_subregion(d->system_memory, &d->smram_region); - d->smram_enabled = true; - } - } else { - if (d->smram_enabled) { - memory_region_add_subregion_overlap(d->system_memory, 0xa0000, - &d->smram_region, 1); - d->smram_enabled = false; - } - } + smram_enabled = (d->smm_enabled && (smram & 0x08)) || (smram & 0x40); + memory_region_set_enabled(&d->smram_region, !smram_enabled); memory_region_transaction_commit(); } @@ -307,7 +297,9 @@ static int i440fx_initfn(PCIDevice *dev) } memory_region_init_alias(&f->smram_region, "smram-region", f->pci_address_space, 0xa0000, 0x20000); - f->smram_enabled = true; + memory_region_add_subregion_overlap(f->system_memory, 0xa0000, + &f->smram_region, 1); + memory_region_set_enabled(&f->smram_region, false); /* Xen supports additional interrupt routes from the PCI devices to * the IOAPIC: the four pins of each PCI device on the bus are also -- 1.7.7.1