From nobody Fri Jun 14 02:08:58 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=1680262085; cv=none; d=zohomail.com; s=zohoarc; b=TxJdkv5cPECxUf1boyhHxljfheEysD337IXVgka6CsbqF9T5wlkWUYzrZVjjF+C5mbc9PM31qTbQVOar6XE7EGZh4Nd1GHHYVU9fsrf2M9bRb9qRJQKC6t6s/rglUemqfbfmKsG9pp/dF/upTPUw0xXUvqaH3YSLgtA/kcwLxnw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680262085; 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=1ZrKHu1zL7AIh4K2PEjJVKmHiFeDBPCBt+mbeWfk2Ww=; b=QIavSNH3Sigt81mr5BzLtW/b4JkaYPcPiZIz7jAbHCcNRRUkRCKxbryKUoykKA2+u8DqAO+HqnFCcamIbu3WyJU1AZ6XkFGIxybLX/317OHXcuZbJXuLiq5W+obj2dLPUSKu9HkGmg826Ctd9LU690lwUhflNVJPC+qdDX3F6HU= 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 1680262085085261.39136587529094; Fri, 31 Mar 2023 04:28:05 -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-627-jJAzK2rMNWeAuhBCm2eudw-1; Fri, 31 Mar 2023 07:26:21 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8F7AB80C8CC; Fri, 31 Mar 2023 11:26:19 +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 70CBB492B11; Fri, 31 Mar 2023 11:26:19 +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 3E5EE19466DF; Fri, 31 Mar 2023 11:26:19 +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 1656419465BC for ; Fri, 31 Mar 2023 11:26:18 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id F13511121315; Fri, 31 Mar 2023 11:26:17 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 789E71121314 for ; Fri, 31 Mar 2023 11:26:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680262083; 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=1ZrKHu1zL7AIh4K2PEjJVKmHiFeDBPCBt+mbeWfk2Ww=; b=TG28pztuKIeBOw4tjPT4O5keU9Q8qw9dljn3UihM5DhZXWq6s21SFhJuo0LE0k6XN5UqKM r9HOQhPg6ulzfqucr74ry9qJFP9RJFDimAfqSS98tueWAc+OwuCW36vEXvEpGs7TJLJd9t IR+U5j4/hSpf5LsxhE3bn3zgjBMWRPk= X-MC-Unique: jJAzK2rMNWeAuhBCm2eudw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 01/21] virDomainPCIAddressSetExtensionAlloc: Remove return value Date: Fri, 31 Mar 2023 13:25:55 +0200 Message-Id: <6127e740c0155f64bbd15c8ca4d0ad9cbc26cd75.1680260939.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.10 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: 1680262086750100001 Content-Type: text/plain; charset="utf-8" The function always returns 0. Remove the return value and refactor caller. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_addr.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index b6534f502c..cf30ad297c 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -974,21 +974,19 @@ virDomainPCIAddressSetExtensionFree(virDomainZPCIAddr= essIds *zpciIds) } -static int +static void virDomainPCIAddressSetExtensionAlloc(virDomainPCIAddressSet *addrs, virPCIDeviceAddressExtensionFlags ext= Flags) { if (extFlags & VIR_PCI_ADDRESS_EXTENSION_ZPCI) { if (addrs->zpciIds) - return 0; + return; addrs->zpciIds =3D g_new0(virDomainZPCIAddressIds, 1); addrs->zpciIds->uids =3D g_hash_table_new_full(g_int_hash, g_int_e= qual, g_free, NULL); addrs->zpciIds->fids =3D g_hash_table_new_full(g_int_hash, g_int_e= qual, g_free, NULL); } - - return 0; } @@ -1002,14 +1000,9 @@ virDomainPCIAddressSetAlloc(unsigned int nbuses, addrs->buses =3D g_new0(virDomainPCIAddressBus, nbuses); addrs->nbuses =3D nbuses; - if (virDomainPCIAddressSetExtensionAlloc(addrs, extFlags) < 0) - goto error; + virDomainPCIAddressSetExtensionAlloc(addrs, extFlags); return addrs; - - error: - virDomainPCIAddressSetFree(addrs); - return NULL; } --=20 2.39.2 From nobody Fri Jun 14 02:08:58 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=1680261989; cv=none; d=zohomail.com; s=zohoarc; b=OdB7N1CGYDWyKBnJS/r3XdYZhICas9R/ZvXzNrymIzZo79+cQGLYX0ReOHgkf/gZFHzg1iUW+Pzgs2SJ8dMpUEiH+HUtiv4cTH1ev8LJaZ6i8FZsAw4kqsM7jwYsO/I75xnci4d+R9Gxk6gighMzBGEWWZOQSnwEuDiGGzZ0Rp8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680261989; 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=C/IZOQo8cmnOLercWJCmFmNaKTUwdIXCTZUslNZ61T8=; b=JVnKDtAwkOQFNFi8yxIvrltyk1Vhjcqp28mVG0ZLXg5u/1aKkBDJAANWlvRaahZtTKdrYfWjp74B15EK53r1QMWB828/jL53OOmuWHZKqBV1O1wuWPaRPOZ1mL2dQJLFx6IkVE1K3K3+L1Bz4ySom7FiV40sKgN3vkYIJoH5NPE= 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 1680261989803423.8058454704716; Fri, 31 Mar 2023 04:26:29 -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-68-YpH_PUe6OGW78MsPv1RQIw-1; Fri, 31 Mar 2023 07:26:24 -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 946BF811E7C; Fri, 31 Mar 2023 11:26:21 +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 8033240AE2B7; Fri, 31 Mar 2023 11:26:21 +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 6C92419465BD; Fri, 31 Mar 2023 11:26:21 +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 394BA19465BC for ; Fri, 31 Mar 2023 11:26:19 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1E1B81121315; Fri, 31 Mar 2023 11:26:19 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 566DE1121314 for ; Fri, 31 Mar 2023 11:26:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680261988; 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=C/IZOQo8cmnOLercWJCmFmNaKTUwdIXCTZUslNZ61T8=; b=EcPq8DjUCbXCyjcoycW0LkynZFyEEFNUr/1u4K53Xr7FyfiViiv1uT+NVQQFblP0kr//O0 ojPrEZHRTfS44tkJZu1sQYk0tz4GWsSGjfznYFql4qJ7hz12Ik+QAAZVhdUtUrncgoRIAC wFJEfBF6UWhfXzxUe1REn1b9ZYEMM3s= X-MC-Unique: YpH_PUe6OGW78MsPv1RQIw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 02/21] qemuxml2argvdata: Do not symlink output files for aarch64 gic tests Date: Fri, 31 Mar 2023 13:25:56 +0200 Message-Id: <081b1104954afd92c692ae61e9dca89c64f50d29.1680260939.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.1 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: 1680261990253100001 Content-Type: text/plain; charset="utf-8" Upcoming patches will be modifying the tests for selecting the GIC version to use real capabilities. This in certain cases will show that a different version is picked. Using symlinks makes it inconvenient to do the modifications and unobvious what changed. Remove the symlinks and replace them by real output files. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- .../aarch64-gic-default-both.args | 31 ++++++++++++++++++- .../aarch64-gic-default-v2.args | 31 ++++++++++++++++++- .../aarch64-gic-default-v3.args | 31 ++++++++++++++++++- .../qemuxml2argvdata/aarch64-gic-default.args | 31 ++++++++++++++++++- .../aarch64-gic-none-both.args | 31 ++++++++++++++++++- .../qemuxml2argvdata/aarch64-gic-none-v2.args | 31 ++++++++++++++++++- .../qemuxml2argvdata/aarch64-gic-none-v3.args | 31 ++++++++++++++++++- tests/qemuxml2argvdata/aarch64-gic-none.args | 31 ++++++++++++++++++- 8 files changed, 240 insertions(+), 8 deletions(-) mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-default-= both.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-default-= v2.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-default-= v3.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-default.= args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-none-bot= h.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-none-v2.= args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-none-v3.= args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/aarch64-gic-none.args diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.args b/tests/q= emuxml2argvdata/aarch64-gic-default-both.args deleted file mode 120000 index 6209eff4b0..0000000000 --- a/tests/qemuxml2argvdata/aarch64-gic-default-both.args +++ /dev/null @@ -1 +0,0 @@ -aarch64-gic-v3.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.args b/tests/q= emuxml2argvdata/aarch64-gic-default-both.args new file mode 100644 index 0000000000..9f604422c4 --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-gic-default-both.args @@ -0,0 +1,30 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Daarch64test,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ +-machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff \ +-accel kvm \ +-cpu host \ +-m 1024 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args b/tests/qem= uxml2argvdata/aarch64-gic-default-v2.args deleted file mode 120000 index 04ecd4ce76..0000000000 --- a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args +++ /dev/null @@ -1 +0,0 @@ -aarch64-gic-v2.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args b/tests/qem= uxml2argvdata/aarch64-gic-default-v2.args new file mode 100644 index 0000000000..07dd297842 --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-gic-default-v2.args @@ -0,0 +1,30 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Daarch64test,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-accel kvm \ +-cpu host \ +-m 1024 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args b/tests/qem= uxml2argvdata/aarch64-gic-default-v3.args deleted file mode 120000 index 6209eff4b0..0000000000 --- a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args +++ /dev/null @@ -1 +0,0 @@ -aarch64-gic-v3.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args b/tests/qem= uxml2argvdata/aarch64-gic-default-v3.args new file mode 100644 index 0000000000..9f604422c4 --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-gic-default-v3.args @@ -0,0 +1,30 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Daarch64test,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ +-machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff \ +-accel kvm \ +-cpu host \ +-m 1024 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-gic-default.args b/tests/qemuxm= l2argvdata/aarch64-gic-default.args deleted file mode 120000 index 04ecd4ce76..0000000000 --- a/tests/qemuxml2argvdata/aarch64-gic-default.args +++ /dev/null @@ -1 +0,0 @@ -aarch64-gic-v2.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/aarch64-gic-default.args b/tests/qemuxm= l2argvdata/aarch64-gic-default.args new file mode 100644 index 0000000000..07dd297842 --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-gic-default.args @@ -0,0 +1,30 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Daarch64test,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-accel kvm \ +-cpu host \ +-m 1024 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-both.args b/tests/qemu= xml2argvdata/aarch64-gic-none-both.args deleted file mode 120000 index 6209eff4b0..0000000000 --- a/tests/qemuxml2argvdata/aarch64-gic-none-both.args +++ /dev/null @@ -1 +0,0 @@ -aarch64-gic-v3.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-both.args b/tests/qemu= xml2argvdata/aarch64-gic-none-both.args new file mode 100644 index 0000000000..9f604422c4 --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-gic-none-both.args @@ -0,0 +1,30 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Daarch64test,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ +-machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff \ +-accel kvm \ +-cpu host \ +-m 1024 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args b/tests/qemuxm= l2argvdata/aarch64-gic-none-v2.args deleted file mode 120000 index 04ecd4ce76..0000000000 --- a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args +++ /dev/null @@ -1 +0,0 @@ -aarch64-gic-v2.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args b/tests/qemuxm= l2argvdata/aarch64-gic-none-v2.args new file mode 100644 index 0000000000..07dd297842 --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-gic-none-v2.args @@ -0,0 +1,30 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Daarch64test,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-accel kvm \ +-cpu host \ +-m 1024 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args b/tests/qemuxm= l2argvdata/aarch64-gic-none-v3.args deleted file mode 120000 index 6209eff4b0..0000000000 --- a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args +++ /dev/null @@ -1 +0,0 @@ -aarch64-gic-v3.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args b/tests/qemuxm= l2argvdata/aarch64-gic-none-v3.args new file mode 100644 index 0000000000..9f604422c4 --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-gic-none-v3.args @@ -0,0 +1,30 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Daarch64test,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ +-machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff \ +-accel kvm \ +-cpu host \ +-m 1024 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-gic-none.args b/tests/qemuxml2a= rgvdata/aarch64-gic-none.args deleted file mode 120000 index 04ecd4ce76..0000000000 --- a/tests/qemuxml2argvdata/aarch64-gic-none.args +++ /dev/null @@ -1 +0,0 @@ -aarch64-gic-v2.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/aarch64-gic-none.args b/tests/qemuxml2a= rgvdata/aarch64-gic-none.args new file mode 100644 index 0000000000..07dd297842 --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-gic-none.args @@ -0,0 +1,30 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Daarch64test,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-accel kvm \ +-cpu host \ +-m 1024 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-msg timestamp=3Don --=20 2.39.2 From nobody Fri Jun 14 02:08:58 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=1680262024; cv=none; d=zohomail.com; s=zohoarc; b=HfCeeIRLHuhXJCDTYbmY0gzhnEviS4OyKbBvDo4ni5EyTQzVatBkAN6YrDig30QfCTF8kUHEguBwgT4VJY4doRgsLqW33b1Vh1fOYVBd86wo5La1KBYB2zcTXJAAYsN8JlXzT+Q4pgOzB1S01Dqp29LwcD6oP43/BPTly9pOeLM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680262024; 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=92T89FPHo+MwtcaWFa6P5qCdnPXWudmq8Q8b9XHvRHg=; b=jre6wQljpUT0xE5E0693/9pHgJollot5mIIb1BYvzU5nwKXksjQyiORyY/VRUKa4mMdjHgvzQGPadExeV8DsmEZBwDe0OIvAhduz6zRv5G42MP2zsQvHiCmNnw1MqLXlmn073VfwmX1QXK53diJLe2ZAXvRmzUCkGCfo9H/xIAw= 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 1680262024739232.52654015934138; Fri, 31 Mar 2023 04:27:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.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-84-NyS_XtYTMP-PXTy-qwArzQ-1; Fri, 31 Mar 2023 07:26:25 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3EF66280BF79; Fri, 31 Mar 2023 11:26:22 +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 19A7614171BA; Fri, 31 Mar 2023 11:26:22 +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 A888A1946A52; Fri, 31 Mar 2023 11:26:21 +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 39A0A19465BC for ; Fri, 31 Mar 2023 11:26:20 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1DFA71121315; Fri, 31 Mar 2023 11:26:20 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8566D1121314 for ; Fri, 31 Mar 2023 11:26:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680262023; 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=92T89FPHo+MwtcaWFa6P5qCdnPXWudmq8Q8b9XHvRHg=; b=Vn4ZwXrR6T8QPkRGWsKHuFvI5OQgK6Qdmd+E4xUh2QEDS/jHBhF1vsBAStVCakgYBm0xJD IESJIN0RMnTTrio/4Z5XbzPs4uaj4XrwsbuNi5Rcyitvst9BGcj9E71pYhq+6crcJZhjgE QwTQbXLh8uOiONmfUNyvFb7uQP/I3Ow= X-MC-Unique: NyS_XtYTMP-PXTy-qwArzQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/21] qemuxml2argvtest: Use real capabilities in tests for picking the aarch64 GIC version Date: Fri, 31 Mar 2023 13:25:57 +0200 Message-Id: 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.7 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: 1680262026440100002 Content-Type: text/plain; charset="utf-8" Convert 'aarch64-gic-default' and 'aarch64-gic-none' cases to use real capabilities both latest and locked to 4.2.0 to show what would happen with a real qemu. Note that the qemuTestSetHostArch() calls are needed as real caps override the setting once used. Once we convert all tests to real data this can be dropped. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...=3D> aarch64-gic-default.aarch64-4.2.0.args} | 3 +- .../aarch64-gic-default.aarch64-latest.args | 32 +++++++++++++++++++ ...gs =3D> aarch64-gic-none.aarch64-4.2.0.args} | 3 +- .../aarch64-gic-none.aarch64-latest.args | 32 +++++++++++++++++++ tests/qemuxml2argvtest.c | 26 ++++++++++++--- 5 files changed, 90 insertions(+), 6 deletions(-) rename tests/qemuxml2argvdata/{aarch64-gic-default.args =3D> aarch64-gic-d= efault.aarch64-4.2.0.args} (86%) create mode 100644 tests/qemuxml2argvdata/aarch64-gic-default.aarch64-late= st.args rename tests/qemuxml2argvdata/{aarch64-gic-none.args =3D> aarch64-gic-none= .aarch64-4.2.0.args} (86%) create mode 100644 tests/qemuxml2argvdata/aarch64-gic-none.aarch64-latest.= args diff --git a/tests/qemuxml2argvdata/aarch64-gic-default.args b/tests/qemuxm= l2argvdata/aarch64-gic-default.aarch64-4.2.0.args similarity index 86% rename from tests/qemuxml2argvdata/aarch64-gic-default.args rename to tests/qemuxml2argvdata/aarch64-gic-default.aarch64-4.2.0.args index 07dd297842..34c9f79ea1 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-default.args +++ b/tests/qemuxml2argvdata/aarch64-gic-default.aarch64-4.2.0.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-machine virt-4.2,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff \ -accel kvm \ -cpu host \ -m 1024 \ @@ -27,4 +27,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -no-acpi \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-gic-default.aarch64-latest.args= b/tests/qemuxml2argvdata/aarch64-gic-default.aarch64-latest.args new file mode 100644 index 0000000000..0d7a1c259a --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-gic-default.aarch64-latest.args @@ -0,0 +1,32 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Daarch64test,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ +-accel kvm \ +-cpu host \ +-m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-gic-none.args b/tests/qemuxml2a= rgvdata/aarch64-gic-none.aarch64-4.2.0.args similarity index 86% rename from tests/qemuxml2argvdata/aarch64-gic-none.args rename to tests/qemuxml2argvdata/aarch64-gic-none.aarch64-4.2.0.args index 07dd297842..34c9f79ea1 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-none.args +++ b/tests/qemuxml2argvdata/aarch64-gic-none.aarch64-4.2.0.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-machine virt-4.2,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff \ -accel kvm \ -cpu host \ -m 1024 \ @@ -27,4 +27,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -no-acpi \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-gic-none.aarch64-latest.args b/= tests/qemuxml2argvdata/aarch64-gic-none.aarch64-latest.args new file mode 100644 index 0000000000..0d7a1c259a --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-gic-none.aarch64-latest.args @@ -0,0 +1,32 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Daarch64test,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ +-accel kvm \ +-cpu host \ +-m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ +-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 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 2e72ebf8e3..772caca47e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2390,8 +2390,17 @@ mymain(void) DO_TEST("aarch64-cpu-passthrough", QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_KVM); - DO_TEST_GIC("aarch64-gic-none", GIC_NONE, - QEMU_CAPS_KVM); + DO_TEST_FULL("aarch64-gic-none", ".aarch64-4.2.0", + ARG_GIC, GIC_NONE, + ARG_CAPS_ARCH, "aarch64", + ARG_CAPS_VER, "4.2.0", + ARG_END); + DO_TEST_FULL("aarch64-gic-none", ".aarch64-latest", + ARG_GIC, GIC_NONE, + ARG_CAPS_ARCH, "aarch64", + ARG_CAPS_VER, "latest", + ARG_END); + qemuTestSetHostArch(&driver, VIR_ARCH_AARCH64); DO_TEST_GIC("aarch64-gic-none-v2", GIC_V2, QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-none-v3", GIC_V3, @@ -2399,8 +2408,17 @@ mymain(void) DO_TEST_GIC("aarch64-gic-none-both", GIC_BOTH, QEMU_CAPS_KVM); DO_TEST_FULL("aarch64-gic-none-tcg", "", ARG_GIC, GIC_BOTH, ARG_END); - DO_TEST_GIC("aarch64-gic-default", GIC_NONE, - QEMU_CAPS_KVM); + DO_TEST_FULL("aarch64-gic-default", ".aarch64-4.2.0", + ARG_GIC, GIC_NONE, + ARG_CAPS_ARCH, "aarch64", + ARG_CAPS_VER, "4.2.0", + ARG_END); + DO_TEST_FULL("aarch64-gic-default", ".aarch64-latest", + ARG_GIC, GIC_NONE, + ARG_CAPS_ARCH, "aarch64", + ARG_CAPS_VER, "latest", + ARG_END); + qemuTestSetHostArch(&driver, VIR_ARCH_AARCH64); DO_TEST_GIC("aarch64-gic-default-v2", GIC_V2, QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-default-v3", GIC_V3, --=20 2.39.2 From nobody Fri Jun 14 02:08:58 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=1680261993; cv=none; d=zohomail.com; s=zohoarc; b=RpoxaVZxzX193Mkf+0fdxFpld7i4LAn4CWalL4qtafScaBAwvDmp88K7pCV9UEJZboJ4kko218F02SxMX6wpsIT0rBocx3rbdztyXrkWXVoelpc0g2U0YkgQwnK5Om/oSsTtD8LHP/itRYLG1bDP3hhLf8qPCOG8O20I9aTGmLE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680261993; 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=fRxVRLQ35gbmbKga+g/nS2QL1woN72sm7+RI11uOdwY=; b=Z3ui2RF/W7HkZr/vbQinkBFC2Oj/WlZHHjCc3n7uBdh+Sj3sxKIVTf8EcBBMP78CaxY7HamvUfrK/yTAF1zpZrnBBcKIFnzDTSr53EBeIFnWUyX1vJ473T59llFI3WLCqV45F7yQdIzALrdHLqb4SDPanQIT1dLFJibXV3bM1hY= 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 1680261993546253.53803872083847; Fri, 31 Mar 2023 04:26:33 -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-542-V4wjvYfqN9GeDVI_LqAECg-1; Fri, 31 Mar 2023 07:26:27 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 36FEA8030DB; Fri, 31 Mar 2023 11:26:24 +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 20DBF492B00; Fri, 31 Mar 2023 11:26:24 +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 C3E2A19465BD; Fri, 31 Mar 2023 11:26:23 +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 554BD19465BC for ; Fri, 31 Mar 2023 11:26:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3C6781121315; Fri, 31 Mar 2023 11:26:21 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id B829C1121314 for ; Fri, 31 Mar 2023 11:26:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680261992; 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=fRxVRLQ35gbmbKga+g/nS2QL1woN72sm7+RI11uOdwY=; b=FowTXdkzZ+P1qFYYe1BkqCWAD+eBLi0yRyq7WrJcbmTsbqGP4sE3WUnRExbWeYduJ+PaHH IVfxUZrYBXCbuPXLiGb/ai4zAOzPhsOOS14dki6JMt9D2vqo2dTeRBFX4kxAwrHa+Cj6UM 2NNkHKF1YHSHzF07E0Wc0mSlB+SLZQQ= X-MC-Unique: V4wjvYfqN9GeDVI_LqAECg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 04/21] qemuxml2argvtest: Convert DO_TEST_GIC to use real latest capabilities Date: Fri, 31 Mar 2023 13:25:58 +0200 Message-Id: <69ca416af85d8d080de021cddeb8f152d7279a43.1680260939.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.9 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: 1680261994288100002 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- .../aarch64-gic-default-both.args | 6 +- .../aarch64-gic-default-v2.args | 6 +- .../aarch64-gic-default-v3.args | 6 +- tests/qemuxml2argvdata/aarch64-gic-host.args | 6 +- .../aarch64-gic-none-both.args | 6 +- .../qemuxml2argvdata/aarch64-gic-none-v2.args | 6 +- .../qemuxml2argvdata/aarch64-gic-none-v3.args | 6 +- tests/qemuxml2argvdata/aarch64-gic-v2.args | 6 +- tests/qemuxml2argvdata/aarch64-gic-v3.args | 6 +- tests/qemuxml2argvtest.c | 61 +++++++------------ 10 files changed, 59 insertions(+), 56 deletions(-) diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.args b/tests/q= emuxml2argvdata/aarch64-gic-default-both.args index 9f604422c4..0d7a1c259a 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-default-both.args +++ b/tests/qemuxml2argvdata/aarch64-gic-default-both.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ @@ -27,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -no-acpi \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args b/tests/qem= uxml2argvdata/aarch64-gic-default-v2.args index 07dd297842..fe06bd19ac 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args +++ b/tests/qemuxml2argvdata/aarch64-gic-default-v2.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ @@ -27,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -no-acpi \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args b/tests/qem= uxml2argvdata/aarch64-gic-default-v3.args index 9f604422c4..0d7a1c259a 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args +++ b/tests/qemuxml2argvdata/aarch64-gic-default-v3.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ @@ -27,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -no-acpi \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.args b/tests/qemuxml2a= rgvdata/aarch64-gic-host.args index bee6ededdf..9f9799917d 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-host.args +++ b/tests/qemuxml2argvdata/aarch64-gic-host.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ --machine virt,usb=3Doff,gic-version=3Dhost,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3Dhost,dump-guest-core=3Doff,memory-ba= ckend=3Dmach-virt.ram \ -accel kvm \ -cpu host \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ @@ -27,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -no-acpi \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-both.args b/tests/qemu= xml2argvdata/aarch64-gic-none-both.args index 9f604422c4..0d7a1c259a 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-none-both.args +++ b/tests/qemuxml2argvdata/aarch64-gic-none-both.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ @@ -27,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -no-acpi \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args b/tests/qemuxm= l2argvdata/aarch64-gic-none-v2.args index 07dd297842..fe06bd19ac 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args +++ b/tests/qemuxml2argvdata/aarch64-gic-none-v2.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ @@ -27,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -no-acpi \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args b/tests/qemuxm= l2argvdata/aarch64-gic-none-v3.args index 9f604422c4..0d7a1c259a 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args +++ b/tests/qemuxml2argvdata/aarch64-gic-none-v3.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ @@ -27,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -no-acpi \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.args b/tests/qemuxml2arg= vdata/aarch64-gic-v2.args index 07dd297842..fe06bd19ac 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-v2.args +++ b/tests/qemuxml2argvdata/aarch64-gic-v2.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ @@ -27,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -no-acpi \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.args b/tests/qemuxml2arg= vdata/aarch64-gic-v3.args index 9f604422c4..0d7a1c259a 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-v3.args +++ b/tests/qemuxml2argvdata/aarch64-gic-v3.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ @@ -27,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -no-acpi \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 772caca47e..2498469dc9 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -915,10 +915,13 @@ mymain(void) # define DO_TEST_NOCAPS(name) \ DO_TEST_FULL(name, "", ARG_END) -# define DO_TEST_GIC(name, gic, ...) \ +/* GIC tests use 'latest' capabilities */ +# define DO_TEST_GIC(name, gic) \ DO_TEST_FULL(name, "", \ ARG_GIC, gic, \ - ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST, ARG_END) + ARG_CAPS_ARCH, "aarch64", \ + ARG_CAPS_VER, "latest", \ + ARG_END) # define DO_TEST_FAILURE(name, ...) \ DO_TEST_FULL(name, "", \ @@ -2400,13 +2403,10 @@ mymain(void) ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", ARG_END); + DO_TEST_GIC("aarch64-gic-none-v2", GIC_V2); + DO_TEST_GIC("aarch64-gic-none-v3", GIC_V3); + DO_TEST_GIC("aarch64-gic-none-both", GIC_BOTH); qemuTestSetHostArch(&driver, VIR_ARCH_AARCH64); - DO_TEST_GIC("aarch64-gic-none-v2", GIC_V2, - QEMU_CAPS_KVM); - DO_TEST_GIC("aarch64-gic-none-v3", GIC_V3, - QEMU_CAPS_KVM); - DO_TEST_GIC("aarch64-gic-none-both", GIC_BOTH, - QEMU_CAPS_KVM); DO_TEST_FULL("aarch64-gic-none-tcg", "", ARG_GIC, GIC_BOTH, ARG_END); DO_TEST_FULL("aarch64-gic-default", ".aarch64-4.2.0", ARG_GIC, GIC_NONE, @@ -2418,37 +2418,22 @@ mymain(void) ARG_CAPS_ARCH, "aarch64", ARG_CAPS_VER, "latest", ARG_END); + DO_TEST_GIC("aarch64-gic-default-v2", GIC_V2); + DO_TEST_GIC("aarch64-gic-default-v3", GIC_V3); + DO_TEST_GIC("aarch64-gic-default-both", GIC_BOTH); + DO_TEST_GIC("aarch64-gic-v2", GIC_NONE); + DO_TEST_GIC("aarch64-gic-v2", GIC_V2); + DO_TEST_GIC("aarch64-gic-v2", GIC_V3); + DO_TEST_GIC("aarch64-gic-v2", GIC_BOTH); + DO_TEST_GIC("aarch64-gic-v3", GIC_NONE); + DO_TEST_GIC("aarch64-gic-v3", GIC_V2); + DO_TEST_GIC("aarch64-gic-v3", GIC_V3); + DO_TEST_GIC("aarch64-gic-v3", GIC_BOTH); + DO_TEST_GIC("aarch64-gic-host", GIC_NONE); + DO_TEST_GIC("aarch64-gic-host", GIC_V2); + DO_TEST_GIC("aarch64-gic-host", GIC_V3); + DO_TEST_GIC("aarch64-gic-host", GIC_BOTH); qemuTestSetHostArch(&driver, VIR_ARCH_AARCH64); - DO_TEST_GIC("aarch64-gic-default-v2", GIC_V2, - QEMU_CAPS_KVM); - DO_TEST_GIC("aarch64-gic-default-v3", GIC_V3, - QEMU_CAPS_KVM); - DO_TEST_GIC("aarch64-gic-default-both", GIC_BOTH, - QEMU_CAPS_KVM); - DO_TEST_GIC("aarch64-gic-v2", GIC_NONE, - QEMU_CAPS_KVM); - DO_TEST_GIC("aarch64-gic-v2", GIC_V2, - QEMU_CAPS_KVM); - DO_TEST_GIC("aarch64-gic-v2", GIC_V3, - QEMU_CAPS_KVM); - DO_TEST_GIC("aarch64-gic-v2", GIC_BOTH, - QEMU_CAPS_KVM); - DO_TEST_GIC("aarch64-gic-v3", GIC_NONE, - QEMU_CAPS_KVM); - DO_TEST_GIC("aarch64-gic-v3", GIC_V2, - QEMU_CAPS_KVM); - DO_TEST_GIC("aarch64-gic-v3", GIC_V3, - QEMU_CAPS_KVM); - DO_TEST_GIC("aarch64-gic-v3", GIC_BOTH, - QEMU_CAPS_KVM); - DO_TEST_GIC("aarch64-gic-host", GIC_NONE, - QEMU_CAPS_KVM); - DO_TEST_GIC("aarch64-gic-host", GIC_V2, - QEMU_CAPS_KVM); - DO_TEST_GIC("aarch64-gic-host", GIC_V3, - QEMU_CAPS_KVM); - DO_TEST_GIC("aarch64-gic-host", GIC_BOTH, - QEMU_CAPS_KVM); DO_TEST_PARSE_ERROR("aarch64-gic-invalid", QEMU_CAPS_KVM); DO_TEST_PARSE_ERROR("aarch64-gic-not-virt", --=20 2.39.2 From nobody Fri Jun 14 02:08:58 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=1680261995; cv=none; d=zohomail.com; s=zohoarc; b=iLDDfZndoJKRRmZRiobeqqZ6W80QZkbbz3hY4UYGGiW/g/IgIYMsky8V5RdqEr1uJtF97wsM17Idjo/zH8yRvTx2O3XuNUB3w5rqSN67ZmaXd3SaLG8Vm4A35Rnq5extxpYIf6ju+muLeEx0lsp2xy5YNTZ6/cPG643+m2TFyRM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680261995; 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=26uREs26dZwShBnzWA5G4D+4emYD9s4r7UXzTqma+HI=; b=H3ymSLl1kUxdFaiwXv1igFzfUFwEmeAhZ6iwSfPdRCE4xbEKq1aHNMqtoeD5cphwINu/6BsW3zgt9023PyXg+ywd0g4dUUOeHE55VAulG9h4FBuuwuzFGSTrhh+hKMqqB598ldoP4NEkpZL3QdYDY7X0Fdo1qT2+JWg7KiS2ysU= 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 1680261995063669.0579161136363; Fri, 31 Mar 2023 04:26:35 -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-625-nnxoCK2YMNiUjnkUG5BZXg-1; Fri, 31 Mar 2023 07:26:27 -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 CBAB2855304; Fri, 31 Mar 2023 11:26:23 +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 B96A44020C82; Fri, 31 Mar 2023 11:26:23 +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 8FF0519466DF; Fri, 31 Mar 2023 11:26:23 +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 4881E19465BD for ; Fri, 31 Mar 2023 11:26:22 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3D1C11121315; Fri, 31 Mar 2023 11:26:22 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id A5BC41121314 for ; Fri, 31 Mar 2023 11:26:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680261991; 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=26uREs26dZwShBnzWA5G4D+4emYD9s4r7UXzTqma+HI=; b=MlOJCCurpw1F1199rNoXahvm5aEIn7Hevb4Z7xuR3INj9pWSm2M+ITwoxsIZkB//8B8LKd FAly9CsAV08VPgGXWfBPAo0t4DLmVU2HbLEEy4zNrG8uWc9ExTb0oUUWPP+f8f5dBsr2oY CpeikATDPETkB6V7HbhiEH0W6mmfkzY= X-MC-Unique: nnxoCK2YMNiUjnkUG5BZXg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 05/21] qemuxml2argvtest: Convert the rest of GIC tests to latest capabilities Date: Fri, 31 Mar 2023 13:25:59 +0200 Message-Id: <94777778f2939f0e08b2db829094db210a5f0604.1680260939.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: 1680261996196100005 Content-Type: text/plain; charset="utf-8" Convert the two negative cases to use real capapbilities as well as the positive case for situations when KVM is not used by stripping the QEMU_CAPS_KVM flag. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...err =3D> aarch64-gic-invalid.aarch64-latest.err} | 0 tests/qemuxml2argvdata/aarch64-gic-none-tcg.args | 6 ++++-- ...rr =3D> aarch64-gic-not-virt.aarch64-latest.err} | 0 tests/qemuxml2argvtest.c | 15 ++++++++------- 4 files changed, 12 insertions(+), 9 deletions(-) rename tests/qemuxml2argvdata/{aarch64-gic-invalid.err =3D> aarch64-gic-in= valid.aarch64-latest.err} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-not-virt.err =3D> aarch64-gic-n= ot-virt.aarch64-latest.err} (100%) diff --git a/tests/qemuxml2argvdata/aarch64-gic-invalid.err b/tests/qemuxml= 2argvdata/aarch64-gic-invalid.aarch64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-invalid.err rename to tests/qemuxml2argvdata/aarch64-gic-invalid.aarch64-latest.err diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args b/tests/qemux= ml2argvdata/aarch64-gic-none-tcg.args index 16a02b74bd..029ef5230d 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args +++ b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a57 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \ @@ -27,4 +28,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -no-acpi \ -boot strict=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-gic-not-virt.err b/tests/qemuxm= l2argvdata/aarch64-gic-not-virt.aarch64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/aarch64-gic-not-virt.err rename to tests/qemuxml2argvdata/aarch64-gic-not-virt.aarch64-latest.err diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 2498469dc9..61e5a93fdc 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2406,8 +2406,12 @@ mymain(void) DO_TEST_GIC("aarch64-gic-none-v2", GIC_V2); DO_TEST_GIC("aarch64-gic-none-v3", GIC_V3); DO_TEST_GIC("aarch64-gic-none-both", GIC_BOTH); - qemuTestSetHostArch(&driver, VIR_ARCH_AARCH64); - DO_TEST_FULL("aarch64-gic-none-tcg", "", ARG_GIC, GIC_BOTH, ARG_END); + DO_TEST_FULL("aarch64-gic-none-tcg", "", + ARG_GIC, GIC_BOTH, + ARG_CAPS_ARCH, "aarch64", + ARG_CAPS_VER, "latest", + ARG_QEMU_CAPS_DEL, QEMU_CAPS_KVM, QEMU_CAPS_LAST, + ARG_END); DO_TEST_FULL("aarch64-gic-default", ".aarch64-4.2.0", ARG_GIC, GIC_NONE, ARG_CAPS_ARCH, "aarch64", @@ -2433,11 +2437,8 @@ mymain(void) DO_TEST_GIC("aarch64-gic-host", GIC_V2); DO_TEST_GIC("aarch64-gic-host", GIC_V3); DO_TEST_GIC("aarch64-gic-host", GIC_BOTH); - qemuTestSetHostArch(&driver, VIR_ARCH_AARCH64); - DO_TEST_PARSE_ERROR("aarch64-gic-invalid", - QEMU_CAPS_KVM); - DO_TEST_PARSE_ERROR("aarch64-gic-not-virt", - QEMU_CAPS_KVM); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-invalid", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-not-virt", "aarch64"= ); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-not-arm", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-kvm-32-on-64", "aarch64"); DO_TEST("aarch64-pci-serial", --=20 2.39.2 From nobody Fri Jun 14 02:08:58 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=1680261993; cv=none; d=zohomail.com; s=zohoarc; b=cJEkCTkbmD799FizMCI/PPiwMJGxv6s4tZk0lWGimMh0eowHNF1gx8LNSHR3eJjQ+KSg8ULabrPdhrbqTYqwVsSVneZmBilkJkofXKz9aOa2r1wHJ6h5mbk6v0UD9oSqnDAElfBZBH1Z1XtDlys8jlzKHXOkIIojkIcmYjqfjCw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680261993; 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=efJXE12UymiXrGAZG1uhGeF2fdZ4BeEAfW3U9LjxIK0=; b=UYy3KoUzN5YqMblNhFsS23xX3zWUcdvN3CImZp3dA1Lp/Qqd5TmU413db5NjxpXY/7maqG6sog+iEaKnk6XYJHDquu4LdS2OyefqDCxtLmXmD5tSS8jxKlCjuW6x+QUt/P9Khx+8Hu7l0RFjz2q+CIpv4gqjnI6cDYJodKZu/xE= 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 1680261993533824.7414965238738; Fri, 31 Mar 2023 04:26:33 -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-225-fF-MohbdMKCK6bJuCuQtqA-1; Fri, 31 Mar 2023 07:26:27 -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 99A25100DEC0; Fri, 31 Mar 2023 11:26:24 +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 79BBC4020C89; Fri, 31 Mar 2023 11:26:24 +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 065C31946A41; Fri, 31 Mar 2023 11:26:24 +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 58BCE19465BD for ; Fri, 31 Mar 2023 11:26:23 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4E5F91121315; Fri, 31 Mar 2023 11:26:23 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD1451121314 for ; Fri, 31 Mar 2023 11:26:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680261992; 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=efJXE12UymiXrGAZG1uhGeF2fdZ4BeEAfW3U9LjxIK0=; b=g9ITS5mp52DsCerT9Zj87T6T87UEAn/jpioLIyzJIwO8y8HZ930YbmcsVlv8MgUhGbIQtX Rx4IcIE1JTOfi+9juJR4zxq3+z07k+XayQCWKZxPKmiWnT05qWK960WSOCkQdZ+wjJTG9e T9xk/x3xblhluWitVuH6SG+n9gIAStQ= X-MC-Unique: fF-MohbdMKCK6bJuCuQtqA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 06/21] qemuxml2argvtest: Add real-caps versions of 'aarch64-virt-virtio' Date: Fri, 31 Mar 2023 13:26:00 +0200 Message-Id: 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: 1680261994252100001 Content-Type: text/plain; charset="utf-8" Add a version for 'latest' caps as well as '4.2.0'. The test demonstrates that with a real qemu PCIe will be used instead of MMIO. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- .../aarch64-virt-virtio.aarch64-4.2.0.args | 54 ++++++++++++++++++ .../aarch64-virt-virtio.aarch64-latest.args | 55 +++++++++++++++++++ tests/qemuxml2argvtest.c | 3 + 3 files changed, 112 insertions(+) create mode 100644 tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-4.2.= 0.args create mode 100644 tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-late= st.args diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-4.2.0.args = b/tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-4.2.0.args new file mode 100644 index 0000000000..a2804668da --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-4.2.0.args @@ -0,0 +1,54 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Daarch64test,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ +-machine virt-4.2,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-accel tcg \ +-cpu cortex-a53 \ +-m 1024 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-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 \ +-kernel /aarch64.kernel \ +-initrd /aarch64.initrd \ +-append 'earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwai= t' \ +-dtb /aarch64.dtb \ +-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 pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device pcie-root-port,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x3 \ +-device pcie-root-port,port=3D12,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x1.0x4 \ +-device pcie-root-port,port=3D13,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x1.0x5 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.2,addr=3D0x0 \ +-blockdev '{"driver":"file","filename":"/aarch64.raw","node-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 virtio-blk-pci,scsi=3Doff,bus=3Dpci.3,addr=3D0x0,drive=3Dlibvirt-1= -format,id=3Dvirtio-disk0,bootindex=3D1 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.1,addr=3D0x0 \ +-chardev pty,id=3Dcharserial0 \ +-serial chardev:charserial0 \ +-chardev pty,id=3Dcharconsole1 \ +-device virtconsole,chardev=3Dcharconsole1,id=3Dconsole1 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.4,addr=3D0x0 \ +-object rng-random,id=3Dobjrng0,filename=3D/dev/random \ +-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.5,addr=3D0x0 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-latest.args= b/tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-latest.args new file mode 100644 index 0000000000..296c0c2f3a --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-virt-virtio.aarch64-latest.args @@ -0,0 +1,55 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Daarch64test,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ +-accel tcg \ +-cpu cortex-a53 \ +-m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-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 \ +-kernel /aarch64.kernel \ +-initrd /aarch64.initrd \ +-append 'earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwai= t' \ +-dtb /aarch64.dtb \ +-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":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x3"}' \ +-device '{"driver":"pcie-root-port","port":12,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x1.0x4"}' \ +-device '{"driver":"pcie-root-port","port":13,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x1.0x5"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.2"= ,"addr":"0x0"}' \ +-blockdev '{"driver":"file","filename":"/aarch64.raw","node-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":"virtio-blk-pci","bus":"pci.3","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-netdev user,id=3Dhostnet0 \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ +-chardev pty,id=3Dcharserial0 \ +-serial chardev:charserial0 \ +-chardev pty,id=3Dcharconsole1 \ +-device '{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}= ' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.4","add= r":"0x0"}' \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .5","addr":"0x0"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 61e5a93fdc..5644825650 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2353,6 +2353,9 @@ mymain(void) QEMU_CAPS_DEVICE_PL011, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST_CAPS_ARCH_VER("aarch64-virt-virtio", "aarch64", "4.2.0"); + DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-virtio", "aarch64"); + /* Demonstrates the virtio-pci default... namely that there isn't any! q35 style PCI controllers will be added if the binary supports it, but virtio-mmio is always used unless PCI addresses are manually --=20 2.39.2 From nobody Fri Jun 14 02:08:58 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=1680262029; cv=none; d=zohomail.com; s=zohoarc; b=Gp9qgczkDI35BHiXxGIhDkpsBaOXmIIqYHHWRtK9fh200a5+t/k6aawmy93b/yiY60eWOR+qZsRqZyYnkHK8bBnrK3kXidgOVFiRz3s7afB/LmuIG5l8WcEyIfe6WQt/PrTNU2iMmbAee0MlFLqKJtmcBF3rTRBFandZTTU9Crk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680262029; 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=psf7AFYPbv+7RSZ6HtWtILZrDGtJhY6nuC2jE2Bgspk=; b=BKpGD0+zEMqAHI2byk6UrX8nIX4LhIXw013vH/COiIzssG2DIF19AqLeTRqvngAmUNZrDiQN8qYj2ORTEbiUEKghgNm7kK06BfGq45J3trEbNgyjY2NkX5jRpyFsPNru21LWsgNL+3c4qZ/dvZLjwm4A7/4ycMpceyVknbD9cB0= 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 1680262029245573.5216834977267; Fri, 31 Mar 2023 04:27:09 -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-558-_pJnlZuANYmpeYs5bvRBSQ-1; Fri, 31 Mar 2023 07:26:30 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 22A6E884340; Fri, 31 Mar 2023 11:26:27 +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 0F3E8C15BA0; Fri, 31 Mar 2023 11:26:27 +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 E603D19465BD; Fri, 31 Mar 2023 11:26:26 +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 5B50819465BD for ; Fri, 31 Mar 2023 11:26:24 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4EA311121320; Fri, 31 Mar 2023 11:26:24 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id B5C4A1121314 for ; Fri, 31 Mar 2023 11:26:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680262028; 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=psf7AFYPbv+7RSZ6HtWtILZrDGtJhY6nuC2jE2Bgspk=; b=KPPo8rOdn4uqjQJJwHWhrbIXCQlA8iBIi37/Ghd7q2DL7uuvT0ZvXZFb0gmMiT6GRO6YR7 uRPyK/oJZwbI7FZtMdXXgDP0MP+YK+MNPBHsl8zQAtccu7og35cclFAQQ3VwuNc9694wtJ 4B2fycLESrfy4KedJrGxjCXj9cFNesQ= X-MC-Unique: _pJnlZuANYmpeYs5bvRBSQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 07/21] qemuxml2argvtest: Drop "aarch64-virt-2.6-virtio-pci-default" case Date: Fri, 31 Mar 2023 13:26:01 +0200 Message-Id: <7ff82bda9a1312afdc5b7dd3ce8cb6a134948f4e.1680260939.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.8 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: 1680262030414100008 Content-Type: text/plain; charset="utf-8" The test data is effectively identical to the 'aarch64-virtio-pci-default' case. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- .../aarch64-virt-2.6-virtio-pci-default.args | 50 ------------------- .../aarch64-virt-2.6-virtio-pci-default.xml | 46 ----------------- tests/qemuxml2argvtest.c | 7 --- 3 files changed, 103 deletions(-) delete mode 100644 tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-defa= ult.args delete mode 100644 tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-defa= ult.xml diff --git a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.arg= s b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args deleted file mode 100644 index 288bc9f07f..0000000000 --- a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args +++ /dev/null @@ -1,50 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ -/usr/bin/qemu-system-aarch64 \ --name guest=3Daarch64test,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ --machine virt-2.6,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ --accel tcg \ --cpu cortex-a53 \ --m 1024 \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ --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 \ --kernel /aarch64.kernel \ --initrd /aarch64.initrd \ --append 'earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwai= t' \ --dtb /aarch64.dtb \ --device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1 \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device ioh3420,port=3D16,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x2 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.2,addr=3D0x2 \ --blockdev '{"driver":"file","filename":"/aarch64.raw","node-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 virtio-blk-pci,bus=3Dpci.2,addr=3D0x3,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ --netdev user,id=3Dhostnet0 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.2,addr=3D0x1 \ --chardev pty,id=3Dcharserial0 \ --serial chardev:charserial0 \ --chardev pty,id=3Dcharconsole1 \ --device virtconsole,chardev=3Dcharconsole1,id=3Dconsole1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x4 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/random \ --device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.2,addr=3D0x5 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.xml= b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.xml deleted file mode 100644 index 43bc0089c9..0000000000 --- a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.xml +++ /dev/null @@ -1,46 +0,0 @@ - - aarch64test - 496d7ea8-9739-544b-4ebd-ef08be936e8b - 1048576 - 1048576 - 1 - - hvm - /aarch64.kernel - /aarch64.initrd - /aarch64.dtb - earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda roo= twait - - - - - - - cortex-a53 - - - destroy - restart - restart - - /usr/bin/qemu-system-aarch64 - - - - - - - - - - - - - - - /dev/random - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5644825650..044566426d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2362,13 +2362,6 @@ mymain(void) specified. */ DO_TEST_CAPS_ARCH_VER("aarch64-virtio-pci-default", "aarch64", "4.2.0"= ); DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-default", "aarch64"); - DO_TEST("aarch64-virt-2.6-virtio-pci-default", - QEMU_CAPS_DEVICE_VIRTIO_MMIO, - QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_PL011, - QEMU_CAPS_DEVICE_IOH3420); /* Example of using virtio-pci with no explicit PCI controller but with manual PCI addresses */ DO_TEST("aarch64-virtio-pci-manual-addresses", --=20 2.39.2 From nobody Fri Jun 14 02:08:58 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=1680261995; cv=none; d=zohomail.com; s=zohoarc; b=bouABVZ2P9Oq3SksPhtLCRVR5drnjfqVJvPcsATWaAjlZfaUO8vBWdr25pCvONo/igAxCLD9U5X+jQLTL3Iv0FHfBYkMJDJlEHD39598n/Zjv0RGtn4iq/uDTKMMB7YrUEVuZPNF8TjbfiZ6X5z6pRTn9nEJ5uY0tT5PuaOXABI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680261995; 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=20m/lyWuYx3MEtNRlUSpxEKst56ZowA+1tiYI4O9b0U=; b=VMzXKhMhtKP2ZMtC6AEBWqoSNkmXgd22TKMhxXC0/Sh3vfHRhg91bhRL7FmqRnwSepL1NOAHvvHzdmJpTiWVmSL+XRa49N0AgHB+OXc/96u7o0T8ze7xWX3Y9QFLJtMkqFWwCwuVm1CndtmRd5JhRW8/phiO9/vbCyXssc0YKT4= 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 1680261995535363.2674304534372; Fri, 31 Mar 2023 04:26:35 -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-638-hlGkGU2vMt2AZ6DYAq8ioQ-1; Fri, 31 Mar 2023 07:26:30 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 96922855317; Fri, 31 Mar 2023 11:26:27 +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 81173492B02; Fri, 31 Mar 2023 11:26:27 +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 3EE7F1946A4B; Fri, 31 Mar 2023 11:26:27 +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 7422519465BC for ; Fri, 31 Mar 2023 11:26:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 559B21121314; Fri, 31 Mar 2023 11:26:25 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id B4B131121315 for ; Fri, 31 Mar 2023 11:26:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680261994; 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=20m/lyWuYx3MEtNRlUSpxEKst56ZowA+1tiYI4O9b0U=; b=IEOHcsGed+kzgMFq3G/hrMuRIlDXcGHL/3tCDrPhyAKu+NCrMnIbuSEzcmABzBMnAm7741 13PHhzr0rjOw5ZzqxObEEoc/Tp/JfQjldPBMhBERKVnfT2sZku6iDzQwuE3BSYmsnACfMF FpgG88wIXAvO4nhMQRc0cq8bSfFms8c= X-MC-Unique: hlGkGU2vMt2AZ6DYAq8ioQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 08/21] qemuxml2argv: Test default aarch64 cofig without PCIe support Date: Fri, 31 Mar 2023 13:26:02 +0200 Message-Id: <7712e0c03077566873b415f3df168ab717feb311.1680260939.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.9 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: 1680261996347100006 Content-Type: text/plain; charset="utf-8" Use real caps and clear out flags for PCIe so that we have a real-ish example of an aarch64 machine using mmio. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...ch64-virt-virtio-MMIO.aarch64.latest.args} | 20 ++++++++++--------- tests/qemuxml2argvtest.c | 12 +++++++---- 2 files changed, 19 insertions(+), 13 deletions(-) rename tests/qemuxml2argvdata/{aarch64-virt-virtio.args =3D> aarch64-virt-= virtio-MMIO.aarch64.latest.args} (58%) diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.args b/tests/qemuxm= l2argvdata/aarch64-virt-virtio-MMIO.aarch64.latest.args similarity index 58% rename from tests/qemuxml2argvdata/aarch64-virt-virtio.args rename to tests/qemuxml2argvdata/aarch64-virt-virtio-MMIO.aarch64.latest.ar= gs index 65cf1f4c35..cfc3195d0f 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-virtio.args +++ b/tests/qemuxml2argvdata/aarch64-virt-virtio-MMIO.aarch64.latest.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a53 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -30,18 +31,19 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch= 64test/.config \ -initrd /aarch64.initrd \ -append 'earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwai= t' \ -dtb /aarch64.dtb \ --device virtio-serial-device,id=3Dvirtio-serial0 \ +-device '{"driver":"virtio-serial-device","id":"virtio-serial0"}' \ -blockdev '{"driver":"file","filename":"/aarch64.raw","node-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 virtio-blk-device,drive=3Dlibvirt-1-format,id=3Dvirtio-disk0,booti= ndex=3D1 \ +-device '{"driver":"virtio-blk-device","drive":"libvirt-1-format","id":"vi= rtio-disk0","bootindex":1}' \ -netdev user,id=3Dhostnet0 \ --device virtio-net-device,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4= :37 \ +-device '{"driver":"virtio-net-device","netdev":"hostnet0","id":"net0","ma= c":"52:54:00:09:a4:37"}' \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ -chardev pty,id=3Dcharconsole1 \ --device virtconsole,chardev=3Dcharconsole1,id=3Dconsole1 \ +-device '{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-device,id=3Dballoon0 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/random \ --device virtio-rng-device,rng=3Dobjrng0,id=3Drng0 \ +-device '{"driver":"virtio-balloon-device","id":"balloon0"}' \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ +-device '{"driver":"virtio-rng-device","rng":"objrng0","id":"rng0"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 044566426d..0bf5bf23b0 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2348,10 +2348,14 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("arm-vexpressa9-virtio", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("arm-virt-virtio", "aarch64"); - DO_TEST("aarch64-virt-virtio", - QEMU_CAPS_DEVICE_VIRTIO_MMIO, - QEMU_CAPS_DEVICE_PL011, - QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); + /* test default config if pcie bus is not available */ + DO_TEST_FULL("aarch64-virt-virtio", "-MMIO.aarch64.latest", + ARG_CAPS_ARCH, "aarch64", + ARG_CAPS_VER, "latest", + ARG_QEMU_CAPS_DEL, + QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3= 420, + QEMU_CAPS_LAST, ARG_END); DO_TEST_CAPS_ARCH_VER("aarch64-virt-virtio", "aarch64", "4.2.0"); DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-virtio", "aarch64"); --=20 2.39.2 From nobody Fri Jun 14 02:08:58 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=1680262024; cv=none; d=zohomail.com; s=zohoarc; b=VM1bk30nI5yCMK2GwTDhvonylPGAXj1P0glubg0J47p4chFoqk3KG1NE5xUJVzG2XnGTtp33B13TRHWHtYdKubfEW2RXjuV55CISYYvjmcMrn929yNx4ImlKJ1gXi+JYUfIEOzrJZZIcByswDQkqe0yNVMs7Shitj6IFwXvZDnc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680262024; 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=g85Ozt6c/pN7SClk5DRpbPalWLKjVZqe8TiAlV+7O4A=; b=XFVdcwdanfR7HrebZPQ2fIjtH4GsIZxYABAIhoXh6yczv471XVXwHrO7tpwQVvYKmKg8qCA0nQGiqO3/KSwDALB59S4+/c4bCnYwDav9P+GV8djXhYbQHw16x1un+ygXvQWBiEhp+4gMUeodWbgAUMJgyfjj6E3oQV9y1w/LhsM= 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 1680262024713114.94462680222762; Fri, 31 Mar 2023 04:27:04 -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-564-w6Y3Pht1N0KHNSo8PbC3OQ-1; Fri, 31 Mar 2023 07:26:31 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ECD731816ED9; Fri, 31 Mar 2023 11:26:27 +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 D4974492B0B; Fri, 31 Mar 2023 11:26:27 +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 923AF1946A47; Fri, 31 Mar 2023 11:26:27 +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 86FC219465BC for ; Fri, 31 Mar 2023 11:26:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7C5291121315; Fri, 31 Mar 2023 11:26:26 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF11A1121314 for ; Fri, 31 Mar 2023 11:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680262023; 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=g85Ozt6c/pN7SClk5DRpbPalWLKjVZqe8TiAlV+7O4A=; b=aPNxcEo0YonJZQ6oVMoVoQ7fUorih6Qazcxi3OdlZ68igd0+NwZ4h2mOXyqcIYdOqOA6iI 8E3AQtldk/7NEs89N1tsM5CG+M+XVmR775a5SmRrIJ/hQvSBKuqmKSEvZZH89L8DoG/dMC oodNYMbvG/O7mQ/w9pnWKHL7ndtk9Hs= X-MC-Unique: w6Y3Pht1N0KHNSo8PbC3OQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 09/21] qemuxml2argvtest: Modernize 'balloon-mmio-deflate' Date: Fri, 31 Mar 2023 13:26:03 +0200 Message-Id: <3ca010de80219b253f5c6fe73e186d7ed60ef513.1680260939.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.9 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: 1680262026377100001 Content-Type: text/plain; charset="utf-8" Use real capabilities and mask-out support for PCIe. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...e.args =3D> balloon-mmio-deflate.aarch64-latest.args} | 8 +++++--- tests/qemuxml2argvtest.c | 10 +++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) rename tests/qemuxml2argvdata/{balloon-mmio-deflate.args =3D> balloon-mmio= -deflate.aarch64-latest.args} (67%) diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.args b/tests/qemux= ml2argvdata/balloon-mmio-deflate.aarch64-latest.args similarity index 67% rename from tests/qemuxml2argvdata/balloon-mmio-deflate.args rename to tests/qemuxml2argvdata/balloon-mmio-deflate.aarch64-latest.args index 1c05dd6484..c26a05bf81 100644 --- a/tests/qemuxml2argvdata/balloon-mmio-deflate.args +++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.aarch64-latest.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-aarch64test/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ -cpu cortex-a53 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -31,5 +32,6 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -append 'earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwai= t' \ -dtb /aarch64.dtb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-device,id=3Dballoon0,deflate-on-oom=3Don \ +-device '{"driver":"virtio-balloon-device","id":"balloon0","deflate-on-oom= ":true}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0bf5bf23b0..93c246bc9b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1703,9 +1703,13 @@ mymain(void) DO_TEST("balloon-device-deflate", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); DO_TEST_CAPS_ARCH_LATEST("balloon-ccw-deflate", "s390x"); - DO_TEST("balloon-mmio-deflate", - QEMU_CAPS_DEVICE_VIRTIO_MMIO, - QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); + DO_TEST_FULL("balloon-mmio-deflate", ".aarch64-latest", + ARG_CAPS_ARCH, "aarch64", + ARG_CAPS_VER, "latest", + ARG_QEMU_CAPS_DEL, + QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3= 420, + QEMU_CAPS_LAST, ARG_END); DO_TEST("balloon-device-deflate-off", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); DO_TEST_NOCAPS("balloon-device-auto"); --=20 2.39.2 From nobody Fri Jun 14 02:08:58 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=1680262037; cv=none; d=zohomail.com; s=zohoarc; b=LluJ2gtESkPQiN1V4gaIoiFhCEnhmIatQ4jTzv0p6lSFrEjKmkjUd+wVMu6RkarOp2i8qEo7P8Aw85BWtY+ziRZqwn1dMc4zgQOtYfGUkJCnz8cgx6/S6TSlRuVlI2crfqG+uwXo70JJvQuWShaJ9yfDjGWcDL1qn+w7VjDcwEA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680262037; 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=lFQfXyFJ4bIrlvZBMXrI6aHKpGr/dklYIXN/ZVI8d+E=; b=iOdvTzMnZtqiBUvRz23OIkiPlBS3/5j8UlDqmnQEPk61TwQfRPXLJDJkr/AdvvTsMli0J2iPJq9hbbqgJX/IZ6dd8+rW/MiDGajwgFMgDgab/Q82jn7KmwmM1eF7hQWpWaekAS7ngS/je2uizYIL/BgDeo15KbnLmsUYhBnTrBw= 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 1680262037232458.0088224387182; Fri, 31 Mar 2023 04:27:17 -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-538-7fJ9uvzJONiGv_mABudsRw-1; Fri, 31 Mar 2023 07:26:32 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4C594185A78B; Fri, 31 Mar 2023 11:26:29 +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 39E84C15BA0; Fri, 31 Mar 2023 11:26:29 +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 2BE2019465BD; Fri, 31 Mar 2023 11:26: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 C62F71946A44 for ; Fri, 31 Mar 2023 11:26:27 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A63B41121314; Fri, 31 Mar 2023 11:26:27 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12EE41121315 for ; Fri, 31 Mar 2023 11:26:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680262036; 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=lFQfXyFJ4bIrlvZBMXrI6aHKpGr/dklYIXN/ZVI8d+E=; b=Zw62MZEiT4Ws6Nrk+tMeXlCoP9ouFI+dTwL4z227wpoLdFBEV/zkd+ne2l4hKuKewh15rl K3eWOkCr0WC1vBMstaCaa24cowNygizmZPSQ0hIJkcIbiXBJmuyqjUxqakGd4E1KTfKw4T FAWbAyKFkuLoAHb1MAkSrwpX9MuFWko= X-MC-Unique: 7fJ9uvzJONiGv_mABudsRw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 10/21] qemuxml2argvtest: Don't symlink output files for 'mach-virt-' cases Date: Fri, 31 Mar 2023 13:26:04 +0200 Message-Id: <2473a4480ed6f698b9ee50193e28c8bd248e239c.1680260939.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.8 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: 1680262038495100001 Content-Type: text/plain; charset="utf-8" Make the output changes of upcoming modernization more visible. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- .../mach-virt-console-native.args | 32 ++++++++++++++++++- .../mach-virt-serial+console-native.args | 32 ++++++++++++++++++- .../mach-virt-serial-compat.args | 32 ++++++++++++++++++- 3 files changed, 93 insertions(+), 3 deletions(-) mode change 120000 =3D> 100644 tests/qemuxml2argvdata/mach-virt-console-na= tive.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/mach-virt-serial+con= sole-native.args mode change 120000 =3D> 100644 tests/qemuxml2argvdata/mach-virt-serial-com= pat.args diff --git a/tests/qemuxml2argvdata/mach-virt-console-native.args b/tests/q= emuxml2argvdata/mach-virt-console-native.args deleted file mode 120000 index c7abf01bd6..0000000000 --- a/tests/qemuxml2argvdata/mach-virt-console-native.args +++ /dev/null @@ -1 +0,0 @@ -mach-virt-serial-native.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/mach-virt-console-native.args b/tests/q= emuxml2argvdata/mach-virt-console-native.args new file mode 100644 index 0000000000..f9f8f49d97 --- /dev/null +++ b/tests/qemuxml2argvdata/mach-virt-console-native.args @@ -0,0 +1,31 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest/master-key.aes \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-accel tcg \ +-m 512 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-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 \ +-chardev pty,id=3Dcharserial0 \ +-serial chardev:charserial0 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/mach-virt-serial+console-native.args b/= tests/qemuxml2argvdata/mach-virt-serial+console-native.args deleted file mode 120000 index c7abf01bd6..0000000000 --- a/tests/qemuxml2argvdata/mach-virt-serial+console-native.args +++ /dev/null @@ -1 +0,0 @@ -mach-virt-serial-native.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/mach-virt-serial+console-native.args b/= tests/qemuxml2argvdata/mach-virt-serial+console-native.args new file mode 100644 index 0000000000..f9f8f49d97 --- /dev/null +++ b/tests/qemuxml2argvdata/mach-virt-serial+console-native.args @@ -0,0 +1,31 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest/master-key.aes \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-accel tcg \ +-m 512 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-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 \ +-chardev pty,id=3Dcharserial0 \ +-serial chardev:charserial0 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/mach-virt-serial-compat.args b/tests/qe= muxml2argvdata/mach-virt-serial-compat.args deleted file mode 120000 index c7abf01bd6..0000000000 --- a/tests/qemuxml2argvdata/mach-virt-serial-compat.args +++ /dev/null @@ -1 +0,0 @@ -mach-virt-serial-native.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/mach-virt-serial-compat.args b/tests/qe= muxml2argvdata/mach-virt-serial-compat.args new file mode 100644 index 0000000000..f9f8f49d97 --- /dev/null +++ b/tests/qemuxml2argvdata/mach-virt-serial-compat.args @@ -0,0 +1,31 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest/master-key.aes \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-accel tcg \ +-m 512 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-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 \ +-chardev pty,id=3Dcharserial0 \ +-serial chardev:charserial0 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-msg timestamp=3Don --=20 2.39.2 From nobody Fri Jun 14 02:08:58 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=1680262045; cv=none; d=zohomail.com; s=zohoarc; b=S6iWV9gXHxW1ZQdkcCn1T2XbL3LerwJ7WFKpC1lwIa5hNXPA8ldfmXLyN9S2R+g0EXWcIXzh3EfNirxmTg28i2aRkZqN0FnfEmuiLbbKOwNFHoq/ehJZGyYmeH7Y7zSCX7uHsA8VCSYQrwr4B26aMOoce7OrXx6rBgc3VzZWqCc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680262045; 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=dEUnywr+BghZ7AtXzs3+sCTp+RDhXLxtG8rVY9DO2B8=; b=BHnpiZ5hwZCFNYb/cufLIp3WswgXskamPwyIH0icsRU6UKS7z6g2/p2+39sW2KWzSpHQl2wag8L5gmF9eMAUrfyqUE8BsKqbNv4y33NjZu9HRe8AaeYq/p8G404kPUPivzws41fUmP+GosqZqd3i7rC2A6opl4t7A0oclsJsnvw= 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 1680262045503551.2300867204223; Fri, 31 Mar 2023 04:27:25 -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-604-2B6TOCXGPUi7KpdoqqJa2g-1; Fri, 31 Mar 2023 07:26:32 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 03F5418A06E7; Fri, 31 Mar 2023 11:26:30 +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 E1EB3202701F; Fri, 31 Mar 2023 11:26:29 +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 D328719465BD; Fri, 31 Mar 2023 11:26: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 DAD0B19465BC for ; Fri, 31 Mar 2023 11:26:28 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id BCFD71121319; Fri, 31 Mar 2023 11:26:28 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A72D1121315 for ; Fri, 31 Mar 2023 11:26:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680262044; 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=dEUnywr+BghZ7AtXzs3+sCTp+RDhXLxtG8rVY9DO2B8=; b=W+52sMnrhQjsHwza/QoIXSLm3HJuhQVf/l0Ws9jVk1nLO66p4o5KPUFdwas+byC58zWK68 s6+3MSyrVmTP8IkZvJYYFd5JivlT1MH51DizEddhToSKs7T85BMnU635+RsEhX97rSu53/ +dQFvb4x9753pkMsT50TKLMnOktIqMc= X-MC-Unique: 2B6TOCXGPUi7KpdoqqJa2g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 11/21] qemuxml2argvtest: Modernize all 'mach-virt-' aarch64 test cases Date: Fri, 31 Mar 2023 13:26:05 +0200 Message-Id: <88f7ca88f4d3a125ef45dae882d463ff2e9cb0ae.1680260939.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.4 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: 1680262046616100001 Content-Type: text/plain; charset="utf-8" Use real capabilities. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...h-virt-console-native.aarch64-latest.args} | 7 +++- ...h-virt-console-virtio.aarch64-latest.args} | 13 +++++-- ...serial+console-native.aarch64-latest.args} | 7 +++- ...ch-virt-serial-compat.aarch64-latest.args} | 7 +++- ...-serial-invalid-machine.x86_64-latest.err} | 0 ...ch-virt-serial-native.aarch64-latest.args} | 7 +++- .../mach-virt-serial-pci.aarch64-latest.args | 37 +++++++++++++++++++ .../mach-virt-serial-pci.args | 34 ----------------- .../mach-virt-serial-usb.aarch64-latest.args | 37 +++++++++++++++++++ .../mach-virt-serial-usb.args | 34 ----------------- tests/qemuxml2argvtest.c | 30 ++++----------- 11 files changed, 111 insertions(+), 102 deletions(-) rename tests/qemuxml2argvdata/{mach-virt-console-native.args =3D> mach-vir= t-console-native.aarch64-latest.args} (67%) rename tests/qemuxml2argvdata/{mach-virt-console-virtio.args =3D> mach-vir= t-console-virtio.aarch64-latest.args} (50%) rename tests/qemuxml2argvdata/{mach-virt-serial-native.args =3D> mach-virt= -serial+console-native.aarch64-latest.args} (67%) rename tests/qemuxml2argvdata/{mach-virt-serial+console-native.args =3D> m= ach-virt-serial-compat.aarch64-latest.args} (67%) rename tests/qemuxml2argvdata/{mach-virt-serial-invalid-machine.err =3D> m= ach-virt-serial-invalid-machine.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{mach-virt-serial-compat.args =3D> mach-virt= -serial-native.aarch64-latest.args} (67%) create mode 100644 tests/qemuxml2argvdata/mach-virt-serial-pci.aarch64-lat= est.args delete mode 100644 tests/qemuxml2argvdata/mach-virt-serial-pci.args create mode 100644 tests/qemuxml2argvdata/mach-virt-serial-usb.aarch64-lat= est.args delete mode 100644 tests/qemuxml2argvdata/mach-virt-serial-usb.args diff --git a/tests/qemuxml2argvdata/mach-virt-console-native.args b/tests/q= emuxml2argvdata/mach-virt-console-native.aarch64-latest.args similarity index 67% rename from tests/qemuxml2argvdata/mach-virt-console-native.args rename to tests/qemuxml2argvdata/mach-virt-console-native.aarch64-latest.ar= gs index f9f8f49d97..7324c37696 100644 --- a/tests/qemuxml2argvdata/mach-virt-console-native.args +++ b/tests/qemuxml2argvdata/mach-virt-console-native.aarch64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ +-cpu cortex-a15 \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -28,4 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/mach-virt-console-virtio.args b/tests/q= emuxml2argvdata/mach-virt-console-virtio.aarch64-latest.args similarity index 50% rename from tests/qemuxml2argvdata/mach-virt-console-virtio.args rename to tests/qemuxml2argvdata/mach-virt-console-virtio.aarch64-latest.ar= gs index 9e0cbf403e..926ca90ba1 100644 --- a/tests/qemuxml2argvdata/mach-virt-console-virtio.args +++ b/tests/qemuxml2argvdata/mach-virt-console-virtio.aarch64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ +-cpu cortex-a15 \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -25,8 +27,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/= .config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device virtio-serial-device,id=3Dvirtio-serial0 \ +-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":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.1"= ,"addr":"0x0"}' \ -chardev pty,id=3Dcharconsole0 \ --device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ +-device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/mach-virt-serial-native.args b/tests/qe= muxml2argvdata/mach-virt-serial+console-native.aarch64-latest.args similarity index 67% rename from tests/qemuxml2argvdata/mach-virt-serial-native.args rename to tests/qemuxml2argvdata/mach-virt-serial+console-native.aarch64-la= test.args index f9f8f49d97..7324c37696 100644 --- a/tests/qemuxml2argvdata/mach-virt-serial-native.args +++ b/tests/qemuxml2argvdata/mach-virt-serial+console-native.aarch64-latest= .args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ +-cpu cortex-a15 \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -28,4 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/mach-virt-serial+console-native.args b/= tests/qemuxml2argvdata/mach-virt-serial-compat.aarch64-latest.args similarity index 67% rename from tests/qemuxml2argvdata/mach-virt-serial+console-native.args rename to tests/qemuxml2argvdata/mach-virt-serial-compat.aarch64-latest.args index f9f8f49d97..7324c37696 100644 --- a/tests/qemuxml2argvdata/mach-virt-serial+console-native.args +++ b/tests/qemuxml2argvdata/mach-virt-serial-compat.aarch64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ +-cpu cortex-a15 \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -28,4 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/mach-virt-serial-invalid-machine.err b/= tests/qemuxml2argvdata/mach-virt-serial-invalid-machine.x86_64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/mach-virt-serial-invalid-machine.err rename to tests/qemuxml2argvdata/mach-virt-serial-invalid-machine.x86_64-la= test.err diff --git a/tests/qemuxml2argvdata/mach-virt-serial-compat.args b/tests/qe= muxml2argvdata/mach-virt-serial-native.aarch64-latest.args similarity index 67% rename from tests/qemuxml2argvdata/mach-virt-serial-compat.args rename to tests/qemuxml2argvdata/mach-virt-serial-native.aarch64-latest.args index f9f8f49d97..7324c37696 100644 --- a/tests/qemuxml2argvdata/mach-virt-serial-compat.args +++ b/tests/qemuxml2argvdata/mach-virt-serial-native.aarch64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ /usr/bin/qemu-system-aarch64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel tcg \ +-cpu cortex-a15 \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -28,4 +30,5 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.= config \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/mach-virt-serial-pci.aarch64-latest.arg= s b/tests/qemuxml2argvdata/mach-virt-serial-pci.aarch64-latest.args new file mode 100644 index 0000000000..8654cb2f6a --- /dev/null +++ b/tests/qemuxml2argvdata/mach-virt-serial-pci.aarch64-latest.args @@ -0,0 +1,37 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ +-accel tcg \ +-cpu cortex-a15 \ +-m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":5368= 70912}' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-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-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-chardev pty,id=3Dcharserial0 \ +-device '{"driver":"pci-serial","chardev":"charserial0","id":"serial0","bu= s":"pci.2","addr":"0x1"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/mach-virt-serial-pci.args b/tests/qemux= ml2argvdata/mach-virt-serial-pci.args deleted file mode 100644 index 5cea9553c9..0000000000 --- a/tests/qemuxml2argvdata/mach-virt-serial-pci.args +++ /dev/null @@ -1,34 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ -/usr/bin/qemu-system-aarch64 \ --name guest=3Dguest,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ --accel tcg \ --m 512 \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ --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 i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1 \ --device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device pcie-root-port,port=3D16,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x2 \ --chardev pty,id=3Dcharserial0 \ --device pci-serial,chardev=3Dcharserial0,id=3Dserial0,bus=3Dpci.2,addr=3D0= x1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/mach-virt-serial-usb.aarch64-latest.arg= s b/tests/qemuxml2argvdata/mach-virt-serial-usb.aarch64-latest.args new file mode 100644 index 0000000000..e672cb1a1e --- /dev/null +++ b/tests/qemuxml2argvdata/mach-virt-serial-usb.aarch64-latest.args @@ -0,0 +1,37 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ +-accel tcg \ +-cpu cortex-a15 \ +-m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":5368= 70912}' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-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"}' \ +-chardev pty,id=3Dcharserial0 \ +-device '{"driver":"usb-serial","chardev":"charserial0","id":"serial0","bu= s":"usb.0","port":"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/mach-virt-serial-usb.args b/tests/qemux= ml2argvdata/mach-virt-serial-usb.args deleted file mode 100644 index d9f65930c3..0000000000 --- a/tests/qemuxml2argvdata/mach-virt-serial-usb.args +++ /dev/null @@ -1,34 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ -XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ -XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ -/usr/bin/qemu-system-aarch64 \ --name guest=3Dguest,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d= omain--1-guest/master-key.aes \ --machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff \ --accel tcg \ --m 512 \ --overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ --uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ --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 \ --chardev pty,id=3Dcharserial0 \ --device usb-serial,chardev=3Dcharserial0,id=3Dserial0,bus=3Dusb.0,port=3D1= \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 93c246bc9b..faa5077112 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1999,28 +1999,14 @@ mymain(void) DO_TEST_PARSE_ERROR_NOCAPS("pseries-serial-invalid-machine"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("pseries-spaprvio-invalid", "ppc6= 4"); - DO_TEST("mach-virt-serial-native", - QEMU_CAPS_DEVICE_PL011); - DO_TEST("mach-virt-serial+console-native", - QEMU_CAPS_DEVICE_PL011); - DO_TEST("mach-virt-serial-compat", - QEMU_CAPS_DEVICE_PL011); - DO_TEST("mach-virt-serial-pci", - QEMU_CAPS_OBJECT_GPEX, - QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_PCI_SERIAL); - DO_TEST("mach-virt-serial-usb", - QEMU_CAPS_OBJECT_GPEX, - QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, - QEMU_CAPS_DEVICE_QEMU_XHCI, - QEMU_CAPS_DEVICE_USB_SERIAL); - DO_TEST("mach-virt-console-native", - QEMU_CAPS_DEVICE_PL011); - DO_TEST("mach-virt-console-virtio", - QEMU_CAPS_DEVICE_VIRTIO_MMIO); - DO_TEST_PARSE_ERROR_NOCAPS("mach-virt-serial-invalid-machine"); + DO_TEST_CAPS_ARCH_LATEST("mach-virt-serial-native", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("mach-virt-serial+console-native", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("mach-virt-serial-compat", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("mach-virt-serial-pci", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("mach-virt-serial-usb", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("mach-virt-console-native", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("mach-virt-console-virtio", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("mach-virt-serial-invalid-machine= ", "x86_64"); DO_TEST("video-device-pciaddr-default", QEMU_CAPS_KVM, --=20 2.39.2 From nobody Fri Jun 14 02:08:58 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=1680262027; cv=none; d=zohomail.com; s=zohoarc; b=NnextNkYpEzxDpq6r43RWULwL5a4yTW9LoVXOADqP2Akd0tbbyPdPXkkRWjXl8uDeO83w7hEOVonPG+QnkItBs4PqJsEpv2Vg6i+c/rLNdTnWc/chz0mLr4YWEhWW62a5II7fMqdu76g7Sigq647UErb+fBMXzgfnoLGR5vHmwA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680262027; 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=/nCsYmwF+BCYBU4HnXqwUNn/SF6O1rFSDYirliUVYWU=; b=dPh985lvy1V2kiY/0AQ5u942GRm9pn6qEaE+veuiATPhu6ZsKQgAiLjzanN6hd/qJrCoAtN2PvGljchcLd0C7Ewti24YgWH2WJMQIxvEbNO/SmX+OK+xBFxEQ6LDOS4ksSoLZPNDCJNV0mFmgNWqGa77X5oylfX56bUHeaZ31EM= 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 1680262027123264.65695267068565; Fri, 31 Mar 2023 04:27:07 -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-497-Rj4VI2XCOqyBmdVxOMyIyw-1; Fri, 31 Mar 2023 07:26:35 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A5BDA100DEB8; Fri, 31 Mar 2023 11:26:32 +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 8C79B14171B6; Fri, 31 Mar 2023 11:26:32 +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 6ECB81946A4A; Fri, 31 Mar 2023 11:26:32 +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 1CF3A19466DF for ; Fri, 31 Mar 2023 11:26:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E4F67112131B; Fri, 31 Mar 2023 11:26:29 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D4B41121319 for ; Fri, 31 Mar 2023 11:26:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680262026; 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=/nCsYmwF+BCYBU4HnXqwUNn/SF6O1rFSDYirliUVYWU=; b=I8UkEfW6zciRayHDbPniWoWQmc2nOSlLJhromRWK62B1fX612MYR/pCPC3r8pJJCICpJht v5Bz+Cs1TmRmqXNwn86bPWr/XeFyRDoLH8UifKw3YYX3NQzPpOQOFYo2H/6yf87Tbb+38d rU5bv1nfD4BvoM2wKgayzO53vchaoKc= X-MC-Unique: Rj4VI2XCOqyBmdVxOMyIyw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 12/21] qemuxml2argvtest: Update 'aarch64-virtio-pci-manual-addresses' case Date: Fri, 31 Mar 2023 13:26:06 +0200 Message-Id: <20adacf8168fa35fbc838cd38e2d117a26ae12d9.1680260939.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.7 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: 1680262028417100005 Content-Type: text/plain; charset="utf-8" With all supported qemu versions we'll pick PCIe to use for the implicit address busses (those lacking an explicit controller) and thus the addresses must reflect that. Update the test to add the new flags, and fix the addresses. Additionally add a real-caps version of the test. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...o-pci-manual-addresses.aarch64-latest.args | 49 ++++++++++++ .../aarch64-virtio-pci-manual-addresses.args | 10 ++- .../aarch64-virtio-pci-manual-addresses.xml | 4 +- tests/qemuxml2argvtest.c | 4 + ...io-pci-manual-addresses.aarch64-latest.xml | 75 +++++++++++++++++++ .../aarch64-virtio-pci-manual-addresses.xml | 24 ++++-- tests/qemuxml2xmltest.c | 4 + 7 files changed, 157 insertions(+), 13 deletions(-) create mode 100644 tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addres= ses.aarch64-latest.args create mode 100644 tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addr= esses.aarch64-latest.xml diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.aar= ch64-latest.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-address= es.aarch64-latest.args new file mode 100644 index 0000000000..dcf5d187fa --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.aarch64-la= test.args @@ -0,0 +1,49 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Daarch64test,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ +-machine virt,usb=3Doff,gic-version=3D2,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ +-accel tcg \ +-cpu cortex-a53 \ +-m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073= 741824}' \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-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 \ +-kernel /aarch64.kernel \ +-initrd /aarch64.initrd \ +-append 'earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwai= t' \ +-dtb /aarch64.dtb \ +-device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1"}' \ +-device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1",= "addr":"0x0"}' \ +-device '{"driver":"pcie-root-port","port":16,"chassis":3,"id":"pci.3","bu= s":"pcie.0","multifunction":true,"addr":"0x2"}' \ +-device '{"driver":"pcie-root-port","port":17,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x2.0x1"}' \ +-device '{"driver":"pcie-root-port","port":18,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x2.0x2"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.4","addr":"0x= 0"}' \ +-blockdev '{"driver":"file","filename":"/aarch64.raw","node-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":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-1-format","id":"scsi0-0= -0-0","bootindex":1}' \ +-netdev user,id=3Dhostnet0 \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.3","addr":"0x0"}' \ +-netdev user,id=3Dhostnet1 \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":= "52:54:00:09:a4:38","bus":"pci.5","addr":"0x0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.arg= s b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args index 65c2b3b706..bdc5e7b798 100644 --- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args +++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args @@ -32,14 +32,16 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch= 64test/.config \ -dtb /aarch64.dtb \ -device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1 \ -device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ --device pci-bridge,chassis_nr=3D3,id=3Dpci.3,bus=3Dpci.1,addr=3D0x1 \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.3,addr=3D0x1 \ +-device pcie-root-port,port=3D16,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,multi= function=3Don,addr=3D0x2 \ +-device pcie-root-port,port=3D17,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x2.0x1 \ +-device pcie-root-port,port=3D18,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x2.0x2 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.4,addr=3D0x0 \ -blockdev '{"driver":"file","filename":"/aarch64.raw","node-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 scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi0-0-0-0,drive=3Dlibvirt-1-format,id=3Dscsi0-0-0-0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.3,addr=3D0x2 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.3,addr=3D0x0 \ -netdev user,id=3Dhostnet1 \ --device virtio-net-pci,netdev=3Dhostnet1,id=3Dnet1,mac=3D52:54:00:09:a4:38= ,bus=3Dpci.2,addr=3D0x1 \ +-device virtio-net-pci,netdev=3Dhostnet1,id=3Dnet1,mac=3D52:54:00:09:a4:38= ,bus=3Dpci.5,addr=3D0x0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.xml= b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.xml index fee32588f7..d1c3ccc70e 100644 --- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.xml +++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.xml @@ -41,12 +41,12 @@
-
+
-
+
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index faa5077112..7b2ae88658 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2358,11 +2358,15 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-default", "aarch64"); /* Example of using virtio-pci with no explicit PCI controller but with manual PCI addresses */ + DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-manual-addresses", "aarch= 64"); DO_TEST("aarch64-virtio-pci-manual-addresses", QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, + QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, + QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE, + QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL, QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_VIRTIO_SCSI); DO_TEST("aarch64-video-virtio-gpu-pci", diff --git a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.a= arch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addr= esses.aarch64-latest.xml new file mode 100644 index 0000000000..63c2636f5e --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.aarch64-= latest.xml @@ -0,0 +1,75 @@ + + aarch64test + 496d7ea8-9739-544b-4ebd-ef08be936e8b + 1048576 + 1048576 + 1 + + hvm + /aarch64.kernel + /aarch64.initrd + earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda roo= twait + /aarch64.dtb + + + + + + + + + cortex-a53 + + + destroy + restart + restart + + /usr/bin/qemu-system-aarch64 + + + + +
+ + + + +
+ + + + +
+ + +
+ + + + +
+ + + + +
+ + + + +
+ + + + +
+ + + + +
+ +