From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 20 Jul 2020 18:01:54 +0000 (+0200)
Subject: qemu_domain_namespace.c: Rename qemuDomainAttachDeviceMknodData
X-Git-Tag: v6.7.0-rc1~197
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08277c2bc661ab1c50a595b37b098ca354d53d91;p=thirdparty%2Flibvirt.git

qemu_domain_namespace.c: Rename qemuDomainAttachDeviceMknodData

This structure is going to be used from not only device attach
code, but also when building the namespace. Moreover, the code
lives in a separate file so the chances of clashing with another
name are minimal.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c
index db38bc0e0d..e78760df29 100644
--- a/src/qemu/qemu_namespace.c
+++ b/src/qemu/qemu_namespace.c
@@ -1098,7 +1098,7 @@ qemuDomainNamespaceAvailable(qemuDomainNamespace ns G_GNUC_UNUSED)
 }
 
 
-struct qemuDomainAttachDeviceMknodData {
+struct qemuNamespaceMkondData {
     virQEMUDriverPtr driver;
     virDomainObjPtr vm;
     const char *file;
@@ -1117,7 +1117,7 @@ static int
 qemuDomainAttachDeviceMknodHelper(pid_t pid G_GNUC_UNUSED,
                                   void *opaque)
 {
-    struct qemuDomainAttachDeviceMknodData *data = opaque;
+    struct qemuNamespaceMkondData *data = opaque;
     int ret = -1;
     bool delDevice = false;
     bool isLink = S_ISLNK(data->sb.st_mode);
@@ -1262,7 +1262,7 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverPtr driver,
                                      unsigned int ttl)
 {
     g_autoptr(virQEMUDriverConfig) cfg = NULL;
-    struct qemuDomainAttachDeviceMknodData data;
+    struct qemuNamespaceMkondData data;
     int ret = -1;
     g_autofree char *target = NULL;
     bool isLink;