From 0b2a2e84e4a347f317f6cf3c0119dddb561dbc2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
Date: Wed, 18 Aug 2021 14:10:57 +0200
Subject: [PATCH] qemu: remove private data from virDomainFSDef
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 801e6da29c0202946d44b42136cc4ee229932a29
They are not needed anymore.
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@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 e5c7c43d1c..1bd3730281 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 aad076dd4c..31971e29ac 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,