From nobody Sun Oct 5 15:58:54 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1602257219; cv=none; d=zohomail.com; s=zohoarc; b=fWa999qO8esPdSm4me25WMJWH9tIi7oDtQmlXkve5ANAlXMt5Vr/lXLmdiiJlVu5BI4QIbyGfagbvR+cTnFKWznP5qM7YEstwmg/ExbCqjWE5xX+QJdek3NYY1pY1jdMd0fRdXh/LsAfz9ehm+d5B6CFWy2+INIIcFNxXMiyChY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602257219; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=08zsfYWtZRLRbA3Dlw0TDOVX/mcKu0cviKGwZPay0ZI=; b=XxJxKcx4aDj09BopnInNanPy36fMcNKAbdTOD8fzKFULO8fpwoDAtSGV1z9MuzVfo9EUdv6oWMGcVq7X8mGoeQowG0clsihNlQ3HqW4pmS6BTogbBv+e8e/93Qccdnhdg8tEj0GeNhKs9aoPpTHpWKONY87CCSktmpowf8flbJQ= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602257219811336.80653908776446; Fri, 9 Oct 2020 08:26:59 -0700 (PDT) Received: from localhost ([::1]:38464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQuIM-0003v7-J6 for importer@patchew.org; Fri, 09 Oct 2020 11:26:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQuCr-0006va-S1 for qemu-devel@nongnu.org; Fri, 09 Oct 2020 11:21:17 -0400 Received: from mx2.suse.de ([195.135.220.15]:56850) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQuCm-0004hL-Li for qemu-devel@nongnu.org; Fri, 09 Oct 2020 11:21:17 -0400 Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 23D91ABE3; Fri, 9 Oct 2020 15:21:10 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Claudio Fontana To: Paolo Bonzini Subject: [RFC v1 1/4] tests/Makefile.include: unbreak non-tcg builds Date: Fri, 9 Oct 2020 17:21:05 +0200 Message-Id: <20201009152108.16120-2-cfontana@suse.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201009152108.16120-1-cfontana@suse.de> References: <20201009152108.16120-1-cfontana@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=195.135.220.15; envelope-from=cfontana@suse.de; helo=mx2.suse.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/08 23:20:51 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x (no timestamps) [generic] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Pavel Dovgalyuk , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini XXX known to be wrong, this breaks other non-native builds remove dependency of check-block from non-native archs --- tests/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 5aca98e60c..1ca70d88ce 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -140,7 +140,7 @@ QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) =3D tests/qemu-iot= ests/socket_scm_helper$(EXE check: check-block check-block: $(SRC_PATH)/tests/check-block.sh qemu-img$(EXESUF) \ qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y) \ - $(patsubst %-softmmu,qemu-system-%,$(filter %-softmmu,$(TARGET_DIRS))) + qemu-system-$(patsubst ppc64%,ppc64, $(shell uname -m)) @$< endif =20 --=20 2.26.2 From nobody Sun Oct 5 15:58:54 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1602257130; cv=none; d=zohomail.com; s=zohoarc; b=i4iHBS0GeM3ii07KfauyYn789N2UN9rIzq8csqOUn4/ml0thiETZIaxPb9453h2s31h0Esv8szOOy14rXA1uouir/CVNImtqgujWgwwO3uGGpKIGDZyvlN0+6m6Stfh5ptgFqw9j22GcKKAg5WkR0drGDtzT1Et1fnYnpUPGOhI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602257130; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YuiinnnrSNOoDlS+a27KgYp/Syd4bjmm9kiSreV6rq8=; b=eTbz7WluUPDo4+tpCT1RpzjQPkczmy27LShvflh7gTM3EX+6mfnFjjEC95cwaB6LCLiZ7NTAaqc9+SddMDM+Cq+KBPf6KOLZX0tnHb77Ighp9zx24D6mZBUIQpSsMZ+zTGmviI7f5HuloZz/uQNAzWGqAPF4sLiF6HRgwzuRKfg= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602257130037347.96075224574145; Fri, 9 Oct 2020 08:25:30 -0700 (PDT) Received: from localhost ([::1]:34336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQuGu-0002AA-O9 for importer@patchew.org; Fri, 09 Oct 2020 11:25:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQuCq-0006uQ-Gn for qemu-devel@nongnu.org; Fri, 09 Oct 2020 11:21:16 -0400 Received: from mx2.suse.de ([195.135.220.15]:56870) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQuCm-0004hQ-Lr for qemu-devel@nongnu.org; Fri, 09 Oct 2020 11:21:16 -0400 Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 7801DAC8C; Fri, 9 Oct 2020 15:21:10 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Claudio Fontana To: Paolo Bonzini Subject: [RFC v1 2/4] qtest: unbreak non-TCG builds in bios-tables-test Date: Fri, 9 Oct 2020 17:21:06 +0200 Message-Id: <20201009152108.16120-3-cfontana@suse.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201009152108.16120-1-cfontana@suse.de> References: <20201009152108.16120-1-cfontana@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=195.135.220.15; envelope-from=cfontana@suse.de; helo=mx2.suse.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/08 23:20:51 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x (no timestamps) [generic] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Pavel Dovgalyuk , Claudio Fontana , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" the tests assume TCG is available, thus breaking for TCG-only tests, where only the TCG accelerator option is passed to the QEMU binary. Suggested-by: Paolo Bonzini Signed-off-by: Claudio Fontana Acked-by: Paolo Bonzini --- tests/qtest/bios-tables-test.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index e15f36c8c7..e783da54ba 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -122,6 +122,9 @@ static void free_test_data(test_data *data) { int i; =20 + if (!data->tables) { + return; + } for (i =3D 0; i < data->tables->len; ++i) { cleanup_table_descriptor(&g_array_index(data->tables, AcpiSdtTable= , i)); } @@ -651,6 +654,13 @@ static void test_acpi_one(const char *params, test_dat= a *data) char *args; bool use_uefi =3D data->uefi_fl1 && data->uefi_fl2; =20 +#ifndef CONFIG_TCG + if (data->tcg_only) { + g_test_skip("TCG disabled, skipping ACPI tcg_only test"); + return; + } +#endif /* CONFIG_TCG */ + if (use_uefi) { /* * TODO: convert '-drive if=3Dpflash' to new syntax (see e33763be7= cd3) --=20 2.26.2 From nobody Sun Oct 5 15:58:54 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1602257010; cv=none; d=zohomail.com; s=zohoarc; b=KE+U+otHXOuz6xxdqEym9QH5kpE00gKD+PYL/eB3Obr64hdbTnbdpbuhRFxWutq3aPOfjSOmjef85rTt33sEVlS4o5DqydGWwJcJBS7aqWNsmAleAVt5uwN4eYWK8dAW7YLjSDLViu2nI81jhwKtQ+1epp31u9eB23DwBEraogo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602257010; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iJL8FQIDnwCvALoKgIouNeDT8ZID9k19FWv9RqFzI1s=; b=UB8Y1WNStwBUKNyBuC/LFivs4n0cHke9bjubjMC6ckAKk72gt7JOIP1x3Yh86rGo6vBHQ0EZgU3gsnTZng0NfjwPNfMZHs0jEdqDu9STeH5abihCHeD2kbDDAkRZvqfb94gNr/RgBiIgdKYElDz/wShgsLbUWHt/8tzQ18Vy69I= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602257010108451.8621570616224; Fri, 9 Oct 2020 08:23:30 -0700 (PDT) Received: from localhost ([::1]:56686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQuEy-00086m-Gi for importer@patchew.org; Fri, 09 Oct 2020 11:23:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQuCo-0006uB-OA for qemu-devel@nongnu.org; Fri, 09 Oct 2020 11:21:14 -0400 Received: from mx2.suse.de ([195.135.220.15]:56886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQuCm-0004hb-L8 for qemu-devel@nongnu.org; Fri, 09 Oct 2020 11:21:14 -0400 Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id CDD70B245; Fri, 9 Oct 2020 15:21:10 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Claudio Fontana To: Paolo Bonzini Subject: [RFC v1 3/4] qtest: do not build ide-test if TCG is not available Date: Fri, 9 Oct 2020 17:21:07 +0200 Message-Id: <20201009152108.16120-4-cfontana@suse.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201009152108.16120-1-cfontana@suse.de> References: <20201009152108.16120-1-cfontana@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=195.135.220.15; envelope-from=cfontana@suse.de; helo=mx2.suse.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/08 23:20:51 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x (no timestamps) [generic] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Pavel Dovgalyuk , Claudio Fontana , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" it seems that ide-test depends on TCG currently. Signed-off-by: Claudio Fontana --- tests/qtest/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index ad33ac311d..3418f65e2a 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -46,9 +46,9 @@ qtests_i386 =3D \ (config_all_devices.has_key('CONFIG_TPM_TIS_ISA') ? ['tpm-tis-test'] : [= ]) + \ (config_all_devices.has_key('CONFIG_TPM_TIS_ISA') ? ['tpm-tis-swtpm-test= '] : []) + \ (config_all_devices.has_key('CONFIG_RTL8139_PCI') ? ['rtl8139-test'] : [= ]) + \ + (config_all.has_key('CONFIG_TCG') ? ['ide-test'] : []) + = \ qtests_pci + = \ ['fdc-test', - 'ide-test', 'hd-geo-test', 'boot-order-test', 'bios-tables-test', --=20 2.26.2 From nobody Sun Oct 5 15:58:54 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1602257012; cv=none; d=zohomail.com; s=zohoarc; b=cqW8Lh3r0R7YGHa3cn9RJA5SIsp61qWw0U36qQExYEv0Uc5a8MYzp7Ptr3O6h7vw5fOTeUd3zoIyx1q8yMPdlgm0vTP95ZAMNtWfxN+SMyc2vC0EKvEZvKAQ9uLdnhYdlx8IwS/ZAt15ujwE7K5wDB8z7YCURUEivNsBYn2RS70= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602257012; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MurCO9W3FHPnPfpkAkCqQ6WUtjDwwKgOwnVbr9SEmWA=; b=ZL/4g7ywrc/kvp+P1DHDE7D9vd3fqhJ2puTUb2fSEQtxOZmX82G9Xcx91WCiya0IYZ2f73i8p+KMpHuLkqC0FLSsPaWqYze9JDPmYqMaZpb03k3i1LFtrgmEfIvjkSriEcYgwsMPWrD30yajIL4stJTY0RkC/z6ApCOCbl1Smmw= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602257012638571.332856895285; Fri, 9 Oct 2020 08:23:32 -0700 (PDT) Received: from localhost ([::1]:56932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQuF1-0008EE-Dw for importer@patchew.org; Fri, 09 Oct 2020 11:23:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQuCu-0006wf-5n for qemu-devel@nongnu.org; Fri, 09 Oct 2020 11:21:20 -0400 Received: from mx2.suse.de ([195.135.220.15]:56904) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQuCm-0004hk-Lx for qemu-devel@nongnu.org; Fri, 09 Oct 2020 11:21:19 -0400 Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 2E8CAB24C; Fri, 9 Oct 2020 15:21:11 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Claudio Fontana To: Paolo Bonzini Subject: [RFC v1 4/4] replay: do not build if TCG is not available Date: Fri, 9 Oct 2020 17:21:08 +0200 Message-Id: <20201009152108.16120-5-cfontana@suse.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201009152108.16120-1-cfontana@suse.de> References: <20201009152108.16120-1-cfontana@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=195.135.220.15; envelope-from=cfontana@suse.de; helo=mx2.suse.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/08 23:20:51 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x (no timestamps) [generic] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Pavel Dovgalyuk , Claudio Fontana , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" replay requires icount, which needs TCG. stub the needed functions in stub/, including errors for hmp and qmp commands. Signed-off-by: Claudio Fontana --- migration/savevm.c | 11 +++-- replay/meson.build | 2 +- stubs/replay.c | 99 ++++++++++++++++++++++++++++++++++++++ tests/qtest/qmp-cmd-test.c | 3 ++ 4 files changed, 110 insertions(+), 5 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index d2e141f7b1..d9181ca520 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -63,6 +63,7 @@ #include "migration/colo.h" #include "qemu/bitmap.h" #include "net/announce.h" +#include "sysemu/tcg.h" =20 const unsigned int postcopy_ram_discard_version =3D 0; =20 @@ -2674,10 +2675,12 @@ int save_snapshot(const char *name, Error **errp) return ret; } =20 - if (!replay_can_snapshot()) { - error_setg(errp, "Record/replay does not allow making snapshot " - "right now. Try once more later."); - return ret; + if (tcg_enabled()) { + if (!replay_can_snapshot()) { + error_setg(errp, "Record/replay does not allow making snapshot= " + "right now. Try once more later."); + return ret; + } } =20 if (!bdrv_all_can_snapshot(&bs)) { diff --git a/replay/meson.build b/replay/meson.build index f91163fb1e..cb3207740a 100644 --- a/replay/meson.build +++ b/replay/meson.build @@ -1,4 +1,4 @@ -softmmu_ss.add(files( +softmmu_ss.add(when: 'CONFIG_TCG', if_true: files( 'replay.c', 'replay-internal.c', 'replay-events.c', diff --git a/stubs/replay.c b/stubs/replay.c index 45ebe77fb9..ff35daf198 100644 --- a/stubs/replay.c +++ b/stubs/replay.c @@ -103,3 +103,102 @@ bool replay_reverse_continue(void) { return false; } + +void replay_add_blocker(Error *reason) +{ +} +void replay_audio_in(size_t *recorded, void *samples, size_t *wpos, size_t= size) +{ +} +void replay_audio_out(size_t *played) +{ +} +void replay_bh_schedule_event(QEMUBH *bh) +{ +} +void replay_breakpoint(void) +{ +} +bool replay_can_snapshot(void) +{ + return false; +} +void replay_configure(struct QemuOpts *opts) +{ +} +void replay_flush_events(void) +{ +} +void replay_gdb_attached(void) +{ +} +void replay_input_event(QemuConsole *src, InputEvent *evt) +{ +} +void replay_input_sync_event(void) +{ +} +void replay_net_packet_event(ReplayNetState *rns, unsigned flags, + const struct iovec *iov, int iovcnt) +{ +} +ReplayNetState *replay_register_net(NetFilterState *nfs) +{ + return NULL; +} +bool replay_running_debug(void) +{ + return false; +} +void replay_shutdown_request(ShutdownCause cause) +{ +} +void replay_start(void) +{ +} +void replay_unregister_net(ReplayNetState *rns) +{ +} +void replay_vmstate_init(void) +{ +} + +#include "monitor/monitor.h" +#include "monitor/hmp.h" +#include "qapi/qapi-commands-replay.h" +#include "qapi/error.h" +#include "qemu/error-report.h" + +void hmp_info_replay(Monitor *mon, const QDict *qdict) +{ + error_report("replay support not available\n"); +} +void hmp_replay_break(Monitor *mon, const QDict *qdict) +{ + error_report("replay support not available\n"); +} +void hmp_replay_delete_break(Monitor *mon, const QDict *qdict) +{ + error_report("replay support not available\n"); +} +void hmp_replay_seek(Monitor *mon, const QDict *qdict) +{ + error_report("replay support not available\n"); +} +ReplayInfo *qmp_query_replay(Error **errp) +{ + error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND, "replay support not ava= ilable"); + return NULL; +} +void qmp_replay_break(int64_t icount, Error **errp) +{ + error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND, "replay support not ava= ilable"); +} +void qmp_replay_delete_break(Error **errp) +{ + error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND, "replay support not ava= ilable"); +} +void qmp_replay_seek(int64_t icount, Error **errp) +{ + error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND, "replay support not ava= ilable"); +} diff --git a/tests/qtest/qmp-cmd-test.c b/tests/qtest/qmp-cmd-test.c index 8a4c570e83..1c7186e53c 100644 --- a/tests/qtest/qmp-cmd-test.c +++ b/tests/qtest/qmp-cmd-test.c @@ -31,6 +31,9 @@ static int query_error_class(const char *cmd) #ifndef CONFIG_SPICE { "query-spice", ERROR_CLASS_COMMAND_NOT_FOUND }, #endif +#ifndef CONFIG_TCG + { "query-replay", ERROR_CLASS_COMMAND_NOT_FOUND }, +#endif #ifndef CONFIG_VNC { "query-vnc", ERROR_CLASS_GENERIC_ERROR }, { "query-vnc-servers", ERROR_CLASS_GENERIC_ERROR }, --=20 2.26.2