Re: [libvirt] [PATCH v2 46/73] qemu: Replace qemuMigrationAnyCompressionDump

[Ján Tomko]

On Wed, Apr 11, 2018 at 04:41:36PM +0200, Jiri Denemark wrote:

Since every parameter or capability set in qemuMigrationCompression
structure is now reflected in qemuMigrationParams structure, we can
replace qemuMigrationAnyCompressionDump with a new API which will work
on qemuMigrationParams.

Signed-off-by: Jiri Denemark 
---
src/qemu/qemu_driver.c   |  6 ++--
src/qemu/qemu_migration.c| 16 --
src/qemu/qemu_migration.h|  1 -
src/qemu/qemu_migration_params.c | 52 ++--
src/qemu/qemu_migration_params.h | 10 +++---
5 files changed, 37 insertions(+), 48 deletions(-)



Reviewed-by: Ján Tomko 

Jano


signature.asc
Description: Digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH v2 46/73] qemu: Replace qemuMigrationAnyCompressionDump

[Jiri Denemark]

Since every parameter or capability set in qemuMigrationCompression
structure is now reflected in qemuMigrationParams structure, we can
replace qemuMigrationAnyCompressionDump with a new API which will work
on qemuMigrationParams.

Signed-off-by: Jiri Denemark 
---
 src/qemu/qemu_driver.c   |  6 ++--
 src/qemu/qemu_migration.c| 16 --
 src/qemu/qemu_migration.h|  1 -
 src/qemu/qemu_migration_params.c | 52 ++--
 src/qemu/qemu_migration_params.h | 10 +++---
 5 files changed, 37 insertions(+), 48 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 3b0c3a3ffb..5e79e90609 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -12297,7 +12297,7 @@ qemuDomainMigratePerform(virDomainPtr dom,
  */
 ret = qemuMigrationSrcPerform(driver, dom->conn, vm, NULL,
   NULL, dconnuri, uri, NULL, NULL, 0, NULL, 0,
-  compression, migParams, cookie, cookielen,
+  migParams, cookie, cookielen,
   NULL, NULL, /* No output cookies in v2 */
   flags, dname, resource, false);
 
@@ -12743,7 +12743,7 @@ qemuDomainMigratePerform3(virDomainPtr dom,
 
 ret = qemuMigrationSrcPerform(driver, dom->conn, vm, xmlin, NULL,
   dconnuri, uri, NULL, NULL, 0, NULL, 0,
-  compression, migParams,
+  migParams,
   cookiein, cookieinlen,
   cookieout, cookieoutlen,
   flags, dname, resource, true);
@@ -12836,7 +12836,7 @@ qemuDomainMigratePerform3Params(virDomainPtr dom,
 ret = qemuMigrationSrcPerform(driver, dom->conn, vm, dom_xml, persist_xml,
   dconnuri, uri, graphicsuri, listenAddress,
   nmigrate_disks, migrate_disks, nbdPort,
-  compression, migParams,
+  migParams,
   cookiein, cookieinlen, cookieout, 
cookieoutlen,
   flags, dname, bandwidth, true);
  cleanup:
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 1c5ee67929..319b4d000a 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -3891,7 +3891,6 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver,
   size_t nmigrate_disks,
   const char **migrate_disks,
   int nbdPort,
-  qemuMigrationCompressionPtr compression,
   qemuMigrationParamsPtr migParams,
   unsigned long long bandwidth,
   bool useParams,
@@ -3976,8 +3975,8 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver,
  nbdPort) < 0)
 goto cleanup;
 
-if (qemuMigrationAnyCompressionDump(compression, , ,
-, ) < 0)
+if (qemuMigrationParamsDump(migParams, , ,
+, ) < 0)
 goto cleanup;
 }
 
@@ -4250,7 +4249,6 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriverPtr driver,
  size_t nmigrate_disks,
  const char **migrate_disks,
  int nbdPort,
- qemuMigrationCompressionPtr compression,
  qemuMigrationParamsPtr migParams,
  unsigned long flags,
  const char *dname,
@@ -4375,7 +4373,7 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriverPtr driver,
 ret = qemuMigrationSrcPerformPeer2Peer3(driver, sconn, dconn, 
dconnuri, vm, xmlin,
 persist_xml, dname, uri, 
graphicsuri,
 listenAddress, nmigrate_disks, 
migrate_disks,
-nbdPort, compression, 
migParams, resource,
+nbdPort, migParams, resource,
 useParams, flags);
 } else {
 ret = qemuMigrationSrcPerformPeer2Peer2(driver, sconn, dconn, vm,
@@ -4416,7 +4414,6 @@ qemuMigrationSrcPerformJob(virQEMUDriverPtr driver,
size_t nmigrate_disks,
const char **migrate_disks,
int nbdPort,
-   qemuMigrationCompressionPtr compression,
qemuMigrationParamsPtr migParams,
const char