From nobody Mon Feb 9 06:02:13 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=1648135993; cv=none; d=zohomail.com; s=zohoarc; b=Wj/NTgihX8ZHxEPPc/qk9EEsaggn83CmFB0UTExJzc3NF1/U8NWKIkz3VYl2c9hNaUpOctJCHjKoGfvwNvrnAhk06Fywb8yRi/k8Y9ePC7ZHoGbwUqqX+K4LWvmOpWjrsz3aVYnAVELC/lLsqX4QEj7JCUXOUrD5hnJoyA8oUZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648135993; 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=V5cYTE4Rng0HVPqluxLs3BP8K82jlN4aCmF6PXcGQeY=; b=GpcTkjEH9EglqS+LTUGdvEw1oEEr7Gwn9XSadF+K9rNCVDv8zKYzVrhqA0oGh6QW2K0zxHutC+d302byrKdrZuIN5gUptYaKq3Dwqf9oRlvX8/CHRV0A0wwkXnRRWiKhWvAqzkML8PNLf30TMzCFlaVxqOr/lU5k+8WQZvQY2Eo= 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 1648135993981667.3003005475364; Thu, 24 Mar 2022 08:33:13 -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-628-8NaOuSXHMQqJW62OyGQAew-1; Thu, 24 Mar 2022 11:33:10 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 23D061066559; Thu, 24 Mar 2022 15:33:08 +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 0BA4F140262B; Thu, 24 Mar 2022 15:33:08 +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 5F914193F6E6; Thu, 24 Mar 2022 15:33:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1D8CF194035B for ; Thu, 24 Mar 2022 15:33:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D3864C15D7C; Thu, 24 Mar 2022 15:32:59 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B4FFC15D7B for ; Thu, 24 Mar 2022 15:32:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648135992; 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=V5cYTE4Rng0HVPqluxLs3BP8K82jlN4aCmF6PXcGQeY=; b=O+5TkKreA3KqFCpVjh3WmII1Nhv4lvJCztTtG64DxFvV8ixmFf0wFi1di4qmUUC3/yxR0X KP/9da9aTlEoiD0QDBfdPTufsiKaf2h8xlCRGudWE6d8UpWYFrNLyv+3jI6teQ1aM1q+g7 n/MV5vKLAa114nA3ZfcDm06BXQzN8rU= X-MC-Unique: 8NaOuSXHMQqJW62OyGQAew-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 4/5] libxl: use virDomainJob enum instead of libxlDomainJob Date: Thu, 24 Mar 2022 16:32:45 +0100 Message-Id: <6a4e114a365d2bd743d4e1b2f976c6a57115360b.1648135845.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1648135994299100009 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Kristina Hanicova --- src/libxl/libxl_domain.c | 28 ++++++++-------------- src/libxl/libxl_domain.h | 17 ++----------- src/libxl/libxl_driver.c | 48 ++++++++++++++++++------------------- src/libxl/libxl_migration.c | 6 ++--- 4 files changed, 39 insertions(+), 60 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 2501f6b848..dbe44f4ffc 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -44,14 +44,6 @@ =20 VIR_LOG_INIT("libxl.libxl_domain"); =20 -VIR_ENUM_IMPL(libxlDomainJob, - LIBXL_JOB_LAST, - "none", - "query", - "destroy", - "modify", -); - =20 static int libxlDomainObjInitJob(libxlDomainObjPrivate *priv) @@ -71,7 +63,7 @@ libxlDomainObjResetJob(libxlDomainObjPrivate *priv) { struct libxlDomainJobObj *job =3D &priv->job; =20 - job->active =3D LIBXL_JOB_NONE; + job->active =3D VIR_JOB_NONE; job->owner =3D 0; } =20 @@ -97,7 +89,7 @@ libxlDomainObjFreeJob(libxlDomainObjPrivate *priv) int libxlDomainObjBeginJob(libxlDriverPrivate *driver G_GNUC_UNUSED, virDomainObj *obj, - enum libxlDomainJob job) + virDomainJob job) { libxlDomainObjPrivate *priv =3D obj->privateData; unsigned long long now; @@ -109,14 +101,14 @@ libxlDomainObjBeginJob(libxlDriverPrivate *driver G_G= NUC_UNUSED, =20 while (priv->job.active) { VIR_DEBUG("Wait normal job condition for starting job: %s", - libxlDomainJobTypeToString(job)); + virDomainJobTypeToString(job)); if (virCondWaitUntil(&priv->job.cond, &obj->parent.lock, then) < 0) goto error; } =20 libxlDomainObjResetJob(priv); =20 - VIR_DEBUG("Starting job: %s", libxlDomainJobTypeToString(job)); + VIR_DEBUG("Starting job: %s", virDomainJobTypeToString(job)); priv->job.active =3D job; priv->job.owner =3D virThreadSelfID(); priv->job.current->started =3D now; @@ -127,9 +119,9 @@ libxlDomainObjBeginJob(libxlDriverPrivate *driver G_GNU= C_UNUSED, error: VIR_WARN("Cannot start job (%s) for domain %s;" " current job is (%s) owned by (%d)", - libxlDomainJobTypeToString(job), + virDomainJobTypeToString(job), obj->def->name, - libxlDomainJobTypeToString(priv->job.active), + virDomainJobTypeToString(priv->job.active), priv->job.owner); =20 if (errno =3D=3D ETIMEDOUT) @@ -157,10 +149,10 @@ libxlDomainObjEndJob(libxlDriverPrivate *driver G_GNU= C_UNUSED, virDomainObj *obj) { libxlDomainObjPrivate *priv =3D obj->privateData; - enum libxlDomainJob job =3D priv->job.active; + virDomainJob job =3D priv->job.active; =20 VIR_DEBUG("Stopping job: %s", - libxlDomainJobTypeToString(job)); + virDomainJobTypeToString(job)); =20 libxlDomainObjResetJob(priv); virCondSignal(&priv->job.cond); @@ -510,7 +502,7 @@ libxlDomainShutdownThread(void *opaque) goto cleanup; } =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 if (xl_reason =3D=3D LIBXL_SHUTDOWN_REASON_POWEROFF) { @@ -639,7 +631,7 @@ libxlDomainDeathThread(void *opaque) goto cleanup; } =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, VIR_DOMAIN_SHUTOFF_DESTRO= YED); diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 157f480b93..aa15e0352f 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -28,23 +28,10 @@ #include "virenum.h" #include "domain_job.h" =20 -/* Only 1 job is allowed at any time - * A job includes *all* libxl.so api, even those just querying - * information, not merely actions */ -enum libxlDomainJob { - LIBXL_JOB_NONE =3D 0, /* Always set to 0 for easy if (jobActive) = conditions */ - LIBXL_JOB_QUERY, /* Doesn't change any state */ - LIBXL_JOB_DESTROY, /* Destroys the domain (cannot be masked out)= */ - LIBXL_JOB_MODIFY, /* May change state */ - - LIBXL_JOB_LAST -}; -VIR_ENUM_DECL(libxlDomainJob); - =20 struct libxlDomainJobObj { virCond cond; /* Use to coordinate jobs */ - enum libxlDomainJob active; /* Currently running job */ + virDomainJob active; /* Currently running job */ int owner; /* Thread which set current job */ virDomainJobData *current; /* Statistics for the current job */ }; @@ -76,7 +63,7 @@ libxlDomainObjPrivateInitCtx(virDomainObj *vm); int libxlDomainObjBeginJob(libxlDriverPrivate *driver, virDomainObj *obj, - enum libxlDomainJob job) + virDomainJob job) G_GNUC_WARN_UNUSED_RESULT; =20 void diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 478ab3e941..01f281d0a5 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -329,7 +329,7 @@ libxlAutostartDomain(virDomainObj *vm, virObjectLock(vm); virResetLastError(); =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 if (vm->autostart && !virDomainObjIsActive(vm) && @@ -1056,7 +1056,7 @@ libxlDomainCreateXML(virConnectPtr conn, const char *= xml, NULL))) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) { + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) { if (!vm->persistent) virDomainObjListRemove(driver->domains, vm); goto cleanup; @@ -1166,7 +1166,7 @@ libxlDomainSuspend(virDomainPtr dom) if (virDomainSuspendEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 if (virDomainObjCheckActive(vm) < 0) @@ -1219,7 +1219,7 @@ libxlDomainResume(virDomainPtr dom) if (virDomainResumeEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 if (virDomainObjCheckActive(vm) < 0) @@ -1380,7 +1380,7 @@ libxlDomainDestroyFlags(virDomainPtr dom, if (virDomainDestroyFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 if (virDomainObjCheckActive(vm) < 0) @@ -1453,7 +1453,7 @@ libxlDomainPMSuspendForDuration(virDomainPtr dom, if (virDomainPMSuspendForDurationEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 if (virDomainObjCheckActive(vm) < 0) @@ -1506,7 +1506,7 @@ libxlDomainPMWakeup(virDomainPtr dom, unsigned int fl= ags) if (virDomainPMWakeupEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 if (virDomainObjGetState(vm, NULL) !=3D VIR_DOMAIN_PMSUSPENDED) { @@ -1640,7 +1640,7 @@ libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned = long newmem, if (virDomainSetMemoryFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 if (virDomainLiveConfigHelperMethod(cfg->caps, driver->xmlopt, vm, &fl= ags, @@ -1909,7 +1909,7 @@ libxlDomainSaveFlags(virDomainPtr dom, const char *to= , const char *dxml, if (virDomainSaveFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 if (virDomainObjCheckActive(vm) < 0) @@ -1974,7 +1974,7 @@ libxlDomainRestoreFlags(virConnectPtr conn, const cha= r *from, NULL))) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) { + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) { if (!vm->persistent) virDomainObjListRemove(driver->domains, vm); goto cleanup; @@ -2021,7 +2021,7 @@ libxlDomainCoreDump(virDomainPtr dom, const char *to,= unsigned int flags) if (virDomainCoreDumpEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 if (virDomainObjCheckActive(vm) < 0) @@ -2110,7 +2110,7 @@ libxlDomainManagedSave(virDomainPtr dom, unsigned int= flags) if (virDomainManagedSaveEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 if (virDomainObjCheckActive(vm) < 0) @@ -2255,7 +2255,7 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned i= nt nvcpus, if (virDomainSetVcpusFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 if (!virDomainObjIsActive(vm) && (flags & VIR_DOMAIN_VCPU_LIVE)) { @@ -2453,7 +2453,7 @@ libxlDomainPinVcpuFlags(virDomainPtr dom, unsigned in= t vcpu, if (virDomainPinVcpuFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 if (virDomainLiveConfigHelperMethod(cfg->caps, driver->xmlopt, vm, @@ -2784,7 +2784,7 @@ libxlDomainCreateWithFlags(virDomainPtr dom, if (virDomainCreateWithFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 if (virDomainObjIsActive(vm)) { @@ -4102,7 +4102,7 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const = char *xml, if (virDomainAttachDeviceFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 if (virDomainObjUpdateModificationImpact(vm, &flags) < 0) @@ -4196,7 +4196,7 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const = char *xml, if (virDomainDetachDeviceFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 if (virDomainObjUpdateModificationImpact(vm, &flags) < 0) @@ -4484,7 +4484,7 @@ libxlDomainSetAutostart(virDomainPtr dom, int autosta= rt) if (virDomainSetAutostartEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 if (!vm->persistent) { @@ -4690,7 +4690,7 @@ libxlDomainSetSchedulerParametersFlags(virDomainPtr d= om, if (virDomainSetSchedulerParametersFlagsEnsureACL(dom->conn, vm->def, = flags) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 if (virDomainObjCheckActive(vm) < 0) @@ -5007,7 +5007,7 @@ libxlDomainInterfaceStats(virDomainPtr dom, if (virDomainInterfaceStatsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_QUERY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_QUERY) < 0) goto cleanup; =20 if (virDomainObjCheckActive(vm) < 0) @@ -5175,7 +5175,7 @@ libxlDomainMemoryStats(virDomainPtr dom, if (virDomainMemoryStatsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_QUERY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_QUERY) < 0) goto cleanup; =20 if (virDomainObjCheckActive(vm) < 0) @@ -5533,7 +5533,7 @@ libxlDomainBlockStats(virDomainPtr dom, if (virDomainBlockStatsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_QUERY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_QUERY) < 0) goto cleanup; =20 if (virDomainObjCheckActive(vm) < 0) @@ -5583,7 +5583,7 @@ libxlDomainBlockStatsFlags(virDomainPtr dom, if (virDomainBlockStatsFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_QUERY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_QUERY) < 0) goto cleanup; =20 if (virDomainObjCheckActive(vm) < 0) @@ -6375,7 +6375,7 @@ libxlDomainSetMetadata(virDomainPtr dom, if (virDomainSetMetadataEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; =20 - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 ret =3D virDomainObjSetMetadata(vm, type, metadata, key, uri, diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 6944c77eed..5bb8747890 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -386,7 +386,7 @@ libxlDomainMigrationSrcBegin(virConnectPtr conn, * terminated in the confirm phase. Errors in the begin or perform * phase will also terminate the job. */ - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto cleanup; =20 if (!(mig =3D libxlMigrationCookieNew(vm))) @@ -556,7 +556,7 @@ libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dco= nn, * Unless an error is encountered in this function, the job will * be terminated in the finish phase. */ - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto error; =20 priv =3D vm->privateData; @@ -665,7 +665,7 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, * Unless an error is encountered in this function, the job will * be terminated in the finish phase. */ - if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + if (libxlDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0) goto error; =20 priv =3D vm->privateData; --=20 2.35.1