mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-25 23:25:24 +00:00
dd60bd62d3
Now that all the qemuDomainDetachPrep*() functions look nearly identical at the end, we can put one copy of that identical code in qemuDomainDetachDeviceLive() at the point after the individual prep functions have been called, and remove the duplicated code from all the prep functions. The code to locate the target "detach" device based on the "match" device remains, as do all device-type-specific validations. Unfortunately there are a few things going on at once in this patch, which makes it a bit more difficult to follow than the others; it was just impossible to do the changes in stages and still have a buildable/testable tree at each step. The other changes of note: * The individual prep functions no longer need their driver or async args, so those are removed, as are the local "ret" variables, since in all cases the functions just directly return -1 or 0. * Some of the prep functions were checking for a valid alias and/or for attempts to detach a multifunction PCI device, but not all. In fact, both checks are valid (or at least harmless) for *all* device types, so they are removed from the prep functions, and done a single time in the common function. (any attempts to *create* an alias when there isn't one has been removed, since that is doomed to failure anyway; the only way the device wouldn't have an alias is if 1) the domain was created by calling virsh qemu-attach to attach an existing qemu process to libvirt, and 2) the qemu command that started said process used "old style" arguments for creating devices that didn't have any device ids. Even if we constructed a device id for one of these devices, qemu wouldn't recognize it in the device_del command anyway, so we may as well fail earlier with "device missing alias" rather than failing later with "couldn't delete device net0".) * Only one type of device has shutdown code that must not be called until after *all* validation of the device is done (including checking for multifunction PCI and valid alias, which is done in the toplevel common code). For this reason, the Net function has been split in two, with the 2nd half (qemuDomainDetachShutdownNet()) called from the common function, right before sending the delete command to qemu. Signed-off-by: Laine Stump <laine@laine.org> ACKed-by: Peter Krempa <pkrempa@redhat.com> |
||
|---|---|---|
| .. | ||
| access | ||
| admin | ||
| bhyve | ||
| conf | ||
| cpu | ||
| cpu_map | ||
| esx | ||
| hyperv | ||
| interface | ||
| keycodemapdb@16e5b07876 | ||
| libxl | ||
| locking | ||
| logging | ||
| lxc | ||
| network | ||
| node_device | ||
| nwfilter | ||
| openvz | ||
| phyp | ||
| qemu | ||
| remote | ||
| rpc | ||
| secret | ||
| security | ||
| storage | ||
| test | ||
| util | ||
| vbox | ||
| vmware | ||
| vmx | ||
| vz | ||
| xenapi | ||
| xenconfig | ||
| admin_protocol-structs | ||
| check-aclperms.pl | ||
| check-aclrules.pl | ||
| check-driverimpls.pl | ||
| check-drivername.pl | ||
| check-symfile.pl | ||
| check-symsorting.pl | ||
| datatypes.c | ||
| datatypes.h | ||
| driver-hypervisor.h | ||
| driver-interface.h | ||
| driver-network.h | ||
| driver-nodedev.h | ||
| driver-nwfilter.h | ||
| driver-secret.h | ||
| driver-state.h | ||
| driver-storage.h | ||
| driver-stream.h | ||
| driver.c | ||
| driver.h | ||
| dtrace2systemtap.pl | ||
| internal.h | ||
| libvirt_admin_private.syms | ||
| libvirt_admin_public.syms | ||
| libvirt_atomic.syms | ||
| libvirt_driver_modules.syms | ||
| libvirt_esx.syms | ||
| libvirt_internal.h | ||
| libvirt_libssh2.syms | ||
| libvirt_libssh.syms | ||
| libvirt_linux.syms | ||
| libvirt_lxc.syms | ||
| libvirt_openvz.syms | ||
| libvirt_private.syms | ||
| libvirt_probes.d | ||
| libvirt_public.syms | ||
| libvirt_qemu_probes.d | ||
| libvirt_qemu.syms | ||
| libvirt_remote.syms | ||
| libvirt_sasl.syms | ||
| libvirt_vmware.syms | ||
| libvirt_vmx.syms | ||
| libvirt_xenconfig.syms | ||
| libvirt-admin.c | ||
| libvirt-admin.conf | ||
| libvirt-domain-snapshot.c | ||
| libvirt-domain.c | ||
| libvirt-host.c | ||
| libvirt-interface.c | ||
| libvirt-lxc.c | ||
| libvirt-lxc.pc.in | ||
| libvirt-network.c | ||
| libvirt-nodedev.c | ||
| libvirt-nwfilter.c | ||
| libvirt-qemu.c | ||
| libvirt-qemu.pc.in | ||
| libvirt-secret.c | ||
| libvirt-storage.c | ||
| libvirt-stream.c | ||
| libvirt.c | ||
| libvirt.conf | ||
| libvirt.pc.in | ||
| lock_protocol-structs | ||
| lxc_monitor_protocol-structs | ||
| lxc_protocol-structs | ||
| Makefile.am | ||
| qemu_protocol-structs | ||
| README | ||
| remote_protocol-structs | ||
| virkeepaliveprotocol-structs | ||
| virnetprotocol-structs | ||
libvirt library code README
===========================
The directory provides the bulk of the libvirt codebase. Everything
except for the libvirtd daemon and client tools. The build uses a
large number of libtool convenience libraries - one for each child
directory, and then links them together for the final libvirt.so,
although some bits get linked directly to libvirtd daemon instead.
The files directly in this directory are supporting the public API
entry points & data structures.
There are two core shared modules to be aware of:
* util/ - a collection of shared APIs that can be used by any
code. This directory is always in the include path
for all things built
* conf/ - APIs for parsing / manipulating all the official XML
files used by the public API. This directory is only
in the include path for driver implementation modules
* vmx/ - VMware VMX config handling (used by esx/ and vmware/)
Then there are the hypervisor implementations:
* bhyve - bhyve - The BSD Hypervisor
* esx/ - VMware ESX and GSX support using vSphere API over SOAP
* hyperv/ - Microsoft Hyper-V support using WinRM
* lxc/ - Linux Native Containers
* openvz/ - OpenVZ containers using cli tools
* phyp/ - IBM Power Hypervisor using CLI tools over SSH
* qemu/ - QEMU / KVM using qemu CLI/monitor
* remote/ - Generic libvirt native RPC client
* test/ - A "mock" driver for testing
* vbox/ - Virtual Box using native API
* vmware/ - VMware Workstation and Player using the vmrun tool
* xen/ - Xen using hypercalls, XenD SEXPR & XenStore
* xenapi/ - Xen using libxenserver
Finally some secondary drivers that are shared for several HVs.
Currently these are used by LXC, OpenVZ, QEMU and Xen drivers.
The ESX, Hyper-V, Power Hypervisor, Remote, Test & VirtualBox drivers all
implement the secondary drivers directly
* cpu/ - CPU feature management
* interface/ - Host network interface management
* network/ - Virtual NAT networking
* nwfilter/ - Network traffic filtering rules
* node_device/ - Host device enumeration
* secret/ - Secret management
* security/ - Mandatory access control drivers
* storage/ - Storage management drivers
Since both the hypervisor and secondary drivers can be built as
dlopen()able modules, it is *FORBIDDEN* to have build dependencies
between these directories. Drivers are only allowed to depend on
the public API, and the internal APIs in the util/ and conf/
directories