From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <m.frank@proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id C3396C832 for <pve-devel@lists.proxmox.com>; Wed, 4 May 2022 09:57:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B9DE69697 for <pve-devel@lists.proxmox.com>; Wed, 4 May 2022 09:57:47 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 11FA4968C for <pve-devel@lists.proxmox.com>; Wed, 4 May 2022 09:57:45 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E16A742ADB for <pve-devel@lists.proxmox.com>; Wed, 4 May 2022 09:57:44 +0200 (CEST) Message-ID: <f84d37f3-833d-56f0-3826-088b01c9faaf@proxmox.com> Date: Wed, 4 May 2022 09:57:41 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.0 Content-Language: en-US To: pve-devel@lists.proxmox.com References: <20220503111901.126976-1-m.frank@proxmox.com> From: Markus Frank <m.frank@proxmox.com> In-Reply-To: <20220503111901.126976-1-m.frank@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 1.384 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -2.871 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pve-devel] [PATCH qemu-server 1/3] tests: replaced somemachine&someothermachine with q35&pc X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Wed, 04 May 2022 07:57:47 -0000 Info because I forgot to write 2/3 and 3/3: These 4 patches belong together. 1: [PATCH qemu-server 1/3] tests: replaced somemachine&someothermachine with q35&pc 2: [PATCH qemu-server] fix #3784: Parameter for guest vIOMMU & machine as property-string 3: [PATCH qemu-server] added test-cases for new machine-syntax & viommu 4: [PATCH manager] ui: MachineEdit with viommu checkbox On 5/3/22 13:18, Markus Frank wrote: > Needed for new machine parameter, because parse_property_string checks > the parameter with the regex-pattern and therefore the test-cases with > somemachine & someothermachine always fail. > > Since they do not have a special meaning, > I changed somemachine & someothermachine to q35 & pc with sed > > sed -i 's/somemachine/q35/g' > sed -i 's/someothermachine/pc/g' > > Signed-off-by: Markus Frank <m.frank@proxmox.com> > --- > test/snapshot-expected/commit/qemu-server/101.conf | 2 +- > test/snapshot-expected/commit/qemu-server/102.conf | 2 +- > test/snapshot-expected/commit/qemu-server/201.conf | 2 +- > test/snapshot-expected/commit/qemu-server/202.conf | 2 +- > test/snapshot-expected/commit/qemu-server/203.conf | 2 +- > test/snapshot-expected/create/qemu-server/102.conf | 2 +- > test/snapshot-expected/create/qemu-server/104.conf | 4 ++-- > test/snapshot-expected/create/qemu-server/106.conf | 2 +- > test/snapshot-expected/create/qemu-server/301.conf | 2 +- > test/snapshot-expected/create/qemu-server/302.conf | 2 +- > test/snapshot-expected/delete/qemu-server/203.conf | 2 +- > test/snapshot-expected/delete/qemu-server/204.conf | 2 +- > test/snapshot-expected/prepare/qemu-server/102.conf | 2 +- > test/snapshot-expected/prepare/qemu-server/104.conf | 2 +- > test/snapshot-expected/rollback/qemu-server/101.conf | 2 +- > test/snapshot-expected/rollback/qemu-server/106.conf | 4 ++-- > test/snapshot-expected/rollback/qemu-server/201.conf | 2 +- > test/snapshot-expected/rollback/qemu-server/202.conf | 2 +- > test/snapshot-expected/rollback/qemu-server/203.conf | 2 +- > test/snapshot-expected/rollback/qemu-server/204.conf | 2 +- > test/snapshot-expected/rollback/qemu-server/205.conf | 2 +- > test/snapshot-expected/rollback/qemu-server/301.conf | 2 +- > test/snapshot-expected/rollback/qemu-server/302.conf | 2 +- > test/snapshot-expected/rollback/qemu-server/303.conf | 2 +- > test/snapshot-input/commit/qemu-server/101.conf | 2 +- > test/snapshot-input/commit/qemu-server/102.conf | 2 +- > test/snapshot-input/commit/qemu-server/201.conf | 2 +- > test/snapshot-input/commit/qemu-server/202.conf | 2 +- > test/snapshot-input/commit/qemu-server/203.conf | 2 +- > test/snapshot-input/create/qemu-server/104.conf | 2 +- > test/snapshot-input/delete/qemu-server/101.conf | 2 +- > test/snapshot-input/delete/qemu-server/203.conf | 2 +- > test/snapshot-input/delete/qemu-server/204.conf | 2 +- > test/snapshot-input/rollback/qemu-server/101.conf | 2 +- > test/snapshot-input/rollback/qemu-server/102.conf | 2 +- > test/snapshot-input/rollback/qemu-server/103.conf | 2 +- > test/snapshot-input/rollback/qemu-server/104.conf | 2 +- > test/snapshot-input/rollback/qemu-server/106.conf | 4 ++-- > test/snapshot-input/rollback/qemu-server/201.conf | 2 +- > test/snapshot-input/rollback/qemu-server/202.conf | 2 +- > test/snapshot-input/rollback/qemu-server/203.conf | 2 +- > test/snapshot-input/rollback/qemu-server/204.conf | 2 +- > test/snapshot-input/rollback/qemu-server/205.conf | 2 +- > test/snapshot-input/rollback/qemu-server/301.conf | 2 +- > test/snapshot-input/rollback/qemu-server/302.conf | 2 +- > test/snapshot-input/rollback/qemu-server/303.conf | 2 +- > 46 files changed, 49 insertions(+), 49 deletions(-) > > diff --git a/test/snapshot-expected/commit/qemu-server/101.conf b/test/snapshot-expected/commit/qemu-server/101.conf > index 060676e..82c9522 100644 > --- a/test/snapshot-expected/commit/qemu-server/101.conf > +++ b/test/snapshot-expected/commit/qemu-server/101.conf > @@ -18,7 +18,7 @@ bootdisk: ide0 > cores: 4 > ide0: somestore:somedisk,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-expected/commit/qemu-server/102.conf b/test/snapshot-expected/commit/qemu-server/102.conf > index 13f33a3..01b8531 100644 > --- a/test/snapshot-expected/commit/qemu-server/102.conf > +++ b/test/snapshot-expected/commit/qemu-server/102.conf > @@ -34,7 +34,7 @@ bootdisk: ide0 > cores: 4 > ide0: somestore:somedisk,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-expected/commit/qemu-server/201.conf b/test/snapshot-expected/commit/qemu-server/201.conf > index 63a6d77..f8e99dd 100644 > --- a/test/snapshot-expected/commit/qemu-server/201.conf > +++ b/test/snapshot-expected/commit/qemu-server/201.conf > @@ -34,7 +34,7 @@ bootdisk: ide0 > cores: 4 > ide0: somestore:somedisk,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-expected/commit/qemu-server/202.conf b/test/snapshot-expected/commit/qemu-server/202.conf > index 4c6b84d..a221ba0 100644 > --- a/test/snapshot-expected/commit/qemu-server/202.conf > +++ b/test/snapshot-expected/commit/qemu-server/202.conf > @@ -35,7 +35,7 @@ bootdisk: ide0 > cores: 4 > ide0: somestore:somedisk,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-expected/commit/qemu-server/203.conf b/test/snapshot-expected/commit/qemu-server/203.conf > index 5acf20d..e10b68e 100644 > --- a/test/snapshot-expected/commit/qemu-server/203.conf > +++ b/test/snapshot-expected/commit/qemu-server/203.conf > @@ -35,7 +35,7 @@ bootdisk: ide0 > cores: 4 > ide0: somestore:somedisk,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-expected/create/qemu-server/102.conf b/test/snapshot-expected/create/qemu-server/102.conf > index 9b57004..d507956 100644 > --- a/test/snapshot-expected/create/qemu-server/102.conf > +++ b/test/snapshot-expected/create/qemu-server/102.conf > @@ -25,7 +25,7 @@ name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > numa: 0 > ostype: win7 > -runningmachine: somemachine > +runningmachine: q35 > smbios1: uuid=01234567-890a-bcde-f012-34567890abcd > snaptime: 1234567890 > sockets: 1 > diff --git a/test/snapshot-expected/create/qemu-server/104.conf b/test/snapshot-expected/create/qemu-server/104.conf > index 54f1c21..385625f 100644 > --- a/test/snapshot-expected/create/qemu-server/104.conf > +++ b/test/snapshot-expected/create/qemu-server/104.conf > @@ -20,7 +20,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > @@ -45,7 +45,7 @@ net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > numa: 0 > ostype: win7 > parent: test > -runningmachine: somemachine > +runningmachine: q35 > smbios1: uuid=01234567-890a-bcde-f012-34567890abcd > snaptime: 1234567890 > sockets: 1 > diff --git a/test/snapshot-expected/create/qemu-server/106.conf b/test/snapshot-expected/create/qemu-server/106.conf > index 9b57004..d507956 100644 > --- a/test/snapshot-expected/create/qemu-server/106.conf > +++ b/test/snapshot-expected/create/qemu-server/106.conf > @@ -25,7 +25,7 @@ name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > numa: 0 > ostype: win7 > -runningmachine: somemachine > +runningmachine: q35 > smbios1: uuid=01234567-890a-bcde-f012-34567890abcd > snaptime: 1234567890 > sockets: 1 > diff --git a/test/snapshot-expected/create/qemu-server/301.conf b/test/snapshot-expected/create/qemu-server/301.conf > index 9c49b1d..8cba2dc 100644 > --- a/test/snapshot-expected/create/qemu-server/301.conf > +++ b/test/snapshot-expected/create/qemu-server/301.conf > @@ -25,7 +25,7 @@ name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > numa: 0 > ostype: win7 > -runningmachine: somemachine > +runningmachine: q35 > smbios1: uuid=01234567-890a-bcde-f012-34567890abcd > snaptime: 1234567890 > sockets: 1 > diff --git a/test/snapshot-expected/create/qemu-server/302.conf b/test/snapshot-expected/create/qemu-server/302.conf > index 9c49b1d..8cba2dc 100644 > --- a/test/snapshot-expected/create/qemu-server/302.conf > +++ b/test/snapshot-expected/create/qemu-server/302.conf > @@ -25,7 +25,7 @@ name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > numa: 0 > ostype: win7 > -runningmachine: somemachine > +runningmachine: q35 > smbios1: uuid=01234567-890a-bcde-f012-34567890abcd > snaptime: 1234567890 > sockets: 1 > diff --git a/test/snapshot-expected/delete/qemu-server/203.conf b/test/snapshot-expected/delete/qemu-server/203.conf > index c406640..ed93cf7 100644 > --- a/test/snapshot-expected/delete/qemu-server/203.conf > +++ b/test/snapshot-expected/delete/qemu-server/203.conf > @@ -21,7 +21,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-expected/delete/qemu-server/204.conf b/test/snapshot-expected/delete/qemu-server/204.conf > index c521154..fe63204 100644 > --- a/test/snapshot-expected/delete/qemu-server/204.conf > +++ b/test/snapshot-expected/delete/qemu-server/204.conf > @@ -20,7 +20,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-expected/prepare/qemu-server/102.conf b/test/snapshot-expected/prepare/qemu-server/102.conf > index 92db74a..8f998ca 100644 > --- a/test/snapshot-expected/prepare/qemu-server/102.conf > +++ b/test/snapshot-expected/prepare/qemu-server/102.conf > @@ -23,7 +23,7 @@ name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > numa: 0 > ostype: win7 > -runningmachine: somemachine > +runningmachine: q35 > smbios1: uuid=01234567-890a-bcde-f012-34567890abcd > snapstate: prepare > snaptime: 1234567890 > diff --git a/test/snapshot-expected/prepare/qemu-server/104.conf b/test/snapshot-expected/prepare/qemu-server/104.conf > index 02e2d3c..2f2ec96 100644 > --- a/test/snapshot-expected/prepare/qemu-server/104.conf > +++ b/test/snapshot-expected/prepare/qemu-server/104.conf > @@ -41,7 +41,7 @@ net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > numa: 0 > ostype: win7 > parent: test > -runningmachine: somemachine > +runningmachine: q35 > smbios1: uuid=01234567-890a-bcde-f012-34567890abcd > snapstate: prepare > snaptime: 1234567890 > diff --git a/test/snapshot-expected/rollback/qemu-server/101.conf b/test/snapshot-expected/rollback/qemu-server/101.conf > index 91de880..17257e3 100644 > --- a/test/snapshot-expected/rollback/qemu-server/101.conf > +++ b/test/snapshot-expected/rollback/qemu-server/101.conf > @@ -21,7 +21,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-expected/rollback/qemu-server/106.conf b/test/snapshot-expected/rollback/qemu-server/106.conf > index aa5fa9e..729bc93 100644 > --- a/test/snapshot-expected/rollback/qemu-server/106.conf > +++ b/test/snapshot-expected/rollback/qemu-server/106.conf > @@ -3,7 +3,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > @@ -21,7 +21,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-expected/rollback/qemu-server/201.conf b/test/snapshot-expected/rollback/qemu-server/201.conf > index c521154..fe63204 100644 > --- a/test/snapshot-expected/rollback/qemu-server/201.conf > +++ b/test/snapshot-expected/rollback/qemu-server/201.conf > @@ -20,7 +20,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-expected/rollback/qemu-server/202.conf b/test/snapshot-expected/rollback/qemu-server/202.conf > index 691f5a2..d09b5d0 100644 > --- a/test/snapshot-expected/rollback/qemu-server/202.conf > +++ b/test/snapshot-expected/rollback/qemu-server/202.conf > @@ -20,7 +20,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:unsnapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-expected/rollback/qemu-server/203.conf b/test/snapshot-expected/rollback/qemu-server/203.conf > index 6e53b27..8abf841 100644 > --- a/test/snapshot-expected/rollback/qemu-server/203.conf > +++ b/test/snapshot-expected/rollback/qemu-server/203.conf > @@ -20,7 +20,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-expected/rollback/qemu-server/204.conf b/test/snapshot-expected/rollback/qemu-server/204.conf > index c406640..ed93cf7 100644 > --- a/test/snapshot-expected/rollback/qemu-server/204.conf > +++ b/test/snapshot-expected/rollback/qemu-server/204.conf > @@ -21,7 +21,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-expected/rollback/qemu-server/205.conf b/test/snapshot-expected/rollback/qemu-server/205.conf > index c521154..fe63204 100644 > --- a/test/snapshot-expected/rollback/qemu-server/205.conf > +++ b/test/snapshot-expected/rollback/qemu-server/205.conf > @@ -20,7 +20,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-expected/rollback/qemu-server/301.conf b/test/snapshot-expected/rollback/qemu-server/301.conf > index c521154..fe63204 100644 > --- a/test/snapshot-expected/rollback/qemu-server/301.conf > +++ b/test/snapshot-expected/rollback/qemu-server/301.conf > @@ -20,7 +20,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-expected/rollback/qemu-server/302.conf b/test/snapshot-expected/rollback/qemu-server/302.conf > index 828e8b0..5110016 100644 > --- a/test/snapshot-expected/rollback/qemu-server/302.conf > +++ b/test/snapshot-expected/rollback/qemu-server/302.conf > @@ -27,7 +27,7 @@ name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > numa: 0 > ostype: win7 > -runningmachine: somemachine > +runningmachine: q35 > smbios1: uuid=01234567-890a-bcde-f012-34567890abcd > snaptime: 1234567890 > sockets: 1 > diff --git a/test/snapshot-expected/rollback/qemu-server/303.conf b/test/snapshot-expected/rollback/qemu-server/303.conf > index 518c954..473a9a0 100644 > --- a/test/snapshot-expected/rollback/qemu-server/303.conf > +++ b/test/snapshot-expected/rollback/qemu-server/303.conf > @@ -26,7 +26,7 @@ name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > numa: 0 > ostype: win7 > -runningmachine: somemachine > +runningmachine: q35 > smbios1: uuid=01234567-890a-bcde-f012-34567890abcd > snaptime: 1234567890 > sockets: 1 > diff --git a/test/snapshot-input/commit/qemu-server/101.conf b/test/snapshot-input/commit/qemu-server/101.conf > index 4ab1787..92c1f6a 100644 > --- a/test/snapshot-input/commit/qemu-server/101.conf > +++ b/test/snapshot-input/commit/qemu-server/101.conf > @@ -18,7 +18,7 @@ bootdisk: ide0 > cores: 4 > ide0: somestore:somedisk,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-input/commit/qemu-server/102.conf b/test/snapshot-input/commit/qemu-server/102.conf > index b62f2c6..99bca5e 100644 > --- a/test/snapshot-input/commit/qemu-server/102.conf > +++ b/test/snapshot-input/commit/qemu-server/102.conf > @@ -35,7 +35,7 @@ bootdisk: ide0 > cores: 4 > ide0: somestore:somedisk,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-input/commit/qemu-server/201.conf b/test/snapshot-input/commit/qemu-server/201.conf > index 63a6d77..f8e99dd 100644 > --- a/test/snapshot-input/commit/qemu-server/201.conf > +++ b/test/snapshot-input/commit/qemu-server/201.conf > @@ -34,7 +34,7 @@ bootdisk: ide0 > cores: 4 > ide0: somestore:somedisk,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-input/commit/qemu-server/202.conf b/test/snapshot-input/commit/qemu-server/202.conf > index 4c6b84d..a221ba0 100644 > --- a/test/snapshot-input/commit/qemu-server/202.conf > +++ b/test/snapshot-input/commit/qemu-server/202.conf > @@ -35,7 +35,7 @@ bootdisk: ide0 > cores: 4 > ide0: somestore:somedisk,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-input/commit/qemu-server/203.conf b/test/snapshot-input/commit/qemu-server/203.conf > index 5acf20d..e10b68e 100644 > --- a/test/snapshot-input/commit/qemu-server/203.conf > +++ b/test/snapshot-input/commit/qemu-server/203.conf > @@ -35,7 +35,7 @@ bootdisk: ide0 > cores: 4 > ide0: somestore:somedisk,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-input/create/qemu-server/104.conf b/test/snapshot-input/create/qemu-server/104.conf > index c521154..fe63204 100644 > --- a/test/snapshot-input/create/qemu-server/104.conf > +++ b/test/snapshot-input/create/qemu-server/104.conf > @@ -20,7 +20,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-input/delete/qemu-server/101.conf b/test/snapshot-input/delete/qemu-server/101.conf > index c521154..fe63204 100644 > --- a/test/snapshot-input/delete/qemu-server/101.conf > +++ b/test/snapshot-input/delete/qemu-server/101.conf > @@ -20,7 +20,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-input/delete/qemu-server/203.conf b/test/snapshot-input/delete/qemu-server/203.conf > index c406640..ed93cf7 100644 > --- a/test/snapshot-input/delete/qemu-server/203.conf > +++ b/test/snapshot-input/delete/qemu-server/203.conf > @@ -21,7 +21,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-input/delete/qemu-server/204.conf b/test/snapshot-input/delete/qemu-server/204.conf > index c521154..fe63204 100644 > --- a/test/snapshot-input/delete/qemu-server/204.conf > +++ b/test/snapshot-input/delete/qemu-server/204.conf > @@ -20,7 +20,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-input/rollback/qemu-server/101.conf b/test/snapshot-input/rollback/qemu-server/101.conf > index 4fea865..0fa6a61 100644 > --- a/test/snapshot-input/rollback/qemu-server/101.conf > +++ b/test/snapshot-input/rollback/qemu-server/101.conf > @@ -20,7 +20,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-input/rollback/qemu-server/102.conf b/test/snapshot-input/rollback/qemu-server/102.conf > index 8f0db83..3fcffe1 100644 > --- a/test/snapshot-input/rollback/qemu-server/102.conf > +++ b/test/snapshot-input/rollback/qemu-server/102.conf > @@ -4,7 +4,7 @@ bootdisk: ide2 > cores: 2 > ide0: local:snapshotable-disk-1,size=32G > ide2: none,media=cdrom > -machine: someothermachine > +machine: pc > memory: 4096 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-input/rollback/qemu-server/103.conf b/test/snapshot-input/rollback/qemu-server/103.conf > index 8f0db83..3fcffe1 100644 > --- a/test/snapshot-input/rollback/qemu-server/103.conf > +++ b/test/snapshot-input/rollback/qemu-server/103.conf > @@ -4,7 +4,7 @@ bootdisk: ide2 > cores: 2 > ide0: local:snapshotable-disk-1,size=32G > ide2: none,media=cdrom > -machine: someothermachine > +machine: pc > memory: 4096 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-input/rollback/qemu-server/104.conf b/test/snapshot-input/rollback/qemu-server/104.conf > index ff50151..2f12761 100644 > --- a/test/snapshot-input/rollback/qemu-server/104.conf > +++ b/test/snapshot-input/rollback/qemu-server/104.conf > @@ -4,7 +4,7 @@ bootdisk: ide2 > cores: 2 > ide0: local:snapshotable-disk-1,size=32G > ide2: none,media=cdrom > -machine: someothermachine > +machine: pc > memory: 4096 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-input/rollback/qemu-server/106.conf b/test/snapshot-input/rollback/qemu-server/106.conf > index 64bf9bf..56d7199 100644 > --- a/test/snapshot-input/rollback/qemu-server/106.conf > +++ b/test/snapshot-input/rollback/qemu-server/106.conf > @@ -3,7 +3,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: someothermachine > +machine: pc > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > @@ -21,7 +21,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-input/rollback/qemu-server/201.conf b/test/snapshot-input/rollback/qemu-server/201.conf > index c521154..fe63204 100644 > --- a/test/snapshot-input/rollback/qemu-server/201.conf > +++ b/test/snapshot-input/rollback/qemu-server/201.conf > @@ -20,7 +20,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-input/rollback/qemu-server/202.conf b/test/snapshot-input/rollback/qemu-server/202.conf > index 691f5a2..d09b5d0 100644 > --- a/test/snapshot-input/rollback/qemu-server/202.conf > +++ b/test/snapshot-input/rollback/qemu-server/202.conf > @@ -20,7 +20,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:unsnapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-input/rollback/qemu-server/203.conf b/test/snapshot-input/rollback/qemu-server/203.conf > index 6e53b27..8abf841 100644 > --- a/test/snapshot-input/rollback/qemu-server/203.conf > +++ b/test/snapshot-input/rollback/qemu-server/203.conf > @@ -20,7 +20,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-input/rollback/qemu-server/204.conf b/test/snapshot-input/rollback/qemu-server/204.conf > index c406640..ed93cf7 100644 > --- a/test/snapshot-input/rollback/qemu-server/204.conf > +++ b/test/snapshot-input/rollback/qemu-server/204.conf > @@ -21,7 +21,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-input/rollback/qemu-server/205.conf b/test/snapshot-input/rollback/qemu-server/205.conf > index c521154..fe63204 100644 > --- a/test/snapshot-input/rollback/qemu-server/205.conf > +++ b/test/snapshot-input/rollback/qemu-server/205.conf > @@ -20,7 +20,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-input/rollback/qemu-server/301.conf b/test/snapshot-input/rollback/qemu-server/301.conf > index c521154..fe63204 100644 > --- a/test/snapshot-input/rollback/qemu-server/301.conf > +++ b/test/snapshot-input/rollback/qemu-server/301.conf > @@ -20,7 +20,7 @@ bootdisk: ide0 > cores: 4 > ide0: local:snapshotable-disk-1,discard=on,size=32G > ide2: none,media=cdrom > -machine: somemachine > +machine: q35 > memory: 8192 > name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > diff --git a/test/snapshot-input/rollback/qemu-server/302.conf b/test/snapshot-input/rollback/qemu-server/302.conf > index 518c954..473a9a0 100644 > --- a/test/snapshot-input/rollback/qemu-server/302.conf > +++ b/test/snapshot-input/rollback/qemu-server/302.conf > @@ -26,7 +26,7 @@ name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > numa: 0 > ostype: win7 > -runningmachine: somemachine > +runningmachine: q35 > smbios1: uuid=01234567-890a-bcde-f012-34567890abcd > snaptime: 1234567890 > sockets: 1 > diff --git a/test/snapshot-input/rollback/qemu-server/303.conf b/test/snapshot-input/rollback/qemu-server/303.conf > index 518c954..473a9a0 100644 > --- a/test/snapshot-input/rollback/qemu-server/303.conf > +++ b/test/snapshot-input/rollback/qemu-server/303.conf > @@ -26,7 +26,7 @@ name: win > net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1 > numa: 0 > ostype: win7 > -runningmachine: somemachine > +runningmachine: q35 > smbios1: uuid=01234567-890a-bcde-f012-34567890abcd > snaptime: 1234567890 > sockets: 1