[PATCH 4/5] qemu: migration: Use 'unsigned int' for flags

Tuesday, 22 November 2022

Don't continue with the historical mistake and fix all internal
functions to use a sane type for flags.

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt;
---
 src/qemu/qemu_migration.c        | 82 ++++++++++++++++----------------
 src/qemu/qemu_migration.h        | 10 ++--
 src/qemu/qemu_migration_params.c |  6 +--
 src/qemu/qemu_migration_params.h |  4 +-
 4 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index bba4e1dbf3..acdfce9935 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2471,7 +2471,7 @@ qemuMigrationSrcBeginXML(virDomainObj *vm,
                          unsigned int cookieFlags,
                          const char **migrate_disks,
                          size_t nmigrate_disks,
-                         unsigned long flags)
+                         unsigned int flags)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
     virQEMUDriver *driver = priv->driver;
@@ -2527,14 +2527,14 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver,
                            int *cookieoutlen,
                            size_t nmigrate_disks,
                            const char **migrate_disks,
-                           unsigned long flags)
+                           unsigned int flags)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
     unsigned int cookieFlags = QEMU_MIGRATION_COOKIE_LOCKSTATE;

     VIR_DEBUG("driver=%p, vm=%p, xmlin=%s, dname=%s,"
               " cookieout=%p, cookieoutlen=%p,"
-              " nmigrate_disks=%zu, migrate_disks=%p, flags=0x%lx",
+              " nmigrate_disks=%zu, migrate_disks=%p, flags=0x%x",
               driver, vm, NULLSTR(xmlin), NULLSTR(dname),
               cookieout, cookieoutlen, nmigrate_disks,
               migrate_disks, flags);
@@ -2647,10 +2647,10 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver,
 static bool
 qemuMigrationAnyCanResume(virDomainObj *vm,
                           virDomainAsyncJob job,
-                          unsigned long flags,
+                          unsigned int flags,
                           qemuMigrationJobPhase expectedPhase)
 {
-    VIR_DEBUG("vm=%p, job=%s, flags=0x%lx, expectedPhase=%s",
+    VIR_DEBUG("vm=%p, job=%s, flags=0x%x, expectedPhase=%s",
               vm, virDomainAsyncJobTypeToString(job), flags,
               qemuDomainAsyncJobPhaseToString(VIR_ASYNC_JOB_MIGRATION_OUT,
                                               expectedPhase));
@@ -2715,7 +2715,7 @@ qemuMigrationSrcBeginResume(virDomainObj *vm,
                             const char *xmlin,
                             char **cookieout,
                             int *cookieoutlen,
-                            unsigned long flags)
+                            unsigned int flags)
 {
     virDomainJobStatus status;

@@ -2741,7 +2741,7 @@ qemuMigrationSrcBeginResumePhase(virConnectPtr conn,
                                  const char *xmlin,
                                  char **cookieout,
                                  int *cookieoutlen,
-                                 unsigned long flags)
+                                 unsigned int flags)
 {
     g_autofree char *xml = NULL;

@@ -2781,7 +2781,7 @@ qemuMigrationSrcBegin(virConnectPtr conn,
                       int *cookieoutlen,
                       size_t nmigrate_disks,
                       const char **migrate_disks,
-                      unsigned long flags)
+                      unsigned int flags)
 {
     virQEMUDriver *driver = conn->privateData;
     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
@@ -3050,7 +3050,7 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver,
                               int nbdPort,
                               const char *nbdURI,
                               qemuMigrationParams *migParams,
-                              unsigned long flags)
+                              unsigned int flags)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
     qemuDomainJobPrivate *jobPriv = vm->job->privateData;
@@ -3249,7 +3249,7 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *driver,
                              int nbdPort,
                              const char *nbdURI,
                              qemuMigrationParams *migParams,
