On 06/22/2016 01:37 PM, Laine Stump wrote:
These had been declared in conf/device_conf.h, but then used in
util/virnetdev.c, meaning that we had to #include conf/device_conf.h
in virnetdev.c (which we have for a long time said shouldn't be done.
This caused a bigger problem when I tried to #include util/virnetdev.h
in a file in src/conf (which is allowed) - for some reason the
"device_conf.h: File not found" error.
The solution is to move the data types and functions used in util
sources from conf to util. Some names were adjusted during the move
("virInterface" --> "virNetDevIf", and "VIR_INTERFACE"
-->
"VIR_NETDEV_IF")
---
src/conf/device_conf.c | 31 ++++---------------------------
src/conf/device_conf.h | 44 +++-----------------------------------------
src/conf/domain_conf.c | 1 +
src/conf/interface_conf.h | 2 +-
src/conf/node_device_conf.h | 2 +-
src/libvirt_private.syms | 6 ++++--
src/util/virnetdev.c | 31 +++++++++++++++++++++++++++----
src/util/virnetdev.h | 40 ++++++++++++++++++++++++++++++++++++++--
tests/virnetdevtest.c | 14 +++++++-------
9 files changed, 86 insertions(+), 85 deletions(-)
New names seem reasonable to me -
ACK
John