Skip to content

Commit 76e79e0

Browse files
committed
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 <[email protected]> Signed-off-by: Pavel Hrdina <[email protected]> Reviewed-by: Ján Tomko <[email protected]>
1 parent fdb92c9 commit 76e79e0

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

src/logging/log_manager.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222

2323
#include "internal.h"
2424

25-
#include "logging/log_protocol.h"
26-
2725
typedef struct _virLogManager virLogManager;
2826
typedef virLogManager *virLogManagerPtr;
2927

src/qemu/qemu_command.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
# include <linux/capability.h>
6565
#endif
6666
#include "logging/log_manager.h"
67+
#include "logging/log_protocol.h"
6768
#include "virutil.h"
6869

6970
#include <sys/stat.h>

0 commit comments

Comments
 (0)