]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
src/logging: no need to include log_protocol.h in log_manager.h
authorPavel Hrdina <phrdina@redhat.com>
Tue, 4 Aug 2020 09:04:04 +0000 (11:04 +0200)
committerPavel Hrdina <phrdina@redhat.com>
Tue, 4 Aug 2020 11:28:22 +0000 (13:28 +0200)
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 <jtomko@redhat.com>
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/logging/log_manager.h
src/qemu/qemu_command.c

index cca15738418ccbc10bdd081c0c9b734db25e2511..ae3ae2b4c55b349b010b3df58febab132aaf346f 100644 (file)
@@ -22,8 +22,6 @@
 
 #include "internal.h"
 
-#include "logging/log_protocol.h"
-
 typedef struct _virLogManager virLogManager;
 typedef virLogManager *virLogManagerPtr;
 
index 0655d8359d10f0ba166277d3e3d12f814a5da760..01812cd39b01b4861a8256365bc7f3b2b3661c2c 100644 (file)
@@ -64,6 +64,7 @@
 # include <linux/capability.h>
 #endif
 #include "logging/log_manager.h"
+#include "logging/log_protocol.h"
 #include "virutil.h"
 
 #include <sys/stat.h>