|
|
218e99 |
From 7f69c4a541318610bef76295163cf4d7907d2339 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
218e99 |
Date: Wed, 31 Jul 2013 14:03:25 +0200
|
|
|
218e99 |
Subject: [PATCH 04/28] qga: create state directory on win32
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Laszlo Ersek <lersek@redhat.com>
|
|
|
218e99 |
Message-id: <1375279407-13573-5-git-send-email-lersek@redhat.com>
|
|
|
218e99 |
Patchwork-id: 52867
|
|
|
218e99 |
O-Subject: [RHEL-7 qemu-kvm PATCH 4/6] qga: create state directory on win32
|
|
|
218e99 |
Bugzilla: 964304
|
|
|
218e99 |
RH-Acked-by: Michal Novotny <minovotn@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
On Win32 the local state directory is application specific and users might
|
|
|
218e99 |
expect qemu-ga to create it automatically.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
218e99 |
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
218e99 |
(cherry picked from commit bf12c1fa8c78e3c667f2fe2ecc656f4f3cfb914e)
|
|
|
218e99 |
---
|
|
|
218e99 |
qga/main.c | 14 ++++++++++++++
|
|
|
218e99 |
1 files changed, 14 insertions(+), 0 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
qga/main.c | 14 ++++++++++++++
|
|
|
218e99 |
1 files changed, 14 insertions(+), 0 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/qga/main.c b/qga/main.c
|
|
|
218e99 |
index 050b968..e49a6dd 100644
|
|
|
218e99 |
--- a/qga/main.c
|
|
|
218e99 |
+++ b/qga/main.c
|
|
|
218e99 |
@@ -1042,6 +1042,20 @@ int main(int argc, char **argv)
|
|
|
218e99 |
}
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
+#ifdef _WIN32
|
|
|
218e99 |
+ /* On win32 the state directory is application specific (be it the default
|
|
|
218e99 |
+ * or a user override). We got past the command line parsing; let's create
|
|
|
218e99 |
+ * the directory (with any intermediate directories). If we run into an
|
|
|
218e99 |
+ * error later on, we won't try to clean up the directory, it is considered
|
|
|
218e99 |
+ * persistent.
|
|
|
218e99 |
+ */
|
|
|
218e99 |
+ if (g_mkdir_with_parents(state_dir, S_IRWXU) == -1) {
|
|
|
218e99 |
+ g_critical("unable to create (an ancestor of) the state directory"
|
|
|
218e99 |
+ " '%s': %s", state_dir, strerror(errno));
|
|
|
218e99 |
+ return EXIT_FAILURE;
|
|
|
218e99 |
+ }
|
|
|
218e99 |
+#endif
|
|
|
218e99 |
+
|
|
|
218e99 |
s = g_malloc0(sizeof(GAState));
|
|
|
218e99 |
s->log_level = log_level;
|
|
|
218e99 |
s->log_file = stderr;
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|