From patchwork Thu Apr 25 14:05:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 239520 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 507F82C00D8 for ; Fri, 26 Apr 2013 00:14:17 +1000 (EST) Received: from localhost ([::1]:48477 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVMwA-0007dL-W3 for incoming@patchwork.ozlabs.org; Thu, 25 Apr 2013 10:14:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49463) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVMqj-00021i-7V for qemu-devel@nongnu.org; Thu, 25 Apr 2013 10:08:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UVMqh-0005c3-Rs for qemu-devel@nongnu.org; Thu, 25 Apr 2013 10:08:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2448) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVMqh-0005bg-Je for qemu-devel@nongnu.org; Thu, 25 Apr 2013 10:08:35 -0400 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 r3PE8V5P030314 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 25 Apr 2013 10:08:31 -0400 Received: from dell-pet610-01.lab.eng.brq.redhat.com (dell-pet610-01.lab.eng.brq.redhat.com [10.34.42.20]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r3PE7rFd006589; Thu, 25 Apr 2013 10:08:28 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2013 16:05:35 +0200 Message-Id: <1366898737-6201-14-git-send-email-imammedo@redhat.com> In-Reply-To: <1366898737-6201-1-git-send-email-imammedo@redhat.com> References: <1366898737-6201-1-git-send-email-imammedo@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: peter.maydell@linaro.org, aliguori@us.ibm.com, ehabkost@redhat.com, mst@redhat.com, stefano.stabellini@eu.citrix.com, quintela@redhat.com, anthony.perard@citrix.com, pbonzini@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 13/15] add hot_add_cpu hook to QEMUMachine and export machine_args 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 hot_add_cpu hook should be overriden by target that implements cpu hot-add via cpu-add QMP command. Make machine_args available globaly, it allows to reuse machine_args->cpu_model during hotplug, instead of adding target specific globals to keep a copy of cpu_model. Signed-off-by: Igor Mammedov --- v2: * convert stack veriable args to global machine_args * don't move current_machine before machine->init(), override hot_add_cpu staticaly instead. --- include/hw/boards.h | 3 +++ vl.c | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 425bdc7..657f379 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -18,6 +18,8 @@ typedef struct QEMUMachineInitArgs { const char *cpu_model; } QEMUMachineInitArgs; +extern QEMUMachineInitArgs machine_args; + typedef void QEMUMachineInitFunc(QEMUMachineInitArgs *args); typedef void QEMUMachineResetFunc(void); @@ -43,6 +45,7 @@ typedef struct QEMUMachine { GlobalProperty *compat_props; struct QEMUMachine *next; const char *hw_version; + void (*hot_add_cpu)(const int64_t id, Error **errp); } QEMUMachine; int qemu_register_machine(QEMUMachine *m); diff --git a/vl.c b/vl.c index 5981db0..faf5e4b 100644 --- a/vl.c +++ b/vl.c @@ -179,6 +179,8 @@ int main(int argc, char **argv) #define MAX_VIRTIO_CONSOLES 1 #define MAX_SCLP_CONSOLES 1 +QEMUMachineInitArgs machine_args; + static const char *data_dir[16]; static int data_dir_idx; const char *bios_name = NULL; @@ -4273,7 +4275,8 @@ int main(int argc, char **argv, char **envp) qdev_machine_init(); - QEMUMachineInitArgs args = { .ram_size = ram_size, + machine_args = (QEMUMachineInitArgs){ + .ram_size = ram_size, .boot_device = (boot_devices[0] == '\0') ? machine->boot_order : boot_devices, @@ -4281,7 +4284,8 @@ int main(int argc, char **argv, char **envp) .kernel_cmdline = kernel_cmdline, .initrd_filename = initrd_filename, .cpu_model = cpu_model }; - machine->init(&args); + + machine->init(&machine_args); cpu_synchronize_all_post_init();