From patchwork Tue Nov 15 11:13:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 125768 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A8657B6F72 for ; Tue, 15 Nov 2011 23:30:49 +1100 (EST) Received: from localhost ([::1]:58231 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQGyv-0001rN-BK for incoming@patchwork.ozlabs.org; Tue, 15 Nov 2011 06:15:13 -0500 Received: from eggs.gnu.org ([140.186.70.92]:60986) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQGy1-0007it-EN for qemu-devel@nongnu.org; Tue, 15 Nov 2011 06:14:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RQGxv-0000Ka-Tp for qemu-devel@nongnu.org; Tue, 15 Nov 2011 06:14:17 -0500 Received: from mail-wy0-f173.google.com ([74.125.82.173]:37244) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQGxv-0000KS-N3 for qemu-devel@nongnu.org; Tue, 15 Nov 2011 06:14:11 -0500 Received: by wyg34 with SMTP id 34so1821973wyg.4 for ; Tue, 15 Nov 2011 03:14:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=uvMLoOxN4tXmgX46CSdKqgt7vxI6wul8YRgISrfPXlA=; b=Ub98iuyn9zBcjmayE+jYUm0zO3cHE3FdcwPO9NbET13EMLbFl4xWXzjIIy7YwdTett e8Wp0A/vqgmJHVB0T2/TGO05yQ7jWqNo9YXEstqhyKeK47fh+G4sWBJOcHPQ4dgYw7FV UhehrcLVhIxBiCfSYYn/HhMrKPTTLoMSGDZxc= Received: by 10.216.213.219 with SMTP id a69mr264743wep.61.1321355650975; Tue, 15 Nov 2011 03:14:10 -0800 (PST) Received: from Laure.box.in.chocolate-blue.net ([109.190.18.76]) by mx.google.com with ESMTPS id n18sm12476201wbm.19.2011.11.15.03.14.09 (version=SSLv3 cipher=OTHER); Tue, 15 Nov 2011 03:14:10 -0800 (PST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Tue, 15 Nov 2011 12:13:52 +0100 Message-Id: <1321355644-1982-3-git-send-email-benoit.canet@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1321355644-1982-1-git-send-email-benoit.canet@gmail.com> References: <1321355644-1982-1-git-send-email-benoit.canet@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.173 Cc: blauwirbel@gmail.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , avi@redhat.com Subject: [Qemu-devel] [PATCH 02/14] slavio_misc: convert configuration to memory API X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Benoit Canet --- hw/slavio_misc.c | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/hw/slavio_misc.c b/hw/slavio_misc.c index 7d427f7..7b98f11 100644 --- a/hw/slavio_misc.c +++ b/hw/slavio_misc.c @@ -36,6 +36,7 @@ typedef struct MiscState { SysBusDevice busdev; + MemoryRegion cfg_iomem; qemu_irq irq; qemu_irq fdc_tc; uint32_t dummy; @@ -101,7 +102,7 @@ static void slavio_set_power_fail(void *opaque, int irq, int power_failing) } static void slavio_cfg_mem_writeb(void *opaque, target_phys_addr_t addr, - uint32_t val) + uint64_t val, unsigned size) { MiscState *s = opaque; @@ -110,7 +111,8 @@ static void slavio_cfg_mem_writeb(void *opaque, target_phys_addr_t addr, slavio_misc_update_irq(s); } -static uint32_t slavio_cfg_mem_readb(void *opaque, target_phys_addr_t addr) +static uint64_t slavio_cfg_mem_readb(void *opaque, target_phys_addr_t addr, + unsigned size) { MiscState *s = opaque; uint32_t ret = 0; @@ -120,16 +122,14 @@ static uint32_t slavio_cfg_mem_readb(void *opaque, target_phys_addr_t addr) return ret; } -static CPUReadMemoryFunc * const slavio_cfg_mem_read[3] = { - slavio_cfg_mem_readb, - NULL, - NULL, -}; - -static CPUWriteMemoryFunc * const slavio_cfg_mem_write[3] = { - slavio_cfg_mem_writeb, - NULL, - NULL, +static const MemoryRegionOps slavio_cfg_mem_ops = { + .read = slavio_cfg_mem_readb, + .write = slavio_cfg_mem_writeb, + .endianness = DEVICE_NATIVE_ENDIAN, + .valid = { + .min_access_size = 1, + .max_access_size = 1, + }, }; static void slavio_diag_mem_writeb(void *opaque, target_phys_addr_t addr, @@ -428,10 +428,9 @@ static int slavio_misc_init1(SysBusDevice *dev) /* 8 bit registers */ /* Slavio control */ - io = cpu_register_io_memory(slavio_cfg_mem_read, - slavio_cfg_mem_write, s, - DEVICE_NATIVE_ENDIAN); - sysbus_init_mmio(dev, MISC_SIZE, io); + memory_region_init_io(&s->cfg_iomem, &slavio_cfg_mem_ops, s, + "configuration", MISC_SIZE); + sysbus_init_mmio_region(dev, &s->cfg_iomem); /* Diagnostics */ io = cpu_register_io_memory(slavio_diag_mem_read,