[libvirt] [PATCH] qemu-agent: available in 0.10.0

[Eric Blake]

The recent virDomainQemuAgentCommand addition is part of 0.10.0;
also, grouping all libvirt-qemu.so callbacks together makes them
easier to identify.

* src/libvirt_qemu.syms: Fix release symbol.
* src/qemu/qemu_driver.c (qemuDriver): Likewise.
* src/remote/remote_driver.c (remote_driver): Likewise.
* src/driver.h (_virDriver): Group qemu-specific callbacks.
---

Pushing under the trivial rule.

 src/driver.h               | 2 +-
 src/libvirt_qemu.syms      | 2 +-
 src/qemu/qemu_driver.c     | 2 +-
 src/remote/remote_driver.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/driver.h b/src/driver.h
index ccb01dc..e88ab28 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -1043,6 +1043,7 @@ struct _virDriver {
     virDrvDomainSnapshotDelete          domainSnapshotDelete;
     virDrvDomainQemuMonitorCommand      qemuDomainMonitorCommand;
     virDrvDomainQemuAttach              qemuDomainAttach;
+    virDrvDomainQemuAgentCommand        qemuDomainArbitraryAgentCommand;
     virDrvDomainOpenConsole             domainOpenConsole;
     virDrvDomainOpenGraphics            domainOpenGraphics;
     virDrvDomainInjectNMI               domainInjectNMI;
@@ -1067,7 +1068,6 @@ struct _virDriver {
     virDrvDomainGetDiskErrors           domainGetDiskErrors;
     virDrvDomainSetMetadata             domainSetMetadata;
     virDrvDomainGetMetadata             domainGetMetadata;
-    virDrvDomainQemuAgentCommand        qemuDomainArbitraryAgentCommand;
 };

 typedef int
diff --git a/src/libvirt_qemu.syms b/src/libvirt_qemu.syms
index 6e11509..f968d91 100644
--- a/src/libvirt_qemu.syms
+++ b/src/libvirt_qemu.syms
@@ -20,7 +20,7 @@ LIBVIRT_QEMU_0.9.4 {
         virDomainQemuAttach;
 } LIBVIRT_QEMU_0.8.3;

-LIBVIRT_QEMU_0.10.1 {
+LIBVIRT_QEMU_0.10.0 {
     global:
         virDomainQemuAgentCommand;
 } LIBVIRT_QEMU_0.9.4;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 3948bef..baeb03b 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -14013,6 +14013,7 @@ static virDriver qemuDriver = {
     .domainSnapshotDelete = qemuDomainSnapshotDelete, /* 0.8.0 */
     .qemuDomainMonitorCommand = qemuDomainMonitorCommand, /* 0.8.3 */
     .qemuDomainAttach = qemuDomainAttach, /* 0.9.4 */
+    .qemuDomainArbitraryAgentCommand = qemuDrvDomainAgentCommand, /* 0.10.0 */
     .domainOpenConsole = qemuDomainOpenConsole, /* 0.8.6 */
     .domainOpenGraphics = qemuDomainOpenGraphics, /* 0.9.7 */
     .domainInjectNMI = qemuDomainInjectNMI, /* 0.9.2 */
@@ -14042,7 +14043,6 @@ static virDriver qemuDriver = {
     .domainPMSuspendForDuration = qemuDomainPMSuspendForDuration, /* 0.9.11 */
     .domainPMWakeup = qemuDomainPMWakeup, /* 0.9.11 */
     .domainGetCPUStats = qemuDomainGetCPUStats, /* 0.9.11 */
-    .qemuDomainArbitraryAgentCommand = qemuDrvDomainAgentCommand, /* 0.10.1 */
 };


diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index f0484a7..cf1f079 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -5530,6 +5530,7 @@ static virDriver remote_driver = {
     .domainSnapshotDelete = remoteDomainSnapshotDelete, /* 0.8.0 */
     .qemuDomainMonitorCommand = remoteQemuDomainMonitorCommand, /* 0.8.3 */
     .qemuDomainAttach = qemuDomainAttach, /* 0.9.4 */
+    .qemuDomainArbitraryAgentCommand = qemuDomainAgentCommand, /* 0.10.0 */
     .domainOpenConsole = remoteDomainOpenConsole, /* 0.8.6 */
     .domainOpenGraphics = remoteDomainOpenGraphics, /* 0.9.7 */
     .domainInjectNMI = remoteDomainInjectNMI, /* 0.9.2 */
@@ -5557,7 +5558,6 @@ static virDriver remote_driver = {
     .domainSetMetadata = remoteDomainSetMetadata, /* 0.9.10 */
     .domainGetMetadata = remoteDomainGetMetadata, /* 0.9.10 */
     .domainGetHostname = remoteDomainGetHostname, /* 0.10.0 */
-    .qemuDomainArbitraryAgentCommand = qemuDomainAgentCommand, /* 0.10.1 */
 };

 static virNetworkDriver network_driver = {
-- 
1.7.11.4