From nobody Sun May 5 14:51:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1491353605068870.8246694520946; Tue, 4 Apr 2017 17:53:25 -0700 (PDT) Received: from localhost ([::1]:38230 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvZCN-0000lx-G6 for importer@patchew.org; Tue, 04 Apr 2017 20:53:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvZBZ-0000Qf-9H for qemu-devel@nongnu.org; Tue, 04 Apr 2017 20:52:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cvZBW-0002FQ-84 for qemu-devel@nongnu.org; Tue, 04 Apr 2017 20:52:33 -0400 Received: from mga14.intel.com ([192.55.52.115]:54964) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cvZBV-0002Eu-E9 for qemu-devel@nongnu.org; Tue, 04 Apr 2017 20:52:30 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Apr 2017 17:52:28 -0700 Received: from orsmsx104.amr.corp.intel.com ([10.22.225.131]) by orsmga003.jf.intel.com with ESMTP; 04 Apr 2017 17:52:27 -0700 Received: from orsmsx112.amr.corp.intel.com ([169.254.3.213]) by ORSMSX104.amr.corp.intel.com ([169.254.4.196]) with mapi id 14.03.0319.002; Tue, 4 Apr 2017 17:52:26 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491353549; x=1522889549; h=from:to:cc:subject:date:message-id: content-transfer-encoding:mime-version; bh=kgv/b8PcjG+jD9STdo/3tgE2h1HExGM7up4Hkr9XL3c=; b=kMc59ED8LiU9zr2uuczi9m0KVlCc5nqXTqp5BnhhXnkKPxq83ZUwrtOZ yffbCQqZkWRw0rbKlY/PDcl4ISoRDg==; X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,276,1486454400"; d="scan'208";a="951908723" From: "Xu, Anthony" To: "'qemu-devel@nongnu.org'" Thread-Topic: [Qemu-devel][PATCH]Enable kvmvapic only when host doesn't support VAPIC capability in KVM mode Thread-Index: AdKtppHPRSzLZkavRkyJ6YDt9RTp3A== Date: Wed, 5 Apr 2017 00:52:25 +0000 Message-ID: <4712D8F4B26E034E80552F30A67BE0B1A4E842@ORSMSX112.amr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_IC x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiODNlNmU0NDQtYTBkNC00ZTEwLTg1YmEtOGQ2OTJiNjNmNGE4IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6InZVRmZjSFRaZGtZNkgwK3hDZFB4RGd3VGt5UWhUdmJ0OFhEUzNhMnZiZ0U9In0= dlp-product: dlpe-windows dlp-version: 10.0.102.7 dlp-reaction: no-action x-originating-ip: [10.22.254.140] Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 Subject: [Qemu-devel] [PATCH]Enable kvmvapic only when host doesn't support VAPIC capability in KVM mode X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 'Paolo Bonzini' , 'Stefan Hajnoczi' Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" In KVM mode, enable kvmvapic only when host doesn't support=20 VAPIC capability. Save the time to set up kvmvapic in some hosts. Signed-off -by: Anthony Xu diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index c3829e3..d5c53af 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -317,8 +317,11 @@ static void apic_common_realize(DeviceState *dev, Erro= r **errp) info =3D APIC_COMMON_GET_CLASS(s); info->realize(dev, errp); =20 - /* Note: We need at least 1M to map the VAPIC option ROM */ + /* Note: We need at least 1M to map the VAPIC option ROM, + if it is KVM, enable kvmvapic only when KVM doesn't have=20 + VAPIC capability */=20 if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK && + (!kvm_enabled() || (kvm_enabled() && !kvm_has_vapic())) && !hax_enabled() && ram_size >=3D 1024 * 1024) { vapic =3D sysbus_create_simple("kvmvapic", -1, NULL); } diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 24281fc..43e0e4c 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -215,6 +215,7 @@ extern KVMState *kvm_state; =20 bool kvm_has_free_slot(MachineState *ms); int kvm_has_sync_mmu(void); +int kvm_has_vapic(void); int kvm_has_vcpu_events(void); int kvm_has_robust_singlestep(void); int kvm_has_debugregs(void); diff --git a/kvm-all.c b/kvm-all.c index 90b8573..edcb6ea 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -2232,6 +2232,10 @@ int kvm_has_sync_mmu(void) return kvm_check_extension(kvm_state, KVM_CAP_SYNC_MMU); } =20 +int kvm_has_vapic(void){ + return !kvm_check_extension(kvm_state, KVM_CAP_VAPIC); +} + int kvm_has_vcpu_events(void) { return kvm_state->vcpu_events;