{"id":811293,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811293/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504836324-4871-7-git-send-email-jasowang@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504836324-4871-7-git-send-email-jasowang@redhat.com>","list_archive_url":null,"date":"2017-09-08T02:05:12","name":"[PULL,06/18] net: rtl8139: do not use old_mmio accesses","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"02cf6826a0dde33a23c3f720f3221fdb3f8db823","submitter":{"id":5225,"url":"http://patchwork.ozlabs.org/api/1.2/people/5225/?format=json","name":"Jason Wang","email":"jasowang@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504836324-4871-7-git-send-email-jasowang@redhat.com/mbox/","series":[{"id":2087,"url":"http://patchwork.ozlabs.org/api/1.2/series/2087/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2087","date":"2017-09-08T02:05:06","name":"[PULL,01/18] net/filter-rewriter.c: Fix rewirter checksum bug when use virtio-net","version":1,"mbox":"http://patchwork.ozlabs.org/series/2087/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811293/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811293/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=jasowang@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xpLSV6nB9z9ryT\n\tfor ;\n\tFri, 8 Sep 2017 12:12:42 +1000 (AEST)","from localhost ([::1]:42971 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dq8me-0000D0-UO\n\tfor incoming@patchwork.ozlabs.org; Thu, 07 Sep 2017 22:12:41 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:60812)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dq8gD-0003Ci-GK\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:06:06 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dq8g8-00029m-L4\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:06:01 -0400","from mx1.redhat.com ([209.132.183.28]:36418)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dq8g8-00027l-Cj\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:05:56 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 6E928356D4;\n\tFri, 8 Sep 2017 02:05:55 +0000 (UTC)","from jason-ThinkPad-T450s.redhat.com (ovpn-12-98.pek2.redhat.com\n\t[10.72.12.98])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id B83A4600CA;\n\tFri, 8 Sep 2017 02:05:52 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 6E928356D4","From":"Jason Wang ","To":"peter.maydell@linaro.org,\n\tqemu-devel@nongnu.org","Date":"Fri, 8 Sep 2017 10:05:12 +0800","Message-Id":"<1504836324-4871-7-git-send-email-jasowang@redhat.com>","In-Reply-To":"<1504836324-4871-1-git-send-email-jasowang@redhat.com>","References":"<1504836324-4871-1-git-send-email-jasowang@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tFri, 08 Sep 2017 02:05:55 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL 06/18] net: rtl8139: do not use old_mmio accesses","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Matt Parker , Jason Wang ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Matt Parker \n\nBoth io and memory use the same mmio functions in the rtl8139 device.\nThis patch removes the separate MemoryRegionOps and old_mmio accessors\nfor memory, and replaces it with an alias to the io memory region.\n\nSigned-off-by: Matt Parker \nSigned-off-by: Jason Wang \n---\n hw/net/rtl8139.c | 53 +++--------------------------------------------------\n 1 file changed, 3 insertions(+), 50 deletions(-)","diff":"diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c\nindex 671c7e4..3be24bb 100644\n--- a/hw/net/rtl8139.c\n+++ b/hw/net/rtl8139.c\n@@ -3132,38 +3132,6 @@ static uint32_t rtl8139_io_readl(void *opaque, uint8_t addr)\n \n /* */\n \n-static void rtl8139_mmio_writeb(void *opaque, hwaddr addr, uint32_t val)\n-{\n- rtl8139_io_writeb(opaque, addr & 0xFF, val);\n-}\n-\n-static void rtl8139_mmio_writew(void *opaque, hwaddr addr, uint32_t val)\n-{\n- rtl8139_io_writew(opaque, addr & 0xFF, val);\n-}\n-\n-static void rtl8139_mmio_writel(void *opaque, hwaddr addr, uint32_t val)\n-{\n- rtl8139_io_writel(opaque, addr & 0xFF, val);\n-}\n-\n-static uint32_t rtl8139_mmio_readb(void *opaque, hwaddr addr)\n-{\n- return rtl8139_io_readb(opaque, addr & 0xFF);\n-}\n-\n-static uint32_t rtl8139_mmio_readw(void *opaque, hwaddr addr)\n-{\n- uint32_t val = rtl8139_io_readw(opaque, addr & 0xFF);\n- return val;\n-}\n-\n-static uint32_t rtl8139_mmio_readl(void *opaque, hwaddr addr)\n-{\n- uint32_t val = rtl8139_io_readl(opaque, addr & 0xFF);\n- return val;\n-}\n-\n static int rtl8139_post_load(void *opaque, int version_id)\n {\n RTL8139State* s = opaque;\n@@ -3344,22 +3312,6 @@ static const MemoryRegionOps rtl8139_io_ops = {\n .endianness = DEVICE_LITTLE_ENDIAN,\n };\n \n-static const MemoryRegionOps rtl8139_mmio_ops = {\n- .old_mmio = {\n- .read = {\n- rtl8139_mmio_readb,\n- rtl8139_mmio_readw,\n- rtl8139_mmio_readl,\n- },\n- .write = {\n- rtl8139_mmio_writeb,\n- rtl8139_mmio_writew,\n- rtl8139_mmio_writel,\n- },\n- },\n- .endianness = DEVICE_LITTLE_ENDIAN,\n-};\n-\n static void rtl8139_timer(void *opaque)\n {\n RTL8139State *s = opaque;\n@@ -3422,8 +3374,9 @@ static void pci_rtl8139_realize(PCIDevice *dev, Error **errp)\n \n memory_region_init_io(&s->bar_io, OBJECT(s), &rtl8139_io_ops, s,\n \"rtl8139\", 0x100);\n- memory_region_init_io(&s->bar_mem, OBJECT(s), &rtl8139_mmio_ops, s,\n- \"rtl8139\", 0x100);\n+ memory_region_init_alias(&s->bar_mem, OBJECT(s), \"rtl8139-mem\", &s->bar_io,\n+ 0, 0x100);\n+\n pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->bar_io);\n pci_register_bar(dev, 1, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->bar_mem);\n \n","prefixes":["PULL","06/18"]}