qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Akihiko Odaki <akihiko.odaki@daynix.com>
To: qemu-devel@nongnu.org, qemu-block@nongnu.org,
	virtio-fs@redhat.com,  Yuval Shaia <yuval.shaia.ml@gmail.com>,
	 Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
	 Konstantin Kostiuk <kkostiuk@redhat.com>,
	 Michael Roth <michael.roth@amd.com>,
	Paolo Bonzini <pbonzini@redhat.com>,  Fam Zheng <fam@euphon.net>,
	"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
	 Stefan Hajnoczi <stefanha@redhat.com>,
	Gerd Hoffmann <kraxel@redhat.com>,  Stefan Weil <sw@weilnetz.de>,
	Yan Vugenfirer <yan@daynix.com>,
	 Akihiko Odaki <akihiko.odaki@daynix.com>
Subject: [PATCH v4 3/7] qga: Use qemu_get_runtime_dir()
Date: Tue, 16 Jul 2024 16:27:33 +0900	[thread overview]
Message-ID: <20240716-run-v4-3-5f7a29631168@daynix.com> (raw)
In-Reply-To: <20240716-run-v4-0-5f7a29631168@daynix.com>

qemu_get_runtime_dir() is used to construct the default state directory.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Message-Id: <20230921075425.16738-5-akihiko.odaki@daynix.com>
---
 qga/main.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/qga/main.c b/qga/main.c
index f4d5f15bb3d5..4bb6f7e27b66 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -45,12 +45,11 @@
 #define QGA_VIRTIO_PATH_DEFAULT "/dev/virtio-ports/org.qemu.guest_agent.0"
 #endif /* CONFIG_BSD */
 #define QGA_SERIAL_PATH_DEFAULT "/dev/ttyS0"
-#define QGA_STATE_RELATIVE_DIR  "run"
 #else
 #define QGA_VIRTIO_PATH_DEFAULT "\\\\.\\Global\\org.qemu.guest_agent.0"
-#define QGA_STATE_RELATIVE_DIR  "qemu-ga"
 #define QGA_SERIAL_PATH_DEFAULT "COM1"
 #endif
+#define QGA_STATE_RELATIVE_DIR  "qemu-ga"
 #ifdef CONFIG_FSFREEZE
 #define QGA_FSFREEZE_HOOK_DEFAULT CONFIG_QEMU_CONFDIR "/fsfreeze-hook"
 #endif
@@ -129,12 +128,12 @@ static void stop_agent(GAState *s, bool requested);
 static void
 init_dfl_pathnames(void)
 {
-    g_autofree char *state = qemu_get_local_state_dir();
+    g_autofree char *run = qemu_get_runtime_dir();
 
     g_assert(dfl_pathnames.state_dir == NULL);
     g_assert(dfl_pathnames.pidfile == NULL);
-    dfl_pathnames.state_dir = g_build_filename(state, QGA_STATE_RELATIVE_DIR, NULL);
-    dfl_pathnames.pidfile = g_build_filename(state, QGA_STATE_RELATIVE_DIR, "qemu-ga.pid", NULL);
+    dfl_pathnames.state_dir = g_build_filename(run, QGA_STATE_RELATIVE_DIR, NULL);
+    dfl_pathnames.pidfile = g_build_filename(run, QGA_STATE_RELATIVE_DIR, "qemu-ga.pid", NULL);
 }
 
 static void quit_handler(int sig)

-- 
2.45.2



  parent reply	other threads:[~2024-07-16  7:30 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-16  7:27 [PATCH v4 0/7] util: Introduce qemu_get_runtime_dir() Akihiko Odaki
2024-07-16  7:27 ` [PATCH v4 1/7] " Akihiko Odaki
2024-07-16  9:53   ` Daniel P. Berrangé
2024-07-16 10:52     ` Akihiko Odaki
2024-07-16 10:54       ` Daniel P. Berrangé
2024-07-16 11:27         ` Akihiko Odaki
2024-07-16  7:27 ` [PATCH v4 2/7] ivshmem-server: Use qemu_get_runtime_dir() Akihiko Odaki
2024-07-16  7:27 ` Akihiko Odaki [this message]
2024-07-16  7:27 ` [PATCH v4 4/7] scsi: " Akihiko Odaki
2024-07-16  7:27 ` [PATCH v4 5/7] module: " Akihiko Odaki
2024-07-16  7:27 ` [PATCH v4 6/7] util: Remove qemu_get_local_state_dir() Akihiko Odaki
2024-07-16  7:27 ` [PATCH v4 7/7] spice-app: Use qemu_get_runtime_dir() Akihiko Odaki
2024-07-16  8:06 ` [PATCH v4 0/7] util: Introduce qemu_get_runtime_dir() Michael Tokarev
2024-07-16  9:32   ` Akihiko Odaki
2024-07-16  9:41     ` Michael Tokarev
2024-07-16  9:56   ` Daniel P. Berrangé
2024-07-16 10:43     ` Paolo Bonzini
2024-07-16 12:45       ` Akihiko Odaki
2024-07-16 13:29         ` Paolo Bonzini
2024-07-16 13:35           ` Akihiko Odaki
2024-07-16  8:45 ` Paolo Bonzini
2025-01-11  5:15 ` Akihiko Odaki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240716-run-v4-3-5f7a29631168@daynix.com \
    --to=akihiko.odaki@daynix.com \
    --cc=dgilbert@redhat.com \
    --cc=fam@euphon.net \
    --cc=kkostiuk@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=michael.roth@amd.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=sw@weilnetz.de \
    --cc=virtio-fs@redhat.com \
    --cc=yan@daynix.com \
    --cc=yuval.shaia.ml@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).