From dd0dbe1d6613840473a94e824144e2c11e0352e9 Mon Sep 17 00:00:00 2001
From: John Ferlan <jferlan@redhat.com>
Date: Wed, 29 Jun 2016 13:34:00 -0400
Subject: [PATCH] qemu: Make QEMU_DRIVE_HOST_PREFIX more private

Move QEMU_DRIVE_HOST_PREFIX into the qemu_alias.c to dissuade future
callers from using it. Create qemuAliasDiskDriveSkipPrefix in order
to handle the current consumers that desire to check if an alias has
the drive- prefix and "get beyond it" in order to get the disk alias.
---
 src/qemu/qemu_alias.c        | 17 +++++++++++++++++
 src/qemu/qemu_alias.h        |  4 ++--
 src/qemu/qemu_domain.c       |  3 +--
 src/qemu/qemu_monitor_json.c |  6 ++----
 src/qemu/qemu_monitor_text.c |  8 +++-----
 src/qemu/qemu_process.c      |  3 +--
 6 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index f2635865a4..28260c92be 100644
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -29,6 +29,8 @@
 #include "virstring.h"
 #include "network/bridge_driver.h"
 
+#define QEMU_DRIVE_HOST_PREFIX "drive-"
+
 #define VIR_FROM_THIS VIR_FROM_QEMU
 
 VIR_LOG_INIT("qemu.qemu_alias");
@@ -476,6 +478,21 @@ qemuAliasFromDisk(const virDomainDiskDef *disk)
 }
 
 
+/* qemuAliasDiskDriveSkipPrefix:
+ * @dev_name: Pointer to a const char string
+ *
+ * If the QEMU_DRIVE_HOST_PREFIX exists in the input string, then
+ * increment the pointer and return it
+ */
+const char *
+qemuAliasDiskDriveSkipPrefix(const char *dev_name)
+{
+    if (STRPREFIX(dev_name, QEMU_DRIVE_HOST_PREFIX))
+        dev_name += strlen(QEMU_DRIVE_HOST_PREFIX);
+    return dev_name;
+}
+
+
 /* qemuDomainGetMasterKeyAlias:
  *
  * Generate and return the masterKey alias
diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h
index 5202f734c9..8f6d9a77f6 100644
--- a/src/qemu/qemu_alias.h
+++ b/src/qemu/qemu_alias.h
@@ -30,8 +30,6 @@
 # include "qemu_domain.h"
 # include "qemu_domain_address.h"
 
-# define QEMU_DRIVE_HOST_PREFIX "drive-"
-
 int qemuAssignDeviceChrAlias(virDomainDefPtr def,
                              virDomainChrDefPtr chr,
                              ssize_t idx);
@@ -69,6 +67,8 @@ int qemuDomainDeviceAliasIndex(const virDomainDeviceInfo *info,
 
 char *qemuAliasFromDisk(const virDomainDiskDef *disk);
 
+const char *qemuAliasDiskDriveSkipPrefix(const char *dev_name);
+
 char *qemuDomainGetMasterKeyAlias(void);
 
 char *qemuDomainGetSecretAESAlias(const char *srcalias,
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 211b883a1b..efc1fb538d 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4403,8 +4403,7 @@ qemuDomainStorageAlias(const char *device, int depth)
 {
     char *alias;
 
-    if (STRPREFIX(device, QEMU_DRIVE_HOST_PREFIX))
-        device += strlen(QEMU_DRIVE_HOST_PREFIX);
+    device = qemuAliasDiskDriveSkipPrefix(device);
 
     if (!depth)
         ignore_value(VIR_STRDUP(alias, device));
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 299526458b..52830241c5 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -1800,8 +1800,7 @@ int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon,
             goto cleanup;
         }
 
-        if (STRPREFIX(thisdev, QEMU_DRIVE_HOST_PREFIX))
-            thisdev += strlen(QEMU_DRIVE_HOST_PREFIX);
+        thisdev = qemuAliasDiskDriveSkipPrefix(thisdev);
 
         if (VIR_ALLOC(info) < 0)
             goto cleanup;
@@ -4195,8 +4194,7 @@ qemuMonitorJSONParseBlockJobInfo(virHashTablePtr blockJobs,
                        _("entry was missing 'device'"));
         return -1;
     }
-    if (STRPREFIX(device, QEMU_DRIVE_HOST_PREFIX))
-        device += strlen(QEMU_DRIVE_HOST_PREFIX);
+    device = qemuAliasDiskDriveSkipPrefix(device);
 
     if (VIR_ALLOC(info) < 0 ||
         virHashAddEntry(blockJobs, device, info) < 0) {
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index cf2979dab4..2c31b5298f 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -753,8 +753,7 @@ int qemuMonitorTextGetBlockInfo(qemuMonitorPtr mon,
     p = reply;
 
     while (*p) {
-        if (STRPREFIX(p, QEMU_DRIVE_HOST_PREFIX))
-            p += strlen(QEMU_DRIVE_HOST_PREFIX);
+        p = (char *)qemuAliasDiskDriveSkipPrefix(p);
 
         eol = strchr(p, '\n');
         if (!eol)
@@ -839,7 +838,7 @@ qemuMonitorTextGetAllBlockStatsInfo(qemuMonitorPtr mon,
 {
     qemuBlockStatsPtr stats = NULL;
     char *info = NULL;
-    char *dev_name;
+    const char *dev_name;
     char **lines = NULL;
     char **values = NULL;
     char *line;
@@ -901,8 +900,7 @@ qemuMonitorTextGetAllBlockStatsInfo(qemuMonitorPtr mon,
         *line = '\0';
         line += 2;
 
-        if (STRPREFIX(dev_name, QEMU_DRIVE_HOST_PREFIX))
-            dev_name += strlen(QEMU_DRIVE_HOST_PREFIX);
+        dev_name = qemuAliasDiskDriveSkipPrefix(dev_name);
 
         if (!(values = virStringSplit(line, " ", 0)))
             goto cleanup;
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index b87e305049..a4935d220e 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -355,8 +355,7 @@ qemuProcessFindDomainDiskByAlias(virDomainObjPtr vm,
 {
     size_t i;
 
-    if (STRPREFIX(alias, QEMU_DRIVE_HOST_PREFIX))
-        alias += strlen(QEMU_DRIVE_HOST_PREFIX);
+    alias = qemuAliasDiskDriveSkipPrefix(alias);
 
     for (i = 0; i < vm->def->ndisks; i++) {
         virDomainDiskDefPtr disk;
-- 
GitLab