[libvirt] [PATCH 05/10] conf: put virtPortProfile struct / functions in a common location

Daniel P. Berrange berrange at redhat.com
Fri Jul 8 12:56:30 UTC 2011


On Tue, Jul 05, 2011 at 03:45:53AM -0400, Laine Stump wrote:
> virtPortProfiles are currently only used in the domain XML, but will
> soon also be used in the network XML. To prepare for that change, this
> patch moves the structure definition into util/network.h and the parse
> and format functions into util/network.c (I decided that this was a
> better choice than macvtap.h/c for something that needed to always be
> available on all platforms).
> 
> Additionally, the virtPortProfile in the domain interface struct is
> now a separately allocated object rather *pointed to by* (rather than
> contained in) the main virDomainNetDef object. This is done to make is
> easier to figure out when a virtualPortProfile has/hasn't been
> specified in a particular config.
> ---
>  src/conf/domain_conf.c    |  208 +++------------------------------------------
>  src/conf/domain_conf.h    |    2 +-
>  src/libvirt_private.syms  |    2 +
>  src/qemu/qemu_command.c   |    4 +-
>  src/qemu/qemu_hotplug.c   |    2 +-
>  src/qemu/qemu_migration.c |    4 +-
>  src/qemu/qemu_process.c   |    2 +-
>  src/util/macvtap.c        |    6 +-
>  src/util/macvtap.h        |   36 +--------
>  src/util/network.c        |  196 ++++++++++++++++++++++++++++++++++++++++++
>  src/util/network.h        |   47 ++++++++++
>  11 files changed, 271 insertions(+), 238 deletions(-)


ACK, a little disappointing that we have to put this in src/util
instead of a common file in src/conf/, but it looks like we have
a compile time dep to macvtap forcing us to put it in util.

Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|




More information about the libvir-list mailing list