From nobody Tue Sep 9 01:20:02 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; arc=fail (BodyHash is different from the expected one); dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1746661183329965.9152327794773; Wed, 7 May 2025 16:39:43 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6292E1540; Wed, 7 May 2025 19:39:42 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 920171568; Wed, 7 May 2025 19:39:03 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6F17E153A; Wed, 7 May 2025 19:39:00 -0400 (EDT) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2085.outbound.protection.outlook.com [40.107.94.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 763DD152E for ; Wed, 7 May 2025 19:38:59 -0400 (EDT) Received: from MW6PR12MB8897.namprd12.prod.outlook.com (2603:10b6:303:24a::19) by PH8PR12MB7255.namprd12.prod.outlook.com (2603:10b6:510:224::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.26; Wed, 7 May 2025 23:38:40 +0000 Received: from MW6PR12MB8897.namprd12.prod.outlook.com ([fe80::7c55:5a45:be80:e971]) by MW6PR12MB8897.namprd12.prod.outlook.com ([fe80::7c55:5a45:be80:e971%4]) with mapi id 15.20.8722.021; Wed, 7 May 2025 23:38:39 +0000 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FORGED_SPF_HELO,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.4 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=q7jt5GCIx2f+gp/dnF3Ir0J6dvRTGIZIFvegvWJW4ld3cQSNoBiRL9EUYjVQIMShFyo4U6raXv3nG8jS1dAKKaqQGHm1ap+dgkNyev8col0mNtNsPPLRBkVcK5mVsr+eq3enzjTZEIgqPH7apt/7nUhTRqAXHNoYa7jgf8q1wxjT0nU9NPxdlDdShQRYCU4rXfQW3mHAaXzwgnwDVXak9ox1pKHhAmyMjNpsVR0UgHi6CYV2j94OFTj7Yq1j5Sarfr3m6LFPwvIM+xfvGHAnsTtQWbYWZKd3+DI8ll5Jr51QLwlUEBjbQ+zTeKUPIPbzz0Pc7zASYhawjFJFI84Dxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LlIg2IqiLmBFKagIiz485EI/+mSGPdkZ5WRyU03O9fs=; b=fNyztEXr9v8R5+CxZFo0kc1cfhq9M2Ts+dMQcNVfjICy8SagfisthJnUGE+DuE+0lgf4FY30VGu6FsaxxHC5AL5rIHPmh904zzRPq0Iayt4YkGLBHFfOJzCzHtYLjQWNDZiUTEa1jwE7qwQgnKaj4O0lAloDziBGhrQGOY+94HZOWQOQ+LAF/HQLVQt7HyRlqWqAZ+wcuaceKMO0z7vdhiXLOvXugbSR1YvNkjjkDANHIdYOpkblefiZCBLUKBK71tb8hMo2H2eFV6Gp2KA2S2fuJvuWvvW/FgCWotch9FRnoxCEezBRlbtzjis6cqTIfkyH5AkR3yNxadiisFuKuA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LlIg2IqiLmBFKagIiz485EI/+mSGPdkZ5WRyU03O9fs=; b=iwn7P8b9wvYfTVhimg66/NcSgEset7SGuxYABmhl2VAbfdD/k8w3rTrd6Br90y8dsYLrv9UACrOPjH22E2scVJTFNDjQOXuxbXhATwlPZIELxQbPJXgqnAqQ/YoMBHZks0ZnytSNdxD66a8vyzGBA2VmQQWng+hjaY8t7PxsEEjtYYybI+C0ob4ih/v5Q9IjuV4B1ULRURgzZQ0ViDBiRD5vOB/w5ycHp3qf/BS2UVIScCohe87H7AqzsIZqWbfqLEniV4G1XQ8maLTZgYLezt8HXqZZsjwN59gkqqL5qBHMUieyOAXM08PYyLhTZoURdhq+hN4pIPJBph+kJ5fn1A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; To: devel@lists.libvirt.org Subject: [PATCH 1/2] tests: Use collie instead of borzoi for aarch64 tests Date: Wed, 7 May 2025 16:38:38 -0700 Message-ID: <20250507233838.3955804-1-mochs@nvidia.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250507233804.3955526-1-mochs@nvidia.com> References: <20250507233804.3955526-1-mochs@nvidia.com> X-NVConfidentiality: public X-ClientProxiedBy: BY3PR05CA0038.namprd05.prod.outlook.com (2603:10b6:a03:39b::13) To MW6PR12MB8897.namprd12.prod.outlook.com (2603:10b6:303:24a::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MW6PR12MB8897:EE_|PH8PR12MB7255:EE_ X-MS-Office365-Filtering-Correlation-Id: c2fac614-3a80-406d-f305-08dd8dc04b6a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?UWmKgHI1D3NBWb07pNwT45MDMXMKGymznzihuCjfPKBUzXBnWS4gXXeD7zrf?= =?us-ascii?Q?2FMSXl5Q5wKr+EXfRl5qgBVTH5p7O0X4IlHiygyfknh5KI/8F8aQ7sEBQOXQ?= =?us-ascii?Q?az+0TLtlD3k8xSAmjowWciZfxtbqssoAGf0lcEc1sPqf2i24OfS7OseAtVCS?= =?us-ascii?Q?gqDsgDZOEjMU472pFmMMDc5guWHyn2OGvBi5sXyBHGcKQNGiKIcK1/NuMoxg?= =?us-ascii?Q?IGmDcsh+yz8OempRPHCgobx9czewH4of+dpgPz+/OYSaUoRf15OXvC9XZgr7?= =?us-ascii?Q?u121hZEHhA+p/wG7w5rhMgZM2RuBkfDgvkQt/ZQWmlNBzvZu+FZDNloInYjQ?= =?us-ascii?Q?fakUS/pjPdnpO2zL1ojARxRLSFYkPl9qTxuNAlhml12ABk4rObMcTVbSMv1R?= =?us-ascii?Q?Fw9hYYIG7b/TZ/kpxOkUtiJWlA0d2J2KIXT1kK2/cb5Sr0VfdkjGW8FpI9En?= =?us-ascii?Q?/sTAMxF+/ttnCftB2bytE4VbRGUBHbfYVhpja2lDPjotn2s/n+wDpuPihp+E?= =?us-ascii?Q?VgAD49Y/6y/7hoP/WZtmypnzr6T/hZ+yw1O3YvGmIzJzwTMfef9j9UI+3rIV?= =?us-ascii?Q?bA0s6Xp+u/5mKqDyW+iMWoBLln0zc+hL3rmdWd1HqSWiXHms8QN+bM9DylZy?= =?us-ascii?Q?2z6g1yuJT9s4FIu+pwzXE6ciyK5Pfldyds7ZidETZ/NvdHD6Ed7j9JTd4z7N?= =?us-ascii?Q?Jeerb//RPIzKzPT5vNZyvURWb38xx6Wiw1x11juE3QBh0B4SDAHA3YdLuTod?= =?us-ascii?Q?3mb0PiST5lc3BQVlj/5cFhGMQr4Y64FIO1A3ifpjnuJ8NpBL7RkmQgQmx7+H?= =?us-ascii?Q?ep4Iz/gscvclrCjTTarl+7PosSXSFBakMhhDqbmyDxsz+eJMH/ywNEEY/LOb?= =?us-ascii?Q?aQp7IfSpnT7S//Uq1ZqEdJVdncKoYIdcHWDD0ep4S+VZQ7jD3MXPFQVaNt2S?= =?us-ascii?Q?gTkAEkucvlRWMClGz9FqGBz0NunegJTDCZOnBHicAs2q3L6aSgCNkuTQOQEi?= =?us-ascii?Q?7Djsghz7pOi/ytYG6xdm+B9iPALiYHkCrhJ2jXJfyjui47ecnoSM5pyIhT5Y?= =?us-ascii?Q?NysKC1HUU+EXoBt4e+Zbp270FywCo/5au+5Dmo/Zik8aJbvqp45cAvy3DpRK?= =?us-ascii?Q?XuqmNn395Kj99DrgmUQN4xg+vLVe7UizcyiZEwFVyzF9YhrkKOX6K1CTlhes?= =?us-ascii?Q?Ic8Dn/xNtaW+40/NO3sUeDKHDEgRvwMMavB4wcXZ+7h1kwRw246pLkLoG5/2?= =?us-ascii?Q?C+F7+J7xbPda2CJSqZ8LsbSgRLLenfUBgJgK0Xg6BoXssWlbIINDT42y8En7?= =?us-ascii?Q?94Yok+zaibct2PAJpg94IUAspcOHYF1GWHvt+5uHjy68Q+D4M7HFDOjV/WLo?= =?us-ascii?Q?IgLBWIilGRUg0YnPduoXl0cAArZcMqNWPSD1P5OSfcqLlV0k3qbP86MN+ArH?= =?us-ascii?Q?/jeBc+74krE=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW6PR12MB8897.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?D6DtSUUow8wbj4w+TYnyYgk0Xy1IJinlLKFSnTKukXbVYnrr8dHQ7U5EHQUo?= =?us-ascii?Q?54nZPGZu4cIhrFtVKjvdP9PWq8CkMVUx+uyOyO2JbygVeO3t4StjoU4JzNGv?= =?us-ascii?Q?xp9vhuWLEfWH8CRjRFOuoxhZdrFA2+/LFOYERXxEHBv2Iq4E+7nOnC6apD3Q?= =?us-ascii?Q?7MpK2Fbi9Gn6zpx2Mj21+YRR+6vmnEWn7gT7mZ7MoyWcIwraPLBfHoLrm0+G?= =?us-ascii?Q?HA+kIVD9hIy5gz+NheBL7VMSGq1xu9Za5QjYqgxCV2v9Qh41ntYe3r7Grgmb?= =?us-ascii?Q?2mtpeXIGqifkaGNZbDDaFbOvU1NlblVowUS2jdve5UheuU3MluRCYR1euwFi?= =?us-ascii?Q?mRmRIZswk/focherlIMzt3jb6jgFkkwo7Zl782i+XU/SBZECI1bwFfWnotST?= =?us-ascii?Q?hz9aHaipKoUBTWxqLcx+HfFCCqLBKDvAeaxMaMi6ikVhuIk1SynjxlqAYqZs?= =?us-ascii?Q?zAwPDWmqE8lWXkBE6ZEx1THGtcFdbIpcfnAl2pgj7amW/jxrT4m5Asu5nPjh?= =?us-ascii?Q?dHn9uyHYot9ZeF09Cpw7eEFKCl/BTzGXHewZvpwJAincCUBH+5NPm5lDQCzm?= =?us-ascii?Q?lyiHY3ACJxvZihE5JDfR0w3uBVo9Bxo02bovGyRF1wWsWIW2NG//U5n7iH8+?= =?us-ascii?Q?I/QgFxhbjT2Q/JDitBIiZaSBvylYcxU6YR/wRZyrwvNJ0GMTtUdo3nl7M9pN?= =?us-ascii?Q?N7mavyyYsD4Chfm11L5vSoksBJHFGUJAv3nFMJJ+eltSPxozkjP/ITzBxWGL?= =?us-ascii?Q?3kkKtSprlb1tkHqyX3xTap1igL5rGiGJcjhswW4nbqxx+f949AWNwfLZovuD?= =?us-ascii?Q?ax5scoGYuxacr84IMgn3ZDhUbBHEurFviIJWvyBj5OYdKLDmQeqW0EcNSjxU?= =?us-ascii?Q?Z/qmnlHtCXExAffOBnIiK2nOs7jgESxALEJ+Wp3+o4IA4CMVBhD9f4Cnwp3N?= =?us-ascii?Q?gawBdLXHZCDb+zb9HapvUtHmMQ47V8XyvXPDGjlLyKj6cQY4xG+XOHR7aeAN?= =?us-ascii?Q?st6oB0KEKSkku5TmPevyK3x93QTAMDM+mExiDECMqjwyDqHABZAUhM1vQHrn?= =?us-ascii?Q?vgTGY0EhvPQ31OtXO+QMTyMQ8pkwN44dp5cVDQkOMcT1PzzD1XJSTuT/TKBB?= =?us-ascii?Q?A1cxbP6y1NmDuLIPhx30brKspD4wOWT04TkUzJYV+3do8EVPCgYhPFvy7mNC?= =?us-ascii?Q?07S/xTjEzM0ZRnDt9Wb9EYTCxTaiekVzQQ3ivX3uxvg2v6Kq0JffYXHCj9hr?= =?us-ascii?Q?T+kL/sNN1y5zOTrdvIAoePJOcAoZlCQTJs0fdjkhljwntwlW1y7AsGxnAZkd?= =?us-ascii?Q?nb7thFjDDOiP8xgWVOkrEB+yIxCr4T2tKd8ms3KazTKI6A1XNoJN0cOO92uA?= =?us-ascii?Q?Z6353M3DC+Ui/coDFOSC/tCLDzWVJsBvZJtbW3AxnvVi+I6GVHcpMUCqnNdZ?= =?us-ascii?Q?ZBqtqD90K6SQs/PieFAGeVz8EiR1ueX1Z+AXHdOME38M1XsuGxC4HVt96mUU?= =?us-ascii?Q?2x5CJ7Yh3+tSNaNNeIv9Jn89yJr3TVuMOw8yG6bYlHEjuse9YB1HxbQxL1xb?= =?us-ascii?Q?QBeDIhZyvirWl6DbqXd8Dkt85R6lz3IMjG/zMTBL?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: c2fac614-3a80-406d-f305-08dd8dc04b6a X-MS-Exchange-CrossTenant-AuthSource: MW6PR12MB8897.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2025 23:38:39.7189 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QTYR2CLw8tQotB0FbgBXf4eb6revbfumkSiNEaY3fgTd/iwZmHvzZNBthpqDw+cYfAhVuSnmDqQXhZ8eEoLiig== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7255 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: R4UJ5WTZBNK7ONIKX72B26WMRWKIRDO5 X-Message-ID-Hash: R4UJ5WTZBNK7ONIKX72B26WMRWKIRDO5 X-MailFrom: mochs@nvidia.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: abologna@redhat.com X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: "Matthew R. Ochs via Devel" Reply-To: "Matthew R. Ochs" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1746661184240116600 Content-Type: text/plain; charset="utf-8" The borzoi machine type was dropped in QEMU 9.2.0, so let's use a different machine type with no ACPI support and no implicit USB controller instead. Signed-off-by: Matthew R. Ochs Reviewed-by: Peter Krempa --- tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err | 2 +- tests/qemuxmlconfdata/aarch64-noacpi-acpi.xml | 2 +- .../aarch64-nousb-minimal.aarch64-latest.abi-update.args | 2 +- .../aarch64-nousb-minimal.aarch64-latest.abi-update.xml | 2 +- tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args | 2 +- tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml | 2 +- tests/qemuxmlconfdata/aarch64-nousb-minimal.xml | 2 +- .../usb-controller-default-fallback-nousb.aarch64-latest.args | 2 +- .../usb-controller-default-fallback-nousb.aarch64-latest.xml | 2 +- .../usb-controller-default-nousb.aarch64-latest.args | 2 +- .../usb-controller-default-nousb.aarch64-latest.xml | 2 +- tests/qemuxmlconfdata/usb-controller-default-nousb.xml | 2 +- ...usb-controller-default-unavailable-nousb.aarch64-latest.args | 2 +- .../usb-controller-default-unavailable-nousb.aarch64-latest.xml | 2 +- tests/qemuxmlconftest.c | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err b= /tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err index 5f379d56ce41..d10bbb1b3e05 100644 --- a/tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err +++ b/tests/qemuxmlconfdata/aarch64-noacpi-acpi.aarch64-latest.err @@ -1 +1 @@ -unsupported configuration: machine type 'borzoi' does not support ACPI +unsupported configuration: machine type 'collie' does not support ACPI diff --git a/tests/qemuxmlconfdata/aarch64-noacpi-acpi.xml b/tests/qemuxmlc= onfdata/aarch64-noacpi-acpi.xml index 10dbeabd6d52..7b5528d612b6 100644 --- a/tests/qemuxmlconfdata/aarch64-noacpi-acpi.xml +++ b/tests/qemuxmlconfdata/aarch64-noacpi-acpi.xml @@ -5,7 +5,7 @@ 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi= -update.args b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.a= bi-update.args index a3d0f7a4fcf5..24f770b92865 100644 --- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update= .args +++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update= .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 '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ --machine borzoi,usb=3Doff,dump-guest-core=3Doff \ +-machine collie,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi= -update.xml b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.ab= i-update.xml index 9bf4af4f7433..e3f04fbbff4a 100644 --- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update= .xml +++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.abi-update= .xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.arg= s b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args index a3d0f7a4fcf5..24f770b92865 100644 --- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.args +++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.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 '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ --machine borzoi,usb=3Doff,dump-guest-core=3Doff \ +-machine collie,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml= b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml index 9bf4af4f7433..e3f04fbbff4a 100644 --- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.aarch64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/aarch64-nousb-minimal.xml b/tests/qemuxm= lconfdata/aarch64-nousb-minimal.xml index 64cd74e36574..6505122cb8d5 100644 --- a/tests/qemuxmlconfdata/aarch64-nousb-minimal.xml +++ b/tests/qemuxmlconfdata/aarch64-nousb-minimal.xml @@ -5,7 +5,7 @@ 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aa= rch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-fallback-n= ousb.aarch64-latest.args index 6cfa04a0f49e..2644394f977f 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-l= atest.args +++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-l= atest.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 '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ --machine borzoi,usb=3Doff,dump-guest-core=3Doff \ +-machine collie,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aa= rch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-fallback-no= usb.aarch64-latest.xml index 2f71d294a7a6..a01dd15168c2 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-l= atest.xml +++ b/tests/qemuxmlconfdata/usb-controller-default-fallback-nousb.aarch64-l= atest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-lat= est.args b/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-lates= t.args index 6cfa04a0f49e..2644394f977f 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.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 '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ --machine borzoi,usb=3Doff,dump-guest-core=3Doff \ +-machine collie,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-lat= est.xml b/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest= .xml index 2f71d294a7a6..a01dd15168c2 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.xml +++ b/tests/qemuxmlconfdata/usb-controller-default-nousb.aarch64-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/usb-controller-default-nousb.xml b/tests= /qemuxmlconfdata/usb-controller-default-nousb.xml index c8bd07ad5d0c..83a405800fbe 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-nousb.xml +++ b/tests/qemuxmlconfdata/usb-controller-default-nousb.xml @@ -5,7 +5,7 @@ 1 - hvm + hvm diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb= .aarch64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-unavail= able-nousb.aarch64-latest.args index 6cfa04a0f49e..2644394f977f 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch6= 4-latest.args +++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch6= 4-latest.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 '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ --machine borzoi,usb=3Doff,dump-guest-core=3Doff \ +-machine collie,usb=3Doff,dump-guest-core=3Doff \ -accel kvm \ -cpu host \ -m size=3D1048576k \ diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb= .aarch64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-unavaila= ble-nousb.aarch64-latest.xml index 2f71d294a7a6..a01dd15168c2 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch6= 4-latest.xml +++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-nousb.aarch6= 4-latest.xml @@ -5,7 +5,7 @@ 1048576 1 - hvm + hvm diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index be2fba9e4dd2..1f31ec810c7a 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -1764,7 +1764,7 @@ mymain(void) * - firmware-manual-efi-acpi-aarch64 * - firmware-auto-efi-loongarch64 * - * - negative case for aarch64 with 'borzoi' machine not supporting A= CPI + * - negative case for aarch64 with 'collie' machine not supporting A= CPI * * - s390x has hack to strip ACPI to preserve migration of old config= s, * but should produce error when ABI_UPDATE is requested --=20 2.46.0