[libvirt PATCH 09/16] qemu: remove private data from virDomainFSDef

Ján Tomko posted 16 patches 4 years, 4 months ago
There is a newer version of this series
[libvirt PATCH 09/16] qemu: remove private data from virDomainFSDef
Posted by Ján Tomko 4 years, 4 months ago
This reverts commit 801e6da29c0202946d44b42136cc4ee229932a29

They are not needed anymore.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
 src/qemu/qemu_domain.c | 41 -----------------------------------------
 src/qemu/qemu_domain.h | 11 -----------
 2 files changed, 52 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 5f467760c3..c4c79d979a 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -983,46 +983,6 @@ qemuDomainNetworkPrivateDispose(void *obj G_GNUC_UNUSED)
 }
 
 
-static virClass *qemuDomainFSPrivateClass;
-static void qemuDomainFSPrivateDispose(void *obj);
-
-
-static int
-qemuDomainFSPrivateOnceInit(void)
-{
-    if (!VIR_CLASS_NEW(qemuDomainFSPrivate, virClassForObject()))
-        return -1;
-
-    return 0;
-}
-
-
-VIR_ONCE_GLOBAL_INIT(qemuDomainFSPrivate);
-
-
-static virObject *
-qemuDomainFSPrivateNew(void)
-{
-    qemuDomainFSPrivate *priv;
-
-    if (qemuDomainFSPrivateInitialize() < 0)
-        return NULL;
-
-    if (!(priv = virObjectNew(qemuDomainFSPrivateClass)))
-        return NULL;
-
-    return (virObject *) priv;
-}
-
-
-static void
-qemuDomainFSPrivateDispose(void *obj)
-{
-    qemuDomainFSPrivate *priv = obj;
-
-    g_free(priv->vhostuser_fs_sock);
-}
-
 static virClass *qemuDomainVideoPrivateClass;
 static void qemuDomainVideoPrivateDispose(void *obj);
 
@@ -3163,7 +3123,6 @@ virDomainXMLPrivateDataCallbacks virQEMUDriverPrivateDataCallbacks = {
     .graphicsNew = qemuDomainGraphicsPrivateNew,
     .networkNew = qemuDomainNetworkPrivateNew,
     .videoNew = qemuDomainVideoPrivateNew,
-    .fsNew = qemuDomainFSPrivateNew,
     .parse = qemuDomainObjPrivateXMLParse,
     .format = qemuDomainObjPrivateXMLFormat,
     .getParseOpaque = qemuDomainObjPrivateXMLGetParseOpaque,
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 59cb703c16..7e717cf2ad 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -392,17 +392,6 @@ struct _qemuDomainNetworkPrivate {
 };
 
 
-#define QEMU_DOMAIN_FS_PRIVATE(dev) \
-    ((qemuDomainFSPrivate *) (dev)->privateData)
-
-typedef struct _qemuDomainFSPrivate qemuDomainFSPrivate;
-struct _qemuDomainFSPrivate {
-    virObject parent;
-
-    char *vhostuser_fs_sock;
-};
-
-
 typedef enum {
     QEMU_PROCESS_EVENT_WATCHDOG = 0,
     QEMU_PROCESS_EVENT_GUESTPANIC,
-- 
2.31.1

Re: [libvirt PATCH 09/16] qemu: remove private data from virDomainFSDef
Posted by Peter Krempa 4 years, 4 months ago
On Wed, Oct 06, 2021 at 09:15:15 +0200, Ján Tomko wrote:
> This reverts commit 801e6da29c0202946d44b42136cc4ee229932a29
> 
> They are not needed anymore.
> 
> Signed-off-by: Ján Tomko <jtomko@redhat.com>
> ---
>  src/qemu/qemu_domain.c | 41 -----------------------------------------
>  src/qemu/qemu_domain.h | 11 -----------
>  2 files changed, 52 deletions(-)

Reviewed-by: Peter Krempa <pkrempa@redhat.com>