From af8241e3dc9a94d82423cb106114ae77a0333f32 Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Mon, 10 Nov 2014 09:14:04 +0100 Subject: [PATCH 27/41] rename parse_enum_option to qapi_enum_parse and make it public Message-id: <1415610847-15383-2-git-send-email-mreitz@redhat.com> Patchwork-id: 62237 O-Subject: [RHEL-7.1 qemu-kvm PATCH v2 1/4] rename parse_enum_option to qapi_enum_parse and make it public Bugzilla: 1087724 RH-Acked-by: Laszlo Ersek RH-Acked-by: Fam Zheng RH-Acked-by: Stefan Hajnoczi From: Peter Lieven relaxing the license to LGPLv2+ is intentional. Suggested-by: Markus Armbruster Signed-off-by: Hu Tao Signed-off-by: Peter Lieven Reviewed-by: Eric Blake Reviewed-by: Benoit Canet Signed-off-by: Stefan Hajnoczi (cherry picked from commit 9e7dac7c6c6003ad9d4aca0125f0278233fcf761) Signed-off-by: Miroslav Rezanina Conflicts: blockdev.c qapi/Makefile.objs Since detect-zeroes does not exist downstream, there was no parse_enum_option() in blockdev.c and therefore no changes to that file are necessary. Signed-off-by: Max Reitz --- include/qapi/util.h | 17 +++++++++++++++++ qapi/Makefile.objs | 1 + qapi/qapi-util.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 include/qapi/util.h create mode 100644 qapi/qapi-util.c diff --git a/include/qapi/util.h b/include/qapi/util.h new file mode 100644 index 0000000..de9238b --- /dev/null +++ b/include/qapi/util.h @@ -0,0 +1,17 @@ +/* + * QAPI util functions + * + * Copyright Fujitsu, Inc. 2014 + * + * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. + * See the COPYING.LIB file in the top-level directory. + * + */ + +#ifndef QAPI_UTIL_H +#define QAPI_UTIL_H + +int qapi_enum_parse(const char *lookup[], const char *buf, + int max, int def, Error **errp); + +#endif diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs index 1f9c973..d896ef0 100644 --- a/qapi/Makefile.objs +++ b/qapi/Makefile.objs @@ -3,3 +3,4 @@ util-obj-y += qmp-output-visitor.o qmp-registry.o qmp-dispatch.o util-obj-y += string-input-visitor.o string-output-visitor.o util-obj-y += opts-visitor.o +util-obj-y += qapi-util.o diff --git a/qapi/qapi-util.c b/qapi/qapi-util.c new file mode 100644 index 0000000..1d8fb96 --- /dev/null +++ b/qapi/qapi-util.c @@ -0,0 +1,34 @@ +/* + * QAPI util functions + * + * Authors: + * Hu Tao + * Peter Lieven + * + * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. + * See the COPYING.LIB file in the top-level directory. + * + */ + +#include "qemu-common.h" +#include "qapi/error.h" +#include "qapi/util.h" + +int qapi_enum_parse(const char *lookup[], const char *buf, + int max, int def, Error **errp) +{ + int i; + + if (!buf) { + return def; + } + + for (i = 0; i < max; i++) { + if (!strcmp(buf, lookup[i])) { + return i; + } + } + + error_setg(errp, "invalid parameter value: %s", buf); + return def; +} -- 1.8.3.1