From: Peter Maydell Date: Thu, 17 Mar 2016 08:52:58 +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=8c4575472494a5dfedfe05e7b58ca9ce3872ad56;p=qemu.git Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' into staging Machine Core queue, 2016-03-16 # gpg: Signature made Wed 16 Mar 2016 18:57:34 GMT using RSA key ID 984DC5A6 # gpg: Good signature from "Eduardo Habkost " * remotes/ehabkost/tags/machine-pull-request: module: Rename machine_init() to opts_init() machine: Use type_init() to register machine classes Signed-off-by: Peter Maydell --- 8c4575472494a5dfedfe05e7b58ca9ce3872ad56