{"id":808750,"url":"http://patchwork.ozlabs.org/api/patches/808750/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-38-armbru@redhat.com/","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":"<20170901153758.8628-38-armbru@redhat.com>","list_archive_url":null,"date":"2017-09-01T15:37:48","name":"[PULL,v2,37/47] hmp: Use qapi_enum_parse() in hmp_migrate_set_parameter()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"7f380f92d16be39dc9a2beaddbe7440cf1d4b55c","submitter":{"id":2645,"url":"http://patchwork.ozlabs.org/api/people/2645/?format=json","name":"Markus Armbruster","email":"armbru@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901153758.8628-38-armbru@redhat.com/mbox/","series":[{"id":1049,"url":"http://patchwork.ozlabs.org/api/series/1049/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1049","date":"2017-09-01T15:37:14","name":"[PULL,v2,01/47] qapi: Fix error handling code on alternate conflict","version":2,"mbox":"http://patchwork.ozlabs.org/series/1049/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808750/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808750/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=armbru@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 3xkP0p3Qy5z9t3P\n\tfor ;\n\tSat, 2 Sep 2017 01:53:30 +1000 (AEST)","from localhost ([::1]:46554 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnoG8-00050w-Hy\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 11:53:28 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51702)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dno1T-0006iv-41\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:27 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dno1N-0001kc-7V\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:19 -0400","from mx1.redhat.com ([209.132.183.28]:56392)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dno1M-0001jC-T2\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 11:38:13 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\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 F0EB125C2A\n\tfor ; Fri, 1 Sep 2017 15:38:11 +0000 (UTC)","from blackfin.pond.sub.org (ovpn-116-75.ams2.redhat.com\n\t[10.36.116.75])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 37B6781FB7;\n\tFri, 1 Sep 2017 15:38:11 +0000 (UTC)","by blackfin.pond.sub.org (Postfix, from userid 1000)\n\tid AFEE01132F46; Fri, 1 Sep 2017 17:37:58 +0200 (CEST)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com F0EB125C2A","From":"Markus Armbruster ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 17:37:48 +0200","Message-Id":"<20170901153758.8628-38-armbru@redhat.com>","In-Reply-To":"<20170901153758.8628-1-armbru@redhat.com>","References":"<20170901153758.8628-1-armbru@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.12","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tFri, 01 Sep 2017 15:38:12 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","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 v2 37/47] hmp: Use qapi_enum_parse() in\n\thmp_migrate_set_parameter()","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":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ,\n\t\"Dr. David Alan Gilbert\" ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Marc-André Lureau \n\nThe error message on invalid parameter name changes from\n\n Invalid parameter \"NAME\"\n\nto\n\n invalid parameter value: NAME\n\nSlight degratation, perhaps.\n\nSigned-off-by: Marc-André Lureau \nMessage-Id: <20170822132255.23945-10-marcandre.lureau@redhat.com>\nReviewed-by: Markus Armbruster \n[Rebased, assertion added, commit message rewritten]\nCc: \"Dr. David Alan Gilbert\" \nSigned-off-by: Markus Armbruster \nMessage-Id: <1503564371-26090-7-git-send-email-armbru@redhat.com>\n---\n hmp.c | 138 +++++++++++++++++++++++++++++++++---------------------------------\n 1 file changed, 68 insertions(+), 70 deletions(-)","diff":"diff --git a/hmp.c b/hmp.c\nindex 7e0bd3d63b..2b6e919501 100644\n--- a/hmp.c\n+++ b/hmp.c\n@@ -1556,84 +1556,82 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)\n MigrateSetParameters *p = g_new0(MigrateSetParameters, 1);\n uint64_t valuebw = 0;\n Error *err = NULL;\n- int i, ret;\n+ int val, ret;\n \n- for (i = 0; i < MIGRATION_PARAMETER__MAX; i++) {\n- if (strcmp(param, MigrationParameter_lookup[i]) == 0) {\n- switch (i) {\n- case MIGRATION_PARAMETER_COMPRESS_LEVEL:\n- p->has_compress_level = true;\n- visit_type_int(v, param, &p->compress_level, &err);\n- break;\n- case MIGRATION_PARAMETER_COMPRESS_THREADS:\n- p->has_compress_threads = true;\n- visit_type_int(v, param, &p->compress_threads, &err);\n- break;\n- case MIGRATION_PARAMETER_DECOMPRESS_THREADS:\n- p->has_decompress_threads = true;\n- visit_type_int(v, param, &p->decompress_threads, &err);\n- break;\n- case MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL:\n- p->has_cpu_throttle_initial = true;\n- visit_type_int(v, param, &p->cpu_throttle_initial, &err);\n- break;\n- case MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT:\n- p->has_cpu_throttle_increment = true;\n- visit_type_int(v, param, &p->cpu_throttle_increment, &err);\n- break;\n- case MIGRATION_PARAMETER_TLS_CREDS:\n- p->has_tls_creds = true;\n- p->tls_creds = g_new0(StrOrNull, 1);\n- p->tls_creds->type = QTYPE_QSTRING;\n- visit_type_str(v, param, &p->tls_creds->u.s, &err);\n- break;\n- case MIGRATION_PARAMETER_TLS_HOSTNAME:\n- p->has_tls_hostname = true;\n- p->tls_hostname = g_new0(StrOrNull, 1);\n- p->tls_hostname->type = QTYPE_QSTRING;\n- visit_type_str(v, param, &p->tls_hostname->u.s, &err);\n- break;\n- case MIGRATION_PARAMETER_MAX_BANDWIDTH:\n- p->has_max_bandwidth = true;\n- /*\n- * Can't use visit_type_size() here, because it\n- * defaults to Bytes rather than Mebibytes.\n- */\n- ret = qemu_strtosz_MiB(valuestr, NULL, &valuebw);\n- if (ret < 0 || valuebw > INT64_MAX\n- || (size_t)valuebw != valuebw) {\n- error_setg(&err, \"Invalid size %s\", valuestr);\n- break;\n- }\n- p->max_bandwidth = valuebw;\n- break;\n- case MIGRATION_PARAMETER_DOWNTIME_LIMIT:\n- p->has_downtime_limit = true;\n- visit_type_int(v, param, &p->downtime_limit, &err);\n- break;\n- case MIGRATION_PARAMETER_X_CHECKPOINT_DELAY:\n- p->has_x_checkpoint_delay = true;\n- visit_type_int(v, param, &p->x_checkpoint_delay, &err);\n- break;\n- case MIGRATION_PARAMETER_BLOCK_INCREMENTAL:\n- p->has_block_incremental = true;\n- visit_type_bool(v, param, &p->block_incremental, &err);\n- break;\n- }\n+ val = qapi_enum_parse(MigrationParameter_lookup, param, -1, &err);\n+ if (val < 0) {\n+ goto cleanup;\n+ }\n \n- if (err) {\n- goto cleanup;\n- }\n-\n- qmp_migrate_set_parameters(p, &err);\n+ switch (val) {\n+ case MIGRATION_PARAMETER_COMPRESS_LEVEL:\n+ p->has_compress_level = true;\n+ visit_type_int(v, param, &p->compress_level, &err);\n+ break;\n+ case MIGRATION_PARAMETER_COMPRESS_THREADS:\n+ p->has_compress_threads = true;\n+ visit_type_int(v, param, &p->compress_threads, &err);\n+ break;\n+ case MIGRATION_PARAMETER_DECOMPRESS_THREADS:\n+ p->has_decompress_threads = true;\n+ visit_type_int(v, param, &p->decompress_threads, &err);\n+ break;\n+ case MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL:\n+ p->has_cpu_throttle_initial = true;\n+ visit_type_int(v, param, &p->cpu_throttle_initial, &err);\n+ break;\n+ case MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT:\n+ p->has_cpu_throttle_increment = true;\n+ visit_type_int(v, param, &p->cpu_throttle_increment, &err);\n+ break;\n+ case MIGRATION_PARAMETER_TLS_CREDS:\n+ p->has_tls_creds = true;\n+ p->tls_creds = g_new0(StrOrNull, 1);\n+ p->tls_creds->type = QTYPE_QSTRING;\n+ visit_type_str(v, param, &p->tls_creds->u.s, &err);\n+ break;\n+ case MIGRATION_PARAMETER_TLS_HOSTNAME:\n+ p->has_tls_hostname = true;\n+ p->tls_hostname = g_new0(StrOrNull, 1);\n+ p->tls_hostname->type = QTYPE_QSTRING;\n+ visit_type_str(v, param, &p->tls_hostname->u.s, &err);\n+ break;\n+ case MIGRATION_PARAMETER_MAX_BANDWIDTH:\n+ p->has_max_bandwidth = true;\n+ /*\n+ * Can't use visit_type_size() here, because it\n+ * defaults to Bytes rather than Mebibytes.\n+ */\n+ ret = qemu_strtosz_MiB(valuestr, NULL, &valuebw);\n+ if (ret < 0 || valuebw > INT64_MAX\n+ || (size_t)valuebw != valuebw) {\n+ error_setg(&err, \"Invalid size %s\", valuestr);\n break;\n }\n+ p->max_bandwidth = valuebw;\n+ break;\n+ case MIGRATION_PARAMETER_DOWNTIME_LIMIT:\n+ p->has_downtime_limit = true;\n+ visit_type_int(v, param, &p->downtime_limit, &err);\n+ break;\n+ case MIGRATION_PARAMETER_X_CHECKPOINT_DELAY:\n+ p->has_x_checkpoint_delay = true;\n+ visit_type_int(v, param, &p->x_checkpoint_delay, &err);\n+ break;\n+ case MIGRATION_PARAMETER_BLOCK_INCREMENTAL:\n+ p->has_block_incremental = true;\n+ visit_type_bool(v, param, &p->block_incremental, &err);\n+ break;\n+ default:\n+ assert(0);\n }\n \n- if (i == MIGRATION_PARAMETER__MAX) {\n- error_setg(&err, QERR_INVALID_PARAMETER, param);\n+ if (err) {\n+ goto cleanup;\n }\n \n+ qmp_migrate_set_parameters(p, &err);\n+\n cleanup:\n qapi_free_MigrateSetParameters(p);\n visit_free(v);\n","prefixes":["PULL","v2","37/47"]}