From 28a766b8099f5e745dbfc18834277039643214a3 Mon Sep 17 00:00:00 2001

From: Laszlo Ersek <lersek@redhat.com>

Date: Thu, 12 Sep 2019 13:04:58 +0100

Subject: [PATCH 01/22] accel: use g_strsplit for parsing accelerator names

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Laszlo Ersek <lersek@redhat.com>

Message-id: <20190912130503.14094-2-lersek@redhat.com>

Patchwork-id: 90437

O-Subject: [RHEL-8.2.0 qemu-kvm PATCH 1/6] accel: use g_strsplit for parsing accelerator names

Bugzilla: 1749022

RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>

From: Daniel P. Berrangé <berrange@redhat.com>

Instead of re-using the get_opt_name() method from QemuOpts to split a

string on ':', just use g_strsplit().

RHEL8 notes:

- Fix up upstream's obviously garbled UTF8 sequences in Dan's name (Author

  meta-datum, Signed-off-by tags).

- Harmless context difference due to downstream-only commit 8b53513834e6

  ("Use kvm by default", 2018-04-24).

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

Message-Id: <20180416111743.8473-2-berrange@redhat.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

(cherry picked from commit 20efc49ed625585809401d8293ad9267927a6a4a)

Signed-off-by: Laszlo Ersek <lersek@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 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 5f3d73f..57390e5 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 = "kvm: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 306fdb5..1cfe5cb 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 95e6cf4..a8db173 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;

-- 

1.8.3.1