From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Yonggang Luo <luoyonggang@gmail.com>, qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>, "Ed Maste" <emaste@freebsd.org>,
qemu-block@nongnu.org, "Stefan Weil" <sw@weilnetz.de>,
"Xie Changlong" <xiechanglong.d@gmail.com>,
"Peter Lieven" <pl@kamp.de>,
"Michael Roth" <mdroth@linux.vnet.ibm.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Wen Congyang" <wencongyang2@huawei.com>,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Max Reitz" <mreitz@redhat.com>, "Li-Wen Hsu" <lwhsu@freebsd.org>
Subject: Re: [PATCH v8 08/27] tests: Fixes test-replication.c on msys2/mingw.
Date: Sun, 13 Sep 2020 17:37:32 +0200 [thread overview]
Message-ID: <505f8221-1da9-b09f-625a-e60f82e2cfa7@redhat.com> (raw)
In-Reply-To: <20200912224431.1428-9-luoyonggang@gmail.com>
On 9/13/20 12:44 AM, Yonggang Luo wrote:
> On Windows there is no path like /tmp/s_local_disk.XXXXXX
> Use g_get_tmp_dir instead of /tmp.
>
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> tests/test-replication.c | 18 ++++++++++++++----
> 1 file changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/tests/test-replication.c b/tests/test-replication.c
> index 9ab3666a90..e7cbd6b144 100644
> --- a/tests/test-replication.c
> +++ b/tests/test-replication.c
> @@ -23,14 +23,14 @@
>
> /* primary */
> #define P_ID "primary-id"
> -static char p_local_disk[] = "/tmp/p_local_disk.XXXXXX";
> +static char *p_local_disk;
>
> /* secondary */
> #define S_ID "secondary-id"
> #define S_LOCAL_DISK_ID "secondary-local-disk-id"
> -static char s_local_disk[] = "/tmp/s_local_disk.XXXXXX";
> -static char s_active_disk[] = "/tmp/s_active_disk.XXXXXX";
> -static char s_hidden_disk[] = "/tmp/s_hidden_disk.XXXXXX";
> +static char *s_local_disk;
> +static char *s_active_disk;
> +static char *s_hidden_disk;
>
> /* FIXME: steal from blockdev.c */
> QemuOptsList qemu_drive_opts = {
> @@ -571,6 +571,11 @@ static void setup_sigabrt_handler(void)
> int main(int argc, char **argv)
> {
> int ret;
> + const char *tmpdir = g_get_tmp_dir();
> + p_local_disk = g_strdup_printf("%s/p_local_disk.XXXXXX", tmpdir);
> + s_local_disk = g_strdup_printf("%s/s_local_disk.XXXXXX", tmpdir);
> + s_active_disk = g_strdup_printf("%s/s_active_disk.XXXXXX", tmpdir);
> + s_hidden_disk = g_strdup_printf("%s/s_hidden_disk.XXXXXX", tmpdir);
> qemu_init_main_loop(&error_fatal);
> bdrv_init();
>
> @@ -605,5 +610,10 @@ int main(int argc, char **argv)
>
> cleanup_imgs();
>
> + g_free(p_local_disk);
> + g_free(s_local_disk);
> + g_free(s_active_disk);
> + g_free(s_hidden_disk);
> +
> return ret;
> }
>
next prev parent reply other threads:[~2020-09-13 15:38 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-12 22:44 [PATCH v8 00/27] W32, W64 msys2/mingw patches Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 01/27] rcu: Implement drain_call_rcu Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 02/27] block: Fixes nfs compiling error on msys2/mingw Yonggang Luo
2020-09-13 15:47 ` Philippe Mathieu-Daudé
2020-09-13 16:00 ` 罗勇刚(Yonggang Luo)
2020-09-13 18:58 ` Philippe Mathieu-Daudé
2020-09-14 10:26 ` 罗勇刚(Yonggang Luo)
2020-09-12 22:44 ` [PATCH v8 03/27] ci: fixes msys2 build by upgrading capstone to 4.0.2 Yonggang Luo
2020-09-14 7:10 ` Thomas Huth
2020-09-14 7:15 ` 罗勇刚(Yonggang Luo)
2020-09-12 22:44 ` [PATCH v8 04/27] configure: Fixes ncursesw detection under msys2/mingw and enable curses Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 05/27] win32: Simplify gmtime_r detection direct base on _POSIX_THREAD_SAFE_FUNCTIONS Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 06/27] curses: Fixes curses compiling errors Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 07/27] tests: disable /char/stdio/* tests in test-char.c on win32 Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 08/27] tests: Fixes test-replication.c on msys2/mingw Yonggang Luo
2020-09-13 15:37 ` Philippe Mathieu-Daudé [this message]
2020-09-12 22:44 ` [PATCH v8 09/27] tests: test-replication disable /replication/secondary/* " Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 10/27] osdep: file locking functions are not available on Win32 Yonggang Luo
2020-09-13 15:36 ` Philippe Mathieu-Daudé
2020-09-12 22:44 ` [PATCH v8 11/27] meson: Use -b to ignore CR vs. CR-LF issues on Windows Yonggang Luo
2020-09-13 15:35 ` Philippe Mathieu-Daudé
2020-09-13 16:01 ` 罗勇刚(Yonggang Luo)
2020-09-13 18:49 ` Philippe Mathieu-Daudé
2020-09-14 14:41 ` Peter Maydell
2020-09-14 15:20 ` 罗勇刚(Yonggang Luo)
2020-09-14 14:01 ` Eric Blake
2020-09-12 22:44 ` [PATCH v8 12/27] gcrypt: test_tls_psk_init should write binary file instead text file Yonggang Luo
2020-09-13 15:31 ` Philippe Mathieu-Daudé
2020-09-12 22:44 ` [PATCH v8 13/27] tests: Enable crypto tests under msys2/mingw Yonggang Luo
2020-09-14 7:23 ` Thomas Huth
2020-09-14 8:19 ` 罗勇刚(Yonggang Luo)
2020-09-14 11:07 ` Thomas Huth
2020-09-14 15:58 ` 罗勇刚(Yonggang Luo)
2020-09-14 16:13 ` Daniel P. Berrangé
2020-09-14 18:31 ` 罗勇刚(Yonggang Luo)
2020-09-12 22:44 ` [PATCH v8 14/27] meson: remove empty else and duplicated gio deps Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 15/27] vmstate: Fixes test-vmstate.c on msys2/mingw Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 16/27] cirrus: Building freebsd in a single short Yonggang Luo
2020-09-14 7:27 ` Thomas Huth
2020-09-14 8:50 ` Philippe Mathieu-Daudé
2020-09-14 10:43 ` Thomas Huth
2020-09-12 22:44 ` [PATCH v8 17/27] tests: Convert g_free to g_autofree macro in test-logging.c Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 18/27] tests: Fixes test-io-channel-socket.c tests under msys2/mingw Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 19/27] tests: fixes aio-win32 about aio_remove_fd_handler, get it consistence with aio-posix.c Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 20/27] tests: Fixes test-io-channel-file by mask only owner file state mask bits Yonggang Luo
2020-09-13 15:28 ` Philippe Mathieu-Daudé
2020-09-12 22:44 ` [PATCH v8 21/27] tests: fix test-util-sockets.c Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 22/27] tests: Fixes test-qdev-global-props.c Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 23/27] rcu: fixes test-logging.c by call drain_call_rcu before rmdir_full Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 24/27] ci: Enable msys2 ci in cirrus Yonggang Luo
2020-09-14 7:38 ` Thomas Huth
2020-09-14 8:25 ` Stefan Weil
2020-09-12 22:44 ` [PATCH v8 25/27] meson: upgrade meson for execute custom ninjatool under msys2 properly Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 26/27] meson: remove --ninja option in configure Yonggang Luo
2020-09-12 22:44 ` [PATCH v8 27/27] Revert "configure: add --ninja option" Yonggang Luo
2020-09-13 14:08 ` Paolo Bonzini
2020-09-13 16:03 ` 罗勇刚(Yonggang Luo)
2020-09-13 16:12 ` Paolo Bonzini
2020-09-13 16:16 ` 罗勇刚(Yonggang Luo)
2020-09-13 16:14 ` 罗勇刚(Yonggang Luo)
2020-09-14 8:45 ` Paolo Bonzini
2020-09-14 8:48 ` 罗勇刚(Yonggang Luo)
2020-09-15 11:44 ` Thomas Huth
2020-09-15 11:56 ` 罗勇刚(Yonggang Luo)
2020-09-12 23:06 ` [PATCH v8 00/27] W32, W64 msys2/mingw patches no-reply
2020-09-14 7:00 ` 罗勇刚(Yonggang Luo)
2020-09-14 6:10 ` Thomas Huth
2020-09-14 6:27 ` 罗勇刚(Yonggang Luo)
2020-09-14 6:37 ` Stefan Weil
2020-09-14 6:54 ` 罗勇刚(Yonggang Luo)
2020-09-14 6:49 ` Philippe Mathieu-Daudé
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=505f8221-1da9-b09f-625a-e60f82e2cfa7@redhat.com \
--to=philmd@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=emaste@freebsd.org \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=luoyonggang@gmail.com \
--cc=lwhsu@freebsd.org \
--cc=mdroth@linux.vnet.ibm.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=pl@kamp.de \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=sw@weilnetz.de \
--cc=wencongyang2@huawei.com \
--cc=xiechanglong.d@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).