include: move qemu_get_vm_name() to sysemu.h

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20220323155743.1585078-26-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/audio/audio.c b/audio/audio.c
index 1c98964eb8432b8cf83b42051bdae1e27e3c5a46..9e91a5a4f2b88c6b3c61521f267c1aaf5aec3702 100644 (file)
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -32,7 +32,7 @@
 #include "qapi/qapi-visit-audio.h"
 #include "qemu/cutils.h"
 #include "qemu/module.h"
-#include "qemu-common.h"
+#include "sysemu/sysemu.h"
 #include "sysemu/replay.h"
 #include "sysemu/runstate.h"
 #include "ui/qemu-spice.h"

diff --git a/block/iscsi.c b/block/iscsi.c
index 51f2a5eeaa80ae404930def4207596964e25fa53..d707d0b3543583eb6e917803a9bc295c3a019da6 100644 (file)
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -28,7 +28,7 @@
 #include <poll.h>
 #include <math.h>
 #include <arpa/inet.h>
-#include "qemu-common.h"
+#include "sysemu/sysemu.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
 #include "qemu/bitops.h"

diff --git a/include/qemu-common.h b/include/qemu-common.h
index fee2181af21845f3f0fb7b203120681543b9646e..1fbc20e4bcf7445908cc02943f9293e7671713eb 100644 (file)
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -24,8 +24,6 @@
 int qemu_main(int argc, char **argv, char **envp);
 #endif
 
-const char *qemu_get_vm_name(void);
-
 /* OS specific functions */
 void os_setup_early_signal_handling(void);
 int os_parse_cmd_args(int index, const char *optarg);

diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index b9421e03ffddf5980b831ab7cf9241e1b0c4a18b..10e283c170643a48bfc7323b3113a7199d233675 100644 (file)
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -13,6 +13,8 @@ extern const char *qemu_name;
 extern QemuUUID qemu_uuid;
 extern bool qemu_uuid_set;
 
+const char *qemu_get_vm_name(void);
+
 void qemu_add_exit_notifier(Notifier *notify);
 void qemu_remove_exit_notifier(Notifier *notify);
 

diff --git a/stubs/get-vm-name.c b/stubs/get-vm-name.c
index fa990136b068d0cff44da95ac11f46084b267009..0906303f73068e792fd065f90fc040d911782b5b 100644 (file)
--- a/stubs/get-vm-name.c
+++ b/stubs/get-vm-name.c
@@ -1,5 +1,5 @@
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "sysemu/sysemu.h"
 
 const char *qemu_get_vm_name(void)
 {