From patchwork Wed Feb 25 19:58:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 443629 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 21EFF140082 for ; Thu, 26 Feb 2015 06:59:38 +1100 (AEDT) Received: from localhost ([::1]:56135 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQi7M-0002RD-E9 for incoming@patchwork.ozlabs.org; Wed, 25 Feb 2015 14:59:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46795) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQi6i-000142-LT for qemu-devel@nongnu.org; Wed, 25 Feb 2015 14:58:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YQi6h-0000GW-Qv for qemu-devel@nongnu.org; Wed, 25 Feb 2015 14:58:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50633) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQi6h-0000GR-KM for qemu-devel@nongnu.org; Wed, 25 Feb 2015 14:58:55 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t1PJwrOT020174 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 25 Feb 2015 14:58:53 -0500 Received: from localhost (ovpn-113-62.phx2.redhat.com [10.3.113.62]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t1PJwqTR022892; Wed, 25 Feb 2015 14:58:53 -0500 From: Eduardo Habkost To: Peter Maydell Date: Wed, 25 Feb 2015 16:58:24 -0300 Message-Id: <1424894306-26740-10-git-send-email-ehabkost@redhat.com> In-Reply-To: <1424894306-26740-1-git-send-email-ehabkost@redhat.com> References: <1424894306-26740-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 09/11] 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. Reviewed-by: Paolo Bonzini Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index e8cd7b3..3e0c39c 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2145,6 +2145,12 @@ CPUX86State *cpu_x86_init_user(const char *cpu_model) goto error; } + object_property_set_int(OBJECT(cpu), CPU(cpu)->cpu_index, "apic-id", + &error); + if (error) { + goto error; + } + object_property_set_bool(OBJECT(cpu), true, "realized", &error); if (error) { goto error;