[pve-devel] [PATCH qemu-server 1/3] tests: replaced somemachine&someothermachine with q35&pc

Thu May 5 13:08:11 CEST 2022

Applied this patch locally + in a few virtualized VMs.

1. GUI: Tried to set a few different combinations of the q35 / i440fx
machine and vIOMMU checkbox setting. I couldn't find any problems or
bugs with the selection of these settings.
2. The vIOMMU settings applied correctly every time I used it. I set
up multiple nested Proxmox nodes, repeated passthrough of a device
worked very well.

I tested this by passing an unmounted NVME SSD device down the chain,
then formatting it in the last VM:

Host (mala)
     -> Nested Proxmox 1
          -> Nested Proxmox 2
               -> Alpine 3.12 VM

Everything worked as advertised.

Tested-by: Daniel Tschlatscher <d.tschlatscher at proxmox.com>

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 at 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