Commit Graph

168 Commits

Author SHA1 Message Date
aliguori
03ff3ca30f Use common objects for qemu-img and qemu-nbd
Right now, we sprinkle #if defined(QEMU_IMG) && defined(QEMU_NBD) all over the
code.  It's ugly and causes us to have to build multiple object files for
linking against qemu and the tools.

This patch introduces a new file, qemu-tool.c which contains enough for
qemu-img, qemu-nbd, and QEMU to all share the same objects.

This also required getting qemu-nbd to be a bit more Windows friendly.  I also
changed the Windows block-raw to use normal IO instead of overlapping IO since
we don't actually do AIO yet on Windows.  I changed the various #if 0's to
 #if WIN32_AIO to make it easier for someone to eventually fix AIO on Windows.

After this patch, there are no longer any #ifdef's related to qemu-img and
qemu-nbd.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5226 c046a42c-6fe2-441c-8c8c-71466251a162
2008-09-15 15:51:35 +00:00
aliguori
a3392f9b10 Only build compatfd when using AIO and make sure to always init AIO
OpenBSD doesn't use AIO so don't try to build compatfd when not using AIO.

Also make sure to call qemu_aio_init() from bdrv_init.  Everything that uses
bdrv calls bdrv_init so it makes sense to init aio from there instead of
in every single tool.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5197 c046a42c-6fe2-441c-8c8c-71466251a162
2008-09-11 18:00:19 +00:00
aliguori
baf35cb902 Use signalfd() to work around signal/select race
This patch introduces signalfd() to work around the signal/select race in
checking for AIO completions.  For platforms that don't support signalfd(), we
emulate it with threads.

There was a long discussion about this approach.  I don't believe there are any
fundamental problems with this approach and I believe eliminating the use of
signals is a good thing.

I've tested Windows and Linux using Windows and Linux guests.  I've also checked
for disk IO performance regressions.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5187 c046a42c-6fe2-441c-8c8c-71466251a162
2008-09-10 15:45:19 +00:00
aliguori
cd01b4a312 Fix windows build
Right now, the Windows build is broken because of NBD.  Using a mingw32 cross
compiler is also badly broken.

This patch fixes the Windows build by stubbing out NBD support until someone
fixes it for Windows.  It also santizing the mingw32 cross compiler support
by replacing the --enable-mingw32 option with a compiler check to determine
if we're on windows or not.

Also remove the weird SDL pseudo-detection for mingw32 using a cross compiler.
The hardcoded sdl-config name is seemly arbitrary.  If you cross compiler SDL
correctly and modify your PATH variable appropriately, it will Just Work when
cross compiling.

The audio driver detection is also broken for cross compiling so you have to
specify the audio drivers explicitly for now.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>




git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5046 c046a42c-6fe2-441c-8c8c-71466251a162
2008-08-21 19:25:45 +00:00
aliguori
7e00eb9b98 Fix compilation of nbd on Solaris (Andreas Faerber)
Compilation of QEMU is currently broken on Solaris due to nbd's use of _IO and
due to network libraries not being linked into qemu-img.

The attached patch adds the appropriate libraries (copied from Makefile.target)
and includes an additional Sun-specific header for _IO.

With these fixes it compiles okay, on OpenSolaris snv_93 (amd64).

