]> git.ipfire.org Git - thirdparty/libvirt.git/commit
Fix build in qemu_capabilities
authorRoman Bogorodskiy <bogorodskiy@gmail.com>
Thu, 18 Sep 2014 06:30:40 +0000 (10:30 +0400)
committerRoman Bogorodskiy <bogorodskiy@gmail.com>
Thu, 18 Sep 2014 09:37:12 +0000 (13:37 +0400)
commit3b3947ea3740d0713f04dcf178a08945b544ce47
treea55d2cee14433c97c64e0db91e8b107380d2f16b
parentd0d344cfdbd49e9bbdb36d79f351be5d225fe1be
Fix build in qemu_capabilities

Commit f05b6a91 added virQEMUDriverConfigPtr argument to the
virQEMUCapsFillDomainCaps function and it uses forward declaration
of virQEMUDriverConfig and virQEMUDriverConfigPtr that casues clang
build to fail:

gmake[3]: Entering directory `/usr/home/novel/code/libvirt/src'
  CC       qemu/libvirt_driver_qemu_impl_la-qemu_capabilities.lo
In file included from qemu/qemu_capabilities.c:43:
In file included from qemu/qemu_hostdev.h:27:
qemu/qemu_conf.h:63:37: error: redefinition of typedef 'virQEMUDriverConfig'
is a C11 feature [-Werror,-Wtypedef-redefinition]
typedef struct _virQEMUDriverConfig virQEMUDriverConfig;
                                    ^
qemu/qemu_capabilities.h:328:37: note: previous definition is here
typedef struct _virQEMUDriverConfig virQEMUDriverConfig;
                                    ^

Fix that by passing loader and nloader config attributes directly
instead of passing complete config.
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
src/qemu/qemu_driver.c
tests/domaincapstest.c