Re: [Xen-devel] [PATCH] libxl: properly set default of discard_enable

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Tue, 2014-06-17 at 10:44 +0200, Olaf Hering wrote:
> Initialze discard_enable properly. This avoids a crash if a
> libxl_device_disk with an uninitialized discard_enable is passed to
> device_disk_add. Up to now only xl initialized discard_enable in its
> config parser. External users of libxl, such as libvirt, do not need to
> provide a default value.
> 
> Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>

Acked + applied. thanks for the quick turnaround.

> ---
>  tools/libxl/libxl.c       | 2 ++
>  tools/libxl/libxlu_disk.c | 1 -
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
> index b115df8..5d2c1cb 100644
> --- a/tools/libxl/libxl.c
> +++ b/tools/libxl/libxl.c
> @@ -2292,6 +2292,8 @@ int libxl__device_disk_setdefault(libxl__gc *gc, 
> libxl_device_disk *disk)
>  {
>      int rc;
>  
> +    libxl_defbool_setdefault(&disk->discard_enable, !!disk->readwrite);
> +
>      rc = libxl__resolve_domid(gc, disk->backend_domname, 
> &disk->backend_domid);
>      if (rc < 0) return rc;
>  
> diff --git a/tools/libxl/libxlu_disk.c b/tools/libxl/libxlu_disk.c
> index 752a2c7..18fe386 100644
> --- a/tools/libxl/libxlu_disk.c
> +++ b/tools/libxl/libxlu_disk.c
> @@ -79,7 +79,6 @@ int xlu_disk_parse(XLU_Config *cfg,
>          if (!disk->pdev_path || !strcmp(disk->pdev_path, ""))
>              disk->format = LIBXL_DISK_FORMAT_EMPTY;
>      }
> -    libxl_defbool_setdefault(&disk->discard_enable, !!disk->readwrite);
>  
>      if (!disk->vdev) {
>          xlu__disk_err(&dpc,0, "no vdev specified");



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel