On Aug 17, 2012, at 1:18 PM, Laine Stump wrote:
On 08/17/2012 12:04 AM, Kyle Mestery wrote:
> Add the ability to support VLAN tags for Open vSwitch
> virtual port types. To accomplish this, modify
> virNetDevOpenvswitchAddPort and
> virNetDevTapCreateInBridgePort to take a virNetDevVlanPtr
> argument. When adding the port to the OVS bridge, setup
> either a single VLAN or a trunk port based on the
> configuration from the virNetDevVlanPtr.
>
> Signed-off-by: Kyle Mestery <kmestery(a)cisco.com>
> ---
> .gnulib | 2 +-
> src/lxc/lxc_process.c | 2 +-
> src/network/bridge_driver.c | 2 +-
> src/qemu/qemu_command.c | 1 +
> src/uml/uml_conf.c | 1 +
> src/util/virnetdevopenvswitch.c | 34 +++++++++++++++++++++++++++++++---
> src/util/virnetdevopenvswitch.h | 4 +++-
> src/util/virnetdevtap.c | 3 ++-
> src/util/virnetdevtap.h | 2 ++
> 9 files changed, 43 insertions(+), 8 deletions(-)
>
> diff --git a/.gnulib b/.gnulib
> index 271dd74..dbd9144 160000
> --- a/.gnulib
> +++ b/.gnulib
> @@ -1 +1 @@
> -Subproject commit 271dd74fdf54ec2a03e73a5173b0b5697f6088f1
> +Subproject commit dbd914496c99c52220e5f5ba4121d6cb55fb3beb
BTW, I meant to point out that somehow you had gotten a gnulib submodule
update added onto your patch. I removed that before I pushed it.
Actually, I noticed this too. For some reason, when I build RPMs from the libvirt
git repo, this always happens. I assume this is not to be expected, but it's unclear
to me how it's happening.
Thanks for pulling that piece out before committing!
Thanks,
Kyle