-                             unsigned long flags)
+                             unsigned int flags)
 {
     virDomainObj *vm = NULL;
     virErrorPtr origErr;
@@ -3261,7 +3261,7 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *driver,
     bool taint_hook = false;

     VIR_DEBUG("name=%s, origname=%s, protocol=%s, port=%hu, "
-              "listenAddress=%s, nbdPort=%d, nbdURI=%s, flags=0x%lx",
+              "listenAddress=%s, nbdPort=%d, nbdURI=%s, flags=0x%x",
               (*def)->name, NULLSTR(origname), protocol, port,
               listenAddress, nbdPort, NULLSTR(nbdURI), flags);

@@ -3424,7 +3424,7 @@ qemuMigrationDstPrepareResume(virQEMUDriver *driver,
                               unsigned short port,
                               bool autoPort,
                               const char *listenAddress,
-                              unsigned long flags)
+                              unsigned int flags)
 {
     g_autoptr(qemuMigrationCookie) mig = NULL;
     qemuProcessIncomingDef *incoming = NULL;
@@ -3434,7 +3434,7 @@ qemuMigrationDstPrepareResume(virQEMUDriver *driver,
     int ret = -1;

     VIR_DEBUG("name=%s, origname=%s, protocol=%s, port=%hu, "
-              "listenAddress=%s, flags=0x%lx",
+              "listenAddress=%s, flags=0x%x",
               def->name, NULLSTR(origname), protocol, port,
               NULLSTR(listenAddress), flags);

@@ -3529,7 +3529,7 @@ qemuMigrationDstPrepareAny(virQEMUDriver *driver,
                            int nbdPort,
                            const char *nbdURI,
                            qemuMigrationParams *migParams,
-                           unsigned long flags)
+                           unsigned int flags)
 {
     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);

@@ -3608,11 +3608,11 @@ qemuMigrationDstPrepareTunnel(virQEMUDriver *driver,
                               virDomainDef **def,
                               const char *origname,
                               qemuMigrationParams *migParams,
-                              unsigned long flags)
+                              unsigned int flags)
 {
     VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, "
               "cookieout=%p, cookieoutlen=%p, st=%p, def=%p, "
-              "origname=%s, flags=0x%lx",
+              "origname=%s, flags=0x%x",
               driver, dconn, NULLSTR(cookiein), cookieinlen,
               cookieout, cookieoutlen, st, *def, origname, flags);

@@ -3668,7 +3668,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriver *driver,
                               int nbdPort,
                               const char *nbdURI,
                               qemuMigrationParams *migParams,
