From nobody Mon Feb 9 06:02:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1666621092; cv=none; d=zohomail.com; s=zohoarc; b=eycxCSAVnHz52FPni2VTiVrgHvzz5mrL3jFb5/fABcUYwb1Te+GX7ACpBWmu8FUmya8qniy8bL5nXQ/YQP0Hz/UEsNKqQZ9V7aidH5Z9jWN+U99OCTjnz845j4GTBpLWMPQ+9LByPEYEe/EO/fWo8Nr+/e/SLOvMnMtNK+DaScQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666621092; 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=BH8OL5LXqf8NcRy+ePDI5993kAKa6jHTNScRGpy3O/A=; b=ZWzZlv6SpIO/f0NeqX3j5O5mCtoZ9XtwCub1QsbE7pyLE+m7rbea7Ma56lzfgn3SVPPAeJq4nJkjIsvJkz0WqSW2b/wH7mR6mWpVIgt3UQXKfyK0SvIGJfm9ghLyS0uGS5fT5hmLTGQdBBrXVujR9o9JZ/GDpJAiQZEk3enK8ss= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1666621092539482.46276941885105; Mon, 24 Oct 2022 07:18:12 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-622-GbIW52kmPS-tzXeO8FIL-Q-1; Mon, 24 Oct 2022 10:16:51 -0400 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 7D749823F91; Mon, 24 Oct 2022 14:15:58 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64B79492CA2; Mon, 24 Oct 2022 14:15:58 +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 413EC194658F; Mon, 24 Oct 2022 14:15:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C82FF194658F for ; Mon, 24 Oct 2022 14:15:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B0DA540C2140; Mon, 24 Oct 2022 14:15:56 +0000 (UTC) Received: from speedmetal.lan (ovpn-208-27.brq.redhat.com [10.40.208.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id A72A440C2064 for ; Mon, 24 Oct 2022 14:15:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666621091; 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=BH8OL5LXqf8NcRy+ePDI5993kAKa6jHTNScRGpy3O/A=; b=T25VOjbH6N99RrRLuPLDw47TE9VaEFGN5F2lR91AB2l7TCtLsM5ug2YMgeIXggVKI5H1kj AQSuZEC8Dk4HPZM8SdJq1PIg6FL955d++mY31oL4Da3hEznzfXuRMOu5RJP1Td8tFSDZG3 2x+UxWx6KtUdRfsMz9SEZ8UkkNLCukk= X-MC-Unique: GbIW52kmPS-tzXeO8FIL-Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 41/43] virDomainJobObj: Use 'unsigned int' instead of 'unsigned long' for 'apiFlags' field Date: Mon, 24 Oct 2022 16:14:46 +0200 Message-Id: <3796569dd86d9e0b187e2a798e8c7e438e70aa4a.1666619795.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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: 1666621093351100001 Content-Type: text/plain; charset="utf-8" The callers store only an 'unsigned int' in the field. Convert it to the proper type including parser/formatter. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/virdomainjob.c | 4 ++-- src/conf/virdomainjob.h | 4 ++-- src/qemu/qemu_domainjob.c | 7 +++---- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_migration_params.c | 8 ++++---- src/qemu/qemu_migration_params.h | 4 ++-- src/qemu/qemu_process.c | 2 +- src/qemu/qemu_process.h | 2 +- 8 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/conf/virdomainjob.c b/src/conf/virdomainjob.c index ca0215bc23..256b665a42 100644 --- a/src/conf/virdomainjob.c +++ b/src/conf/virdomainjob.c @@ -431,7 +431,7 @@ virDomainObjBeginJobInternal(virDomainObj *obj, VIR_WARN("Cannot start job (%s, %s, %s) in API %s for domain %s; " "current job is (%s, %s, %s) " - "owned by (%llu %s, %llu %s, %llu %s (flags=3D0x%lx)) " + "owned by (%llu %s, %llu %s, %llu %s (flags=3D0x%x)) " "for (%llus, %llus, %llus)", virDomainJobTypeToString(job), virDomainAgentJobTypeToString(agentJob), @@ -550,7 +550,7 @@ virDomainObjBeginAgentJob(virDomainObj *obj, int virDomainObjBeginAsyncJob(virDomainObj *obj, virDomainAsyncJob asyncJob, virDomainJobOperation operation, - unsigned long apiFlags) + unsigned int apiFlags) { if (virDomainObjBeginJobInternal(obj, obj->job, VIR_JOB_ASYNC, VIR_AGENT_JOB_NONE, diff --git a/src/conf/virdomainjob.h b/src/conf/virdomainjob.h index c101334596..b1ac36a2fa 100644 --- a/src/conf/virdomainjob.h +++ b/src/conf/virdomainjob.h @@ -182,7 +182,7 @@ struct _virDomainJobObj { virDomainJobData *completed; /* statistics data of a recently comp= leted job */ bool abortJob; /* abort of the job requested */ char *error; /* job event completion error */ - unsigned long apiFlags; /* flags passed to the API which started the a= sync job */ + unsigned int apiFlags; /* flags passed to the API which started the as= ync job */ void *privateData; /* job specific collection of data= */ virDomainObjPrivateJobCallbacks *cb; @@ -255,7 +255,7 @@ int virDomainObjBeginAgentJob(virDomainObj *obj, int virDomainObjBeginAsyncJob(virDomainObj *obj, virDomainAsyncJob asyncJob, virDomainJobOperation operation, - unsigned long apiFlags) + unsigned int apiFlags) G_GNUC_WARN_UNUSED_RESULT; int virDomainObjBeginNestedJob(virDomainObj *obj, virDomainAsyncJob asyncJob) diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index a170fdd97d..4d320f075e 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -692,7 +692,7 @@ qemuDomainObjPrivateXMLFormatJob(virBuffer *buf, } if (vm->job->asyncJob !=3D VIR_ASYNC_JOB_NONE) { - virBufferAsprintf(&attrBuf, " flags=3D'0x%lx'", vm->job->apiFlags); + virBufferAsprintf(&attrBuf, " flags=3D'0x%x'", vm->job->apiFlags); virBufferAsprintf(&attrBuf, " asyncStarted=3D'%llu'", vm->job->asy= ncStarted); } @@ -758,10 +758,9 @@ qemuDomainObjPrivateXMLParseJob(virDomainObj *vm, } } - if (virXPathULongHex("string(@flags)", ctxt, &vm->job->apiFlags) =3D= =3D -2) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid job flags"= )); + if (virXMLPropUInt(ctxt->node, "flags", 16, VIR_XML_PROP_NONE, + &vm->job->apiFlags) < 0) return -1; - } if (vm->job->cb && vm->job->cb->parseJobPrivate(ctxt, job, vm) < 0) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 33105cf07b..53c655fb93 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -101,7 +101,7 @@ qemuMigrationJobIsAllowed(virDomainObj *vm) static int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RE= SULT qemuMigrationJobStart(virDomainObj *vm, virDomainAsyncJob job, - unsigned long apiFlags) + unsigned int apiFlags) { virDomainJobOperation op; unsigned long long mask; diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index 7a023b36c8..bee0af9fca 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -919,7 +919,7 @@ int qemuMigrationParamsApply(virDomainObj *vm, int asyncJob, qemuMigrationParams *migParams, - unsigned long apiFlags) + unsigned int apiFlags) { bool postcopyResume =3D !!(apiFlags & VIR_MIGRATE_POSTCOPY_RESUME); int ret =3D -1; @@ -1117,7 +1117,7 @@ static void qemuMigrationParamsResetTLS(virDomainObj *vm, int asyncJob, qemuMigrationParams *origParams, - unsigned long apiFlags) + unsigned int apiFlags) { g_autofree char *tlsAlias =3D NULL; g_autofree char *secAlias =3D NULL; @@ -1280,7 +1280,7 @@ void qemuMigrationParamsReset(virDomainObj *vm, int asyncJob, qemuMigrationParams *origParams, - unsigned long apiFlags) + unsigned int apiFlags) { virErrorPtr err; g_autoptr(virBitmap) clearCaps =3D NULL; @@ -1288,7 +1288,7 @@ qemuMigrationParamsReset(virDomainObj *vm, virErrorPreserveLast(&err); - VIR_DEBUG("Resetting migration parameters %p, flags 0x%lx", + VIR_DEBUG("Resetting migration parameters %p, flags 0x%x", origParams, apiFlags); if (!virDomainObjIsActive(vm) || !origParams) diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_par= ams.h index c58a933ab6..5612a4d283 100644 --- a/src/qemu/qemu_migration_params.h +++ b/src/qemu/qemu_migration_params.h @@ -98,7 +98,7 @@ int qemuMigrationParamsApply(virDomainObj *vm, int asyncJob, qemuMigrationParams *migParams, - unsigned long apiFlags); + unsigned int apiFlags); int qemuMigrationParamsEnableTLS(virQEMUDriver *driver, @@ -145,7 +145,7 @@ void qemuMigrationParamsReset(virDomainObj *vm, int asyncJob, qemuMigrationParams *origParams, - unsigned long apiFlags); + unsigned int apiFlags); void qemuMigrationParamsFormat(virBuffer *buf, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f405326312..48b3e07f09 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4689,7 +4689,7 @@ qemuProcessIncomingDefNew(virQEMUCaps *qemuCaps, int qemuProcessBeginJob(virDomainObj *vm, virDomainJobOperation operation, - unsigned long apiFlags) + unsigned int apiFlags) { if (virDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_START, operation, apiFlags) < 0) diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 4dfb2485c0..d1f58ee258 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -65,7 +65,7 @@ void qemuProcessIncomingDefFree(qemuProcessIncomingDef *i= nc); int qemuProcessBeginJob(virDomainObj *vm, virDomainJobOperation operation, - unsigned long apiFlags); + unsigned int apiFlags); void qemuProcessEndJob(virDomainObj *vm); typedef enum { --=20 2.37.3