X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=os-win32.c;h=ae9857448f671e3ea353365f7c033079ace46a1e;hb=aba0fb1e2e8a6b5c76c07a1d24c587d77154491d;hp=50b7f6f8859a70ef159c62a483f3dc59eec43c37;hpb=0727b867542eea7fedfd2c53568e9782627fd3bd;p=mirror_qemu.git diff --git a/os-win32.c b/os-win32.c index 50b7f6f885..ae9857448f 100644 --- a/os-win32.c +++ b/os-win32.c @@ -22,15 +22,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include #include -#include -#include -#include -#include -#include -#include -#include "config-host.h" #include "sysemu/sysemu.h" #include "qemu-options.h" @@ -84,26 +78,9 @@ void os_setup_early_signal_handling(void) } /* Look for support files in the same directory as the executable. */ -char *os_find_datadir(const char *argv0) +char *os_find_datadir(void) { - char *p; - char buf[MAX_PATH]; - DWORD len; - - len = GetModuleFileName(NULL, buf, sizeof(buf) - 1); - if (len == 0) { - return NULL; - } - - buf[len] = 0; - p = buf + len - 1; - while (p != buf && *p != '\\') - p--; - *p = 0; - if (access(buf, R_OK) == 0) { - return g_strdup(buf); - } - return NULL; + return qemu_get_exec_dir(); } void os_set_line_buffering(void) @@ -121,11 +98,6 @@ void os_parse_cmd_args(int index, const char *optarg) return; } -void os_pidfile_error(void) -{ - fprintf(stderr, "Could not acquire pid file: %s\n", strerror(errno)); -} - int qemu_create_pidfile(const char *filename) { char buffer[128];