From patchwork Wed Sep 4 13:00:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11130285 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 64ECE1399 for ; Wed, 4 Sep 2019 13:31:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 45F8322CEA for ; Wed, 4 Sep 2019 13:31:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 45F8322CEA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:58014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5VNW-0006Hl-RG for patchwork-qemu-devel@patchwork.kernel.org; Wed, 04 Sep 2019 09:31:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55041) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5UuE-00023K-7T for qemu-devel@nongnu.org; Wed, 04 Sep 2019 09:01:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5Uu9-0008HD-5S for qemu-devel@nongnu.org; Wed, 04 Sep 2019 09:01:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33990) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i5Uu8-0008Gw-UP for qemu-devel@nongnu.org; Wed, 04 Sep 2019 09:00:57 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2E3B318B3D89 for ; Wed, 4 Sep 2019 13:00:56 +0000 (UTC) Received: from thuth.com (ovpn-116-69.ams2.redhat.com [10.36.116.69]) by smtp.corp.redhat.com (Postfix) with ESMTP id B505C1001B02; Wed, 4 Sep 2019 13:00:51 +0000 (UTC) From: Thomas Huth To: Laurent Vivier , qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 15:00:41 +0200 Message-Id: <20190904130047.25808-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Wed, 04 Sep 2019 13:00:56 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 0/6] Make the core libqtest library independe from global_qtest 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: Paolo Bonzini , Stefan Hajnoczi Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" global_qtest and the related wrapper functions often caused trouble in the past - if they are used somewhere in the libqtest or libqos library code, it's hard to write tests that properly track multiple test states (like migration tests). This patch series finally gets rid of the remaining global_qtest dependencies in the core libqtest code. The first patches are used to clean up some files that should not use global_qtest anymore, then the wrapper functions and the global_qtest definition get moved to a separate header file called libqtest-single.h - which then should only be used in tests that track only a single test state. v2: - Do not add parameter to qvirtio_wait_config_isr(), but push the logic into virtio-mmio.c and virtio-pci.c instead since we have access to the test state here (as suggested by Laurent). Thomas Huth (6): tests/migration: Do not use functions anymore that rely on global_qtest tests/libqos/e1000e: Make e1000e libqos functions independent from global_qtest tests/libqos: Replace clock_step with qtest_clock_step in virtio code tests: Remove unnecessary global_qtest references tests/libqtest: Move global_test wrapper function into a separate header tests/libqtest: Use libqtest-single.h in tests that require global_qtest MAINTAINERS | 2 +- tests/ahci-test.c | 1 - tests/bios-tables-test.c | 1 - tests/cpu-plug-test.c | 2 +- tests/display-vga-test.c | 2 +- tests/e1000e-test.c | 2 +- tests/fdc-test.c | 2 +- tests/i440fx-test.c | 2 +- tests/i82801b11-test.c | 2 +- tests/intel-hda-test.c | 2 +- tests/ioh3420-test.c | 2 +- tests/ipmi-kcs-test.c | 3 +- tests/ivshmem-test.c | 3 - tests/libqos/e1000e.c | 16 +- tests/libqos/virtio-mmio.c | 14 +- tests/libqos/virtio-pci.c | 14 +- tests/libqos/virtio.c | 20 +-- tests/libqos/virtio.h | 6 +- tests/libqtest-single.h | 315 ++++++++++++++++++++++++++++++++++ tests/libqtest.c | 13 -- tests/libqtest.h | 289 ------------------------------- tests/m25p80-test.c | 2 +- tests/migration-test.c | 6 +- tests/qos-test.c | 2 +- tests/rtas-test.c | 1 - tests/rtc-test.c | 2 +- tests/rtl8139-test.c | 2 +- tests/test-arm-mptimer.c | 2 +- tests/test-netfilter.c | 2 +- tests/test-x86-cpuid-compat.c | 2 +- tests/tmp105-test.c | 2 +- tests/tpm-crb-test.c | 2 +- tests/tpm-tests.c | 2 +- tests/tpm-tis-test.c | 2 +- tests/usb-hcd-ohci-test.c | 2 +- tests/usb-hcd-uhci-test.c | 2 +- tests/usb-hcd-xhci-test.c | 2 +- tests/vhost-user-test.c | 2 +- tests/virtio-blk-test.c | 5 +- tests/virtio-ccw-test.c | 2 +- tests/virtio-net-test.c | 2 +- tests/virtio-scsi-test.c | 2 +- tests/virtio-serial-test.c | 2 +- 43 files changed, 396 insertions(+), 367 deletions(-) create mode 100644 tests/libqtest-single.h