From patchwork Fri Apr 25 15:28:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 884375 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp4025977wrs; Fri, 25 Apr 2025 08:32:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWwXA+XD5ahsQStFtYBEvoRozrkud5l5kdOTza1+IwNyroTKTi1XYGK9HIN+dcntz2Hur87Rw==@linaro.org X-Google-Smtp-Source: AGHT+IEe2Vaka9mV0NhX91S+XhQH+H0ZUX6wXPocJf5O5VuGVm/Ay5TKthTpcBr/W0VWwxXFNHK/ X-Received: by 2002:a05:622a:34b:b0:476:7f5c:e303 with SMTP id d75a77b69052e-4801d049ab5mr37688461cf.26.1745595141040; Fri, 25 Apr 2025 08:32:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745595141; cv=none; d=google.com; s=arc-20240605; b=keNlQIWZXY9hkuRxtslvN7SHV6wLTw/nyuyRQxJlcMUKtSYnmcTpOq+hBsXl1Lrk2U ODi73Scplf0pNY55QCegS1kHBIsiuORBzObw+4XxhJmLro95hEKmOP4FtaSbQCwX6MSE F2O0L7/m9SI5n1ty46KpzpjsO2sl5kCzCPNOogFfyBjwpm1h85f4Y5jRcr9IaTR3djR4 aVpkfM1aFzl2w+7AaGjffisbYxZ4PIQ6TlPrbbPa+JS022Ai+rRva4MWdwsq4f3dtT10 w4BPKDEU7blHYdKQ4HvbiPMS4H0xPMQoTuRQTrtawedOFXVPdHcnvP9vBpqgAsxLMzvi M0/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zk+R4YridhukqVAAutZ2TUUvBuxoiK7M6RsZ8N/t+zg=; fh=5KYNaH84KuhJkbNfHAKkJotxTHueTtQQGeWlMENxW3A=; b=IFW4TDhq1mNYOVBpau4/VLHConiudtJg2RApdqR8hO1ho0e/GzTbwByPD31oFGCLY4 Z8ykImdoVAYU64+kbu4TNo3wOvvUx53u4bnHk26zGRUcgsLZq9FoSoH9D1ByUdjwI7Ba pZ0IqTVxPOi22n/ku+835Q2H69pIwGx5CaFYJQPjzGjBGzMGpmvmUU+MrlIdMQbKYawu 5DEj2mbFiUgDpmG574F+9b7KlqGMzGF7CQEjFKlBhpMqoqchB8OejOl8QwRD60coA0HK zybfwsc53g1udJQBtXWRyGiimNUMHH/2k+1Orq/TJD3Jk9WkQIvO9ynpYkjowkviRQbg uOlQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kSVEsf5E; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47e9f2ca762si42445671cf.48.2025.04.25.08.32.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Apr 2025 08:32:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kSVEsf5E; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8L26-0006em-Gm; Fri, 25 Apr 2025 11:32:07 -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 1u8L1i-0004oM-2c for qemu-devel@nongnu.org; Fri, 25 Apr 2025 11:31:45 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u8L1g-00044b-1A for qemu-devel@nongnu.org; Fri, 25 Apr 2025 11:31:41 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-43d2d952eb1so17189145e9.1 for ; Fri, 25 Apr 2025 08:31:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745595098; x=1746199898; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zk+R4YridhukqVAAutZ2TUUvBuxoiK7M6RsZ8N/t+zg=; b=kSVEsf5E43NZUDOWTHYCTax5zIgPBo3ku54SgJ2lp1WDlRhXDiIZfFhUM4tlN3AJxI dtwyK+zIyZdZj96EjqBd2HxRSDJ7kIF776B6gaVZz5wVqOZB66QVvENK0ElFV8kWcR6N 6Fd/2ErNbcqhThxmvwrcObyQRCEL0qrESC6MYghlKdaha/aY3I6z8ac/sDYhbucaztMo v+dVwQqlZSPSiX1cmpNaCQKlZMBBBma/pMTJvP2O6g61TPy/NaM6TXFs6CcEXRR4DHV6 xjy/n4hZCMSaY6onrxJohPwJ+xH/oXr8OhOwVWwFeJBWNYpaYPvBQlqbRmY5Q4dYBvzR UGVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745595098; x=1746199898; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zk+R4YridhukqVAAutZ2TUUvBuxoiK7M6RsZ8N/t+zg=; b=Ddqgs0D6dtNZTI5XOZm6yP1TIsDn9NDSvsnT13iuoTze5bDiBvNsxQd0QwChcM1Rhr sM/Y5KkI+MzbjiURVe+8+0aCmwX4RZOjtOLNnxv8ms1jiH40GZnrIwj5REE4IMb/6hEi iGk4d6kWuOLQKDjIybfGmSOuYuCoWyLNDPtmADgJNBUAZGGQTgliZKsdbrAdSwkdEWbZ 1JX7ylgZrP2R5wbXt2fT7AgytXmbm0KPDiKm5Eeds9oDAqRBFTGFHmXzkjtZwfd1KdAN HE1yrW9YT7kZvadLuXVrVB+q8B4RtYfMaL8HUPHZF+pvmjJVeT8srMlxPklqjxzrFutF lQ5Q== X-Gm-Message-State: AOJu0Yzt3WzYNXVce7LQIF4fxDSrPnTnyjIxHHXh3S833lQXEJOmeCwX sOaXlF2ph9JwkXahrAdyxIgp7cWIzeOf6CmodHFTVW7ECBIqo7LKu0QDGxlB9kIOrPGxbF/td13 k X-Gm-Gg: ASbGncvP4FGoPbI4965RGVl0jedm/lA7F3VBpfdgUZZsThapFunBbzM6rIyYzm0DrnI K5+chepHilGY9rzuTHCDknpMohvQ8ZUFQxJjGmGff23NCqC78nwwNIwh2qiLkiIlY2/I8MB6PHz 4N8irTmbchhr6iIFHUnz3QLdn0tP288Y1UKYULZApQPu8a2uySt8FYjFQGO26MU8QY5099410cu 6zhzOZILUxYm7iqOZNDxj+z5u1RwVy1L92FIoxwU9PwS+bkxSg61fYp8QDOs8/sE7mB+u9Dtzaa azZZI+Oz+/kA1/xf3k1bReLUXWRmp93QSnXzV6CobXmNwrFjBVk+YUYuuJjuRYT8rj+0mAJ16X6 fkqUip7dau5gnRs4= X-Received: by 2002:a05:600c:3c92:b0:43c:e7ae:4bcf with SMTP id 5b1f17b1804b1-440a63492d8mr18866835e9.0.1745595097858; Fri, 25 Apr 2025 08:31:37 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4409d2ac27dsm60196155e9.22.2025.04.25.08.31.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 25 Apr 2025 08:31:37 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: BALATON Zoltan , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PULL 35/58] system/datadir: Add new type constant for DTB files Date: Fri, 25 Apr 2025 17:28:19 +0200 Message-ID: <20250425152843.69638-36-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250425152843.69638-1-philmd@linaro.org> References: <20250425152843.69638-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: BALATON Zoltan Currently DTB files are mixed with ROMs under BIOS type. Separate them under a new type constant and turn defines into an enum while at it. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daudé Message-ID: Signed-off-by: Philippe Mathieu-Daudé --- include/qemu/datadir.h | 11 ++++++++--- hw/microblaze/boot.c | 2 +- hw/ppc/ppc440_bamboo.c | 2 +- hw/ppc/sam460ex.c | 2 +- hw/ppc/virtex_ml507.c | 2 +- system/datadir.c | 3 ++- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/include/qemu/datadir.h b/include/qemu/datadir.h index 21f9097f582..cca32af3008 100644 --- a/include/qemu/datadir.h +++ b/include/qemu/datadir.h @@ -1,11 +1,16 @@ #ifndef QEMU_DATADIR_H #define QEMU_DATADIR_H -#define QEMU_FILE_TYPE_BIOS 0 -#define QEMU_FILE_TYPE_KEYMAP 1 +typedef enum { + QEMU_FILE_TYPE_BIOS, + QEMU_FILE_TYPE_DTB, + QEMU_FILE_TYPE_KEYMAP, +} QemuFileType; + /** * qemu_find_file: * @type: QEMU_FILE_TYPE_BIOS (for BIOS, VGA BIOS) + * QEMU_FILE_TYPE_DTB (for device tree blobs) * or QEMU_FILE_TYPE_KEYMAP (for keymaps). * @name: Relative or absolute file name * @@ -20,7 +25,7 @@ * * Returns: a path that can access @name, or NULL if no matching file exists. */ -char *qemu_find_file(int type, const char *name); +char *qemu_find_file(QemuFileType type, const char *name); void qemu_add_default_firmwarepath(void); void qemu_add_data_dir(char *path); void qemu_list_data_dirs(void); diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index 60b4ef0abe7..4a9c9df3181 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -130,7 +130,7 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, bool is_little_endian, dtb_arg = current_machine->dtb; /* default to pcbios dtb as passed by machine_init */ if (!dtb_arg && dtb_filename) { - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, dtb_filename); + filename = qemu_find_file(QEMU_FILE_TYPE_DTB, dtb_filename); } boot_info.machine_cpu_reset = machine_cpu_reset; diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 099fda39092..6fff0d8afbc 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -64,7 +64,7 @@ static int bamboo_load_device_tree(MachineState *machine, uint32_t tb_freq = 400000000; uint32_t clock_freq = 400000000; - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE); + filename = qemu_find_file(QEMU_FILE_TYPE_DTB, BINARY_DEVICE_TREE_FILE); if (!filename) { return -1; } diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index a070de23cf2..ee31bd8f349 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -142,7 +142,7 @@ static int sam460ex_load_device_tree(MachineState *machine, uint32_t clock_freq = CPU_FREQ; int offset; - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE); + filename = qemu_find_file(QEMU_FILE_TYPE_DTB, BINARY_DEVICE_TREE_FILE); if (!filename) { error_report("Couldn't find dtb file `%s'", BINARY_DEVICE_TREE_FILE); exit(1); diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 17115be74d5..c9969ae48a8 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -146,7 +146,7 @@ static int xilinx_load_device_tree(MachineState *machine, /* Try the local "ppc.dtb" override. */ fdt = load_device_tree("ppc.dtb", &fdt_size); if (!fdt) { - path = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE); + path = qemu_find_file(QEMU_FILE_TYPE_DTB, BINARY_DEVICE_TREE_FILE); if (path) { fdt = load_device_tree(path, &fdt_size); g_free(path); diff --git a/system/datadir.c b/system/datadir.c index c9237cb5d4a..e450b84ce91 100644 --- a/system/datadir.c +++ b/system/datadir.c @@ -30,7 +30,7 @@ static const char *data_dir[16]; static int data_dir_idx; -char *qemu_find_file(int type, const char *name) +char *qemu_find_file(QemuFileType type, const char *name) { int i; const char *subdir; @@ -44,6 +44,7 @@ char *qemu_find_file(int type, const char *name) switch (type) { case QEMU_FILE_TYPE_BIOS: + case QEMU_FILE_TYPE_DTB: subdir = ""; break; case QEMU_FILE_TYPE_KEYMAP: