From patchwork Tue Jul 23 20:38:34 2024 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: 813970 Delivered-To: patch@linaro.org Received: by 2002:adf:f288:0:b0:367:895a:4699 with SMTP id k8csp2488966wro; Tue, 23 Jul 2024 13:40:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXscg7rL3xOKwkrk2/loJlClB0gySXc452fb0uCOIuSZLsW6t2uQ5mon2gTBXGdzLy96z/jIfX3ztv2amFU/Z93 X-Google-Smtp-Source: AGHT+IGEoS4Rydrl9xrj6cfsw+7T8E3K9CsCu39kZbtieQufILsZ8dfor6M8nnP9Z+/JLwdXmIco X-Received: by 2002:a05:6214:3019:b0:6b4:fbec:952f with SMTP id 6a1803df08f44-6b990744ec0mr587916d6.25.1721767218276; Tue, 23 Jul 2024 13:40:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721767218; cv=none; d=google.com; s=arc-20160816; b=MFn+FeTomzWRsq9T2dnTC4QR793gfdHb3NIQofxkMlXajlif/nmYJNWOZ6CYfXSu76 gBdrnM/tarqWNZ1qR0/A2qXneOsxHkvdbY4UZIRQP3bxwzC3gMyPUKLm9x8GdqeedTWC yjmyEqnXoBFYeHmrnFW3SDLEQlvX7qSPoRKqhfWk1yIb1bC/IMu0me8Pebkp1OKey6zG vMp84eQ1iilAWbLjhJRWUDa/PYxD8j4UJ58a46wDTHRZbUb5oWaw590mIFOdUzmpHqat gY+ePRwzp8CdF8wd9FDAv58718IvP+93yTNgP4W9mo6q2jB9PqG1zC/zF5I4fr40Vrni nK4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=PVW3Gx4VWf1FcJPawzcx0DDSK91Xb6uFhCXhyBk+SmU=; fh=My8FCjwgGr9Kbdql5KahR2+ZkzFVqZuChAI9lVM2YGU=; b=aMgvWOgTLHLCP1OQFVlyB9svDdIFt7txw3yKfMKjJSOeMFrBi9j+aJryUGDJiD1F7l DK5q8c/TnqUDaixwwJ0ZkRcSDAvgC4FxRy9ZOLK/vAATc1dPPMV306Jfgbq3hcoH7WOw eoKabGNoAClWUkoyTlKcT07vX9/ST769qVoiVHTkvBLygdbCP3iTqJye7o6v1JorI0hF vuBvbFWv9nC85SyMBqjMyRz8NCj6oaYg/Sw7wCLAg2phexGHolDr0vBPv0AkgqM5zsgS d5uAZHi1b1dpyUDwLWrKTML59IXZ8STTtYPjACgV1AMOpZGmS/ixCI4nksHohEmwyuPd hAlQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xEZFmD0D; 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 6a1803df08f44-6b7ac7c54f1si112231756d6.177.2024.07.23.13.40.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2024 13:40:18 -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=xEZFmD0D; 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 1sWMIT-000578-W3; Tue, 23 Jul 2024 16:39:46 -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 1sWMIQ-0004su-Tc for qemu-devel@nongnu.org; Tue, 23 Jul 2024 16:39:42 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sWMIP-0003yB-7w for qemu-devel@nongnu.org; Tue, 23 Jul 2024 16:39:42 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-427d8f1f363so34183875e9.2 for ; Tue, 23 Jul 2024 13:39:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1721767178; x=1722371978; 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=PVW3Gx4VWf1FcJPawzcx0DDSK91Xb6uFhCXhyBk+SmU=; b=xEZFmD0DTPUjTsBSWySthtoHcR2rj1cTmeg7RaOyDAjWEccmOXcSo8msHOJg9fuB9S n4godjE7L8/OIK27BGwWsW0ZQgQW6L6CZUEZtAxs5g4mh6bwaJOu4Z3n3jpy43NsXs3i s0kD7SOb9La/Di3I/EBHD5Z2dZNjI5PWjSRsR6GHfftNqsQ4xki6ISleAIO2H2q+OpfV fXIPnUtoEk2Q7q3Xp0BF5C0DaFQHe89KoKfjsN4x5OQcM2UntT3MlgKO6149LHjLvox4 geCVTfRUiN8nE4q9vqMHI+pbW3TVZQq4UMm+TDKNPdadkHokbkJvSx6p/0TMzohmePhd 4Ong== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721767178; x=1722371978; 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=PVW3Gx4VWf1FcJPawzcx0DDSK91Xb6uFhCXhyBk+SmU=; b=MX44lc2e0y2ZD7i5v4/mxSdQ5nNlbkIXVp9SODVK3BO8bUbItR4dRI+X17vm+m7YU0 OyBN0Qi9/j5yjjjmQJsU5zyVNcCQYTkOItXJqb5gDtz/X7reYdda0vKxkWRQK6VdtHos gklm6CeW+SIcf5xvhZI7PUouOn21WZFZmfS6QWijFJlGzjxkg/po49sMCTPx8tlqQCaY O5jY3GEojtHGPYoCiwddF5T/vZ3ytg5l4eZ05GGK/a3VqlL/aKG0vTK102pZw+0CtOjO o8VR37zKE7I/tMMZfvcjUnEr7QZPob9zgoSY0jos9W5V/OzTkTtYu8HjzRMjn59f9CvF um/A== X-Gm-Message-State: AOJu0Yxrt+yWpwLGd6roEbl8IFu4J9ce8LkM9Q4/Qw4CJQIoAdgwya1i JSmcp3mB/LrfpAgS62e8J1+ve9Sb2jksp/bsNd2tqj9ghnzXaxnadJynWAhRoI6eSQlEmXBaaBA fCOA= X-Received: by 2002:a05:600c:3ba9:b0:426:647b:1bfc with SMTP id 5b1f17b1804b1-427dc5584d8mr66747675e9.30.1721767178238; Tue, 23 Jul 2024 13:39:38 -0700 (PDT) Received: from localhost.localdomain (vbo91-h01-176-184-50-4.dsl.sta.abo.bbox.fr. [176.184.50.4]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427f935954fsm575655e9.9.2024.07.23.13.39.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 23 Jul 2024 13:39:37 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PULL 07/28] docs/interop/firmware.json: add new enum FirmwareFormat Date: Tue, 23 Jul 2024 22:38:34 +0200 Message-ID: <20240723203855.65033-8-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240723203855.65033-1-philmd@linaro.org> References: <20240723203855.65033-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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: Thomas Weißschuh Only a small subset of all blockdev drivers make sense for firmware images. Introduce and use a new enum to represent this. This also reduces the dependency on firmware.json from the global qapi definitions. Claim "Since: 3.0" for the new enum, because that's correct for its members, and the members are what matters in the interface. Suggested-by: Daniel P. Berrangé Reviewed-by: Daniel P. Berrangé Signed-off-by: Thomas Weißschuh Reviewed-by: Markus Armbruster Message-ID: <20240719-qapi-firmware-json-v6-1-c2e3de390b58@linutronix.de> Signed-off-by: Philippe Mathieu-Daudé --- docs/interop/firmware.json | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/docs/interop/firmware.json b/docs/interop/firmware.json index 54a1fc6c104..d5d4c17f230 100644 --- a/docs/interop/firmware.json +++ b/docs/interop/firmware.json @@ -15,7 +15,6 @@ ## { 'include' : 'machine.json' } -{ 'include' : 'block-core.json' } ## # @FirmwareOSInterface: @@ -200,6 +199,20 @@ 'enrolled-keys', 'requires-smm', 'secure-boot', 'verbose-dynamic', 'verbose-static' ] } +## +# @FirmwareFormat: +# +# Formats that are supported for firmware images. +# +# @raw: Raw disk image format. +# +# @qcow2: The QCOW2 image format. +# +# Since: 3.0 +## +{ 'enum': 'FirmwareFormat', + 'data': [ 'raw', 'qcow2' ] } + ## # @FirmwareFlashFile: # @@ -219,7 +232,7 @@ ## { 'struct' : 'FirmwareFlashFile', 'data' : { 'filename' : 'str', - 'format' : 'BlockdevDriver' } } + 'format' : 'FirmwareFormat' } } ##