From patchwork Fri Dec 19 02:41:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 422738 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 8B1A01400A0 for ; Fri, 19 Dec 2014 13:44:49 +1100 (AEDT) Received: from localhost ([::1]:56613 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1nYc-0006ys-JG for incoming@patchwork.ozlabs.org; Thu, 18 Dec 2014 21:44:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40044) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1nVr-00022v-LZ for qemu-devel@nongnu.org; Thu, 18 Dec 2014 21:42:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y1nVn-0002Wu-2G for qemu-devel@nongnu.org; Thu, 18 Dec 2014 21:41:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54426) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1nVm-0002Wp-Ra for qemu-devel@nongnu.org; Thu, 18 Dec 2014 21:41:51 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sBJ2fhkU017595 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 18 Dec 2014 21:41:43 -0500 Received: from localhost (ovpn-113-75.phx2.redhat.com [10.3.113.75]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sBJ2fgSP003070; Thu, 18 Dec 2014 21:41:43 -0500 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 19 Dec 2014 00:41:21 -0200 Message-Id: <1418956884-24022-6-git-send-email-ehabkost@redhat.com> In-Reply-To: <1418956884-24022-1-git-send-email-ehabkost@redhat.com> References: <1418956884-24022-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Gu Zheng , Igor Mammedov , Paolo Bonzini Subject: [Qemu-devel] [PATCH 5/8] target-i386: Set APIC ID using cpu_index on CONFIG_USER 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 The PC CPU initialization code already sets apic-id based on the CPU topology, and CONFIG_USER doesn't need the topology-based APIC ID calculation code. Make CONFIG_USER set apic-id before realizing the CPU (just like PC already does), so we can simplify x86_cpu_initfn later. As there is no CPU topology configuration in CONFIG_USER, just use cpu_index as the APIC ID. Signed-off-by: Eduardo Habkost Cc: Gu Zheng --- target-i386/cpu.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index bb9525d..4b0e0a5 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2161,6 +2161,12 @@ CPUX86State *cpu_x86_init_user(const char *cpu_model) goto out; } + object_property_set_int(OBJECT(cpu), CPU(cpu)->cpu_index, "apic-id", + &error); + if (error) { + goto out; + } + object_property_set_bool(OBJECT(cpu), true, "realized", &error); out: