[elbe-devel] [PATCH] improve kvm machine-emulation heuristic

[Torben Hohn]

On Mon, Dec 18, 2017 at 12:37:44PM +0100, Manuel Traut wrote:
> From: Lukasz Walewski <lwalewski at s-can.at>
> 
> a1f422fb6ec80b3245e74d3e07f220de48974da7 introduces the heuristic.
> 
> But pc-i440fx-2.6 is not available on stretch:
> >> qemu-system-x86_64: -M pc-i440fx-2.6: Unsupported machine type
> 
> So apply the heuristic only if running on a stretch system.
> 
> Signed-off-by: Lukasz Walewski <lwalewski at s-can.at>
> Signed-off-by: Manuel Traut <manut at linutronix.de>
> Tested-by: Lukasz Walewski <lwalewski at s-can.at> (stretch/elbe 2.2)
> ---
>  elbepack/init/Makefile.mako | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/elbepack/init/Makefile.mako b/elbepack/init/Makefile.mako
> index bb9a3218..4ccafd57 100644
> --- a/elbepack/init/Makefile.mako
> +++ b/elbepack/init/Makefile.mako
> @@ -23,7 +23,8 @@ INTERPRETER?=${prj.text('interpreter', default=defs, key='interpreter')}
>  # this is a workaround for
>  # http://lists.linutronix.de/pipermail/elbe-devel/2017-July/000541.html
>  VIRT=$(shell test -x /usr/bin/systemd-detect-virt && /usr/bin/systemd-detect-virt)
> -ifeq ($(VIRT), vmware)
> +DIST=$(shell lsb_release -cs)
> +ifeq ($(filter-out vmware stretch, $(VIRT) $(DIST)),)

i would actually prefer 2 nested ifeq statements here.
That makes things a bit clearer.

Is it intended behaviour, to fallback to pc-i440fx-2.6, when
/usr/bin/systemd-detect-virt is not avail ?

before this patch this was not the case.


>  MACHINE?=pc-i440fx-2.6
>  else
>  MACHINE?=pc
> -- 
> 2.15.1
> 
> 
> _______________________________________________
> elbe-devel mailing list
> elbe-devel at linutronix.de
> https://lists.linutronix.de/mailman/listinfo/elbe-devel

-- 
Mit freundlichen Grüßen
Torben Hohn

Linutronix GmbH

Standort: Bremen

Phone: +49 7556 25 999 18; Fax.: +49 7556 25 999 99

Firmensitz / Registered Office: D-88690 Uhldingen, Bahnhofstr. 3
Registergericht / Local District Court: Amtsgericht Freiburg i. Br.; HRB
Nr. / Trade register no.: 700 806

Geschäftsführer / Managing Directors: Heinz Egger, Thomas Gleixner

Eine Bitte von uns: Sollten Sie diese E-Mail irrtümlich erhalten haben,
benachrichtigen Sie uns in diesem Falle bitte sobald wie es Ihnen
möglich ist, durch Antwort-Mail. Vielen Dank!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://lists.linutronix.de/pipermail/elbe-devel/attachments/20171218/49f99765/attachment.sig>