From patchwork Thu Jul 21 01:27:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 105943 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 38B56B6F81 for ; Thu, 21 Jul 2011 16:02:53 +1000 (EST) Received: from localhost ([::1]:42336 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qji3u-0002eI-BI for incoming@patchwork.ozlabs.org; Wed, 20 Jul 2011 21:28:26 -0400 Received: from eggs.gnu.org ([140.186.70.92]:52202) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qji3J-0002Ck-BV for qemu-devel@nongnu.org; Wed, 20 Jul 2011 21:27:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qji3B-0003sJ-Eo for qemu-devel@nongnu.org; Wed, 20 Jul 2011 21:27:48 -0400 Received: from cantor2.suse.de ([195.135.220.15]:58014 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qji39-0003ql-Pk for qemu-devel@nongnu.org; Wed, 20 Jul 2011 21:27:40 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 9E2028F0D1; Thu, 21 Jul 2011 03:27:36 +0200 (CEST) From: Alexander Graf To: QEMU-devel Developers Date: Thu, 21 Jul 2011 03:27:32 +0200 Message-Id: <1311211654-14326-22-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1311211654-14326-1-git-send-email-agraf@suse.de> References: <1311211654-14326-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: Scott Wood Subject: [Qemu-devel] [PATCH 21/23] PPC: E500: Remove unneeded CPU nodes 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 We should only keep CPU nodes in the device tree around that we really have virtual CPUs for. So remove all superfluous entries that we just keep there in case someone wants to create a lot of vCPUs. Signed-off-by: Alexander Graf --- hw/ppce500_mpc8544ds.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c index 85d8da1..cccf79b 100644 --- a/hw/ppce500_mpc8544ds.c +++ b/hw/ppce500_mpc8544ds.c @@ -129,6 +129,12 @@ static int mpc8544_load_device_tree(CPUState *env, qemu_devtree_setprop_cell(fdt, cpu_name, "timebase-frequency", tb_freq); } + for (i = smp_cpus; i < 32; i++) { + char cpu_name[128]; + snprintf(cpu_name, sizeof(cpu_name), "/cpus/PowerPC,8544@%x", i); + qemu_devtree_nop_node(fdt, cpu_name); + } + ret = rom_add_blob_fixed(BINARY_DEVICE_TREE_FILE, fdt, fdt_size, addr); qemu_free(fdt);