From: Peter Maydell Date: Wed, 15 Mar 2017 13:07:07 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=926e368388420a9728de1e31528ba48e7e8029b3;p=qemu.git Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' into staging Fix global property and -cpu handling bug This bug fix was supposed to be applied just after 2.8.0 was released, but it slipped through the cracks. Sending it now for the next -rc. # gpg: Signature made Tue 14 Mar 2017 20:04:50 GMT # gpg: using RSA key 0x2807936F984DC5A6 # gpg: Good signature from "Eduardo Habkost " # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/machine-pull-request: machine: Convert abstract typename on compat_props to subclass names Signed-off-by: Peter Maydell --- 926e368388420a9728de1e31528ba48e7e8029b3