From nobody Fri Apr 26 08:40:11 2024 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=libvir-list-bounces@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=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1633957367; cv=none; d=zohomail.com; s=zohoarc; b=oJozBvjl5nWmOhGpM4WSwztkixfxkzMto+rfjHPdyYceUS4YnbpWJ5lFxkz6p/Bl3i0mnCb60EvSvzUiVZzOn8SMu4k0SnGRiBIVMQfy+G8SG8sEtjcZtLjnvuraD4KYwbM5umIFacQpCesF1KVUVJt3HrhvdBCZRn73i7o+GLU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633957367; h=Content-Type:Content-Transfer-Encoding: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=h4vIVbtOKbft7+kLvGKt3AytWbUC6+sPQQEJoO3zv/c=; b=WmcHoIT8rTHiSywEiC6tbtzB4L0FyK9UQ2ti9975hgkG2JSLHSOgSLPnl2Btx/FQNrmbmPSG+W/A3JGZGYHTYz4cXxr9sIkBKickbZHtZrCFBsbFv5HgRfMyTAzyrhdvucwtHlt9cPQCT5vXrdmjpMKVJI/kH2TleLlu5Y91Ln0= 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=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: 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 1633957367695805.642553668963; Mon, 11 Oct 2021 06:02:47 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-225-ki7790VZOqOBh7JtD0HwXw-1; Mon, 11 Oct 2021 09:02:42 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B4D6F1923770; Mon, 11 Oct 2021 13:02:35 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 986C15F4E5; Mon, 11 Oct 2021 13:02:35 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5F3A14EA2F; Mon, 11 Oct 2021 13:02:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19BD2Fcj024803 for ; Mon, 11 Oct 2021 09:02:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id E41A65F4E4; Mon, 11 Oct 2021 13:02:15 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3FAA95F4E8 for ; Mon, 11 Oct 2021 13:02:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633957366; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=h4vIVbtOKbft7+kLvGKt3AytWbUC6+sPQQEJoO3zv/c=; b=D7GVtNTZLKcLJNlPwXEcMtMzbLtSKPxKXeoz/HC9eB8Bda3EOIvC3GVnK33Zst+7zcRaK2 1I5nhA+e0fdmmwItNBrvq7GFV6ou01CDvmcZRh3Tx9SBkHwS4K9TQh9p9sdPK/UCb9yEqC ItPmTIgeb8nC7JVQhxymmUu5HU17kmc= X-MC-Unique: ki7790VZOqOBh7JtD0HwXw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 1/7] qemuValidateDomainDefPCIFeature: un-break error messages Date: Mon, 11 Oct 2021 15:02:06 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1633957394129100001 Content-Type: text/plain; charset="utf-8" https://www.libvirt.org/coding-style.html#error-message-format Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_validate.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index be609c9d39..e530368cb3 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -194,8 +194,7 @@ qemuValidateDomainDefPCIFeature(const virDomainDef *def, case VIR_DOMAIN_PCI_ACPI_BRIDGE_HOTPLUG: if (!ARCH_IS_X86(def->os.arch)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("acpi-bridge-hotplug is not available= " - "for architecture '%s'"), + _("acpi-bridge-hotplug is not available= for architecture '%s'"), virArchToString(def->os.arch)); return -1; } @@ -203,8 +202,7 @@ qemuValidateDomainDefPCIFeature(const virDomainDef *def, !virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("acpi-bridge-hotplug is not available= " - "with this QEMU binary")); + _("acpi-bridge-hotplug is not available= with this QEMU binary")); return -1; } break; --=20 2.31.1 From nobody Fri Apr 26 08:40:11 2024 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=libvir-list-bounces@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=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1633957463; cv=none; d=zohomail.com; s=zohoarc; b=GUh/kAniVZg5eYdhLZehxtThyJ2Av97/3mGl+cM1VMJrTpsc+lGbC7lxWpfHcfR+LCfsGW//4jsWutgsXGVEellUvqRR2qDxMiIOH55t9NOlDVK1iBMTpoAuqjXt9/SG2CR4UHZ2nZtVDqKieE4n39Sq3877xItnYH+RPpev8Wg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633957463; h=Content-Type:Content-Transfer-Encoding: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=piEFK0RwHV5oK9mbOCkIUVBoDEfQQ++Pf4tYnHBxhn8=; b=STAq+yajSLNuELbt46/KJ2aA4QKW9pcC6ob2VQknFlNERkRHpJWui7jjuy9ZlseqKLVnJhpIr15FiQmzyKHT4B1KR74sHbuid2S803z7u4MZ1bB5bFeU7ZUVUP6sA13mJIIVw8NOzr1Ryho6lmLG0iqpRCd/rU9ByKfedV9Mm5o= 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=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: 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 1633957463653640.5939811879596; Mon, 11 Oct 2021 06:04:23 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-125-PymphFwHNpa8VkYtrmP7dA-1; Mon, 11 Oct 2021 09:02:32 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 25D3BEC1D0; Mon, 11 Oct 2021 13:02:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8D739380; Mon, 11 Oct 2021 13:02:20 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 96F614EA29; Mon, 11 Oct 2021 13:02:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19BD2H0h024814 for ; Mon, 11 Oct 2021 09:02:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0DC275F4E5; Mon, 11 Oct 2021 13:02:17 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D78C5F4E4 for ; Mon, 11 Oct 2021 13:02:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633957462; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=piEFK0RwHV5oK9mbOCkIUVBoDEfQQ++Pf4tYnHBxhn8=; b=G24J1ylDzmOyd19iStRp3WDAFPhqMe+5PvsmzWje6NuHqRanVDq9/nEIWHQP6tgrA68BT6 CqoVnwd9eAnXcaYuBNukNvHDvduFUa3YpGrVC02C6zU/NP08kLAg+AivsfxFu+gKTE7NiS FLztTcJtghZgZT+aZVgZ0htU+kckXGs= X-MC-Unique: PymphFwHNpa8VkYtrmP7dA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 2/7] qemuValidateDomainDefPCIFeature: Fix validation logic Date: Mon, 11 Oct 2021 15:02:07 +0200 Message-Id: <744cbb1f8c964870ef04fe84b03450a578989013.1633957206.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1633957474498100003 Content-Type: text/plain; charset="utf-8" The error that "acpi-bridge-hotplug" is not supported would be triggered only if both the ICH9 and PIIX don't support the capability and the machine is q35. This makes no sense. We want to check that the appropriate platform supports the appropriate feature. Fixes: 7300ccc9b3e Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_validate.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index e530368cb3..7eb9a37870 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -179,9 +179,6 @@ qemuValidateDomainDefPCIFeature(const virDomainDef *def, int feature) { size_t i; - bool q35Dom =3D qemuDomainIsQ35(def); - bool q35cap =3D q35Dom && virQEMUCapsGet(qemuCaps, - QEMU_CAPS_ICH9_ACPI_HOTPLUG_BRI= DGE); if (def->features[feature] =3D=3D VIR_TRISTATE_SWITCH_ABSENT) return 0; @@ -198,9 +195,9 @@ qemuValidateDomainDefPCIFeature(const virDomainDef *def, virArchToString(def->os.arch)); return -1; } - if (!q35cap && - !virQEMUCapsGet(qemuCaps, - QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE)) { + + if ((qemuDomainIsQ35(def) && !virQEMUCapsGet(qemuCaps, QEM= U_CAPS_ICH9_ACPI_HOTPLUG_BRIDGE)) || + (!qemuDomainIsQ35(def) && !virQEMUCapsGet(qemuCaps, QE= MU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("acpi-bridge-hotplug is not available= with this QEMU binary")); return -1; --=20 2.31.1 From nobody Fri Apr 26 08:40:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@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 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1633957367; cv=none; d=zohomail.com; s=zohoarc; b=UjGdZ8QE0O4SoJkj+S2tUxdAw9VCRa7T/76pD3YX8RDayUnMeEvXrS9Fq2LXsQgikOm46OoKbdnoHzGk6WffxrE1y7QA0OWH34U4Y8wyBH7tm5bnrqtEydXSmvX4csE9NX14AAsk+amnVQu4+Opm7AShj2+ngS4RuUw7EPFWoPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633957367; h=Content-Type:Content-Transfer-Encoding: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=lyzWG6/P5VW+t7aLHCyyMsIU3c1FMwnOmf4jGEfuch0=; b=FFEkFeeEygI6kn4XZvnJlT7COoHSz09fjb7qVooANIObHbN53O0CM8f59OOJbPco3uIzsgVnXrCBZNywP2Qm319c+kXNUnKzKSPJyMLGq4koyAyTbUaXV0prsvbni5Pxh2zQ4YVaHOxw0lzpj7hpPS8HcfmXlcCUVwT6gKeqoGA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1633957367809702.0775313760016; Mon, 11 Oct 2021 06:02:47 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-166-APZUiTkuMMGgnssrUQ2foA-1; Mon, 11 Oct 2021 09:02:42 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E6429A40C5; Mon, 11 Oct 2021 13:02:35 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C8BFF60938; Mon, 11 Oct 2021 13:02:35 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 92FDB4EA30; Mon, 11 Oct 2021 13:02:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19BD2I7V024819 for ; Mon, 11 Oct 2021 09:02:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2E2635F4E8; Mon, 11 Oct 2021 13:02:18 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D4575F4E4 for ; Mon, 11 Oct 2021 13:02:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633957366; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=lyzWG6/P5VW+t7aLHCyyMsIU3c1FMwnOmf4jGEfuch0=; b=VeymtOBl48bD157x02O1kcybwd6yRZsMZUetegqxefTKkEgXLpTnU0M5hsbJSOgvhD0hUa +haN6wRRSmD2qs2Mv+Fd3Tdk//bj4ZQRBOP+1YTCxvsVJOlo/qzTTMUWydeiSXk/K2nKZ7 h9BECyIfui+EE2EEXMJN/mzLQjTm2Ow= X-MC-Unique: APZUiTkuMMGgnssrUQ2foA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 3/7] qemuxml2argvtest: Use real-caps testing for 'pc-i440fx-acpi-root-hotplug-disable' Date: Mon, 11 Oct 2021 15:02:08 +0200 Message-Id: <0deab14acc94c9dc4668299f7b849d413714e24c.1633957206.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1633958295611100001 Content-Type: text/plain; charset="utf-8" We can use two real example configs to prove the support without the need for using fake capabilities. Fix the recently added test cases. Fixes: 133d7983d6c Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...fx-acpi-root-hotplug-disable.x86_64-5.1.0.err} | 0 ...-acpi-root-hotplug-disable.x86_64-latest.args} | 15 +++++++++------ tests/qemuxml2argvtest.c | 5 ++--- 3 files changed, 11 insertions(+), 9 deletions(-) rename tests/qemuxml2argvdata/{pc-i440fx-acpi-root-hotplug-disable.err =3D= > pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.err} (100%) rename tests/qemuxml2argvdata/{pc-i440fx-acpi-root-hotplug-disable.args = =3D> pc-i440fx-acpi-root-hotplug-disable.x86_64-latest.args} (55%) diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.err= b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-5.1.0.= err similarity index 100% rename from tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.err rename to tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64= -5.1.0.err diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.arg= s b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-lates= t.args similarity index 55% rename from tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.args rename to tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64= -latest.args index dd8ea503fc..056a925bc0 100644 --- a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.args +++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-lat= est.args @@ -6,26 +6,29 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-i440fx/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-i440fx/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-i440fx/.config \ -QEMU_AUDIO_DRV=3Dnone \ /usr/bin/qemu-system-x86_64 \ -name guest=3Di440fx,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-i440= fx/master-key.aes \ --machine pc-i440fx-2.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-i440fx/master-key.aes"}' \ +-machine pc-i440fx-2.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-= backend=3Dpc.ram \ +-cpu qemu64 \ -m 1024 \ --realtime mlock=3Doff \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-i440fx/monitor.= sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ -global PIIX4_PM.acpi-root-pci-hotplug=3Doff \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev id=3Daudio1,driver=3Dnone \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 116ba714eb..0224bd1854 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2559,9 +2559,8 @@ mymain(void) QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4); - DO_TEST("pc-i440fx-acpi-root-hotplug-disable", - QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG); - DO_TEST_PARSE_ERROR_NOCAPS("pc-i440fx-acpi-root-hotplug-disable"); + DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-disable"); + DO_TEST_CAPS_VER_PARSE_ERROR("pc-i440fx-acpi-root-hotplug-disable", "5= .1.0"); DO_TEST("q35-acpi-hotplug-bridge-disable", QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, --=20 2.31.1 From nobody Fri Apr 26 08:40:11 2024 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=libvir-list-bounces@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=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1633957371; cv=none; d=zohomail.com; s=zohoarc; b=UAh3B2fvqXi83AxDvnVcJUD6oksh/qAQtvA5Mjo6IvSs+hvoZxW+PEH4RVwYFfFZ5GBdBrOoNNihD8V0U6qb3JzbowcX2RtlFnEc01AmbwcjopPlCxi1s42L/fksdybrKxDxXU/rGYI5Nhvp4VXZle4rQaKm9HBsRSnoW6la3Cs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633957371; h=Content-Type:Content-Transfer-Encoding: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=0HnjBXnvLwrAuQFjhfPnVZn1dklEiCfc0z2/RpsGQ4E=; b=F+PB2ETBXjNMosaRoQUVwc51hblNafwVC0EIbdeJXZxL/vYonXDd2ZnwgATj39U/MYT5QMYNXWiTJEwmxBOSb4UbkYeweMFuVQU5iIi8v/v65vZJ2PameqIZRwK3jzMhr/+aDpqoV070iLoaTp0OBkcoaAi4Xt4BZihr5zTsnXk= 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=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: 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 1633957371010533.5907291654813; Mon, 11 Oct 2021 06:02:51 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-101-AREnBVynOHiPDIdaWKzCfw-1; Mon, 11 Oct 2021 09:02:46 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8EB8E802947; Mon, 11 Oct 2021 13:02:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6B2C360BF4; Mon, 11 Oct 2021 13:02:40 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 358E11806D01; Mon, 11 Oct 2021 13:02:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19BD2J7q024829 for ; Mon, 11 Oct 2021 09:02:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4A2ED5F4E5; Mon, 11 Oct 2021 13:02:19 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id A33895F4E4 for ; Mon, 11 Oct 2021 13:02:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633957370; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0HnjBXnvLwrAuQFjhfPnVZn1dklEiCfc0z2/RpsGQ4E=; b=QX07S8LU/WtDZ8CQsL29t8nZZ+LBuuD9UWFAq+Lq08NroYHeysAnxflWk3byfWNSyMRhJA H0RuqIul0UnKPIqHFOwwENox0wW2cWukG/MLez+evEYwUDJJfVeRh1RwhlODgCMFybRh6L PZ2CBahSdM6pTwSub6h7H3cT5rOZfZA= X-MC-Unique: AREnBVynOHiPDIdaWKzCfw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 4/7] qemuxml2argvtest: Use real-caps testing for 'acpi-hotplug-bridge-disable' Date: Mon, 11 Oct 2021 15:02:09 +0200 Message-Id: <4593d3244cf0df081994ac73ba5b5806c907e40b.1633957206.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1633957396833100001 Content-Type: text/plain; charset="utf-8" We can use real example configs to prove the support without the need for using fake capabilities. Fix the recently added test cases. The negative case for 'pc-i440fx-acpi-hotplug-bridge-disable' is removed completely as there is no real qemu libvirt supports which wouldn't have the capability. Fixes: bef0f0d8be6 Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...pi-hotplug-bridge-disable.aarch64-latest.err | 1 + .../aarch64-acpi-hotplug-bridge-disable.err | 1 - ...i-hotplug-bridge-disable.x86_64-latest.args} | 15 +++++++++------ .../q35-acpi-hotplug-bridge-disable.err | 1 - ...cpi-hotplug-bridge-disable.x86_64-6.0.0.err} | 0 ...i-hotplug-bridge-disable.x86_64-latest.args} | 14 +++++++++----- tests/qemuxml2argvtest.c | 17 ++++------------- 7 files changed, 23 insertions(+), 26 deletions(-) create mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disa= ble.aarch64-latest.err delete mode 100644 tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disa= ble.err rename tests/qemuxml2argvdata/{pc-i440fx-acpi-hotplug-bridge-disable.args = =3D> pc-i440fx-acpi-hotplug-bridge-disable.x86_64-latest.args} (55%) delete mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.= err rename tests/qemuxml2argvdata/{pc-i440fx-acpi-hotplug-bridge-disable.err = =3D> q35-acpi-hotplug-bridge-disable.x86_64-6.0.0.err} (100%) rename tests/qemuxml2argvdata/{q35-acpi-hotplug-bridge-disable.args =3D> q= 35-acpi-hotplug-bridge-disable.x86_64-latest.args} (61%) diff --git a/tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.aar= ch64-latest.err b/tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disabl= e.aarch64-latest.err new file mode 100644 index 0000000000..139591fce3 --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.aarch64-la= test.err @@ -0,0 +1 @@ +XML error: The PCI controller with index=3D'0' must be model=3D'pcie-root'= for this machine type, but model=3D'pci-root' was found instead diff --git a/tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.err= b/tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.err deleted file mode 100644 index 9f0a88b826..0000000000 --- a/tests/qemuxml2argvdata/aarch64-acpi-hotplug-bridge-disable.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: acpi-bridge-hotplug is not available for archit= ecture 'aarch64' diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.a= rgs b/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64-l= atest.args similarity index 55% rename from tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.ar= gs rename to tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_= 64-latest.args index a1e5dc85c7..26de6c81ec 100644 --- a/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.args +++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64-l= atest.args @@ -6,26 +6,29 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-i440fx/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-i440fx/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-i440fx/.config \ -QEMU_AUDIO_DRV=3Dnone \ /usr/bin/qemu-system-x86_64 \ -name guest=3Di440fx,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-i440= fx/master-key.aes \ --machine pc-i440fx-2.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-i440fx/master-key.aes"}' \ +-machine pc-i440fx-2.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-= backend=3Dpc.ram \ +-cpu qemu64 \ -m 1024 \ --realtime mlock=3Doff \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-i440fx/monitor.= sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -global PIIX4_PM.acpi-pci-hotplug-with-bridge-support=3Doff \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev id=3Daudio1,driver=3Dnone \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.err b/t= ests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.err deleted file mode 100644 index 8c09a3cd76..0000000000 --- a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: acpi-bridge-hotplug is not available with this = QEMU binary diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.e= rr b/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.x86_64-6.0.0.err similarity index 100% rename from tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-disable.err rename to tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.x86_64-6.0= .0.err diff --git a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.args b/= tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.args similarity index 61% rename from tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.args rename to tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.x86_64-lat= est.args index 007c22c646..0c29f36738 100644 --- a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.args +++ b/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-disable.x86_64-latest.= args @@ -6,20 +6,21 @@ LOGNAME=3Dtest \ XDG_DATA_HOME=3D/tmp/lib/domain--1-q35/.local/share \ XDG_CACHE_HOME=3D/tmp/lib/domain--1-q35/.cache \ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35/.config \ -QEMU_AUDIO_DRV=3Dnone \ /usr/bin/qemu-system-x86_64 \ -name guest=3Dq35,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-q35/= master-key.aes \ --machine pc-q35-2.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-q35/master-key.aes"}' \ +-machine pc-q35-2.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-bac= kend=3Dpc.ram \ +-cpu qemu64 \ -m 1024 \ --realtime mlock=3Doff \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-q35/monitor.soc= k,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ @@ -29,5 +30,8 @@ QEMU_AUDIO_DRV=3Dnone \ -device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ -device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ -device ioh3420,port=3D0x8,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.3,addr=3D0x0 \ +-audiodev id=3Daudio1,driver=3Dnone \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0224bd1854..0fad076877 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2561,22 +2561,13 @@ mymain(void) QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4); DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-disable"); DO_TEST_CAPS_VER_PARSE_ERROR("pc-i440fx-acpi-root-hotplug-disable", "5= .1.0"); - DO_TEST("q35-acpi-hotplug-bridge-disable", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_ACPI_HOTPLUG_BRIDGE); - DO_TEST("pc-i440fx-acpi-hotplug-bridge-disable", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_PIIX4_ACPI_HOTPLUG_BRIDGE); - DO_TEST_PARSE_ERROR_NOCAPS("q35-acpi-hotplug-bridge-disable"); - DO_TEST_PARSE_ERROR_NOCAPS("pc-i440fx-acpi-hotplug-bridge-disable"); + DO_TEST_CAPS_LATEST("q35-acpi-hotplug-bridge-disable"); + DO_TEST_CAPS_LATEST("pc-i440fx-acpi-hotplug-bridge-disable"); + DO_TEST_CAPS_VER_PARSE_ERROR("q35-acpi-hotplug-bridge-disable", "6.0.0= "); /* verify that we fail when acpi-bridge-hotplug option is specified for * archs other than x86 */ - DO_TEST_PARSE_ERROR_NOCAPS("aarch64-acpi-hotplug-bridge-disable"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-acpi-hotplug-bridge-disa= ble", "aarch64"); DO_TEST("q35-usb2", QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, --=20 2.31.1 From nobody Fri Apr 26 08:40:11 2024 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=libvir-list-bounces@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=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1633957446; cv=none; d=zohomail.com; s=zohoarc; b=BBUNLI0vrNZ/e1o/sTY9SEao0aiCYZYnGSM3JZT2XD88LMUrRuW0bt/kM+avQoH3FE3D112g9mVt0jQmrAL7mbZB89Ll911vtdi7jRHzsJAGZPSrxMMBKMe5DGzRo5+0wW9KcyDtUpRZlhhUpCT4GBni985ff/VyqKV7NAV724s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633957446; h=Content-Type:Content-Transfer-Encoding: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=aXBlFAyGDHMe91cgO0iWMkbenGbetwRmLYkD5UUNf+U=; b=OlbFkh3OGhzMk0zlkCvAku+vakjvBT0eqwBVs2kVhHaPhmVtaX6SfylZQ2CUqrHkkMRvYT5J74zUr1q/B0NEsLf1NHiHBdi3atpIXKzeWepnwRPyimmgGlExZdmH4XFkNFCo2hNrNDycLmIHPXd378s1OTj7yQ8LuoeTvGcAklE= 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=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: 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 1633957446345596.6597162572655; Mon, 11 Oct 2021 06:04:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-527-F0G4BTAsO1mZPBFOKz7FQw-1; Mon, 11 Oct 2021 09:02:46 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CAE1EBD545; Mon, 11 Oct 2021 13:02:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AC6B45BAEA; Mon, 11 Oct 2021 13:02:38 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6ED821801241; Mon, 11 Oct 2021 13:02:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19BD2K7E024848 for ; Mon, 11 Oct 2021 09:02:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 57F425F4E8; Mon, 11 Oct 2021 13:02:20 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id B28705F4E4 for ; Mon, 11 Oct 2021 13:02:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633957445; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=aXBlFAyGDHMe91cgO0iWMkbenGbetwRmLYkD5UUNf+U=; b=YRjAad2al+WZUdjI3SKPJJ4HAG4oxKPLOjMrYwWfMVpyH+so/oU+BzxwRDPZ4jbxJH4uWT +GoYIIou9Rp+C0pNq9caHdZCmN1MdD034S3P21nEACrs5D/uoUr2vPnb81dvmBIZgxVlvU toAp4GV3ZtNeKFfVXqlDyss//KQWsWw= X-MC-Unique: F0G4BTAsO1mZPBFOKz7FQw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 5/7] qemuxml2argvtest: Add '-enable' variants for ACPI-hotplug related cases Date: Mon, 11 Oct 2021 15:02:10 +0200 Message-Id: <9402b7dc2f0bbfa2a6a15aa07efddd05caf1ffe6.1633957206.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1633957461337100003 Content-Type: text/plain; charset="utf-8" We have input files for those, provide also xml2argv testing since we have them. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...i-hotplug-bridge-enable.x86_64-latest.args | 34 +++++++++++++++++ ...-acpi-root-hotplug-enable.x86_64-5.1.0.err | 1 + ...cpi-root-hotplug-enable.x86_64-latest.args | 34 +++++++++++++++++ ...cpi-hotplug-bridge-enable.x86_64-6.0.0.err | 1 + ...i-hotplug-bridge-enable.x86_64-latest.args | 37 +++++++++++++++++++ tests/qemuxml2argvtest.c | 5 +++ 6 files changed, 112 insertions(+) create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-en= able.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enab= le.x86_64-5.1.0.err create mode 100644 tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enab= le.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x= 86_64-6.0.0.err create mode 100644 tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x= 86_64-latest.args diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.x8= 6_64-latest.args b/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-ena= ble.x86_64-latest.args new file mode 100644 index 0000000000..92b1c8c541 --- /dev/null +++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-hotplug-bridge-enable.x86_64-la= test.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-i440fx \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-i440fx/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-i440fx/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-i440fx/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3Di440fx,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-i440fx/master-key.aes"}' \ +-machine pc-i440fx-2.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-= backend=3Dpc.ram \ +-cpu qemu64 \ +-m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-global PIIX4_PM.acpi-pci-hotplug-with-bridge-support=3Don \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_= 64-5.1.0.err b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x8= 6_64-5.1.0.err new file mode 100644 index 0000000000..b507f1f8bc --- /dev/null +++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-5.1.= 0.err @@ -0,0 +1 @@ +unsupported configuration: setting the hotplug property on a 'pci-root' de= vice is not supported by this QEMU binary diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_= 64-latest.args b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.= x86_64-latest.args new file mode 100644 index 0000000000..244877a88f --- /dev/null +++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-late= st.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-i440fx \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-i440fx/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-i440fx/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-i440fx/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3Di440fx,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-i440fx/master-key.aes"}' \ +-machine pc-i440fx-2.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-= backend=3Dpc.ram \ +-cpu qemu64 \ +-m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-global PIIX4_PM.acpi-root-pci-hotplug=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-6= .0.0.err b/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-6.0= .0.err new file mode 100644 index 0000000000..8c09a3cd76 --- /dev/null +++ b/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-6.0.0.err @@ -0,0 +1 @@ +unsupported configuration: acpi-bridge-hotplug is not available with this = QEMU binary diff --git a/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-l= atest.args b/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-l= atest.args new file mode 100644 index 0000000000..2dcaaca013 --- /dev/null +++ b/tests/qemuxml2argvdata/q35-acpi-hotplug-bridge-enable.x86_64-latest.a= rgs @@ -0,0 +1,37 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-q35 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-q35/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-q35/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3Dq35,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-q35/master-key.aes"}' \ +-machine pc-q35-2.5,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-bac= kend=3Dpc.ram \ +-cpu qemu64 \ +-m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}= ' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=3Don \ +-boot strict=3Don \ +-device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ +-device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ +-device ioh3420,port=3D0x8,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.3,addr=3D0x0 \ +-audiodev id=3Daudio1,driver=3Dnone \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0fad076877..ec7bb3074e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2560,10 +2560,15 @@ mymain(void) QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4); DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-disable"); + DO_TEST_CAPS_LATEST("pc-i440fx-acpi-root-hotplug-enable"); DO_TEST_CAPS_VER_PARSE_ERROR("pc-i440fx-acpi-root-hotplug-disable", "5= .1.0"); + DO_TEST_CAPS_VER_PARSE_ERROR("pc-i440fx-acpi-root-hotplug-enable", "5.= 1.0"); DO_TEST_CAPS_LATEST("q35-acpi-hotplug-bridge-disable"); + DO_TEST_CAPS_LATEST("q35-acpi-hotplug-bridge-enable"); DO_TEST_CAPS_LATEST("pc-i440fx-acpi-hotplug-bridge-disable"); + DO_TEST_CAPS_LATEST("pc-i440fx-acpi-hotplug-bridge-enable"); DO_TEST_CAPS_VER_PARSE_ERROR("q35-acpi-hotplug-bridge-disable", "6.0.0= "); + DO_TEST_CAPS_VER_PARSE_ERROR("q35-acpi-hotplug-bridge-enable", "6.0.0"= ); /* verify that we fail when acpi-bridge-hotplug option is specified for * archs other than x86 */ --=20 2.31.1 From nobody Fri Apr 26 08:40:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@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 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1633957374; cv=none; d=zohomail.com; s=zohoarc; b=UOCYbrEpdy7frKZmYeAn2Q27z1Vl2/7rHxJ862yUnSVbLvBjKtr7vZB27UGWyQEtUbVTh4G8U7jWMS4yYmMmnVw4r2C0MNoT0vVNjov0ahknlKVdoYBYYEIyoIak9jGLoKyQZZDVv81QU/OG2dFl+bMEvxfcGW/gC3AfaTtht1E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633957374; h=Content-Type:Content-Transfer-Encoding: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=mW9K58CGQOyv+q03O0rKlfZN0pOXY/o9gmNhBoRV+TE=; b=JFHOU8f9xykog2diwhaTB9ijJpeUEhJJhhpvxC63hYAVwqC71b9FzMpHaaze4oME/LUE4OajqYTcQj3U7q01d6H29ups0t+yO+S3ZW3n4WKxKzonN71/+nz159E/iD2+tDTyOdlKOkoZaXvnD1wsbZmkKjkQE+Rm9AAtu7Ja9LE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1633957374757167.45270848464975; Mon, 11 Oct 2021 06:02:54 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-314-0pat9ghKOYWVBbSn7i0vsw-1; Mon, 11 Oct 2021 09:02:51 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 99AA7107563B; Mon, 11 Oct 2021 13:02:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7AD0860938; Mon, 11 Oct 2021 13:02:45 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 182194EA2A; Mon, 11 Oct 2021 13:02:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19BD2LFv024856 for ; Mon, 11 Oct 2021 09:02:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9E8FE5F4E9; Mon, 11 Oct 2021 13:02:21 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id C41FC5F4E4 for ; Mon, 11 Oct 2021 13:02:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633957373; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=mW9K58CGQOyv+q03O0rKlfZN0pOXY/o9gmNhBoRV+TE=; b=T0i972DF7TvM7P19RR60+INO1moqrb/Zz4CD7MrR1dNMhNRN4nbyaqTw8nQ4XWSay7QPp5 6p1RpLSwbBK+yNaVNIeSdu6qZR4us9gGocmsK9Jt97JRO/cVcW4Njk4CSRp/I6EY++LeV7 D0jUMP4t7HKE7ec5ByaSg69qgQDXLKk= X-MC-Unique: 0pat9ghKOYWVBbSn7i0vsw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 6/7] qemuxml2xmltest: Convert all acpi-hotplug control related tests to DO_TEST_CAPS_LATEST Date: Mon, 11 Oct 2021 15:02:11 +0200 Message-Id: <9fa0c3df8f7659760607b9f6d2dee1dd5ee22f0a.1633957206.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1633957400221100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...i-hotplug-bridge-disable.x86_64-latest.xml | 36 +++++++++++++ .../pc-i440fx-acpi-hotplug-bridge-disable.xml | 1 - ...pi-hotplug-bridge-enable.x86_64-latest.xml | 36 +++++++++++++ .../pc-i440fx-acpi-hotplug-bridge-enable.xml | 1 - ...cpi-root-hotplug-disable.x86_64-latest.xml | 33 ++++++++++++ .../pc-i440fx-acpi-root-hotplug-disable.xml | 1 - ...acpi-root-hotplug-enable.x86_64-latest.xml | 33 ++++++++++++ .../pc-i440fx-acpi-root-hotplug-enable.xml | 1 - ...i-hotplug-bridge-disable.x86_64-latest.xml | 53 +++++++++++++++++++ .../q35-acpi-hotplug-bridge-disable.xml | 1 - ...pi-hotplug-bridge-enable.x86_64-latest.xml | 53 +++++++++++++++++++ .../q35-acpi-hotplug-bridge-enable.xml | 1 - tests/qemuxml2xmltest.c | 24 +++------ 13 files changed, 250 insertions(+), 24 deletions(-) create mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-= disable.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-= disable.xml create mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-= enable.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-= enable.xml create mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-di= sable.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-di= sable.xml create mode 100644 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-en= able.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/pc-i440fx-acpi-root-hotplug-en= able.xml create mode 100644 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disabl= e.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-disabl= e.xml create mode 100644 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable= .x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/q35-acpi-hotplug-bridge-enable= .xml diff --git a/tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable= .x86_64-latest.xml b/tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge= -disable.x86_64-latest.xml new file mode 100644 index 0000000000..1b63ff9539 --- /dev/null +++ b/tests/qemuxml2xmloutdata/pc-i440fx-acpi-hotplug-bridge-disable.x86_64= -latest.xml @@ -0,0 +1,36 @@ + + i440fx + 56f5055c-1b8d-490c-844a-ad646a1caaaa + 1048576 + 1048576 + 1 + + hvm + + + + + + + + + qemu64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + +
+ + + + +