From nobody Fri May 3 04:19:27 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=1652342166; cv=none; d=zohomail.com; s=zohoarc; b=bi878YlIDfzlEP2UFZjra9vjnBYbPNyQ1C9vdxbC4oCPxUXLpQPxojXOkxUiyzBStXoYPxjinrM48vTM+OOrYr88ldpX6qsVsSr0xGmgS1q1DaNpeVLVusiL9BbDuvc8z6Jf0g8E9vpv29WRPiujfzXcU8G1DswLsDyPQ0UGIBU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652342166; 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=vTv3x+pCUOwj/faghRp8YdBI1JHYyodbx1SQrga/opU=; b=Ap8WzvQD3QxBDfH8qDPqvVvcIuwJ5Y/Ciqij9OKwY3KNb8stwXrT3yhj7KnBsDMKb/U9KJgq3T0Ji//1M12W/u/5oa7rydg9SnTosT+opTGUIJwX+SXu1oNEJ4OsqckVdoMkUf9ISfhvax1YdU43Xy6tQcePaAs/lCB0abpRgJc= 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 1652342166709435.92233443352575; Thu, 12 May 2022 00:56:06 -0700 (PDT) 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-589-PPRLQOUdP3SXX5ekBjoALw-1; Thu, 12 May 2022 03:55:58 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 06443100BAB4; Thu, 12 May 2022 07:55:57 +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 E3B7C40CF8F9; Thu, 12 May 2022 07:55:56 +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 C1EE71932236; Thu, 12 May 2022 07:55:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DFD0F194E103 for ; Thu, 12 May 2022 07:55:52 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B42EFC28124; Thu, 12 May 2022 07:55:52 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B0164C2810A for ; Thu, 12 May 2022 07:55:52 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 96BA180159B for ; Thu, 12 May 2022 07:55:52 +0000 (UTC) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-463-ONEPw6nQNk66bO_mlli_vA-1; Thu, 12 May 2022 03:55:50 -0400 Received: by mail-wm1-f72.google.com with SMTP id c62-20020a1c3541000000b0038ec265155fso4031012wma.6 for ; Thu, 12 May 2022 00:55:50 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id m12-20020a5d56cc000000b0020c635ca28bsm3358519wrw.87.2022.05.12.00.55.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 00:55:48 -0700 (PDT) Received: from wheatley.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 49B956D3299F for ; Thu, 12 May 2022 09:55:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652342165; 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=vTv3x+pCUOwj/faghRp8YdBI1JHYyodbx1SQrga/opU=; b=WISzUOLS4JJg6t/0Ft5Dc4dFPu9AhtN9LAxMfooVam0bn/ZcgK93vQsCN96PtYWIyI/MJf EoHg1LCFc8nDEfkmlSgE8FXNWh8p0iwWGa4EhBThu8bNkRGz9WPjISAY/b9GZZwcGiEsCj KQJoM0tKCXxnhDJV9hKUjs9Zb0vU7+U= X-MC-Unique: PPRLQOUdP3SXX5ekBjoALw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: ONEPw6nQNk66bO_mlli_vA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vTv3x+pCUOwj/faghRp8YdBI1JHYyodbx1SQrga/opU=; b=3VGDHZxCDDRfzfRUz8xEkE8wW+pfOiMo5cwb+WNZT59BTxNx/KIH8c3kSZSKGdN4b+ sMDBZs3BRMSTeeW7+Hn1SzAe4JXv0JBhQYrqi8nidM330F4+eQ/WnrBQjfFGPJ7yR54G IDiyatYTtws4kVEieGXHEJKb5vGJ1/5F6YyKD21kIlYqHQw/8GUXmOSIRw8jFcNUGa/m rkOjQ2zDBWWEge6r+pw1JJfYXw2wQ54XYl/2XY44hrFWncNYtq72HwHXUY/M/FgKAZn9 T9Mxz0IScqs0eSikEDO0IiRx7QNg0mQGc149+Fsj5YXNf39RkOP9lFmwjvSBusZ2b7n8 w8Jg== X-Gm-Message-State: AOAM533Wkr3o5kv+2e1seWl3pge2ywNpz26EAXkqKbVDUXiOdQ0ivLZv uHhSE0cAK16DaPZyg8gcFT7D/NrsVmsT0IA2Fn7/bYZ1JRGEsUIMV+kvek2FyO3+qzZUDEbAJ3K PKVnPo0EY9+AZ/25re39HBDKKlYvJxcYMMRhg/cePu7KnSW5hvorabI0YbV0H7ZMzIuA2VZI= X-Received: by 2002:a7b:c156:0:b0:395:b669:5c83 with SMTP id z22-20020a7bc156000000b00395b6695c83mr7301534wmi.141.1652342149793; Thu, 12 May 2022 00:55:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJys3gQ2kDn6IZLlYuvLRMli/KY75Y0ILNrrtsnGWqR8EFJpw0sHoccz+QklITf1ITnePLUbng== X-Received: by 2002:a7b:c156:0:b0:395:b669:5c83 with SMTP id z22-20020a7bc156000000b00395b6695c83mr7301523wmi.141.1652342149456; Thu, 12 May 2022 00:55:49 -0700 (PDT) From: Martin Kletzander To: libvir-list@redhat.com Subject: [libvirt PATCH 1/4] Remove serial-spiceport-nospice test Date: Thu, 12 May 2022 09:55:45 +0200 Message-Id: <2fbf21bb17357db7fde28691d84c67674060486b.1652342145.git.mkletzan@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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 2.84 on 10.11.54.1 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: 1652342168125100007 Content-Type: text/plain; charset="utf-8"; x-default="true" This old test was added by me to allow people to keep the spicevmc channel while changing graphics type from spice to something else. However we do not do this in other places and also now we have all the Validate functions so it is better to show the user they will not have the spicevmc channel available rather than simply not formatting it on the qemu command line. Signed-off-by: Martin Kletzander Reviewed-by: Michal Privoznik --- .../serial-spiceport-nospice.args | 33 ------------- ...erial-spiceport-nospice.x86_64-latest.args | 37 --------------- .../serial-spiceport-nospice.xml | 37 --------------- tests/qemuxml2argvtest.c | 2 - .../serial-spiceport-nospice.xml | 47 ------------------- tests/qemuxml2xmltest.c | 1 - 6 files changed, 157 deletions(-) delete mode 100644 tests/qemuxml2argvdata/serial-spiceport-nospice.args delete mode 100644 tests/qemuxml2argvdata/serial-spiceport-nospice.x86_64-= latest.args delete mode 100644 tests/qemuxml2argvdata/serial-spiceport-nospice.xml delete mode 100644 tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml diff --git a/tests/qemuxml2argvdata/serial-spiceport-nospice.args b/tests/q= emuxml2argvdata/serial-spiceport-nospice.args deleted file mode 100644 index 038b660afef6..000000000000 --- a/tests/qemuxml2argvdata/serial-spiceport-nospice.args +++ /dev/null @@ -1,33 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m 214 \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --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 \ --usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-spiceport-nospice.x86_64-latest.= args b/tests/qemuxml2argvdata/serial-spiceport-nospice.x86_64-latest.args deleted file mode 100644 index cee7dcd1a80a..000000000000 --- a/tests/qemuxml2argvdata/serial-spiceport-nospice.x86_64-latest.args +++ /dev/null @@ -1,37 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ --accel tcg \ --cpu qemu64 \ --m 214 \ --object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --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 \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-spiceport-nospice.xml b/tests/qe= muxml2argvdata/serial-spiceport-nospice.xml deleted file mode 100644 index 7a5b96ace2d7..000000000000 --- a/tests/qemuxml2argvdata/serial-spiceport-nospice.xml +++ /dev/null @@ -1,37 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - - - -
- - - - - - - - - - - - - - - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1d6e03490dd9..4ad88f7bd8bb 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1613,7 +1613,6 @@ mymain(void) QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST_NOCAPS("serial-spiceport-nospice"); =20 DO_TEST("console-compat", QEMU_CAPS_DEVICE_ISA_SERIAL); @@ -1635,7 +1634,6 @@ mymain(void) QEMU_CAPS_DEVICE_ISA_SERIAL); DO_TEST_CAPS_LATEST("serial-file-log"); DO_TEST_CAPS_LATEST("serial-spiceport"); - DO_TEST_CAPS_LATEST("serial-spiceport-nospice"); DO_TEST_CAPS_LATEST("serial-debugcon"); =20 DO_TEST_CAPS_LATEST("console-compat"); diff --git a/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml b/tests/= qemuxml2xmloutdata/serial-spiceport-nospice.xml deleted file mode 100644 index bdc640be9e00..000000000000 --- a/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml +++ /dev/null @@ -1,47 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - - - - -
- - -
- - -
- - - - - - - - - - - - - - -