qom: Fix missing interface in qemu-storage-daemon
v3 cover qom: Fix missing interface in qemu-storage-daemon
Attempt to fix the issue reported by Kevin.
Since v2:
- Rename function (lersek)
Since RFC(v1):
- Keep it local to hw/nvram (danpb)
- Based on Meson cleanup
Based-on: <[email protected]>
Base is available in the Git repository at:
https://gitlab.com/philmd/qemu.git branches/meson_libraries_consistency
Philippe Mathieu-Daudé (1):
hw/nvram: Always register FW_CFG_DATA_GENERATOR_INTERFACE
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
Signature · 1 line
2.26.2
PATCH v3 1/1 hw/nvram: Always register FW_CFG_DATA_GENERATOR_INTERFACE
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=qmp0 --monitor qmp0
{"QMP": {"version": {"qemu": {"micro": 50, "minor": 1, "major": 5}, "package": ""}, "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.
--- 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
hw/nvram/fw_cfg-interface.c new file +15 -0
@@ -0,0 +1,15 @@ +#include "qemu/osdep.h" +#include "hw/nvram/fw_cfg.h" + +static const TypeInfo fw_cfg_data_generator_interface_info = { + .parent =TYPE_INTERFACE , + .name =TYPE_FW_CFG_DATA_GENERATOR_INTERFACE , + .class_size =sizeof (FWCfgDataGeneratorClass), +}; + +static void fw_cfg_register_interfaces (void ) +{ +type_register_static (&fw_cfg_data_generator_interface_info); +} + +type_init (fw_cfg_register_interfaces)
hw/nvram/fw_cfg.c +0 -7
@@ -1360,18 +1360,11 @@ static const TypeInfo fw_cfg_mem_info = { .class_init = fw_cfg_mem_class_init, }; -static const TypeInfo fw_cfg_data_generator_interface_info = { - .parent =TYPE_INTERFACE , - .name =TYPE_FW_CFG_DATA_GENERATOR_INTERFACE , - .class_size =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); }type_init (fw_cfg_register_types)
MAINTAINERS +1 -1
@@ -2054,7 +2054,7 @@ R: Laszlo Ersek <[email protected]> R: Gerd Hoffmann <[email protected]> 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
hw/nvram/meson.build +3 -0
@@ -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'))
Signature · 1 line
2.26.2
Paolo Bonzini
AppliedRe: [PATCH v3 1/1] hw/nvram: Always register FW_CFG_DATA_GENERATOR_INTERFACE
Quoted 97 lines · Philippe Mathieu-Daudé
While the
FW_CFG_DATA_GENERATOR_INTERFACEis 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
69699f3055introduced 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=qmp0 --monitor qmp0 {"QMP": {"version": {"qemu": {"micro": 50, "minor": 1, "major": 5}, "package": ""}, "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 <[email protected]>Reviewed-by Laszlo Ersek <[email protected]>Fixes 69699f3055 ("crypto/tls-cipher-suites: Produce fw_cfg consumable blob")Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- 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.chw/nvram/fw_cfg-interface.c new file +15
-0@@ -0,0 +1,15 @@ +#include "qemu/osdep.h" +#include "hw/nvram/fw_cfg.h" + +static const TypeInfo fw_cfg_data_generator_interface_info = { + .parent =TYPE_INTERFACE , + .name =TYPE_FW_CFG_DATA_GENERATOR_INTERFACE , + .class_size =sizeof (FWCfgDataGeneratorClass), +}; + +static void fw_cfg_register_interfaces (void ) +{ +type_register_static (&fw_cfg_data_generator_interface_info); +} + +type_init (fw_cfg_register_interfaces)hw/nvram/fw_cfg.c +0
-7@@ -1360,18 +1360,11 @@ static const TypeInfo fw_cfg_mem_info = { .class_init = fw_cfg_mem_class_init, }; -static const TypeInfo fw_cfg_data_generator_interface_info = { - .parent =TYPE_INTERFACE , - .name =TYPE_FW_CFG_DATA_GENERATOR_INTERFACE , - .class_size =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); }type_init (fw_cfg_register_types)MAINTAINERS +1
-1@@ -2054,7 +2054,7 @@ R: Laszlo Ersek <[email protected]> R: Gerd Hoffmann <[email protected]> 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.hhw/nvram/meson.build +0
-0
hw/nvram/meson.build line 6
Quoted 6 lines
hw/nvram/meson.build +3
-0@@ -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'))
Queued, thanks.
Paolo
Re: [PATCH v3 1/1] hw/nvram: Always register FW_CFG_DATA_GENERATOR_INTERFACE
In reply to Philippe Mathieu-Daudéhw/nvram/fw_cfg-interface.c line 2
Quoted 4 lines · Philippe Mathieu-Daudé
+++
b/hw/nvram/fw_cfg-interface.chw/nvram/fw_cfg-interface.c new file +2
-0@@ -0,0 +1,15 @@ +#include "qemu/osdep.h" +#include "hw/nvram/fw_cfg.h"
License boilerplate missing.
r~
Re: [PATCH v3 1/1] hw/nvram: Always register FW_CFG_DATA_GENERATOR_INTERFACE
Quoted 7 lines · Richard Henderson
hw/nvram/fw_cfg-interface.c line 2
Quoted 4 lines · Philippe Mathieu-Daudé
+++
b/hw/nvram/fw_cfg-interface.chw/nvram/fw_cfg-interface.c new file +2
-0@@ -0,0 +1,15 @@ +#include "qemu/osdep.h" +#include "hw/nvram/fw_cfg.h" License boilerplate missing.
Grr. Paolo since you queued this, do you mind fixing directly?
Re: [PATCH v3 1/1] hw/nvram: Always register FW_CFG_DATA_GENERATOR_INTERFACE
Quoted 11 lines · Philippe Mathieu-Daudé
Quoted 7 lines · Richard Henderson
hw/nvram/fw_cfg-interface.c line 2
Quoted 4 lines · Philippe Mathieu-Daudé
+++
b/hw/nvram/fw_cfg-interface.chw/nvram/fw_cfg-interface.c new file +2
-0@@ -0,0 +1,15 @@ +#include "qemu/osdep.h" +#include "hw/nvram/fw_cfg.h" License boilerplate missing.
Grr. Paolo since you queued this, do you mind fixing directly?
Please write it here and I'll paste it in place.
Paolo
Re: [PATCH v3 1/1] hw/nvram: Always register FW_CFG_DATA_GENERATOR_INTERFACE
Quoted 10 lines · Paolo Bonzini
Quoted 9 lines · Philippe Mathieu-Daudé
Quoted 7 lines · Richard Henderson
hw/nvram/fw_cfg-interface.c line 2
Quoted 4 lines · Philippe Mathieu-Daudé
+++
b/hw/nvram/fw_cfg-interface.chw/nvram/fw_cfg-interface.c new file +2
-0@@ -0,0 +1,15 @@ +#include "qemu/osdep.h" +#include "hw/nvram/fw_cfg.h" License boilerplate missing.
Quoted 4 lines
Quoted 2 lines
Grr. Paolo since you queued this, do you mind fixing directly?
Please write it here and I'll paste it in place.
/*
* QEMU Firmware configuration device emulation (QOM interfaces) *
* Copyright 2020 Red Hat, Inc.
*
* SPDX-License-Identifier: GPL-2.0-or-later
*/
Thanks!
Phil.
Re: [PATCH v3 1/1] hw/nvram: Always register FW_CFG_DATA_GENERATOR_INTERFACE
In reply to Richard HendersonQuoted 10 lines · Richard Henderson
hw/nvram/fw_cfg-interface.c line 2
Quoted 4 lines · Philippe Mathieu-Daudé
+++
b/hw/nvram/fw_cfg-interface.chw/nvram/fw_cfg-interface.c new file +2
-0@@ -0,0 +1,15 @@ +#include "qemu/osdep.h" +#include "hw/nvram/fw_cfg.h" License boilerplate missing.
r~
Hrmpf, so easy to forget about that, especially in review :/ Thanks for catching it.
Laszlo
Re: [PATCH v3 1/1] hw/nvram: Always register FW_CFG_DATA_GENERATOR_INTERFACE
Quoted 9 lines · Laszlo Ersek
Quoted 8 lines · Richard Henderson
hw/nvram/fw_cfg-interface.c line 2
Quoted 4 lines · Philippe Mathieu-Daudé
+++
b/hw/nvram/fw_cfg-interface.chw/nvram/fw_cfg-interface.c new file +2
-0@@ -0,0 +1,15 @@ +#include "qemu/osdep.h" +#include "hw/nvram/fw_cfg.h" License boilerplate missing.
Quoted 4 lines
Quoted 2 lines
r~
Hrmpf, so easy to forget about that, especially in review :/
Although easily scriptable if we consider SPDX identifiers...
Quoted 5 lines
Thanks for
catching it.Laszlo
Re: [PATCH v3 1/1] hw/nvram: Always register FW_CFG_DATA_GENERATOR_INTERFACE
Quoted 10 lines · Philippe Mathieu-Daudé
Quoted 9 lines · Laszlo Ersek
Quoted 8 lines · Richard Henderson
hw/nvram/fw_cfg-interface.c line 2
Quoted 4 lines · Philippe Mathieu-Daudé
+++
b/hw/nvram/fw_cfg-interface.chw/nvram/fw_cfg-interface.c new file +2
-0@@ -0,0 +1,15 @@ +#include "qemu/osdep.h" +#include "hw/nvram/fw_cfg.h" License boilerplate missing.
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
r~
Hrmpf, so easy to forget about that, especially in review :/
Although easily scriptable if we consider SPDX identifiers...
... Hm, "scripts/checkpatch.pl" already checks for SPDX, but only as an exception to the ban on "//" comments :) See commit 8d061278d385 ("checkpatch: allow SPDX-License-Identifier", 2019-06-03).
Laszlo
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Type: series
Message-id: [email protected]
Subject: [PATCH v3 0/1] qom: Fix missing interface in qemu-storage-daemon
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
From https://github.com/patchew-project/qemu
- [tag update] patchew/[email protected] -> patchew/[email protected]
fatal: failed to write ref-pack file
fatal: The remote end hung up unexpectedly
Traceback (most recent call last):
File "patchew-tester2/src/patchew-cli", line 531, in test_one
git_clone_repo(clone, r["repo"], r["head"], logf, True)
File "patchew-tester2/src/patchew-cli", line 62, in git_clone_repo
subprocess.check_call(clone_cmd, stderr=logf, stdout=logf)
File "/opt/rh/rh-python36/root/usr/lib64/python3.6/subprocess.py", line 291, in check_call
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['git', 'clone', '-q', '/home/patchew2/.cache/patchew-git-cache/httpsgithubcompatchewprojectqemu-3c8cf5a9c21ff8782164d1def7f44bd888713384', '/var/tmp/patchew-tester-tmp-ttyqifjv/src']' returned non-zero exit status 128.
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]