From patchwork Wed Mar 20 10:32:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1914057 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=i/Ekhbse; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V04g63ZGFz23r9 for ; Wed, 20 Mar 2024 21:33:06 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmtFP-0007eT-24; Wed, 20 Mar 2024 06:32:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmtFC-0007Oz-GZ for qemu-devel@nongnu.org; Wed, 20 Mar 2024 06:32:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmtFA-0004H8-8u for qemu-devel@nongnu.org; Wed, 20 Mar 2024 06:32:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710930743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WNPPEhUqNxc++TdG1DRwfNWJJ5hRnAz956SbDwj5H6w=; b=i/EkhbselR9k2LjGput0c6G8sfI6+Gs42FmPUulig0e75mzN5O/IjizMAycQKwSfjGMA6y h+ONVMDHHxeP9jcy6R0G1x8WgHeLx3FoDzWbr0OtAZDj3o8UiLF4THyqt7JO9KAG8fSakK ycLPlbLLt74UubEdXD+MhaI8F/1gfW0= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-346-9fW11EPxNaGrrZPuTjM28A-1; Wed, 20 Mar 2024 06:32:22 -0400 X-MC-Unique: 9fW11EPxNaGrrZPuTjM28A-1 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-568cd600ee6so1788938a12.0 for ; Wed, 20 Mar 2024 03:32:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710930740; x=1711535540; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WNPPEhUqNxc++TdG1DRwfNWJJ5hRnAz956SbDwj5H6w=; b=fk06wZ6qGU8PSgazrTHYuNmrziKqpXdxvSKlrpqkQ4Zm6xCj4K60CW8peFSSYlwcbP A0veuJYZ1GojVuNd1FEZGwfjC50dKN976uUYHqQaavmq9PEoGa9nF7sazv2dMTvF+2f5 6skUrf2S7a4Cre2iyenqKoYxu9FCM8MMmKkbJkGVVi8B+C2bzWD3Y8B0Q+JDaBoy2Ip5 gT5/Ly5GIWJ7KRzh3lAY8LK8gdnA9nXQA2qV8h+KdpJi6jD4n6PTjHx9S8t0tIEV53e1 k/qggveAmgOUlna28S6VbEOffJLq6Rdd9ve7V9u2P1YBch/fcYPm48MbXtMHkoC0mO+7 2ttQ== X-Gm-Message-State: AOJu0YwMJQxM4CunTmSpSq+LsX+9EvhGxYNmLBycvFBUfzXhn7WCG2n6 PCub0qlWpm1qBTMSIRTRflD2CVVVdSnf4VqHzqO6zXIkzS0xHW4XodkXaQYtVpGFQCFSrn2Mdxh OmA2Hf08SScR7xQivz4zsVzAacCk5cxAnOGPLxKwBIVPKlhFikNQgODfXWjJYRjq83Oi2mAlzDh B1dGg+NZvjlRIn9TUev46o4OMCTWgXZOsVjZSH X-Received: by 2002:a05:6402:2486:b0:566:c572:6fa0 with SMTP id q6-20020a056402248600b00566c5726fa0mr14862899eda.15.1710930740271; Wed, 20 Mar 2024 03:32:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHelUNNEi5ltwH4SQQLwP2l2wU2AlmxsZ+ZlYfh6zaUmwYi/FqO2XReLVo4voOWKtY/dcGzIQ== X-Received: by 2002:a05:6402:2486:b0:566:c572:6fa0 with SMTP id q6-20020a056402248600b00566c5726fa0mr14862878eda.15.1710930739786; Wed, 20 Mar 2024 03:32:19 -0700 (PDT) Received: from [192.168.10.118] ([151.95.49.219]) by smtp.gmail.com with ESMTPSA id m24-20020aa7d358000000b0056729e902f7sm6762655edr.56.2024.03.20.03.32.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 03:32:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 2/6] vl: convert qemu_machine_creation_done() to Error ** Date: Wed, 20 Mar 2024 11:32:09 +0100 Message-ID: <20240320103213.1048405-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240320103213.1048405-1-pbonzini@redhat.com> References: <20240320103213.1048405-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.422, 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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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 Allow using Error ** to pass an error string up to qmp_x_exit_preconfig() and possibly main(). Signed-off-by: Paolo Bonzini --- system/vl.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/system/vl.c b/system/vl.c index 70f4cece7f9..0c970cf0203 100644 --- a/system/vl.c +++ b/system/vl.c @@ -2653,7 +2653,7 @@ static void qemu_create_cli_devices(void) rom_reset_order_override(); } -static void qemu_machine_creation_done(void) +static bool qemu_machine_creation_done(Error **errp) { MachineState *machine = MACHINE(qdev_get_machine()); @@ -2684,7 +2684,8 @@ static void qemu_machine_creation_done(void) } if (foreach_device_config(DEV_GDB, gdbserver_start) < 0) { - exit(1); + error_setg(errp, "could not start gdbserver"); + return false; } if (!vga_interface_created && !default_vga && vga_interface_type != VGA_NONE) { @@ -2692,6 +2693,7 @@ static void qemu_machine_creation_done(void) "type does not use that option; " "No VGA device has been created"); } + return true; } void qmp_x_exit_preconfig(Error **errp) @@ -2703,7 +2705,9 @@ void qmp_x_exit_preconfig(Error **errp) qemu_init_board(); qemu_create_cli_devices(); - qemu_machine_creation_done(); + if (!qemu_machine_creation_done(errp)) { + return; + } if (loadvm) { RunState state = autostart ? RUN_STATE_RUNNING : runstate_get();