From patchwork Fri Oct 11 16:55:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11185961 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 353BF17EE for ; Fri, 11 Oct 2019 16:57:26 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0D8A821835 for ; Fri, 11 Oct 2019 16:57:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="b0hB9iIO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D8A821835 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iIyCx-0006EE-3x; Fri, 11 Oct 2019 16:56:03 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iIyCv-0006E8-40 for xen-devel@lists.xenproject.org; Fri, 11 Oct 2019 16:56:01 +0000 X-Inumbo-ID: fdd561ec-ec47-11e9-933c-12813bfff9fa Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id fdd561ec-ec47-11e9-933c-12813bfff9fa; Fri, 11 Oct 2019 16:55:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1570812956; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=i8ohvpRF2Yfo5MDNhiEHdlcrwfkQEqJLbJBL1iBAdJY=; b=b0hB9iIOD1+cJ7/DRPm/albt/PMhWIL0ZYjvbTFN/XfM2FzJHsYr0vSO BKxumqzMKRpfS/xJscUEB4S/EuiIJFpBiv/RijNvodVHS3oE8x0F74i2T btfEpcv+S2R179p9ttRKVcE8BGURL4gVt5E/mvi3u1B3kiZvSaQJ0ysTb I=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=ian.jackson@eu.citrix.com; spf=Pass smtp.mailfrom=Ian.Jackson@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa5.hc3370-68.iphmx.com: no sender authenticity information available from domain of ian.jackson@eu.citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="ian.jackson@eu.citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa5.hc3370-68.iphmx.com: domain of Ian.Jackson@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="Ian.Jackson@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa5.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: gcaFv8Ts9o5eB1vrH/rSvA9YNFXkbKEtilAI6+72CHpbETEVDYpY+U9Sk5Uuf8FkdO43A4TN4W KLp+r0X1SA+Icjw9jimDZpz82M6JXyN9wBb18fgwUWNz5FEoe86lAXsbl7p66+hXDwi8iJ4dJU FnVZkAky8Vw/0foifdylSYpPKd7HBhOOlJzjitxiVz7gPnfQm85ePJqa1asBLiZ3OYd8vCRldA gL+AhDxRB39zidrF4pS8YEf2+BcTHr/WjuXp67B4ak4SMxT60rCfiCUyb+2RVe3yaSCk66jZRX NiY= X-SBRS: 2.7 X-MesageID: 7051221 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.67,284,1566878400"; d="scan'208";a="7051221" From: Ian Jackson To: Date: Fri, 11 Oct 2019 17:55:46 +0100 Message-ID: <20191011165549.21639-4-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191011165549.21639-1-ian.jackson@eu.citrix.com> References: <20191011165549.21639-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [XEN PATCH for-4.13 v3 07/10] libxl: create: setdefault: Make libxl_physinfo info[1] X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Paul Durrant , Ian Jackson , Jan Beulich , Andrew Cooper Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" No functional change. This will let us make it into a pointer without textual change other than to the definition. While we are here, fix some style errors (missing { }). Signed-off-by: Ian Jackson Acked-by: Wei Liu --- v2: New patch in this version of the series. --- tools/libxl/libxl_create.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index b394312d98..9c56a914ca 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -30,10 +30,10 @@ int libxl__domain_create_info_setdefault(libxl__gc *gc, libxl_domain_create_info *c_info) { - libxl_physinfo info; + libxl_physinfo info[1]; int rc; - rc = libxl_get_physinfo(CTX, &info); + rc = libxl_get_physinfo(CTX, info); if (rc) return rc; @@ -45,11 +45,11 @@ int libxl__domain_create_info_setdefault(libxl__gc *gc, libxl__arch_domain_create_info_setdefault(gc, c_info); if (c_info->type != LIBXL_DOMAIN_TYPE_PV) { - if (info.cap_hap) + if (info->cap_hap) { libxl_defbool_setdefault(&c_info->hap, true); - else if (info.cap_shadow) + } else if (info->cap_shadow) { libxl_defbool_setdefault(&c_info->hap, false); - else { + } else { LOG(ERROR, "neither hap nor shadow paging available"); return ERROR_INVAL; } @@ -63,12 +63,12 @@ int libxl__domain_create_info_setdefault(libxl__gc *gc, if (!c_info->ssidref) c_info->ssidref = SECINITSID_DOMU; - if (info.cap_hvm_directio && + if (info->cap_hvm_directio && (c_info->passthrough == LIBXL_PASSTHROUGH_UNKNOWN)) { c_info->passthrough = ((c_info->type == LIBXL_DOMAIN_TYPE_PV) || - !info.cap_iommu_hap_pt_share) ? + !info->cap_iommu_hap_pt_share) ? LIBXL_PASSTHROUGH_SYNC_PT : LIBXL_PASSTHROUGH_SHARE_PT; - } else if (!info.cap_hvm_directio) { + } else if (!info->cap_hvm_directio) { c_info->passthrough = LIBXL_PASSTHROUGH_DISABLED; }