From patchwork Thu Mar 19 02:07:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tiejun Chen X-Patchwork-Id: 451707 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 042CD14010F for ; Thu, 19 Mar 2015 13:08:06 +1100 (AEDT) Received: from localhost ([::1]:36806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYPsR-0008OM-Rh for incoming@patchwork.ozlabs.org; Wed, 18 Mar 2015 22:08:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYPs9-00087a-Kp for qemu-devel@nongnu.org; Wed, 18 Mar 2015 22:07:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYPs6-0002zp-Ct for qemu-devel@nongnu.org; Wed, 18 Mar 2015 22:07:45 -0400 Received: from mga01.intel.com ([192.55.52.88]:15060) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYPs6-0002zZ-1y for qemu-devel@nongnu.org; Wed, 18 Mar 2015 22:07:42 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP; 18 Mar 2015 19:07:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,426,1422950400"; d="scan'208";a="667286520" Received: from tiejunch-mobl.ccr.corp.intel.com (HELO [10.238.128.117]) ([10.238.128.117]) by orsmga001.jf.intel.com with ESMTP; 18 Mar 2015 19:07:40 -0700 Message-ID: <550A2F6A.4060508@intel.com> Date: Thu, 19 Mar 2015 10:07:38 +0800 From: "Chen, Tiejun" User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Ian Campbell References: <1425980538-5508-1-git-send-email-tiejun.chen@intel.com> <1425980538-5508-3-git-send-email-tiejun.chen@intel.com> <1426073641.21353.192.camel@citrix.com> <55010596.2030106@intel.com> <1426163186.21353.409.camel@citrix.com> <55023FDA.7030204@intel.com> <1426241479.32572.94.camel@citrix.com> <55062CD2.8050305@intel.com> <1426508400.18247.33.camel@citrix.com> <5507DBD6.8030401@intel.com> <1426584396.18247.136.camel@citrix.com> <55092A24.8010409@intel.com> <1426674310.18247.318.camel@citrix.com> In-Reply-To: <1426674310.18247.318.camel@citrix.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.88 Cc: Ian.Jackson@eu.citrix.com, wei.liu2@citrix.com, qemu-devel@nongnu.org, stefano.stabellini@citrix.com, xen-devel@lists.xen.org Subject: Re: [Qemu-devel] [v2][PATCH 2/2] libxl: introduce gfx_passthru_kind X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org > This duplicates the code from above. I think this would be best done as: > > static int libxl__detect_gfx_passthru_kind(libxl__gc *gc, guest_config) > { > if (b_info->u.hvm.gfx_passthru_kind != LIBXL_GFX_PASSTHRU_KIND_DEFAULT) > return 0; > > if (libxl__is_igd_vga_passthru(gc, guest_config)) { > b_info->u.hvm.gfx_passthru_kind = LIBXL_GFX_PASSTHRU_KIND_IGD; > return 0; > } > > LOG(ERROR, "Unable to detect graphics passthru kind"); > return 1; > } > > Then for the code in libxl__build_device_model_args_new: > > if (libxl_defbool_val(b_info->u.hvm.gfx_passthru)) { > if (!libxl__detect_gfx_passthru_kind(gc, guest_config)) > return NULL > switch (b_info->u.hvm.gfx_passthru_kind) { > case LIBXL_GFX_PASSTHRU_KIND_IGD: > machinearg = GCSPRINTF("%s,igd-passthru=on", machinearg); > break; > default: > LOG(ERROR, "unknown gfx_passthru_kind\n"); > return NULL; > } > } > > That is, a helper to try and autodetect kind if it is default and then a > single switch entry for each kind. > >> + default: >> + LOG(WARN, "gfx_passthru_kind is invalid so ignored.\n"); > > Please return an error here, as I've shown above. Looks good and thanks, but here 'guest_config' is a const so we shouldn't/can't reset b_info->u.hvm.gfx_passthru_kind like this, b_info->u.hvm.gfx_passthru_kind = LIBXL_GFX_PASSTHRU_KIND_IGD; So I tried to refactor a little bit to follow up yours, *guest_config, @@ -427,7 +444,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, const char *keymap = dm_keymap(guest_config); char *machinearg; flexarray_t *dm_args; - int i, connection, devid; + int i, connection, devid, gfx_passthru_kind; uint64_t ram_size; const char *path, *chardev; @@ -710,9 +727,6 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, flexarray_append(dm_args, "-net"); flexarray_append(dm_args, "none"); } - if (libxl_defbool_val(b_info->u.hvm.gfx_passthru)) { - flexarray_append(dm_args, "-gfx_passthru"); - } } else { if (!sdl && !vnc) { flexarray_append(dm_args, "-nographic"); @@ -757,6 +771,20 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, machinearg, max_ram_below_4g); } } + + if (libxl_defbool_val(b_info->u.hvm.gfx_passthru)) { + gfx_passthru_kind = libxl__detect_gfx_passthru_kind(gc, + guest_config); + switch (gfx_passthru_kind) { + case LIBXL_GFX_PASSTHRU_KIND_IGD: + machinearg = GCSPRINTF("%s,igd-passthru=on", machinearg); + break; + default: + LOG(ERROR, "unknown gfx_passthru_kind\n"); + return NULL; + } + } + flexarray_append(dm_args, machinearg); for (i = 0; b_info->extra_hvm && b_info->extra_hvm[i] != NULL; i++) flexarray_append(dm_args, b_info->extra_hvm[i]); > >> diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h >> index c97c62d..8912421 100644 >> --- a/tools/libxl/libxl_internal.h >> +++ b/tools/libxl/libxl_internal.h >> @@ -3632,6 +3632,11 @@ static inline void >> libxl__update_config_vtpm(libxl__gc *gc, >> */ >> void libxl__bitmap_copy_best_effort(libxl__gc *gc, libxl_bitmap *dptr, >> const libxl_bitmap *sptr); >> + >> +#ifdef LIBXL_HAVE_GFX_PASSTHRU_KIND > > No need for this ifdef. Removed. Thanks Tiejun diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 8599a6a..605b17c 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -409,6 +409,23 @@ static char *dm_spice_options(libxl__gc *gc, return opt; } +static int +libxl__detect_gfx_passthru_kind(libxl__gc *gc, + const libxl_domain_config *guest_config) +{ + const libxl_domain_build_info *b_info = &guest_config->b_info; + + if (b_info->u.hvm.gfx_passthru_kind != LIBXL_GFX_PASSTHRU_KIND_DEFAULT) + return b_info->u.hvm.gfx_passthru_kind; + + if (libxl__is_igd_vga_passthru(gc, guest_config)) { + return LIBXL_GFX_PASSTHRU_KIND_IGD; + } + + LOG(ERROR, "Unable to detect graphics passthru kind"); + return -1; +} + static char ** libxl__build_device_model_args_new(libxl__gc *gc, const char *dm, int guest_domid, const libxl_domain_config