Commit 20efc49e authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Paolo Bonzini
Browse files

accel: use g_strsplit for parsing accelerator names 



Instead of re-using the get_opt_name() method from QemuOpts to split a
string on ':', just use g_strsplit().

Signed-off-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Message-Id: <20180416111743.8473-2-berrange@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
parent 7afcfd32

accel/accel.c

+7 −9
Original line number Diff line number Diff line
@@ -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) {

include/qemu/option.h

+0 −1
Original line number Diff line number Diff line
@@ -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,

util/qemu-option.c

+2 −1
Original line number Diff line number Diff line
@@ -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;