diff options
author | Peter Maydell | 2016-03-17 09:52:58 +0100 |
---|---|---|
committer | Peter Maydell | 2016-03-17 09:52:58 +0100 |
commit | 8c4575472494a5dfedfe05e7b58ca9ce3872ad56 (patch) | |
tree | b56c2fb353dc23b414f7462744048585787857c4 /async.c | |
parent | Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (diff) | |
parent | module: Rename machine_init() to opts_init() (diff) | |
download | qemu-8c4575472494a5dfedfe05e7b58ca9ce3872ad56.tar.gz qemu-8c4575472494a5dfedfe05e7b58ca9ce3872ad56.tar.xz qemu-8c4575472494a5dfedfe05e7b58ca9ce3872ad56.zip |
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 <ehabkost@redhat.com>"
* 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 <peter.maydell@linaro.org>
Diffstat (limited to 'async.c')
0 files changed, 0 insertions, 0 deletions