Signed-off-by: Andreas Faerber <andreas.faerber@web.de> 
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4982 c046a42c-6fe2-441c-8c8c-71466251a162
2008-08-02 01:57:02 +00:00
aliguori
2991990b18 Add e1000 etherboot ROM from http://www.rom-o-matic.net
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4952 c046a42c-6fe2-441c-8c8c-71466251a162
2008-07-26 16:53:22 +00:00
ths
8a16d27388 Add Virtual Distributed Ethernet native support, by Luca Bigliardi.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4896 c046a42c-6fe2-441c-8c8c-71466251a162
2008-07-19 09:56:24 +00:00
balrog
6c9f886cea Add CDC-Ethernet usb NIC (original patch from Thomas Sailer).
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4884 c046a42c-6fe2-441c-8c8c-71466251a162
2008-07-17 20:47:13 +00:00
ths
75818250ba Allow QEMU to connect directly to an NBD server, by Laurent Vivier.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4838 c046a42c-6fe2-441c-8c8c-71466251a162
2008-07-03 13:41:03 +00:00
ths
2f7264888a Add a parameter to disable host cache, by Laurent Vivier.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4836 c046a42c-6fe2-441c-8c8c-71466251a162
2008-07-03 11:47:46 +00:00
malc
96935aa4e3 Add -MT
Unbreaks dependency generation for audio, slirp and tests

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4828 c046a42c-6fe2-441c-8c8c-71466251a162
2008-07-02 21:16:22 +00:00
malc
b8e59f18de Pulseaudio driver
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4827 c046a42c-6fe2-441c-8c8c-71466251a162
2008-07-02 21:03:08 +00:00
pbrook
17e2377abf Prevent guest reusing host memory allocations.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4710 c046a42c-6fe2-441c-8c8c-71466251a162
2008-06-09 13:47:45 +00:00
pbrook
cec7d0b6e1 Don't link usermode emulation against libqemu_common.a
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4607 c046a42c-6fe2-441c-8c8c-71466251a162
2008-05-28 16:44:57 +00:00
bellard
7a5ca8648b qemu-nbd tool (Anthony Liguori)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4596 c046a42c-6fe2-441c-8c8c-71466251a162
2008-05-27 21:13:40 +00:00
balrog
1d4e547b55 Add the LM8323-based keyboard of N810.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4400 c046a42c-6fe2-441c-8c8c-71466251a162
2008-05-09 22:16:11 +00:00
blueswir1
938255d2f7 Copy Sparc64 firmware when installing (Hervé Poussineau)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4244 c046a42c-6fe2-441c-8c8c-71466251a162
2008-04-23 19:38:07 +00:00
aurel32
99c6c082ff Ignore .git and .svn in Makefile, noticed by Stefan Weil.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4241 c046a42c-6fe2-441c-8c8c-71466251a162
2008-04-22 20:45:30 +00:00
balrog
7e7c5e4c1b Nokia N800 machine support (ARM).
Also add various peripherals: two miscellaneous Nokia CBUS chips,
EPSON S1D13745 LCD/TV remote-framebuffer controller,
TWL92230 - standard OMAP2 power management companion chip on i2c.
Generic OneNAND flash memory,
TMP105 temperature sensor on i2c.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4215 c046a42c-6fe2-441c-8c8c-71466251a162
2008-04-14 21:57:44 +00:00
aurel32
2e4d9fb126 Braille device support
(Samuel Thibault)


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4173 c046a42c-6fe2-441c-8c8c-71466251a162
2008-04-08 06:01:02 +00:00
pbrook
f5d28393ca Remove stray BASE_CFLAGS.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4155 c046a42c-6fe2-441c-8c8c-71466251a162
2008-03-31 23:41:24 +00:00
blueswir1
18be8d775e Properly bomb out on errors in Makefile shell fragments (Ian Jackson)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4019 c046a42c-6fe2-441c-8c8c-71466251a162
2008-03-05 18:16:09 +00:00
balrog
4d3b6f6e12 Add an ncurses UI.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3976 c046a42c-6fe2-441c-8c8c-71466251a162
2008-02-10 16:33:14 +00:00
bellard
2e2ea909c2 typo
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3941 c046a42c-6fe2-441c-8c8c-71466251a162
2008-02-01 10:02:52 +00:00
bellard
40293e580d Makefile cleanup - more generic support of 32 bit compilation on x86_64
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3937 c046a42c-6fe2-441c-8c8c-71466251a162
2008-01-31 11:32:10 +00:00
balrog
ca9cc28c62 pthreads-based audio and miscellaneous audio clean-up (malc).
ESD support (malc, Frederick Reeve).


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3917 c046a42c-6fe2-441c-8c8c-71466251a162
2008-01-14 04:24:29 +00:00
balrog
a795421883 USB-to-serial device (Samuel Thibault).
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3914 c046a42c-6fe2-441c-8c8c-71466251a162
2008-01-14 03:41:02 +00:00
balrog
b94ec3eca8 Fully clean up on Mac OS X Leopard (Andreas Färber).
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3907 c046a42c-6fe2-441c-8c8c-71466251a162
2008-01-14 02:36:29 +00:00
bellard
f0403c037d update binary distribution
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3894 c046a42c-6fe2-441c-8c8c-71466251a162
2008-01-06 18:27:12 +00:00
ths
985a03b0ce Real SCSI device passthrough (v4), by Laurent Vivier.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3851 c046a42c-6fe2-441c-8c8c-71466251a162
2007-12-24 16:10:43 +00:00
ths
223d4670a0 Split block-raw.c into block-raw-posix.c and block-raw-win32.c, by
Anthony Liguori.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3814 c046a42c-6fe2-441c-8c8c-71466251a162
2007-12-15 17:28:36 +00:00
ths
85ffbdfc72 SH4 big endian configuration, by Tomoyoshi Asano.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3784 c046a42c-6fe2-441c-8c8c-71466251a162
2007-12-09 05:10:03 +00:00
pbrook
775616c3ae Partial SD card SPI mode support.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3731 c046a42c-6fe2-441c-8c8c-71466251a162
2007-11-24 23:35:08 +00:00
ths
d5db424633 Use CONFIG_VNC_TLS_CFLAGS for building vnc.o.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3694 c046a42c-6fe2-441c-8c8c-71466251a162
2007-11-18 21:33:07 +00:00
pbrook
8c462f8ff5 Fix out of tree builds.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3692 c046a42c-6fe2-441c-8c8c-71466251a162
2007-11-18 21:12:37 +00:00
pbrook
cf0dbb2115 Luminary board input support.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3689 c046a42c-6fe2-441c-8c8c-71466251a162
2007-11-18 14:36:08 +00:00
pbrook
87ecb68bdf Break up vl.h.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3674 c046a42c-6fe2-441c-8c8c-71466251a162
2007-11-17 17:14:51 +00:00
bellard
9b0b82037a removed obsolete test2 target
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3640 c046a42c-6fe2-441c-8c8c-71466251a162
2007-11-14 10:34:57 +00:00
pbrook
faf07963cb Split block API from vl.h.
Remove QEMU_TOOL. Replace with QEMU_IMG and NEED_CPU_H.
Avoid linking qemu-img against whole system emulatior.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3578 c046a42c-6fe2-441c-8c8c-71466251a162
2007-11-11 02:51:17 +00:00
pbrook
da0b0df8c7 Fix Makefile dependencies.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3569 c046a42c-6fe2-441c-8c8c-71466251a162
2007-11-10 19:30:52 +00:00
bellard
4fb240a495 compile common code once
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3543 c046a42c-6fe2-441c-8c8c-71466251a162
2007-11-07 19:24:02 +00:00
ths
932a79df5d Don't install tools if $(TOOLS) is empty, by Thayne Harbaugh.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3415 c046a42c-6fe2-441c-8c8c-71466251a162
2007-10-20 18:29:34 +00:00
ths
540635ba65 Code provision for n32/n64 mips userland emulation. Not functional yet.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3284 c046a42c-6fe2-441c-8c8c-71466251a162
2007-09-30 01:58:33 +00:00
ths
4887d78b01 Don't hardcode the host architecture name.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3276 c046a42c-6fe2-441c-8c8c-71466251a162
2007-09-29 21:22:33 +00:00
ths
ff1aaf65e7 Update tarbin rule.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3275 c046a42c-6fe2-441c-8c8c-71466251a162
2007-09-29 21:18:26 +00:00
pbrook
c39e33380f Only build qemu-img with softmmu targets.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3207 c046a42c-6fe2-441c-8c8c-71466251a162
2007-09-22 16:49:14 +00:00
ths
5fafdf24ef find -type f | xargs sed -i 's/[\t ]$//g' # on most files
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3173 c046a42c-6fe2-441c-8c8c-71466251a162
2007-09-16 21:08:06 +00:00
ths
6ada7453aa Parallels disk image support, by Alex Beregszaszi.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3102 c046a42c-6fe2-441c-8c8c-71466251a162
2007-07-31 23:28:53 +00:00
ths
e56869531a Remove cscope.* files on 'make clean', by George G. Davis.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2986 c046a42c-6fe2-441c-8c8c-71466251a162
2007-06-17 16:41:04 +00:00
ths
860c6c526f Delete linux_boot.bin from the install target.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2839 c046a42c-6fe2-441c-8c8c-71466251a162
2007-05-20 10:54:50 +00:00