From nobody Sun Feb 8 22:08:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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=1629294256; cv=none; d=zohomail.com; s=zohoarc; b=JhcVm0F5ZgrsSWDfAl5KquKgvR1fxNl2r24UWtKBoKaYPLDnFtwRjB9dBd3IMU6c2lQyUB7cYGoPcFN7ClkAEeI+QInpzy5FiHyGbmOroSlpB7FeOvz0WmW4lYH3JoTmFFhmg45+jkdHFBMHM1X8+ObyYwQGSotrsMyZmbjiCd4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629294256; 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=+6Rh5pI25qHOz01FEWScLaVT0xKSYpe4jBFU00piWOE=; b=NAXUR53Y5rijFvGDq7MBSVWtQJT6BBvYI2gVolX2IRYAjUCUZREG5HSo+nsSrwy9DKC7X82eHAudM4NMDibGRC1JtQMd7QTrkS/CFbGA1m1PhrjLsIkQOHtu4W55jQay+JvZdrZ+8VUnAhKUZw3E3ZhEdeqAIIk7Y87A1AuJjXw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 162929425599076.56281186444824; Wed, 18 Aug 2021 06:44:15 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-454-gYct2yxvNsOXUn2gJYAyXQ-1; Wed, 18 Aug 2021 09:43:05 -0400 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 4EA83CF9B1; Wed, 18 Aug 2021 13:43:00 +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 2BFE05DEFA; Wed, 18 Aug 2021 13:43:00 +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 CC67D182188E; Wed, 18 Aug 2021 13:42:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17IDfPPa005634 for ; Wed, 18 Aug 2021 09:41:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id EE9FF19C87; Wed, 18 Aug 2021 13:41:25 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61C59369A for ; Wed, 18 Aug 2021 13:41:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629294255; 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=+6Rh5pI25qHOz01FEWScLaVT0xKSYpe4jBFU00piWOE=; b=OOmkN+RyOtNEcdt4s3zF3vEM5tUch9ptbIONOl5WtXqCRGhGQVb0gAYTXo0JZpjF3yY2WU CsJkETDeRxCakg9ouTs0hmV22JOQ7zJQ76BN2A8bmCJWJV0TN+f7DgqH4Ku59c6Cb/hyPw x8AjBW9mLzePTEcBYmPXzfWxTUBGQiE= X-MC-Unique: gYct2yxvNsOXUn2gJYAyXQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/6] qemuxml2argvtest: Slightly modernize "cpu-host-model" case Date: Wed, 18 Aug 2021 15:41:06 +0200 Message-Id: <8caf00ea7d366ec003753b2fb94ec6a7423490ca.1629293828.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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: 1629294257749100001 Content-Type: text/plain; charset="utf-8" Switch to q35 in anticipation of using DO_TEST_CAPS* in further patches. Signed-off-by: Peter Krempa --- tests/qemuxml2argvdata/cpu-host-model.args | 14 ++++++++++---- tests/qemuxml2argvdata/cpu-host-model.xml | 14 ++++++++------ tests/qemuxml2argvtest.c | 7 ++++++- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/tests/qemuxml2argvdata/cpu-host-model.args b/tests/qemuxml2arg= vdata/cpu-host-model.args index 651952d7fb..f4511fef83 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.args +++ b/tests/qemuxml2argvdata/cpu-host-model.args @@ -10,11 +10,11 @@ QEMU_AUDIO_DRV=3Dnone \ /usr/bin/qemu-system-x86_64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine q35,accel=3Dkvm,usb=3Doff,dump-guest-core=3Doff \ -cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtp= r,+lahf_lm \ -m 214 \ -realtime mlock=3Doff \ --smp 6,sockets=3D6,cores=3D1,threads=3D1 \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -24,6 +24,12 @@ QEMU_AUDIO_DRV=3Dnone \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ --usb \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ +-device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ +-device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ +-device ioh3420,port=3D0x8,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1 \ +-device ich9-usb-ehci1,id=3Dusb,bus=3Dpcie.0,addr=3D0x1d.0x7 \ +-device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1d \ +-device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpcie.0,addr= =3D0x1d.0x1 \ +-device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpcie.0,addr= =3D0x1d.0x2 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.xml b/tests/qemuxml2argv= data/cpu-host-model.xml index 21697eda0f..29ea4e3e68 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.xml +++ b/tests/qemuxml2argvdata/cpu-host-model.xml @@ -1,19 +1,21 @@ - + QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 219100 219100 - 6 + 1 - hvm - + hvm - + + + destroy restart destroy - /usr/bin/qemu-system-x86_64 + /usr/bin/qemu-system-x86_64 + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 4e7d1da216..aa3da0ef93 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2077,7 +2077,12 @@ mymain(void) DO_TEST_FAILURE("cpu-numa-memshared", QEMU_CAPS_OBJECT_MEMORY_RAM); DO_TEST_PARSE_ERROR_NOCAPS("cpu-numa-memshared-1"); DO_TEST("cpu-numa-memshared", QEMU_CAPS_OBJECT_MEMORY_FILE); - DO_TEST_NOCAPS("cpu-host-model"); + DO_TEST("cpu-host-model", + QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, + QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_ICH9_AHCI, + QEMU_CAPS_ICH9_USB_EHCI1); DO_TEST_NOCAPS("cpu-host-model-vendor"); DO_TEST_FULL("cpu-host-model-fallback", "", ARG_FLAGS, FLAG_SKIP_LEGACY_CPUS, ARG_END); --=20 2.31.1