From nobody Sun Feb 8 19:24:20 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=1662386256; cv=none; d=zohomail.com; s=zohoarc; b=Qf5XMYjSnZdZXk+bjPFsP3iEQvNVNRkcVtZ1Cp1TTnuq32y/uP10xsUZrSSiSoxz4qxO4D1U8TqLOg5QC1Ot5gEB49TJy+GVN6TpdJ4/OcM5IvBHjj7rD0/25Ftfx2Vhw/SHFONpE3kk2ETuo45nsl/NGMoRrKArOtF//SNPcB4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662386256; 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=psv1u9IzSdbBrGseCt6JCAu1lQC77A/sxe8eMBjrct4=; b=b2BPKs6rmj6NQo16zytHmvnRY6HpZ8rRNvE69bOXu/4Nk08Ot/1qFNadYA/DKhjEfCMnqRuVpzDU1/xKm6YEJf/dGtg6vN+Bv4OKt+TAxJseMNlCEmVOWAD1ERXyN/KQeHNc3cAwZ6z3/Ou0fLO14M9wCdrQyY2vJiGweBBN600= 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 1662386256518871.2337160712982; Mon, 5 Sep 2022 06:57:36 -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-508-KPQlz62-Npq-w4MYwqQU4w-1; Mon, 05 Sep 2022 09:57:32 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 19DA28037AF; Mon, 5 Sep 2022 13:57:25 +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 05B91C15BBD; Mon, 5 Sep 2022 13:57:25 +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 C0B82194E013; Mon, 5 Sep 2022 13:57:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 421DD1940379 for ; Mon, 5 Sep 2022 13:57:23 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 261302026D64; Mon, 5 Sep 2022 13:57:23 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id C51082026D4C for ; Mon, 5 Sep 2022 13:57:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662386255; 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=psv1u9IzSdbBrGseCt6JCAu1lQC77A/sxe8eMBjrct4=; b=Z++Qt0zusjMoxb5mFdwoP+DIclBD2K0Qudw1QMiQNxTEiXQhVgkKhTITqwJJXI9UfGGbvA jp2hvIdHYDolbeX5YxbpUCA3nyNaCVEw29/fI2fWo5orHkk18EOUgSoS0Q3vYtJ3cmKSSR lpEQBnrJ8NhHQIRHzv53cnCNn18pZoM= X-MC-Unique: KPQlz62-Npq-w4MYwqQU4w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH v2 03/17] move files: hypervisor/domain_job -> conf/virdomainjob Date: Mon, 5 Sep 2022 15:57:01 +0200 Message-Id: <0686f159f7b0bb7908ae65c8c8f4120327279054.1662385930.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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.8 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: 1662386258562100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The following patches move job object as a member into the domain object. Because of this, domain_conf (where the domain object is defined) needs to import the file with the job object. It makes sense to move jobs to the same level as the domain_conf: into src/conf/ Signed-off-by: Kristina Hanicova --- po/POTFILES | 2 +- src/ch/ch_domain.h | 2 +- src/conf/meson.build | 1 + .../domain_job.c =3D> conf/virdomainjob.c} | 6 +-- .../domain_job.h =3D> conf/virdomainjob.h} | 2 +- src/hypervisor/meson.build | 1 - src/libvirt_private.syms | 44 +++++++++---------- src/libxl/libxl_domain.c | 1 - src/libxl/libxl_domain.h | 2 +- src/lxc/lxc_domain.c | 1 - src/lxc/lxc_domain.h | 2 +- src/qemu/qemu_domainjob.h | 2 +- 12 files changed, 32 insertions(+), 34 deletions(-) rename src/{hypervisor/domain_job.c =3D> conf/virdomainjob.c} (99%) rename src/{hypervisor/domain_job.h =3D> conf/virdomainjob.h} (99%) diff --git a/po/POTFILES b/po/POTFILES index b9577e840d..169e2a41dc 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -53,6 +53,7 @@ src/conf/storage_conf.c src/conf/storage_encryption_conf.c src/conf/storage_source_conf.c src/conf/virchrdev.c +src/conf/virdomainjob.c src/conf/virdomainmomentobjlist.c src/conf/virdomainobjlist.c src/conf/virnetworkobj.c @@ -90,7 +91,6 @@ src/hyperv/hyperv_util.c src/hyperv/hyperv_wmi.c src/hypervisor/domain_cgroup.c src/hypervisor/domain_driver.c -src/hypervisor/domain_job.c src/hypervisor/virclosecallbacks.c src/hypervisor/virhostdev.c src/interface/interface_backend_netcf.c diff --git a/src/ch/ch_domain.h b/src/ch/ch_domain.h index b3bebd6b9a..27efe2feed 100644 --- a/src/ch/ch_domain.h +++ b/src/ch/ch_domain.h @@ -24,7 +24,7 @@ #include "ch_monitor.h" #include "virchrdev.h" #include "vircgroup.h" -#include "domain_job.h" +#include "virdomainjob.h" =20 /* Give up waiting for mutex after 30 seconds */ #define CH_JOB_WAIT_TIME (1000ull * 30) diff --git a/src/conf/meson.build b/src/conf/meson.build index 5ef494c3ba..5116c23fe3 100644 --- a/src/conf/meson.build +++ b/src/conf/meson.build @@ -20,6 +20,7 @@ domain_conf_sources =3D [ 'numa_conf.c', 'snapshot_conf.c', 'virdomaincheckpointobjlist.c', + 'virdomainjob.c', 'virdomainmomentobjlist.c', 'virdomainobjlist.c', 'virdomainsnapshotobjlist.c', diff --git a/src/hypervisor/domain_job.c b/src/conf/virdomainjob.c similarity index 99% rename from src/hypervisor/domain_job.c rename to src/conf/virdomainjob.c index 07ee5b4a3d..0515e1d507 100644 --- a/src/hypervisor/domain_job.c +++ b/src/conf/virdomainjob.c @@ -1,5 +1,5 @@ /* - * domain_job.c: job functions shared between hypervisor drivers + * virdomainjob.c: job functions shared between hypervisor drivers * * Copyright (C) 2022 Red Hat, Inc. * SPDX-License-Identifier: LGPL-2.1-or-later @@ -8,7 +8,7 @@ #include #include =20 -#include "domain_job.h" +#include "virdomainjob.h" #include "viralloc.h" #include "virthreadjob.h" #include "virlog.h" @@ -16,7 +16,7 @@ =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 -VIR_LOG_INIT("hypervisor.domain_job"); +VIR_LOG_INIT("conf.virdomainjob"); =20 =20 VIR_ENUM_IMPL(virDomainJob, diff --git a/src/hypervisor/domain_job.h b/src/conf/virdomainjob.h similarity index 99% rename from src/hypervisor/domain_job.h rename to src/conf/virdomainjob.h index d7409c05f0..bdfdc91935 100644 --- a/src/hypervisor/domain_job.h +++ b/src/conf/virdomainjob.h @@ -1,5 +1,5 @@ /* - * domain_job.h: job functions shared between hypervisor drivers + * virdomainjob.h: job functions shared between hypervisor drivers * * Copyright (C) 2022 Red Hat, Inc. * SPDX-License-Identifier: LGPL-2.1-or-later diff --git a/src/hypervisor/meson.build b/src/hypervisor/meson.build index 7532f30ee2..f35565b16b 100644 --- a/src/hypervisor/meson.build +++ b/src/hypervisor/meson.build @@ -3,7 +3,6 @@ hypervisor_sources =3D [ 'domain_driver.c', 'virclosecallbacks.c', 'virhostdev.c', - 'domain_job.c', ] =20 stateful_driver_source_files +=3D files(hypervisor_sources) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 08571cd4b4..5077db9c6b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1175,6 +1175,28 @@ virDomainCheckpointUpdateRelations; virDomainListCheckpoints; =20 =20 +#conf/virdomainjob.h +virDomainAgentJobTypeToString; +virDomainAsyncJobTypeFromString; +virDomainAsyncJobTypeToString; +virDomainJobDataCopy; +virDomainJobDataFree; +virDomainJobDataInit; +virDomainJobStatusToType; +virDomainJobTypeFromString; +virDomainJobTypeToString; +virDomainNestedJobAllowed; +virDomainObjBeginJobInternal; +virDomainObjCanSetJob; +virDomainObjClearJob; +virDomainObjInitJob; +virDomainObjPreserveJob; +virDomainObjResetAgentJob; +virDomainObjResetAsyncJob; +virDomainObjResetJob; +virDomainTrackJob; + + # conf/virdomainmomentobjlist.h virDomainMomentDropChildren; virDomainMomentDropParent; @@ -1585,28 +1607,6 @@ virDomainDriverParseBlkioDeviceStr; virDomainDriverSetupPersistentDefBlkioParams; =20 =20 -# hypervisor/domain_job.h -virDomainAgentJobTypeToString; -virDomainAsyncJobTypeFromString; -virDomainAsyncJobTypeToString; -virDomainJobDataCopy; -virDomainJobDataFree; -virDomainJobDataInit; -virDomainJobStatusToType; -virDomainJobTypeFromString; -virDomainJobTypeToString; -virDomainNestedJobAllowed; -virDomainObjBeginJobInternal; -virDomainObjCanSetJob; -virDomainObjClearJob; -virDomainObjInitJob; -virDomainObjPreserveJob; -virDomainObjResetAgentJob; -virDomainObjResetAsyncJob; -virDomainObjResetJob; -virDomainTrackJob; - - # hypervisor/virclosecallbacks.h virCloseCallbacksGet; virCloseCallbacksNew; diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 6695ec670e..aadb13f461 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -37,7 +37,6 @@ #include "xen_common.h" #include "driver.h" #include "domain_validate.h" -#include "domain_job.h" =20 #define VIR_FROM_THIS VIR_FROM_LIBXL =20 diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 8ad56f1e88..451e76e311 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -24,7 +24,7 @@ =20 #include "libxl_conf.h" #include "virchrdev.h" -#include "domain_job.h" +#include "virdomainjob.h" =20 =20 typedef struct _libxlDomainObjPrivate libxlDomainObjPrivate; diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index 61e59ec726..f234aaf39c 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -29,7 +29,6 @@ #include "virsystemd.h" #include "virinitctl.h" #include "domain_driver.h" -#include "domain_job.h" =20 #define VIR_FROM_THIS VIR_FROM_LXC =20 diff --git a/src/lxc/lxc_domain.h b/src/lxc/lxc_domain.h index 82c36eb940..db622acc86 100644 --- a/src/lxc/lxc_domain.h +++ b/src/lxc/lxc_domain.h @@ -25,7 +25,7 @@ #include "lxc_conf.h" #include "lxc_monitor.h" #include "virenum.h" -#include "domain_job.h" +#include "virdomainjob.h" =20 =20 typedef enum { diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index bb3c7ede14..23eadc26a7 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -20,7 +20,7 @@ =20 #include #include "qemu_monitor.h" -#include "domain_job.h" +#include "virdomainjob.h" =20 =20 typedef enum { --=20 2.37.2