diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-05-21 18:09:49 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-05-21 18:09:49 +0300 |
| commit | aa04a64f00be218d996e1e341c4190180e0b7c0c (patch) | |
| tree | 8e8a33f87e4ab1793ab36fa2f6fbb57ab22ca946 /target-ia64 | |
| parent | Make qemu executable depend on libkvm.a (diff) | |
| parent | Convert machine registration to use module init functions (diff) | |
| download | qemu-kvm-aa04a64f00be218d996e1e341c4190180e0b7c0c.tar.gz qemu-kvm-aa04a64f00be218d996e1e341c4190180e0b7c0c.tar.bz2 qemu-kvm-aa04a64f00be218d996e1e341c4190180e0b7c0c.zip | |
Merge branch 'master' of git://git.sv.gnu.org/qemu
* 'master' of git://git.sv.gnu.org/qemu:
Convert machine registration to use module init functions
Eliminate --disable-gfx-check and make VNC default when SDL not available
Do not attempt to allocate sn_tab when there are no snapshots
Cast pointer arguments of get/setsockopt, send to void * to keep GCC
Conflicts:
hw/boards.h
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'target-ia64')
| -rw-r--r-- | target-ia64/machine.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/target-ia64/machine.c b/target-ia64/machine.c index a32b01a08..dd205c576 100644 --- a/target-ia64/machine.c +++ b/target-ia64/machine.c @@ -4,11 +4,6 @@ #include "exec-all.h" #include "qemu-kvm.h" -void register_machines(void) -{ - qemu_register_machine(&ipf_machine); -} - void cpu_save(QEMUFile *f, void *opaque) { CPUState *env = opaque; @@ -29,3 +24,12 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id) } return 0; } + +extern QEMUMachine ipf_machine; + +static void ipf_machine_init(void) +{ + qemu_register_machine(&ipf_machine); +} + +machine_init(ipf_machine_init); |