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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 74E11C433EF for ; Thu, 16 Sep 2021 11:07:02 +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 E77CA60E90 for ; Thu, 16 Sep 2021 11:07:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E77CA60E90 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:54988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQpEK-0008C4-Tp for qemu-devel@archiver.kernel.org; Thu, 16 Sep 2021 07:07:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQpDA-0006tC-Nt for qemu-devel@nongnu.org; Thu, 16 Sep 2021 07:05:48 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:39754) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQpD8-0002Py-C1 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 07:05:48 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 196-20020a1c04cd000000b002fa489ffe1fso7058088wme.4 for ; Thu, 16 Sep 2021 04:05:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:subject:to:references:from:cc:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=H2PsU82MMlyW78SaWN79PjADHJVEchsxP5tnC3pZR3E=; b=PDotSiZGBHTOzxjPQZsN7GITegUiQ0CTkp/LQwyCHz7cpYtEBdh6U7YYUXUnEv/nQP Z/R0qh7/o2PKXFl23mfW3iVth7mVYYKv4iqYLN2fBrhwY4vnlPnFySJwlm13k2mJzvSt TzCScp9OZg/vBF8BbW59RNr/pbdSKSAjKRwpR+Vo4X6lYl9PbErPQ0Z1QEFx4P+Kolzb P7oJkOPfnMy68JmodStFd82ehXP/byFNW1+nRPn5SA7NVfI7DyY/GG0PjncOLU/9l091 eKWWgbH6D4DEERti7b3u3elowmPKf9ASVVpTWVUcgBq6ZKVgOsabF4Qfw28MmsDSPfQE x6BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:subject:to:references:from:cc:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=H2PsU82MMlyW78SaWN79PjADHJVEchsxP5tnC3pZR3E=; b=gaVRAXpU9Ca7suxqzixuFXplKahAGTuQ/Mzcn6cHAQVF5GRLsseDzg9SXIBr0EX3r5 WYR32a3A/NZFZFshTT1Mv8jZ+PJ/4Yr9CZ6qsxTZjAYGuc7Y+IGkl2AsOBWUt8r3HKOW zlAQWOJd2zreYT5kdQq3fwpWUQNnZu9z/Nc+18vqHGRHTkpbfrXyqQEj6qmwm14mQnqf oFaaQBaqy5AjeFjVNg4kSrJPGVzqz1o+E/c5FHTAaZMruyIbdOFjW7qCHYeDNRMZiEXy ZzsS7xuzx51QufwnQSY5cOr5/aCyvr+0HH+aYiGRVLL5dDzvAsN7q09cX7yeTVVKxF31 AK6A== X-Gm-Message-State: AOAM532504SVsCwaDBp17jmOwCcEWrfVnQtqkTVGtxIOH3S9qDdVWKfS yRK9tdn6Vpk/kbveVlz2hsc= X-Google-Smtp-Source: ABdhPJwAoX+wrkntSmitZHgz1SW7ISjn/2qii9uCsTLRYZUMIMgj/eYt8luXMsN+qrPbbFWiUa0mmA== X-Received: by 2002:a05:600c:1c11:: with SMTP id j17mr9560747wms.138.1631790342866; Thu, 16 Sep 2021 04:05:42 -0700 (PDT) Received: from [192.168.1.36] (14.red-83-35-25.dynamicip.rima-tde.net. [83.35.25.14]) by smtp.gmail.com with ESMTPSA id k22sm3319722wrd.59.2021.09.16.04.05.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 16 Sep 2021 04:05:42 -0700 (PDT) Subject: Re: [PATCH v3 11/20] nubus-device: add romfile property for loading declaration ROMs To: Mark Cave-Ayland , qemu-devel@nongnu.org, laurent@vivier.eu References: <20210916100554.10963-1-mark.cave-ayland@ilande.co.uk> <20210916100554.10963-12-mark.cave-ayland@ilande.co.uk> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: Date: Thu, 16 Sep 2021 13:05:41 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210916100554.10963-12-mark.cave-ayland@ilande.co.uk> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32d.google.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NICE_REPLY_A=-1.488, RCVD_IN_DNSWL_NONE=-0.0001, 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: Markus Armbruster Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 9/16/21 12:05 PM, Mark Cave-Ayland wrote: > The declaration ROM is located at the top-most address of the standard slot > space. > > Signed-off-by: Mark Cave-Ayland > --- > hw/nubus/nubus-device.c | 43 +++++++++++++++++++++++++++++++++++++++- > include/hw/nubus/nubus.h | 6 ++++++ > 2 files changed, 48 insertions(+), 1 deletion(-) > @@ -38,10 +43,46 @@ static void nubus_device_realize(DeviceState *dev, Error **errp) > memory_region_add_subregion(&nubus->slot_io, slot_offset, > &nd->slot_mem); > g_free(name); > + > + /* Declaration ROM */ > + if (nd->romfile != NULL) { > + path = qemu_find_file(QEMU_FILE_TYPE_BIOS, nd->romfile); > + if (path == NULL) { > + path = g_strdup(nd->romfile); > + } > + > + size = get_image_size(path); > + if (size < 0) { > + error_setg(errp, "failed to find romfile \"%s\"", nd->romfile); > + g_free(path); > + return; > + } else if (size == 0) { > + error_setg(errp, "romfile \"%s\" is empty", nd->romfile); > + g_free(path); > + return; > + } else if (size > NUBUS_DECL_ROM_MAX_SIZE) { > + error_setg(errp, "romfile \"%s\" too large (maximum size 128K)", > + nd->romfile); > + g_free(path); > + return; > + } > + > + name = g_strdup_printf("nubus-slot-%x-declaration-rom", nd->slot); > + memory_region_init_rom(&nd->decl_rom, OBJECT(dev), name, size, > + &error_fatal); > + ret = load_image_mr(path, &nd->decl_rom); load_image_mr() already calls get_image_size(), rom_add_file() and qemu_find_file(). *But* it doesn't takes and Error handle, and report error using fprintf()... So unfortunately rom_add*() functions are kinda outdated and you are doing the right thing to propagate detailled errors. Therefore: Reviewed-by: Philippe Mathieu-Daudé > + g_free(path); > + if (ret < 0) { > + warn_report("nubus-device: could not load prom '%s'", nd->romfile); > + } > + memory_region_add_subregion(&nd->slot_mem, NUBUS_SLOT_SIZE - size, > + &nd->decl_rom); > + } > }