mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-29 00:55:22 +00:00
9911562a22
There are currently two places in the domain where this combination is used, and there is about to be another. This patch puts them together for brevity and uniformity. As with the newly-renamed virNetDevIPAddr and virNetDevIPRoute objects, the new virNetDevIPInfo object will need to be accessed by a utility function that calls low level Netlink functions (so we don't want it to be in the conf directory) and will be called from multiple hypervisor drivers (so it can't be in any hypervisor directory); the most appropriate place is thus once again the util directory. The parse and format functions are in conf/domain_conf.c because only the domain XML (i.e. *not* the network XML) has this exact combination of IP addresses plus routes. Note that virDomainNetIPInfoFormat() will end up being the only caller to virDomainNetRoutesFormat() and virDomainNetIPsFormat(), so it will just subsume those functions in a later patch, but we can't do that until they are no longer called. (It would have been nice to include the interface name within the virNetDevIPInfo object (with a slight name change), but that can't be done cleanly, because in each case the interface name is provided in a different place in the XML relative to the routes and IP addresses, so putting it in this object would actually make the code more confused rather than simpler). |
||
|---|---|---|
| .. | ||
| capabilities.c | ||
| capabilities.h | ||
| cpu_conf.c | ||
| cpu_conf.h | ||
| device_conf.c | ||
| device_conf.h | ||
| domain_addr.c | ||
| domain_addr.h | ||
| domain_audit.c | ||
| domain_audit.h | ||
| domain_capabilities.c | ||
| domain_capabilities.h | ||
| domain_conf.c | ||
| domain_conf.h | ||
| domain_event.c | ||
| domain_event.h | ||
| domain_nwfilter.c | ||
| domain_nwfilter.h | ||
| interface_conf.c | ||
| interface_conf.h | ||
| netdev_bandwidth_conf.c | ||
| netdev_bandwidth_conf.h | ||
| netdev_vlan_conf.c | ||
| netdev_vlan_conf.h | ||
| netdev_vport_profile_conf.c | ||
| netdev_vport_profile_conf.h | ||
| network_conf.c | ||
| network_conf.h | ||
| network_event.c | ||
| network_event.h | ||
| networkcommon_conf.c | ||
| networkcommon_conf.h | ||
| node_device_conf.c | ||
| node_device_conf.h | ||
| numa_conf.c | ||
| numa_conf.h | ||
| nwfilter_conf.c | ||
| nwfilter_conf.h | ||
| nwfilter_ipaddrmap.c | ||
| nwfilter_ipaddrmap.h | ||
| nwfilter_params.c | ||
| nwfilter_params.h | ||
| object_event_private.h | ||
| object_event.c | ||
| object_event.h | ||
| secret_conf.c | ||
| secret_conf.h | ||
| snapshot_conf.c | ||
| snapshot_conf.h | ||
| storage_conf.c | ||
| storage_conf.h | ||
| storage_event.c | ||
| storage_event.h | ||
| virchrdev.c | ||
| virchrdev.h | ||
| virdomainobjlist.c | ||
| virdomainobjlist.h | ||
| virsecretobj.c | ||
| virsecretobj.h | ||