From nobody Mon Sep 16 19:45:38 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=1693923909; cv=none; d=zohomail.com; s=zohoarc; b=OOsXEeOxHKANS2jaz2ewNL64iF+SiaHz+uUzmDHB0s1YuAB6/ZOTC012PAjJRxkZpVcZXhohGYD+ka70XUSFeFwYVcegmD3C4xpF+ZqoLsU0kQj8FCw2p1zX4KJ0NICrZUkJqUNTmLw442aTDqJT1MHtrZFwT2oGchxhffIfY3c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923909; 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=UGlMWwkRZ9+e9iyWhKqTP4IfEAyOa2bd6IHvaehIqdw=; b=JTg3Wg5WtJlCyNMGmOflVQrApufW54PGFC6LIGSd4zFMaVbOXa8spCmaozqWxRhKFkcYcVcXNio/92uSvofARarGKrmLQM/3ziTHiXGBPuJnOzQYmvlrlXIEO8vkmTIX4QFB6Z6OPifkMAi2uY9NdGNMKq5dYW29zfvT9SArFmg= 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 1693923909071500.4451816989076; Tue, 5 Sep 2023 07:25:09 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.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-158-GCoA0-igPxqlph9uq0fPFg-1; Tue, 05 Sep 2023 10:24:57 -0400 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 1EB802812942; Tue, 5 Sep 2023 14:24:30 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A30A412F2D0; Tue, 5 Sep 2023 14:24:30 +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 DC2F61946595; Tue, 5 Sep 2023 14:24:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 660471946589 for ; Tue, 5 Sep 2023 14:24:29 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5795C1208F6E; Tue, 5 Sep 2023 14:24:29 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id B98801121319 for ; Tue, 5 Sep 2023 14:24:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923908; 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=UGlMWwkRZ9+e9iyWhKqTP4IfEAyOa2bd6IHvaehIqdw=; b=EheqV+4tAOfBhGx6DRDdDt+30MorY6avQFI/D6vDSwaITD37fs+9Krb1RcxPcvnyVxGCiw ojkgcl6J75hdFxUn1RNv0yHhos8noq6Q7+s2ADmMPT7UEEQ4MxF7WaS26TLm1asg/vpLly iWhC9ED9p+Jx33x4xpZO31M65ChUfes= X-MC-Unique: GCoA0-igPxqlph9uq0fPFg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 06/51] qemuxml2argvtest: Drop 'monitor-json' case Date: Tue, 5 Sep 2023 16:23:33 +0200 Message-ID: <34466da4436f5b1a10a086a837c9fa7b816112f7.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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: 1693923909662100001 Content-Type: text/plain; charset="utf-8" QMP monitor is the only thing we support at this point, thus all other tests test the same thing. Signed-off-by: Peter Krempa --- tests/qemuxml2argvdata/monitor-json.args | 34 ------------------------ tests/qemuxml2argvdata/monitor-json.xml | 25 ----------------- tests/qemuxml2argvtest.c | 2 -- 3 files changed, 61 deletions(-) delete mode 100644 tests/qemuxml2argvdata/monitor-json.args delete mode 100644 tests/qemuxml2argvdata/monitor-json.xml diff --git a/tests/qemuxml2argvdata/monitor-json.args b/tests/qemuxml2argvd= ata/monitor-json.args deleted file mode 100644 index 817806f5a4..0000000000 --- a/tests/qemuxml2argvdata/monitor-json.args +++ /dev/null @@ -1,34 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-encryptdisk \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-encryptdisk/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-encryptdisk/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-encryptdisk/.config \ -/usr/bin/qemu-system-x86_64 \ --name guest=3Dencryptdisk,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-encryptdisk/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m size=3D219136k \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \ --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 \ --blockdev '{"driver":"file","filename":"/dev/hda1","node-name":"libvirt-1-= storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/monitor-json.xml b/tests/qemuxml2argvda= ta/monitor-json.xml deleted file mode 100644 index d151884434..0000000000 --- a/tests/qemuxml2argvdata/monitor-json.xml +++ /dev/null @@ -1,25 +0,0 @@ - - encryptdisk - 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - - - - - - - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3c2156118a..8238dceed8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1892,8 +1892,6 @@ mymain(void) DO_TEST("multifunction-pci-device", QEMU_CAPS_SCSI_LSI); - DO_TEST_NOCAPS("monitor-json"); - DO_TEST_NOCAPS("seclabel-dynamic"); DO_TEST_NOCAPS("seclabel-dynamic-baselabel"); DO_TEST_NOCAPS("seclabel-dynamic-override"); --=20 2.41.0