From nobody Sat Feb 7 03:54:09 2026 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=1601895293; cv=none; d=zohomail.com; s=zohoarc; b=S2KNx6Z1bDtfprqdCC0azoED6ayIyw6rBQvVz6kTLPCGz8I6bMQbhSidApK2yNRW8L6ldnrw7FIE6fIYc3QBnigebpeemJqdv0LSHHYl2kireWkqrJKSM/zr6Dd6CG4FKn7WeYXTDg5JPZkmX2nEAWbdCMtJRWEtGjhljGdjU+M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601895293; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=S6WO5CjQSd0ltN/dEHJ0VgZWTVaEIexhMUGPC2p0bOQ=; b=LuGwgUIYdU1amdp3HXuY1H21V5rZyvTjo/Sw7+t64nayFPycscGkzxOLTvivWsmmhX+tpW8QL2ozYwBcLqS2jmScnaLCON54452zGCXJ8AmBtUn0cGfp/SBDdWbGbeRNjmPFTcDoXgpDwarYgBUfCy1P/GUiF7juJ2iLO3KEIX4= 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 1601895293885124.22637109862387; Mon, 5 Oct 2020 03:54:53 -0700 (PDT) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-528-G4KCA-vQN1uuqdSVGaRJcg-1; Mon, 05 Oct 2020 06:54:50 -0400 Received: by mail-wm1-f71.google.com with SMTP id 21so1309123wma.7 for ; Mon, 05 Oct 2020 03:54:50 -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 l3sm12735066wmh.27.2020.10.05.03.54.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2020 03:54:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601895292; 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=S6WO5CjQSd0ltN/dEHJ0VgZWTVaEIexhMUGPC2p0bOQ=; b=PKpoe5/3lvAfSVOeel+SzGP+3fEQl/4BBuACLrFEKxHMDttlUamJtN7AGDMyMwsSfyQTeI tfyU3ed1VFI0YrFOTvxJlCsiZT8m2WDZLcd48JFHBjGqOpUn9Pocy2gcdTdQysEipBOLdt SiykQ5MgABxto7IOwgIFTX8fq7Eyit8= X-MC-Unique: G4KCA-vQN1uuqdSVGaRJcg-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=S6WO5CjQSd0ltN/dEHJ0VgZWTVaEIexhMUGPC2p0bOQ=; b=fxa3iayNrCr405kN/DPKFRoF+CMomzGz8amD0W0TM+SVeC4i6bxAr6ELpE4okh+Kkr DasWWaEfj9IQm5/bIftaUMIMgLceJHkp6ssrtG/Mok4REPyJWreQKT1jK1oODrWQk5hM GUtDfwj+ULgHDHEKlYd/+MG6vxmdJdbJCWWH7lNlvdsBLUtubTLZjbbQwjVnqBdji2N9 fzIx5U6BstYsuyY9aNFhebXajT0A04VvCHb8u65ZXWd/I8nSd0lKTEdzSLkgNgoVtKWw Ar23Q46Jc2S9jz9GRPeuNmACLX7VBG5uklVhZm1amGJBgjCgob1FI5RmlxAcFTM4e9gm v/bA== X-Gm-Message-State: AOAM530m2KRKMx2GcLCSD8pn/E6JZDa8qbn4K2qPpLkSs5/y+BK797of 4sJd9aTClGWUmziJTRtRdWr/+OBCIXgdBKtxdD38LLq5wGB0t6+SizlroPUB2rl1kW4+R5zPCFu FYfEIFPG5RTu3tg== X-Received: by 2002:a5d:468f:: with SMTP id u15mr16771327wrq.336.1601895289412; Mon, 05 Oct 2020 03:54:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz1UoGi9Et5W6FMxnMCa6hx7cXiKRg3yVI532O2fSZTwbnsMAT6RzwE1Gd52qJX6GNzdx5i9w== X-Received: by 2002:a5d:468f:: with SMTP id u15mr16771298wrq.336.1601895289176; Mon, 05 Oct 2020 03:54:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Kevin Wolf , "Daniel P . Berrange" , qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Eduardo Habkost , Paolo Bonzini , Laszlo Ersek , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Subject: [RFC PATCH 1/3] qom: Always register FW_CFG_DATA_GENERATOR_INTERFACE Date: Mon, 5 Oct 2020 12:54:40 +0200 Message-Id: <20201005105442.2093105-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201005105442.2093105-1-philmd@redhat.com> References: <20201005105442.2093105-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 Fixes: 69699f3055 ("crypto/tls-cipher-suites: Produce fw_cfg consumable blo= b") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- I first used: +if config_host.has_key('CONFIG_GNUTLS') or have_system + qom_ss.add(files('fw_cfg_interface.c')) +endif but then realized anything could implement a QOM interface, so better keep this generic. --- hw/nvram/fw_cfg.c | 7 ------- qom/fw_cfg_interface.c | 15 +++++++++++++++ MAINTAINERS | 1 + qom/meson.build | 5 +++++ 4 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 qom/fw_cfg_interface.c 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/qom/fw_cfg_interface.c b/qom/fw_cfg_interface.c new file mode 100644 index 0000000000..2b19502ffe --- /dev/null +++ b/qom/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_types(void) +{ + type_register_static(&fw_cfg_data_generator_interface_info); +} + +type_init(fw_cfg_register_types) diff --git a/MAINTAINERS b/MAINTAINERS index b76fb31861..9c89d54b41 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2055,6 +2055,7 @@ R: Gerd Hoffmann S: Supported F: docs/specs/fw_cfg.txt F: hw/nvram/fw_cfg.c +F: qom/fw_cfg_interface.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/qom/meson.build b/qom/meson.build index a1cd03c82c..7335f8c8a2 100644 --- a/qom/meson.build +++ b/qom/meson.build @@ -7,6 +7,11 @@ qom_ss.add(files( 'qom-qobject.c', )) =20 +# interfaces any object might implement +qom_ss.add(files( + 'fw_cfg_interface.c', +)) + qmp_ss.add(files('qom-qmp-cmds.c')) softmmu_ss.add(files('qom-hmp-cmds.c')) =20 --=20 2.26.2 From nobody Sat Feb 7 03:54:09 2026 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=1601895298; cv=none; d=zohomail.com; s=zohoarc; b=PwyiJaLyy/V+TVU62gs8AMQBTSVve/1fK584tR6cc/eWQ5qffUom55A8yhkhbC3K4gIZs5mZ98hmlOfi//ERE5hSagyrFxXO9Fhkgybn3uY6Nq2BLNq2MG5nN3MWFlnfHShJSVgz7xXG/qJOezYiseVJRjyZwvuABgGi73PQwco= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601895298; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=m8MSMvH0EGCYLgtqlWbOI3p4RLhGZ+KMS1a1Fylf9ro=; b=Gt5TWLiVds+DS7DKwlz/cOT7MLB2kFyd8sQ0hUjeRQT1vyzy3XPAa28Gr9vpiyVBryUZl8MPUdDKJy5TcUXjBXB1nRSfKcEaIX97teq7tsvmNzBW3E/Dq9Gka0bXutqU9WCTw18y+qpmeJyIdGYge/F39XbsofFYmuXpHqcOdac= 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 1601895298541835.2369949152932; Mon, 5 Oct 2020 03:54:58 -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-2-73ML_LfqOxiAfWk5aZSHPg-1; Mon, 05 Oct 2020 06:54:55 -0400 Received: by mail-wr1-f69.google.com with SMTP id v5so3869128wrr.0 for ; Mon, 05 Oct 2020 03:54:55 -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 q2sm3640992wrw.40.2020.10.05.03.54.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2020 03:54:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601895297; 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=m8MSMvH0EGCYLgtqlWbOI3p4RLhGZ+KMS1a1Fylf9ro=; b=i6kmcmEmhtdREccXEMG1fN4hO0neFMxnCyDwaC2xmyh5dDh8oFooilRb3YlrkDy2TNcpl9 G6GGYwh1ydFM0F7Tmfr42d+40RbCHihuyyEpuct20RoU4MG0+286HQAqcHkBv6sejWtg0g K1ztGUVKcvH94f3w4W4K95Jkz653mEU= X-MC-Unique: 73ML_LfqOxiAfWk5aZSHPg-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=m8MSMvH0EGCYLgtqlWbOI3p4RLhGZ+KMS1a1Fylf9ro=; b=RlsZ6+v5PHTVSwz3NTOWZYvl36Jxihuy3dlwCsk/w5gcuDGunGQNTpCp1fvwBgwPBe 1+zA1ECN8ax039fYUD0etCMuR4Ixn7Rq38FVkSz6St9VM2VLhSlKOfFuJaRW46++0FQi bgaPvSdvwsDn95L2bXndJ5asKLFCAjXbyN9P935kKENzT7M4Qat3lcJjQSDTAxjvUUhP 4bDfnzfp8EqgymNRzX1Zf+ALDTDOvsm/G2iLT4thId6lRKJTC9OluBMGHF98DLb3hKJV mvz8vZam8cYmP1pHtjWN/FhGf5aHqQwdaJUvuhdoB+hnLQhdFRK37DapQLKEn/LK61vH yuaQ== X-Gm-Message-State: AOAM5303ByGNzsOBibhTCwUx2Gl3BHAXnfXMdoIj3F1SbFAGuwC6Y2Mf 4eBfBHAUv1DsyCXjZ9vBhx4xvaOyasOL4wD8ZI+Br2ubTTng1GPvG97zxHrtYDR0Vx5C3tge4Lu V81Eykp84T1JGVQ== X-Received: by 2002:a5d:51ca:: with SMTP id n10mr17005547wrv.222.1601895294375; Mon, 05 Oct 2020 03:54:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx5I1CyuSubTUSQDDYiGGWISM9QKMHHSJxB5MgymvpXAzBUx49+X69fI5+2zxRSaJqWgqK3YQ== X-Received: by 2002:a5d:51ca:: with SMTP id n10mr17005533wrv.222.1601895294236; Mon, 05 Oct 2020 03:54:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Kevin Wolf , "Daniel P . Berrange" , qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Eduardo Habkost , Paolo Bonzini , Laszlo Ersek , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Subject: [RFC PATCH 2/3] tests: Only build socket_scm_helper when a softmmu target is available Date: Mon, 5 Oct 2020 12:54:41 +0200 Message-Id: <20201005105442.2093105-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201005105442.2093105-1-philmd@redhat.com> References: <20201005105442.2093105-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) Do not try to build socket_scm_helper if not softmmu target is available. This fixes: $ make check-block Generating qemu-version.h with a meson_exe.py custom command make: *** No rule to make target 'tests/qemu-iotests/socket_scm_helper', = needed by 'check-block'. Stop. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/Makefile.include | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/Makefile.include b/tests/Makefile.include index 40d909badc..d257777560 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -136,7 +136,9 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-v= m-images check: =20 ifeq ($(CONFIG_TOOLS)$(CONFIG_POSIX),yy) +ifneq ($(TARGET_DIRS),) QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) =3D tests/qemu-iotests/socket_scm_hel= per$(EXESUF) +endif check: check-block check-block: $(SRC_PATH)/tests/check-block.sh qemu-img$(EXESUF) \ qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \ --=20 2.26.2 From nobody Sat Feb 7 03:54:09 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1601895303; cv=none; d=zohomail.com; s=zohoarc; b=lRAxuf1QO8rSkBpohKwCpz3WLjl1qxCymcqgp/aIgjmlgNaCQrJFFkfoh8jDsLa2k91LxwIR8UNOMPIJakCXeO2KQg0uHXrq+8sTkYRkOGCIlEtM9q6boIqZ4wBR0+M/v7GccVaCcYo+mEh/u8VuiASNOH4kp2KXhha/aWM+cTo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601895303; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=/z9yRp8+WHql3Xgj+kTqlTxcqqInaLF1iEEzvMMLOY8=; b=NtelaG3bA3G+pJCxYL7Rm2Mtvz1z/QuITHxhAMhEUxgi0fsQ8b1eHUu2EAA1LqX0kS5irbDPuVPWinxMrG5JjbEFGVdgxsw61ctgyGRLmwZPhbxF+aNhsMN68JnCYivBbFB7blxfCgt01/RAXKGR73N/GvKWh+//QJUlwlQWlf0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1601895303305557.1264319979975; Mon, 5 Oct 2020 03:55:03 -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-203-NSSc9RRFOv-H8jjMMb2uAg-1; Mon, 05 Oct 2020 06:55:00 -0400 Received: by mail-wr1-f69.google.com with SMTP id d13so3822329wrr.23 for ; Mon, 05 Oct 2020 03:55:00 -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 a15sm13811809wrn.3.2020.10.05.03.54.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2020 03:54:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601895302; 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=/z9yRp8+WHql3Xgj+kTqlTxcqqInaLF1iEEzvMMLOY8=; b=hqAvztmErrmA0gddHWR52YuDk0zRxaiqdCgke1UODTscU6FO8llP3OXElU3jvcVfCJJ8iU u8J74+OaLvRAd1jqRPwV6GZJ/z880tk0proHM06nCBvVbhSBPmAJc2ZzTneU8b7lMxG2yq QwZNvcMc4VpDDF4wq+kec5dWnI5moME= X-MC-Unique: NSSc9RRFOv-H8jjMMb2uAg-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=/z9yRp8+WHql3Xgj+kTqlTxcqqInaLF1iEEzvMMLOY8=; b=TV/DSoU5FWcdhVmuTavd7pSarVyCBFxazjyi15+TEmPtQpMdpgLVswJnOhNjD8gk5y PZhgGwV33Pn3+5ElX8SVh8Ej6hVwb3TUGjsujEIGo5j7XgvigNbujqlJ1ZShrXj0dVSe Fws24bq/ot1AaKui7QoY22BVYQOrZavILNCN80aeiyXxhn9VLmoafnbTxxJ1tV2Uz04u A7IJ+BrRe4cwbsRm9k5izbjd+iQDjIKf5U8Z0VVt78FFqRQyy1Gh3rdGxIqOPzSAAwf6 S5EbckNBxLV74eDtO0aU4duFM/5lCkF2/FGFSufRSOLDG6YDcxMsqNTiQcAmqX1i4VNX jWIg== X-Gm-Message-State: AOAM532sOPd1YG7+FXo/zDdp5b8BAQRPRIGB/BbYYjdn/etjr7rnZVcu NeqUxJMV7+tY4fr3iC4ZIpMeOruFGlPMGTKg5Fy4ujLPW+wMwMkxHA+6TLIy1NH6pcfLlvEOVTJ IkIJuHK7RCdj+ag== X-Received: by 2002:a1c:a949:: with SMTP id s70mr6315256wme.17.1601895299456; Mon, 05 Oct 2020 03:54:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzReQJ75SoObycGxzGbogKef3teUeSgq/xjMcZfRZMX1mVnciDi3ttxM3qyhlYq80FpIZK4Mw== X-Received: by 2002:a1c:a949:: with SMTP id s70mr6315241wme.17.1601895299253; Mon, 05 Oct 2020 03:54:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Kevin Wolf , "Daniel P . Berrange" , qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Eduardo Habkost , Paolo Bonzini , Laszlo Ersek , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Subject: [RFC PATCH 3/3] tests: Add a trivial qemu-storage-daemon test Date: Mon, 5 Oct 2020 12:54:42 +0200 Message-Id: <20201005105442.2093105-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201005105442.2093105-1-philmd@redhat.com> References: <20201005105442.2093105-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) This test fails on top of commit 69699f3055 ("crypto/tls-cipher-suites: Produce fw_cfg consumable blob") because the TYPE_FW_CFG_DATA_GENERATOR_INTERFACE registered in hw/nvram/fw_cfg.c is not linked into qemu-storage-daemon: $ make check-block Generating qemu-version.h with a meson_exe.py custom command qemu-storage-daemon tests/qemu-storage-daemon.sh: line 10: 2089929 Aborted (c= ore dumped) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/Makefile.include | 3 +++ tests/qemu-storage-daemon.sh | 10 ++++++++++ 2 files changed, 13 insertions(+) create mode 100755 tests/qemu-storage-daemon.sh diff --git a/tests/Makefile.include b/tests/Makefile.include index d257777560..be12581c77 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -142,7 +142,10 @@ endif check: check-block check-block: $(SRC_PATH)/tests/check-block.sh qemu-img$(EXESUF) \ qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \ + storage-daemon/qemu-storage-daemon \ $(patsubst %-softmmu,qemu-system-%,$(filter %-softmmu,$(TARGET_DIRS))) + $(call quiet-command, \ + $(SRC_PATH)/tests/qemu-storage-daemon.sh, "qemu-storage-daemon") @$< endif =20 diff --git a/tests/qemu-storage-daemon.sh b/tests/qemu-storage-daemon.sh new file mode 100755 index 0000000000..9fd4c73400 --- /dev/null +++ b/tests/qemu-storage-daemon.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +# Test all QOM dependencies are resolved +storage-daemon/qemu-storage-daemon \ + --chardev stdio,id=3Dqmp0 --monitor qmp0 \ + > /dev/null << 'EOF' +{"execute": "qmp_capabilities"} +{"execute": "qom-list-types"} +{"execute": "quit"} +EOF --=20 2.26.2