{"id":808915,"url":"http://patchwork.ozlabs.org/api/1.0/patches/808915/?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":"<20170901180340.30009-11-eblake@redhat.com>","date":"2017-09-01T18:03:21","name":"[v6,10/29] libqtest: Topologically sort functions","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"b092eecb9e359d603fcf2b7542bb9722a6baa4cd","submitter":{"id":6591,"url":"http://patchwork.ozlabs.org/api/1.0/people/6591/?format=json","name":"Eric Blake","email":"eblake@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901180340.30009-11-eblake@redhat.com/mbox/","series":[{"id":1089,"url":"http://patchwork.ozlabs.org/api/1.0/series/1089/?format=json","date":"2017-09-01T18:03:12","name":"Preliminary libqtest cleanups","version":6,"mbox":"http://patchwork.ozlabs.org/series/1089/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808915/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-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=eblake@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 3xkS2j545lz9sQl\n\tfor ;\n\tSat, 2 Sep 2017 04:10:19 +1000 (AEST)","from localhost ([::1]:53112 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnqOX-0003zR-3T\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 14:10:17 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:55766)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnqIS-00077m-Ro\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 14:04:03 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnqIR-0001aU-8B\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 14:04:00 -0400","from mx1.redhat.com ([209.132.183.28]:48958)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dnqIQ-0001a8-Vy\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 14:03:59 -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 0F96B404321\n\tfor ; Fri, 1 Sep 2017 18:03:58 +0000 (UTC)","from red.redhat.com (ovpn-121-149.rdu2.redhat.com [10.10.121.149])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 6F10A62929;\n\tFri, 1 Sep 2017 18:03:57 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 0F96B404321","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 13:03:21 -0500","Message-Id":"<20170901180340.30009-11-eblake@redhat.com>","In-Reply-To":"<20170901180340.30009-1-eblake@redhat.com>","References":"<20170901180340.30009-1-eblake@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.38]);\n\tFri, 01 Sep 2017 18:03:58 +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 v6 10/29] libqtest: Topologically sort functions","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":"pbonzini@redhat.com, armbru@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Put static functions prior to public ones, in part so that\nimprovements to qtest_start() can benefit from the static\nhelpers without needing forward references. Code motion, with\nno semantic change.\n\nSigned-off-by: Eric Blake \n---\n tests/libqtest.c | 263 +++++++++++++++++++++++++++----------------------------\n 1 file changed, 131 insertions(+), 132 deletions(-)","diff":"diff --git a/tests/libqtest.c b/tests/libqtest.c\nindex 438a22678d..5d16351e24 100644\n--- a/tests/libqtest.c\n+++ b/tests/libqtest.c\n@@ -49,7 +49,6 @@ static struct sigaction sigact_old;\n g_assert_cmpint(ret, !=, -1); \\\n } while (0)\n\n-static int qtest_query_target_endianness(QTestState *s);\n\n static int init_socket(const char *socket_path)\n {\n@@ -128,6 +127,137 @@ static void setup_sigabrt_handler(void)\n sigaction(SIGABRT, &sigact, &sigact_old);\n }\n\n+static void socket_send(int fd, const char *buf, ssize_t size)\n+{\n+ size_t offset;\n+\n+ if (size < 0) {\n+ size = strlen(buf);\n+ }\n+ offset = 0;\n+ while (offset < size) {\n+ ssize_t len;\n+\n+ len = write(fd, buf + offset, size - offset);\n+ if (len == -1 && errno == EINTR) {\n+ continue;\n+ }\n+\n+ g_assert_no_errno(len);\n+ g_assert_cmpint(len, >, 0);\n+\n+ offset += len;\n+ }\n+}\n+\n+static void socket_sendf(int fd, const char *fmt, va_list ap)\n+{\n+ gchar *str = g_strdup_vprintf(fmt, ap);\n+\n+ socket_send(fd, str, -1);\n+ g_free(str);\n+}\n+\n+static void GCC_FMT_ATTR(2, 3) qtest_sendf(QTestState *s, const char *fmt, ...)\n+{\n+ va_list ap;\n+\n+ va_start(ap, fmt);\n+ socket_sendf(s->fd, fmt, ap);\n+ va_end(ap);\n+}\n+\n+static GString *qtest_recv_line(QTestState *s)\n+{\n+ GString *line;\n+ size_t offset;\n+ char *eol;\n+\n+ while ((eol = strchr(s->rx->str, '\\n')) == NULL) {\n+ ssize_t len;\n+ char buffer[1024];\n+\n+ len = read(s->fd, buffer, sizeof(buffer));\n+ if (len == -1 && errno == EINTR) {\n+ continue;\n+ }\n+\n+ if (len == -1 || len == 0) {\n+ fprintf(stderr, \"Broken pipe\\n\");\n+ exit(1);\n+ }\n+\n+ g_string_append_len(s->rx, buffer, len);\n+ }\n+\n+ offset = eol - s->rx->str;\n+ line = g_string_new_len(s->rx->str, offset);\n+ g_string_erase(s->rx, 0, offset + 1);\n+\n+ return line;\n+}\n+\n+static gchar **qtest_rsp(QTestState *s, int expected_args)\n+{\n+ GString *line;\n+ gchar **words;\n+ int i;\n+\n+redo:\n+ line = qtest_recv_line(s);\n+ words = g_strsplit(line->str, \" \", 0);\n+ g_string_free(line, TRUE);\n+\n+ if (strcmp(words[0], \"IRQ\") == 0) {\n+ long irq;\n+ int ret;\n+\n+ g_assert(words[1] != NULL);\n+ g_assert(words[2] != NULL);\n+\n+ ret = qemu_strtol(words[2], NULL, 0, &irq);\n+ g_assert(!ret);\n+ g_assert_cmpint(irq, >=, 0);\n+ g_assert_cmpint(irq, <, MAX_IRQ);\n+\n+ if (strcmp(words[1], \"raise\") == 0) {\n+ s->irq_level[irq] = true;\n+ } else {\n+ s->irq_level[irq] = false;\n+ }\n+\n+ g_strfreev(words);\n+ goto redo;\n+ }\n+\n+ g_assert(words[0] != NULL);\n+ g_assert_cmpstr(words[0], ==, \"OK\");\n+\n+ if (expected_args) {\n+ for (i = 0; i < expected_args; i++) {\n+ g_assert(words[i] != NULL);\n+ }\n+ } else {\n+ g_strfreev(words);\n+ }\n+\n+ return words;\n+}\n+\n+static int qtest_query_target_endianness(QTestState *s)\n+{\n+ gchar **args;\n+ int big_endian;\n+\n+ qtest_sendf(s, \"endianness\\n\");\n+ args = qtest_rsp(s, 1);\n+ g_assert(strcmp(args[1], \"big\") == 0 || strcmp(args[1], \"little\") == 0);\n+ big_endian = strcmp(args[1], \"big\") == 0;\n+ g_strfreev(args);\n+\n+ return big_endian;\n+}\n+\n static void cleanup_sigabrt_handler(void)\n {\n sigaction(SIGABRT, &sigact_old, NULL);\n@@ -252,137 +382,6 @@ void qtest_quit(QTestState *s)\n g_free(s);\n }\n\n-static void socket_send(int fd, const char *buf, ssize_t size)\n-{\n- size_t offset;\n-\n- if (size < 0) {\n- size = strlen(buf);\n- }\n- offset = 0;\n- while (offset < size) {\n- ssize_t len;\n-\n- len = write(fd, buf + offset, size - offset);\n- if (len == -1 && errno == EINTR) {\n- continue;\n- }\n-\n- g_assert_no_errno(len);\n- g_assert_cmpint(len, >, 0);\n-\n- offset += len;\n- }\n-}\n-\n-static void socket_sendf(int fd, const char *fmt, va_list ap)\n-{\n- gchar *str = g_strdup_vprintf(fmt, ap);\n-\n- socket_send(fd, str, -1);\n- g_free(str);\n-}\n-\n-static void GCC_FMT_ATTR(2, 3) qtest_sendf(QTestState *s, const char *fmt, ...)\n-{\n- va_list ap;\n-\n- va_start(ap, fmt);\n- socket_sendf(s->fd, fmt, ap);\n- va_end(ap);\n-}\n-\n-static GString *qtest_recv_line(QTestState *s)\n-{\n- GString *line;\n- size_t offset;\n- char *eol;\n-\n- while ((eol = strchr(s->rx->str, '\\n')) == NULL) {\n- ssize_t len;\n- char buffer[1024];\n-\n- len = read(s->fd, buffer, sizeof(buffer));\n- if (len == -1 && errno == EINTR) {\n- continue;\n- }\n-\n- if (len == -1 || len == 0) {\n- fprintf(stderr, \"Broken pipe\\n\");\n- exit(1);\n- }\n-\n- g_string_append_len(s->rx, buffer, len);\n- }\n-\n- offset = eol - s->rx->str;\n- line = g_string_new_len(s->rx->str, offset);\n- g_string_erase(s->rx, 0, offset + 1);\n-\n- return line;\n-}\n-\n-static gchar **qtest_rsp(QTestState *s, int expected_args)\n-{\n- GString *line;\n- gchar **words;\n- int i;\n-\n-redo:\n- line = qtest_recv_line(s);\n- words = g_strsplit(line->str, \" \", 0);\n- g_string_free(line, TRUE);\n-\n- if (strcmp(words[0], \"IRQ\") == 0) {\n- long irq;\n- int ret;\n-\n- g_assert(words[1] != NULL);\n- g_assert(words[2] != NULL);\n-\n- ret = qemu_strtol(words[2], NULL, 0, &irq);\n- g_assert(!ret);\n- g_assert_cmpint(irq, >=, 0);\n- g_assert_cmpint(irq, <, MAX_IRQ);\n-\n- if (strcmp(words[1], \"raise\") == 0) {\n- s->irq_level[irq] = true;\n- } else {\n- s->irq_level[irq] = false;\n- }\n-\n- g_strfreev(words);\n- goto redo;\n- }\n-\n- g_assert(words[0] != NULL);\n- g_assert_cmpstr(words[0], ==, \"OK\");\n-\n- if (expected_args) {\n- for (i = 0; i < expected_args; i++) {\n- g_assert(words[i] != NULL);\n- }\n- } else {\n- g_strfreev(words);\n- }\n-\n- return words;\n-}\n-\n-static int qtest_query_target_endianness(QTestState *s)\n-{\n- gchar **args;\n- int big_endian;\n-\n- qtest_sendf(s, \"endianness\\n\");\n- args = qtest_rsp(s, 1);\n- g_assert(strcmp(args[1], \"big\") == 0 || strcmp(args[1], \"little\") == 0);\n- big_endian = strcmp(args[1], \"big\") == 0;\n- g_strfreev(args);\n-\n- return big_endian;\n-}\n-\n typedef struct {\n JSONMessageParser parser;\n QDict *response;\n","prefixes":["v6","10/29"]}