From nobody Sun Feb 8 05:41:03 2026 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; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607044009; cv=none; d=zohomail.com; s=zohoarc; b=Ed+q8Tp990VJ4qkcvcDXifKxxxrgYeEWjGpWtfk30kCaKEmR+i5vQVoVG6PpwfBb+LByGphDaP8b5AqONOoVRqxXuHoSiDFFZXl030es26LiCxjMa0+KtjO1aEdfmv6qjQkml4m+uPb4Fpl6InBNoFc2RLa8wFoBbfcoaVGn0xo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607044009; h=Content-Type: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=/0er/khZaLYCf28fCWpVL9v+hOMxGeALAzgxMY//abc=; b=Igjf0K1wA44aoc8ffoSaSN6tzX0B58gdGFLG4tKqVMeSvKQFcYE8vaxmKxXxdkQ2HSnu62BJKoSCbAK9BzkYNcwkJZN8wBEXJGizz2bMNlZ6ED9zwq3mIeZtv9cw0TbhH4034BLMlS91jZ2o28EjK/YDzgA8ln30JiXgAecEX84= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= 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 1607044009004549.4147126754351; Thu, 3 Dec 2020 17:06:49 -0800 (PST) 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-95-oyFclwvzMdmsvP9ojelH5Q-1; Thu, 03 Dec 2020 20:06:44 -0500 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 11F8C107ACF5; Fri, 4 Dec 2020 01:06: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 E03EF1A8A6; Fri, 4 Dec 2020 01:06:37 +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 ACBEE1809C9F; Fri, 4 Dec 2020 01:06:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0B415o2N026377 for ; Thu, 3 Dec 2020 20:05:50 -0500 Received: by smtp.corp.redhat.com (Postfix) id A1ABF2026D3E; Fri, 4 Dec 2020 01:05:50 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9CD5B2027144 for ; Fri, 4 Dec 2020 01:05:50 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 84243108C0A0 for ; Fri, 4 Dec 2020 01:05:50 +0000 (UTC) Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-248-gv7Y2fC1Mj2e1IyjWUcOfg-1; Thu, 03 Dec 2020 20:05:48 -0500 Received: by mail-qt1-f171.google.com with SMTP id a6so477986qtw.6; Thu, 03 Dec 2020 17:05:48 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:c1a:69c1:2b22:e880:fc49]) by smtp.gmail.com with ESMTPSA id z133sm3600542qka.20.2020.12.03.17.05.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Dec 2020 17:05:46 -0800 (PST) X-MC-Unique: oyFclwvzMdmsvP9ojelH5Q-1 X-MC-Unique: gv7Y2fC1Mj2e1IyjWUcOfg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/0er/khZaLYCf28fCWpVL9v+hOMxGeALAzgxMY//abc=; b=J8umWxLeGbfKK2Sifsj0D94/ZWgtsxGO+aMebOkygb0AHosAk+fAQ9nX+5wdzDu6iQ WLAy/W6Xl/fL3okhmV+5QfHMnpaJdAoZE01A/IPSoVeKXcHOMgJMNqzA8PHaraC9nMlE iWIgzF4ygdJLXmxSbllBPP72rErxnjZYBWD9zgi7aXjedKyMKwh/jKwNC+4gDrQHN9DB bx2mLkamzUrDh4H4wjGkuMrfsVqYi357H3IFbU4yM04MR0Cj5RGQZESD+AqHtMc3tyfP fHhxTXm6gBxOQ3Cne2yZ2blVgh4b80RaAlV3gUtVKFzouOpvZ0+s7/KzA8BCJyaSvJYT pKYA== X-Gm-Message-State: AOAM5322vHqAjrL+AbtWiZ7SwQw1pkBMZk7v8uTxI50dETOgVt+2laoO Kf6dvowk7DJaPdj3TZx0ycEz1qBnmqUiZA== X-Google-Smtp-Source: ABdhPJynBpdIYJLN+AOWOA3nl23SFRAQB+jnomqmNZ33/QSYB+hgnCKIQ/DnjM6E1CzBYGdijFS0Lw== X-Received: by 2002:aed:31c5:: with SMTP id 63mr6427801qth.84.1607043947289; Thu, 03 Dec 2020 17:05:47 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH v3 2/5] tests: Simplify some ppc64 tests Date: Thu, 3 Dec 2020 22:05:26 -0300 Message-Id: <20201204010529.325244-3-danielhb413@gmail.com> In-Reply-To: <20201204010529.325244-1-danielhb413@gmail.com> References: <20201204010529.325244-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , Andrea Bolognani 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 Content-Type: text/plain; charset="utf-8" From: Andrea Bolognani We can leave out things like USB controller, memballoon device, kernel and initrd since they're not the focus of the tests. Propagating some information from the output files back to the input files makes it easier to compare them, as it reduces the resulting diff, and in the case of the qemuxml2xml test for memory-hotplug-ppc64-nonuma it allows us to convert the output file into a symlink, since in the specific case the XML doesn't change at all. Reviewed-by: Daniel Henrique Barboza Signed-off-by: Andrea Bolognani --- .../memory-hotplug-nvdimm-ppc64.args | 4 +- .../memory-hotplug-nvdimm-ppc64.xml | 8 +--- .../memory-hotplug-ppc64-nonuma.args | 7 +-- .../memory-hotplug-ppc64-nonuma.xml | 14 ++++-- .../memory-hotplug-nvdimm-ppc64.xml | 8 +--- .../memory-hotplug-ppc64-nonuma.xml | 46 +------------------ 6 files changed, 17 insertions(+), 70 deletions(-) mode change 100644 =3D> 120000 tests/qemuxml2xmloutdata/memory-hotplug-ppc= 64-nonuma.xml diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args b/test= s/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args index 94bd86ada0..f50444e47e 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args @@ -27,6 +27,4 @@ uuid=3D49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=3Dmemn= vdimm0,id=3Dnvdimm0,slot=3D0 \ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ --no-shutdown \ --usb \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 +-no-shutdown diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.xml b/tests= /qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.xml index ae5a17d3c8..bf7df9a259 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.xml @@ -21,16 +21,12 @@ destroy /usr/bin/qemu-system-ppc64 - -
- + - -
- + 49545eb3-75e1-2d0a-acdd-f0294406c99e diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args b/test= s/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args index 91cea9d8bf..f7f151d1ca 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args +++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args @@ -26,9 +26,4 @@ QEMU_AUDIO_DRV=3Dnone \ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ --no-shutdown \ --kernel /media/ram/uImage \ --initrd /media/ram/ramdisk \ --append 'root=3D/dev/ram rw console=3DttyS0,115200' \ --usb \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 +-no-shutdown diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.xml b/tests= /qemuxml2argvdata/memory-hotplug-ppc64-nonuma.xml index 7c68cd6aa2..a0806c4b54 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.xml +++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.xml @@ -7,9 +7,7 @@ 1 hvm - /media/ram/uImage - /media/ram/ramdisk - root=3D/dev/ram rw console=3DttyS0,115200 + destroy @@ -17,16 +15,24 @@ destroy /usr/bin/qemu-system-ppc64 - + + + + + + + 523264 +
524287 +
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.xml b/tes= ts/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.xml index ecb1b83b4a..0c0b9f96fb 100644 --- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.xml +++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.xml @@ -21,16 +21,12 @@ destroy /usr/bin/qemu-system-ppc64 - -
- + - -
- + 49545eb3-75e1-2d0a-acdd-f0294406c99e diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.xml b/tes= ts/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.xml deleted file mode 100644 index a5905e64b5..0000000000 --- a/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.xml +++ /dev/null @@ -1,45 +0,0 @@ - - QEMUGuest1 - 49545eb3-75e1-2d0a-acdd-f0294406c99e - 4194304 - 2097152 - 2097152 - 1 - - hvm - /media/ram/uImage - /media/ram/ramdisk - root=3D/dev/ram rw console=3DttyS0,115200 - - - - destroy - restart - destroy - - /usr/bin/qemu-system-ppc64 - -
- - - - - - -
- - - - - 523264 - -
- - - - 524287 - -
- - - diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.xml b/tes= ts/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.xml new file mode 120000 index 0000000000..0822e409b4 --- /dev/null +++ b/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/memory-hotplug-ppc64-nonuma.xml \ No newline at end of file --=20 2.26.2