Message ID | 20180306040154.3669-2-david@gibson.dropbear.id.au |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="UD/k7w6r"; dkim-atps=neutral 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 3zwNRC677gz9sgm for <incoming@patchwork.ozlabs.org>; Tue, 6 Mar 2018 15:03:03 +1100 (AEDT) Received: from localhost ([::1]:52757 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1et3ob-0001OD-Mh for incoming@patchwork.ozlabs.org; Mon, 05 Mar 2018 23:03:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49141) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <dgibson@ozlabs.org>) id 1et3nl-0001Nj-0h for qemu-devel@nongnu.org; Mon, 05 Mar 2018 23:02:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <dgibson@ozlabs.org>) id 1et3nk-0004N6-6e for qemu-devel@nongnu.org; Mon, 05 Mar 2018 23:02:09 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:60965) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <dgibson@ozlabs.org>) id 1et3nj-0004KS-8x; Mon, 05 Mar 2018 23:02:08 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3zwNQ069mHz9sgW; Tue, 6 Mar 2018 15:02:00 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1520308920; bh=N6izT8E1VadmMQ/UKuv2quiqRIGFm5ozSsigmTkVkXg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UD/k7w6rzNysUbD6b/fAQhH15aFxwsHYOM/mV2mzFfNCYi0VJrJYv08AubKhCSnU5 Lbr7AbEkA4led8o0srOKlvKOgi45GEaSbPSRvWxusqngTl5bA9bmIkhtcihQf9gms+ Ud6q9uqMMJDlLnGHxrpVxUuSkcpXiTG5mGArdJJU= From: David Gibson <david@gibson.dropbear.id.au> To: peter.maydell@linaro.org, groug@kaod.org Date: Tue, 6 Mar 2018 15:01:25 +1100 Message-Id: <20180306040154.3669-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180306040154.3669-1-david@gibson.dropbear.id.au> References: <20180306040154.3669-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 01/30] spapr: fix missing CPU core nodes in DT when running with TCG X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: qemu-devel@nongnu.org, David Gibson <david@gibson.dropbear.id.au>, qemu-ppc@nongnu.org, agraf@suse.de, surajjs@au1.ibm.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/30] spapr: fix missing CPU core nodes in DT when running with TCG
|
expand
|
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 83c9d66dd5..d6fd0e666e 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3810,13 +3810,7 @@ static void spapr_pic_print_info(InterruptStatsProvider *obj, int spapr_get_vcpu_id(PowerPCCPU *cpu) { - CPUState *cs = CPU(cpu); - - if (kvm_enabled()) { - return kvm_arch_vcpu_id(cs); - } else { - return cs->cpu_index; - } + return cpu->vcpu_id; } void spapr_set_vcpu_id(PowerPCCPU *cpu, int cpu_index, Error **errp)