From patchwork Mon Jul 18 08:31:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 649385 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 3rtGfm04pyz9rxl for ; Mon, 18 Jul 2016 18:33:52 +1000 (AEST) Received: from localhost ([::1]:45124 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bP3zp-00060r-Ps for incoming@patchwork.ozlabs.org; Mon, 18 Jul 2016 04:33:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bP3xa-0002mX-9Z for qemu-devel@nongnu.org; Mon, 18 Jul 2016 04:31:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bP3xW-0004S1-2z for qemu-devel@nongnu.org; Mon, 18 Jul 2016 04:31:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47019) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bP3xV-0004Rx-TC for qemu-devel@nongnu.org; Mon, 18 Jul 2016 04:31:26 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4135D7F082; Mon, 18 Jul 2016 08:31:25 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6I8VNUn019351; Mon, 18 Jul 2016 04:31:23 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Mon, 18 Jul 2016 10:31:22 +0200 Message-Id: <1468830682-38702-1-git-send-email-imammedo@redhat.com> In-Reply-To: <1468515285-173356-5-git-send-email-imammedo@redhat.com> References: <1468515285-173356-5-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 18 Jul 2016 08:31:25 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v5 04/16] pc: forbid BSP removal 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: pkrempa@redhat.com, bdas@redhat.com, ehabkost@redhat.com, eduardo.otubo@profitbricks.com, mst@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Boot CPU is assumed to always present in QEMU code, so untile that assumptions are gone, deny removal request, In another words QEMU won't support BSP hot-unplug. Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost --- v5: - s/1st CPU (BSP)/Boot CPU/ Eduardo Habkost - intialize idx to -1 and assert on it, Eduardo Habkost (note: that should nexer happen in current code as we don't have stray CPUs and most likely never will, but it doesn't hurt to cautios) --- hw/i386/pc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 110f1bf..e15fcc1 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1757,10 +1757,18 @@ out: static void pc_cpu_unplug_request_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { + int idx = -1; HotplugHandlerClass *hhc; Error *local_err = NULL; PCMachineState *pcms = PC_MACHINE(hotplug_dev); + pc_find_cpu_slot(pcms, CPU(dev), &idx); + assert(idx != -1); + if (idx == 0) { + error_setg(&local_err, "Boot CPU is unpluggable"); + goto out; + } + hhc = HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev); hhc->unplug_request(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err);