This series continues on my previous work to refactor the driver registration process. With this patch series applied, there is no probing of secondary drivers any more. Once the hypervisor driver is chosen, the correct secondary drivers are immediately known. This enables a bunch of hacks to be removed from the ESX, HyperV and VirtualBox drivers. The final remaining problem will be to address the circular dependancy problems wrt to the secrets and storage drivers. Daniel P. Berrange (8): Remove use of secretPrivateData from secret driver Remove use of nwfilterPrivateData from nwfilter driver Remove use of storagePrivateData/networkPrivateData from vbox Remove use of nodeDevicePrivateData from nodeDev driver Remove use of interfacePrivateData from udev driver Remove all secondary driver private data fields don't disable state driver when libvirtd is not built Removing probing of secondary drivers daemon/libvirtd.c | 19 +- src/Makefile.am | 69 +------ src/bhyve/bhyve_driver.c | 14 +- src/check-driverimpls.pl | 3 +- src/conf/domain_nwfilter.c | 5 +- src/conf/domain_nwfilter.h | 6 +- src/datatypes.c | 12 -- src/datatypes.h | 6 - src/driver-hypervisor.h | 3 - src/driver-interface.h | 9 - src/driver-network.h | 11 +- src/driver-nodedev.h | 8 +- src/driver-nwfilter.h | 13 +- src/driver-secret.h | 12 +- src/driver-storage.h | 12 +- src/driver.h | 60 +++--- src/esx/esx_device_monitor.c | 74 -------- src/esx/esx_device_monitor.h | 28 --- src/esx/esx_driver.c | 25 +-- src/esx/esx_interface_driver.c | 37 +--- src/esx/esx_interface_driver.h | 4 +- src/esx/esx_network_driver.c | 37 +--- src/esx/esx_network_driver.h | 4 +- src/esx/esx_nwfilter_driver.c | 74 -------- src/esx/esx_nwfilter_driver.h | 28 --- src/esx/esx_secret_driver.c | 72 ------- src/esx/esx_secret_driver.h | 27 --- src/esx/esx_storage_driver.c | 37 +--- src/esx/esx_storage_driver.h | 4 +- src/hyperv/hyperv_device_monitor.c | 71 ------- src/hyperv/hyperv_device_monitor.h | 28 --- src/hyperv/hyperv_driver.c | 25 +-- src/hyperv/hyperv_interface_driver.c | 71 ------- src/hyperv/hyperv_interface_driver.h | 28 --- src/hyperv/hyperv_network_driver.c | 71 ------- src/hyperv/hyperv_network_driver.h | 28 --- src/hyperv/hyperv_nwfilter_driver.c | 71 ------- src/hyperv/hyperv_nwfilter_driver.h | 28 --- src/hyperv/hyperv_secret_driver.c | 71 ------- src/hyperv/hyperv_secret_driver.h | 28 --- src/hyperv/hyperv_storage_driver.c | 71 ------- src/hyperv/hyperv_storage_driver.h | 28 --- src/interface/interface_backend_netcf.c | 26 +-- src/interface/interface_backend_udev.c | 120 ++++++------ src/libvirt.c | 327 ++++++++++++++------------------ src/libvirt_daemon.syms | 15 -- src/libvirt_internal.h | 2 - src/libvirt_private.syms | 19 +- src/libxl/libxl_driver.c | 10 +- src/lxc/lxc_driver.c | 13 +- src/lxc/lxc_process.c | 8 +- src/lxc/lxc_process.h | 3 +- src/network/bridge_driver.c | 25 +-- src/node_device/node_device_driver.c | 78 +++----- src/node_device/node_device_driver.h | 6 +- src/node_device/node_device_hal.c | 106 ++++------- src/node_device/node_device_udev.c | 78 +++----- src/nwfilter/nwfilter_driver.c | 132 +++++-------- src/openvz/openvz_driver.c | 12 +- src/phyp/phyp_driver.c | 64 +------ src/qemu/qemu_command.c | 8 +- src/qemu/qemu_command.h | 1 - src/qemu/qemu_driver.c | 12 +- src/qemu/qemu_hotplug.c | 12 +- src/qemu/qemu_hotplug.h | 1 - src/qemu/qemu_process.c | 10 +- src/remote/remote_driver.c | 158 ++------------- src/secret/secret_driver.c | 215 +++++++++------------ src/storage/storage_driver.c | 25 +-- src/test/test_driver.c | 156 ++------------- src/uml/uml_conf.c | 9 +- src/uml/uml_driver.c | 10 +- src/vbox/vbox_common.c | 1 - src/vbox/vbox_driver.c | 47 ++--- src/vbox/vbox_network.c | 32 ---- src/vbox/vbox_storage.c | 30 --- src/vmware/vmware_driver.c | 12 +- src/xen/xen_driver.c | 11 +- src/xenapi/xenapi_driver.c | 10 +- tests/qemuxml2argvtest.c | 17 -- tests/virdrivermoduletest.c | 18 +- 81 files changed, 648 insertions(+), 2523 deletions(-) delete mode 100644 src/esx/esx_device_monitor.c delete mode 100644 src/esx/esx_device_monitor.h delete mode 100644 src/esx/esx_nwfilter_driver.c delete mode 100644 src/esx/esx_nwfilter_driver.h delete mode 100644 src/esx/esx_secret_driver.c delete mode 100644 src/esx/esx_secret_driver.h delete mode 100644 src/hyperv/hyperv_device_monitor.c delete mode 100644 src/hyperv/hyperv_device_monitor.h delete mode 100644 src/hyperv/hyperv_interface_driver.c delete mode 100644 src/hyperv/hyperv_interface_driver.h delete mode 100644 src/hyperv/hyperv_network_driver.c delete mode 100644 src/hyperv/hyperv_network_driver.h delete mode 100644 src/hyperv/hyperv_nwfilter_driver.c delete mode 100644 src/hyperv/hyperv_nwfilter_driver.h delete mode 100644 src/hyperv/hyperv_secret_driver.c delete mode 100644 src/hyperv/hyperv_secret_driver.h delete mode 100644 src/hyperv/hyperv_storage_driver.c delete mode 100644 src/hyperv/hyperv_storage_driver.h delete mode 100644 src/libvirt_daemon.syms -- 2.1.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list