-                              unsigned long flags)
+                              unsigned int flags)
 {
     unsigned short port = 0;
     bool autoPort = true;
@@ -3682,7 +3682,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriver *driver,
               "cookieout=%p, cookieoutlen=%p, uri_in=%s, uri_out=%p, "
               "def=%p, origname=%s, listenAddress=%s, "
               "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, "
-              "nbdURI=%s, flags=0x%lx",
+              "nbdURI=%s, flags=0x%x",
               driver, dconn, NULLSTR(cookiein), cookieinlen,
               cookieout, cookieoutlen, NULLSTR(uri_in), uri_out,
               *def, origname, NULLSTR(listenAddress),
@@ -4683,7 +4683,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
                     int cookieinlen,
                     char **cookieout,
                     int *cookieoutlen,
-                    unsigned long flags,
+                    unsigned int flags,
                     unsigned long resource,
                     qemuMigrationSpec *spec,
                     virConnectPtr dconn,
@@ -4713,7 +4713,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
         priv->migMaxBandwidth = resource;

     VIR_DEBUG("driver=%p, vm=%p, cookiein=%s, cookieinlen=%d, "
-              "cookieout=%p, cookieoutlen=%p, flags=0x%lx, resource=%lu, "
+              "cookieout=%p, cookieoutlen=%p, flags=0x%x, resource=%lu, "
               "spec=%p (dest=%d, fwd=%d), dconn=%p, graphicsuri=%s, "
               "nmigrate_disks=%zu, migrate_disks=%p",
               driver, vm, NULLSTR(cookiein), cookieinlen,
@@ -5043,7 +5043,7 @@ qemuMigrationSrcResume(virDomainObj *vm,
                        char **cookieout,
                        int *cookieoutlen,
                        qemuMigrationSpec *spec,
-                       unsigned long flags)
+                       unsigned int flags)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
     virQEMUDriver *driver = priv->driver;
@@ -5095,7 +5095,7 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver,
                               int cookieinlen,
                               char **cookieout,
                               int *cookieoutlen,
-                              unsigned long flags,
+                              unsigned int flags,
                               unsigned long resource,
                               virConnectPtr dconn,
                               const char *graphicsuri,
@@ -5110,7 +5110,7 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver,
     qemuMigrationSpec spec;

     VIR_DEBUG("driver=%p, vm=%p, uri=%s, cookiein=%s, cookieinlen=%d, "
-              "cookieout=%p, cookieoutlen=%p, flags=0x%lx, resource=%lu, "
+              "cookieout=%p, cookieoutlen=%p, flags=0x%x, resource=%lu, "
               "graphicsuri=%s, nmigrate_disks=%zu migrate_disks=%p",
               driver, vm, uri, NULLSTR(cookiein), cookieinlen,
               cookieout, cookieoutlen, flags, resource,
@@ -5200,7 +5200,7 @@ qemuMigrationSrcPerformTunnel(virQEMUDriver *driver,
                               int cookieinlen,
                               char **cookieout,
                               int *cookieoutlen,
-                              unsigned long flags,
+                              unsigned int flags,
                               unsigned long resource,
                               virConnectPtr dconn,
                               const char *graphicsuri,
@@ -5213,7 +5213,7 @@ qemuMigrationSrcPerformTunnel(virQEMUDriver *driver,
     int fds[2] = { -1, -1 };

     VIR_DEBUG("driver=%p, vm=%p, st=%p, cookiein=%s, cookieinlen=%d, "
-              "cookieout=%p, cookieoutlen=%p, flags=0x%lx, resource=%lu, "
+              "cookieout=%p, cookieoutlen=%p, flags=0x%x, resource=%lu, "
               "graphicsuri=%s, nmigrate_disks=%zu, migrate_disks=%p",
               driver, vm, st, NULLSTR(cookiein), cookieinlen,
               cookieout, cookieoutlen, flags, resource,
@@ -5264,7 +5264,7 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *driver,
                                   virConnectPtr dconn,
                                   virDomainObj *vm,
                                   const char *dconnuri,
-                                  unsigned long flags,
+                                  unsigned int flags,
                                   const char *dname,
                                   unsigned long resource,
                                   qemuMigrationParams *migParams)
@@ -5280,7 +5280,7 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *driver,
     unsigned long destflags;

     VIR_DEBUG("driver=%p, sconn=%p, dconn=%p, vm=%p, dconnuri=%s, "
-              "flags=0x%lx, dname=%s, resource=%lu",
+              "flags=0x%x, dname=%s, resource=%lu",
               driver, sconn, dconn, vm, NULLSTR(dconnuri),
               flags, NULLSTR(dname), resource);

@@ -5419,7 +5419,7 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driver,
                                   qemuMigrationParams *migParams,
                                   unsigned long long bandwidth,
                                   bool useParams,
-                                  unsigned long flags)
+                                  unsigned int flags)
 {
     virDomainPtr ddomain = NULL;
     char *uri_out = NULL;
@@ -5442,7 +5442,7 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driver,
     VIR_DEBUG("driver=%p, sconn=%p, dconn=%p, dconnuri=%s, vm=%p, xmlin=%s, "
               "dname=%s, uri=%s, graphicsuri=%s, listenAddress=%s, "
               "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, nbdURI=%s, "
-              "bandwidth=%llu, useParams=%d, flags=0x%lx",
+              "bandwidth=%llu, useParams=%d, flags=0x%x",
               driver, sconn, dconn, NULLSTR(dconnuri), vm, NULLSTR(xmlin),
               NULLSTR(dname), NULLSTR(uri), NULLSTR(graphicsuri),
               NULLSTR(listenAddress), nmigrate_disks, migrate_disks, nbdPort,
@@ -5784,7 +5784,7 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriver *driver,
                                  int nbdPort,
                                  const char *nbdURI,
                                  qemuMigrationParams *migParams,
-                                 unsigned long flags,
+                                 unsigned int flags,
                                  const char *dname,
                                  unsigned long resource,
                                  bool *v3proto)
@@ -5801,7 +5801,7 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriver *driver,

     VIR_DEBUG("driver=%p, sconn=%p, vm=%p, xmlin=%s, dconnuri=%s, uri=%s, "
               "graphicsuri=%s, listenAddress=%s, nmigrate_disks=%zu, "
-              "migrate_disks=%p, nbdPort=%d, nbdURI=%s, flags=0x%lx, "
+              "migrate_disks=%p, nbdPort=%d, nbdURI=%s, flags=0x%x, "
               "dname=%s, resource=%lu",
               driver, sconn, vm, NULLSTR(xmlin), NULLSTR(dconnuri),
               NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress),
@@ -5955,7 +5955,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver,
                            int cookieinlen,
                            char **cookieout,
                            int *cookieoutlen,
-                           unsigned long flags,
+                           unsigned int flags,
                            const char *dname,
                            unsigned long resource,
                            bool v3proto)
@@ -6076,7 +6076,7 @@ qemuMigrationSrcPerformResume(virQEMUDriver *driver,
                               int cookieinlen,
                               char **cookieout,
                               int *cookieoutlen,
-                              unsigned long flags)
+                              unsigned int flags)
 {
     int ret;

@@ -6127,7 +6127,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver,
                              int cookieinlen,
                              char **cookieout,
                              int *cookieoutlen,
-                             unsigned long flags,
+                             unsigned int flags,
                              unsigned long resource,
                              const char *nbdURI)
 {
@@ -6206,7 +6206,7 @@ qemuMigrationSrcPerform(virQEMUDriver *driver,
                         int cookieinlen,
                         char **cookieout,
                         int *cookieoutlen,
-                        unsigned long flags,
+                        unsigned int flags,
                         const char *dname,
                         unsigned long resource,
                         bool v3proto)
@@ -6218,7 +6218,7 @@ qemuMigrationSrcPerform(virQEMUDriver *driver,
               "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, "
               "nbdURI=%s, "
               "cookiein=%s, cookieinlen=%d, cookieout=%p, cookieoutlen=%p, "
-              "flags=0x%lx, dname=%s, resource=%lu, v3proto=%d",
+              "flags=0x%x, dname=%s, resource=%lu, v3proto=%d",
               driver, conn, vm, NULLSTR(xmlin), NULLSTR(dconnuri),
               NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress),
               nmigrate_disks, migrate_disks, nbdPort, NULLSTR(nbdURI),
@@ -6478,7 +6478,7 @@ static int
 qemuMigrationDstFinishFresh(virQEMUDriver *driver,
                             virDomainObj *vm,
                             qemuMigrationCookie *mig,
-                            unsigned long flags,
+                            unsigned int flags,
                             bool v3proto,
                             unsigned long long timeReceived,
                             bool *doKill,
@@ -6627,7 +6627,7 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver,
                              int cookieinlen,
                              char **cookieout,
                              int *cookieoutlen,
-                             unsigned long flags,
+                             unsigned int flags,
                              int retcode,
                              bool v3proto,
                              unsigned long long timeReceived,
@@ -6643,7 +6643,7 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver,
     bool doKill = vm->job->phase != QEMU_MIGRATION_PHASE_FINISH_RESUME;
     int rc;

-    VIR_DEBUG("vm=%p, flags=0x%lx, retcode=%d",
+    VIR_DEBUG("vm=%p, flags=0x%x, retcode=%d",
               vm, flags, retcode);

     if (!(mig = qemuMigrationCookieParse(driver, vm->def, priv->origname, priv,
@@ -6733,7 +6733,7 @@ qemuMigrationDstFinish(virQEMUDriver *driver,
                        int cookieinlen,
                        char **cookieout,
                        int *cookieoutlen,
-                       unsigned long flags,
+                       unsigned int flags,
                        int retcode,
                        bool v3proto)
 {
@@ -6746,7 +6746,7 @@ qemuMigrationDstFinish(virQEMUDriver *driver,
                         : QEMU_MIGRATION_PHASE_FINISH2;

     VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, "
-              "cookieout=%p, cookieoutlen=%p, flags=0x%lx, retcode=%d",
+              "cookieout=%p, cookieoutlen=%p, flags=0x%x, retcode=%d",
               driver, dconn, vm, NULLSTR(cookiein), cookieinlen,
               cookieout, cookieoutlen, flags, retcode);

diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h
index 3d7c2702aa..38a961f4e9 100644
--- a/src/qemu/qemu_migration.h
+++ b/src/qemu/qemu_migration.h
@@ -122,7 +122,7 @@ qemuMigrationSrcBegin(virConnectPtr conn,
                       int *cookieoutlen,
                       size_t nmigrate_disks,
                       const char **migrate_disks,
-                      unsigned long flags);
+                      unsigned int flags);

 virDomainDef *
 qemuMigrationAnyPrepareDef(virQEMUDriver *driver,
@@ -142,7 +142,7 @@ qemuMigrationDstPrepareTunnel(virQEMUDriver *driver,
                               virDomainDef **def,
                               const char *origname,
                               qemuMigrationParams *migParams,
-                              unsigned long flags);
+                              unsigned int flags);

 int
 qemuMigrationDstPrepareDirect(virQEMUDriver *driver,
@@ -161,7 +161,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriver *driver,
                               int nbdPort,
                               const char *nbdURI,
                               qemuMigrationParams *migParams,
-                              unsigned long flags);
+                              unsigned int flags);

 int
 qemuMigrationSrcPerform(virQEMUDriver *driver,
@@ -182,7 +182,7 @@ qemuMigrationSrcPerform(virQEMUDriver *driver,
                         int cookieinlen,
                         char **cookieout,
                         int *cookieoutlen,
-                        unsigned long flags,
+                        unsigned int flags,
                         const char *dname,
                         unsigned long resource,
                         bool v3proto);
@@ -195,7 +195,7 @@ qemuMigrationDstFinish(virQEMUDriver *driver,
                        int cookieinlen,
                        char **cookieout,
                        int *cookieoutlen,
-                       unsigned long flags,
+                       unsigned int flags,
                        int retcode,
                        bool v3proto);

diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index bee0af9fca..bd09dcfb23 100644
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -509,7 +509,7 @@ qemuMigrationParamsSetTPString(qemuMigrationParams *migParams,
 static int
 qemuMigrationParamsSetCompression(virTypedParameterPtr params,
                                   int nparams,
-                                  unsigned long flags,
+                                  unsigned int flags,
                                   qemuMigrationParams *migParams)
 {
     size_t i;
@@ -596,7 +596,7 @@ qemuMigrationParamsSetBlockDirtyBitmapMapping(qemuMigrationParams
*migParams,
 qemuMigrationParams *
 qemuMigrationParamsFromFlags(virTypedParameterPtr params,
                              int nparams,
-                             unsigned long flags,
+                             unsigned int flags,
                              qemuMigrationParty party)
 {
     g_autoptr(qemuMigrationParams) migParams = NULL;
@@ -681,7 +681,7 @@ qemuMigrationParamsDump(qemuMigrationParams *migParams,
                         virTypedParameterPtr *params,
                         int *nparams,
                         int *maxparams,
-                        unsigned long *flags)
+                        unsigned int *flags)
 {
     size_t i;

diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h
index 5612a4d283..e7c65f6a21 100644
--- a/src/qemu/qemu_migration_params.h
+++ b/src/qemu/qemu_migration_params.h
@@ -77,7 +77,7 @@ qemuMigrationParamsGetAlwaysOnCaps(qemuMigrationParty party);
 qemuMigrationParams *
 qemuMigrationParamsFromFlags(virTypedParameterPtr params,
                              int nparams,
-                             unsigned long flags,
+                             unsigned int flags,
                              qemuMigrationParty party);

 int
@@ -85,7 +85,7 @@ qemuMigrationParamsDump(qemuMigrationParams *migParams,
                         virTypedParameterPtr *params,
                         int *nparams,
                         int *maxparams,
-                        unsigned long *flags);
+                        unsigned int *flags);

 qemuMigrationParams *
 qemuMigrationParamsNew(void);
-- 
2.37.3


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

[PATCH 4/5] qemu: migration: Use 'unsigned int' for flags