From patchwork Fri Jun 7 17:28:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason J. Herne" X-Patchwork-Id: 249769 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4270A2C02A5 for ; Sat, 8 Jun 2013 03:28:58 +1000 (EST) Received: from localhost ([::1]:43324 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ul0T9-00072E-Jw for incoming@patchwork.ozlabs.org; Fri, 07 Jun 2013 13:28:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ul0SZ-00071i-Bn for qemu-devel@nongnu.org; Fri, 07 Jun 2013 13:28:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ul0SV-00083p-55 for qemu-devel@nongnu.org; Fri, 07 Jun 2013 13:28:19 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:58278) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ul0SV-00083k-00 for qemu-devel@nongnu.org; Fri, 07 Jun 2013 13:28:15 -0400 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 7 Jun 2013 13:28:14 -0400 Received: from d01dlp03.pok.ibm.com (9.56.250.168) by e7.ny.us.ibm.com (192.168.1.107) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 7 Jun 2013 13:28:13 -0400 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 52A18C90026 for ; Fri, 7 Jun 2013 13:28:12 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r57HSCgC12976196 for ; Fri, 7 Jun 2013 13:28:12 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r57HS9TO018429 for ; Fri, 7 Jun 2013 14:28:11 -0300 Received: from jason-ThinkPad-W500.endicott.ibm.com (jason-thinkpad-w500.endicott.ibm.com [9.60.75.211] (may be forged)) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r57HS7Jg018232; Fri, 7 Jun 2013 14:28:09 -0300 From: "Jason J. Herne" To: agraf@suse.de, borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, imammedo@redhat.com, qemu-devel@nongnu.org, ehabkost@redhat.com Date: Fri, 7 Jun 2013 13:28:04 -0400 Message-Id: <1370626087-840-6-git-send-email-jjherne@us.ibm.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1370626087-840-1-git-send-email-jjherne@us.ibm.com> References: <1370626087-840-1-git-send-email-jjherne@us.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13060717-5806-0000-0000-00002197CADF X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 32.97.182.137 Cc: "Jason J. Herne" Subject: [Qemu-devel] [PATCH 5/8] [PATCH RFC v2] s390-qemu: cpu hotplug - Introduce post-cpu-init function 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 From: "Jason J. Herne" In preparation for treating cpus as devices we need to separate machine initialization into two stages: 1. Initialization that needs to be done before cpu devices can be created. 2. Initialization that requires cpu devices to already be created. This is accomplished by creating an optional post-cpu initialization function for QEMUMachine. Signed-off-by: Jason J. Herne --- include/hw/boards.h | 3 ++- vl.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index fb7c6f1..ed427a1 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -19,7 +19,7 @@ typedef struct QEMUMachineInitArgs { } QEMUMachineInitArgs; typedef void QEMUMachineInitFunc(QEMUMachineInitArgs *args); - +typedef void QEMUMachineInitPostCpusFunc(void); typedef void QEMUMachineResetFunc(void); typedef void QEMUMachineHotAddCPUFunc(const int64_t id, Error **errp); @@ -29,6 +29,7 @@ typedef struct QEMUMachine { const char *alias; const char *desc; QEMUMachineInitFunc *init; + QEMUMachineInitPostCpusFunc *post_cpu_init; QEMUMachineResetFunc *reset; QEMUMachineHotAddCPUFunc *hot_add_cpu; BlockInterfaceType block_default_type; diff --git a/vl.c b/vl.c index 47ab45d..71e1e6d 100644 --- a/vl.c +++ b/vl.c @@ -4305,6 +4305,10 @@ int main(int argc, char **argv, char **envp) .cpu_model = cpu_model }; machine->init(&args); + if (machine->post_cpu_init) { + machine->post_cpu_init(); + } + audio_init(); cpu_synchronize_all_post_init();