From nobody Sat Feb 7 10:08:10 2026 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=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1663605620; cv=none; d=zohomail.com; s=zohoarc; b=ZIe+6LZqGvb53p+xpVcC6139aJPHY4DpPKAf2tiKEYxihMl71COskUdVTD+qN7MrIh57KUs49JViyFuFOipfSvx5O8SuytF6cePRe2Km8PbWteUuOEnw2h7/pCcY23D+IvlSMXlx67LFMKramXbhHPkHUURBzTaXUo6BtT0Llrg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663605620; h=Content-Type:Content-Transfer-Encoding:Cc: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=auXmEr5EyUFYs8qIm/p68fCTTp65eqtGC/JOZEpfHVo=; b=OjumO6fq9Xd6CPV/jNbVlOkf3xbjw5uRqFYOeXaqCm3YcKudpHOQhyg6MMfaWhCIRiEsgGCap5boZ0LOb6UejKPGFSrQrJn57U9etg6VcE5rUa56/WwgfdCXPGzWpLEV9Fiw+76hojGCvUz5pLXaxJWfrXBQhEhKMArkxTrRbLY= 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=fail 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 166360562057223.565192065096085; Mon, 19 Sep 2022 09:40:20 -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-475-TByd2jh5PSSBX7iWXw6Owg-1; Mon, 19 Sep 2022 12:40:15 -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 14C6C1C1BD26; Mon, 19 Sep 2022 16:40:12 +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 E8D7A492B15; Mon, 19 Sep 2022 16:40:11 +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 B6B751946A42; Mon, 19 Sep 2022 16:40:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 615C919465A2 for ; Mon, 19 Sep 2022 16:40:10 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 45B2A40C206B; Mon, 19 Sep 2022 16:40:10 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3D71140C2066 for ; Mon, 19 Sep 2022 16:40:10 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 13260101A528 for ; Mon, 19 Sep 2022 16:40:10 +0000 (UTC) Received: from mail-oa1-f42.google.com (mail-oa1-f42.google.com [209.85.160.42]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-583-WPAMAfcqMiKP8niMaDlYZw-1; Mon, 19 Sep 2022 12:40:08 -0400 Received: by mail-oa1-f42.google.com with SMTP id 586e51a60fabf-1274ec87ad5so294904fac.0 for ; Mon, 19 Sep 2022 09:40:08 -0700 (PDT) Received: from balboa.COMFAST ([191.193.2.69]) by smtp.gmail.com with ESMTPSA id z20-20020a056871015400b0012784cb563dsm8544889oab.22.2022.09.19.09.40.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Sep 2022 09:40:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663605619; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=auXmEr5EyUFYs8qIm/p68fCTTp65eqtGC/JOZEpfHVo=; b=CemrJH0XYWaKfN0MPlnRX8V0cXS48ZjgctbQejx+k988sRuXUKKc+7T546TwFuEho99Bst GGRZnfgJ+cfOkGSr3E12hC8GEmbtU8Cpl4yLuLe8Vzicv4qoUcz8II7/ce01KVFLLObLae JzNgwA3HucKhKWgLSH5zH5cf36Td3k8= X-MC-Unique: TByd2jh5PSSBX7iWXw6Owg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: WPAMAfcqMiKP8niMaDlYZw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=auXmEr5EyUFYs8qIm/p68fCTTp65eqtGC/JOZEpfHVo=; b=vpIO8//1fwDUg1s2pTF9c+pNDOWjJK7VcvpCWR3zgsthhZLm6zbwkIi2u3N+vKhqGE 92+IsUxcmf5vS0nXUjx1rry5qUlY57s1P7VMcJvWM2zfJm93hfFjYwowZJVGYEzE9gE9 njscKXYBk3seUXbeBamqDLuWeFqA5BYR5irASUzP6s/4wVZlB7UefxdTcz15cFHFt0C0 xZ35N9ZBNIubRa/WzlTOf0R42pfVwCD8S0obXlfsmHHvMEicZZymChITE11xMomnQsuK e3wgHbn4apIzWbmstTELguyGJ46qURtyXSyjSj7+x5KJ92E3PMY6Ije9YlXPUn+dQZOJ jq0g== X-Gm-Message-State: ACgBeo2eUAYUhCv684v6V/Vosa0Uf8VAkTCGGbIHtCAAKuR1xEKlme5P 0d3fxsm9y0x/G6l1xSbAKWEcMHwNmUY= X-Google-Smtp-Source: AA6agR6Jz/Kume0PEG4Zib+1uVbwyhzSLhpMPqolpK3NLn8elOrMz/FXWtddpFVg9/Kt4K0SeecUDA== X-Received: by 2002:a05:6870:15d3:b0:122:5c72:f21f with SMTP id k19-20020a05687015d300b001225c72f21fmr15972910oad.178.1663605605633; Mon, 19 Sep 2022 09:40:05 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH 2/3] tests: change qemuxml2argv pseries tests to TEST_CAPS_LATEST Date: Mon, 19 Sep 2022 13:39:48 -0300 Message-Id: <20220919163949.19768-3-danielhb413@gmail.com> In-Reply-To: <20220919163949.19768-1-danielhb413@gmail.com> References: <20220919163949.19768-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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: , Cc: danielhb413@gmail.com 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: 1663605620925100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Eliminate most of the pseries tests that are using explicit qemu caps instead of CAPS_LATEST. The remaining tests will be handled in the next patch. The changes made are trivial: rename the .args/.err files to ppc64-latest.(args/err) and do the required changes to match the newest capabilities. A notable expection were tests pseries-console-native, pseries-serial-compat and pseries-serial+console-native. These are aliases of the pseries-serial-native tests. In this case we needed to re-create the symlink accordingly. Signed-off-by: Daniel Henrique Barboza --- ...s.args =3D> pseries-basic.ppc64-latest.args} | 11 +- .../pseries-console-native.args | 1 - .../pseries-console-native.ppc64-latest.args | 1 + ... pseries-console-virtio.ppc64-latest.args} | 11 +- ...s =3D> pseries-cpu-compat.ppc64-latest.args} | 10 +- ...gs =3D> pseries-cpu-exact.ppc64-latest.args} | 10 +- ....args =3D> pseries-cpu-le.ppc64-latest.args} | 11 +- ...es-default-phb-numa-node.ppc64-latest.err} | 0 ...rgs =3D> pseries-features.ppc64-latest.args} | 7 +- .../pseries-hostdevs-1.ppc64-latest.args | 36 +++++ .../pseries-hostdevs-2.ppc64-latest.args | 36 +++++ .../qemuxml2argvdata/pseries-hostdevs-3.args | 32 ---- .../pseries-hostdevs-3.ppc64-latest.args | 35 +++++ .../pseries-many-buses-1.args | 30 ---- ...=3D> pseries-many-buses-1.ppc64-latest.args} | 14 +- .../pseries-many-buses-2.args | 30 ---- ...=3D> pseries-many-buses-2.ppc64-latest.args} | 14 +- .../pseries-many-devices.args | 61 -------- .../pseries-many-devices.ppc64-latest.args | 64 ++++++++ ...m.args =3D> pseries-nvram.ppc64-latest.args} | 9 +- ...=3D> pseries-panic-address.ppc64-latest.err} | 0 .../pseries-panic-missing.ppc64-latest.args | 34 +++++ ...pseries-panic-no-address.ppc64-latest.args | 34 +++++ .../pseries-phb-default-missing.args | 30 ---- ...ies-phb-default-missing.ppc64-latest.args} | 12 +- ...> pseries-phb-numa-node.ppc64-latest.args} | 16 +- .../qemuxml2argvdata/pseries-phb-simple.args | 30 ---- ...s =3D> pseries-phb-simple.ppc64-latest.args} | 12 +- .../pseries-serial+console-native.args | 1 - ...es-serial+console-native.ppc64-latest.args | 1 + .../pseries-serial-compat.args | 1 - .../pseries-serial-compat.ppc64-latest.args | 1 + ...> pseries-serial-native.ppc64-latest.args} | 9 +- ...s =3D> pseries-serial-pci.ppc64-latest.args} | 9 +- ...s =3D> pseries-serial-usb.ppc64-latest.args} | 11 +- .../qemuxml2argvdata/pseries-usb-default.args | 31 ---- .../pseries-usb-default.ppc64-latest.args | 34 +++++ tests/qemuxml2argvdata/pseries-usb-kbd.args | 32 ---- .../pseries-usb-kbd.ppc64-latest.args | 35 +++++ tests/qemuxml2argvdata/pseries-usb-multi.args | 32 ---- .../pseries-usb-multi.ppc64-latest.args | 35 +++++ ...eries-vio-user-assigned.ppc64-latest.args} | 19 ++- ...ned.args =3D> pseries-vio.ppc64-latest.args} | 19 ++- tests/qemuxml2argvtest.c | 144 +++++------------- 44 files changed, 502 insertions(+), 503 deletions(-) rename tests/qemuxml2argvdata/{pseries-panic-no-address.args =3D> pseries-= basic.ppc64-latest.args} (58%) delete mode 120000 tests/qemuxml2argvdata/pseries-console-native.args create mode 120000 tests/qemuxml2argvdata/pseries-console-native.ppc64-lat= est.args rename tests/qemuxml2argvdata/{pseries-console-virtio.args =3D> pseries-co= nsole-virtio.ppc64-latest.args} (57%) rename tests/qemuxml2argvdata/{pseries-cpu-compat.args =3D> pseries-cpu-co= mpat.ppc64-latest.args} (58%) rename tests/qemuxml2argvdata/{pseries-cpu-exact.args =3D> pseries-cpu-exa= ct.ppc64-latest.args} (59%) rename tests/qemuxml2argvdata/{pseries-cpu-le.args =3D> pseries-cpu-le.ppc= 64-latest.args} (58%) rename tests/qemuxml2argvdata/{pseries-default-phb-numa-node.err =3D> pser= ies-default-phb-numa-node.ppc64-latest.err} (100%) rename tests/qemuxml2argvdata/{pseries-features.args =3D> pseries-features= .ppc64-latest.args} (68%) create mode 100644 tests/qemuxml2argvdata/pseries-hostdevs-1.ppc64-latest.= args create mode 100644 tests/qemuxml2argvdata/pseries-hostdevs-2.ppc64-latest.= args delete mode 100644 tests/qemuxml2argvdata/pseries-hostdevs-3.args create mode 100644 tests/qemuxml2argvdata/pseries-hostdevs-3.ppc64-latest.= args delete mode 100644 tests/qemuxml2argvdata/pseries-many-buses-1.args rename tests/qemuxml2argvdata/{pseries-hostdevs-2.args =3D> pseries-many-b= uses-1.ppc64-latest.args} (57%) delete mode 100644 tests/qemuxml2argvdata/pseries-many-buses-2.args rename tests/qemuxml2argvdata/{pseries-hostdevs-1.args =3D> pseries-many-b= uses-2.ppc64-latest.args} (58%) delete mode 100644 tests/qemuxml2argvdata/pseries-many-devices.args create mode 100644 tests/qemuxml2argvdata/pseries-many-devices.ppc64-lates= t.args rename tests/qemuxml2argvdata/{pseries-nvram.args =3D> pseries-nvram.ppc64= -latest.args} (63%) rename tests/qemuxml2argvdata/{pseries-panic-address.err =3D> pseries-pani= c-address.ppc64-latest.err} (100%) create mode 100644 tests/qemuxml2argvdata/pseries-panic-missing.ppc64-late= st.args create mode 100644 tests/qemuxml2argvdata/pseries-panic-no-address.ppc64-l= atest.args delete mode 100644 tests/qemuxml2argvdata/pseries-phb-default-missing.args rename tests/qemuxml2argvdata/{pseries-basic.args =3D> pseries-phb-default= -missing.ppc64-latest.args} (58%) rename tests/qemuxml2argvdata/{pseries-phb-numa-node.args =3D> pseries-phb= -numa-node.ppc64-latest.args} (53%) delete mode 100644 tests/qemuxml2argvdata/pseries-phb-simple.args rename tests/qemuxml2argvdata/{pseries-panic-missing.args =3D> pseries-phb= -simple.ppc64-latest.args} (58%) delete mode 120000 tests/qemuxml2argvdata/pseries-serial+console-native.ar= gs create mode 120000 tests/qemuxml2argvdata/pseries-serial+console-native.pp= c64-latest.args delete mode 120000 tests/qemuxml2argvdata/pseries-serial-compat.args create mode 120000 tests/qemuxml2argvdata/pseries-serial-compat.ppc64-late= st.args rename tests/qemuxml2argvdata/{pseries-serial-native.args =3D> pseries-ser= ial-native.ppc64-latest.args} (61%) rename tests/qemuxml2argvdata/{pseries-serial-pci.args =3D> pseries-serial= -pci.ppc64-latest.args} (60%) rename tests/qemuxml2argvdata/{pseries-serial-usb.args =3D> pseries-serial= -usb.ppc64-latest.args} (57%) delete mode 100644 tests/qemuxml2argvdata/pseries-usb-default.args create mode 100644 tests/qemuxml2argvdata/pseries-usb-default.ppc64-latest= .args delete mode 100644 tests/qemuxml2argvdata/pseries-usb-kbd.args create mode 100644 tests/qemuxml2argvdata/pseries-usb-kbd.ppc64-latest.args delete mode 100644 tests/qemuxml2argvdata/pseries-usb-multi.args create mode 100644 tests/qemuxml2argvdata/pseries-usb-multi.ppc64-latest.a= rgs rename tests/qemuxml2argvdata/{pseries-vio.args =3D> pseries-vio-user-assi= gned.ppc64-latest.args} (52%) rename tests/qemuxml2argvdata/{pseries-vio-user-assigned.args =3D> pseries= -vio.ppc64-latest.args} (52%) diff --git a/tests/qemuxml2argvdata/pseries-panic-no-address.args b/tests/q= emuxml2argvdata/pseries-basic.ppc64-latest.args similarity index 58% rename from tests/qemuxml2argvdata/pseries-panic-no-address.args rename to tests/qemuxml2argvdata/pseries-basic.ppc64-latest.args index 67f927a1fa..6960c88a25 100644 --- a/tests/qemuxml2argvdata/pseries-panic-no-address.args +++ b/tests/qemuxml2argvdata/pseries-basic.ppc64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-ppc64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pseries,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ +-cpu POWER9 \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -24,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --usb \ +-device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ +-device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-console-native.args b/tests/qem= uxml2argvdata/pseries-console-native.args deleted file mode 120000 index 1c09cf2102..0000000000 --- a/tests/qemuxml2argvdata/pseries-console-native.args +++ /dev/null @@ -1 +0,0 @@ -pseries-serial-native.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/pseries-console-native.ppc64-latest.arg= s b/tests/qemuxml2argvdata/pseries-console-native.ppc64-latest.args new file mode 120000 index 0000000000..c3b96bc117 --- /dev/null +++ b/tests/qemuxml2argvdata/pseries-console-native.ppc64-latest.args @@ -0,0 +1 @@ +pseries-serial-native.ppc64-latest.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/pseries-console-virtio.args b/tests/qem= uxml2argvdata/pseries-console-virtio.ppc64-latest.args similarity index 57% rename from tests/qemuxml2argvdata/pseries-console-virtio.args rename to tests/qemuxml2argvdata/pseries-console-virtio.ppc64-latest.args index 2e9d1bd831..83fe2990b3 100644 --- a/tests/qemuxml2argvdata/pseries-console-virtio.args +++ b/tests/qemuxml2argvdata/pseries-console-virtio.ppc64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-ppc64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ --machine pseries,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ +-cpu POWER9 \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -24,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x1 \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x1"}' \ -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/pseries-cpu-compat.args b/tests/qemuxml= 2argvdata/pseries-cpu-compat.ppc64-latest.args similarity index 58% rename from tests/qemuxml2argvdata/pseries-cpu-compat.args rename to tests/qemuxml2argvdata/pseries-cpu-compat.ppc64-latest.args index 5e35726566..58533c751f 100644 --- a/tests/qemuxml2argvdata/pseries-cpu-compat.args +++ b/tests/qemuxml2argvdata/pseries-cpu-compat.ppc64-latest.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-ppc64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pseries,usb=3Doff,dump-guest-core=3Doff,max-cpu-compat=3Dpower7 \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram,max-cpu-compat=3Dpower7 \ -accel kvm \ -cpu host \ -m 256 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":2684= 35456}' \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -25,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --usb \ +-device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ +-device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-cpu-exact.args b/tests/qemuxml2= argvdata/pseries-cpu-exact.ppc64-latest.args similarity index 59% rename from tests/qemuxml2argvdata/pseries-cpu-exact.args rename to tests/qemuxml2argvdata/pseries-cpu-exact.ppc64-latest.args index 6059c5a31c..4f6cf05658 100644 --- a/tests/qemuxml2argvdata/pseries-cpu-exact.args +++ b/tests/qemuxml2argvdata/pseries-cpu-exact.ppc64-latest.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-ppc64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pseries,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ -cpu POWER7 \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -25,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --usb \ +-device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ +-device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-cpu-le.args b/tests/qemuxml2arg= vdata/pseries-cpu-le.ppc64-latest.args similarity index 58% rename from tests/qemuxml2argvdata/pseries-cpu-le.args rename to tests/qemuxml2argvdata/pseries-cpu-le.ppc64-latest.args index 667264ac82..d28f7392ce 100644 --- a/tests/qemuxml2argvdata/pseries-cpu-le.args +++ b/tests/qemuxml2argvdata/pseries-cpu-le.ppc64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-ppc64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pseries,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel kvm \ +-cpu POWER9 \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -24,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --usb \ +-device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ +-device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-default-phb-numa-node.err b/tes= ts/qemuxml2argvdata/pseries-default-phb-numa-node.ppc64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pseries-default-phb-numa-node.err rename to tests/qemuxml2argvdata/pseries-default-phb-numa-node.ppc64-latest= .err diff --git a/tests/qemuxml2argvdata/pseries-features.args b/tests/qemuxml2a= rgvdata/pseries-features.ppc64-latest.args similarity index 68% rename from tests/qemuxml2argvdata/pseries-features.args rename to tests/qemuxml2argvdata/pseries-features.ppc64-latest.args index 427feaa808..ee6473410a 100644 --- a/tests/qemuxml2argvdata/pseries-features.args +++ b/tests/qemuxml2argvdata/pseries-features.ppc64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-ppc64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ --machine pseries,usb=3Doff,resize-hpt=3Drequired,cap-hpt-max-page-size=3D1= 048576k,cap-htm=3Don,cap-nested-hv=3Doff,cap-ccf-assist=3Don,cap-cfpc=3Dfix= ed,cap-sbbc=3Dbroken,cap-ibs=3Dfixed-ccd,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-machine pseries,usb=3Doff,resize-hpt=3Drequired,cap-hpt-max-page-size=3D1= 048576k,cap-htm=3Don,cap-nested-hv=3Doff,cap-ccf-assist=3Don,cap-cfpc=3Dfix= ed,cap-sbbc=3Dbroken,cap-ibs=3Dfixed-ccd,dump-guest-core=3Doff,memory-backe= nd=3Dppc_spapr.ram \ -accel tcg \ +-cpu POWER9 \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -25,4 +27,5 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -no-shutdown \ -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/pseries-hostdevs-1.ppc64-latest.args b/= tests/qemuxml2argvdata/pseries-hostdevs-1.ppc64-latest.args new file mode 100644 index 0000000000..810379f1b9 --- /dev/null +++ b/tests/qemuxml2argvdata/pseries-hostdevs-1.ppc64-latest.args @@ -0,0 +1,36 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ +/usr/bin/qemu-system-ppc64 \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ +-accel tcg \ +-cpu POWER9 \ +-m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.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 \ +-boot strict=3Don \ +-device '{"driver":"spapr-pci-host-bridge","index":1,"id":"pci.1"}' \ +-device '{"driver":"spapr-pci-host-bridge","index":2,"id":"pci.2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"vfio-pci","host":"0005:90:01.0","id":"hostdev0","bus":= "pci.1.0","addr":"0x1"}' \ +-device '{"driver":"vfio-pci","host":"0001:01:00.0","id":"hostdev1","bus":= "pci.2.0","addr":"0x1"}' \ +-device '{"driver":"vfio-pci","host":"0001:01:00.1","id":"hostdev2","bus":= "pci.2.0","addr":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-2.ppc64-latest.args b/= tests/qemuxml2argvdata/pseries-hostdevs-2.ppc64-latest.args new file mode 100644 index 0000000000..bd5ffe5c54 --- /dev/null +++ b/tests/qemuxml2argvdata/pseries-hostdevs-2.ppc64-latest.args @@ -0,0 +1,36 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ +/usr/bin/qemu-system-ppc64 \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ +-accel tcg \ +-cpu POWER9 \ +-m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.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 \ +-boot strict=3Don \ +-device '{"driver":"spapr-pci-host-bridge","index":1,"id":"pci.1"}' \ +-device '{"driver":"spapr-pci-host-bridge","index":2,"id":"pci.2"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.1.0","addr":"= 0x1"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"vfio-pci","host":"0001:01:00.0","id":"hostdev0","bus":= "pci.1.0","addr":"0x2"}' \ +-device '{"driver":"vfio-pci","host":"0005:90:01.0","id":"hostdev1","bus":= "pci.2.0","addr":"0x1"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-3.args b/tests/qemuxml= 2argvdata/pseries-hostdevs-3.args deleted file mode 100644 index c236d0b38f..0000000000 --- a/tests/qemuxml2argvdata/pseries-hostdevs-3.args +++ /dev/null @@ -1,32 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-guest \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -/usr/bin/qemu-system-ppc64 \ --name guest=3Dguest,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ --machine pseries,usb=3Doff,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 \ --boot strict=3Don \ --device spapr-pci-host-bridge,index=3D1,id=3Dpci.1 \ --device spapr-pci-host-bridge,index=3D2,id=3Dpci.2 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device vfio-pci,host=3D0001:01:00.0,id=3Dhostdev0,bus=3Dpci.2.0,addr=3D0x= 1 \ --device vfio-pci,host=3D0001:01:00.1,id=3Dhostdev1,bus=3Dpci.2.0,addr=3D0x= 2 \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-3.ppc64-latest.args b/= tests/qemuxml2argvdata/pseries-hostdevs-3.ppc64-latest.args new file mode 100644 index 0000000000..dcc09f1435 --- /dev/null +++ b/tests/qemuxml2argvdata/pseries-hostdevs-3.ppc64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ +/usr/bin/qemu-system-ppc64 \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ +-accel tcg \ +-cpu POWER9 \ +-m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.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 \ +-boot strict=3Don \ +-device '{"driver":"spapr-pci-host-bridge","index":1,"id":"pci.1"}' \ +-device '{"driver":"spapr-pci-host-bridge","index":2,"id":"pci.2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"vfio-pci","host":"0001:01:00.0","id":"hostdev0","bus":= "pci.2.0","addr":"0x1"}' \ +-device '{"driver":"vfio-pci","host":"0001:01:00.1","id":"hostdev1","bus":= "pci.2.0","addr":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-many-buses-1.args b/tests/qemux= ml2argvdata/pseries-many-buses-1.args deleted file mode 100644 index bbb7c90707..0000000000 --- a/tests/qemuxml2argvdata/pseries-many-buses-1.args +++ /dev/null @@ -1,30 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-guest \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -/usr/bin/qemu-system-ppc64 \ --name guest=3Dguest,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ --machine pseries,usb=3Doff,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 \ --boot strict=3Don \ --device spapr-pci-host-bridge,index=3D1,id=3Dpci.1 \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.1.0,addr=3D0x1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-2.args b/tests/qemuxml= 2argvdata/pseries-many-buses-1.ppc64-latest.args similarity index 57% rename from tests/qemuxml2argvdata/pseries-hostdevs-2.args rename to tests/qemuxml2argvdata/pseries-many-buses-1.ppc64-latest.args index fca68ff76a..e9ef6944fd 100644 --- a/tests/qemuxml2argvdata/pseries-hostdevs-2.args +++ b/tests/qemuxml2argvdata/pseries-many-buses-1.ppc64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-ppc64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ --machine pseries,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ +-cpu POWER9 \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -24,10 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device spapr-pci-host-bridge,index=3D1,id=3Dpci.1 \ --device spapr-pci-host-bridge,index=3D2,id=3Dpci.2 \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.1.0,addr=3D0x1 \ +-device '{"driver":"spapr-pci-host-bridge","index":1,"id":"pci.1"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.1.0","addr":"= 0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device vfio-pci,host=3D0001:01:00.0,id=3Dhostdev0,bus=3Dpci.1.0,addr=3D0x= 2 \ --device vfio-pci,host=3D0005:90:01.0,id=3Dhostdev1,bus=3Dpci.2.0,addr=3D0x= 1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-many-buses-2.args b/tests/qemux= ml2argvdata/pseries-many-buses-2.args deleted file mode 100644 index 961c62971c..0000000000 --- a/tests/qemuxml2argvdata/pseries-many-buses-2.args +++ /dev/null @@ -1,30 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-guest \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -/usr/bin/qemu-system-ppc64 \ --name guest=3Dguest,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ --machine pseries,usb=3Doff,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 \ --boot strict=3Don \ --device spapr-pci-host-bridge,index=3D1,id=3Dpci.2 \ --device spapr-pci-host-bridge,index=3D2,id=3Dpci.1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-1.args b/tests/qemuxml= 2argvdata/pseries-many-buses-2.ppc64-latest.args similarity index 58% rename from tests/qemuxml2argvdata/pseries-hostdevs-1.args rename to tests/qemuxml2argvdata/pseries-many-buses-2.ppc64-latest.args index 3339187420..824abb3688 100644 --- a/tests/qemuxml2argvdata/pseries-hostdevs-1.args +++ b/tests/qemuxml2argvdata/pseries-many-buses-2.ppc64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-ppc64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ --machine pseries,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ +-cpu POWER9 \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -24,10 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device spapr-pci-host-bridge,index=3D1,id=3Dpci.1 \ --device spapr-pci-host-bridge,index=3D2,id=3Dpci.2 \ +-device '{"driver":"spapr-pci-host-bridge","index":1,"id":"pci.2"}' \ +-device '{"driver":"spapr-pci-host-bridge","index":2,"id":"pci.1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device vfio-pci,host=3D0005:90:01.0,id=3Dhostdev0,bus=3Dpci.1.0,addr=3D0x= 1 \ --device vfio-pci,host=3D0001:01:00.0,id=3Dhostdev1,bus=3Dpci.2.0,addr=3D0x= 1 \ --device vfio-pci,host=3D0001:01:00.1,id=3Dhostdev2,bus=3Dpci.2.0,addr=3D0x= 2 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-many-devices.args b/tests/qemux= ml2argvdata/pseries-many-devices.args deleted file mode 100644 index a108e44136..0000000000 --- a/tests/qemuxml2argvdata/pseries-many-devices.args +++ /dev/null @@ -1,61 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-guest \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -/usr/bin/qemu-system-ppc64 \ --name guest=3Dguest,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ --machine pseries,usb=3Doff,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 \ --boot strict=3Don \ --device spapr-pci-host-bridge,index=3D1,id=3Dpci.1 \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x1 \ --device virtio-scsi-pci,id=3Dscsi1,bus=3Dpci.0,addr=3D0x2 \ --device virtio-scsi-pci,id=3Dscsi2,bus=3Dpci.0,addr=3D0x3 \ --device virtio-scsi-pci,id=3Dscsi3,bus=3Dpci.0,addr=3D0x4 \ --device virtio-scsi-pci,id=3Dscsi4,bus=3Dpci.0,addr=3D0x5 \ --device virtio-scsi-pci,id=3Dscsi5,bus=3Dpci.0,addr=3D0x6 \ --device virtio-scsi-pci,id=3Dscsi6,bus=3Dpci.0,addr=3D0x7 \ --device virtio-scsi-pci,id=3Dscsi7,bus=3Dpci.0,addr=3D0x8 \ --device virtio-scsi-pci,id=3Dscsi8,bus=3Dpci.0,addr=3D0x9 \ --device virtio-scsi-pci,id=3Dscsi9,bus=3Dpci.0,addr=3D0xa \ --device virtio-scsi-pci,id=3Dscsi10,bus=3Dpci.0,addr=3D0xb \ --device virtio-scsi-pci,id=3Dscsi11,bus=3Dpci.0,addr=3D0xc \ --device virtio-scsi-pci,id=3Dscsi12,bus=3Dpci.0,addr=3D0xd \ --device virtio-scsi-pci,id=3Dscsi13,bus=3Dpci.0,addr=3D0xe \ --device virtio-scsi-pci,id=3Dscsi14,bus=3Dpci.0,addr=3D0xf \ --device virtio-scsi-pci,id=3Dscsi15,bus=3Dpci.0,addr=3D0x10 \ --device virtio-scsi-pci,id=3Dscsi16,bus=3Dpci.0,addr=3D0x11 \ --device virtio-scsi-pci,id=3Dscsi17,bus=3Dpci.0,addr=3D0x12 \ --device virtio-scsi-pci,id=3Dscsi18,bus=3Dpci.0,addr=3D0x13 \ --device virtio-scsi-pci,id=3Dscsi19,bus=3Dpci.0,addr=3D0x14 \ --device virtio-scsi-pci,id=3Dscsi20,bus=3Dpci.0,addr=3D0x15 \ --device virtio-scsi-pci,id=3Dscsi21,bus=3Dpci.0,addr=3D0x16 \ --device virtio-scsi-pci,id=3Dscsi22,bus=3Dpci.0,addr=3D0x17 \ --device virtio-scsi-pci,id=3Dscsi23,bus=3Dpci.0,addr=3D0x18 \ --device virtio-scsi-pci,id=3Dscsi24,bus=3Dpci.0,addr=3D0x19 \ --device virtio-scsi-pci,id=3Dscsi25,bus=3Dpci.0,addr=3D0x1a \ --device virtio-scsi-pci,id=3Dscsi26,bus=3Dpci.0,addr=3D0x1b \ --device virtio-scsi-pci,id=3Dscsi27,bus=3Dpci.0,addr=3D0x1c \ --device virtio-scsi-pci,id=3Dscsi28,bus=3Dpci.0,addr=3D0x1d \ --device virtio-scsi-pci,id=3Dscsi29,bus=3Dpci.0,addr=3D0x1e \ --device virtio-scsi-pci,id=3Dscsi30,bus=3Dpci.0,addr=3D0x1f \ --device virtio-scsi-pci,id=3Dscsi31,bus=3Dpci.1.0,addr=3D0x1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-many-devices.ppc64-latest.args = b/tests/qemuxml2argvdata/pseries-many-devices.ppc64-latest.args new file mode 100644 index 0000000000..584e39529f --- /dev/null +++ b/tests/qemuxml2argvdata/pseries-many-devices.ppc64-latest.args @@ -0,0 +1,64 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ +/usr/bin/qemu-system-ppc64 \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ +-accel tcg \ +-cpu POWER9 \ +-m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.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 \ +-boot strict=3Don \ +-device '{"driver":"spapr-pci-host-bridge","index":1,"id":"pci.1"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 1"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi1","bus":"pci.0","addr":"0x= 2"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi2","bus":"pci.0","addr":"0x= 3"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi3","bus":"pci.0","addr":"0x= 4"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi4","bus":"pci.0","addr":"0x= 5"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi5","bus":"pci.0","addr":"0x= 6"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi6","bus":"pci.0","addr":"0x= 7"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi7","bus":"pci.0","addr":"0x= 8"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi8","bus":"pci.0","addr":"0x= 9"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi9","bus":"pci.0","addr":"0x= a"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi10","bus":"pci.0","addr":"0= xb"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi11","bus":"pci.0","addr":"0= xc"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi12","bus":"pci.0","addr":"0= xd"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi13","bus":"pci.0","addr":"0= xe"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi14","bus":"pci.0","addr":"0= xf"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi15","bus":"pci.0","addr":"0= x10"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi16","bus":"pci.0","addr":"0= x11"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi17","bus":"pci.0","addr":"0= x12"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi18","bus":"pci.0","addr":"0= x13"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi19","bus":"pci.0","addr":"0= x14"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi20","bus":"pci.0","addr":"0= x15"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi21","bus":"pci.0","addr":"0= x16"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi22","bus":"pci.0","addr":"0= x17"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi23","bus":"pci.0","addr":"0= x18"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi24","bus":"pci.0","addr":"0= x19"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi25","bus":"pci.0","addr":"0= x1a"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi26","bus":"pci.0","addr":"0= x1b"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi27","bus":"pci.0","addr":"0= x1c"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi28","bus":"pci.0","addr":"0= x1d"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi29","bus":"pci.0","addr":"0= x1e"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi30","bus":"pci.0","addr":"0= x1f"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi31","bus":"pci.1.0","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/pseries-nvram.args b/tests/qemuxml2argv= data/pseries-nvram.ppc64-latest.args similarity index 63% rename from tests/qemuxml2argvdata/pseries-nvram.args rename to tests/qemuxml2argvdata/pseries-nvram.ppc64-latest.args index f411777dc5..06e984c83e 100644 --- a/tests/qemuxml2argvdata/pseries-nvram.args +++ b/tests/qemuxml2argvdata/pseries-nvram.ppc64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-ppc64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pseries,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ +-cpu POWER9 \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -24,7 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --usb \ +-device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -global spapr-nvram.reg=3D0x4000 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-panic-address.err b/tests/qemux= ml2argvdata/pseries-panic-address.ppc64-latest.err similarity index 100% rename from tests/qemuxml2argvdata/pseries-panic-address.err rename to tests/qemuxml2argvdata/pseries-panic-address.ppc64-latest.err diff --git a/tests/qemuxml2argvdata/pseries-panic-missing.ppc64-latest.args= b/tests/qemuxml2argvdata/pseries-panic-missing.ppc64-latest.args new file mode 100644 index 0000000000..6960c88a25 --- /dev/null +++ b/tests/qemuxml2argvdata/pseries-panic-missing.ppc64-latest.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-ppc64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ +-accel tcg \ +-cpu POWER9 \ +-m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.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 \ +-boot strict=3Don \ +-device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ +-chardev pty,id=3Dcharserial0 \ +-device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-panic-no-address.ppc64-latest.a= rgs b/tests/qemuxml2argvdata/pseries-panic-no-address.ppc64-latest.args new file mode 100644 index 0000000000..6960c88a25 --- /dev/null +++ b/tests/qemuxml2argvdata/pseries-panic-no-address.ppc64-latest.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-ppc64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ +-accel tcg \ +-cpu POWER9 \ +-m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.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 \ +-boot strict=3Don \ +-device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ +-chardev pty,id=3Dcharserial0 \ +-device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-phb-default-missing.args b/test= s/qemuxml2argvdata/pseries-phb-default-missing.args deleted file mode 100644 index 6891512a31..0000000000 --- a/tests/qemuxml2argvdata/pseries-phb-default-missing.args +++ /dev/null @@ -1,30 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-ppc64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pseries,usb=3Doff,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 \ --boot strict=3Don \ --device spapr-pci-host-bridge,index=3D1,id=3Dpci.1 \ --device spapr-pci-host-bridge,index=3D2,id=3Dpci.2 \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-basic.args b/tests/qemuxml2argv= data/pseries-phb-default-missing.ppc64-latest.args similarity index 58% rename from tests/qemuxml2argvdata/pseries-basic.args rename to tests/qemuxml2argvdata/pseries-phb-default-missing.ppc64-latest.a= rgs index 67f927a1fa..df93a3b79c 100644 --- a/tests/qemuxml2argvdata/pseries-basic.args +++ b/tests/qemuxml2argvdata/pseries-phb-default-missing.ppc64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-ppc64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pseries,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ +-cpu POWER9 \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -24,8 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --usb \ --chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ +-device '{"driver":"spapr-pci-host-bridge","index":1,"id":"pci.1"}' \ +-device '{"driver":"spapr-pci-host-bridge","index":2,"id":"pci.2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-phb-numa-node.args b/tests/qemu= xml2argvdata/pseries-phb-numa-node.ppc64-latest.args similarity index 53% rename from tests/qemuxml2argvdata/pseries-phb-numa-node.args rename to tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args index 62d38ce2b6..c373f992ff 100644 --- a/tests/qemuxml2argvdata/pseries-phb-numa-node.args +++ b/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args @@ -9,15 +9,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-ppc64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ -machine pseries,usb=3Doff,dump-guest-core=3Doff \ -accel tcg \ +-cpu POWER9 \ -m 2048 \ -overcommit mem-lock=3Doff \ --smp 8,sockets=3D2,cores=3D1,threads=3D4 \ --object memory-backend-ram,id=3Dram-node0,size=3D1073741824,host-nodes=3D1= ,policy=3Dbind \ +-smp 8,sockets=3D2,dies=3D1,cores=3D1,threads=3D4 \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":10737418= 24,"host-nodes":[1],"policy":"bind"}' \ -numa node,nodeid=3D0,cpus=3D0-3,memdev=3Dram-node0 \ --object memory-backend-ram,id=3Dram-node1,size=3D1073741824,host-nodes=3D2= ,policy=3Dbind \ +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":10737418= 24,"host-nodes":[2],"policy":"bind"}' \ -numa node,nodeid=3D1,cpus=3D4-7,memdev=3Dram-node1 \ -uuid 87eedafe-eedc-4336-8130-ed9fe5dc90c8 \ -display none \ @@ -28,8 +29,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device spapr-pci-host-bridge,index=3D1,id=3Dpci.1,numa_node=3D1 \ --device spapr-pci-host-bridge,index=3D2,id=3Dpci.2 \ --device spapr-pci-host-bridge,index=3D3,id=3Dpci.3,numa_node=3D0 \ +-device '{"driver":"spapr-pci-host-bridge","index":1,"id":"pci.1","numa_no= de":1}' \ +-device '{"driver":"spapr-pci-host-bridge","index":2,"id":"pci.2"}' \ +-device '{"driver":"spapr-pci-host-bridge","index":3,"id":"pci.3","numa_no= de":0}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-phb-simple.args b/tests/qemuxml= 2argvdata/pseries-phb-simple.args deleted file mode 100644 index 6891512a31..0000000000 --- a/tests/qemuxml2argvdata/pseries-phb-simple.args +++ /dev/null @@ -1,30 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-ppc64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pseries,usb=3Doff,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 \ --boot strict=3Don \ --device spapr-pci-host-bridge,index=3D1,id=3Dpci.1 \ --device spapr-pci-host-bridge,index=3D2,id=3Dpci.2 \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-panic-missing.args b/tests/qemu= xml2argvdata/pseries-phb-simple.ppc64-latest.args similarity index 58% rename from tests/qemuxml2argvdata/pseries-panic-missing.args rename to tests/qemuxml2argvdata/pseries-phb-simple.ppc64-latest.args index 67f927a1fa..df93a3b79c 100644 --- a/tests/qemuxml2argvdata/pseries-panic-missing.args +++ b/tests/qemuxml2argvdata/pseries-phb-simple.ppc64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-ppc64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pseries,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ +-cpu POWER9 \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -24,8 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --usb \ --chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ +-device '{"driver":"spapr-pci-host-bridge","index":1,"id":"pci.1"}' \ +-device '{"driver":"spapr-pci-host-bridge","index":2,"id":"pci.2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-serial+console-native.args b/te= sts/qemuxml2argvdata/pseries-serial+console-native.args deleted file mode 120000 index 1c09cf2102..0000000000 --- a/tests/qemuxml2argvdata/pseries-serial+console-native.args +++ /dev/null @@ -1 +0,0 @@ -pseries-serial-native.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/pseries-serial+console-native.ppc64-lat= est.args b/tests/qemuxml2argvdata/pseries-serial+console-native.ppc64-lates= t.args new file mode 120000 index 0000000000..c3b96bc117 --- /dev/null +++ b/tests/qemuxml2argvdata/pseries-serial+console-native.ppc64-latest.args @@ -0,0 +1 @@ +pseries-serial-native.ppc64-latest.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/pseries-serial-compat.args b/tests/qemu= xml2argvdata/pseries-serial-compat.args deleted file mode 120000 index 1c09cf2102..0000000000 --- a/tests/qemuxml2argvdata/pseries-serial-compat.args +++ /dev/null @@ -1 +0,0 @@ -pseries-serial-native.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/pseries-serial-compat.ppc64-latest.args= b/tests/qemuxml2argvdata/pseries-serial-compat.ppc64-latest.args new file mode 120000 index 0000000000..c3b96bc117 --- /dev/null +++ b/tests/qemuxml2argvdata/pseries-serial-compat.ppc64-latest.args @@ -0,0 +1 @@ +pseries-serial-native.ppc64-latest.args \ No newline at end of file diff --git a/tests/qemuxml2argvdata/pseries-serial-native.args b/tests/qemu= xml2argvdata/pseries-serial-native.ppc64-latest.args similarity index 61% rename from tests/qemuxml2argvdata/pseries-serial-native.args rename to tests/qemuxml2argvdata/pseries-serial-native.ppc64-latest.args index 1fb4b31dd2..12df0c8927 100644 --- a/tests/qemuxml2argvdata/pseries-serial-native.args +++ b/tests/qemuxml2argvdata/pseries-serial-native.ppc64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-ppc64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ --machine pseries,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ +-cpu POWER9 \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -25,6 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -no-shutdown \ -boot strict=3Don \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ +-device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-serial-pci.args b/tests/qemuxml= 2argvdata/pseries-serial-pci.ppc64-latest.args similarity index 60% rename from tests/qemuxml2argvdata/pseries-serial-pci.args rename to tests/qemuxml2argvdata/pseries-serial-pci.ppc64-latest.args index 458970c329..33e51a4fd9 100644 --- a/tests/qemuxml2argvdata/pseries-serial-pci.args +++ b/tests/qemuxml2argvdata/pseries-serial-pci.ppc64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-ppc64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ --machine pseries,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ +-cpu POWER9 \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -25,6 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -no-shutdown \ -boot strict=3Don \ -chardev pty,id=3Dcharserial0 \ --device pci-serial,chardev=3Dcharserial0,id=3Dserial0,bus=3Dpci.0,addr=3D0= x1 \ +-device '{"driver":"pci-serial","chardev":"charserial0","id":"serial0","bu= s":"pci.0","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/pseries-serial-usb.args b/tests/qemuxml= 2argvdata/pseries-serial-usb.ppc64-latest.args similarity index 57% rename from tests/qemuxml2argvdata/pseries-serial-usb.args rename to tests/qemuxml2argvdata/pseries-serial-usb.ppc64-latest.args index e4c3ef54ec..c8f3bca3a4 100644 --- a/tests/qemuxml2argvdata/pseries-serial-usb.args +++ b/tests/qemuxml2argvdata/pseries-serial-usb.ppc64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ /usr/bin/qemu-system-ppc64 \ -name guest=3Dguest,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ --machine pseries,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-guest/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ +-cpu POWER9 \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ @@ -24,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device qemu-xhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.0","addr":"0x1"}' \ -chardev pty,id=3Dcharserial0 \ --device usb-serial,chardev=3Dcharserial0,id=3Dserial0,bus=3Dusb.0,port=3D1= \ +-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/pseries-usb-default.args b/tests/qemuxm= l2argvdata/pseries-usb-default.args deleted file mode 100644 index c491eb69b2..0000000000 --- a/tests/qemuxml2argvdata/pseries-usb-default.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-ppc64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pseries,usb=3Doff,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 \ --boot strict=3Don \ --device pci-ohci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ --chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-usb-default.ppc64-latest.args b= /tests/qemuxml2argvdata/pseries-usb-default.ppc64-latest.args new file mode 100644 index 0000000000..6960c88a25 --- /dev/null +++ b/tests/qemuxml2argvdata/pseries-usb-default.ppc64-latest.args @@ -0,0 +1,34 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-ppc64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ +-accel tcg \ +-cpu POWER9 \ +-m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.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 \ +-boot strict=3Don \ +-device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ +-chardev pty,id=3Dcharserial0 \ +-device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-usb-kbd.args b/tests/qemuxml2ar= gvdata/pseries-usb-kbd.args deleted file mode 100644 index 2a725806af..0000000000 --- a/tests/qemuxml2argvdata/pseries-usb-kbd.args +++ /dev/null @@ -1,32 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-ppc64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pseries,usb=3Doff,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 \ --boot strict=3Don \ --device pci-ohci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ --chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ --device usb-kbd,id=3Dinput0,bus=3Dusb.0,port=3D1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-usb-kbd.ppc64-latest.args b/tes= ts/qemuxml2argvdata/pseries-usb-kbd.ppc64-latest.args new file mode 100644 index 0000000000..ddb9300cd4 --- /dev/null +++ b/tests/qemuxml2argvdata/pseries-usb-kbd.ppc64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-ppc64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ +-accel tcg \ +-cpu POWER9 \ +-m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.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 \ +-boot strict=3Don \ +-device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ +-chardev pty,id=3Dcharserial0 \ +-device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ +-device '{"driver":"usb-kbd","id":"input0","bus":"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/pseries-usb-multi.args b/tests/qemuxml2= argvdata/pseries-usb-multi.args deleted file mode 100644 index ac122b6586..0000000000 --- a/tests/qemuxml2argvdata/pseries-usb-multi.args +++ /dev/null @@ -1,32 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-ppc64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pseries,usb=3Doff,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 \ --boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ --device pci-ohci,id=3Dusb1,bus=3Dpci.0,addr=3D0x2 \ --chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-usb-multi.ppc64-latest.args b/t= ests/qemuxml2argvdata/pseries-usb-multi.ppc64-latest.args new file mode 100644 index 0000000000..5c6f82a620 --- /dev/null +++ b/tests/qemuxml2argvdata/pseries-usb-multi.ppc64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-ppc64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ +-accel tcg \ +-cpu POWER9 \ +-m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.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 \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1"}= ' \ +-device '{"driver":"pci-ohci","id":"usb1","bus":"pci.0","addr":"0x2"}' \ +-chardev pty,id=3Dcharserial0 \ +-device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-vio.args b/tests/qemuxml2argvda= ta/pseries-vio-user-assigned.ppc64-latest.args similarity index 52% rename from tests/qemuxml2argvdata/pseries-vio.args rename to tests/qemuxml2argvdata/pseries-vio-user-assigned.ppc64-latest.args index f83d891682..3d95c3374b 100644 --- a/tests/qemuxml2argvdata/pseries-vio.args +++ b/tests/qemuxml2argvdata/pseries-vio-user-assigned.ppc64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-ppc64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pseries,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ +-cpu POWER9 \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 2754dd7b-ac8a-4850-aec0-1f3fcd43235b \ @@ -24,15 +26,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device spapr-vscsi,id=3Dscsi0,reg=3D8192 \ --device spapr-vscsi,id=3Dscsi1,reg=3D12288 \ --usb \ +-device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ +-device '{"driver":"spapr-vscsi","id":"scsi0","reg":8192}' \ +-device '{"driver":"spapr-vscsi","id":"scsi1","reg":805306368}' \ -blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-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=3Dscsi1.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi1-0-0-0,drive=3Dlibvirt-1-format,id=3Dscsi1-0-0-0,bootindex=3D1 \ +-device '{"driver":"scsi-hd","bus":"scsi1.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi1-0-0-0","drive":"libvirt-1-format","id":"scsi1-0= -0-0","bootindex":1}' \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ +-device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":536870912}' \ -chardev pty,id=3Dcharserial1 \ --device spapr-vty,chardev=3Dcharserial1,id=3Dserial1,reg=3D805310464 \ +-device '{"driver":"spapr-vty","chardev":"charserial1","id":"serial1","reg= ":805310464}' \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args b/tests/= qemuxml2argvdata/pseries-vio.ppc64-latest.args similarity index 52% rename from tests/qemuxml2argvdata/pseries-vio-user-assigned.args rename to tests/qemuxml2argvdata/pseries-vio.ppc64-latest.args index 88ff276a4b..f6fecba1d8 100644 --- a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args +++ b/tests/qemuxml2argvdata/pseries-vio.ppc64-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-ppc64 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pseries,usb=3Doff,dump-guest-core=3Doff \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pseries,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dppc_spap= r.ram \ -accel tcg \ +-cpu POWER9 \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":5368= 70912}' \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid 2754dd7b-ac8a-4850-aec0-1f3fcd43235b \ @@ -24,15 +26,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device spapr-vscsi,id=3Dscsi0,reg=3D8192 \ --device spapr-vscsi,id=3Dscsi1,reg=3D805306368 \ --usb \ +-device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ +-device '{"driver":"spapr-vscsi","id":"scsi0","reg":8192}' \ +-device '{"driver":"spapr-vscsi","id":"scsi1","reg":12288}' \ -blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-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=3Dscsi1.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi1-0-0-0,drive=3Dlibvirt-1-format,id=3Dscsi1-0-0-0,bootindex=3D1 \ +-device '{"driver":"scsi-hd","bus":"scsi1.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi1-0-0-0","drive":"libvirt-1-format","id":"scsi1-0= -0-0","bootindex":1}' \ -chardev pty,id=3Dcharserial0 \ --device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D536870912 \ +-device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ -chardev pty,id=3Dcharserial1 \ --device spapr-vty,chardev=3Dcharserial1,id=3Dserial1,reg=3D805310464 \ +-device '{"driver":"spapr-vty","chardev":"charserial1","id":"serial1","reg= ":805310464}' \ -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 b7c3bc0e2d..67b9ffb3e7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2122,45 +2122,20 @@ mymain(void) DO_TEST_PARSE_ERROR_NOCAPS("seclabel-multiple"); DO_TEST_PARSE_ERROR_NOCAPS("seclabel-device-duplicates"); =20 - DO_TEST("pseries-basic", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY); - DO_TEST("pseries-vio", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY); - DO_TEST("pseries-usb-default", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_PCI_OHCI); - DO_TEST("pseries-usb-multi", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_PCI_OHCI); - DO_TEST("pseries-vio-user-assigned", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY); - DO_TEST_PARSE_ERROR_NOCAPS("pseries-vio-address-clash"); - DO_TEST("pseries-nvram", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_NVRAM); - DO_TEST("pseries-usb-kbd", QEMU_CAPS_PCI_OHCI, - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_USB_KBD, - QEMU_CAPS_DEVICE_SPAPR_VTY); - DO_TEST("pseries-cpu-exact", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY); + DO_TEST_CAPS_LATEST_PPC64("pseries-basic"); + DO_TEST_CAPS_LATEST_PPC64("pseries-vio"); + DO_TEST_CAPS_LATEST_PPC64("pseries-usb-default"); + DO_TEST_CAPS_LATEST_PPC64("pseries-usb-multi"); + DO_TEST_CAPS_LATEST_PPC64("pseries-vio-user-assigned"); + DO_TEST_CAPS_LATEST_PPC64("pseries-nvram"); + DO_TEST_CAPS_LATEST_PPC64("pseries-usb-kbd"); + DO_TEST_CAPS_LATEST_PPC64("pseries-cpu-exact"); DO_TEST_PARSE_ERROR_NOCAPS("pseries-no-parallel"); + DO_TEST_CAPS_LATEST_PPC64("pseries-cpu-le"); =20 qemuTestSetHostArch(&driver, VIR_ARCH_PPC64); - DO_TEST("pseries-cpu-compat", QEMU_CAPS_KVM, - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY); - DO_TEST("pseries-cpu-le", QEMU_CAPS_KVM, - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY); + DO_TEST_CAPS_LATEST_PPC64_HOSTCPU("pseries-cpu-compat", + QEMU_CPU_DEF_POWER9); DO_TEST_CAPS_LATEST_PPC64_HOSTCPU_FAILURE("pseries-cpu-compat-power9", QEMU_CPU_DEF_POWER8); DO_TEST_CAPS_LATEST_PPC64_HOSTCPU("pseries-cpu-compat-power9", @@ -2172,64 +2147,27 @@ mymain(void) =20 qemuTestSetHostArch(&driver, VIR_ARCH_NONE); =20 - DO_TEST("pseries-panic-missing", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY); - DO_TEST("pseries-panic-no-address", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY); - DO_TEST_PARSE_ERROR("pseries-panic-address", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); - - DO_TEST("pseries-phb-simple", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); - DO_TEST("pseries-phb-default-missing", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); - DO_TEST("pseries-phb-numa-node", - QEMU_CAPS_NUMA, - QEMU_CAPS_OBJECT_MEMORY_RAM, - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE); - DO_TEST_PARSE_ERROR("pseries-default-phb-numa-node", - QEMU_CAPS_NUMA, - QEMU_CAPS_OBJECT_MEMORY_RAM, - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE); + DO_TEST_CAPS_LATEST_PPC64("pseries-panic-missing"); + DO_TEST_CAPS_LATEST_PPC64("pseries-panic-no-address"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("pseries-panic-address", "ppc64"); + + DO_TEST_CAPS_LATEST_PPC64("pseries-phb-simple"); + DO_TEST_CAPS_LATEST_PPC64("pseries-phb-default-missing"); + DO_TEST_CAPS_LATEST_PPC64("pseries-phb-numa-node"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("pseries-default-phb-numa-node", + "ppc64"); DO_TEST_PARSE_ERROR_NOCAPS("pseries-phb-invalid-target-index-1"); DO_TEST_PARSE_ERROR_NOCAPS("pseries-phb-invalid-target-index-2"); DO_TEST_PARSE_ERROR_NOCAPS("pseries-phb-invalid-target-index-3"); =20 - DO_TEST("pseries-many-devices", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_VIRTIO_SCSI); - DO_TEST("pseries-many-buses-1", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_VIRTIO_SCSI); - DO_TEST("pseries-many-buses-2", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_VIRTIO_SCSI); - DO_TEST("pseries-hostdevs-1", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST("pseries-hostdevs-2", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST("pseries-hostdevs-3", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_VFIO_PCI); + DO_TEST_CAPS_LATEST_PPC64("pseries-many-devices"); + DO_TEST_CAPS_LATEST_PPC64("pseries-many-buses-1"); + DO_TEST_CAPS_LATEST_PPC64("pseries-many-buses-2"); + DO_TEST_CAPS_LATEST_PPC64("pseries-hostdevs-1"); + DO_TEST_CAPS_LATEST_PPC64("pseries-hostdevs-2"); + DO_TEST_CAPS_LATEST_PPC64("pseries-hostdevs-3"); =20 - DO_TEST("pseries-features", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE, - QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, - QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, - QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST, - QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC, - QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC, - QEMU_CAPS_MACHINE_PSERIES_CAP_IBS); + DO_TEST_CAPS_LATEST_PPC64("pseries-features"); =20 /* parse error: no QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE */ DO_TEST_PARSE_ERROR("pseries-features-hpt-pagesize", @@ -2303,27 +2241,13 @@ mymain(void) =20 DO_TEST_PARSE_ERROR_NOCAPS("pseries-features-invalid-machine"); =20 - DO_TEST("pseries-serial-native", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY); - DO_TEST("pseries-serial+console-native", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY); - DO_TEST("pseries-serial-compat", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY); - DO_TEST("pseries-serial-pci", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_PCI_SERIAL); - DO_TEST("pseries-serial-usb", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_QEMU_XHCI, - QEMU_CAPS_DEVICE_USB_SERIAL); - DO_TEST("pseries-console-native", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_DEVICE_SPAPR_VTY); - DO_TEST("pseries-console-virtio", - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); + DO_TEST_CAPS_LATEST_PPC64("pseries-serial-native"); + DO_TEST_CAPS_LATEST_PPC64("pseries-serial+console-native"); + DO_TEST_CAPS_LATEST_PPC64("pseries-serial-compat"); + DO_TEST_CAPS_LATEST_PPC64("pseries-serial-pci"); + DO_TEST_CAPS_LATEST_PPC64("pseries-serial-usb"); + DO_TEST_CAPS_LATEST_PPC64("pseries-console-native"); + DO_TEST_CAPS_LATEST_PPC64("pseries-console-virtio"); DO_TEST_PARSE_ERROR_NOCAPS("pseries-serial-invalid-machine"); DO_TEST_PARSE_ERROR_NOCAPS("pseries-spaprvio-invalid"); =20 --=20 2.37.3