exec: make -mem-path filenames deterministic
PATCH v3 1/1 exec: make -mem-path filenames deterministic
From: Peter Feiner <[email protected]>
Adds ramblocks' names to their backing files when using -mem-path. Eases introspection and debugging.
---
The commit should probably be called "exec: add ramblocks' names to -mem-path files" since the paths aren't deterministic.
v1 -> v2: Just add ramblock name to mkstemp template. v2 -> v3: Safely handle ramblocks with "/" in their names
exec.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
exec.c +12 -1
@@ -844,6 +844,8 @@ static void *file_ram_alloc(RAMBlock *block, const char *path) {char *filename; +char *sanitized_name; +char *c;void *area;int fd;#ifdef MAP_POPULATE
@@ -865,7 +867,16 @@ static void *file_ram_alloc(RAMBlock *block,return NULL ; } - filename =g_strdup_printf ("%s/qemu_back_mem.XXXXXX" , path); +/* Make name safe to use with mkstemp by replacing '/' with '_'. */ + sanitized_name =g_strdup (block->mr->name); +for (c = sanitized_name; *c !='\0' ; c++) { +if (*c =='/' ) + *c ='_' ; + } + + filename =g_strdup_printf ("%s/qemu_back_mem.%s.XXXXXX" , path, + sanitized_name); +g_free (sanitized_name); fd =mkstemp (filename);if (fd <0 ) {
Signature · 1 line
1.7.10.4
Ping.
I'm very much hoping for this to make it into 1.5.
Thanks,
Peter
Quoted 52 lines · On Mon, Mar 4, 2013 at 1:54 PM, <[email protected]> wrote:
From: Peter Feiner <[email protected]>
Adds ramblocks' names to their backing files when using -mem-path. Eases introspection and debugging.
Signed-off-by Peter Feiner <[email protected]>---
The commit should probably be called "exec: add ramblocks' names to -mem-path files" since the paths aren't deterministic.
v1 -> v2: Just add ramblock name to mkstemp template. v2 -> v3: Safely handle ramblocks with "/" in their names
exec.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)exec.c +12
-2@@ -844,6 +844,8 @@ static void *file_ram_alloc(RAMBlock *block, const char *path) {char *filename; +char *sanitized_name; +char *c;void *area;int fd;#ifdef MAP_POPULATE @@ -865,7 +867,16 @@ static void *file_ram_alloc(RAMBlock *block,return NULL ; } - filename =g_strdup_printf ("%s/qemu_back_mem.XXXXXX" , path); +/* Make name safe to use with mkstemp by replacing '/' with '_'. */ + sanitized_name =g_strdup (block->mr->name); +for (c = sanitized_name; *c !='\0' ; c++) { +if (*c =='/' ) + *c ='_' ; + } + + filename =g_strdup_printf ("%s/qemu_back_mem.%s.XXXXXX" , path, + sanitized_name); +g_free (sanitized_name); fd =mkstemp (filename);if (fd <0 ) { --1.7.10.4
Anthony Liguori
AppliedApplied. Thanks.
Regards,
Anthony Liguori