From patchwork Sat Aug 3 08:31:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 264393 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7CC842C0095 for ; Sat, 3 Aug 2013 18:31:42 +1000 (EST) Received: from localhost ([::1]:33273 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V5XFT-00042e-CB for incoming@patchwork.ozlabs.org; Sat, 03 Aug 2013 04:31:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47128) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V5XF8-00041U-20 for qemu-devel@nongnu.org; Sat, 03 Aug 2013 04:31:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V5XF2-0005jW-0y for qemu-devel@nongnu.org; Sat, 03 Aug 2013 04:31:17 -0400 Received: from mout.web.de ([212.227.17.12]:60923) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V5XF1-0005jM-NS for qemu-devel@nongnu.org; Sat, 03 Aug 2013 04:31:11 -0400 Received: from mchn199C.mchp.siemens.de ([95.157.58.223]) by smtp.web.de (mrweb002) with ESMTPSA (Nemesis) id 0MYviN-1UbZlt1yR1-00Vh77 for ; Sat, 03 Aug 2013 10:31:10 +0200 Message-ID: <51FCBFCD.5020608@web.de> Date: Sat, 03 Aug 2013 10:31:09 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Paolo Bonzini X-Enigmail-Version: 1.5.2 X-Provags-ID: V03:K0:U2K38H953dIj8381rSZXETNU2ynfYuS77oBVF1TwrLJ9G/qIc6e rXxpHjx/WY6QmhDE7H/9V9SNp01+4a747/xTmuyhY1G3Uax4psKExbJC0p6Hk4DlqIK/7hS sv2/vsr0wI1xFHrOeuCzfbYZ+p0aEszTCkQSSBWQi6AdugaITWGpQkz8g4DeO+z5G+bmnJs CRM00tiGGi1IY9X9a5ceg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.17.12 Cc: qemu-devel Subject: [Qemu-devel] [PATCH 1/2] memory: Provide separate handling of unassigned io ports accesses 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 From: Jan Kiszka Accesses to unassigned io ports shall return -1 on read and be ignored on write. Ensure these properties via dedicated ops, decoupling us from the memory core's handling of unassigned accesses. Signed-off-by: Jan Kiszka --- exec.c | 3 ++- include/exec/ioport.h | 2 ++ ioport.c | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/exec.c b/exec.c index 3ca9381..9ed598f 100644 --- a/exec.c +++ b/exec.c @@ -1820,7 +1820,8 @@ static void memory_map_init(void) address_space_init(&address_space_memory, system_memory, "memory"); system_io = g_malloc(sizeof(*system_io)); - memory_region_init(system_io, NULL, "io", 65536); + memory_region_init_io(system_io, NULL, &unassigned_io_ops, NULL, "io", + 65536); address_space_init(&address_space_io, system_io, "I/O"); memory_listener_register(&core_memory_listener, &address_space_memory); diff --git a/include/exec/ioport.h b/include/exec/ioport.h index bdd4e96..84f7f85 100644 --- a/include/exec/ioport.h +++ b/include/exec/ioport.h @@ -45,6 +45,8 @@ typedef struct MemoryRegionPortio { #define PORTIO_END_OF_LIST() { } +extern const MemoryRegionOps unassigned_io_ops; + void cpu_outb(pio_addr_t addr, uint8_t val); void cpu_outw(pio_addr_t addr, uint16_t val); void cpu_outl(pio_addr_t addr, uint32_t val); diff --git a/ioport.c b/ioport.c index 79b7f1a..9765588 100644 --- a/ioport.c +++ b/ioport.c @@ -44,6 +44,22 @@ typedef struct MemoryRegionPortioList { MemoryRegionPortio ports[]; } MemoryRegionPortioList; +static uint64_t unassigned_io_read(void *opaque, hwaddr addr, unsigned size) +{ + return -1UL; +} + +static void unassigned_io_write(void *opaque, hwaddr addr, uint64_t val, + unsigned size) +{ +} + +const MemoryRegionOps unassigned_io_ops = { + .read = unassigned_io_read, + .write = unassigned_io_write, + .endianness = DEVICE_NATIVE_ENDIAN, +}; + void cpu_outb(pio_addr_t addr, uint8_t val) { LOG_IOPORT("outb: %04"FMT_pioaddr" %02"PRIx8"\n", addr, val);