[libvirt] [PATCH v2] 802.1Qbg: use pre-associate state at beginning of incoming migration

[Daniel Veillard]

On Wed, Nov 24, 2010 at 08:39:23AM -0500, Stefan Berger wrote:
[...]
> Gerhard successfully tested the patch with a recent blade network
> 802.1Qbg-compliant switch.
[...]
> The patch should not have any side-effects on the 802.1Qbh support
> in libvirt, but Roopa (cc'ed) may want to verify this.
> 
> Signed-off-by: Stefan Berger <stefanb at us.ibm.com>
> Signed-off-by: Gerhard Stenzel <gerhard.stenzel at de.ibm.com>
> 
> ---
>  src/libvirt_macvtap.syms |    2 +
>  src/qemu/qemu_conf.c     |   12 +++++--
>  src/qemu/qemu_conf.h     |    7 +++-
>  src/qemu/qemu_driver.c   |   72
> +++++++++++++++++++++++++++++++++++++----------
>  src/util/macvtap.c       |   54 ++++++++++++++++++++++++++++++-----
>  src/util/macvtap.h       |   20 +++++++++++--
>  6 files changed, 137 insertions(+), 30 deletions(-)
> 
[...]
> @@ -238,7 +239,8 @@ int         qemudBuildCommandLine
>                                           int **vmfds,
>                                           int *nvmfds,
>                                           const char *migrateFrom,
> -                                         virDomainSnapshotObjPtr
> current_snapshot)
> +                                         virDomainSnapshotObjPtr
> current_snapshot,
> +                                         enum virVMOperationType vmop)
>      ATTRIBUTE_NONNULL(1);

  this brroke the build

qemuxml2argvtest.c: In function 'testCompareXMLToArgvFiles':
qemuxml2argvtest.c:92:31: error: too few arguments to function
'qemudBuildCommandLine'
../src/qemu/qemu_conf.h:231:5: note: declared here

I'm commiting a fix,

Daniel

-- 
Daniel Veillard      | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
daniel at veillard.com  | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library  http://libvirt.org/