From nobody Mon May 6 13:57:22 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=1641462287; cv=none; d=zohomail.com; s=zohoarc; b=Uhi6JSi8VQNpaO3Z0X0S23OkdSO0Q2OixP1A8QD7CpslORMAJok8IG3xKGVgqHJ8ARne55GuT3q+oa8/Bg/xFzv09OJhkLcNAq1wXVGqUqOyEK1vEuh+fbdE6PUd9pAaueUvPmwv+WJf38x7uQAJxzzKnAHFbItWCWVznzi/McM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641462287; 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=TmcsYUntDJDt4rc3+pF6UdVGt4/NrgpoBGCJL825wmE=; b=Ne9fsagED8bNHCQeIVkE3slbDtK2dstLMuh8eNSTdZyswK+X5Lt6rgikPxTerijULaBtvI4bIiK/4/x/oxv6tmxmn0E4tpvqT783NGSiEDNTCUIompk9RR8GjRg8g8fGMP8gcZ6f9kbxpxNbWr7QSBdCh0TApGEjDi9DZrrl6uE= 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 1641462287710977.1436304148964; Thu, 6 Jan 2022 01:44:47 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-120-4oIoATI3OkCnMn4bSwAK4Q-1; Thu, 06 Jan 2022 04:44:42 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1B864801AAB; Thu, 6 Jan 2022 09:44: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 516917AB7E; Thu, 6 Jan 2022 09:44: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 0DAFF1809CBA; Thu, 6 Jan 2022 09:44:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 2069iYic005360 for ; Thu, 6 Jan 2022 04:44:34 -0500 Received: by smtp.corp.redhat.com (Postfix) id 429BC7CD68; Thu, 6 Jan 2022 09:44:34 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99FC27CAD2 for ; Thu, 6 Jan 2022 09:44:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641462286; 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=TmcsYUntDJDt4rc3+pF6UdVGt4/NrgpoBGCJL825wmE=; b=XiuwMrfUdvQ0SzdmKK1nqVBPAnayGbQpPIOwuO21fFZyqngbwcTrOjg4+RyTbujkChdmHq x8O/7Uem4u7BQ8QiS0WsNvJLL9kJtD1YK0Y8wRxdnmIDljLuz5uetBf/kHUpP8K/WN9VHt lb5ZIY07Wf0JmZp/iV2oggXqpN8QaxM= X-MC-Unique: 4oIoATI3OkCnMn4bSwAK4Q-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 01/21] qemuProcessPrepareQEMUCaps: Don't clear QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE Date: Thu, 6 Jan 2022 10:44:00 +0100 Message-Id: <20cfacda92c133c504decce0d91f23150217e3a3.1641461748.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.16 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: 1641462289816100001 Content-Type: text/plain; charset="utf-8" All the fd-passing setup of chardevs which this hack meant to disable was moved to the host-preparation phase which is skipped for formatting of non-real commandlines. Signed-off-by: Peter Krempa --- src/qemu/qemu_process.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index de1146251d..76a52f7a5d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5522,7 +5522,6 @@ qemuProcessStartUpdateCustomCaps(virDomainObj *vm) * qemuProcessPrepareQEMUCaps: * @vm: domain object * @qemuCapsCache: cache of QEMU capabilities - * @processStartFlags: flags based on the VIR_QEMU_PROCESS_START_* enum * * Prepare the capabilities of a QEMU process for startup. This includes * copying the caps to a static cache and potential post-processing depend= ing @@ -5532,8 +5531,7 @@ qemuProcessStartUpdateCustomCaps(virDomainObj *vm) */ static int qemuProcessPrepareQEMUCaps(virDomainObj *vm, - virFileCache *qemuCapsCache, - unsigned int processStartFlags) + virFileCache *qemuCapsCache) { qemuDomainObjPrivate *priv =3D vm->privateData; @@ -5544,9 +5542,6 @@ qemuProcessPrepareQEMUCaps(virDomainObj *vm, vm->def->os.machine)= )) return -1; - if (processStartFlags & VIR_QEMU_PROCESS_START_STANDALONE) - virQEMUCapsClear(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS_COMMAND= LINE); - /* Update qemu capabilities according to lists passed in via namespace= */ if (qemuProcessStartUpdateCustomCaps(vm) < 0) return -1; @@ -5605,7 +5600,7 @@ qemuProcessInit(virQEMUDriver *driver, } VIR_DEBUG("Determining emulator version"); - if (qemuProcessPrepareQEMUCaps(vm, driver->qemuCapsCache, flags) < 0) + if (qemuProcessPrepareQEMUCaps(vm, driver->qemuCapsCache) < 0) goto cleanup; if (qemuDomainUpdateCPU(vm, updatedCPU, &origCPU) < 0) --=20 2.31.1 From nobody Mon May 6 13:57:22 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=1641462307; cv=none; d=zohomail.com; s=zohoarc; b=eJfO8v69ImxZaLfn4neUWhY1MoAkEpB2jv0GLhM54u42xJrxoNZ6Jw4EGJhpqZzmV2pRui+2RBc1vQ9OHJdEzpkeJUhPHNvdsekPXjPV6p+nlhK4DWECJQxbzGAntCBaaMHBhsGfAOZYwaKrNCLrcK8G/5dv+0yBw7582ogyADw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641462307; 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=R7a5AiDVfx3oaP9MgDBHfGaZJ0PfwsT59uoEzRVK03M=; b=T7Anka4z+Jkt5nhQXia9FWkD3zVBtiCANfxDAuaUktC/BQwKjVnBRDRtwCQ7g6ZSiT7SBz8BPpSAFuyqJOaTBiTR3R4/h1FDO80ydqPrwFmpsO9jUnFYZbPLwsfqmqPdLZWGegykJk0DO9SrFnB7NynpFenULoQtx8jpY0nnLfE= 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 1641462307004264.42413221960567; Thu, 6 Jan 2022 01:45:07 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-252-4QXBT1fwOKaOfJSlczi-MA-1; Thu, 06 Jan 2022 04:44:59 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0DCB281CCB6; Thu, 6 Jan 2022 09:44:55 +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 DDD41106A026; Thu, 6 Jan 2022 09:44:54 +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 0FD221806D03; Thu, 6 Jan 2022 09:44:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 2069ictu005383 for ; Thu, 6 Jan 2022 04:44:38 -0500 Received: by smtp.corp.redhat.com (Postfix) id C3ED07CD68; Thu, 6 Jan 2022 09:44:38 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27DF27CAD2 for ; Thu, 6 Jan 2022 09:44:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641462305; 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=R7a5AiDVfx3oaP9MgDBHfGaZJ0PfwsT59uoEzRVK03M=; b=JVxJxBBA3sq8dh0poFI45gJvYUQvyUQ5sfgC7AXUGx8yFA+q2S9QCXiTa1lwcyacplsogH vHzTkdj+EqvJlguX/F+RX42JDo8E7Jjk6GAZcgwfE4pQLLm7Ke5ZiF5BC2Xlr8NYVfq6q+ YGnhP8Z9L4/eFM6ClfFxbqFCUnpaheE= X-MC-Unique: 4QXBT1fwOKaOfJSlczi-MA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 02/21] qemuDomainNeedsFDC: Simplify and improve checking if a machine needs FDC Date: Thu, 6 Jan 2022 10:44:01 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.22 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: 1641462307774100001 Content-Type: text/plain; charset="utf-8" Commit c7f3a1f7870 turned qemuDomainMachineNeedsFDC() effectively into qemuDomainIsQ35. Use it instead as it also matches the non-canonicalized 'q35'. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3f10f9306f..a8401bac30 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8685,20 +8685,6 @@ bool qemuDomainHasBuiltinESP(const virDomainDef *def) } -static bool -qemuDomainMachineNeedsFDC(const char *machine, - const virArch arch) -{ - if (!ARCH_IS_X86(arch)) - return false; - - if (!STRPREFIX(machine, "pc-q35-")) - return false; - - return true; -} - - bool qemuDomainIsQ35(const virDomainDef *def) { @@ -8781,7 +8767,8 @@ qemuDomainHasBuiltinIDE(const virDomainDef *def) bool qemuDomainNeedsFDC(const virDomainDef *def) { - return qemuDomainMachineNeedsFDC(def->os.machine, def->os.arch); + /* all supported Q35 machines need explicit FDC */ + return qemuDomainIsQ35(def); } --=20 2.31.1 From nobody Mon May 6 13:57:22 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=1641462305; cv=none; d=zohomail.com; s=zohoarc; b=JCDv+ZFjCUaDcfmzI5cw5E92d1n5qTUCnFj58p2/IAgh4UZ6tqfHaF4u9wU/LEsXKsUe3Z5RUgwVkM0U9Ue4J2R7xNKO1gDc+LjVk067vSHnihUqUKhGSaa1FRilyliZ3oHQpx0XkKDMtka3VmK6Q7Dk+/OqG7iwFPOcdZ4M0cs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641462305; 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=r+8Zwqw+jcXwuYJB2Pi9/vhc/Unf7CpHybpuLFtZ8Tw=; b=oE9YNrMX3i9tlwJS9N1bE+r+bf6RuyO6meNc//YwYC4GwOevg/ubZvXggTjN8gf7GkvB+HH1viX1KhbtDF3ZTfWvsq7a4EsEwgvadTs7yM6iABfdbIopyGZJqvMQpWt6FzNxgTBGzgcvGoX7yRTmJnCJePnEldZsJ3yRnZub7cs= 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 16414623059704.929686413048671; Thu, 6 Jan 2022 01:45:05 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-408-YPKPnOY4NZm6FfIzdG0Pbg-1; Thu, 06 Jan 2022 04:44:59 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DF2AA81CCB5; Thu, 6 Jan 2022 09:44:54 +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 E2A4B749BB; Thu, 6 Jan 2022 09:44:53 +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 A18714BB7C; Thu, 6 Jan 2022 09:44:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 2069in16005395 for ; Thu, 6 Jan 2022 04:44:49 -0500 Received: by smtp.corp.redhat.com (Postfix) id 023637CAD2; Thu, 6 Jan 2022 09:44:49 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64DC57D48F for ; Thu, 6 Jan 2022 09:44:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641462303; 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=r+8Zwqw+jcXwuYJB2Pi9/vhc/Unf7CpHybpuLFtZ8Tw=; b=Cm9gjOHT0GP/Yfp0vK8MgNEobA4odlZT/vVmmo9xuZbl1Jz3X0zp5jVIG4SlCz2/kZcqQC ee72EMNZ1r0RgR/F8P8Dwa2dKq6FJB1uKgEEOm6pyI3n1iHhsr6rKs8vhMq0wRJ9GupCd/ uIGNnFCjJXZ0JLsuFcLQiNgsERLjugw= X-MC-Unique: YPKPnOY4NZm6FfIzdG0Pbg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/21] qemuxml2argvtest: Remove redundant floppy controller tests Date: Thu, 6 Jan 2022 10:44:02 +0100 Message-Id: <94b598380c047eff2b1972a161539430d4eb65c0.1641461748.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.14 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: 1641463208837100001 Content-Type: text/plain; charset="utf-8" The two test cases were added to avoid regressions such as fixed in 17dff3584855e9. Nowadays the code is much simpler and any Q35 machine will trigger the explicit FDC. Remove the '2.11' machine type version and turn the '2.9' version into a generic q35 machine. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemusecuritytest.c | 3 +- .../disk-floppy-q35-2_11.x86_64-latest.args | 42 ------------------- .../qemuxml2argvdata/disk-floppy-q35-2_11.xml | 38 ----------------- .../disk-floppy-q35-2_9.x86_64-2.12.0.args | 36 ---------------- ...rgs =3D> disk-floppy-q35.x86_64-2.12.0.args} | 2 +- ...rgs =3D> disk-floppy-q35.x86_64-latest.args} | 2 +- ...floppy-q35-2_9.xml =3D> disk-floppy-q35.xml} | 2 +- tests/qemuxml2argvtest.c | 6 +-- 8 files changed, 6 insertions(+), 125 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-late= st.args delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_11.xml delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.= 0.args rename tests/qemuxml2argvdata/{disk-floppy-q35-2_11.x86_64-2.12.0.args =3D= > disk-floppy-q35.x86_64-2.12.0.args} (96%) rename tests/qemuxml2argvdata/{disk-floppy-q35-2_9.x86_64-latest.args =3D>= disk-floppy-q35.x86_64-latest.args} (96%) rename tests/qemuxml2argvdata/{disk-floppy-q35-2_9.xml =3D> disk-floppy-q3= 5.xml} (95%) diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c index a7e87fdf8f..924c625a4c 100644 --- a/tests/qemusecuritytest.c +++ b/tests/qemusecuritytest.c @@ -213,8 +213,7 @@ mymain(void) DO_TEST_DOMAIN("disk-detect-zeroes"); DO_TEST_DOMAIN("disk-error-policy"); DO_TEST_DOMAIN("disk-floppy"); - DO_TEST_DOMAIN("disk-floppy-q35-2_11"); - DO_TEST_DOMAIN("disk-floppy-q35-2_9"); + DO_TEST_DOMAIN("disk-floppy-q35"); DO_TEST_DOMAIN("disk-network-gluster"); DO_TEST_DOMAIN("disk-network-iscsi"); DO_TEST_DOMAIN("disk-network-nbd"); diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args deleted file mode 100644 index 88144f5f98..0000000000 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args +++ /dev/null @@ -1,42 +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-q35-2.11,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.r= am \ --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":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ --device '{"driver":"isa-fdc","bootindexA":1}' \ --blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"floppy","unit":0,"drive":"libvirt-2-format","id":"fdc0= -0-0"}' \ --blockdev '{"driver":"file","filename":"/tmp/data.img","node-name":"libvir= t-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 '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.xml b/tests/qemuxm= l2argvdata/disk-floppy-q35-2_11.xml deleted file mode 100644 index 6f51691a5c..0000000000 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.xml +++ /dev/null @@ -1,38 +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/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args = b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args deleted file mode 100644 index 528214e73f..0000000000 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args +++ /dev/null @@ -1,36 +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-q35-2.9,usb=3Doff,dump-guest-core=3Doff \ --accel tcg \ --m 214 \ --realtime mlock=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 pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ --drive file=3D/tmp/firmware.img,format=3Draw,if=3Dnone,id=3Ddrive-fdc0-0-0= \ --drive file=3D/tmp/data.img,format=3Dqcow2,if=3Dnone,id=3Ddrive-fdc0-0-1 \ --device isa-fdc,driveA=3Ddrive-fdc0-0-0,bootindexA=3D1,driveB=3Ddrive-fdc0= -0-1 \ --sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args= b/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-2.12.0.args similarity index 96% rename from tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args rename to tests/qemuxml2argvdata/disk-floppy-q35.x86_64-2.12.0.args index 055661b75b..efd76d6436 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-2.12.0.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -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-q35-2.11,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-q35-2.12,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args = b/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args similarity index 96% rename from tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args rename to tests/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args index c04f0e2a2f..810cc0796d 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -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-q35-2.9,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra= m \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ -accel tcg \ -cpu qemu64 \ -m 214 \ diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.xml b/tests/qemuxml= 2argvdata/disk-floppy-q35.xml similarity index 95% rename from tests/qemuxml2argvdata/disk-floppy-q35-2_9.xml rename to tests/qemuxml2argvdata/disk-floppy-q35.xml index 5301759279..6fef3bf8f9 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.xml +++ b/tests/qemuxml2argvdata/disk-floppy-q35.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6c67b36d5c..658084ad0c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1380,10 +1380,8 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-cdrom-tray"); DO_TEST_CAPS_VER("disk-floppy", "2.12.0"); DO_TEST_CAPS_LATEST("disk-floppy"); - DO_TEST_CAPS_VER("disk-floppy-q35-2_9", "2.12.0"); - DO_TEST_CAPS_LATEST("disk-floppy-q35-2_9"); - DO_TEST_CAPS_VER("disk-floppy-q35-2_11", "2.12.0"); - DO_TEST_CAPS_LATEST("disk-floppy-q35-2_11"); + DO_TEST_CAPS_VER("disk-floppy-q35", "2.12.0"); + DO_TEST_CAPS_LATEST("disk-floppy-q35"); DO_TEST_CAPS_ARCH_LATEST_FAILURE("disk-floppy-pseries", "ppc64"); DO_TEST_CAPS_LATEST("disk-floppy-tray"); DO_TEST_CAPS_LATEST("disk-virtio"); --=20 2.31.1 From nobody Mon May 6 13:57:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1641462371; cv=none; d=zohomail.com; s=zohoarc; b=ky6nk1xskOvF9m9Fo8O5x2RNCjEQu+zFRSR/pt+vWpvtDa0qz4GPH/tOcL30vL1Rv6DuTFsMpl9xDMJewvlubKZO0CmDFYCdhO4YsaL02XG36S1KcOEQ4s6Wpb7x/y9VJaMGc3kuINhLRipgSTNkO1Qk+bge0nKvhuuejETSa8c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641462371; 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=0fxtXthV9D0ILb2vYHyT3LPkzCzu8agCsGxd1/TAXps=; b=oBRrGzcStXutBssHQXTYPvZ/ue4nxGwzXcXOD7oT8Z7WClEsGLLgnBtS+U2YuSwGTVvHfLFe7QHw1l0p3pc4GkTvHC8DtAZAyNPOT8rXe54QFp19mAhz4q0XhbW/4YQg2KTXQDipgJvmeS6StVOJr+M82peLVH1WyFjXP+5qusU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1641462371548618.7953423737343; Thu, 6 Jan 2022 01:46:11 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-171-mx4RRxTXNAK70OabMFw8Hg-1; Thu, 06 Jan 2022 04:45:11 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 251B71083F64; Thu, 6 Jan 2022 09:45:06 +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 F24F87B6C0; Thu, 6 Jan 2022 09:45:05 +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 B42CF4A7C8; Thu, 6 Jan 2022 09:45:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 2069j4Qk005473 for ; Thu, 6 Jan 2022 04:45:04 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4C5787D48E; Thu, 6 Jan 2022 09:45:04 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id A02877D48A for ; Thu, 6 Jan 2022 09:44:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641462370; 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=0fxtXthV9D0ILb2vYHyT3LPkzCzu8agCsGxd1/TAXps=; b=NWL8elMSjhUxEZHX4Q9R0cRwfj0QFfnFKXvgZSQlvR3CLH/CwXRc2H6XbmWfncZ96R647H HZqPQcCn+wS/bGU3FL/QdLeYsJCA3FDPtHDRI8lcWC8lenuUC5Ueh0ZeWKQn+heCXGNPX+ UN3DaClf9JvL2qJ+WLLTtQ3AuZnDf5s= X-MC-Unique: mx4RRxTXNAK70OabMFw8Hg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 04/21] testutilsqemu: Remove unused non-x86 fake machine types Date: Thu, 6 Jan 2022 10:44:03 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.16 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: 1641462372253100001 Content-Type: text/plain; charset="utf-8" For tests with fake capabilities we fill in a bunch of machine types which the tests might use. For now there's a random collection of machine types which are not actually used. Purge the unused ones for non-x86 machines. Signed-off-by: Peter Krempa --- tests/testutilsqemu.c | 12 +++++------- tests/vircapstest.c | 6 ------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 7fdb82daec..980555b27e 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -58,27 +58,25 @@ static const char *const aarch64_machines[] =3D { "virt", "virt-2.6", "versatilepb", NULL }; static const char *const arm_machines[] =3D { - "vexpress-a9", "vexpress-a15", "versatilepb", "virt", NULL + "vexpress-a9", "virt", NULL }; static const char *const ppc64_machines[] =3D { "pseries", NULL }; static const char *const ppc_machines[] =3D { - "g3beige", "mac99", "prep", "ppce500", NULL + "ppce500", NULL }; static const char *const riscv32_machines[] =3D { - "spike_v1.10", "spike_v1.9.1", "sifive_e", "virt", "sifive_u", NULL + "virt", NULL }; static const char *const riscv64_machines[] =3D { - "spike_v1.10", "spike_v1.9.1", "sifive_e", "virt", "sifive_u", NULL + "virt", NULL }; static const char *const s390x_machines[] =3D { "s390-ccw-virtio", NULL }; static const char *const sparc_machines[] =3D { - "SS-5", "LX", "SPARCClassic", "SPARCbook", - "SS-10", "SS-20", "SS-4", "SS-600MP", - "Voyager", "leon3_generic", NULL + "SS-5", NULL }; static const char *const *qemu_machines[VIR_ARCH_LAST] =3D { diff --git a/tests/vircapstest.c b/tests/vircapstest.c index 697803fdc9..be93325307 100644 --- a/tests/vircapstest.c +++ b/tests/vircapstest.c @@ -165,12 +165,6 @@ test_virCapsDomainDataLookupQEMU(const void *data G_GN= UC_UNUSED) CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, "/usr/bin/qemu-syste= m-ppc64", NULL, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_PPC64, VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-ppc64", "pseries"); - CAPSCOMP(-1, VIR_ARCH_RISCV32, VIR_DOMAIN_VIRT_NONE, NULL, NULL, - VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_RISCV32, - VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-riscv32", "spike_v1.10= "); - CAPSCOMP(-1, VIR_ARCH_RISCV64, VIR_DOMAIN_VIRT_NONE, NULL, NULL, - VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_RISCV64, - VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-riscv64", "spike_v1.10= "); CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, "pseries", VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_PPC64, --=20 2.31.1 From nobody Mon May 6 13:57:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1641462330; cv=none; d=zohomail.com; s=zohoarc; b=GMfesH5kZGTm5Qdhh3ZHVlF6LPvF+1DyrpcJKH/uNjgrJHr/NItEkbEs98kHcAIiqzVEs/Wto4Yx4pZvKJ1qH0V0gxR1JE1PecWFx1Xs4eplmYZ79psW4s4IHm8LAOimvHemRIOO0GssYDUWnQYEZIspU3FRxsbyG2ypYlGsYcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641462330; 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=6QgFNdUXae5+aAZ8ZtRuUrKc9167fZwif67AxmJrekA=; b=ErzO9y6oPcIxhqDkWJXjJEjJbNoN6+s/wZWY4jTgnJkzqL92uJlOefc2IEeNoiYvOq0UAkSnPIWvWNSRCPb+Vb/9BTBKnDHzDlzblAgnCrjA4mgnVyl9awfR7MHe6q/k6/rhdsUktamiod9pCH4I2YSCopTnG+HL2phGE4mLvys= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1641462330697172.90550951641274; Thu, 6 Jan 2022 01:45:30 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-653-vgkvvIWYMpGkIrAyR3g1Eg-1; Thu, 06 Jan 2022 04:45:25 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 97BCB1006AA3; Thu, 6 Jan 2022 09:45:20 +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 75735106F74C; Thu, 6 Jan 2022 09:45: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 4229B1806D2C; Thu, 6 Jan 2022 09:45:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 2069jJnh005632 for ; Thu, 6 Jan 2022 04:45:19 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6B1617D4AF; Thu, 6 Jan 2022 09:45:19 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id A8B257D4A4 for ; Thu, 6 Jan 2022 09:45:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641462329; 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=6QgFNdUXae5+aAZ8ZtRuUrKc9167fZwif67AxmJrekA=; b=bD7G8q26hgM6djJn1vz4zUGOVUXBMFr35o8+4NSTzyPwYYUb1TLGRsEVvyz80hy4yo1Wff zTBSBYflOJEwwfFLx12rKDVvTTgUJM6lPPHW4UkNuFxyDrlEkmGErUGB0pd3fsXEJ0owkV FUJb9vnu9vahdkL0/lJSy2Dd68mFckM= X-MC-Unique: vgkvvIWYMpGkIrAyR3g1Eg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 05/21] tests: qemuxml2argvdata: Remove use of 'pc-1.0' and 'pc-1.2' machine types Date: Thu, 6 Jan 2022 10:44:04 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.22 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: 1641462331889100001 Content-Type: text/plain; charset="utf-8" There's nothing special about the tests requiring to use very old machine types. Most usage is cargo-culted from other tests. Switch all the tests to use 'pc' instead. Signed-off-by: Peter Krempa --- ...launch-security-sev-missing-platform-info.x86_64-2.12.0.args | 2 +- .../launch-security-sev-missing-platform-info.xml | 2 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 2 +- tests/qemuxml2argvdata/pci-autoadd-addr.xml | 2 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 2 +- tests/qemuxml2argvdata/pci-autoadd-idx.xml | 2 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 2 +- tests/qemuxml2argvdata/pci-autofill-addr.xml | 2 +- tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml | 2 +- tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml | 2 +- tests/qemuxml2argvdata/pci-bridge.args | 2 +- tests/qemuxml2argvdata/pci-bridge.xml | 2 +- tests/qemuxml2argvdata/pci-many.args | 2 +- tests/qemuxml2argvdata/pci-many.xml | 2 +- tests/qemuxml2argvdata/pci-root-address.xml | 2 +- tests/qemuxml2argvdata/pci-root-nonzero-index.xml | 2 +- tests/qemuxml2argvdata/pcihole64-gib.xml | 2 +- tests/qemuxml2argvdata/pcihole64-none.xml | 2 +- tests/qemuxml2argvdata/pcihole64.args | 2 +- tests/qemuxml2argvdata/pcihole64.xml | 2 +- tests/qemuxml2xmloutdata/pci-autoadd-addr.xml | 2 +- tests/qemuxml2xmloutdata/pci-autoadd-idx.xml | 2 +- tests/qemuxml2xmloutdata/pci-autofill-addr.xml | 2 +- tests/qemuxml2xmloutdata/pci-bridge.xml | 2 +- tests/qemuxml2xmloutdata/pci-many.xml | 2 +- tests/qemuxml2xmloutdata/pcihole64-gib.xml | 2 +- tests/qemuxml2xmloutdata/pcihole64-none.xml | 2 +- tests/qemuxml2xmloutdata/pcihole64.xml | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-in= fo.x86_64-2.12.0.args b/tests/qemuxml2argvdata/launch-security-sev-missing-= platform-info.x86_64-2.12.0.args index 20ad935a68..f7000ea11d 100644 --- a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_= 64-2.12.0.args +++ b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_= 64-2.12.0.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -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-1.0,usb=3Doff,dump-guest-core=3Doff,memory-encryption=3Dlsec0 \ +-machine pc-i440fx-2.12,usb=3Doff,dump-guest-core=3Doff,memory-encryption= =3Dlsec0 \ -accel kvm \ -m 214 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-in= fo.xml b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x= ml index 41ec4cb872..b4f3eb4998 100644 --- a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.xml +++ b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2a= rgvdata/pci-autoadd-addr.args index 4643e87933..b77611bbdd 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-addr.args +++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dfdr-br,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-fdr-= br/master-key.aes \ --machine pc-1.2,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 2048 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.xml b/tests/qemuxml2ar= gvdata/pci-autoadd-addr.xml index 57b920ba09..fec2b151ed 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-addr.xml +++ b/tests/qemuxml2argvdata/pci-autoadd-addr.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2ar= gvdata/pci-autoadd-idx.args index bf1f0460d1..b9ec27af3f 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-idx.args +++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dfdr-br,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-fdr-= br/master-key.aes \ --machine pc-1.2,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 2048 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.xml b/tests/qemuxml2arg= vdata/pci-autoadd-idx.xml index 0a72956f9e..614a60329e 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-idx.xml +++ b/tests/qemuxml2argvdata/pci-autoadd-idx.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2= argvdata/pci-autofill-addr.args index d30b31e7f5..002bd37416 100644 --- a/tests/qemuxml2argvdata/pci-autofill-addr.args +++ b/tests/qemuxml2argvdata/pci-autofill-addr.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dfdr-br,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-fdr-= br/master-key.aes \ --machine pc-1.2,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 2048 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.xml b/tests/qemuxml2a= rgvdata/pci-autofill-addr.xml index a601c50ab9..1d5dbf9b23 100644 --- a/tests/qemuxml2argvdata/pci-autofill-addr.xml +++ b/tests/qemuxml2argvdata/pci-autofill-addr.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml b/tests/= qemuxml2argvdata/pci-bridge-duplicate-index.xml index e298d66618..ef7b828233 100644 --- a/tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml +++ b/tests/qemuxml2argvdata/pci-bridge-duplicate-index.xml @@ -4,7 +4,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml b= /tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml index 790827ae04..36a5fafae0 100644 --- a/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml +++ b/tests/qemuxml2argvdata/pci-bridge-negative-index-invalid.xml @@ -4,7 +4,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdat= a/pci-bridge.args index d9a7b78b97..9608f79dfa 100644 --- a/tests/qemuxml2argvdata/pci-bridge.args +++ b/tests/qemuxml2argvdata/pci-bridge.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dfdr-br,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-fdr-= br/master-key.aes \ --machine pc-1.2,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 2048 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/pci-bridge.xml b/tests/qemuxml2argvdata= /pci-bridge.xml index c28adfe43e..886b8ae641 100644 --- a/tests/qemuxml2argvdata/pci-bridge.xml +++ b/tests/qemuxml2argvdata/pci-bridge.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/= pci-many.args index b098fbaeab..0139f12ccd 100644 --- a/tests/qemuxml2argvdata/pci-many.args +++ b/tests/qemuxml2argvdata/pci-many.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dfdr-br,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-fdr-= br/master-key.aes \ --machine pc-1.2,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 2048 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/pci-many.xml b/tests/qemuxml2argvdata/p= ci-many.xml index 28654d5a48..e5603f04b6 100644 --- a/tests/qemuxml2argvdata/pci-many.xml +++ b/tests/qemuxml2argvdata/pci-many.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pci-root-address.xml b/tests/qemuxml2ar= gvdata/pci-root-address.xml index 2f5058b330..08b4c61619 100644 --- a/tests/qemuxml2argvdata/pci-root-address.xml +++ b/tests/qemuxml2argvdata/pci-root-address.xml @@ -4,7 +4,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pci-root-nonzero-index.xml b/tests/qemu= xml2argvdata/pci-root-nonzero-index.xml index 5d0dcc7dd5..49fd0f6e60 100644 --- a/tests/qemuxml2argvdata/pci-root-nonzero-index.xml +++ b/tests/qemuxml2argvdata/pci-root-nonzero-index.xml @@ -4,7 +4,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pcihole64-gib.xml b/tests/qemuxml2argvd= ata/pcihole64-gib.xml index ef5237edd7..a82c847fda 100644 --- a/tests/qemuxml2argvdata/pcihole64-gib.xml +++ b/tests/qemuxml2argvdata/pcihole64-gib.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pcihole64-none.xml b/tests/qemuxml2argv= data/pcihole64-none.xml index 5f96ef3b0d..e924747418 100644 --- a/tests/qemuxml2argvdata/pcihole64-none.xml +++ b/tests/qemuxml2argvdata/pcihole64-none.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/pcihole64.args b/tests/qemuxml2argvdata= /pcihole64.args index 69733910e6..45e49c7a3f 100644 --- a/tests/qemuxml2argvdata/pcihole64.args +++ b/tests/qemuxml2argvdata/pcihole64.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dfoo,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-foo/= master-key.aes \ --machine pc-1.2,usb=3Doff,dump-guest-core=3Doff \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 2048 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/pcihole64.xml b/tests/qemuxml2argvdata/= pcihole64.xml index 7ed2ce3ba4..0b289b1733 100644 --- a/tests/qemuxml2argvdata/pcihole64.xml +++ b/tests/qemuxml2argvdata/pcihole64.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml b/tests/qemuxml2= xmloutdata/pci-autoadd-addr.xml index cff6b2fa4d..2670c9d951 100644 --- a/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml +++ b/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml b/tests/qemuxml2x= mloutdata/pci-autoadd-idx.xml index f42c77d219..8812868ba8 100644 --- a/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml +++ b/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/pci-autofill-addr.xml b/tests/qemuxml= 2xmloutdata/pci-autofill-addr.xml index 30dc7625ec..e12dc4bae3 100644 --- a/tests/qemuxml2xmloutdata/pci-autofill-addr.xml +++ b/tests/qemuxml2xmloutdata/pci-autofill-addr.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/pci-bridge.xml b/tests/qemuxml2xmlout= data/pci-bridge.xml index d95660a381..46e42a8bc3 100644 --- a/tests/qemuxml2xmloutdata/pci-bridge.xml +++ b/tests/qemuxml2xmloutdata/pci-bridge.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/pci-many.xml b/tests/qemuxml2xmloutda= ta/pci-many.xml index b610e3aa3c..635bccc696 100644 --- a/tests/qemuxml2xmloutdata/pci-many.xml +++ b/tests/qemuxml2xmloutdata/pci-many.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/pcihole64-gib.xml b/tests/qemuxml2xml= outdata/pcihole64-gib.xml index d9b821bfe2..1ad7ca40d8 100644 --- a/tests/qemuxml2xmloutdata/pcihole64-gib.xml +++ b/tests/qemuxml2xmloutdata/pcihole64-gib.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/pcihole64-none.xml b/tests/qemuxml2xm= loutdata/pcihole64-none.xml index f4941bc67b..c4b12510bf 100644 --- a/tests/qemuxml2xmloutdata/pcihole64-none.xml +++ b/tests/qemuxml2xmloutdata/pcihole64-none.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/pcihole64.xml b/tests/qemuxml2xmloutd= ata/pcihole64.xml index 52d61603aa..5058107227 100644 --- a/tests/qemuxml2xmloutdata/pcihole64.xml +++ b/tests/qemuxml2xmloutdata/pcihole64.xml @@ -5,7 +5,7 @@ 2097152 2 - hvm + hvm --=20 2.31.1 From nobody Mon May 6 13:57:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1641462356; cv=none; d=zohomail.com; s=zohoarc; b=Gy6m//wOv1R0ThDsN98KkbNvmVV86x5b0eMot39EskxA28tcOpLRMgLBS2oRsjzRjwkUKxBAXYsDoUj5XXLRLumoLaVc6MuSupX3EBp6gqUeCMEMX9OwTiuYmi8Q2cRsVVhihHoYTG0AqcFC5qIYPCNxz3qXcWgUV9PEN+XOUTc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641462356; 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=Hx2dmDs6pRtFoXlHkNKeeh4AEsuj7/1cZAMI48fJHuY=; b=Dov7IYOuIh5N3MGAXR8hWLMXC7t04mwmbVoE9C49Y+V1EUqGt5+dzefhR36zZ/3Nu1txPG7psuSnwnIWuL+aBT+EqxE0NT2CQsz05iod5zsYtJipvnZsgKh5TN1qQxBjDdv89U016hM00/kmxlMOmuMYNNCisBgemJFeFszrXms= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1641462356808641.0589311288307; Thu, 6 Jan 2022 01:45:56 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-295-LQSwH7ZfPgeuoIrNCxSIQg-1; Thu, 06 Jan 2022 04:45:54 -0500 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 ED12F802C98; Thu, 6 Jan 2022 09:45:48 +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 CE2E87CD6C; Thu, 6 Jan 2022 09:45:48 +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 9BBD74A7C8; Thu, 6 Jan 2022 09:45:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 2069jlOf005679 for ; Thu, 6 Jan 2022 04:45:47 -0500 Received: by smtp.corp.redhat.com (Postfix) id 69D347CAD5; Thu, 6 Jan 2022 09:45:47 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id B720E7CD6C for ; Thu, 6 Jan 2022 09:45:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641462355; 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=Hx2dmDs6pRtFoXlHkNKeeh4AEsuj7/1cZAMI48fJHuY=; b=RN13rHsrTQFOwDWQa0xfTA94+1J189EI2iGgEQ1ogd694cx3ATDSN5vi4xb8lkc2fwgp1t c1d4yhFelVVD1yutV/en2Ekg1jfflo+REFMrxmzI2jekJVzz3xHsStXA3qs4ydMPdpW+MP BiU2G3WX+LVerGcrwi+0CUfc4BgrPyY= X-MC-Unique: LQSwH7ZfPgeuoIrNCxSIQg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 06/21] tests: qemuxml2argvdata: Remove specific q35 machine types from fake-caps tests Date: Thu, 6 Jan 2022 10:44:05 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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: 1641462358107100001 Content-Type: text/plain; charset="utf-8" Use q35 instead. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuxml2argvdata/bios-nvram-secure.args | 2 +- tests/qemuxml2argvdata/bios-nvram-secure.xml | 2 +- tests/qemuxml2argvdata/boot-floppy-q35.args | 2 +- tests/qemuxml2argvdata/boot-floppy-q35.xml | 2 +- tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args | 2 +- tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.xml | 2 +- tests/qemuxml2argvdata/q35-pm-disable-fallback.args | 2 +- tests/qemuxml2argvdata/q35-pm-disable-fallback.xml | 2 +- tests/qemuxml2argvdata/q35-pm-disable.args | 2 +- tests/qemuxml2argvdata/q35-pm-disable.xml | 2 +- tests/qemuxml2argvdata/q35-virt-manager-basic.args | 2 +- tests/qemuxml2argvdata/q35-virt-manager-basic.xml | 2 +- tests/qemuxml2argvdata/user-aliases2.xml | 2 +- tests/qemuxml2argvdata/vcpu-placement-static.args | 2 +- tests/qemuxml2argvdata/vcpu-placement-static.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml | 2 +- tests/qemuxml2xmloutdata/q35-virt-manager-basic.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.args b/tests/qemuxml2= argvdata/bios-nvram-secure.args index f7af9f2a02..f0799bec3c 100644 --- a/tests/qemuxml2argvdata/bios-nvram-secure.args +++ b/tests/qemuxml2argvdata/bios-nvram-secure.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Dtest-bios,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= -bios/master-key.aes \ --machine pc-q35-2.5,usb=3Doff,smm=3Don,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,smm=3Don,dump-guest-core=3Doff \ -accel tcg \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ -drive file=3D/usr/share/OVMF/OVMF_CODE.secboot.fd,if=3Dpflash,format=3Dra= w,unit=3D0,readonly=3Don \ diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.xml b/tests/qemuxml2a= rgvdata/bios-nvram-secure.xml index 5eb84c868e..0788bb9b03 100644 --- a/tests/qemuxml2argvdata/bios-nvram-secure.xml +++ b/tests/qemuxml2argvdata/bios-nvram-secure.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm /usr/share/OVM= F/OVMF_CODE.secboot.fd /usr/share/OVMF/OVMF_VARS.fd diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.args b/tests/qemuxml2ar= gvdata/boot-floppy-q35.args index 6aa61da3ed..e2df5abc50 100644 --- a/tests/qemuxml2argvdata/boot-floppy-q35.args +++ b/tests/qemuxml2argvdata/boot-floppy-q35.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -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-q35-2.4,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 214 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.xml b/tests/qemuxml2arg= vdata/boot-floppy-q35.xml index 2cececf340..0604cd155b 100644 --- a/tests/qemuxml2argvdata/boot-floppy-q35.xml +++ b/tests/qemuxml2argvdata/boot-floppy-q35.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args b/tes= ts/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args index ae5c64be25..fd09c23a1f 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest2,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest2/master-key.aes \ --machine pc-q35-2.7,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -m 214 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.xml b/test= s/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.xml index c4e8c33a93..2678835254 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.xml +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args b/tests/qe= muxml2argvdata/q35-pm-disable-fallback.args index c249cc14c6..40cc5d7bfb 100644 --- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args +++ b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -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,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 1024 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.xml b/tests/qem= uxml2argvdata/q35-pm-disable-fallback.xml index 3d2a7d813d..386391b270 100644 --- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.xml +++ b/tests/qemuxml2argvdata/q35-pm-disable-fallback.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxml2argvdata/q35-pm-disable.args b/tests/qemuxml2arg= vdata/q35-pm-disable.args index dbe43ea6b0..25c44e5024 100644 --- a/tests/qemuxml2argvdata/q35-pm-disable.args +++ b/tests/qemuxml2argvdata/q35-pm-disable.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -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,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ -m 1024 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/q35-pm-disable.xml b/tests/qemuxml2argv= data/q35-pm-disable.xml index 3d2a7d813d..386391b270 100644 --- a/tests/qemuxml2argvdata/q35-pm-disable.xml +++ b/tests/qemuxml2argvdata/q35-pm-disable.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args b/tests/qem= uxml2argvdata/q35-virt-manager-basic.args index 6e84c9ca2a..49e0f6794e 100644 --- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args +++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dspice \ -name guest=3Dvirt-manager-basic,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-virt= -manager-basic/master-key.aes \ --machine pc-q35-2.7,usb=3Doff,vmport=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,vmport=3Doff,dump-guest-core=3Doff \ -accel kvm \ -m 4096 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.xml b/tests/qemu= xml2argvdata/q35-virt-manager-basic.xml index aaa8ffdc08..c2d82c2c47 100644 --- a/tests/qemuxml2argvdata/q35-virt-manager-basic.xml +++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.xml @@ -5,7 +5,7 @@ 4194304 2 - hvm + hvm diff --git a/tests/qemuxml2argvdata/user-aliases2.xml b/tests/qemuxml2argvd= ata/user-aliases2.xml index a288b86117..3a6a088b50 100644 --- a/tests/qemuxml2argvdata/user-aliases2.xml +++ b/tests/qemuxml2argvdata/user-aliases2.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.args b/tests/qemu= xml2argvdata/vcpu-placement-static.args index fa4c9d0c6b..4dedbbea6e 100644 --- a/tests/qemuxml2argvdata/vcpu-placement-static.args +++ b/tests/qemuxml2argvdata/vcpu-placement-static.args @@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3Ddummy2,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-dumm= y2/master-key.aes \ --machine pc-q35-2.3,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -m 128 \ -realtime mlock=3Doff \ diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.xml b/tests/qemux= ml2argvdata/vcpu-placement-static.xml index ffdd6cc10a..47b70335e5 100644 --- a/tests/qemuxml2argvdata/vcpu-placement-static.xml +++ b/tests/qemuxml2argvdata/vcpu-placement-static.xml @@ -13,7 +13,7 @@ - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml b/te= sts/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml index f66562e216..dd8db2158c 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml @@ -5,7 +5,7 @@ 219100 1 - hvm + hvm diff --git a/tests/qemuxml2xmloutdata/q35-virt-manager-basic.xml b/tests/qe= muxml2xmloutdata/q35-virt-manager-basic.xml index b63da06027..44770b5fdc 100644 --- a/tests/qemuxml2xmloutdata/q35-virt-manager-basic.xml +++ b/tests/qemuxml2xmloutdata/q35-virt-manager-basic.xml @@ -5,7 +5,7 @@ 4194304 2 - hvm + hvm --=20 2.31.1 From nobody Mon May 6 13:57:22 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=1641462358; cv=none; d=zohomail.com; s=zohoarc; b=aY0otXrYE0MirAUKVqyaOpf/ur98s5VCzjs56scejc6fLKEceLleNbf8Z9EeFCO4HFC0wVTMULkCPUkEkPlo8olt5N8BtVWd/Lz4+vEXiRP5hTpEKkyshjdE+MCpksivXDPaIQSpbH9qoGx8yOdkvMIX4qQvE3lXNJjFDCDuUN8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641462358; 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=EKF9GcNfftMK0M5FqEaY48KcKcvWT+88/9384NcFEK0=; b=BdbYo1IEWEYgOABuIrB6fKx0/pn2c1JaiPvVpBHP7TxU8evN7tWqkpq/ZjckkEnZ5pZ3s9SCtUfV3AAoqL+Cu/xZUtDvCX4gAFqSuXSMdsKh7qFPuMDT0r7m+BTidcyUTsn9Ig4aOiIoU2BJa/zc/BoFsL1XWrk/D/+Dzr2A4nY= 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 1641462358732539.6862243277496; Thu, 6 Jan 2022 01:45:58 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-562-HZgQBUuGO4GexgZiWAl8Rg-1; Thu, 06 Jan 2022 04:45:54 -0500 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 2FD8E81CCB4; Thu, 6 Jan 2022 09:45:50 +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 0D8177CAD2; Thu, 6 Jan 2022 09:45:50 +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 D35864A7C9; Thu, 6 Jan 2022 09:45:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 2069jmNS005690 for ; Thu, 6 Jan 2022 04:45:48 -0500 Received: by smtp.corp.redhat.com (Postfix) id 89F257CAD2; Thu, 6 Jan 2022 09:45:48 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED57A7E116 for ; Thu, 6 Jan 2022 09:45:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641462357; 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=EKF9GcNfftMK0M5FqEaY48KcKcvWT+88/9384NcFEK0=; b=NjA8/Mf+oUZftN9siZKuj+BQBFlMC6dPJAaPRV+1BCqdpxGINpe/1fEY2Z7KjxOzrMHm45 1Cd6BEQzJBArqkL40RGEPYwBfw/+kEoj64zhcclDeDU0ykHn5knXFBzNCXthDx9GPdKTo2 UpbPWsomvphuzsO+T6UN7LCHa2aN/ws= X-MC-Unique: HZgQBUuGO4GexgZiWAl8Rg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 07/21] qemuxml2xmltest: Replace 'interface-server' by 'net-server' test case Date: Thu, 6 Jan 2022 10:44:06 +0100 Message-Id: <8f9b87bf9dd085d7ef518c2ff38e72f490b8fbe0.1641461748.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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: 1641462360165100003 Content-Type: text/plain; charset="utf-8" According to commit 52222568490 the test case was added to verify that the '
' element is covered by the schema. The test was not registered for qemuxml2argvtest though. We can use 'net-server' instead as it has the same type. On the other hand that one was not registered for qemuxml2xmltest. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuxml2argvdata/interface-server.xml | 131 ----------------- tests/qemuxml2xmloutdata/interface-server.xml | 138 ------------------ tests/qemuxml2xmloutdata/net-server.xml | 43 ++++++ tests/qemuxml2xmltest.c | 6 +- 4 files changed, 44 insertions(+), 274 deletions(-) delete mode 100644 tests/qemuxml2argvdata/interface-server.xml delete mode 100644 tests/qemuxml2xmloutdata/interface-server.xml create mode 100644 tests/qemuxml2xmloutdata/net-server.xml diff --git a/tests/qemuxml2argvdata/interface-server.xml b/tests/qemuxml2ar= gvdata/interface-server.xml deleted file mode 100644 index 7bf119197a..0000000000 --- a/tests/qemuxml2argvdata/interface-server.xml +++ /dev/null @@ -1,131 +0,0 @@ - - gentoo - a75aca4b-a02f-2bcb-4a91-c93cd848c34b - 4194304 - 4194304 - - - - - - 4 - - hvm - - - - - - - - - - - - - - - - - - destroy - restart - restart - - - - - - /usr/bin/qemu-system-x86_64 - - - - -
- - - - - -
- - - - - -
- - - - - - - -
- - -
- - - -
- - -
- - - - - - - - - - -
- - - - - - - - - -
- - - - - -
- - - - - - - - - - - - - -
- - - - - -
- -