summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRichard Henderson2022-05-30 01:34:56 +0200
committerRichard Henderson2022-05-30 01:34:56 +0200
commitf7a1ea403e0282a7f57edd4298c4f65f24165da5 (patch)
treeff2acf016a1f27dc3e11c511b2d5bdd85f9c58bc /include
parentMerge tag 'hppa-serial-fix-pull-request' of https://github.com/hdeller/qemu-h... (diff)
parenttest/qga: use g_auto wherever sensible (diff)
downloadqemu-f7a1ea403e0282a7f57edd4298c4f65f24165da5.tar.gz
qemu-f7a1ea403e0282a7f57edd4298c4f65f24165da5.tar.xz
qemu-f7a1ea403e0282a7f57edd4298c4f65f24165da5.zip
Merge tag 'misc-pull-request' of gitlab.com:marcandre.lureau/qemu into staging
Misc cleanups Mostly qemu-ga related cleanups. # -----BEGIN PGP SIGNATURE----- # # iQJQBAABCAA6FiEEh6m9kz+HxgbSdvYt2ujhCXWWnOUFAmKT+IccHG1hcmNhbmRy # ZS5sdXJlYXVAcmVkaGF0LmNvbQAKCRDa6OEJdZac5SGgD/97YXkEQHHQNCiKwFub # c3RpunfM2ww/492fwBqRYt/QZgnl1esR3gNkMLcEtR8dtWoGja98XNcTBSGcbZGj # ydGlMZ5kfe/+7mJd5xu45egfEbWICXySstohWU6MzpddBQ1tTgq0iTsU738CsPY7 # kreQgnbYjvfPux0/xhLbYmuLZgBeLX3ser4tzaDA5ExvHjdMSkzjV6qQI5j2BZbZ # 7jCEfOJJ++Rht71A+FN98HGF9WG6LhV0e6AUnc52XhhldnnhJ3hSU6vcrrvHfYFk # 31awe1R2agWb4RMfhV2Nfn1uwsc3E+2cNPYbTvm3v/wX00Zc0gE4Z2e1/nXYU8OZ # +kjJeiVBCgt8DNfJDYnqRWnrYSyhMmc/UIysl0SKLVVOymPDotqHjkEanDNwPUsK # sgGNkZz2KsBkW9+PoIXh9nxowT5gG/v2oBQuLZQ+2iHgrfNVTKUweO8vHDv+A5lj # 2hEjx7IhUTNlclSHjggj2Uig7cfSgPVw27ephij0pi5pclsS8wLDs3XlVX+GSyW9 # P+2DWcsi7sBx1Gt6VcwWO07McS+NrqwwhR7rT0ioNhmS1TE0mt0YWhkCg5iabVFo # yzweA0urN8AF0Js5IKZdNk0/z83nr8Qu8dRmGjciaYo7abBetmIdqdzuv1mIkV2H # Sqi0mv7yPf7uYHk0U1lb2RNtJQ== # =L0lG # -----END PGP SIGNATURE----- # gpg: Signature made Sun 29 May 2022 03:49:43 PM PDT # gpg: using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5 # gpg: issuer "marcandre.lureau@redhat.com" # gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" [full] # gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>" [full] * tag 'misc-pull-request' of gitlab.com:marcandre.lureau/qemu: test/qga: use g_auto wherever sensible qga/wixl: replace QEMU_GA_MSI_MINGW_BIN_PATH with glib bindir qga/wixl: simplify some pre-processing qga/wixl: require Mingw_bin qga/wixl: prefer variables over environment test/qga: use G_TEST_DIR to locate os-release test file qga: make build_fs_mount_list() return a bool qga: replace qemu_open_old() with qga_open_cloexec() qga: throw an Error in ga_channel_open() qga: use qga_open_cloexec() for safe_open_or_create() qga: add qga_open_cloexec() helper qga: flatten safe_open_or_create() tests: make libqmp buildable for win32 util/win32: simplify qemu_get_local_state_dir() include: move qemu_*_exec_dir() to cutils Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'include')
-rw-r--r--include/qemu/cutils.h7
-rw-r--r--include/qemu/osdep.h8
2 files changed, 7 insertions, 8 deletions
diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h
index 5c6572d444..40e10e19a7 100644
--- a/include/qemu/cutils.h
+++ b/include/qemu/cutils.h
@@ -193,6 +193,13 @@ int uleb128_decode_small(const uint8_t *in, uint32_t *n);
*/
int qemu_pstrcmp0(const char **str1, const char **str2);
+/* Find program directory, and save it for later usage with
+ * qemu_get_exec_dir().
+ * Try OS specific API first, if not working, parse from argv0. */
+void qemu_init_exec_dir(const char *argv0);
+
+/* Get the saved exec dir. */
+const char *qemu_get_exec_dir(void);
/**
* get_relocated_path:
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index a72e99db85..b1c161c035 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -557,14 +557,6 @@ void qemu_set_cloexec(int fd);
*/
char *qemu_get_local_state_dir(void);
-/* Find program directory, and save it for later usage with
- * qemu_get_exec_dir().
- * Try OS specific API first, if not working, parse from argv0. */
-void qemu_init_exec_dir(const char *argv0);
-
-/* Get the saved exec dir. */
-const char *qemu_get_exec_dir(void);
-
/**
* qemu_getauxval:
* @type: the auxiliary vector key to lookup