mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,468 Commits 50 Branches 394 Tags
Commit Graph

504 Commits

Author SHA1 Message Date
Markus Armbruster
09aaa1602f qdev: convert watchdogs 
-watchdog NAME is now equivalent to -device NAME, except it treats
option argument '?' specially, and supports only one watchdog.

A side effect is that a device created with -watchdog may now receive
a different PCI address.

i6300esb is now available on any machine with a PCI bus, not just PCs.
ib700 is still PC only, but that could be changed easily.

The only remaining use of struct WatchdogTimerModel and
watchdog_add_model() is supporting '-watchdog ?'.  Should be replaced
by searching device_info_list for watchdog devices when we can
identify them there.

Also fixes ib700 not to use vm_clock before it is initialized: in
wdt_ib700_init(), called from register_watchdogs(), which runs before
init_timers().  The bug made ib700_write_enable_reg() crash in
qemu_del_timer().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
 2009-08-27 20:35:24 -05:00
Jes Sorensen
3a38d437ca Add isa_reserve_irq(). 
Introduce isa_reserve_irq() which marks an irq reserved and returns
the appropriate qemu_irq entry from the i8259 table.

isa_reserve_irq() is a temporary interface to be used to allocate ISA
IRQs for devices which have not yet been converted to qdev, and for
special cases which are not suited for qdev conversions, such as the
'ferr'.

This patch goes on top of Gerd Hoffmann's which makes isa-bus.c own
the ISA irq table.

[ added isa-bus.o to some targets to fix build failures  -- kraxel ]

Signed-off-by: Jes Sorensen <jes@sgi.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
 2009-08-27 20:30:20 -05:00
malc
523e727d46 Remove a hack introduced by d19076faca944c31bb051b95d285e75ec67902f7 
Work by Blue Swirl culminating with 5c55ff99fa88158871d5b9f619c485deae5f3d5b
made it unnecessary.
 2009-08-27 18:04:10 +04:00
Michael S. Tsirkin
3987e1cf6d qemu: move virtio-pci.o to near pci.o 
virtio-pci depends, and will always depend, on pci.c
so it makes sense to keep it in the same makefile,
(unlike the rest of virtio files which should eventually
 be moved out to Makefile.hw).

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
 2009-08-24 08:46:47 -05:00
Anthony Liguori
a25a0ef51e Only build osdep once 
We no longer need hackery to work around kqemu

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
 2009-08-24 08:02:55 -05:00
Anthony Liguori
4a1418e07b Unbreak large mem support by removing kqemu 
kqemu introduces a number of restrictions on the i386 target.  The worst is that
it prevents large memory from working in the default build.

Furthermore, kqemu is fundamentally flawed in a number of ways.  It relies on
the TSC as a time source which will not be reliable on a multiple processor
system in userspace.  Since most modern processors are multicore, this severely
limits the utility of kqemu.

kvm is a viable alternative for people looking to accelerate qemu and has the
benefit of being supported by the upstream Linux kernel.  If someone can
implement work arounds to remove the restrictions introduced by kqemu, I'm
happy to avoid and/or revert this patch.

N.B. kqemu will still function in the 0.11 series but this patch removes it from
the 0.12 series.

Paul, please Ack or Nack this patch.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
 2009-08-24 08:02:55 -05:00
Andrzej Zaborowski
ef07b49145 Extract the Marvell 88w8618 audio device from musicpal.c 
Signed-off-by: Benoit Canet <benoit.canet@gmail.com>
Signed-off-by: Andrzej Zaborowski <balrogg@gmail.com>
 2009-08-23 15:44:15 +02:00
Andrzej Zaborowski
3ead03bd0a Extract musicpal.c I2C bitbanging code and make it gpio aware 
Signed-off-by: Benoit Canet <benoit.canet@gmail.com>
Signed-off-by: Andrzej Zaborowski <balrogg@gmail.com>
 2009-08-23 15:38:50 +02:00
Blue Swirl
facd285778 user: compile host-utils.c only once 
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
 2009-08-16 08:03:26 +00:00
Blue Swirl
e27b27b3c6 Simplify 5ba6531956b9b6486560cbd13604c2238a3542dd 
Thanks to Juan Quintela.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
 2009-08-16 07:39:33 +00:00
Blue Swirl
6af5a25246 linux-user: compile envlist.c only once 
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
 2009-08-15 08:47:42 +00:00
Blue Swirl
5ba6531956 user: compile ioport-user.c only for x86 
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
 2009-08-15 07:52:19 +00:00
