On 15.09.2015 23:03, John Ferlan wrote:
> Commit id 'f1f68ca33' added code to remove the directory paths for
> auto-generated sockets, but that code could be called before the
> paths were created resulting in generating error messages from
> virFileDeleteTree indicating that the file doesn't exist. So just
> add a check before attemping the directory delete for existence.
>
> Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx>
> ---
> src/qemu/qemu_process.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
> index ce2c70c..b55eb52 100644
> --- a/src/qemu/qemu_process.c
> +++ b/src/qemu/qemu_process.c
> @@ -5269,13 +5269,13 @@ void qemuProcessStop(virQEMUDriverPtr driver,
>
> ignore_value(virAsprintf(&tmppath, "%s/domain-%s",
> cfg->libDir, vm->def->name));
> - if (tmppath)
> + if (tmppath && virFileExists(tmppath))
> virFileDeleteTree(tmppath);
> VIR_FREE(tmppath);
>
> ignore_value(virAsprintf(&tmppath, "%s/domain-%s",
> cfg->channelTargetDir, vm->def->name));
> - if (tmppath)
> + if (tmppath && virFileExists(tmppath))
> virFileDeleteTree(tmppath);
> VIR_FREE(tmppath);
>
>
Okay, so this is needed so that we don't taint logs with useless error
messages. ACK to the idea. But what what about moving virFileExists into
virFileDeleteTree? The reason for that would be that I like functions
which deals with dummy arguments. In this case it would be:
virFileDeleteTree("/some/nonexistent/path");
virFileDeleteTree(NULL);
But if you dislike the idea, ACK to this patch then. There's nothing
wrong with it.
Michal
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list