From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A2D6C4361B for ; Mon, 7 Dec 2020 14:03:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8348223447 for ; Mon, 7 Dec 2020 14:03:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8348223447 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmH7N-0000Wk-Hs for qemu-devel@archiver.kernel.org; Mon, 07 Dec 2020 09:03:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmH62-0008WQ-4S for qemu-devel@nongnu.org; Mon, 07 Dec 2020 09:02:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:31495) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kmH5s-0000qs-HD for qemu-devel@nongnu.org; Mon, 07 Dec 2020 09:02:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607349742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=L6lyRg10TuawGAbqsDHEKahuCPGz46T6eOu65Khkus0=; b=Cnk9G7D9LOn46HPmvbOf/WXBQt0KyF6Zc6J/HetYz/TY/pP/UsxcuaNKvJJrKifqrp0UVv 9wVhHKaUbly8iT/4UM0ZurM4tOzwvu12zO6Af1JE31MQTKuUmNpOcVm1YzYgvxqNm2aQIV meeHSzJeUFFIuH5O6TIe9vyJVcnyipc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-448-9FAws7y5PKG7sg3w7mmzWQ-1; Mon, 07 Dec 2020 09:02:21 -0500 X-MC-Unique: 9FAws7y5PKG7sg3w7mmzWQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 425C11005504 for ; Mon, 7 Dec 2020 14:02:20 +0000 (UTC) Received: from localhost (unknown [10.40.208.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E758299B4; Mon, 7 Dec 2020 14:02:19 +0000 (UTC) Date: Mon, 7 Dec 2020 15:02:18 +0100 From: Igor Mammedov To: Paolo Bonzini Subject: Re: [PATCH 02/15] vl: remove separate preconfig main_loop Message-ID: <20201207150218.2df0dc3b@redhat.com> In-Reply-To: <20201202081854.4126071-3-pbonzini@redhat.com> References: <20201202081854.4126071-1-pbonzini@redhat.com> <20201202081854.4126071-3-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, 2 Dec 2020 03:18:41 -0500 Paolo Bonzini wrote: > Move post-preconfig initialization to the x-exit-preconfig. If preconfig > is not requested, just exit preconfig mode immediately with the QMP > command. > > As a result, the preconfig loop will run with accel_setup_post > and os_setup_post restrictions (xen_restrict, chroot, etc.) > already done. > > Signed-off-by: Paolo Bonzini Reviewed-by: Igor Mammedov > --- > include/sysemu/runstate.h | 1 - > monitor/qmp-cmds.c | 9 ---- > softmmu/vl.c | 95 +++++++++++++++++---------------------- > 3 files changed, 41 insertions(+), 64 deletions(-) > > diff --git a/include/sysemu/runstate.h b/include/sysemu/runstate.h > index f760094858..e557f470d4 100644 > --- a/include/sysemu/runstate.h > +++ b/include/sysemu/runstate.h > @@ -41,7 +41,6 @@ typedef enum WakeupReason { > QEMU_WAKEUP_REASON_OTHER, > } WakeupReason; > > -void qemu_exit_preconfig_request(void); > void qemu_system_reset_request(ShutdownCause reason); > void qemu_system_suspend_request(void); > void qemu_register_suspend_notifier(Notifier *notifier); > diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c > index 501a3024c7..7ced7eb3e8 100644 > --- a/monitor/qmp-cmds.c > +++ b/monitor/qmp-cmds.c > @@ -102,15 +102,6 @@ void qmp_system_powerdown(Error **errp) > qemu_system_powerdown_request(); > } > > -void qmp_x_exit_preconfig(Error **errp) > -{ > - if (qdev_hotplug) { > - error_setg(errp, "The command is permitted only before machine initialization"); > - return; > - } > - qemu_exit_preconfig_request(); > -} > - > void qmp_cont(Error **errp) > { > BlockBackend *blk; > diff --git a/softmmu/vl.c b/softmmu/vl.c > index ab2210bc79..abbbb83e1a 100644 > --- a/softmmu/vl.c > +++ b/softmmu/vl.c > @@ -1151,7 +1151,6 @@ static pid_t shutdown_pid; > static int powerdown_requested; > static int debug_requested; > static int suspend_requested; > -static bool preconfig_exit_requested = true; > static WakeupReason wakeup_reason; > static NotifierList powerdown_notifiers = > NOTIFIER_LIST_INITIALIZER(powerdown_notifiers); > @@ -1238,11 +1237,6 @@ static int qemu_debug_requested(void) > return r; > } > > -void qemu_exit_preconfig_request(void) > -{ > - preconfig_exit_requested = true; > -} > - > /* > * Reset the VM. Issue an event unless @reason is SHUTDOWN_CAUSE_NONE. > */ > @@ -1464,10 +1458,6 @@ static bool main_loop_should_exit(void) > RunState r; > ShutdownCause request; > > - if (preconfig_exit_requested) { > - preconfig_exit_requested = false; > - return true; > - } > if (qemu_debug_requested()) { > vm_stop(RUN_STATE_DEBUG); > } > @@ -3283,6 +3273,43 @@ static void qemu_machine_creation_done(void) > register_global_state(); > } > > +void qmp_x_exit_preconfig(Error **errp) > +{ > + if (qdev_hotplug) { > + error_setg(errp, "The command is permitted only before machine initialization"); > + return; > + } > + > + qemu_init_board(); > + qemu_create_cli_devices(); > + qemu_machine_creation_done(); > + > + if (loadvm) { > + Error *local_err = NULL; > + if (load_snapshot(loadvm, &local_err) < 0) { > + error_report_err(local_err); > + autostart = 0; > + exit(1); > + } > + } > + if (replay_mode != REPLAY_MODE_NONE) { > + replay_vmstate_init(); > + } > + > + if (incoming) { > + Error *local_err = NULL; > + if (strcmp(incoming, "defer") != 0) { > + qmp_migrate_incoming(incoming, &local_err); > + if (local_err) { > + error_reportf_err(local_err, "-incoming %s: ", incoming); > + exit(1); > + } > + } > + } else if (autostart) { > + qmp_cont(NULL); > + } > +} > + > void qemu_init(int argc, char **argv, char **envp) > { > QemuOpts *opts; > @@ -3847,7 +3874,6 @@ void qemu_init(int argc, char **argv, char **envp) > } > break; > case QEMU_OPTION_preconfig: > - preconfig_exit_requested = false; > preconfig_requested = true; > break; > case QEMU_OPTION_enable_kvm: > @@ -4272,57 +4298,18 @@ void qemu_init(int argc, char **argv, char **envp) > qemu_resolve_machine_memdev(); > parse_numa_opts(current_machine); > > - if (preconfig_requested) { > - qemu_init_displays(); > - } > - > - /* do monitor/qmp handling at preconfig state if requested */ > - qemu_main_loop(); > - > - qemu_init_board(); > - > - qemu_create_cli_devices(); > - > - /* initialize displays after all errors have been reported */ > - if (!preconfig_requested) { > - qemu_init_displays(); > - } > - qemu_machine_creation_done(); > - > - if (loadvm) { > - Error *local_err = NULL; > - if (load_snapshot(loadvm, &local_err) < 0) { > - error_report_err(local_err); > - autostart = 0; > - exit(1); > - } > - } > - if (replay_mode != REPLAY_MODE_NONE) { > - replay_vmstate_init(); > - } > - > if (vmstate_dump_file) { > /* dump and exit */ > dump_vmstate_json_to_file(vmstate_dump_file); > exit(0); > } > - if (incoming) { > - Error *local_err = NULL; > - if (strcmp(incoming, "defer") != 0) { > - qmp_migrate_incoming(incoming, &local_err); > - if (local_err) { > - error_reportf_err(local_err, "-incoming %s: ", incoming); > - exit(1); > - } > - } > - } else if (autostart) { > - qmp_cont(NULL); > - } > > + qemu_init_displays(); > + if (!preconfig_requested) { > + qmp_x_exit_preconfig(&error_fatal); > + } > accel_setup_post(current_machine); > os_setup_post(); > - > - return; > } > > void qemu_cleanup(void)