From nobody Mon Feb 9 06:48:50 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1632315994; cv=none; d=zohomail.com; s=zohoarc; b=WfVLi7g6f5skjtZCcGA7VQ2cwuAVA9hWoFpTHV474OTsRDXjt18G0wp7RVcCNal2cfpTcfqvqYQFsUpitueemCdZYCM2I3+834HO8Uu0YphSZsfgk9JGXw14BaZgO7+cygJuWTsRLQPRLzO5QjUJdA/k/U+gSzt/E3OI+YAlqao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632315994; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=giHR41PCRWD8ePrus/7WLf66D7d3Yr2HdmDCM3Rn9n0=; b=lt5xuYycR0mlPVb9kBGQ9hc7Cva01vPHqaUd77p1D3cEQDb0WlAin860+0UG6HY3B5n93fFTeRS7ay7IfnhilLr1cqvw+TxuvupBXZBK0V2SZaqbOLxb71pIIal3Hn6krqCzwPIMBJYgmOCDX9nIPOFutPz3P+qEZsylG2QmyY4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1632315994103277.294225153611; Wed, 22 Sep 2021 06:06:34 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-43-0vBu1WBYNseurWaxZNrNYg-1; Wed, 22 Sep 2021 09:06:30 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D64381018F6C; Wed, 22 Sep 2021 13:06:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B24E360C82; Wed, 22 Sep 2021 13:06:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 79C6D4EA2F; Wed, 22 Sep 2021 13:06:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18MD6LVk021535 for ; Wed, 22 Sep 2021 09:06:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8090229671; Wed, 22 Sep 2021 13:06:21 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id AAC8E5DF2F for ; Wed, 22 Sep 2021 13:05:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632315993; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=giHR41PCRWD8ePrus/7WLf66D7d3Yr2HdmDCM3Rn9n0=; b=M9hZSpvGKg3dd5zbB0O2DHjN3vx4tV9icFmWrDK2nmBmJhE7iXdIIVCqXCVEtZio8XOqID j86pi0FyvDhZWNWBAPNmxqexxzcwJwvQg9uvlyv/rJdb/2f9dcun0fEhHJZ44eyxubchh9 pGg4d7quQEH+S9xiBwtesk/Llfauw28= X-MC-Unique: 0vBu1WBYNseurWaxZNrNYg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 18/20] qemuxml2argvtest: Use versioned ("4.1.0") capabilities for pre '-audiodev' cases Date: Wed, 22 Sep 2021 15:02:27 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1632315994820100001 Content-Type: text/plain; charset="utf-8" Use real caps instead of fake caps for the legacy cases. This will also show us when we can remove the old-style code. Signed-off-by: Peter Krempa --- ...args =3D> audio-alsa-best.x86_64-4.1.0.args} | 9 +-- ...l.err =3D> audio-alsa-full.x86_64-4.1.0.err} | 0 ...s =3D> audio-alsa-minimal.x86_64-4.1.0.args} | 9 +-- ...=3D> audio-coreaudio-best.x86_64-4.1.0.args} | 9 +-- ... =3D> audio-coreaudio-full.x86_64-4.1.0.err} | 0 ...audio-coreaudio-minimal.x86_64-4.1.0.args} | 9 +-- ...udio-default-nographics.x86_64-4.1.0.args} | 9 +-- ...args =3D> audio-file-best.x86_64-4.1.0.args} | 9 +-- ...l.err =3D> audio-file-full.x86_64-4.1.0.err} | 0 ...s =3D> audio-file-minimal.x86_64-4.1.0.args} | 9 +-- ...l.err =3D> audio-jack-full.x86_64-4.1.0.err} | 0 ...rr =3D> audio-jack-minimal.x86_64-4.1.0.err} | 0 ...r =3D> audio-many-backends.x86_64-4.1.0.err} | 0 ...args =3D> audio-none-best.x86_64-4.1.0.args} | 9 +-- ...l.err =3D> audio-none-full.x86_64-4.1.0.err} | 0 ...s =3D> audio-none-minimal.x86_64-4.1.0.args} | 9 +-- ....args =3D> audio-oss-best.x86_64-4.1.0.args} | 9 +-- ...ll.err =3D> audio-oss-full.x86_64-4.1.0.err} | 0 ...gs =3D> audio-oss-minimal.x86_64-4.1.0.args} | 9 +-- ...> audio-pulseaudio-best.x86_64-4.1.0.args} | 9 +-- ...=3D> audio-pulseaudio-full.x86_64-4.1.0.err} | 0 ...udio-pulseaudio-minimal.x86_64-4.1.0.args} | 9 +-- ....args =3D> audio-sdl-best.x86_64-4.1.0.args} | 9 +-- ...ll.err =3D> audio-sdl-full.x86_64-4.1.0.err} | 0 ...gs =3D> audio-sdl-minimal.x86_64-4.1.0.args} | 9 +-- ...rgs =3D> audio-spice-best.x86_64-4.1.0.args} | 9 +-- ....err =3D> audio-spice-full.x86_64-4.1.0.err} | 0 ... =3D> audio-spice-minimal.x86_64-4.1.0.args} | 9 +-- tests/qemuxml2argvtest.c | 56 +++++++++---------- 29 files changed, 113 insertions(+), 96 deletions(-) rename tests/qemuxml2argvdata/{audio-alsa-best.args =3D> audio-alsa-best.x= 86_64-4.1.0.args} (81%) rename tests/qemuxml2argvdata/{audio-alsa-full.err =3D> audio-alsa-full.x8= 6_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-alsa-minimal.args =3D> audio-alsa-min= imal.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-coreaudio-best.args =3D> audio-coreau= dio-best.x86_64-4.1.0.args} (81%) rename tests/qemuxml2argvdata/{audio-coreaudio-full.err =3D> audio-coreaud= io-full.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-coreaudio-minimal.args =3D> audio-cor= eaudio-minimal.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-default-nographics.args =3D> audio-de= fault-nographics.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-file-best.args =3D> audio-file-best.x= 86_64-4.1.0.args} (81%) rename tests/qemuxml2argvdata/{audio-file-full.err =3D> audio-file-full.x8= 6_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-file-minimal.args =3D> audio-file-min= imal.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-jack-full.err =3D> audio-jack-full.x8= 6_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-jack-minimal.err =3D> audio-jack-mini= mal.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-many-backends.err =3D> audio-many-bac= kends.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-none-best.args =3D> audio-none-best.x= 86_64-4.1.0.args} (80%) rename tests/qemuxml2argvdata/{audio-none-full.err =3D> audio-none-full.x8= 6_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-none-minimal.args =3D> audio-none-min= imal.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-oss-best.args =3D> audio-oss-best.x86= _64-4.1.0.args} (82%) rename tests/qemuxml2argvdata/{audio-oss-full.err =3D> audio-oss-full.x86_= 64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-oss-minimal.args =3D> audio-oss-minim= al.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-pulseaudio-best.args =3D> audio-pulse= audio-best.x86_64-4.1.0.args} (82%) rename tests/qemuxml2argvdata/{audio-pulseaudio-full.err =3D> audio-pulsea= udio-full.x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-pulseaudio-minimal.args =3D> audio-pu= lseaudio-minimal.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-sdl-best.args =3D> audio-sdl-best.x86= _64-4.1.0.args} (81%) rename tests/qemuxml2argvdata/{audio-sdl-full.err =3D> audio-sdl-full.x86_= 64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-sdl-minimal.args =3D> audio-sdl-minim= al.x86_64-4.1.0.args} (75%) rename tests/qemuxml2argvdata/{audio-spice-best.args =3D> audio-spice-best= .x86_64-4.1.0.args} (80%) rename tests/qemuxml2argvdata/{audio-spice-full.err =3D> audio-spice-full.= x86_64-4.1.0.err} (100%) rename tests/qemuxml2argvdata/{audio-spice-minimal.args =3D> audio-spice-m= inimal.x86_64-4.1.0.args} (75%) diff --git a/tests/qemuxml2argvdata/audio-alsa-best.args b/tests/qemuxml2ar= gvdata/audio-alsa-best.x86_64-4.1.0.args similarity index 81% rename from tests/qemuxml2argvdata/audio-alsa-best.args rename to tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args index a9c6833570..615a45711e 100644 --- a/tests/qemuxml2argvdata/audio-alsa-best.args +++ b/tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args @@ -24,21 +24,22 @@ QEMU_AUDIO_DAC_DEV=3D/dev/dsp1 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-alsa-full.err b/tests/qemuxml2arg= vdata/audio-alsa-full.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-alsa-full.err rename to tests/qemuxml2argvdata/audio-alsa-full.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-alsa-minimal.args b/tests/qemuxml= 2argvdata/audio-alsa-minimal.x86_64-4.1.0.args similarity index 75% rename from tests/qemuxml2argvdata/audio-alsa-minimal.args rename to tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args index 9a1126b0e8..d27ddd1e29 100644 --- a/tests/qemuxml2argvdata/audio-alsa-minimal.args +++ b/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args @@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=3Dalsa \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-coreaudio-best.args b/tests/qemux= ml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args similarity index 81% rename from tests/qemuxml2argvdata/audio-coreaudio-best.args rename to tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args index 60308f06f0..cdcec548ea 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-best.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args @@ -24,21 +24,22 @@ QEMU_COREAUDIO_BUFFER_SIZE=3D200 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-coreaudio-full.err b/tests/qemuxm= l2argvdata/audio-coreaudio-full.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-coreaudio-full.err rename to tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-coreaudio-minimal.args b/tests/qe= muxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args similarity index 75% rename from tests/qemuxml2argvdata/audio-coreaudio-minimal.args rename to tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args index f5a1c9822a..2254f91106 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-minimal.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args @@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=3Dcoreaudio \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-default-nographics.args b/tests/q= emuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args similarity index 75% rename from tests/qemuxml2argvdata/audio-default-nographics.args rename to tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args index 9a1126b0e8..d27ddd1e29 100644 --- a/tests/qemuxml2argvdata/audio-default-nographics.args +++ b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args @@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=3Dalsa \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-file-best.args b/tests/qemuxml2ar= gvdata/audio-file-best.x86_64-4.1.0.args similarity index 81% rename from tests/qemuxml2argvdata/audio-file-best.args rename to tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args index 36bd22e223..ccdc6417ab 100644 --- a/tests/qemuxml2argvdata/audio-file-best.args +++ b/tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args @@ -23,21 +23,22 @@ QEMU_WAV_PATH=3Daudio.wav \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-file-full.err b/tests/qemuxml2arg= vdata/audio-file-full.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-file-full.err rename to tests/qemuxml2argvdata/audio-file-full.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-file-minimal.args b/tests/qemuxml= 2argvdata/audio-file-minimal.x86_64-4.1.0.args similarity index 75% rename from tests/qemuxml2argvdata/audio-file-minimal.args rename to tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args index abb377fab3..69f6f07a7c 100644 --- a/tests/qemuxml2argvdata/audio-file-minimal.args +++ b/tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args @@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=3Dwav \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-jack-full.err b/tests/qemuxml2arg= vdata/audio-jack-full.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-jack-full.err rename to tests/qemuxml2argvdata/audio-jack-full.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-jack-minimal.err b/tests/qemuxml2= argvdata/audio-jack-minimal.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-jack-minimal.err rename to tests/qemuxml2argvdata/audio-jack-minimal.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-many-backends.err b/tests/qemuxml= 2argvdata/audio-many-backends.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-many-backends.err rename to tests/qemuxml2argvdata/audio-many-backends.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-none-best.args b/tests/qemuxml2ar= gvdata/audio-none-best.x86_64-4.1.0.args similarity index 80% rename from tests/qemuxml2argvdata/audio-none-best.args rename to tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args index 8284b7cf5f..06bca09a59 100644 --- a/tests/qemuxml2argvdata/audio-none-best.args +++ b/tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args @@ -22,21 +22,22 @@ QEMU_AUDIO_DAC_FIXED_FMT=3Df32 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-none-full.err b/tests/qemuxml2arg= vdata/audio-none-full.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-none-full.err rename to tests/qemuxml2argvdata/audio-none-full.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-none-minimal.args b/tests/qemuxml= 2argvdata/audio-none-minimal.x86_64-4.1.0.args similarity index 75% rename from tests/qemuxml2argvdata/audio-none-minimal.args rename to tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args index ec6ddd2857..0624595a5e 100644 --- a/tests/qemuxml2argvdata/audio-none-minimal.args +++ b/tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args @@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=3Dnone \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-oss-best.args b/tests/qemuxml2arg= vdata/audio-oss-best.x86_64-4.1.0.args similarity index 82% rename from tests/qemuxml2argvdata/audio-oss-best.args rename to tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args index 25d37650f6..99ef339f50 100644 --- a/tests/qemuxml2argvdata/audio-oss-best.args +++ b/tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args @@ -27,21 +27,22 @@ QEMU_OSS_NFRAGS=3D30 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-oss-full.err b/tests/qemuxml2argv= data/audio-oss-full.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-oss-full.err rename to tests/qemuxml2argvdata/audio-oss-full.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-oss-minimal.args b/tests/qemuxml2= argvdata/audio-oss-minimal.x86_64-4.1.0.args similarity index 75% rename from tests/qemuxml2argvdata/audio-oss-minimal.args rename to tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args index eb94dedbe0..19870c0d84 100644 --- a/tests/qemuxml2argvdata/audio-oss-minimal.args +++ b/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args @@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=3Doss \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-best.args b/tests/qemu= xml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args similarity index 82% rename from tests/qemuxml2argvdata/audio-pulseaudio-best.args rename to tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args index f462325694..3f6118e847 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-best.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args @@ -26,21 +26,22 @@ QEMU_PA_SERVER=3D%s=3Dacme.example.org \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-full.err b/tests/qemux= ml2argvdata/audio-pulseaudio-full.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-pulseaudio-full.err rename to tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.args b/tests/q= emuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args similarity index 75% rename from tests/qemuxml2argvdata/audio-pulseaudio-minimal.args rename to tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args index e68b58528d..e6c8a71925 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args @@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=3Dpa \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-sdl-best.args b/tests/qemuxml2arg= vdata/audio-sdl-best.x86_64-4.1.0.args similarity index 81% rename from tests/qemuxml2argvdata/audio-sdl-best.args rename to tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args index 221d67468c..2767721b6b 100644 --- a/tests/qemuxml2argvdata/audio-sdl-best.args +++ b/tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args @@ -24,21 +24,22 @@ SDL_AUDIODRIVER=3Dpulseaudio \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-sdl-full.err b/tests/qemuxml2argv= data/audio-sdl-full.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-sdl-full.err rename to tests/qemuxml2argvdata/audio-sdl-full.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-sdl-minimal.args b/tests/qemuxml2= argvdata/audio-sdl-minimal.x86_64-4.1.0.args similarity index 75% rename from tests/qemuxml2argvdata/audio-sdl-minimal.args rename to tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args index fe745b25db..6720a3b50a 100644 --- a/tests/qemuxml2argvdata/audio-sdl-minimal.args +++ b/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args @@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=3Dsdl \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-spice-best.args b/tests/qemuxml2a= rgvdata/audio-spice-best.x86_64-4.1.0.args similarity index 80% rename from tests/qemuxml2argvdata/audio-spice-best.args rename to tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args index 70d10fe24d..bfc9657ae6 100644 --- a/tests/qemuxml2argvdata/audio-spice-best.args +++ b/tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args @@ -22,21 +22,22 @@ QEMU_AUDIO_DAC_FIXED_FMT=3Df32 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-spice-full.err b/tests/qemuxml2ar= gvdata/audio-spice-full.x86_64-4.1.0.err similarity index 100% rename from tests/qemuxml2argvdata/audio-spice-full.err rename to tests/qemuxml2argvdata/audio-spice-full.x86_64-4.1.0.err diff --git a/tests/qemuxml2argvdata/audio-spice-minimal.args b/tests/qemuxm= l2argvdata/audio-spice-minimal.x86_64-4.1.0.args similarity index 75% rename from tests/qemuxml2argvdata/audio-spice-minimal.args rename to tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args index 30a4f5e5a0..ebc58f725b 100644 --- a/tests/qemuxml2argvdata/audio-spice-minimal.args +++ b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args @@ -11,21 +11,22 @@ QEMU_AUDIO_DRV=3Dspice \ -name guest=3DQEMUGuest1,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine pc-i440fx-4.1,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 214 \ --realtime mlock=3Doff \ +-overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ -nodefaults \ --chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --usb \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-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 69018c6411..87c8a27b73 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1080,15 +1080,15 @@ mymain(void) QEMU_CAPS_VIRTIO_BLK_SCSI); /* Simplest possible