--- Pushed as trivial. src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capspriv.h | 2 +- tests/cputest.c | 4 ++-- tests/qemucapabilitiestest.c | 2 +- tests/qemucapsprobe.c | 2 +- tests/qemucpumock.c | 4 ++-- tests/qemuxml2argvtest.c | 4 ++-- tests/testutilsqemu.c | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 60ed31e..8bd39c7 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -44,7 +44,7 @@ #include "virstring.h" #include "qemu_hostdev.h" #include "qemu_domain.h" -#define __QEMU_CAPSRIV_H_ALLOW__ +#define __QEMU_CAPSPRIV_H_ALLOW__ #include "qemu_capspriv.h" #include <fcntl.h> diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index ee29b8b..61ccd45 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -21,7 +21,7 @@ * Author: Pavel Fedin <p.fedin@samsung.com> */ -#ifndef __QEMU_CAPSRIV_H_ALLOW__ +#ifndef __QEMU_CAPSPRIV_H_ALLOW__ # error "qemu_capspriv.h may only be included by qemu_capabilities.c or test suites" #endif diff --git a/tests/cputest.c b/tests/cputest.c index 5e205c5..917b1a3 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -43,9 +43,9 @@ #if WITH_QEMU && WITH_YAJL # include "testutilsqemu.h" # include "qemumonitortestutils.h" -# define __QEMU_CAPSRIV_H_ALLOW__ +# define __QEMU_CAPSPRIV_H_ALLOW__ # include "qemu/qemu_capspriv.h" -# undef __QEMU_CAPSRIV_H_ALLOW__ +# undef __QEMU_CAPSPRIV_H_ALLOW__ #endif #define VIR_FROM_THIS VIR_FROM_CPU diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 2152e80..2918ff4 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -22,7 +22,7 @@ #include "testutils.h" #include "testutilsqemu.h" #include "qemumonitortestutils.h" -#define __QEMU_CAPSRIV_H_ALLOW__ +#define __QEMU_CAPSPRIV_H_ALLOW__ #include "qemu/qemu_capspriv.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c index fb9f3e9..561c5d7 100644 --- a/tests/qemucapsprobe.c +++ b/tests/qemucapsprobe.c @@ -24,7 +24,7 @@ #include "internal.h" #include "virthread.h" #include "qemu/qemu_capabilities.h" -#define __QEMU_CAPSRIV_H_ALLOW__ 1 +#define __QEMU_CAPSPRIV_H_ALLOW__ 1 #include "qemu/qemu_capspriv.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/qemucpumock.c b/tests/qemucpumock.c index 2c1d24d..f0a113f 100644 --- a/tests/qemucpumock.c +++ b/tests/qemucpumock.c @@ -18,9 +18,9 @@ #include "internal.h" #include "qemu/qemu_capabilities.h" -#define __QEMU_CAPSRIV_H_ALLOW__ +#define __QEMU_CAPSPRIV_H_ALLOW__ #include "qemu/qemu_capspriv.h" -#undef __QEMU_CAPSRIV_H_ALLOW__ +#undef __QEMU_CAPSPRIV_H_ALLOW__ virCPUDefPtr diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 64e14af..ec73ac7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -27,9 +27,9 @@ # include "storage/storage_driver.h" # include "virmock.h" -# define __QEMU_CAPSRIV_H_ALLOW__ +# define __QEMU_CAPSPRIV_H_ALLOW__ # include "qemu/qemu_capspriv.h" -# undef __QEMU_CAPSRIV_H_ALLOW__ +# undef __QEMU_CAPSPRIV_H_ALLOW__ # include "testutilsqemu.h" diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 026b73e..4cc482d 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -8,7 +8,7 @@ # include "cpu_conf.h" # include "qemu/qemu_driver.h" # include "qemu/qemu_domain.h" -# define __QEMU_CAPSRIV_H_ALLOW__ +# define __QEMU_CAPSPRIV_H_ALLOW__ # include "qemu/qemu_capspriv.h" # include "virstring.h" -- 2.7.4