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-i386/machine.c | |
| 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-i386/machine.c')
| -rw-r--r-- | target-i386/machine.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/target-i386/machine.c b/target-i386/machine.c index 399204deb..59472d09c 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -6,15 +6,6 @@ #include "exec-all.h" #include "qemu-kvm.h" -void register_machines(void) -{ - qemu_register_machine(&pc_machine); - qemu_register_machine(&isapc_machine); -#ifdef CONFIG_XEN - qemu_register_machine(&xenpv_machine); -#endif -} - static void cpu_put_seg(QEMUFile *f, SegmentCache *dt) { qemu_put_be32(f, dt->selector); |