{"id":817620,"url":"http://patchwork.ozlabs.org/api/patches/817620/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170922160111.31885-3-f4bug@amsat.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/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":"<20170922160111.31885-3-f4bug@amsat.org>","list_archive_url":null,"date":"2017-09-22T16:01:02","name":"[25/34] hw/timer/m48t59: use TYPE_M48T59_ISA, add entries to MAINTAINERS","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"5c7ff1090db7d3ab0cb7fec2dfd7d02d4a44bc57","submitter":{"id":70924,"url":"http://patchwork.ozlabs.org/api/people/70924/?format=json","name":"Philippe Mathieu-Daudé","email":"f4bug@amsat.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170922160111.31885-3-f4bug@amsat.org/mbox/","series":[{"id":4657,"url":"http://patchwork.ozlabs.org/api/series/4657/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=4657","date":"2017-09-22T15:39:40","name":"remove i386/pc dependency from non-PC world (part 1)","version":1,"mbox":"http://patchwork.ozlabs.org/series/4657/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/817620/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817620/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","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=<UNKNOWN>)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"PJTM1r9L\"; dkim-atps=neutral"],"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 3xzJQq3KQbz9t49\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 23 Sep 2017 02:12:19 +1000 (AEST)","from localhost ([::1]:59843 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dvQYr-0006g2-CF\n\tfor incoming@patchwork.ozlabs.org; Fri, 22 Sep 2017 12:12:17 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51562)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <philippe.mathieu.daude@gmail.com>)\n\tid 1dvQOh-00067s-GZ\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 12:01:48 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <philippe.mathieu.daude@gmail.com>)\n\tid 1dvQOf-0008Ox-Pv\n\tfor qemu-devel@nongnu.org; Fri, 22 Sep 2017 12:01:47 -0400","from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:37306)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from <philippe.mathieu.daude@gmail.com>)\n\tid 1dvQOf-0008Oi-Lt; Fri, 22 Sep 2017 12:01:45 -0400","by mail-qt0-x243.google.com with SMTP id u48so923684qtc.4;\n\tFri, 22 Sep 2017 09:01:45 -0700 (PDT)","from yoga.lan ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id\n\ty31sm108325qta.83.2017.09.22.09.01.41\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tFri, 22 Sep 2017 09:01:44 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=sender:from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=/vTJhoXWoZsgcDOXvcRuqqfhOoSV0vVpPdkW06HrZ3w=;\n\tb=PJTM1r9LKA9S/icPTAoM/7NvGUw4UB4QFQHkdI6axCvJylzZYrkIRX/ueoU4+4N5bN\n\tAe9/Yykcc7qB5sE3NY9GaL4JsBS+OuR+i4/FzDs1sBi5e/ZSMCwSFH2KC1vNGj9x/IL1\n\tHOKL1hrq+YK3cYtdVE45UT/fkGpjT9GtBa6bibUtd6mLI8Vol7JW9JsAaPsadm6OX4EZ\n\tVq1AqblcwaOw6xXuL4hSWN42D1sdm04aWlRfbEo7o/nRs0HQlgRehDIA737q8MCmN8Sh\n\taxcmj3Ja3EadHouC/DI5oY0x3h6NQW3qxD1trkcFgsPl0FOhhqjMTTlaisly/Yukx2uj\n\txCIg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:sender:from:to:cc:subject:date:message-id\n\t:in-reply-to:references:mime-version:content-transfer-encoding;\n\tbh=/vTJhoXWoZsgcDOXvcRuqqfhOoSV0vVpPdkW06HrZ3w=;\n\tb=iZ13HTMh2CRQA7tpcpmVmjabwfjWiy+0B4IGaI92ms0FPnxMX60FtWI3+04Oh5PuGX\n\tE67RC+F1gSFMU/5kylE+evs3fPMa5ftgY221RznKHj5dsocJd88+/Aoc2YskeEZ9TKiY\n\tAObgVZrR0rdxBQZLunJYAgmi9Q41UDD715Jv+6B7OcrIV2UUIPmsPkYpTORKICP99LUA\n\tbRkH9J4db14onqYgRJ/Qah/QKt8sprvQALZZQbDVMaXZItPFKCW+bKsViXnOic972c3U\n\tsIdNgRIvhelPX/bw784mpR5C0WGOrIVAdENbw9k62AlhHKAPFCOW7VAW7I1UzTSO2S80\n\tuyug==","X-Gm-Message-State":"AHPjjUhxgxqF/QHOTK65jE02Jp/lc8ZbedlyA0V05lqCbEBo29lAjO9q\n\tzvLJS5CoQ64dSKTIX4SWlbs=","X-Google-Smtp-Source":"AOwi7QBrrK1Bp5+A4RDiUkDgxsJ9/9fCKV+tt1PuTGULunjXRFW3+PHaFhqcmdpMh19t5HdaUN9y8g==","X-Received":"by 10.200.27.85 with SMTP id p21mr8433969qtk.3.1506096104946;\n\tFri, 22 Sep 2017 09:01:44 -0700 (PDT)","From":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>","To":"Peter Maydell <peter.maydell@linaro.org>, Thomas Huth <thuth@redhat.com>,\n\tPaolo Bonzini <pbonzini@redhat.com>, =?utf-8?q?Herv=C3=A9_Poussineau?=\n\t<hpoussin@reactos.org>, David Gibson <david@gibson.dropbear.id.au>,\n\tAlexander Graf <agraf@suse.de>","Date":"Fri, 22 Sep 2017 13:01:02 -0300","Message-Id":"<20170922160111.31885-3-f4bug@amsat.org>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170922154014.29350-1-f4bug@amsat.org>","References":"<20170922154014.29350-1-f4bug@amsat.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2607:f8b0:400d:c0d::243","Subject":"[Qemu-devel] [PATCH 25/34] hw/timer/m48t59: use TYPE_M48T59_ISA,\n\tadd entries to MAINTAINERS","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathi?=\n\t=?utf-8?b?ZXUtRGF1ZMOp?= <f4bug@amsat.org>, \tqemu-devel@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>\n---\n include/hw/timer/m48t59.h | 2 ++\n hw/ppc/prep.c             | 2 +-\n hw/timer/m48t59-isa.c     | 2 +-\n MAINTAINERS               | 2 ++\n 4 files changed, 6 insertions(+), 2 deletions(-)","diff":"diff --git a/include/hw/timer/m48t59.h b/include/hw/timer/m48t59.h\nindex db5e43a8da..069bb045d7 100644\n--- a/include/hw/timer/m48t59.h\n+++ b/include/hw/timer/m48t59.h\n@@ -25,6 +25,8 @@ typedef struct NvramClass {\n     void (*toggle_lock)(Nvram *obj, int lock);\n } NvramClass;\n \n+#define TYPE_M48T59_ISA \"isa-m48t59\"\n+\n Nvram *m48t59_init_isa(ISABus *bus, uint32_t io_base, uint16_t size,\n                        int base_year, int type);\n Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base,\ndiff --git a/hw/ppc/prep.c b/hw/ppc/prep.c\nindex 16f4537093..1f8ef4819b 100644\n--- a/hw/ppc/prep.c\n+++ b/hw/ppc/prep.c\n@@ -777,7 +777,7 @@ static void ibm_40p_init(MachineState *machine)\n     /* add some more devices */\n     if (defaults_enabled()) {\n         isa_create_simple(isa_bus, TYPE_I8042);\n-        m48t59 = NVRAM(isa_create_simple(isa_bus, \"isa-m48t59\"));\n+        m48t59 = NVRAM(isa_create_simple(isa_bus, TYPE_M48T59_ISA));\n \n         dev = DEVICE(isa_create(isa_bus, \"cs4231a\"));\n         qdev_prop_set_uint32(dev, \"iobase\", 0x830);\ndiff --git a/hw/timer/m48t59-isa.c b/hw/timer/m48t59-isa.c\nindex ea1ba703d7..077346f7ca 100644\n--- a/hw/timer/m48t59-isa.c\n+++ b/hw/timer/m48t59-isa.c\n@@ -49,7 +49,7 @@ typedef struct M48txxISADeviceClass {\n \n static M48txxInfo m48txx_isa_info[] = {\n     {\n-        .bus_name = \"isa-m48t59\",\n+        .bus_name = TYPE_M48T59_ISA,\n         .model = 59,\n         .size = 0x2000,\n     }\ndiff --git a/MAINTAINERS b/MAINTAINERS\nindex a79723601c..3cb6bc190c 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -708,6 +708,8 @@ F: hw/pci-host/prep.[hc]\n F: hw/isa/i82378.c\n F: hw/isa/pc87312.[hc]\n F: hw/dma/i82374.c\n+F: hw/timer/m48t59-isa.c\n+F: include/hw/timer/m48t59.h\n F: pc-bios/ppc_rom.bin\n \n sPAPR\n","prefixes":["25/34"]}