From patchwork Mon Apr 29 15:02:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 240390 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8427C2C00C1 for ; Tue, 30 Apr 2013 01:04:40 +1000 (EST) Received: from localhost ([::1]:59853 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWpd8-0003tE-CU for incoming@patchwork.ozlabs.org; Mon, 29 Apr 2013 11:04:38 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWpcT-0003jQ-KE for qemu-devel@nongnu.org; Mon, 29 Apr 2013 11:04:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UWpcN-0006aD-TI for qemu-devel@nongnu.org; Mon, 29 Apr 2013 11:03:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58680) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWpcN-0006a2-JF for qemu-devel@nongnu.org; Mon, 29 Apr 2013 11:03:51 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3TF3Sxf012523 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 29 Apr 2013 11:03:28 -0400 Received: from thinkpad.redhat.com (vpn-238-245.phx2.redhat.com [10.3.238.245]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r3TF2vEM010752; Mon, 29 Apr 2013 11:03:25 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Mon, 29 Apr 2013 17:02:55 +0200 Message-Id: <1367247776-7695-7-git-send-email-imammedo@redhat.com> In-Reply-To: <1367247776-7695-1-git-send-email-imammedo@redhat.com> References: <1367247776-7695-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, ehabkost@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, claudio.fontana@huawei.com, aderumier@odiso.com, lcapitulino@redhat.com, jfrei@linux.vnet.ibm.com, yang.z.zhang@intel.com, pbonzini@redhat.com, afaerber@suse.de, lig.fnst@cn.fujitsu.com, rth@twiddle.net Subject: [Qemu-devel] [PATCH 6/7] target-i386: implement machine->hot_add_cpu hook 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 Signed-off-by: Igor Mammedov --- v2: * override .hot_add_cpu staticaly starting with 1.5 machine --- hw/i386/pc.c | 22 ++++++++++++++++++++++ hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 1 + include/hw/i386/pc.h | 1 + 4 files changed, 25 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 26644a1..2bdad17 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -915,6 +915,28 @@ static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id, return cpu; } +void pc_hot_add_cpu(const int64_t id, Error **errp) +{ + DeviceState *icc_bridge; + int64_t apic_id = x86_cpu_apic_id_from_index(id); + + if (cpu_exists(apic_id)) { + error_setg(errp, "Unable to add CPU: %" PRIi64 + ", it already exists", id); + return; + } + + if (id >= max_cpus) { + error_setg(errp, "Unable to add CPU: %" PRIi64 + ", max allowed: %d", id, max_cpus - 1); + return; + } + + icc_bridge = DEVICE(object_resolve_path_type("icc-bridge", + TYPE_ICC_BRIDGE, NULL)); + pc_new_cpu(machine_args.cpu_model, apic_id, icc_bridge, errp); +} + void pc_cpus_init(QEMUMachineInitArgs *args, DeviceState *icc_bridge) { int i; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index bdfac59..ccb230e 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -291,6 +291,7 @@ static QEMUMachine pc_i440fx_machine_v1_5 = { .alias = "pc", .desc = "Standard PC (i440FX + PIIX, 1996)", .init = pc_init_pci, + .hot_add_cpu = pc_hot_add_cpu, .max_cpus = 255, .is_default = 1, DEFAULT_MACHINE_OPTIONS, diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index a6f0960..24dc34f 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -209,6 +209,7 @@ static QEMUMachine pc_q35_machine_v1_5 = { .alias = "q35", .desc = "Standard PC (Q35 + ICH9, 2009)", .init = pc_q35_init, + .hot_add_cpu = pc_hot_add_cpu, .max_cpus = 255, DEFAULT_MACHINE_OPTIONS, }; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index c86059f..89bf4e1 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -80,6 +80,7 @@ void pc_register_ferr_irq(qemu_irq irq); void pc_acpi_smi_interrupt(void *opaque, int irq, int level); void pc_cpus_init(QEMUMachineInitArgs *args, DeviceState *icc_bridge); +void pc_hot_add_cpu(const int64_t id, Error **errp); void pc_acpi_init(const char *default_dsdt); void *pc_memory_init(MemoryRegion *system_memory, const char *kernel_filename,