Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

[mirror_qemu.git] / balloon.c

diff --git a/balloon.c b/balloon.c
index f2ef50cf77cb0d59e6902b3f77869eb5f5cfd3df..1d720fff816e209797ff6fb94037b4bbb8f1b562 100644 (file)
--- a/balloon.c
+++ b/balloon.c
@@ -29,7 +29,7 @@
 #include "exec/cpu-common.h"
 #include "sysemu/kvm.h"
 #include "sysemu/balloon.h"
-#include "trace.h"
+#include "trace-root.h"
 #include "qmp-commands.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qjson.h"