Re: [Xen-devel] [PATCH v5 1/5] libxl: make libxl__need_xenpv_qemu() operate on domain config

[Wei Liu <wei.liu2@xxxxxxxxxx>]

On Wed, Mar 30, 2016 at 02:05:54PM +0200, Juergen Gross wrote:
> libxl__need_xenpv_qemu() is called with configuration data for console,
> vfbs, disks and channels today in order to evaluate the need for
> starting a device model for a pv domain.
> 
> The console data is local to the caller and setup in a way to never
> require a device model. All other data is taken from the domain config
> structure.
> 
> In order to support other device backends via qemu change the interface
> of libxl__need_xenpv_qemu() to take the domain config structure as
> input instead of the single device arrays.
> 
> Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
> ---
> V4: Return (negative) error value in case of failure, 0 or 1 else
> 

I think this is a backport candidate -- can you please split it out
from the rest of changes?

Other than that, the code looks good.

> V2: Return false if libxl__get_domid() fails as requested by George Dunlap
> ---
>  tools/libxl/libxl_create.c   | 12 +++------
>  tools/libxl/libxl_dm.c       | 60 
> +++++++++++++-------------------------------
>  tools/libxl/libxl_internal.h |  5 +---
>  3 files changed, 23 insertions(+), 54 deletions(-)
> 
> diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
> index 61b5c01..0681103 100644
> --- a/tools/libxl/libxl_create.c
> +++ b/tools/libxl/libxl_create.c
> @@ -1304,7 +1304,6 @@ static void domcreate_launch_dm(libxl__egc *egc, 
> libxl__multidev *multidev,
>      }
>      case LIBXL_DOMAIN_TYPE_PV:
>      {
> -        int need_qemu = 0;
>          libxl__device_console console;
>          libxl__device device;
>  
> @@ -1314,17 +1313,14 @@ static void domcreate_launch_dm(libxl__egc *egc, 
> libxl__multidev *multidev,
>          }
>  
>          init_console_info(gc, &console, 0);
> -
> -        need_qemu = libxl__need_xenpv_qemu(gc, 1, &console,
> -                d_config->num_vfbs, d_config->vfbs,
> -                d_config->num_disks, &d_config->disks[0],
> -                d_config->num_channels, &d_config->channels[0]);
> -
>          console.backend_domid = state->console_domid;
>          libxl__device_console_add(gc, domid, &console, state, &device);
>          libxl__device_console_dispose(&console);
>  
> -        if (need_qemu) {
> +        ret = libxl__need_xenpv_qemu(gc, d_config);
> +        if (ret < 0)
> +            goto error_out;
> +        if (ret) {
>              dcs->dmss.dm.guest_domid = domid;
>              libxl__spawn_local_dm(egc, &dcs->dmss.dm);
>              return;
> diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
> index cfda24c..0d88c37 100644
> --- a/tools/libxl/libxl_dm.c
> +++ b/tools/libxl/libxl_dm.c
> @@ -2113,61 +2113,37 @@ int libxl__destroy_device_model(libxl__gc *gc, 
> uint32_t domid)
>                  GCSPRINTF("/local/domain/%d/image/device-model-pid", domid));
>  }
>  
> -int libxl__need_xenpv_qemu(libxl__gc *gc,
> -        int nr_consoles, libxl__device_console *consoles,
> -        int nr_vfbs, libxl_device_vfb *vfbs,
> -        int nr_disks, libxl_device_disk *disks,
> -        int nr_channels, libxl_device_channel *channels)

Maybe add a comment here about return values?

> +int libxl__need_xenpv_qemu(libxl__gc *gc, libxl_domain_config *d_config)
>  {

Wei.

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