[libvirt] [PATCH 6/6] maint: include virdomaintypes.h instead of domain_conf.h

Most of the consumers only care about the domain types and do not need to parse/format XML. Include the smaller, more specific header if possible. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/access/viraccessdriver.h | 2 +- src/access/viraccessmanager.h | 2 +- src/conf/virchrdev.h | 2 +- src/esx/esx_private.h | 2 +- src/interface/interface_backend_udev.c | 2 +- src/libxl/libxl_capabilities.c | 2 +- src/libxl/libxl_domain.h | 2 +- src/locking/domain_lock.h | 2 +- src/locking/lock_driver.h | 2 +- src/locking/sanlock_helper.c | 2 +- src/lxc/lxc_cgroup.h | 2 +- src/lxc/lxc_conf.h | 2 +- src/lxc/lxc_hostdev.h | 2 +- src/lxc/lxc_monitor.h | 2 +- src/lxc/lxc_native.c | 2 +- src/lxc/lxc_native.h | 2 +- src/network/bridge_driver.h | 2 +- src/nwfilter/nwfilter_dhcpsnoop.c | 2 +- src/nwfilter/nwfilter_driver.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 2 +- src/nwfilter/nwfilter_gentech_driver.c | 2 +- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/qemu/qemu_alias.h | 2 +- src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_cgroup.h | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_command.h | 2 +- src/qemu/qemu_conf.h | 2 +- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_domain_address.h | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_firmware.h | 2 +- src/qemu/qemu_hostdev.h | 2 +- src/qemu/qemu_hotplug.h | 2 +- src/qemu/qemu_interface.h | 2 +- src/qemu/qemu_monitor.h | 2 +- src/qemu/qemu_processpriv.h | 2 +- src/qemu/qemu_security.h | 2 +- src/qemu/qemu_tpm.c | 2 +- src/remote/remote_daemon_dispatch.c | 2 +- src/security/security_manager.h | 2 +- src/security/virt-aa-helper.c | 2 +- src/storage/storage_driver.h | 2 +- src/test/test_driver.c | 2 +- src/vbox/vbox_driver.c | 2 +- src/vbox/vbox_network.c | 2 +- src/vbox/vbox_storage.c | 2 +- src/vbox/vbox_tmpl.c | 2 +- src/vz/vz_utils.h | 2 +- src/xenapi/xenapi_driver.c | 2 +- src/xenapi/xenapi_utils.c | 2 +- src/xenapi/xenapi_utils.h | 2 +- src/xenconfig/xen_common.h | 2 +- src/xenconfig/xen_xl.c | 2 +- src/xenconfig/xen_xl.h | 2 +- src/xenconfig/xen_xm.h | 2 +- tests/domainconftest.c | 2 +- tests/qemumemlocktest.c | 2 +- tests/qemumonitortestutils.h | 2 +- tests/qemusecuritytest.c | 2 +- tests/testutilslxc.c | 2 +- tests/testutilsqemu.h | 2 +- tests/testutilsxen.c | 2 +- tools/virsh-domain.c | 2 +- 65 files changed, 65 insertions(+), 65 deletions(-) diff --git a/src/access/viraccessdriver.h b/src/access/viraccessdriver.h index 363d75965c..0be181eaf0 100644 --- a/src/access/viraccessdriver.h +++ b/src/access/viraccessdriver.h @@ -20,7 +20,7 @@ #pragma once -#include "conf/domain_conf.h" +#include "virdomaintypes.h" #include "access/viraccessmanager.h" typedef int (*virAccessDriverCheckConnectDrv)(virAccessManagerPtr manager, diff --git a/src/access/viraccessmanager.h b/src/access/viraccessmanager.h index 2c02db4bf2..3ed85df38a 100644 --- a/src/access/viraccessmanager.h +++ b/src/access/viraccessmanager.h @@ -21,7 +21,7 @@ #pragma once #include "viridentity.h" -#include "conf/domain_conf.h" +#include "virdomaintypes.h" #include "conf/network_conf.h" #include "conf/nwfilter_conf.h" #include "conf/node_device_conf.h" diff --git a/src/conf/virchrdev.h b/src/conf/virchrdev.h index e218ea7203..b31d53a204 100644 --- a/src/conf/virchrdev.h +++ b/src/conf/virchrdev.h @@ -22,7 +22,7 @@ #pragma once #include "internal.h" -#include "domain_conf.h" +#include "virdomaintypes.h" typedef struct _virChrdevs virChrdevs; typedef virChrdevs *virChrdevsPtr; diff --git a/src/esx/esx_private.h b/src/esx/esx_private.h index 15edab4aa1..91332608d2 100644 --- a/src/esx/esx_private.h +++ b/src/esx/esx_private.h @@ -24,7 +24,7 @@ #include "internal.h" #include "virerror.h" #include "capabilities.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "esx_vi.h" typedef struct _esxPrivate { diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index fea5108dbc..a867380efb 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -27,7 +27,7 @@ #include "virfile.h" #include "c-ctype.h" #include "datatypes.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "interface_driver.h" #include "interface_conf.h" #include "viralloc.h" diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 73ae0b3fa1..9b3d4a37ec 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -29,7 +29,7 @@ #include "virfile.h" #include "viralloc.h" #include "virstring.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "capabilities.h" #include "domain_capabilities.h" #include "vircommand.h" diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 737ae6accd..e432c90145 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -22,7 +22,7 @@ #include <libxl.h> -#include "domain_conf.h" +#include "virdomaintypes.h" #include "libxl_conf.h" #include "virchrdev.h" #include "virenum.h" diff --git a/src/locking/domain_lock.h b/src/locking/domain_lock.h index 6f197bf08b..dca6460cf3 100644 --- a/src/locking/domain_lock.h +++ b/src/locking/domain_lock.h @@ -22,7 +22,7 @@ #pragma once #include "internal.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "lock_manager.h" int virDomainLockProcessStart(virLockManagerPluginPtr plugin, diff --git a/src/locking/lock_driver.h b/src/locking/lock_driver.h index e53c28ee33..fdefcea7a4 100644 --- a/src/locking/lock_driver.h +++ b/src/locking/lock_driver.h @@ -22,7 +22,7 @@ #pragma once #include "internal.h" -#include "domain_conf.h" +#include "virdomaintypes.h" typedef struct _virLockManager virLockManager; typedef virLockManager *virLockManagerPtr; diff --git a/src/locking/sanlock_helper.c b/src/locking/sanlock_helper.c index d589576f04..71fac1dd1f 100644 --- a/src/locking/sanlock_helper.c +++ b/src/locking/sanlock_helper.c @@ -3,7 +3,7 @@ #include "internal.h" #include "virconf.h" #include "viralloc.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "virgettext.h" diff --git a/src/lxc/lxc_cgroup.h b/src/lxc/lxc_cgroup.h index 63e9e837b0..c26dba0bd2 100644 --- a/src/lxc/lxc_cgroup.h +++ b/src/lxc/lxc_cgroup.h @@ -22,7 +22,7 @@ #pragma once #include "vircgroup.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "lxc_fuse.h" #include "virusb.h" diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h index e26ca22d3c..d732e331dd 100644 --- a/src/lxc/lxc_conf.h +++ b/src/lxc/lxc_conf.h @@ -23,7 +23,7 @@ #include "internal.h" #include "libvirt_internal.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "domain_event.h" #include "capabilities.h" #include "virthread.h" diff --git a/src/lxc/lxc_hostdev.h b/src/lxc/lxc_hostdev.h index d2cdebddc8..7f321106ea 100644 --- a/src/lxc/lxc_hostdev.h +++ b/src/lxc/lxc_hostdev.h @@ -22,7 +22,7 @@ #pragma once #include "lxc_conf.h" -#include "domain_conf.h" +#include "virdomaintypes.h" int virLXCUpdateActiveUSBHostdevs(virLXCDriverPtr driver, virDomainDefPtr def); diff --git a/src/lxc/lxc_monitor.h b/src/lxc/lxc_monitor.h index 6d0944c301..2af2eff25c 100644 --- a/src/lxc/lxc_monitor.h +++ b/src/lxc/lxc_monitor.h @@ -21,7 +21,7 @@ #pragma once #include "virobject.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "lxc_monitor_protocol.h" typedef struct _virLXCMonitor virLXCMonitor; diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index b4c6e790d8..1da308b0cd 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -29,7 +29,7 @@ #include "util/virlog.h" #include "util/virstring.h" #include "util/virconf.h" -#include "conf/domain_conf.h" +#include "virdomaintypes.h" #define VIR_FROM_THIS VIR_FROM_LXC diff --git a/src/lxc/lxc_native.h b/src/lxc/lxc_native.h index f16407f2e6..3c736c56e0 100644 --- a/src/lxc/lxc_native.h +++ b/src/lxc/lxc_native.h @@ -20,7 +20,7 @@ #pragma once -#include "domain_conf.h" +#include "virdomaintypes.h" #include "virenum.h" #define LXC_CONFIG_FORMAT "lxc-tools" diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h index b095388a0b..c56b2299ef 100644 --- a/src/network/bridge_driver.h +++ b/src/network/bridge_driver.h @@ -22,7 +22,7 @@ #pragma once #include "internal.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "vircommand.h" #include "virdnsmasq.h" #include "virnetworkobj.h" diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index d8a1e7f8a8..d47715b0f1 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -52,7 +52,7 @@ #include "virlog.h" #include "datatypes.h" #include "virerror.h" -#include "conf/domain_conf.h" +#include "virdomaintypes.h" #include "nwfilter_gentech_driver.h" #include "nwfilter_dhcpsnoop.h" #include "nwfilter_ipaddrmap.h" diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 530e4f5872..574059d972 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -32,7 +32,7 @@ #include "virerror.h" #include "datatypes.h" #include "viralloc.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "domain_nwfilter.h" #include "nwfilter_driver.h" #include "nwfilter_gentech_driver.h" diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 32bbf6d05c..4a21a6f013 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -32,7 +32,7 @@ #include "viralloc.h" #include "virlog.h" #include "virerror.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "nwfilter_conf.h" #include "nwfilter_driver.h" #include "nwfilter_gentech_driver.h" diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 6d68189d5f..ed3ad8feb6 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -26,7 +26,7 @@ #include "viralloc.h" #include "virlog.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "virerror.h" #include "nwfilter_gentech_driver.h" #include "nwfilter_ebiptables_driver.h" diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index cd66e3ea7d..720d0a47c8 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -48,7 +48,7 @@ #include "virerror.h" #include "virthread.h" #include "conf/nwfilter_params.h" -#include "conf/domain_conf.h" +#include "virdomaintypes.h" #include "nwfilter_gentech_driver.h" #include "nwfilter_ebiptables_driver.h" #include "nwfilter_ipaddrmap.h" diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h index aaac09a1d1..e6df17b2b2 100644 --- a/src/qemu/qemu_alias.h +++ b/src/qemu/qemu_alias.h @@ -21,7 +21,7 @@ #pragma once -#include "domain_conf.h" +#include "virdomaintypes.h" #include "qemu_capabilities.h" #include "qemu_domain.h" diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 292610d089..c0817d96bc 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -27,7 +27,7 @@ #include "qemu_block.h" #include "qemu_domain.h" -#include "conf/domain_conf.h" +#include "virdomaintypes.h" #include "conf/domain_event.h" #include "virlog.h" diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 65192469da..cde6de86f2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -32,7 +32,7 @@ #include "virprocess.h" #include "cpu/cpu.h" #include "cpu/cpu_x86.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "vircommand.h" #include "virbitmap.h" #include "virnodesuspend.h" diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h index 91d0877947..d003910e04 100644 --- a/src/qemu/qemu_cgroup.h +++ b/src/qemu/qemu_cgroup.h @@ -23,7 +23,7 @@ #include "virusb.h" #include "vircgroup.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "qemu_conf.h" int qemuSetupImageCgroup(virDomainObjPtr vm, diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1cf165079f..4ab201edff 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -44,7 +44,7 @@ #include "domain_nwfilter.h" #include "domain_addr.h" #include "domain_audit.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "netdev_bandwidth_conf.h" #include "snapshot_conf.h" #include "storage_conf.h" diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 8695832c16..53e815af36 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -22,7 +22,7 @@ #pragma once #include "domain_addr.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "vircommand.h" #include "virenum.h" #include "capabilities.h" diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 2229b76e89..62459866a7 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -27,7 +27,7 @@ #include "internal.h" #include "capabilities.h" #include "network_conf.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "snapshot_conf.h" #include "domain_event.h" #include "virthread.h" diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index b0c465cb22..875901c571 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -25,7 +25,7 @@ #include "vircgroup.h" #include "virperf.h" #include "domain_addr.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "snapshot_conf.h" #include "qemu_monitor.h" #include "qemu_agent.h" diff --git a/src/qemu/qemu_domain_address.h b/src/qemu/qemu_domain_address.h index bf04e6bfdb..623189d2e1 100644 --- a/src/qemu/qemu_domain_address.h +++ b/src/qemu/qemu_domain_address.h @@ -22,7 +22,7 @@ #pragma once #include "domain_addr.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "qemu_conf.h" #include "qemu_capabilities.h" diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 329c166255..93cc9772f7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -65,7 +65,7 @@ #include "viralloc.h" #include "virarptable.h" #include "viruuid.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "domain_audit.h" #include "node_device_conf.h" #include "virpci.h" diff --git a/src/qemu/qemu_firmware.h b/src/qemu/qemu_firmware.h index 6a3b6061f4..59cab09f81 100644 --- a/src/qemu/qemu_firmware.h +++ b/src/qemu/qemu_firmware.h @@ -20,7 +20,7 @@ #pragma once -#include "domain_conf.h" +#include "virdomaintypes.h" #include "qemu_conf.h" #include "virautoclean.h" #include "virarch.h" diff --git a/src/qemu/qemu_hostdev.h b/src/qemu/qemu_hostdev.h index f6d76c1c2a..3267b60254 100644 --- a/src/qemu/qemu_hostdev.h +++ b/src/qemu/qemu_hostdev.h @@ -22,7 +22,7 @@ #pragma once #include "qemu_conf.h" -#include "domain_conf.h" +#include "virdomaintypes.h" bool qemuHostdevHostSupportsPassthroughLegacy(void); bool qemuHostdevHostSupportsPassthroughVFIO(void); diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 896e6c7b98..b9601b86fe 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -23,7 +23,7 @@ #include "qemu_conf.h" #include "qemu_domain.h" -#include "domain_conf.h" +#include "virdomaintypes.h" int qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, virDomainObjPtr vm, diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h index 5a2f87e532..4955f20739 100644 --- a/src/qemu/qemu_interface.h +++ b/src/qemu/qemu_interface.h @@ -21,7 +21,7 @@ #pragma once -#include "domain_conf.h" +#include "virdomaintypes.h" #include "qemu_conf.h" #include "qemu_domain.h" diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 88c9702530..f063ed19e8 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -23,7 +23,7 @@ #include "internal.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "virbitmap.h" #include "virhash.h" #include "virjson.h" diff --git a/src/qemu/qemu_processpriv.h b/src/qemu/qemu_processpriv.h index 84d6bc8420..ee2ed2d26d 100644 --- a/src/qemu/qemu_processpriv.h +++ b/src/qemu/qemu_processpriv.h @@ -25,7 +25,7 @@ #pragma once -#include "domain_conf.h" +#include "virdomaintypes.h" #include "qemu_monitor.h" /* diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h index 68e377f418..2c72f7d17f 100644 --- a/src/qemu/qemu_security.h +++ b/src/qemu/qemu_security.h @@ -21,7 +21,7 @@ #pragma once #include "qemu_conf.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "security/security_manager.h" int qemuSecuritySetAllLabel(virQEMUDriverPtr driver, diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index cc8c69433b..7165706d5e 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -28,7 +28,7 @@ #include "qemu_domain.h" #include "qemu_security.h" -#include "conf/domain_conf.h" +#include "virdomaintypes.h" #include "vircommand.h" #include "viralloc.h" #include "virkmod.h" diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 856c5e48e7..ed65bfb0c2 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -43,7 +43,7 @@ #include "lxc_protocol.h" #include "virstring.h" #include "object_event.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "network_conf.h" #include "virprobe.h" #include "viraccessapicheck.h" diff --git a/src/security/security_manager.h b/src/security/security_manager.h index 0d2375b263..516e11a32a 100644 --- a/src/security/security_manager.h +++ b/src/security/security_manager.h @@ -20,7 +20,7 @@ #pragma once -#include "domain_conf.h" +#include "virdomaintypes.h" #include "vircommand.h" #include "virstoragefile.h" diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index ad9a7dda94..f2d7a2cb0e 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -38,7 +38,7 @@ #include "security_driver.h" #include "security_apparmor.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "virxml.h" #include "viruuid.h" #include "virusb.h" diff --git a/src/storage/storage_driver.h b/src/storage/storage_driver.h index 64b3d8bbf8..1696f6e53a 100644 --- a/src/storage/storage_driver.h +++ b/src/storage/storage_driver.h @@ -23,7 +23,7 @@ #include <sys/stat.h> -#include "domain_conf.h" +#include "virdomaintypes.h" #include "virstorageobj.h" virStoragePoolObjPtr virStoragePoolObjFindPoolByUUID(const unsigned char *uuid) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 2e33a9dd55..d7f523214c 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -39,7 +39,7 @@ #include "viralloc.h" #include "virnetworkobj.h" #include "interface_conf.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "domain_event.h" #include "network_event.h" #include "snapshot_conf.h" diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index 1f31fa28df..172e800b45 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -40,7 +40,7 @@ #include "virerror.h" #include "virutil.h" #include "domain_event.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "vbox_get_driver.h" diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c index 814f27155f..6455a7842d 100644 --- a/src/vbox/vbox_network.c +++ b/src/vbox/vbox_network.c @@ -22,7 +22,7 @@ #include "internal.h" #include "datatypes.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "domain_event.h" #include "virlog.h" #include "virstring.h" diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index f879e287cb..5813a5c706 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -22,7 +22,7 @@ #include "internal.h" #include "datatypes.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "domain_event.h" #include "virlog.h" #include "virstring.h" diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 88b712c8cb..0be354c519 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -41,7 +41,7 @@ #include "internal.h" #include "datatypes.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "domain_event.h" #include "viralloc.h" #include "virlog.h" diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index f116f9dd1f..a90c00e4df 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -25,7 +25,7 @@ #include <Parallels.h> #include "driver.h" -#include "conf/domain_conf.h" +#include "virdomaintypes.h" #include "conf/snapshot_conf.h" #include "conf/virdomainsnapshotobjlist.h" #include "conf/virdomainobjlist.h" diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 672117822f..21cc1fb9fb 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -23,7 +23,7 @@ #include <curl/curl.h> #include <xen/api/xen_all.h> #include "internal.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "virerror.h" #include "datatypes.h" #include "virauth.h" diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index 4791f06945..f29b0d1a17 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -22,7 +22,7 @@ #include <xen/api/xen_all.h> #include "internal.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "virerror.h" #include "datatypes.h" #include "viruuid.h" diff --git a/src/xenapi/xenapi_utils.h b/src/xenapi/xenapi_utils.h index e394197bfd..d66ef5e4e7 100644 --- a/src/xenapi/xenapi_utils.h +++ b/src/xenapi/xenapi_utils.h @@ -23,7 +23,7 @@ #include <xen/api/xen_all.h> #include "internal.h" #include "viruri.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #define NETWORK_DEVID_SIZE (12) diff --git a/src/xenconfig/xen_common.h b/src/xenconfig/xen_common.h index 231fa0d078..df736f178b 100644 --- a/src/xenconfig/xen_common.h +++ b/src/xenconfig/xen_common.h @@ -22,7 +22,7 @@ #include "internal.h" #include "virconf.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #define XEN_CONFIG_FORMAT_XL "xen-xl" #define XEN_CONFIG_FORMAT_XM "xen-xm" diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index ca094d30c2..8fcae8e5bc 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -26,7 +26,7 @@ #include "virconf.h" #include "virerror.h" #include "virlog.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "viralloc.h" #include "virstring.h" #include "virstoragefile.h" diff --git a/src/xenconfig/xen_xl.h b/src/xenconfig/xen_xl.h index 24f6470283..d424190729 100644 --- a/src/xenconfig/xen_xl.h +++ b/src/xenconfig/xen_xl.h @@ -23,7 +23,7 @@ #pragma once #include "virconf.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #include "xen_common.h" virDomainDefPtr xenParseXL(virConfPtr conn, diff --git a/src/xenconfig/xen_xm.h b/src/xenconfig/xen_xm.h index 5546b2ddf4..2d934bd331 100644 --- a/src/xenconfig/xen_xm.h +++ b/src/xenconfig/xen_xm.h @@ -24,7 +24,7 @@ #include "internal.h" #include "virconf.h" -#include "domain_conf.h" +#include "virdomaintypes.h" virConfPtr xenFormatXM(virConnectPtr conn, virDomainDefPtr def); diff --git a/tests/domainconftest.c b/tests/domainconftest.c index e7bdc99438..d9369ac823 100644 --- a/tests/domainconftest.c +++ b/tests/domainconftest.c @@ -23,7 +23,7 @@ #include "viralloc.h" #include "virlog.h" -#include "domain_conf.h" +#include "virdomaintypes.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index 42a4643338..111c083499 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -12,7 +12,7 @@ # include "datatypes.h" # include "internal.h" # include "virstring.h" -# include "conf/domain_conf.h" +# include "virdomaintypes.h" # include "qemu/qemu_domain.h" # include "testutilsqemu.h" diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h index 75ea63382d..788dd351c8 100644 --- a/tests/qemumonitortestutils.h +++ b/tests/qemumonitortestutils.h @@ -19,7 +19,7 @@ #pragma once -#include "domain_conf.h" +#include "virdomaintypes.h" #include "qemu/qemu_conf.h" #include "qemu/qemu_monitor.h" #include "qemu/qemu_agent.h" diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c index 2d88979168..cb56504cc9 100644 --- a/tests/qemusecuritytest.c +++ b/tests/qemusecuritytest.c @@ -22,7 +22,7 @@ #include "testutils.h" #include "testutilsqemu.h" #include "security/security_manager.h" -#include "conf/domain_conf.h" +#include "virdomaintypes.h" #include "qemu/qemu_domain.h" #include "qemu/qemu_security.h" diff --git a/tests/testutilslxc.c b/tests/testutilslxc.c index eed18304c4..d05a7e368d 100644 --- a/tests/testutilslxc.c +++ b/tests/testutilslxc.c @@ -4,7 +4,7 @@ # include "testutilslxc.h" # include "testutils.h" # include "viralloc.h" -# include "domain_conf.h" +# include "virdomaintypes.h" virCapsPtr testLXCCapsInit(void) diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 0632141d68..efc3ab4b94 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -20,7 +20,7 @@ # include "capabilities.h" # include "virfilecache.h" -# include "domain_conf.h" +# include "virdomaintypes.h" # include "qemu/qemu_capabilities.h" # include "qemu/qemu_conf.h" diff --git a/tests/testutilsxen.c b/tests/testutilsxen.c index 2c347a7f3f..6925e7c6d8 100644 --- a/tests/testutilsxen.c +++ b/tests/testutilsxen.c @@ -4,7 +4,7 @@ #include "testutilsxen.h" #include "testutilshostcpus.h" -#include "domain_conf.h" +#include "virdomaintypes.h" virCapsPtr testXLInitCaps(void) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 828ae30789..fb354583f9 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -36,7 +36,7 @@ #include "virbitmap.h" #include "virbuffer.h" #include "c-ctype.h" -#include "conf/domain_conf.h" +#include "conf/virdomaintypes.h" #include "viralloc.h" #include "vircommand.h" #include "virfile.h" -- 2.19.2