From nobody Sat May 18 04:30:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601998608; cv=none; d=zohomail.com; s=zohoarc; b=CgTSIO1MemBEfi0H6Vs0gFlRoV2ma1CRyp8S4VyeGExzG5ixdzNgJyeuixrMwPHePM0ya7dceY3Fb4a3Bm3bK9pBzl257UEVUua9u50nSN3ObF/suH6giFZLA3lh2aGRvROASlf6cFVq47Y6bz888vGV+i2I8R09Snce/8nffMw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601998608; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=A2NhhHmyKoCsBTvmZ7fN8i5on5WUvhiptL/RbfJsOjA=; b=YMec3IRo/rveAE+6+KfeHJkSAEUY1sneojBUB15WPNGhpO75cwQBZul9L+9uZD4QwribPTduPYSeFU1XnnCTd/Xk/aKmfOZoe9DH6nhPZsKeE34XOmUqyrWDUdrpwlANTX4/SW0rPBp6mPBW/8B0OhFWjckiy0vn65QGC9XtQD4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1601998608045154.69267088814456; Tue, 6 Oct 2020 08:36:48 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-258-suIXxVUkMCeQ0rvLheWLwA-1; Tue, 06 Oct 2020 11:36:45 -0400 Received: by mail-wr1-f69.google.com with SMTP id v5so5536183wrr.0 for ; Tue, 06 Oct 2020 08:36:45 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id x64sm4599526wmg.33.2020.10.06.08.36.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 08:36:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601998606; 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: in-reply-to:in-reply-to:references:references; bh=A2NhhHmyKoCsBTvmZ7fN8i5on5WUvhiptL/RbfJsOjA=; b=ZjzEZBBze5ZrNoq3yk4K7I5bRSqkrisYjbUcq1BZkBX4BE27S0K+NYdqkH7zUitDj5N3rH OKC7Joq8hJ7KP7/P8pUauAzEierM2FZ5KvR+2P7xiQpMEvXmH+0BRIaKWNGtEeIXQ/AnRy hm36Kd1/aP1z6/ikQTQf6PCK6TPpPsg= X-MC-Unique: suIXxVUkMCeQ0rvLheWLwA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=A2NhhHmyKoCsBTvmZ7fN8i5on5WUvhiptL/RbfJsOjA=; b=pMnhukrMY4MvP2h9EyBByljDpjw4E3z8JEnw522nE1lObxpQfwiWWUSHz3OaEWPElN CvWpRkH5X9IWUgjTpIyt2XUk3O2Ss6qdvRSv9wb4L5TdggSaFMK2Wqvh3WetfL5bhv40 MIpllW4xYm10ySyoiTnijz3jWep3vOeDUcz6X4T638AReu8S1NxBRnfmiKks2jTUyq4w ReKjScpE4/2ligmdk5GCP6Si2lttvodG3c4fiZ0WOB0XMiksl6o39t+pKnF7rvM3GxcX 7U3+6Q89caDhe6sSVxHvK0JVL7L0zIKlp0cJ5zkzGzaFk2a0sSX2CR1iTCQpSj3tO5Dl Cbxg== X-Gm-Message-State: AOAM5307YapZigwoKwFezj9KtELjeomDAyHIPFG7NlD2p4yoGRkbirGz 3hYoCFAns4PUjoehE2r80+vob8Y0mGRK3e3Jad612+jXDXE8Y4Ca+QOXdqO4g+n3fxxkdQEppo7 EQLLcn7E1HxJnKg== X-Received: by 2002:a1c:a444:: with SMTP id n65mr5411401wme.122.1601998603931; Tue, 06 Oct 2020 08:36:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzE1afOkEaLvCyOXRNcmsc2zAsFDK9aCgvWyWFJrqIZKeaSKDJHTn6WL9oI+4kBM3+FLAvbKw== X-Received: by 2002:a1c:a444:: with SMTP id n65mr5411379wme.122.1601998603674; Tue, 06 Oct 2020 08:36:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Laszlo Ersek , Paolo Bonzini , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kevin Wolf Subject: [PATCH v3 1/1] hw/nvram: Always register FW_CFG_DATA_GENERATOR_INTERFACE Date: Tue, 6 Oct 2020 17:36:36 +0200 Message-Id: <20201006153636.2383248-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201006153636.2383248-1-philmd@redhat.com> References: <20201006153636.2383248-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) While the FW_CFG_DATA_GENERATOR_INTERFACE is only consumed by a device only available using system-mode (fw_cfg), it is implemented by a crypto component (tls-cipher-suites) which is always available when crypto is used. Commit 69699f3055 introduced the following error in the qemu-storage-daemon binary: $ echo -e \ '{"execute": "qmp_capabilities"}\r\n{"execute": "qom-list-types"}\r\n{"= execute": "quit"}\r\n' \ | storage-daemon/qemu-storage-daemon --chardev stdio,id=3Dqmp0 --monit= or qmp0 {"QMP": {"version": {"qemu": {"micro": 50, "minor": 1, "major": 5}, "pack= age": ""}, "capabilities": ["oob"]}} {"return": {}} missing interface 'fw_cfg-data-generator' for object 'tls-creds' Aborted (core dumped) Since QOM dependencies are resolved at runtime, this issue could not be triggered at linktime, and we don't have test running the qemu-storage-daemon binary. Fix by always registering the QOM interface. Reported-by: Kevin Wolf Reviewed-by: Laszlo Ersek Fixes: 69699f3055 ("crypto/tls-cipher-suites: Produce fw_cfg consumable blo= b") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/nvram/fw_cfg-interface.c | 15 +++++++++++++++ hw/nvram/fw_cfg.c | 7 ------- MAINTAINERS | 2 +- hw/nvram/meson.build | 3 +++ 4 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 hw/nvram/fw_cfg-interface.c diff --git a/hw/nvram/fw_cfg-interface.c b/hw/nvram/fw_cfg-interface.c new file mode 100644 index 0000000000..bcc7b1edbc --- /dev/null +++ b/hw/nvram/fw_cfg-interface.c @@ -0,0 +1,15 @@ +#include "qemu/osdep.h" +#include "hw/nvram/fw_cfg.h" + +static const TypeInfo fw_cfg_data_generator_interface_info =3D { + .parent =3D TYPE_INTERFACE, + .name =3D TYPE_FW_CFG_DATA_GENERATOR_INTERFACE, + .class_size =3D sizeof(FWCfgDataGeneratorClass), +}; + +static void fw_cfg_register_interfaces(void) +{ + type_register_static(&fw_cfg_data_generator_interface_info); +} + +type_init(fw_cfg_register_interfaces) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 0e95d057fd..08539a1aab 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -1360,18 +1360,11 @@ static const TypeInfo fw_cfg_mem_info =3D { .class_init =3D fw_cfg_mem_class_init, }; =20 -static const TypeInfo fw_cfg_data_generator_interface_info =3D { - .parent =3D TYPE_INTERFACE, - .name =3D TYPE_FW_CFG_DATA_GENERATOR_INTERFACE, - .class_size =3D sizeof(FWCfgDataGeneratorClass), -}; - static void fw_cfg_register_types(void) { type_register_static(&fw_cfg_info); type_register_static(&fw_cfg_io_info); type_register_static(&fw_cfg_mem_info); - type_register_static(&fw_cfg_data_generator_interface_info); } =20 type_init(fw_cfg_register_types) diff --git a/MAINTAINERS b/MAINTAINERS index b76fb31861..a45d908ebd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2054,7 +2054,7 @@ R: Laszlo Ersek R: Gerd Hoffmann S: Supported F: docs/specs/fw_cfg.txt -F: hw/nvram/fw_cfg.c +F: hw/nvram/fw_cfg*.c F: stubs/fw_cfg.c F: include/hw/nvram/fw_cfg.h F: include/standard-headers/linux/qemu_fw_cfg.h diff --git a/hw/nvram/meson.build b/hw/nvram/meson.build index 1f2ed013b2..fd2951a860 100644 --- a/hw/nvram/meson.build +++ b/hw/nvram/meson.build @@ -1,3 +1,6 @@ +# QOM interfaces must be available anytime QOM is used. +qom_ss.add(files('fw_cfg-interface.c')) + softmmu_ss.add(files('fw_cfg.c')) softmmu_ss.add(when: 'CONFIG_CHRP_NVRAM', if_true: files('chrp_nvram.c')) softmmu_ss.add(when: 'CONFIG_DS1225Y', if_true: files('ds1225y.c')) --=20 2.26.2