Re: [Qemu-devel] [PULL 4/7] hostmem-file: add the 'pmem' option

[Michael S. Tsirkin]

On Fri, Aug 24, 2018 at 05:57:06PM +0100, Peter Maydell wrote:
> On 24 August 2018 at 17:53, Michael S. Tsirkin <address@hidden> wrote:
> > On Fri, Aug 24, 2018 at 04:13:18PM +0100, Peter Maydell wrote:
> >> object_get_canonical_path_component() returns a string which
> >> must be freed using g_free().
> 
> > Like the following? Junyan, could you pls try this one and confirm?
> >
> > Signed-off-by: Michael S. Tsirkin <address@hidden>
> >
> > diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c
> > index 2476dcb435..d88125b86e 100644
> > --- a/backends/hostmem-file.c
> > +++ b/backends/hostmem-file.c
> > @@ -154,11 +154,14 @@ static void file_memory_backend_set_pmem(Object *o, 
> > bool value, Error **errp)
> >  #ifndef CONFIG_LIBPMEM
> >      if (value) {
> >          Error *local_err = NULL;
> > +        char *path = object_get_canonical_path_component(o);
> > +
> >          error_setg(&local_err,
> >                     "Lack of libpmem support while setting the 'pmem=on'"
> >                     " of %s '%s'. We can't ensure data persistence.",
> >                     object_get_typename(o),
> > -                   object_get_canonical_path_component(o));
> > +                   );
> > +        g_free(path);
> >          error_propagate(errp, local_err);
> >          return;
> 
> Yep, like that (though I would put the closing ");" on
> the line with object_get_typename() and delete the trailing comma).
> 
> thanks
> -- PMM

oh i forgot to add in "path".
I didn't build with libpmem installed
Should have been (still untested):

Signed-off-by: Michael S. Tsirkin <address@hidden>


diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c
index 2476dcb435..72e7055ee7 100644
--- a/backends/hostmem-file.c
+++ b/backends/hostmem-file.c
@@ -154,11 +154,14 @@ static void file_memory_backend_set_pmem(Object *o, bool 
value, Error **errp)
 #ifndef CONFIG_LIBPMEM
     if (value) {
         Error *local_err = NULL;
+        char *path = object_get_canonical_path_component(o);
+
         error_setg(&local_err,
                    "Lack of libpmem support while setting the 'pmem=on'"
                    " of %s '%s'. We can't ensure data persistence.",
                    object_get_typename(o),
-                   object_get_canonical_path_component(o));
+                   path);
+        g_free(path);
         error_propagate(errp, local_err);
         return;
     }