{"id":807306,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807306/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/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":""},"msgid":"<20170829204934.9039-4-jsnow@redhat.com>","date":"2017-08-29T20:49:28","name":"[v2,3/9] IDE: add tracing for data ports","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b29c601b73d6466f9c0c20c7a6ea885549aacb1d","submitter":{"id":64343,"url":"http://patchwork.ozlabs.org/api/1.0/people/64343/?format=json","name":"John Snow","email":"jsnow@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170829204934.9039-4-jsnow@redhat.com/mbox/","series":[{"id":474,"url":"http://patchwork.ozlabs.org/api/1.0/series/474/?format=json","date":"2017-08-29T20:49:27","name":"IDE: replace printfs with tracing","version":2,"mbox":"http://patchwork.ozlabs.org/series/474/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807306/checks/","tags":{},"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>)","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=jsnow@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 3xhgt10QVDz9sMN\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 30 Aug 2017 06:56:41 +1000 (AEST)","from localhost ([::1]:46930 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 1dmnYs-0001JO-Rm\n\tfor incoming@patchwork.ozlabs.org; Tue, 29 Aug 2017 16:56:38 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:50061)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <jsnow@redhat.com>) id 1dmnSF-0003bC-NP\n\tfor qemu-devel@nongnu.org; Tue, 29 Aug 2017 16:49:48 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <jsnow@redhat.com>) id 1dmnSE-0001uI-Fz\n\tfor qemu-devel@nongnu.org; Tue, 29 Aug 2017 16:49:47 -0400","from mx1.redhat.com ([209.132.183.28]:53635)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <jsnow@redhat.com>)\n\tid 1dmnSB-0001rh-Gx; Tue, 29 Aug 2017 16:49:43 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 7BCB67EA8D;\n\tTue, 29 Aug 2017 20:49:42 +0000 (UTC)","from probe.bos.redhat.com (dhcp-17-231.bos.redhat.com\n\t[10.18.17.231])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id D811B63628;\n\tTue, 29 Aug 2017 20:49:41 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 7BCB67EA8D","From":"John Snow <jsnow@redhat.com>","To":"qemu-block@nongnu.org","Date":"Tue, 29 Aug 2017 16:49:28 -0400","Message-Id":"<20170829204934.9039-4-jsnow@redhat.com>","In-Reply-To":"<20170829204934.9039-1-jsnow@redhat.com>","References":"<20170829204934.9039-1-jsnow@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.28]);\n\tTue, 29 Aug 2017 20:49:42 +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] [PATCH v2 3/9] IDE: add tracing for data ports","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":"John Snow <jsnow@redhat.com>, qemu-devel@nongnu.org, f4bug@amsat.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":"To be used sparingly, but still interesting in the case of small\nfirmwares designed to reproduce bugs in QEMU IDE.\n\nSigned-off-by: John Snow <jsnow@redhat.com>\n---\n hw/ide/core.c       | 12 +++++++++++-\n hw/ide/trace-events |  5 +++++\n 2 files changed, 16 insertions(+), 1 deletion(-)","diff":"diff --git a/hw/ide/core.c b/hw/ide/core.c\nindex cb250e6..82a19b1 100644\n--- a/hw/ide/core.c\n+++ b/hw/ide/core.c\n@@ -2259,6 +2259,8 @@ void ide_data_writew(void *opaque, uint32_t addr, uint32_t val)\n     IDEState *s = idebus_active_if(bus);\n     uint8_t *p;\n \n+    trace_ide_data_writew(addr, val, bus, s);\n+\n     /* PIO data access allowed only when DRQ bit is set. The result of a write\n      * during PIO out is indeterminate, just ignore it. */\n     if (!(s->status & DRQ_STAT) || ide_is_pio_out(s)) {\n@@ -2304,6 +2306,8 @@ uint32_t ide_data_readw(void *opaque, uint32_t addr)\n         s->status &= ~DRQ_STAT;\n         s->end_transfer_func(s);\n     }\n+\n+    trace_ide_data_readw(addr, ret, bus, s);\n     return ret;\n }\n \n@@ -2313,6 +2317,8 @@ void ide_data_writel(void *opaque, uint32_t addr, uint32_t val)\n     IDEState *s = idebus_active_if(bus);\n     uint8_t *p;\n \n+    trace_ide_data_writel(addr, val, bus, s);\n+\n     /* PIO data access allowed only when DRQ bit is set. The result of a write\n      * during PIO out is indeterminate, just ignore it. */\n     if (!(s->status & DRQ_STAT) || ide_is_pio_out(s)) {\n@@ -2343,7 +2349,8 @@ uint32_t ide_data_readl(void *opaque, uint32_t addr)\n     /* PIO data access allowed only when DRQ bit is set. The result of a read\n      * during PIO in is indeterminate, return 0 and don't move forward. */\n     if (!(s->status & DRQ_STAT) || !ide_is_pio_out(s)) {\n-        return 0;\n+        ret = 0;\n+        goto out;\n     }\n \n     p = s->data_ptr;\n@@ -2358,6 +2365,9 @@ uint32_t ide_data_readl(void *opaque, uint32_t addr)\n         s->status &= ~DRQ_STAT;\n         s->end_transfer_func(s);\n     }\n+\n+out:\n+    trace_ide_data_readl(addr, ret, bus, s);\n     return ret;\n }\n \ndiff --git a/hw/ide/trace-events b/hw/ide/trace-events\nindex bff8f39..17bc6f1 100644\n--- a/hw/ide/trace-events\n+++ b/hw/ide/trace-events\n@@ -6,6 +6,11 @@ ide_ioport_read(uint32_t addr, const char *reg, uint32_t val, void *bus, void *s\n ide_ioport_write(uint32_t addr, const char *reg, uint32_t val, void *bus, void *s) \"IDE PIO wr @ 0x%\"PRIx32\" (%s); val 0x%02\"PRIx32\"; bus %p IDEState %p\"\n ide_status_read(uint32_t addr, uint32_t val, void *bus, void *s)                   \"IDE PIO rd @ 0x%\"PRIx32\" (Alt Status); val 0x%02\"PRIx32\"; bus %p; IDEState %p\"\n ide_cmd_write(uint32_t addr, uint32_t val, void *bus)                              \"IDE PIO wr @ 0x%\"PRIx32\" (Device Control); val 0x%02\"PRIx32\"; bus %p\"\n+# Warning: verbose\n+ide_data_readw(uint32_t addr, uint32_t val, void *bus, void *s)                    \"IDE PIO rd @ 0x%\"PRIx32\" (Data: Word); val 0x%04\"PRIx32\"; bus %p; IDEState %p\"\n+ide_data_writew(uint32_t addr, uint32_t val, void *bus, void *s)                   \"IDE PIO wr @ 0x%\"PRIx32\" (Data: Word); val 0x%04\"PRIx32\"; bus %p; IDEState %p\"\n+ide_data_readl(uint32_t addr, uint32_t val, void *bus, void *s)                    \"IDE PIO rd @ 0x%\"PRIx32\" (Data: Long); val 0x%08\"PRIx32\"; bus %p; IDEState %p\"\n+ide_data_writel(uint32_t addr, uint32_t val, void *bus, void *s)                   \"IDE PIO wr @ 0x%\"PRIx32\" (Data: Long); val 0x%08\"PRIx32\"; bus %p; IDEState %p\"\n # misc\n ide_exec_cmd(void *bus, void *state, uint32_t cmd) \"IDE exec cmd: bus %p; state %p; cmd 0x%02x\"\n ide_cancel_dma_sync_buffered(void *fn, void *req) \"invoking cb %p of buffered request %p with -ECANCELED\"\n","prefixes":["v2","3/9"]}