Blue Swirl
370220865b user: compile path.c only once 
Also merge bsd-user/path.c and linux-user/path.c.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
 2009-08-15 07:51:59 +00:00
Anthony Liguori
562593aa8a Add emacs header to Makefile.target 
Signed-off-by: Anthony Liguori <aliguori@us.ibmc.om>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:11:27 -05:00
Juan Quintela
f14bfdf952 Move libsunpath to use the same style than everything else 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:48 -05:00
Juan Quintela
f622d8a33d convert gprof flags to style of rest of Makefile 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:48 -05:00
Juan Quintela
7973f21c4b Add cocoa libs at Darwin selection time 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:47 -05:00
Juan Quintela
f03029354e CURL libs are used both by tools and softmmu 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:47 -05:00
Juan Quintela
8e02e54cc4 VDE libs are used both by tools and softmmu 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:46 -05:00
Juan Quintela
e18ea868d2 use TARGET_<arch name> for selection 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:46 -05:00
Juan Quintela
55d9c04bc3 Consolidate audio flags in configure 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:46 -05:00
Juan Quintela
ed69c30dc6 remove last 3 uses of :=, everywhere else uses += or = 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:46 -05:00
Juan Quintela
4de67f2fa7 Make slirp include dir globlal in cflags 
We already include it everywhere

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:45 -05:00
Juan Quintela
864de24ad3 Use one less HELPER_CFLAGS 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:45 -05:00
Juan Quintela
b248a85ddc Use only one KVM_CFLAGS 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:45 -05:00
Juan Quintela
646560247c Move dis-* selection to configure 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:45 -05:00
Juan Quintela
471857dd01 Added CONFIG_NEED_MMU for microblaze and cris 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:44 -05:00
Juan Quintela
57ddfbf7f9 Generate more conmmon CFLAGS 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:44 -05:00
Juan Quintela
d02c1db3d8 Fold TARGET_GPROF handling in configure 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:44 -05:00
Juan Quintela
10a072a2bd this bit was already generated in configure 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:43 -05:00
Juan Quintela
c60d0afa65 Move ia64 QEMU_CFLAGS target to configure 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:43 -05:00
Juan Quintela
6ee7126f7c Move alpha CFLAGS target to configure 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:43 -05:00
Juan Quintela
d6b3893971 Introduce CONFIG_NOSOFTFLOAT and simplify Makefile.target 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:42 -05:00
Juan Quintela
76dfdd24de \!CONFIG_USER_ONLY == CONFIG_SOFTMMU 
Use this to simplify Makefile.target and remove negative logic

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:42 -05:00
Juan Quintela
7ce9361c5e remove duplicated TARGET_GPROF code 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:42 -05:00
Juan Quintela
264606b3a9 Fold BRLAPI_LIBS into libs_softmmu 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:41 -05:00
Juan Quintela
e4782985f9 Fold FDT_LIBS into libs_softmmu 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:41 -05:00
Juan Quintela
e482d56ad9 Fold BLUEZ_LIBS into libs_softmmu 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:41 -05:00
Juan Quintela
3efd632b82 Fold XEN_LIBS into libs_softmmu 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:41 -05:00
Juan Quintela
fa838301c9 Fold VNC_SASL_LIBS into libs_softmmu 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:41 -05:00
Juan Quintela
a5e32cc912 Fold VNC_TLS_LIBS into libs_softmmu 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:41 -05:00
Juan Quintela
d2ef30d5d3 Fold CURSES_LIBS into libsoftmmu_libs 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:41 -05:00
Juan Quintela
6362a53f55 Test if we need -lutil in ,/configure 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:41 -05:00
Juan Quintela
ba679e62f3 files are only compiled when CONFIG_ADLIB is defined 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:40 -05:00
Juan Quintela
a4bf678087 Move sound library selection to sound selection 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:40 -05:00
Juan Quintela
997e690ab9 move coreaudio libraries to coreaudio selection 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:40 -05:00
Juan Quintela
9f437a0919 gcc generates the right dependency for this file 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:40 -05:00
Juan Quintela
0705667e2e Add SDL_LIBS to libs_softmmu 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:40 -05:00
Juan Quintela
07d9ac4442 move SDL_LIBS Win32 hack to configure 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:39 -05:00
Juan Quintela
c81da56e97 Refactor HELPER_CFLAGS 
Calculate its value in ./configure.
Put together all its uses

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
 2009-08-10 13:05:39 -05:00