From: Pavel Hrdina Date: Tue, 4 Aug 2020 09:04:04 +0000 (+0200) Subject: src/logging: no need to include log_protocol.h in log_manager.h X-Git-Tag: v6.7.0-rc1~166 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76e79e0e77699cc3534290736288840d1e5d8ab4;p=thirdparty%2Flibvirt.git src/logging: no need to include log_protocol.h in log_manager.h The header log_manager.h doesn't use anything from log_protocol.h and the only other place than logging using log_protocol.h is qemu_command.c where we can include log_protocol.h directly to have enum value VIR_LOG_MANAGER_PROTOCOL_DOMAIN_OPEN_LOG_FILE_TRUNCATE available. Fixes race-condition compilation error with meson: In file included from ../tests/qemuhotplugmock.c:21: In file included from ../src/qemu/qemu_hotplug.h:25: In file included from ../src/qemu/qemu_domain.h:42: ../src/logging/log_manager.h:25:10: fatal error: 'logging/log_protocol.h' file not found ^~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. Reported-by: Ján Tomko Signed-off-by: Pavel Hrdina Reviewed-by: Ján Tomko --- diff --git a/src/logging/log_manager.h b/src/logging/log_manager.h index cca1573841..ae3ae2b4c5 100644 --- a/src/logging/log_manager.h +++ b/src/logging/log_manager.h @@ -22,8 +22,6 @@ #include "internal.h" -#include "logging/log_protocol.h" - typedef struct _virLogManager virLogManager; typedef virLogManager *virLogManagerPtr; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0655d8359d..01812cd39b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -64,6 +64,7 @@ # include #endif #include "logging/log_manager.h" +#include "logging/log_protocol.h" #include "virutil.h" #include