From: Marc-André Lureau
This code was based on a per-helper instance and peer-to-peer
connections. The code that landed in qemu master for v5.0 is relying
on a single instance and DBus bus.
Instead of trying to adapt the existing dbus-vmstate code, let's
remove it and resubmit. That should make reviewing easier.
Signed-off-by: Marc-André Lureau
---
src/qemu/Makefile.inc.am | 2 -
src/qemu/qemu_alias.c | 16 -
src/qemu/qemu_alias.h | 3 -
src/qemu/qemu_command.c | 83 -
src/qemu/qemu_command.h | 3 -
src/qemu/qemu_dbus.c | 94
src/qemu/qemu_dbus.h | 42 -
src/qemu/qemu_domain.c| 13
src/qemu/qemu_domain.h| 1 -
src/qemu/qemu_extdevice.c | 4 +-
src/qemu/qemu_hotplug.c | 83 +
src/qemu/qemu_hotplug.h | 11
src/qemu/qemu_migration.c | 8 ---
src/qemu/qemu_slirp.c | 125 +-
src/qemu/qemu_slirp.h | 4 +-
15 files changed, 7 insertions(+), 485 deletions(-)
delete mode 100644 src/qemu/qemu_dbus.c
delete mode 100644 src/qemu/qemu_dbus.h
diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index 967f6e75a2..028ab9043c 100644
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -13,8 +13,6 @@ QEMU_DRIVER_SOURCES = \
qemu/qemu_capabilities.h \
qemu/qemu_command.c \
qemu/qemu_command.h \
- qemu/qemu_dbus.c \
- qemu/qemu_dbus.h \
qemu/qemu_domain.c \
qemu/qemu_domain.h \
qemu/qemu_domain_address.c \
diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index 93bdcb7548..61f8ce05c9 100644
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -840,19 +840,3 @@ qemuDomainGetUnmanagedPRAlias(const char *parentalias)
return ret;
}
-
-char *
-qemuAliasDBusVMStateFromId(const char *id)
-{
-char *ret;
-size_t i;
-
-ret = g_strdup_printf("dbus-vms-%s", id);
-
-for (i = 0; ret[i]; i++) {
-if (ret[i] == ':')
-ret[i] = '_';
-}
-
-return ret;
-}
diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h
index ae2fce16bc..aaac09a1d1 100644
--- a/src/qemu/qemu_alias.h
+++ b/src/qemu/qemu_alias.h
@@ -95,6 +95,3 @@ char *qemuAliasChardevFromDevAlias(const char *devAlias)
const char *qemuDomainGetManagedPRAlias(void);
char *qemuDomainGetUnmanagedPRAlias(const char *parentalias);
-
-char *qemuAliasDBusVMStateFromId(const char *id)
-ATTRIBUTE_NONNULL(1);
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 904d2beab5..7429a0b7f5 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -27,7 +27,6 @@
#include "qemu_interface.h"
#include "qemu_alias.h"
#include "qemu_security.h"
-#include "qemu_dbus.h"
#include "qemu_slirp.h"
#include "qemu_block.h"
#include "cpu/cpu.h"
@@ -9459,85 +9458,6 @@ qemuBuildPflashBlockdevCommandLine(virCommandPtr cmd,
}
-static virJSONValuePtr
-qemuBuildDBusVMStateInfoPropsInternal(const char *alias,
- const char *addr)
-{
-virJSONValuePtr ret = NULL;
-
-if (qemuMonitorCreateObjectProps(,
- "dbus-vmstate", alias,
- "s:addr", addr, NULL) < 0)
-return NULL;
-
-return ret;
-}
-
-
-virJSONValuePtr
-qemuBuildDBusVMStateInfoProps(const char *id,
- const char *addr)
-{
-g_autofree char *alias = qemuAliasDBusVMStateFromId(id);
-
-if (!alias)
-return NULL;
-
-return qemuBuildDBusVMStateInfoPropsInternal(alias, addr);
-}
-
-
-typedef struct qemuBuildDBusVMStateCommandLineData {
-virCommandPtr cmd;
-} qemuBuildDBusVMStateCommandLineData;
-
-
-static int
-qemuBuildDBusVMStateCommandLineEach(void *payload,
-const void *id,
-void *user_data)
-{
-qemuBuildDBusVMStateCommandLineData *data = user_data;
-qemuDBusVMStatePtr vms = payload;
-g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-g_autoptr(virJSONValue) props = NULL;
-
-if (!(props = qemuBuildDBusVMStateInfoProps(id, vms->addr)))
-return -1;
-
-if (virQEMUBuildObjectCommandlineFromJSON(, props) < 0)
-return -1;
-
-virCommandAddArg(data->cmd, "-object");
-virCommandAddArgBuffer(data->cmd, );
-
-return 0;
-}
-
-static int
-qemuBuildDBusVMStateCommandLine(virCommandPtr cmd,
-qemuDomainObjPrivatePtr priv)
-{
-qemuBuildDBusVMStateCommandLineData data = {
-.cmd = cmd,
-};
-
-if (virHashSize(priv->dbusVMStates) == 0)
-return 0;
-
-if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DBUS_VMSTATE)) {
-virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("dbus-vmstate object is not supported by this QEMU
binary"));
-return 0;
-}
-
-if (virHashForEach(priv->dbusVMStates,
