From nobody Mon Feb 9 06:27:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1669122249; cv=none; d=zohomail.com; s=zohoarc; b=UPHCxAoPTQKCsr9CAUUEPhYl/1uBqIsn8D36bt61fvV6i8oBc29kwLjHgjMMmjm2YS+w9qecN4lEtfWg+FOOrJ5hWIQk/aF9JQrKdTj/kHk0jn7I/o0147VElunvstr2HTWhDD7ED4w7GwQ/NTwfYuoLk9vcm3XNXAjEAOIh1dA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669122249; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OSCwvAfa0Swhtez/e3n3pJoaHkbAbSMepCEiXb0BqcU=; b=IPY+TMRu2tkbXncc9HOcPw7MuhLNpBDV7wBbnawfYLB0/HHRpRKkxulgJ/N5hBuxsGHZi5SfSVAPkFjNucfXQ9ft39tP2uXtzt1fOTv/cYei0Vudm+RXPSoFa45DtCYsuCDsBR34i32DuQOT/u6ZJZodT9r2n4ljvfHvElgKwj4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 166912224926476.70400729700873; Tue, 22 Nov 2022 05:04:09 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-302-9kUgjfBkPPOSe_N_1uaUlA-1; Tue, 22 Nov 2022 08:03:16 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 67E522A5957F; Tue, 22 Nov 2022 13:03:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C7D04B401B; Tue, 22 Nov 2022 13:03:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 08D7619465B9; Tue, 22 Nov 2022 13:03:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7127B1946589 for ; Tue, 22 Nov 2022 13:03:10 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 531A7492B2A; Tue, 22 Nov 2022 13:03:10 +0000 (UTC) Received: from speedmetal.redhat.com (ovpn-208-20.brq.redhat.com [10.40.208.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87745492B17 for ; Tue, 22 Nov 2022 13:03:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669122247; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=OSCwvAfa0Swhtez/e3n3pJoaHkbAbSMepCEiXb0BqcU=; b=NGTIqSufCIcFxsdpYFPI33qyWFienZ0dLED+iGLrh/jeFddTfITiqmk6M/GKPCCEUugTJ+ PfVVjffdrCmVvxw5QVKQt2cHrKrkDql6NYD4//dzAqtxVbpvZFZXhRc7kGFDki/3a+Kl5g 1HOs4BmWv9w2i18BXGjIweba9fSAlbk= X-MC-Unique: 9kUgjfBkPPOSe_N_1uaUlA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/5] qemu: migration: Use 'unsigned int' for flags Date: Tue, 22 Nov 2022 14:02:57 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1669122251197100001 Content-Type: text/plain; charset="utf-8" Don't continue with the historical mistake and fix all internal functions to use a sane type for flags. Signed-off-by: Peter Krempa --- 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 =3D vm->privateData; virQEMUDriver *driver =3D 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 =3D vm->privateData; unsigned int cookieFlags =3D QEMU_MIGRATION_COOKIE_LOCKSTATE; VIR_DEBUG("driver=3D%p, vm=3D%p, xmlin=3D%s, dname=3D%s," " cookieout=3D%p, cookieoutlen=3D%p," - " nmigrate_disks=3D%zu, migrate_disks=3D%p, flags=3D0x%lx", + " nmigrate_disks=3D%zu, migrate_disks=3D%p, flags=3D0x%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=3D%p, job=3D%s, flags=3D0x%lx, expectedPhase=3D%s", + VIR_DEBUG("vm=3D%p, job=3D%s, flags=3D0x%x, expectedPhase=3D%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 =3D 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 =3D conn->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); @@ -3050,7 +3050,7 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver, int nbdPort, const char *nbdURI, qemuMigrationParams *migParams, - unsigned long flags) + unsigned int flags) { qemuDomainObjPrivate *priv =3D vm->privateData; qemuDomainJobPrivate *jobPriv =3D 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 =3D NULL; virErrorPtr origErr; @@ -3261,7 +3261,7 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *driver, bool taint_hook =3D false; VIR_DEBUG("name=3D%s, origname=3D%s, protocol=3D%s, port=3D%hu, " - "listenAddress=3D%s, nbdPort=3D%d, nbdURI=3D%s, flags=3D0x%l= x", + "listenAddress=3D%s, nbdPort=3D%d, nbdURI=3D%s, flags=3D0x%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 =3D NULL; qemuProcessIncomingDef *incoming =3D NULL; @@ -3434,7 +3434,7 @@ qemuMigrationDstPrepareResume(virQEMUDriver *driver, int ret =3D -1; VIR_DEBUG("name=3D%s, origname=3D%s, protocol=3D%s, port=3D%hu, " - "listenAddress=3D%s, flags=3D0x%lx", + "listenAddress=3D%s, flags=3D0x%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 =3D 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=3D%p, dconn=3D%p, cookiein=3D%s, cookieinlen=3D%d, " "cookieout=3D%p, cookieoutlen=3D%p, st=3D%p, def=3D%p, " - "origname=3D%s, flags=3D0x%lx", + "origname=3D%s, flags=3D0x%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 =3D 0; bool autoPort =3D true; @@ -3682,7 +3682,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriver *driver, "cookieout=3D%p, cookieoutlen=3D%p, uri_in=3D%s, uri_out=3D%= p, " "def=3D%p, origname=3D%s, listenAddress=3D%s, " "nmigrate_disks=3D%zu, migrate_disks=3D%p, nbdPort=3D%d, " - "nbdURI=3D%s, flags=3D0x%lx", + "nbdURI=3D%s, flags=3D0x%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 =3D resource; VIR_DEBUG("driver=3D%p, vm=3D%p, cookiein=3D%s, cookieinlen=3D%d, " - "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%lx, resource= =3D%lu, " + "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%x, resource= =3D%lu, " "spec=3D%p (dest=3D%d, fwd=3D%d), dconn=3D%p, graphicsuri=3D= %s, " "nmigrate_disks=3D%zu, migrate_disks=3D%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 =3D vm->privateData; virQEMUDriver *driver =3D 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=3D%p, vm=3D%p, uri=3D%s, cookiein=3D%s, cookieinlen= =3D%d, " - "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%lx, resource= =3D%lu, " + "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%x, resource= =3D%lu, " "graphicsuri=3D%s, nmigrate_disks=3D%zu migrate_disks=3D%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] =3D { -1, -1 }; VIR_DEBUG("driver=3D%p, vm=3D%p, st=3D%p, cookiein=3D%s, cookieinlen= =3D%d, " - "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%lx, resource= =3D%lu, " + "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%x, resource= =3D%lu, " "graphicsuri=3D%s, nmigrate_disks=3D%zu, migrate_disks=3D%p", driver, vm, st, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, resource, @@ -5264,7 +5264,7 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *driv= er, 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 *driv= er, unsigned long destflags; VIR_DEBUG("driver=3D%p, sconn=3D%p, dconn=3D%p, vm=3D%p, dconnuri=3D%s= , " - "flags=3D0x%lx, dname=3D%s, resource=3D%lu", + "flags=3D0x%x, dname=3D%s, resource=3D%lu", driver, sconn, dconn, vm, NULLSTR(dconnuri), flags, NULLSTR(dname), resource); @@ -5419,7 +5419,7 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driv= er, qemuMigrationParams *migParams, unsigned long long bandwidth, bool useParams, - unsigned long flags) + unsigned int flags) { virDomainPtr ddomain =3D NULL; char *uri_out =3D NULL; @@ -5442,7 +5442,7 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driv= er, VIR_DEBUG("driver=3D%p, sconn=3D%p, dconn=3D%p, dconnuri=3D%s, vm=3D%p= , xmlin=3D%s, " "dname=3D%s, uri=3D%s, graphicsuri=3D%s, listenAddress=3D%s,= " "nmigrate_disks=3D%zu, migrate_disks=3D%p, nbdPort=3D%d, nbd= URI=3D%s, " - "bandwidth=3D%llu, useParams=3D%d, flags=3D0x%lx", + "bandwidth=3D%llu, useParams=3D%d, flags=3D0x%x", driver, sconn, dconn, NULLSTR(dconnuri), vm, NULLSTR(xmlin), NULLSTR(dname), NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress), nmigrate_disks, migrate_disks, nbdPo= rt, @@ -5784,7 +5784,7 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriver *drive= r, 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 *drive= r, VIR_DEBUG("driver=3D%p, sconn=3D%p, vm=3D%p, xmlin=3D%s, dconnuri=3D%s= , uri=3D%s, " "graphicsuri=3D%s, listenAddress=3D%s, nmigrate_disks=3D%zu,= " - "migrate_disks=3D%p, nbdPort=3D%d, nbdURI=3D%s, flags=3D0x%l= x, " + "migrate_disks=3D%p, nbdPort=3D%d, nbdURI=3D%s, flags=3D0x%x= , " "dname=3D%s, resource=3D%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=3D%zu, migrate_disks=3D%p, nbdPort=3D%d, " "nbdURI=3D%s, " "cookiein=3D%s, cookieinlen=3D%d, cookieout=3D%p, cookieoutl= en=3D%p, " - "flags=3D0x%lx, dname=3D%s, resource=3D%lu, v3proto=3D%d", + "flags=3D0x%x, dname=3D%s, resource=3D%lu, v3proto=3D%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 =3D vm->job->phase !=3D QEMU_MIGRATION_PHASE_FINISH_RESUME; int rc; - VIR_DEBUG("vm=3D%p, flags=3D0x%lx, retcode=3D%d", + VIR_DEBUG("vm=3D%p, flags=3D0x%x, retcode=3D%d", vm, flags, retcode); if (!(mig =3D 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=3D%p, dconn=3D%p, vm=3D%p, cookiein=3D%s, cookieinle= n=3D%d, " - "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%lx, retcode= =3D%d", + "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%x, retcode=3D= %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_par= ams.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 *mig= Params, static int qemuMigrationParamsSetCompression(virTypedParameterPtr params, int nparams, - unsigned long flags, + unsigned int flags, qemuMigrationParams *migParams) { size_t i; @@ -596,7 +596,7 @@ qemuMigrationParamsSetBlockDirtyBitmapMapping(qemuMigra= tionParams *migParams, qemuMigrationParams * qemuMigrationParamsFromFlags(virTypedParameterPtr params, int nparams, - unsigned long flags, + unsigned int flags, qemuMigrationParty party) { g_autoptr(qemuMigrationParams) migParams =3D 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_par= ams.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 par= ty); 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); --=20 2.37.3