From: Peter Maydell Date: Tue, 26 Jun 2018 11:49:24 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bd4e4a387aa733e40270a7406c7d111f2292de65;p=qemu.git Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging Machine queue, 2018-06-25 * Don't support --daemonize and --preconfig together * Deprecate machine types pc-0.10 and pc-0.11 # gpg: Signature made Mon 25 Jun 2018 23:37:59 BST # gpg: using RSA key 2807936F984DC5A6 # gpg: Good signature from "Eduardo Habkost " # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/machine-next-pull-request: hw/i386: Deprecate the machine types pc-0.10 and pc-0.11 vl.c: do not allow --daemonize in combination with --preconfig CLI option Signed-off-by: Peter Maydell --- bd4e4a387aa733e40270a7406c7d111f2292de65