From patchwork Mon Dec 14 12:48:25 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 41097 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2A504B6ED0 for ; Tue, 15 Dec 2009 00:02:39 +1100 (EST) Received: from localhost ([127.0.0.1]:44577 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKAZP-000189-RG for incoming@patchwork.ozlabs.org; Mon, 14 Dec 2009 08:02:35 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NKAM7-0004zA-2a for qemu-devel@nongnu.org; Mon, 14 Dec 2009 07:48:51 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NKAM1-0004w8-2j for qemu-devel@nongnu.org; Mon, 14 Dec 2009 07:48:49 -0500 Received: from [199.232.76.173] (port=57619 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKAM0-0004w3-Ui for qemu-devel@nongnu.org; Mon, 14 Dec 2009 07:48:44 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:34968) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NKAM0-0006Kl-89 for qemu-devel@nongnu.org; Mon, 14 Dec 2009 07:48:44 -0500 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 2B3CE4A4CF; Mon, 14 Dec 2009 21:48:36 +0900 (JST) Received: (nullmailer pid 30215 invoked by uid 1000); Mon, 14 Dec 2009 12:48:26 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org, mst@redhat.com Date: Mon, 14 Dec 2009 21:48:25 +0900 Message-Id: <1260794906-30168-11-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.5.4 In-Reply-To: <1260794906-30168-1-git-send-email-yamahata@valinux.co.jp> References: <1260794906-30168-1-git-send-email-yamahata@valinux.co.jp> X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH 10/11] piix_pci: use range helper function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org use range helper function in i440fx_write_config(). Signed-off-by: Isaku Yamahata --- hw/piix_pci.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 7bbaf50..304f84a 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -136,9 +136,11 @@ static void i440fx_write_config(PCIDevice *dev, /* XXX: implement SMRAM.D_LOCK */ pci_default_write_config(dev, address, val, len); - if ((address >= I440FX_PAM0 && address <= I440FX_PAM6) || - address == I440FX_SMRAM) + if (ranges_overlap(address, len, + I440FX_PAM0, I440FX_PAM6 - I440FX_PAM0 + 1) || + range_covers_byte(address, len, I440FX_SMRAM)) { i440fx_update_memory_mappings(d); + } } static int i440fx_load_old(QEMUFile* f, void *opaque, int version_id)