| Message ID | 20220920103159.1865256-9-bmeng.cn@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests/qtest: Enable running qtest on Windows | expand |
On Tue, Sep 20, 2022 at 2:58 PM Bin Meng <bmeng.cn@gmail.com> wrote: > From: Bin Meng <bin.meng@windriver.com> > > There is a difference in the mkdir() call for win32 and non-win32 > platforms, and currently is handled in the codes with #ifdefs. > > glib provides a portable g_mkdir() API and we can use it to unify > the codes without #ifdefs. > > Signed-off-by: Bin Meng <bin.meng@windriver.com> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > > Changes in v2: > - Change to use g_mkdir() > > block/vvfat.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/block/vvfat.c b/block/vvfat.c > index d6dd919683..723beef025 100644 > --- a/block/vvfat.c > +++ b/block/vvfat.c > @@ -25,6 +25,7 @@ > > #include "qemu/osdep.h" > #include <dirent.h> > +#include <glib/gstdio.h> > #include "qapi/error.h" > #include "block/block_int.h" > #include "block/qdict.h" > @@ -2726,13 +2727,9 @@ static int > handle_renames_and_mkdirs(BDRVVVFATState* s) > mapping_t* mapping; > int j, parent_path_len; > > -#ifdef __MINGW32__ > - if (mkdir(commit->path)) > + if (g_mkdir(commit->path, 0755)) { > return -5; > -#else > - if (mkdir(commit->path, 0755)) > - return -5; > -#endif > + } > > mapping = insert_mapping(s, commit->param.mkdir.cluster, > commit->param.mkdir.cluster + 1); > -- > 2.34.1 > > >
diff --git a/block/vvfat.c b/block/vvfat.c index d6dd919683..723beef025 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include <dirent.h> +#include <glib/gstdio.h> #include "qapi/error.h" #include "block/block_int.h" #include "block/qdict.h" @@ -2726,13 +2727,9 @@ static int handle_renames_and_mkdirs(BDRVVVFATState* s) mapping_t* mapping; int j, parent_path_len; -#ifdef __MINGW32__ - if (mkdir(commit->path)) + if (g_mkdir(commit->path, 0755)) { return -5; -#else - if (mkdir(commit->path, 0755)) - return -5; -#endif + } mapping = insert_mapping(s, commit->param.mkdir.cluster, commit->param.mkdir.cluster + 1);