{"id":807312,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807312/?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-9-jsnow@redhat.com>","date":"2017-08-29T20:49:33","name":"[v2,8/9] AHCI: pretty-print FIS to buffer instead of stderr","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"79df00bc079eb763597befa82c273ca1cf0476a0","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-9-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/807312/checks/","tags":{},"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-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.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 3xhh3D4sQpz9ryT\n\tfor ;\n\tWed, 30 Aug 2017 07:04:40 +1000 (AEST)","from localhost ([::1]:46976 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmngc-0007nd-GM\n\tfor incoming@patchwork.ozlabs.org; Tue, 29 Aug 2017 17:04:38 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:50225)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmnSO-0003mp-L5\n\tfor qemu-devel@nongnu.org; Tue, 29 Aug 2017 16:49:57 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmnSN-0001zf-ID\n\tfor qemu-devel@nongnu.org; Tue, 29 Aug 2017 16:49:56 -0400","from mx1.redhat.com ([209.132.183.28]:35116)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dmnSI-0001x2-T9; Tue, 29 Aug 2017 16:49:51 -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 D893791FFE;\n\tTue, 29 Aug 2017 20:49:49 +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 448C66268F;\n\tTue, 29 Aug 2017 20:49:49 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com D893791FFE","From":"John Snow ","To":"qemu-block@nongnu.org","Date":"Tue, 29 Aug 2017 16:49:33 -0400","Message-Id":"<20170829204934.9039-9-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.29]);\n\tTue, 29 Aug 2017 20:49:50 +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 8/9] AHCI: pretty-print FIS to buffer\n\tinstead of stderr","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":"John Snow , qemu-devel@nongnu.org, f4bug@amsat.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"The current FIS printing routines dump the FIS to screen. adjust this\nsuch that it dumps to buffer instead, then use this ability to have\nFIS dump mechanisms via trace-events instead of compiled defines.\n\nSigned-off-by: John Snow \n---\n hw/ide/ahci.c | 54 +++++++++++++++++++++++++++++++++++++++++++----------\n hw/ide/trace-events | 4 ++++\n 2 files changed, 48 insertions(+), 10 deletions(-)","diff":"diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c\nindex a0a4dd6..2e75f9b 100644\n--- a/hw/ide/ahci.c\n+++ b/hw/ide/ahci.c\n@@ -644,20 +644,45 @@ static void ahci_reset_port(AHCIState *s, int port)\n ahci_init_d2h(d);\n }\n \n-static void debug_print_fis(uint8_t *fis, int cmd_len)\n+/* Buffer pretty output based on a raw FIS structure. */\n+static void ahci_pretty_buffer_fis(uint8_t *fis, int cmd_len, char **out)\n {\n-#if DEBUG_AHCI\n+ size_t bufsize;\n+ char *pbuf;\n+ char *pptr;\n+ size_t lines = DIV_ROUND_UP(cmd_len, 16);\n+ const char *preamble = \"FIS:\";\n int i;\n \n- fprintf(stderr, \"fis:\");\n+ /* Total amount of memory to store FISes in HBA memory */\n+ g_assert_cmpint(cmd_len, <=, 0x100);\n+ g_assert(out);\n+\n+ /* Printed like:\n+ * FIS:\\n\n+ * 0x00: 00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee \\n\n+ * 0x10: ff \\n\n+ * \\0\n+ *\n+ * Four bytes for the preamble, seven for each line prefix (including a\n+ * newline to start a new line), three bytes for each source byte,\n+ * a trailing newline and a terminal null byte.\n+ */\n+\n+ bufsize = strlen(preamble) + ((6 + 1) * lines) + (3 * cmd_len) + 1 + 1;\n+ pbuf = g_malloc(bufsize);\n+ pptr = pbuf;\n+ pptr += sprintf(pptr, \"%s\", preamble);\n for (i = 0; i < cmd_len; i++) {\n if ((i & 0xf) == 0) {\n- fprintf(stderr, \"\\n%02x:\",i);\n+ pptr += sprintf(pptr, \"\\n0x%02x: \", i);\n }\n- fprintf(stderr, \"%02x \",fis[i]);\n+ pptr += sprintf(pptr, \"%02x \", fis[i]);\n }\n- fprintf(stderr, \"\\n\");\n-#endif\n+ pptr += sprintf(pptr, \"\\n\");\n+ pptr += 1; /* \\0 */\n+ g_assert(pbuf + bufsize == pptr);\n+ *out = pbuf;\n }\n \n static bool ahci_map_fis_address(AHCIDevice *ad)\n@@ -1201,7 +1226,12 @@ static void handle_reg_h2d_fis(AHCIState *s, int port,\n * table to ide_state->io_buffer */\n if (opts & AHCI_CMD_ATAPI) {\n memcpy(ide_state->io_buffer, &cmd_fis[AHCI_COMMAND_TABLE_ACMD], 0x10);\n- debug_print_fis(ide_state->io_buffer, 0x10);\n+ if (TRACE_HANDLE_REG_H2D_FIS_DUMP_ENABLED) {\n+ char *pretty_fis;\n+ ahci_pretty_buffer_fis(ide_state->io_buffer, 0x10, &pretty_fis);\n+ trace_handle_reg_h2d_fis_dump(s, port, pretty_fis);\n+ g_free(pretty_fis);\n+ }\n s->dev[port].done_atapi_packet = false;\n /* XXX send PIO setup FIS */\n }\n@@ -1256,8 +1286,12 @@ static int handle_cmd(AHCIState *s, int port, uint8_t slot)\n trace_handle_cmd_badmap(s, port, cmd_len);\n goto out;\n }\n- debug_print_fis(cmd_fis, 0x80);\n-\n+ if (TRACE_HANDLE_CMD_FIS_DUMP_ENABLED) {\n+ char *pretty_fis;\n+ ahci_pretty_buffer_fis(cmd_fis, 0x80, &pretty_fis);\n+ trace_handle_cmd_fis_dump(s, port, pretty_fis);\n+ g_free(pretty_fis);\n+ }\n switch (cmd_fis[0]) {\n case SATA_FIS_TYPE_REGISTER_H2D:\n handle_reg_h2d_fis(s, port, slot, cmd_fis);\ndiff --git a/hw/ide/trace-events b/hw/ide/trace-events\nindex e15fd77..77ed3c1 100644\n--- a/hw/ide/trace-events\n+++ b/hw/ide/trace-events\n@@ -105,3 +105,7 @@ ahci_cmd_done(void *s, int port) \"ahci(%p)[%d]: cmd done\"\n ahci_reset(void *s) \"ahci(%p): HBA reset\"\n allwinner_ahci_mem_read(void *s, void *a, uint64_t addr, uint64_t val, unsigned size) \"ahci(%p): read a=%p addr=0x%\"HWADDR_PRIx\" val=0x%\"PRIx64\", size=%d\"\n allwinner_ahci_mem_write(void *s, void *a, uint64_t addr, uint64_t val, unsigned size) \"ahci(%p): write a=%p addr=0x%\"HWADDR_PRIx\" val=0x%\"PRIx64\", size=%d\"\n+\n+# Warning: Verbose\n+handle_reg_h2d_fis_dump(void *s, int port, char *fis) \"ahci(%p)[%d]: %s\"\n+handle_cmd_fis_dump(void *s, int port, char *fis) \"ahci(%p)[%d]: %s\"\n","prefixes":["v2","8/9"]}