From nobody Sat Nov 8 02:49:25 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550165275857338.73974450049593; Thu, 14 Feb 2019 09:27:55 -0800 (PST) Received: from localhost ([127.0.0.1]:52140 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guKnh-00062r-KP for importer@patchew.org; Thu, 14 Feb 2019 12:27:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56016) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guKeJ-0007Ds-CX for qemu-devel@nongnu.org; Thu, 14 Feb 2019 12:18:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1guKXv-00051F-QV for qemu-devel@nongnu.org; Thu, 14 Feb 2019 12:11:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41816) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1guKXv-0004zw-Fs for qemu-devel@nongnu.org; Thu, 14 Feb 2019 12:11:35 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 62098C070132; Thu, 14 Feb 2019 17:11:32 +0000 (UTC) Received: from t460s.redhat.com (unknown [10.36.118.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 983555C6C1; Thu, 14 Feb 2019 17:11:29 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 14 Feb 2019 18:11:28 +0100 Message-Id: <20190214171128.24093-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 14 Feb 2019 17:11:33 +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 v1] tests: Add a simple device_del test for PCI devices X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Collin Walling , Eduardo Habkost , Pierre Morel , "Michael S . Tsirkin" , Cornelia Huck , David Hildenbrand , Greg Kurz , Paolo Bonzini , Thomas Huth , Igor Mammedov , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The issue with testing asynchronous unplug requests it that they usually require a running guest to handle the request. However, to test if unplug of PCI devices works, we can apply a nice little trick on some architectures: On system reset, x86 ACPI, s390x and spapr will perform the unplug, resulting in the device of interest to get deleted and a DEVICE_DELETED event getting sent. On s390x, we still get a warning qemu-system-s390x: -device virtio-mouse-pci,id=3Ddev0: warning: Plugging a PCI/zPCI device without the 'zpci' CPU feature enabled; the guest will not be able to see/use this device This will be fixed soon, when we enable the zpci CPU feature always (Conny already has a patch for this queued). Cc: Collin Walling Cc: Cornelia Huck Cc: Pierre Morel Cc: Michael S. Tsirkin Cc: Marcel Apfelbaum Cc: David Gibson Cc: Greg Kurz Cc: Igor Mammedov Cc: Eduardo Habkost Cc: Thomas Huth Cc: Laurent Vivier Cc: Paolo Bonzini Signed-off-by: David Hildenbrand Reviewed-by: David Gibson Tested-by: David Gibson --- tests/Makefile.include | 4 ++ tests/device_del-test.c | 103 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 tests/device_del-test.c diff --git a/tests/Makefile.include b/tests/Makefile.include index b39e989f72..713e5e23a7 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -192,6 +192,7 @@ check-qtest-i386-$(CONFIG_ISA_IPMI_KCS) +=3D tests/ipmi= -kcs-test$(EXESUF) # check-qtest-i386-$(CONFIG_ISA_IPMI_BT) +=3D tests/ipmi-bt-test$(EXESUF) check-qtest-i386-y +=3D tests/i440fx-test$(EXESUF) check-qtest-i386-y +=3D tests/fw_cfg-test$(EXESUF) +check-qtest-i386-y +=3D tests/device_del-test$(EXESUF) check-qtest-i386-y +=3D tests/drive_del-test$(EXESUF) check-qtest-i386-$(CONFIG_WDT_IB700) +=3D tests/wdt_ib700-test$(EXESUF) check-qtest-i386-y +=3D tests/tco-test$(EXESUF) @@ -256,6 +257,7 @@ check-qtest-ppc-$(CONFIG_M48T59) +=3D tests/m48t59-test= $(EXESUF) =20 check-qtest-ppc64-y +=3D $(check-qtest-ppc-y) check-qtest-ppc64-$(CONFIG_PSERIES) +=3D tests/spapr-phb-test$(EXESUF) +check-qtest-ppc64-$(CONFIG_PSERIES) +=3D tests/device_del-test$(EXESUF) check-qtest-ppc64-$(CONFIG_POWERNV) +=3D tests/pnv-xscom-test$(EXESUF) check-qtest-ppc64-y +=3D tests/migration-test$(EXESUF) check-qtest-ppc64-$(CONFIG_PSERIES) +=3D tests/rtas-test$(EXESUF) @@ -310,6 +312,7 @@ check-qtest-s390x-$(CONFIG_SLIRP) +=3D tests/test-netfi= lter$(EXESUF) check-qtest-s390x-$(CONFIG_POSIX) +=3D tests/test-filter-mirror$(EXESUF) check-qtest-s390x-$(CONFIG_POSIX) +=3D tests/test-filter-redirector$(EXESU= F) check-qtest-s390x-y +=3D tests/drive_del-test$(EXESUF) +check-qtest-s390x-y +=3D tests/device_del-test$(EXESUF) check-qtest-s390x-y +=3D tests/virtio-ccw-test$(EXESUF) check-qtest-s390x-y +=3D tests/cpu-plug-test$(EXESUF) check-qtest-s390x-y +=3D tests/migration-test$(EXESUF) @@ -750,6 +753,7 @@ tests/ipoctal232-test$(EXESUF): tests/ipoctal232-test.o tests/qom-test$(EXESUF): tests/qom-test.o tests/test-hmp$(EXESUF): tests/test-hmp.o tests/machine-none-test$(EXESUF): tests/machine-none-test.o +tests/device_del-test$(EXESUF): tests/device_del-test.o tests/drive_del-test$(EXESUF): tests/drive_del-test.o $(libqos-virtio-obj-= y) tests/nvme-test$(EXESUF): tests/nvme-test.o $(libqos-pc-obj-y) tests/pvpanic-test$(EXESUF): tests/pvpanic-test.o diff --git a/tests/device_del-test.c b/tests/device_del-test.c new file mode 100644 index 0000000000..cbc3e78e56 --- /dev/null +++ b/tests/device_del-test.c @@ -0,0 +1,103 @@ +/* + * QEMU device_del handling + * + * Copyright (C) 2019 Red Hat Inc. + * + * Authors: + * David Hildenbrand + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "libqtest.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" + +static void device_del_request(const char *id) +{ + QDict *resp; + + resp =3D qmp("{'execute': 'device_del', 'arguments': { 'id': %s } }", = id); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); +} + +static void system_reset(void) +{ + QDict *resp; + + resp =3D qmp("{'execute': 'system_reset'}"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); +} + +static void wait_device_deleted_event(const char *id) +{ + QDict *resp, *data; + QObject *device; + QString *qstr; + + /* + * Other devices might get removed along with the removed device. Skip + * these. + */ + for (;;) { + resp =3D qtest_qmp_eventwait_ref(global_qtest, "DEVICE_DELETED"); + data =3D qdict_get_qdict(resp, "data"); + if (!data) { + qobject_unref(resp); + continue; + } + device =3D qdict_get(data, "device"); + if (!device) { + qobject_unref(resp); + continue; + } + qstr =3D qobject_to(QString, device); + g_assert(qstr); + if (!strcmp(qstring_get_str(qstr), id)) { + qobject_unref(data); + qobject_unref(resp); + break; + } + qobject_unref(data); + qobject_unref(resp); + } +} + +static void test_pci_device_del_request(void) +{ + char *args; + + args =3D g_strdup_printf("-device virtio-mouse-pci,id=3Ddev0"); + qtest_start(args); + + /* + * Request device removal. As the guest is not running, the request wo= n't + * be processed. However during system reset, the removal will be + * handled, removing the device. + */ + device_del_request("dev0"); + system_reset(); + wait_device_deleted_event("dev0"); + + qtest_end(); + g_free(args); +} + +int main(int argc, char **argv) +{ + g_test_init(&argc, &argv, NULL); + + /* + * We need a system that will process unplug requests during system re= sets + * and does not do PCI surprise removal. This holds for x86 ACPI, + * s390x and spapr. + */ + qtest_add_func("/device_del/pci_device_del_request", + test_pci_device_del_request); + + return g_test_run(); +} --=20 2.17.2