move files: hypervisor/domain_job -> conf/virdomainjob

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 <khanicov@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>

diff --git a/po/POTFILES b/po/POTFILES
index b9577e840de478194c0aa580bd2a3197dc0db34c..169e2a41dc14eac661a3f8e90370e019c5c4c67c 100644 (file)
--- 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 b3bebd6b9a9e4b7948cb8950934fb1f0456793fa..27efe2feed55af0fc2f341d2b5f441724e3faf93 100644 (file)
--- 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"
 
 /* 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 5ef494c3babc9ac558676d81a1b7c680ba4f7599..5116c23fe396fb320ae75a262c61244ad337d5da 100644 (file)
--- a/src/conf/meson.build
+++ b/src/conf/meson.build
@@ -20,6 +20,7 @@ domain_conf_sources = [
   '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 07ee5b4a3dbb65294367044d0c2a472f9061de27..0515e1d507aa362e6119f246557af319379a12ad 100644 (file)
--- 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 <config.h>
 #include <string.h>
 
-#include "domain_job.h"
+#include "virdomainjob.h"
 #include "viralloc.h"
 #include "virthreadjob.h"
 #include "virlog.h"
@@ -16,7 +16,7 @@
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
-VIR_LOG_INIT("hypervisor.domain_job");
+VIR_LOG_INIT("conf.virdomainjob");
 
 
 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 d7409c05f07dc92881dd82ccfb4ae65966c3b3a5..bdfdc91935a8cada107098a47a24690aa12fcfdd 100644 (file)
--- 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 7532f30ee28c32af78f3078d58d1cb33134ae29c..f35565b16b0b7b1315acec871b1bbf08b13f6c49 100644 (file)
--- a/src/hypervisor/meson.build
+++ b/src/hypervisor/meson.build
@@ -3,7 +3,6 @@ hypervisor_sources = [
   'domain_driver.c',
   'virclosecallbacks.c',
   'virhostdev.c',
-  'domain_job.c',
 ]
 
 stateful_driver_source_files += files(hypervisor_sources)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 08571cd4b4dcca4a5bb4352e1f4f0c9dea4fe56f..5077db9c6b0c48abd83bbfeb03c66410ad1fbab1 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1175,6 +1175,28 @@ virDomainCheckpointUpdateRelations;
 virDomainListCheckpoints;
 
 
+#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;
 
 
-# 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 6695ec670efd6a4edd120925d9a6f9d8c381a802..aadb13f461de40c85ea80bb61d38e61c14c697bc 100644 (file)
--- 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"
 
 #define VIR_FROM_THIS VIR_FROM_LIBXL
 

diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h
index 8ad56f1e88a633248687bb797ce9bbf118bd9571..451e76e311b7801e53cd636b0bc465c0552f5ab6 100644 (file)
--- a/src/libxl/libxl_domain.h
+++ b/src/libxl/libxl_domain.h
@@ -24,7 +24,7 @@
 
 #include "libxl_conf.h"
 #include "virchrdev.h"
-#include "domain_job.h"
+#include "virdomainjob.h"
 
 
 typedef struct _libxlDomainObjPrivate libxlDomainObjPrivate;

diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index 61e59ec726a202902ded28b497fa849a0c27364a..f234aaf39ca7625cb9c07455d9fa1b5d0b138c98 100644 (file)
--- 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"
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 

diff --git a/src/lxc/lxc_domain.h b/src/lxc/lxc_domain.h
index 82c36eb94021e57d90a0a8f7248a040fa170de1f..db622acc86288374e90d861e6f9afeab5d593b45 100644 (file)
--- 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"
 
 
 typedef enum {

diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h
index bb3c7ede1468a7a2085602d06a1a50b8aef88e86..23eadc26a715af615f8120bff8c48953be953bc0 100644 (file)
--- a/src/qemu/qemu_domainjob.h
+++ b/src/qemu/qemu_domainjob.h
@@ -20,7 +20,7 @@
 
 #include <glib-object.h>
 #include "qemu_monitor.h"
-#include "domain_job.h"
+#include "virdomainjob.h"
 
 
 typedef enum {