From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: Re: [PATCH] xenstore: use relative path for device-model node Date: Fri, 13 Mar 2015 11:04:45 +0000 Message-ID: References: <1426242875-24446-1-git-send-email-wei.liu2@citrix.com> <1426243119-24591-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1426243119-24591-1-git-send-email-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Wei Liu Cc: anthony.perard@citrix.com, stefano.stabellini@eu.citrix.com, ian.jackson@eu.citrix.com, ian.campbell@citrix.com, xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org Sounds good to me. It should have been written like this since the beginning. Acked-by: Stefano Stabellini On Fri, 13 Mar 2015, Wei Liu wrote: > Signed-off-by: Wei Liu > --- > xenstore.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/xenstore.c b/xenstore.c > index b0d6f77..09319c7 100644 > --- a/xenstore.c > +++ b/xenstore.c > @@ -711,7 +711,7 @@ void xenstore_parse_domain_config(int hvm_domid) > > > /* Set a watch for log-dirty commands from the migration tools */ > - if (pasprintf(&buf, "/local/domain/0/device-model/%u/logdirty/cmd", > + if (pasprintf(&buf, "device-model/%u/logdirty/cmd", > domid) != -1) { > xs_watch(xsh, buf, "logdirty"); > fprintf(logfile, "Watching %s\n", buf); > @@ -719,7 +719,7 @@ void xenstore_parse_domain_config(int hvm_domid) > > /* Set a watch for suspend requests from the migration tools */ > if (pasprintf(&buf, > - "/local/domain/0/device-model/%u/command", domid) != -1) { > + "device-model/%u/command", domid) != -1) { > xs_watch(xsh, buf, "dm-command"); > fprintf(logfile, "Watching %s\n", buf); > } > @@ -777,7 +777,7 @@ int xenstore_parse_disable_pf_config () > int disable_pf = 0; > unsigned int len; > > - if (pasprintf(&buf, "/local/domain/0/device-model/%u/disable_pf",domid) == -1) > + if (pasprintf(&buf, "device-model/%u/disable_pf",domid) == -1) > goto out; > > params = xs_read(xsh, XBT_NULL, buf, &len); > @@ -808,13 +808,13 @@ static void xenstore_process_logdirty_event(void) > > /* Remember the paths for the command and response entries */ > if (pasprintf(&ret_path, > - "/local/domain/0/device-model/%u/logdirty/ret", > + "device-model/%u/logdirty/ret", > domid) == -1) { > fprintf(logfile, "Log-dirty: out of memory\n"); > exit(1); > } > if (pasprintf(&cmd_path, > - "/local/domain/0/device-model/%u/logdirty/cmd", > + "device-model/%u/logdirty/cmd", > domid) == -1) { > fprintf(logfile, "Log-dirty: out of memory\n"); > exit(1); > @@ -855,7 +855,7 @@ static void xenstore_process_dm_command_event(void) > unsigned int len; > > if (pasprintf(&path, > - "/local/domain/0/device-model/%u/command", domid) == -1) { > + "device-model/%u/command", domid) == -1) { > fprintf(logfile, "out of memory reading dm command\n"); > goto out; > } > @@ -875,7 +875,7 @@ static void xenstore_process_dm_command_event(void) > } else if (!strncmp(command, "usb-add", len)) { > fprintf(logfile, "dm-command: usb-add a usb device\n"); > if (pasprintf(&path, > - "/local/domain/0/device-model/%u/parameter", domid) == -1) { > + "device-model/%u/parameter", domid) == -1) { > fprintf(logfile, "out of memory reading dm command parameter\n"); > goto out; > } > @@ -889,7 +889,7 @@ static void xenstore_process_dm_command_event(void) > } else if (!strncmp(command, "usb-del", len)) { > fprintf(logfile, "dm-command: usb-del a usb device\n"); > if (pasprintf(&path, > - "/local/domain/0/device-model/%u/parameter", domid) == -1) { > + "device-model/%u/parameter", domid) == -1) { > fprintf(logfile, "out of memory reading dm command parameter\n"); > goto out; > } > @@ -905,7 +905,7 @@ static void xenstore_process_dm_command_event(void) > fprintf(logfile, "dm-command: hot remove pass-through pci dev \n"); > > if (pasprintf(&path, > - "/local/domain/0/device-model/%u/parameter", domid) == -1) { > + "device-model/%u/parameter", domid) == -1) { > fprintf(logfile, "out of memory reading dm command parameter\n"); > goto out; > } > @@ -919,7 +919,7 @@ static void xenstore_process_dm_command_event(void) > fprintf(logfile, "dm-command: hot insert pass-through pci dev \n"); > > if (pasprintf(&path, > - "/local/domain/0/device-model/%u/parameter", domid) == -1) { > + "device-model/%u/parameter", domid) == -1) { > fprintf(logfile, "out of memory reading dm command parameter\n"); > goto out; > } > @@ -944,7 +944,7 @@ void xenstore_record_dm(const char *subpath, const char *state) > char *path = NULL; > > if (pasprintf(&path, > - "/local/domain/0/device-model/%u/%s", domid, subpath) == -1) { > + "device-model/%u/%s", domid, subpath) == -1) { > fprintf(logfile, "out of memory recording dm \n"); > goto out; > } > @@ -1521,7 +1521,7 @@ char *xenstore_device_model_read(int domid, const char *key, unsigned int *len) > { > char *path = NULL, *value = NULL; > > - if (pasprintf(&path, "/local/domain/0/device-model/%d/%s", domid, key) == -1) > + if (pasprintf(&path, "device-model/%d/%s", domid, key) == -1) > return NULL; > > value = xs_read(xsh, XBT_NULL, path, len); > -- > 1.9.1 >