Loading .gitignore +2 −0 Original line number Diff line number Diff line Loading @@ -4,6 +4,8 @@ config-host.* config-target.* trace.h trace.c trace-dtrace.h trace-dtrace.dtrace *-timestamp *-softmmu *-darwin-user Loading MAINTAINERS +417 −77 Original line number Diff line number Diff line QEMU Maintainers ================ Project leaders: ---------------- The intention of this file is not to establish who owns what portions of the code base, but to provide a set of names that developers can consult when they have a question about a particular subset and also to provide a set of names to be CC'd when submitting a patch to obtain appropriate review. Fabrice Bellard Paul Brook In general, if you have a question about inclusion of a patch, you should consult qemu-devel and not any specific individual privately. CPU cores: ---------- Descriptions of section entries: M: Mail patches to: FullName <address@domain> L: Mailing list that is relevant to this area W: Web-page with status/info Q: Patchwork web based patch tracking system site T: SCM tree type and location. Type is one of: git, hg, quilt, stgit. S: Status, one of the following: Supported: Someone is actually paid to look after this. Maintained: Someone actually looks after it. Odd Fixes: It has a maintainer but they don't have time to do much other than throw the odd patch in. See below.. Orphan: No current maintainer [but maybe you could take the role as you write your new code]. Obsolete: Old code. Something tagged obsolete generally means it has been replaced by a better system and you should be using that. F: Files and directories with wildcard patterns. A trailing slash includes all files and subdirectory files. F: drivers/net/ all files in and below drivers/net F: drivers/net/* all files in drivers/net, but not below F: */net/* all files in "any top level directory"/net One pattern per line. Multiple F: lines acceptable. X: Files and directories that are NOT maintained, same rules as F: Files exclusions are tested before file matches. Can be useful for excluding a specific subdirectory, for instance: F: net/ X: net/ipv6/ matches all files in and below net excluding net/ipv6/ K: Keyword perl extended regex pattern to match content in a patch or file. For instance: K: of_get_profile matches patches or files that contain "of_get_profile" K: \b(printk|pr_(info|err))\b matches patches or files that contain one or more of the words printk, pr_info or pr_err One regex pattern per line. Multiple K: lines acceptable. General Project Administration ------------------------------ M: Anthony Liguori <aliguori@us.ibm.com> M: Paul Brook <paul@codesourcery.com> Guest CPU cores (TCG): ---------------------- Alpha M: qemu-devel@nongnu.org S: Orphan F: target-alpha/ x86 Fabrice Bellard ARM Paul Brook SPARC Blue Swirl MIPS ? PowerPC Alexander Graf M68K Paul Brook SH4 ? CRIS Edgar E. Iglesias Alpha ? MicroBlaze Edgar E. Iglesias S390 ? Machines (sorted by CPU): ------------------------- x86 pc.c Fabrice Bellard (new maintainer needed) ARM integratorcp.c Paul Brook versatilepb.c Paul Brook Real View Paul Brook spitz.c Andrzej Zaborowski palm.c Andrzej Zaborowski nseries.c Andrzej Zaborowski stellaris.c Paul Brook gumstix.c Thorsten Zitterell mainstone.c Armin Kuster musicpal.c Jan Kiszka SPARC sun4u.c Blue Swirl sun4m.c Blue Swirl M: Paul Brook <paul@codesourcery.com> S: Maintained F: target-arm/ CRIS M: Edgar E. Iglesias <edgar.iglesias@gmail.com> S: Maintained F: target-cris/ M68K M: Paul Brook <paul@codesourcery.com> S: Maintained F: target-m68k/ MicroBlaze M: Edgar E. Iglesias <edgar.iglesias@gmail.com> S: Maintained F: target-microblaze/ MIPS mips_r4k.c Aurelien Jarno mips_malta.c Aurelien Jarno mips_jazz.c Hervé Poussineau mips_mipssim.c ? M: qemu-devel@nongnu.org S: Orphan F: target-mips/ PowerPC ppc_prep.c ? ppc_oldworld.c Alexander Graf ppc_newworld.c Alexander Graf ppc405_boards.c Alexander Graf M86K mcf5208.c Paul Brook an5206.c Paul Brook dummy_m68k.c Paul Brook M: Alexander Graf <agraf@suse.de> S: Maintained F: target-ppc/ S390 M: Alexander Graf <agraf@suse.de> S: Maintained F: target-s390x/ SH4 shix.c ? r2d.c Magnus Damm CRIS etraxfs.c Edgar E. Iglesias axis_dev88.c Edgar E. Iglesias Alpha MicroBlaze petalogix_s3adsp1800.c Edgar E. Iglesias M: qemu-devel@nongnu.org S: Orphan F: target-sh4/ SPARC M: Blue Swirl <blauwirbel@gmail.com> S: Maintained F: target-sparc/ X86 M: qemu-devel@nongnu.org S: Odd Fixes F: target-i386/ Guest CPU Cores (KVM): ---------------------- Overall M: Avi Kivity <avi@redhat.com> M: Marcelo Tosatti <mtosatti@redhat.com> L: kvm@vger.kernel.org S: Supported F: kvm-* F: */kvm.* PPC M: Alexander Graf <agraf@suse.de> S: Maintained F: target-ppc/kvm.c S390 s390-*.c Alexander Graf M: Alexander Graf <agraf@suse.de> S: Maintained F: target-s390x/kvm.c X86 M: Avi Kivity <avi@redhat.com> M: Marcelo Tosatti <mtosatti@redhat.com> L: kvm@vger.kernel.org S: Supported F: target-i386/kvm.c ARM Machines ------------ Gumstix M: qemu-devel@nongnu.org S: Orphan F: hw/gumstix.c Integrator CP M: Paul Brook <paul@codesourcery.com> S: Maintained F: hw/integratorcp.c Mainstone M: qemu-devel@nongnu.org S: Orphan F: hw/mainstone.c Musicpal M: Jan Kiszka <jan.kiszka@web.de> S: Maintained F: hw/musicpal.c nSeries M: Andrzej Zaborowski <balrogg@gmail.com> S: Maintained F: hw/nseries.c Palm M: Andrzej Zaborowski <balrogg@gmail.com> S: Maintained F: hw/palm.c Real View M: Paul Brook <paul@codesourcery.com> S: Maintained F: hw/realview* Spitz M: Andrzej Zaborowski <balrogg@gmail.com> S: Maintained F: hw/spitz.c Stellaris M: Paul Brook <paul@codesourcery.com> S: Maintained F: hw/stellaris.c Versatile PB M: Paul Brook <paul@codesourcery.com> S: Maintained F: hw/versatilepb.c CRIS Machines ------------- Axis Dev88 M: Edgar E. Iglesias <edgar.iglesias@gmail.com> S: Maintained F: hw/axis_dev88.c Generic Subsystems: etraxfs M: Edgar E. Iglesias <edgar.iglesias@gmail.com> S: Maintained F: hw/etraxfs.c M86K Machines ------------- an5206 M: Paul Brook <paul@codesourcery.com> S: Maintained F: hw/an5206.c dummy_m68k M: Paul Brook <paul@codesourcery.com> S: Maintained F: hw/dummy_m68k.c mcf5208 M: Paul Brook <paul@codesourcery.com> S: Maintained F: hw/mcf5208.c MicroBlaze Machines ------------------- petalogix_s3adsp1800 M: Edgar E. Iglesias <edgar.iglesias@gmail.com> S: Maintained F: hw/petalogix_s3adsp1800.c MIPS Machines ------------- Jazz M: Hervé Poussineau <hpoussin@reactos.org> S: Maintained F: hw/mips_jazz.c Malta M: Aurelien Jarno <aurelien@aurel32.net> S: Maintained F: hw/mips_malta.c Mipssim M: qemu-devel@nongnu.org S: Orphan F: hw/mips_mipssim.c R4000 M: Aurelien Jarno <aurelien@aurel32.net> S: Maintained F: hw/mips_r4k.c PowerPC Machines ---------------- 405 M: Alexander Graf <agraf@suse.de> S: Maintained F: hw/ppc405_boards.c New World M: Alexander Graf <agraf@suse.de> S: Maintained F: hw/ppc_newworld.c Old World M: Alexander Graf <agraf@suse.de> S: Maintained F: hw/ppc_oldworld.c Prep M: qemu-devel@nongnu.org S: Orphan F: hw/ppc_prep.c SH4 Machines ------------ R2D M: Magnus Damm <magnus.damm@gmail.com> S: Maintained F: hw/r2d.c Shix M: Magnus Damm <magnus.damm@gmail.com> S: Oprhan F: hw/shix.c SPARC Machines -------------- Sun4m M: Blue Swirl <blauwirbel@gmail.com> S: Maintained F: hw/sun4m.c Sun4u M: Blue Swirl <blauwirbel@gmail.com> S: Maintained F: hw/sun4u.c S390 Machines ------------- S390 Virtio M: Alexander Graf <agraf@suse.de> S: Maintained F: hw/s390-*.c X86 Machines ------------ PC M: Anthony Liguori <aliguori@us.ibm.com> S: Supported F: hw/pc.[ch] hw/pc_piix.c Devices ------- IDE M: Kevin Wolf <kwolf@redhat.com> S: Odd Fixes F: hw/ide/ PCI M: Michael S. Tsirkin <mst@redhat.com> S: Supported F: hw/pci* F: hw/piix* SCSI M: Paul Brook <paul@codesourcery.com> M: Kevin Wolf <kwolf@redhat.com> S: Odd Fixes F: hw/lsi53c895a.c F: hw/scsi* USB M: qemu-devel@nongnu.org S: Odd Fixes F: hw/usb* vhost M: Michael S. Tsirkin <mst@redhat.com> S: Supported F: hw/vhost* virtio M: Anthony Liguori <aliguori@us.ibm.com> S: Supported F: hw/virtio* virtio-9p M: Venkateswararao Jujjuri (JV) <jvrao@linux.vnet.ibm.com> S: Supported F: hw/virtio-9p* virtio-blk M: Kevin Wolf <kwolf@redhat.com> S: Supported F: hw/virtio-blk* virtio-serial M: Amit Shah <amit.shah@redhat.com> S: Supported F: hw/virtio-serial* F: hw/virtio-console* Subsystems ---------- Audio M: Vassili Karpov (malc) <av1474@comtv.ru> S: Maintained F: audio/ Block M: Kevin Wolf <kwolf@redhat.com> S: Supported F: block* F: block/ Character Devices M: Anthony Liguori <aliguori@us.ibm.com> S: Maintained F: qemu-char.c GDB stub M: qemu-devel@nongnu.org S: Odd Fixes F: gdbstub* F: gdb-xml/ Graphics M: Anthony Liguori <aliguori@us.ibm.com> S: Maintained F: ui/ Main loop M: Anthony Liguori <aliguori@us.ibm.com> S: Supported F: vl.c Monitor (QMP/HMP) M: Luiz Capitulino <lcapitulino@redhat.com> M: Markus Armbruster <armbru@redhat.com> S: Supported F: monitor.c Network device layer M: Anthony Liguori <aliguori@us.ibm.com> M: Mark McLoughlin <markmc@redhat.com> S: Maintained F: net/ SLIRP M: qemu-devel@nongnu.org S: Orphan F: slirp/ Usermode Emulation ------------------ BSD user M: Blue Swirl <blauwirbel@gmail.com> S: Maintained F: bsd-user/ Darwin user M: qemu-devel@nongnu.org S: Orphan F: darwin-user/ Dynamic translator Fabrice Bellard Main loop Fabrice Bellard (new maintainer needed) TCG Fabrice Bellard IDE device ? SCSI device Paul Brook PCI layer Michael S. Tsirkin USB layer ? Block layer ? Graphic layer ? Audio device layer Vassili Karpov (malc) Character device layer ? Network device layer ? GDB stub ? Linux user ? Darwin user ? SLIRP ? Linux user M: Riku Voipio <riku.voipio@iki.fi> S: Maintained F: linux-user/ Makefile +41 −14 Original line number Diff line number Diff line # Makefile for QEMU. GENERATED_HEADERS = config-host.h trace.h qemu-options.def ifeq ($(TRACE_BACKEND),dtrace) GENERATED_HEADERS += trace-dtrace.h endif ifneq ($(wildcard config-host.mak),) # Put the all: rule here so that config-host.mak can contain dependencies. Loading Loading @@ -36,18 +39,19 @@ endif SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory) SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS)) SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %/config-devices.mak.d, $(TARGET_DIRS)) config-all-devices.mak: $(SUBDIR_DEVICES_MAK) $(call quiet-command,cat $(SUBDIR_DEVICES_MAK) | grep =y | sort -u > $@," GEN $@") -include $(SUBDIR_DEVICES_MAK_DEP) %/config-devices.mak: default-configs/%.mak $(call quiet-command,cat $< > $@.tmp, " GEN $@") $(call quiet-command,$(SHELL) $(SRC_PATH)/make_device_config.sh $@ $<, " GEN $@") @if test -f $@; then \ if cmp -s $@.old $@; then \ if ! cmp -s $@ $@.tmp; then \ mv $@.tmp $@; \ cp -p $@ $@.old; \ fi; \ else \ if test -f $@.old; then \ echo "WARNING: $@ (user modified) out of date.";\ Loading Loading @@ -108,7 +112,11 @@ ui/vnc.o: QEMU_CFLAGS += $(VNC_TLS_CFLAGS) bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS) ifeq ($(TRACE_BACKEND),dtrace) trace.h: trace.h-timestamp trace-dtrace.h else trace.h: trace.h-timestamp endif trace.h-timestamp: $(SRC_PATH)/trace-events config-host.mak $(call quiet-command,sh $(SRC_PATH)/tracetool --$(TRACE_BACKEND) -h < $< > $@," GEN trace.h") @cmp -s $@ trace.h || cp $@ trace.h Loading @@ -120,6 +128,20 @@ trace.c-timestamp: $(SRC_PATH)/trace-events config-host.mak trace.o: trace.c $(GENERATED_HEADERS) trace-dtrace.h: trace-dtrace.dtrace $(call quiet-command,dtrace -o $@ -h -s $<, " GEN trace-dtrace.h") # Normal practice is to name DTrace probe file with a '.d' extension # but that gets picked up by QEMU's Makefile as an external dependancy # rule file. So we use '.dtrace' instead trace-dtrace.dtrace: trace-dtrace.dtrace-timestamp trace-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events config-host.mak $(call quiet-command,sh $(SRC_PATH)/tracetool --$(TRACE_BACKEND) -d < $< > $@," GEN trace-dtrace.dtrace") @cmp -s $@ trace-dtrace.dtrace || cp $@ trace-dtrace.dtrace trace-dtrace.o: trace-dtrace.dtrace $(GENERATED_HEADERS) $(call quiet-command,dtrace -o $@ -G -s $<, " GEN trace-dtrace.o") simpletrace.o: simpletrace.c $(GENERATED_HEADERS) version.o: $(SRC_PATH)/version.rc config-host.mak Loading @@ -129,7 +151,7 @@ version-obj-$(CONFIG_WIN32) += version.o ###################################################################### qemu-img.o: qemu-img-cmds.h qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o: $(GENERATED_HEADERS) qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o cmd.o: $(GENERATED_HEADERS) qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(oslib-obj-y) $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o Loading @@ -142,12 +164,14 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o: $(GENERATED_HEADERS) check-qint: check-qint.o qint.o qemu-malloc.o $(trace-obj-y) check-qstring: check-qstring.o qstring.o qemu-malloc.o $(trace-obj-y) check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qemu-malloc.o qlist.o $(trace-obj-y) check-qlist: check-qlist.o qlist.o qint.o qemu-malloc.o $(trace-obj-y) check-qfloat: check-qfloat.o qfloat.o qemu-malloc.o $(trace-obj-y) check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjson.o json-streamer.o json-lexer.o json-parser.o qemu-malloc.o $(trace-obj-y) CHECK_PROG_DEPS = qemu-malloc.o $(oslib-obj-y) $(trace-obj-y) check-qint: check-qint.o qint.o $(CHECK_PROG_DEPS) check-qstring: check-qstring.o qstring.o $(CHECK_PROG_DEPS) check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qlist.o $(CHECK_PROG_DEPS) check-qlist: check-qlist.o qlist.o qint.o $(CHECK_PROG_DEPS) check-qfloat: check-qfloat.o qfloat.o $(CHECK_PROG_DEPS) check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjson.o json-streamer.o json-lexer.o json-parser.o $(CHECK_PROG_DEPS) clean: # avoid old build problems by removing potentially incorrect old files Loading @@ -157,6 +181,8 @@ clean: rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d rm -f qemu-img-cmds.h rm -f trace.c trace.h trace.c-timestamp trace.h-timestamp rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp rm -f trace-dtrace.h trace-dtrace.h-timestamp $(MAKE) -C tests clean for d in $(ALL_SUBDIRS) libhw32 libhw64 libuser libdis libdis-user; do \ if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \ Loading @@ -178,8 +204,9 @@ ar de en-us fi fr-be hr it lv nl pl ru th \ common de-ch es fo fr-ca hu ja mk nl-be pt sl tr ifdef INSTALL_BLOBS BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ openbios-sparc32 openbios-sparc64 openbios-ppc \ BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin \ vgabios-stdvga.bin vgabios-vmware.bin \ ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc \ gpxe-eepro100-80861209.rom \ pxe-e1000.bin \ pxe-ne2k_pci.bin pxe-pcnet.bin \ Loading Makefile.objs +27 −11 Original line number Diff line number Diff line Loading @@ -42,6 +42,11 @@ net-nested-$(CONFIG_SLIRP) += slirp.o net-nested-$(CONFIG_VDE) += vde.o net-obj-y += $(addprefix net/, $(net-nested-y)) ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS),yy) # Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add. # only pull in the actual virtio-9p device if we also enabled virtio. CONFIG_REALLY_VIRTFS=y endif fsdev-nested-$(CONFIG_VIRTFS) = qemu-fsdev.o fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y)) Loading Loading @@ -102,6 +107,7 @@ common-obj-$(CONFIG_SPICE) += ui/spice-core.o ui/spice-input.o ui/spice-display. audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o audio-obj-$(CONFIG_SDL) += sdlaudio.o audio-obj-$(CONFIG_OSS) += ossaudio.o audio-obj-$(CONFIG_SPICE) += spiceaudio.o audio-obj-$(CONFIG_COREAUDIO) += coreaudio.o audio-obj-$(CONFIG_ALSA) += alsaaudio.o audio-obj-$(CONFIG_DSOUND) += dsoundaudio.o Loading Loading @@ -158,9 +164,13 @@ user-obj-y += cutils.o cache-utils.o hw-obj-y = hw-obj-y += vl.o loader.o hw-obj-y += virtio.o virtio-console.o hw-obj-y += fw_cfg.o pci.o pci_host.o pcie_host.o pci_bridge.o hw-obj-y += ioh3420.o xio3130_upstream.o xio3130_downstream.o hw-obj-$(CONFIG_VIRTIO) += virtio.o virtio-console.o hw-obj-y += fw_cfg.o # FIXME: Core PCI code and its direct dependencies are required by the # QMP query-pci command. hw-obj-y += pci.o pci_bridge.o msix.o msi.o hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o hw-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o hw-obj-y += watchdog.o hw-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o hw-obj-$(CONFIG_ECC) += ecc.o Loading Loading @@ -205,15 +215,16 @@ hw-obj-$(CONFIG_PPCE500_PCI) += ppce500_pci.o hw-obj-$(CONFIG_PIIX4) += piix4.o # PCI watchdog devices hw-obj-y += wdt_i6300esb.o hw-obj-$(CONFIG_PCI) += wdt_i6300esb.o hw-obj-y += pcie.o pcie_aer.o pcie_port.o hw-obj-y += msix.o msi.o hw-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o hw-obj-$(CONFIG_PCI) += msix.o msi.o # PCI network cards hw-obj-y += ne2000.o hw-obj-y += eepro100.o hw-obj-y += pcnet.o hw-obj-$(CONFIG_NE2000_PCI) += ne2000.o hw-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o hw-obj-$(CONFIG_PCNET_PCI) += pcnet-pci.o hw-obj-$(CONFIG_PCNET_COMMON) += pcnet.o hw-obj-$(CONFIG_SMC91C111) += smc91c111.o hw-obj-$(CONFIG_LAN9118) += lan9118.o Loading @@ -230,7 +241,7 @@ hw-obj-$(CONFIG_IDE_MACIO) += ide/macio.o hw-obj-$(CONFIG_IDE_VIA) += ide/via.o # SCSI layer hw-obj-y += lsi53c895a.o hw-obj-$(CONFIG_LSI_SCSI_PCI) += lsi53c895a.o hw-obj-$(CONFIG_ESP) += esp.o hw-obj-y += dma-helpers.o sysbus.o isa-bus.o Loading Loading @@ -260,7 +271,8 @@ sound-obj-$(CONFIG_HDA) += intel-hda.o hda-audio.o adlib.o fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0 hw-obj-$(CONFIG_SOUND) += $(sound-obj-y) hw-obj-$(CONFIG_VIRTFS) += virtio-9p-debug.o virtio-9p-local.o virtio-9p-xattr.o hw-obj-$(CONFIG_REALLY_VIRTFS) += virtio-9p-debug.o hw-obj-$(CONFIG_VIRTFS) += virtio-9p-local.o virtio-9p-xattr.o hw-obj-$(CONFIG_VIRTFS) += virtio-9p-xattr-user.o virtio-9p-posix-acl.o ###################################################################### Loading @@ -285,11 +297,15 @@ libdis-$(CONFIG_SPARC_DIS) += sparc-dis.o ###################################################################### # trace ifeq ($(TRACE_BACKEND),dtrace) trace-obj-y = trace-dtrace.o else trace-obj-y = trace.o ifeq ($(TRACE_BACKEND),simple) trace-obj-y += simpletrace.o user-obj-y += qemu-timer-common.o endif endif vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) Loading Makefile.target +33 −5 Original line number Diff line number Diff line Loading @@ -30,6 +30,7 @@ endif endif PROGS=$(QEMU_PROG) STPFILES= ifndef CONFIG_HAIKU LIBS+=-lm Loading @@ -40,7 +41,27 @@ kvm.o kvm-all.o vhost.o vhost_net.o: QEMU_CFLAGS+=$(KVM_CFLAGS) config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak all: $(PROGS) ifdef CONFIG_SYSTEMTAP_TRACE stap: $(QEMU_PROG).stp ifdef CONFIG_USER_ONLY TARGET_TYPE=user else TARGET_TYPE=system endif $(QEMU_PROG).stp: $(call quiet-command,sh $(SRC_PATH)/tracetool \ --$(TRACE_BACKEND) \ --binary $(bindir)/$(QEMU_PROG) \ --target-arch $(TARGET_ARCH) \ --target-type $(TARGET_TYPE) \ --stap < $(SRC_PATH)/trace-events > $(QEMU_PROG).stp," GEN $(QEMU_PROG).stp") else stap: endif all: $(PROGS) stap # Dummy command so that make thinks it has done something @true Loading Loading @@ -167,11 +188,11 @@ ifdef CONFIG_SOFTMMU obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o obj-y += vhost_net.o obj-$(CONFIG_VHOST_NET) += vhost.o obj-$(CONFIG_VIRTFS) += virtio-9p.o obj-$(CONFIG_REALLY_VIRTFS) += virtio-9p.o obj-y += rwhandler.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_NO_KVM) += kvm-stub.o Loading @@ -189,8 +210,8 @@ obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o obj-$(CONFIG_USB_OHCI) += usb-ohci.o # PCI network cards obj-y += rtl8139.o obj-y += e1000.o obj-$(CONFIG_RTL8139_PCI) += rtl8139.o obj-$(CONFIG_E1000_PCI) += e1000.o # Inter-VM PCI shared memory obj-$(CONFIG_KVM) += ivshmem.o Loading Loading @@ -340,6 +361,9 @@ clean: rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o rm -f *.d */*.d tcg/*.o ide/*.o rm -f hmp-commands.h qmp-commands.h gdbstub-xml.c ifdef CONFIG_SYSTEMTAP_TRACE rm -f *.stp endif install: all ifneq ($(PROGS),) Loading @@ -348,6 +372,10 @@ ifneq ($(STRIP),) $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS)) endif endif ifdef CONFIG_SYSTEMTAP_TRACE $(INSTALL_DIR) "$(DESTDIR)$(datadir)/../systemtap/tapset" $(INSTALL_DATA) $(QEMU_PROG).stp "$(DESTDIR)$(datadir)/../systemtap/tapset" endif # Include automatically generated dependency files -include $(wildcard *.d */*.d) Loading
.gitignore +2 −0 Original line number Diff line number Diff line Loading @@ -4,6 +4,8 @@ config-host.* config-target.* trace.h trace.c trace-dtrace.h trace-dtrace.dtrace *-timestamp *-softmmu *-darwin-user Loading
MAINTAINERS +417 −77 Original line number Diff line number Diff line QEMU Maintainers ================ Project leaders: ---------------- The intention of this file is not to establish who owns what portions of the code base, but to provide a set of names that developers can consult when they have a question about a particular subset and also to provide a set of names to be CC'd when submitting a patch to obtain appropriate review. Fabrice Bellard Paul Brook In general, if you have a question about inclusion of a patch, you should consult qemu-devel and not any specific individual privately. CPU cores: ---------- Descriptions of section entries: M: Mail patches to: FullName <address@domain> L: Mailing list that is relevant to this area W: Web-page with status/info Q: Patchwork web based patch tracking system site T: SCM tree type and location. Type is one of: git, hg, quilt, stgit. S: Status, one of the following: Supported: Someone is actually paid to look after this. Maintained: Someone actually looks after it. Odd Fixes: It has a maintainer but they don't have time to do much other than throw the odd patch in. See below.. Orphan: No current maintainer [but maybe you could take the role as you write your new code]. Obsolete: Old code. Something tagged obsolete generally means it has been replaced by a better system and you should be using that. F: Files and directories with wildcard patterns. A trailing slash includes all files and subdirectory files. F: drivers/net/ all files in and below drivers/net F: drivers/net/* all files in drivers/net, but not below F: */net/* all files in "any top level directory"/net One pattern per line. Multiple F: lines acceptable. X: Files and directories that are NOT maintained, same rules as F: Files exclusions are tested before file matches. Can be useful for excluding a specific subdirectory, for instance: F: net/ X: net/ipv6/ matches all files in and below net excluding net/ipv6/ K: Keyword perl extended regex pattern to match content in a patch or file. For instance: K: of_get_profile matches patches or files that contain "of_get_profile" K: \b(printk|pr_(info|err))\b matches patches or files that contain one or more of the words printk, pr_info or pr_err One regex pattern per line. Multiple K: lines acceptable. General Project Administration ------------------------------ M: Anthony Liguori <aliguori@us.ibm.com> M: Paul Brook <paul@codesourcery.com> Guest CPU cores (TCG): ---------------------- Alpha M: qemu-devel@nongnu.org S: Orphan F: target-alpha/ x86 Fabrice Bellard ARM Paul Brook SPARC Blue Swirl MIPS ? PowerPC Alexander Graf M68K Paul Brook SH4 ? CRIS Edgar E. Iglesias Alpha ? MicroBlaze Edgar E. Iglesias S390 ? Machines (sorted by CPU): ------------------------- x86 pc.c Fabrice Bellard (new maintainer needed) ARM integratorcp.c Paul Brook versatilepb.c Paul Brook Real View Paul Brook spitz.c Andrzej Zaborowski palm.c Andrzej Zaborowski nseries.c Andrzej Zaborowski stellaris.c Paul Brook gumstix.c Thorsten Zitterell mainstone.c Armin Kuster musicpal.c Jan Kiszka SPARC sun4u.c Blue Swirl sun4m.c Blue Swirl M: Paul Brook <paul@codesourcery.com> S: Maintained F: target-arm/ CRIS M: Edgar E. Iglesias <edgar.iglesias@gmail.com> S: Maintained F: target-cris/ M68K M: Paul Brook <paul@codesourcery.com> S: Maintained F: target-m68k/ MicroBlaze M: Edgar E. Iglesias <edgar.iglesias@gmail.com> S: Maintained F: target-microblaze/ MIPS mips_r4k.c Aurelien Jarno mips_malta.c Aurelien Jarno mips_jazz.c Hervé Poussineau mips_mipssim.c ? M: qemu-devel@nongnu.org S: Orphan F: target-mips/ PowerPC ppc_prep.c ? ppc_oldworld.c Alexander Graf ppc_newworld.c Alexander Graf ppc405_boards.c Alexander Graf M86K mcf5208.c Paul Brook an5206.c Paul Brook dummy_m68k.c Paul Brook M: Alexander Graf <agraf@suse.de> S: Maintained F: target-ppc/ S390 M: Alexander Graf <agraf@suse.de> S: Maintained F: target-s390x/ SH4 shix.c ? r2d.c Magnus Damm CRIS etraxfs.c Edgar E. Iglesias axis_dev88.c Edgar E. Iglesias Alpha MicroBlaze petalogix_s3adsp1800.c Edgar E. Iglesias M: qemu-devel@nongnu.org S: Orphan F: target-sh4/ SPARC M: Blue Swirl <blauwirbel@gmail.com> S: Maintained F: target-sparc/ X86 M: qemu-devel@nongnu.org S: Odd Fixes F: target-i386/ Guest CPU Cores (KVM): ---------------------- Overall M: Avi Kivity <avi@redhat.com> M: Marcelo Tosatti <mtosatti@redhat.com> L: kvm@vger.kernel.org S: Supported F: kvm-* F: */kvm.* PPC M: Alexander Graf <agraf@suse.de> S: Maintained F: target-ppc/kvm.c S390 s390-*.c Alexander Graf M: Alexander Graf <agraf@suse.de> S: Maintained F: target-s390x/kvm.c X86 M: Avi Kivity <avi@redhat.com> M: Marcelo Tosatti <mtosatti@redhat.com> L: kvm@vger.kernel.org S: Supported F: target-i386/kvm.c ARM Machines ------------ Gumstix M: qemu-devel@nongnu.org S: Orphan F: hw/gumstix.c Integrator CP M: Paul Brook <paul@codesourcery.com> S: Maintained F: hw/integratorcp.c Mainstone M: qemu-devel@nongnu.org S: Orphan F: hw/mainstone.c Musicpal M: Jan Kiszka <jan.kiszka@web.de> S: Maintained F: hw/musicpal.c nSeries M: Andrzej Zaborowski <balrogg@gmail.com> S: Maintained F: hw/nseries.c Palm M: Andrzej Zaborowski <balrogg@gmail.com> S: Maintained F: hw/palm.c Real View M: Paul Brook <paul@codesourcery.com> S: Maintained F: hw/realview* Spitz M: Andrzej Zaborowski <balrogg@gmail.com> S: Maintained F: hw/spitz.c Stellaris M: Paul Brook <paul@codesourcery.com> S: Maintained F: hw/stellaris.c Versatile PB M: Paul Brook <paul@codesourcery.com> S: Maintained F: hw/versatilepb.c CRIS Machines ------------- Axis Dev88 M: Edgar E. Iglesias <edgar.iglesias@gmail.com> S: Maintained F: hw/axis_dev88.c Generic Subsystems: etraxfs M: Edgar E. Iglesias <edgar.iglesias@gmail.com> S: Maintained F: hw/etraxfs.c M86K Machines ------------- an5206 M: Paul Brook <paul@codesourcery.com> S: Maintained F: hw/an5206.c dummy_m68k M: Paul Brook <paul@codesourcery.com> S: Maintained F: hw/dummy_m68k.c mcf5208 M: Paul Brook <paul@codesourcery.com> S: Maintained F: hw/mcf5208.c MicroBlaze Machines ------------------- petalogix_s3adsp1800 M: Edgar E. Iglesias <edgar.iglesias@gmail.com> S: Maintained F: hw/petalogix_s3adsp1800.c MIPS Machines ------------- Jazz M: Hervé Poussineau <hpoussin@reactos.org> S: Maintained F: hw/mips_jazz.c Malta M: Aurelien Jarno <aurelien@aurel32.net> S: Maintained F: hw/mips_malta.c Mipssim M: qemu-devel@nongnu.org S: Orphan F: hw/mips_mipssim.c R4000 M: Aurelien Jarno <aurelien@aurel32.net> S: Maintained F: hw/mips_r4k.c PowerPC Machines ---------------- 405 M: Alexander Graf <agraf@suse.de> S: Maintained F: hw/ppc405_boards.c New World M: Alexander Graf <agraf@suse.de> S: Maintained F: hw/ppc_newworld.c Old World M: Alexander Graf <agraf@suse.de> S: Maintained F: hw/ppc_oldworld.c Prep M: qemu-devel@nongnu.org S: Orphan F: hw/ppc_prep.c SH4 Machines ------------ R2D M: Magnus Damm <magnus.damm@gmail.com> S: Maintained F: hw/r2d.c Shix M: Magnus Damm <magnus.damm@gmail.com> S: Oprhan F: hw/shix.c SPARC Machines -------------- Sun4m M: Blue Swirl <blauwirbel@gmail.com> S: Maintained F: hw/sun4m.c Sun4u M: Blue Swirl <blauwirbel@gmail.com> S: Maintained F: hw/sun4u.c S390 Machines ------------- S390 Virtio M: Alexander Graf <agraf@suse.de> S: Maintained F: hw/s390-*.c X86 Machines ------------ PC M: Anthony Liguori <aliguori@us.ibm.com> S: Supported F: hw/pc.[ch] hw/pc_piix.c Devices ------- IDE M: Kevin Wolf <kwolf@redhat.com> S: Odd Fixes F: hw/ide/ PCI M: Michael S. Tsirkin <mst@redhat.com> S: Supported F: hw/pci* F: hw/piix* SCSI M: Paul Brook <paul@codesourcery.com> M: Kevin Wolf <kwolf@redhat.com> S: Odd Fixes F: hw/lsi53c895a.c F: hw/scsi* USB M: qemu-devel@nongnu.org S: Odd Fixes F: hw/usb* vhost M: Michael S. Tsirkin <mst@redhat.com> S: Supported F: hw/vhost* virtio M: Anthony Liguori <aliguori@us.ibm.com> S: Supported F: hw/virtio* virtio-9p M: Venkateswararao Jujjuri (JV) <jvrao@linux.vnet.ibm.com> S: Supported F: hw/virtio-9p* virtio-blk M: Kevin Wolf <kwolf@redhat.com> S: Supported F: hw/virtio-blk* virtio-serial M: Amit Shah <amit.shah@redhat.com> S: Supported F: hw/virtio-serial* F: hw/virtio-console* Subsystems ---------- Audio M: Vassili Karpov (malc) <av1474@comtv.ru> S: Maintained F: audio/ Block M: Kevin Wolf <kwolf@redhat.com> S: Supported F: block* F: block/ Character Devices M: Anthony Liguori <aliguori@us.ibm.com> S: Maintained F: qemu-char.c GDB stub M: qemu-devel@nongnu.org S: Odd Fixes F: gdbstub* F: gdb-xml/ Graphics M: Anthony Liguori <aliguori@us.ibm.com> S: Maintained F: ui/ Main loop M: Anthony Liguori <aliguori@us.ibm.com> S: Supported F: vl.c Monitor (QMP/HMP) M: Luiz Capitulino <lcapitulino@redhat.com> M: Markus Armbruster <armbru@redhat.com> S: Supported F: monitor.c Network device layer M: Anthony Liguori <aliguori@us.ibm.com> M: Mark McLoughlin <markmc@redhat.com> S: Maintained F: net/ SLIRP M: qemu-devel@nongnu.org S: Orphan F: slirp/ Usermode Emulation ------------------ BSD user M: Blue Swirl <blauwirbel@gmail.com> S: Maintained F: bsd-user/ Darwin user M: qemu-devel@nongnu.org S: Orphan F: darwin-user/ Dynamic translator Fabrice Bellard Main loop Fabrice Bellard (new maintainer needed) TCG Fabrice Bellard IDE device ? SCSI device Paul Brook PCI layer Michael S. Tsirkin USB layer ? Block layer ? Graphic layer ? Audio device layer Vassili Karpov (malc) Character device layer ? Network device layer ? GDB stub ? Linux user ? Darwin user ? SLIRP ? Linux user M: Riku Voipio <riku.voipio@iki.fi> S: Maintained F: linux-user/
Makefile +41 −14 Original line number Diff line number Diff line # Makefile for QEMU. GENERATED_HEADERS = config-host.h trace.h qemu-options.def ifeq ($(TRACE_BACKEND),dtrace) GENERATED_HEADERS += trace-dtrace.h endif ifneq ($(wildcard config-host.mak),) # Put the all: rule here so that config-host.mak can contain dependencies. Loading Loading @@ -36,18 +39,19 @@ endif SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory) SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS)) SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %/config-devices.mak.d, $(TARGET_DIRS)) config-all-devices.mak: $(SUBDIR_DEVICES_MAK) $(call quiet-command,cat $(SUBDIR_DEVICES_MAK) | grep =y | sort -u > $@," GEN $@") -include $(SUBDIR_DEVICES_MAK_DEP) %/config-devices.mak: default-configs/%.mak $(call quiet-command,cat $< > $@.tmp, " GEN $@") $(call quiet-command,$(SHELL) $(SRC_PATH)/make_device_config.sh $@ $<, " GEN $@") @if test -f $@; then \ if cmp -s $@.old $@; then \ if ! cmp -s $@ $@.tmp; then \ mv $@.tmp $@; \ cp -p $@ $@.old; \ fi; \ else \ if test -f $@.old; then \ echo "WARNING: $@ (user modified) out of date.";\ Loading Loading @@ -108,7 +112,11 @@ ui/vnc.o: QEMU_CFLAGS += $(VNC_TLS_CFLAGS) bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS) ifeq ($(TRACE_BACKEND),dtrace) trace.h: trace.h-timestamp trace-dtrace.h else trace.h: trace.h-timestamp endif trace.h-timestamp: $(SRC_PATH)/trace-events config-host.mak $(call quiet-command,sh $(SRC_PATH)/tracetool --$(TRACE_BACKEND) -h < $< > $@," GEN trace.h") @cmp -s $@ trace.h || cp $@ trace.h Loading @@ -120,6 +128,20 @@ trace.c-timestamp: $(SRC_PATH)/trace-events config-host.mak trace.o: trace.c $(GENERATED_HEADERS) trace-dtrace.h: trace-dtrace.dtrace $(call quiet-command,dtrace -o $@ -h -s $<, " GEN trace-dtrace.h") # Normal practice is to name DTrace probe file with a '.d' extension # but that gets picked up by QEMU's Makefile as an external dependancy # rule file. So we use '.dtrace' instead trace-dtrace.dtrace: trace-dtrace.dtrace-timestamp trace-dtrace.dtrace-timestamp: $(SRC_PATH)/trace-events config-host.mak $(call quiet-command,sh $(SRC_PATH)/tracetool --$(TRACE_BACKEND) -d < $< > $@," GEN trace-dtrace.dtrace") @cmp -s $@ trace-dtrace.dtrace || cp $@ trace-dtrace.dtrace trace-dtrace.o: trace-dtrace.dtrace $(GENERATED_HEADERS) $(call quiet-command,dtrace -o $@ -G -s $<, " GEN trace-dtrace.o") simpletrace.o: simpletrace.c $(GENERATED_HEADERS) version.o: $(SRC_PATH)/version.rc config-host.mak Loading @@ -129,7 +151,7 @@ version-obj-$(CONFIG_WIN32) += version.o ###################################################################### qemu-img.o: qemu-img-cmds.h qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o: $(GENERATED_HEADERS) qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o cmd.o: $(GENERATED_HEADERS) qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(oslib-obj-y) $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o Loading @@ -142,12 +164,14 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o: $(GENERATED_HEADERS) check-qint: check-qint.o qint.o qemu-malloc.o $(trace-obj-y) check-qstring: check-qstring.o qstring.o qemu-malloc.o $(trace-obj-y) check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qemu-malloc.o qlist.o $(trace-obj-y) check-qlist: check-qlist.o qlist.o qint.o qemu-malloc.o $(trace-obj-y) check-qfloat: check-qfloat.o qfloat.o qemu-malloc.o $(trace-obj-y) check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjson.o json-streamer.o json-lexer.o json-parser.o qemu-malloc.o $(trace-obj-y) CHECK_PROG_DEPS = qemu-malloc.o $(oslib-obj-y) $(trace-obj-y) check-qint: check-qint.o qint.o $(CHECK_PROG_DEPS) check-qstring: check-qstring.o qstring.o $(CHECK_PROG_DEPS) check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qlist.o $(CHECK_PROG_DEPS) check-qlist: check-qlist.o qlist.o qint.o $(CHECK_PROG_DEPS) check-qfloat: check-qfloat.o qfloat.o $(CHECK_PROG_DEPS) check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjson.o json-streamer.o json-lexer.o json-parser.o $(CHECK_PROG_DEPS) clean: # avoid old build problems by removing potentially incorrect old files Loading @@ -157,6 +181,8 @@ clean: rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d rm -f qemu-img-cmds.h rm -f trace.c trace.h trace.c-timestamp trace.h-timestamp rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp rm -f trace-dtrace.h trace-dtrace.h-timestamp $(MAKE) -C tests clean for d in $(ALL_SUBDIRS) libhw32 libhw64 libuser libdis libdis-user; do \ if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \ Loading @@ -178,8 +204,9 @@ ar de en-us fi fr-be hr it lv nl pl ru th \ common de-ch es fo fr-ca hu ja mk nl-be pt sl tr ifdef INSTALL_BLOBS BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ openbios-sparc32 openbios-sparc64 openbios-ppc \ BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin \ vgabios-stdvga.bin vgabios-vmware.bin \ ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc \ gpxe-eepro100-80861209.rom \ pxe-e1000.bin \ pxe-ne2k_pci.bin pxe-pcnet.bin \ Loading
Makefile.objs +27 −11 Original line number Diff line number Diff line Loading @@ -42,6 +42,11 @@ net-nested-$(CONFIG_SLIRP) += slirp.o net-nested-$(CONFIG_VDE) += vde.o net-obj-y += $(addprefix net/, $(net-nested-y)) ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS),yy) # Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add. # only pull in the actual virtio-9p device if we also enabled virtio. CONFIG_REALLY_VIRTFS=y endif fsdev-nested-$(CONFIG_VIRTFS) = qemu-fsdev.o fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y)) Loading Loading @@ -102,6 +107,7 @@ common-obj-$(CONFIG_SPICE) += ui/spice-core.o ui/spice-input.o ui/spice-display. audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o audio-obj-$(CONFIG_SDL) += sdlaudio.o audio-obj-$(CONFIG_OSS) += ossaudio.o audio-obj-$(CONFIG_SPICE) += spiceaudio.o audio-obj-$(CONFIG_COREAUDIO) += coreaudio.o audio-obj-$(CONFIG_ALSA) += alsaaudio.o audio-obj-$(CONFIG_DSOUND) += dsoundaudio.o Loading Loading @@ -158,9 +164,13 @@ user-obj-y += cutils.o cache-utils.o hw-obj-y = hw-obj-y += vl.o loader.o hw-obj-y += virtio.o virtio-console.o hw-obj-y += fw_cfg.o pci.o pci_host.o pcie_host.o pci_bridge.o hw-obj-y += ioh3420.o xio3130_upstream.o xio3130_downstream.o hw-obj-$(CONFIG_VIRTIO) += virtio.o virtio-console.o hw-obj-y += fw_cfg.o # FIXME: Core PCI code and its direct dependencies are required by the # QMP query-pci command. hw-obj-y += pci.o pci_bridge.o msix.o msi.o hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o hw-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o hw-obj-y += watchdog.o hw-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o hw-obj-$(CONFIG_ECC) += ecc.o Loading Loading @@ -205,15 +215,16 @@ hw-obj-$(CONFIG_PPCE500_PCI) += ppce500_pci.o hw-obj-$(CONFIG_PIIX4) += piix4.o # PCI watchdog devices hw-obj-y += wdt_i6300esb.o hw-obj-$(CONFIG_PCI) += wdt_i6300esb.o hw-obj-y += pcie.o pcie_aer.o pcie_port.o hw-obj-y += msix.o msi.o hw-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o hw-obj-$(CONFIG_PCI) += msix.o msi.o # PCI network cards hw-obj-y += ne2000.o hw-obj-y += eepro100.o hw-obj-y += pcnet.o hw-obj-$(CONFIG_NE2000_PCI) += ne2000.o hw-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o hw-obj-$(CONFIG_PCNET_PCI) += pcnet-pci.o hw-obj-$(CONFIG_PCNET_COMMON) += pcnet.o hw-obj-$(CONFIG_SMC91C111) += smc91c111.o hw-obj-$(CONFIG_LAN9118) += lan9118.o Loading @@ -230,7 +241,7 @@ hw-obj-$(CONFIG_IDE_MACIO) += ide/macio.o hw-obj-$(CONFIG_IDE_VIA) += ide/via.o # SCSI layer hw-obj-y += lsi53c895a.o hw-obj-$(CONFIG_LSI_SCSI_PCI) += lsi53c895a.o hw-obj-$(CONFIG_ESP) += esp.o hw-obj-y += dma-helpers.o sysbus.o isa-bus.o Loading Loading @@ -260,7 +271,8 @@ sound-obj-$(CONFIG_HDA) += intel-hda.o hda-audio.o adlib.o fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0 hw-obj-$(CONFIG_SOUND) += $(sound-obj-y) hw-obj-$(CONFIG_VIRTFS) += virtio-9p-debug.o virtio-9p-local.o virtio-9p-xattr.o hw-obj-$(CONFIG_REALLY_VIRTFS) += virtio-9p-debug.o hw-obj-$(CONFIG_VIRTFS) += virtio-9p-local.o virtio-9p-xattr.o hw-obj-$(CONFIG_VIRTFS) += virtio-9p-xattr-user.o virtio-9p-posix-acl.o ###################################################################### Loading @@ -285,11 +297,15 @@ libdis-$(CONFIG_SPARC_DIS) += sparc-dis.o ###################################################################### # trace ifeq ($(TRACE_BACKEND),dtrace) trace-obj-y = trace-dtrace.o else trace-obj-y = trace.o ifeq ($(TRACE_BACKEND),simple) trace-obj-y += simpletrace.o user-obj-y += qemu-timer-common.o endif endif vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) Loading
Makefile.target +33 −5 Original line number Diff line number Diff line Loading @@ -30,6 +30,7 @@ endif endif PROGS=$(QEMU_PROG) STPFILES= ifndef CONFIG_HAIKU LIBS+=-lm Loading @@ -40,7 +41,27 @@ kvm.o kvm-all.o vhost.o vhost_net.o: QEMU_CFLAGS+=$(KVM_CFLAGS) config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak all: $(PROGS) ifdef CONFIG_SYSTEMTAP_TRACE stap: $(QEMU_PROG).stp ifdef CONFIG_USER_ONLY TARGET_TYPE=user else TARGET_TYPE=system endif $(QEMU_PROG).stp: $(call quiet-command,sh $(SRC_PATH)/tracetool \ --$(TRACE_BACKEND) \ --binary $(bindir)/$(QEMU_PROG) \ --target-arch $(TARGET_ARCH) \ --target-type $(TARGET_TYPE) \ --stap < $(SRC_PATH)/trace-events > $(QEMU_PROG).stp," GEN $(QEMU_PROG).stp") else stap: endif all: $(PROGS) stap # Dummy command so that make thinks it has done something @true Loading Loading @@ -167,11 +188,11 @@ ifdef CONFIG_SOFTMMU obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o obj-y += vhost_net.o obj-$(CONFIG_VHOST_NET) += vhost.o obj-$(CONFIG_VIRTFS) += virtio-9p.o obj-$(CONFIG_REALLY_VIRTFS) += virtio-9p.o obj-y += rwhandler.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_NO_KVM) += kvm-stub.o Loading @@ -189,8 +210,8 @@ obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o obj-$(CONFIG_USB_OHCI) += usb-ohci.o # PCI network cards obj-y += rtl8139.o obj-y += e1000.o obj-$(CONFIG_RTL8139_PCI) += rtl8139.o obj-$(CONFIG_E1000_PCI) += e1000.o # Inter-VM PCI shared memory obj-$(CONFIG_KVM) += ivshmem.o Loading Loading @@ -340,6 +361,9 @@ clean: rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o rm -f *.d */*.d tcg/*.o ide/*.o rm -f hmp-commands.h qmp-commands.h gdbstub-xml.c ifdef CONFIG_SYSTEMTAP_TRACE rm -f *.stp endif install: all ifneq ($(PROGS),) Loading @@ -348,6 +372,10 @@ ifneq ($(STRIP),) $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS)) endif endif ifdef CONFIG_SYSTEMTAP_TRACE $(INSTALL_DIR) "$(DESTDIR)$(datadir)/../systemtap/tapset" $(INSTALL_DATA) $(QEMU_PROG).stp "$(DESTDIR)$(datadir)/../systemtap/tapset" endif # Include automatically generated dependency files -include $(wildcard *.d */*.d)
