From patchwork Tue Nov 23 09:16:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 12633791 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C5BEFC433EF for ; Tue, 23 Nov 2021 09:18:14 +0000 (UTC) Received: from localhost ([::1]:42486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpRwL-00054h-KY for qemu-devel@archiver.kernel.org; Tue, 23 Nov 2021 04:18:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpRvI-0004Nc-GJ for qemu-devel@nongnu.org; Tue, 23 Nov 2021 04:17:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:33360) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpRvF-000793-ID for qemu-devel@nongnu.org; Tue, 23 Nov 2021 04:17:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637659024; 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; bh=R3gZYVQzZYfsvLdPMUISNk+/ctEDxL31b7VgCciUxjA=; b=fjQBIshPKDnHQHPYcAUN5pg0RTIFuekxQxMGB2+yUMbsqvVxazJ2H6lDrGSrzClj8RQCTd Da/Rd/vRgrmmWxIVc+C4GpgJWiD2CYFL4gkMj6HGNIcUr4dEQfcnzbc7rU++r1bYLSiQhs Pmo5i4R6Fmfkw20x31I5ZPJE9koZB1Y= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-224-fj2vUSpGNT6X9jihEzJFeg-1; Tue, 23 Nov 2021 04:17:02 -0500 X-MC-Unique: fj2vUSpGNT6X9jihEzJFeg-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 949EA875047; Tue, 23 Nov 2021 09:17:01 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.79]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 85EB3E144; Tue, 23 Nov 2021 09:16:50 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 5D7D61800936; Tue, 23 Nov 2021 10:16:48 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH] microvm: use MachineState->dumpdtb Date: Tue, 23 Nov 2021 10:16:48 +0100 Message-Id: <20211123091648.115334-1-kraxel@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=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , "Michael S. Tsirkin" , Richard Henderson , Gerd Hoffmann , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" There already is a machine property to dumb the device tree for debugging purposes, and the helper function qemu_fdt_dumpdtb() implementing the dumbing. Make microvm use it for consistency. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daudé --- hw/i386/microvm-dt.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/hw/i386/microvm-dt.c b/hw/i386/microvm-dt.c index 875ba9196394..e6f5a90209c5 100644 --- a/hw/i386/microvm-dt.c +++ b/hw/i386/microvm-dt.c @@ -330,12 +330,5 @@ void dt_setup_microvm(MicrovmMachineState *mms) fprintf(stderr, "%s: add etc/fdt to fw_cfg\n", __func__); fw_cfg_add_file(x86ms->fw_cfg, "etc/fdt", mms->fdt, size); - if (debug) { - fprintf(stderr, "%s: writing microvm.fdt\n", __func__); - g_file_set_contents("microvm.fdt", mms->fdt, size, NULL); - int ret = system("dtc -I dtb -O dts microvm.fdt"); - if (ret != 0) { - fprintf(stderr, "%s: oops, dtc not installed?\n", __func__); - } - } + qemu_fdt_dumpdtb(mms->fdt, size); }