[elbe-devel] [PATCH v2 2/5] initvm: always use machine type pc

[Holger Dengler]

On 22.06.22 09:09, Bastian Germann wrote:
> There is only one machine type left. This reverts the remainings of
> f5252c11c5 ("Workaround for buggy qemu machine type in vmware/stretch").
> 
> Signed-off-by: Bastian Germann <bage at linutronix.de>

Tested-by: Holger Dengler <holger at hdengler.de>

> ---
>  elbepack/commands/init.py      | 1 -
>  elbepack/init/libvirt.xml.mako | 2 +-
>  2 files changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/elbepack/commands/init.py b/elbepack/commands/init.py
> index a39db3cfcb..bef868468f 100644
> --- a/elbepack/commands/init.py
> +++ b/elbepack/commands/init.py
> @@ -164,7 +164,6 @@ def run_command(argv):
>               "http_proxy": initvm_http_proxy,
>               "pkgs": xml.node("/initvm/pkg-list") or [],
>               "preseed": get_initvm_preseed(xml),
> -             "machine_type": "pc",
>               "cfg": cfg}
>  
>          if http_proxy != "":
> diff --git a/elbepack/init/libvirt.xml.mako b/elbepack/init/libvirt.xml.mako
> index 6451be1c6f..9dc5c1ce8b 100644
> --- a/elbepack/init/libvirt.xml.mako
> +++ b/elbepack/init/libvirt.xml.mako
> @@ -50,7 +50,7 @@ xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
>    </cpu>
>  % endif
>    <os>
> -    <type arch='x86_64' machine='${machine_type}'>hvm</type>
> +    <type arch='x86_64' machine='pc'>hvm</type>
>    </os>
>    <features>
>      <acpi />

-- 
Gruß,
Holger Dengler
--
holger at hdengler.de