diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-17 08:52:58 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-17 08:52:58 +0000 |
| commit | 8c4575472494a5dfedfe05e7b58ca9ce3872ad56 (patch) | |
| tree | b56c2fb353dc23b414f7462744048585787857c4 /ui/input-linux.c | |
| parent | 33616ace9f3da93cbc967761a173d96eb744fcda (diff) | |
| parent | 34294e2f545dae9f020b6d52e3929f4c4e45800c (diff) | |
| download | focaccia-qemu-8c4575472494a5dfedfe05e7b58ca9ce3872ad56.tar.gz focaccia-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 'ui/input-linux.c')
| -rw-r--r-- | ui/input-linux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/input-linux.c b/ui/input-linux.c index 0bc0405ec6..2cf5d4990c 100644 --- a/ui/input-linux.c +++ b/ui/input-linux.c @@ -388,4 +388,4 @@ static void input_linux_register_config(void) { qemu_add_opts(&qemu_input_linux_opts); } -machine_init(input_linux_register_config); +opts_init(input_linux_register_config); |