[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 1/3] accel: use g_strsplit for parsing accelerat
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH 1/3] accel: use g_strsplit for parsing accelerator names |
Date: |
Mon, 16 Apr 2018 08:23:29 -0300 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 |
On 04/16/2018 08:17 AM, Daniel P. Berrangé wrote:
> Instead of re-using the get_opt_name() method from QemuOpts to split a
> string on ':', just use g_strsplit().
>
> Signed-off-by: Daniel P. Berrangé <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
> ---
> accel/accel.c | 16 +++++++---------
> include/qemu/option.h | 1 -
> util/qemu-option.c | 3 ++-
> 3 files changed, 9 insertions(+), 11 deletions(-)
>
> diff --git a/accel/accel.c b/accel/accel.c
> index 93e2434c87..4981e7fff3 100644
> --- a/accel/accel.c
> +++ b/accel/accel.c
> @@ -70,8 +70,8 @@ static int accel_init_machine(AccelClass *acc, MachineState
> *ms)
>
> void configure_accelerator(MachineState *ms)
> {
> - const char *accel, *p;
> - char buf[10];
> + const char *accel;
> + char **accel_list, **tmp;
> int ret;
> bool accel_initialised = false;
> bool init_failed = false;
> @@ -83,13 +83,10 @@ void configure_accelerator(MachineState *ms)
> accel = "tcg";
> }
>
> - p = accel;
> - while (!accel_initialised && *p != '\0') {
> - if (*p == ':') {
> - p++;
> - }
> - p = get_opt_name(buf, sizeof(buf), p, ':');
> - acc = accel_find(buf);
> + accel_list = g_strsplit(accel, ":", 0);
> +
> + for (tmp = accel_list; !accel_initialised && tmp && *tmp; tmp++) {
> + acc = accel_find(*tmp);
> if (!acc) {
> continue;
> }
> @@ -107,6 +104,7 @@ void configure_accelerator(MachineState *ms)
> accel_initialised = true;
> }
> }
> + g_strfreev(accel_list);
>
> if (!accel_initialised) {
> if (!init_failed) {
> diff --git a/include/qemu/option.h b/include/qemu/option.h
> index 306fdb5f7a..1cfe5cbc2d 100644
> --- a/include/qemu/option.h
> +++ b/include/qemu/option.h
> @@ -28,7 +28,6 @@
>
> #include "qemu/queue.h"
>
> -const char *get_opt_name(char *buf, int buf_size, const char *p, char delim);
> const char *get_opt_value(char *buf, int buf_size, const char *p);
>
> void parse_option_size(const char *name, const char *value,
> diff --git a/util/qemu-option.c b/util/qemu-option.c
> index d0756fda58..baca40fb94 100644
> --- a/util/qemu-option.c
> +++ b/util/qemu-option.c
> @@ -49,7 +49,8 @@
> * The return value is the position of the delimiter/zero byte after the
> option
> * name in p.
> */
> -const char *get_opt_name(char *buf, int buf_size, const char *p, char delim)
> +static const char *get_opt_name(char *buf, int buf_size, const char *p,
> + char delim)
> {
> char *q;
>
>
- [Qemu-devel] [PATCH 0/3] Remove artificial length limits when parsing options, Daniel P . Berrangé, 2018/04/16
- [Qemu-devel] [PATCH 1/3] accel: use g_strsplit for parsing accelerator names, Daniel P . Berrangé, 2018/04/16
- Re: [Qemu-devel] [PATCH 1/3] accel: use g_strsplit for parsing accelerator names,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH 2/3] opts: don't silently truncate long parameter keys, Daniel P . Berrangé, 2018/04/16
- [Qemu-devel] [PATCH 3/3] opts: don't silently truncate long option values, Daniel P . Berrangé, 2018/04/16
- Re: [Qemu-devel] [PATCH 0/3] Remove artificial length limits when parsing options, Paolo Bonzini, 2018/04/16
- Re: [Qemu-devel] [PATCH 0/3] Remove artificial length limits when parsing options, Markus Armbruster, 2018/04/16