From nobody Mon Apr 29 19:01:02 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=1677853700; cv=none; d=zohomail.com; s=zohoarc; b=WOGxkpFwTiUMgxeRj8wnxseAlzp+OnyxIDjbDOGwmdTQrIHLuNFZNfNabxg+1gz2iA/59qLR0kqGxg4pfvzekQ7ZFVpGjl4coaoJvOoVCCenM0vrX5aYahC+2Ucz/3JVwdFsAswUUdZYc+UwCjZbkOO2z9Hh/QXaBIdlIERj6xQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677853700; 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=tq4v8YOp9rSDx/RlpLOuBNoab2K7iyvRL0oK+aAUuGM=; b=A0zoCb4sOXAH2jkDLpo2jparqitnG9cf5g0iUHIBJq58JHe1XPRocy5Nv3xh42KzPiKzPO5p6uzGvIZ1aYytZqC7C/0csSoPAhIcbM0xoDAZbg5W8hsJl04TmGhpc5lD2Fnq3LlA1gQYWJOdQqULijRTdmPLlSy3lqcAz37xmNc= 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 1677853700253658.7380965082212; Fri, 3 Mar 2023 06:28:20 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-322-lzcolR0OM96vYwhfSvKL5w-1; Fri, 03 Mar 2023 09:28:17 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BABB82805595; Fri, 3 Mar 2023 14:28:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A0F76140EBF4; Fri, 3 Mar 2023 14:28:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4ABEB19452CD; Fri, 3 Mar 2023 14:28:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 48524194866E for ; Fri, 3 Mar 2023 14:28:09 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3D98340B40DF; Fri, 3 Mar 2023 14:28:09 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id A6AC240CF8EF for ; Fri, 3 Mar 2023 14:28:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677853699; 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=tq4v8YOp9rSDx/RlpLOuBNoab2K7iyvRL0oK+aAUuGM=; b=FtEN+vavod8bsumzQ8RCz9AE9AdcDb5KWwTrZCPWXNn19TdARV3PXjx8G+tasdWGnLGdgO tltE5YU+HKZPvTRYQT8MVoA2VzqVspBO1Cl1JtO/UiNy6SdJDZ17zvPmLOvICAaWk8ha1w kFWFx2ebNnEXSG8obhPsfACMx0hVRrs= X-MC-Unique: lzcolR0OM96vYwhfSvKL5w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 01/31] tests: domainschemadata: Drop redundant tests Date: Fri, 3 Mar 2023 15:27:35 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 1677853702541100002 Content-Type: text/plain; charset="utf-8" The schema tested by removed test cases is tested by other, more useful, test cases: - 'maxMemory' - qemuxmlargvdata/memory-hotplug* - 'backingChains' - qemuxmlargvdata/disk-backing-chains* - 'timers' - qemuxml2argvdata/kvm-pit-delay.xml - qemuxml2argvdata/clock-catchup.xml - 'qemu-simple-description-title.xml' - 'qemuxml2argvdata/minimal.xml Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/domainschemadata/backing-chains.xml | 94 ------------------- tests/domainschemadata/maxMemory.xml | 19 ---- .../qemu-simple-description-title.xml | 27 ------ tests/domainschemadata/timers.xml | 28 ------ 4 files changed, 168 deletions(-) delete mode 100644 tests/domainschemadata/backing-chains.xml delete mode 100644 tests/domainschemadata/maxMemory.xml delete mode 100644 tests/domainschemadata/qemu-simple-description-title.xml delete mode 100644 tests/domainschemadata/timers.xml diff --git a/tests/domainschemadata/backing-chains.xml b/tests/domainschema= data/backing-chains.xml deleted file mode 100644 index 908eba5c1a..0000000000 --- a/tests/domainschemadata/backing-chains.xml +++ /dev/null @@ -1,94 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/domainschemadata/maxMemory.xml b/tests/domainschemadata/= maxMemory.xml deleted file mode 100644 index 366442999c..0000000000 --- a/tests/domainschemadata/maxMemory.xml +++ /dev/null @@ -1,19 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 1233456789 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - diff --git a/tests/domainschemadata/qemu-simple-description-title.xml b/tes= ts/domainschemadata/qemu-simple-description-title.xml deleted file mode 100644 index d402cf0ab1..0000000000 --- a/tests/domainschemadata/qemu-simple-description-title.xml +++ /dev/null @@ -1,27 +0,0 @@ - - qemu-demo - 603cc28c-9841-864e-0949-8cc7d3bae9f8 - 65536 - 65536 - A short description of this domain - - A longer explanation that this domain is a test domain - for validating domain schemas. - - 1 - - hvm - - - - - - - - destroy - restart - restart - - /usr/bin/qemu-system-x86_64 - - diff --git a/tests/domainschemadata/timers.xml b/tests/domainschemadata/tim= ers.xml deleted file mode 100644 index 75131bd7c1..0000000000 --- a/tests/domainschemadata/timers.xml +++ /dev/null @@ -1,28 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 - 1 - - hvm - - - - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - -
- - - - - --=20 2.39.2 From nobody Mon Apr 29 19:01:02 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=1677853701; cv=none; d=zohomail.com; s=zohoarc; b=WEPstOlSQ1c/0FwYB1RrMmveI4zKVfd6g0MgY4jkQ0gVYBG3bBMNrnHDF3lLu5SF/kRj1seVXin4uI3ubRyxc/GDz0XeWklMRja0IJCBrzFyYH4Po3HpYPvyjTZq1WVTHfl59KUQPF7jI7U/MGsH9Ww4Uof2ZQaWOsK6xsvQz50= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677853701; 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=3Sms9QvLAhiS1nJ0J/8aiMosSDYQgPpKVsCH56XTVY8=; b=MqP4JRgi0OHZxBVYsbhfeTcN704GBJXX2PYkQ40ZvIFHoTd5Li/z406O930TEU81+2Zq2ASz1awWU0/TDGNcGfzKJmh0F2oISZiLnWM+4QoYWbSdrduEafPJc4EV/5Yfi6CqG51wZOmUGD4Nz4ME/FMgEV5uLSTz3JUJM5WFJxM= 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 1677853701666417.11325200523265; Fri, 3 Mar 2023 06:28:21 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-414-aCqDCiAENIKFTcQ3TVADeA-1; Fri, 03 Mar 2023 09:28:18 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 441A287A9ED; Fri, 3 Mar 2023 14:28:16 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F26440C6EC4; Fri, 3 Mar 2023 14:28:16 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2D9251943BC7; Fri, 3 Mar 2023 14:28:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5D29A194866E for ; Fri, 3 Mar 2023 14:28:10 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4D9154011AC8; Fri, 3 Mar 2023 14:28:10 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 911EF40B40DF for ; Fri, 3 Mar 2023 14:28:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677853700; 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=3Sms9QvLAhiS1nJ0J/8aiMosSDYQgPpKVsCH56XTVY8=; b=Ct6D+3UO04A++vz3bLdsaJ294XNdkVPqI5bg61hn67gdFPFjyBMFnkhjUs3cj+Fb5rR08v m+k+mVZylTKwM+GIWDnrRLrdwK3LFKrH7Fmi5FaK9UDS4fjONVkAw6qCKSVayG/D81+7R2 pGxIB6YJmgtT/YLlVGblFlkRjtH4khU= X-MC-Unique: aCqDCiAENIKFTcQ3TVADeA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 02/31] tests: qemu: Move testing of default cache and disk source with space to 'sata-device' Date: Fri, 3 Mar 2023 15:27:36 +0100 Message-Id: <75ee690b7938bd7740e86c0acdcd7c0fb225a6cc.1677853487.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: 1677853702505100001 Content-Type: text/plain; charset="utf-8" Integrate the two special cases used for schema testing into the more useful qemuxml2argvtest, whose input data is still tested against the schema. Add also a xml output variant. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/domainschemadata/default-cache-mode.xml | 26 ------------ .../domain-disk-source-space.xml | 36 ----------------- .../disk-sata-device.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-sata-device.xml | 3 +- .../disk-sata-device.x86_64-latest.xml | 40 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 6 files changed, 44 insertions(+), 64 deletions(-) delete mode 100644 tests/domainschemadata/default-cache-mode.xml delete mode 100644 tests/domainschemadata/domain-disk-source-space.xml create mode 100644 tests/qemuxml2xmloutdata/disk-sata-device.x86_64-latest= .xml diff --git a/tests/domainschemadata/default-cache-mode.xml b/tests/domainsc= hemadata/default-cache-mode.xml deleted file mode 100644 index a11232316d..0000000000 --- a/tests/domainschemadata/default-cache-mode.xml +++ /dev/null @@ -1,26 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - - -
- - - - - diff --git a/tests/domainschemadata/domain-disk-source-space.xml b/tests/do= mainschemadata/domain-disk-source-space.xml deleted file mode 100644 index 553b6c7f01..0000000000 --- a/tests/domainschemadata/domain-disk-source-space.xml +++ /dev/null @@ -1,36 +0,0 @@ - - dummy - aa86471a-e67b-41b1-8d7d-2dc37c2ac5ec - 2097152 - 2097152 - 4 - - hvm - - - - - - destroy - restart - restart - - - - - - /usr/bin/qemu-system-x86_64 - - - - - - -
- - - -
- - - diff --git a/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args index 9365104c20..3cf305f14c 100644 --- a/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"ahci","id":"sata0","bus":"pci.0","addr":"0x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUG uest1","n= ode-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ -device '{"driver":"ide-hd","bus":"sata0.0","drive":"libvirt-1-format","id= ":"sata0-0-0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/disk-sata-device.xml b/tests/qemuxml2ar= gvdata/disk-sata-device.xml index 5dbf08ef1d..a9def2923e 100644 --- a/tests/qemuxml2argvdata/disk-sata-device.xml +++ b/tests/qemuxml2argvdata/disk-sata-device.xml @@ -15,7 +15,8 @@ /usr/bin/qemu-system-x86_64 - + +
diff --git a/tests/qemuxml2xmloutdata/disk-sata-device.x86_64-latest.xml b/= tests/qemuxml2xmloutdata/disk-sata-device.x86_64-latest.xml new file mode 100644 index 0000000000..cd20f5185b --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-sata-device.x86_64-latest.xml @@ -0,0 +1,40 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + qemu64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + + +
+ + +
+ + +
+ + + + +