diff options
| author | Avi Kivity <avi@redhat.com> | 2010-11-14 16:49:09 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-11-14 16:49:09 +0200 |
| commit | 38be1ea9d08c2197d68a0c790d5e6ac5d2acd20d (patch) | |
| tree | 5583b32477469165f82e0ba09ddeb0cc8b53363c /Makefile | |
| parent | 031871007b88a18309807c35568f135a49be60fe (diff) | |
| parent | cf2c1839a955482f2e208d7400594bf076c222f2 (diff) | |
Merge remote branch 'upstream' into upstream-merge
* upstream: (46 commits)
add copyright to spiceaudio
spice: add audio
intel-hda: fix codec addressing.
Revert "intel-hda: fix codec addressing."
intel-hda: fix codec addressing.
intel-hda: add msi support
intel-hda: update irq status on WAKEEN changes.
intel-hda: Honor WAKEEN bits.
hda-audio: exit cleanup
intel-hda: exit cleanup
Fix win32 build
scsi-disk: Fix immediate failure of bdrv_aio_*
virtio-blk: Handle immediate flush failure properly
ide: Handle immediate bdrv_aio_flush failure
block: avoid a warning on 64 bit hosts with long as int64_t
qcow2: Invalidate cache after failed read
vpc: Implement bdrv_flush
scsi-disk: Implement werror for flushes
scsi-disk: Complete failed requests in scsi_disk_emulate_command
block: Allow bdrv_flush to return errors
...
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -71,7 +71,7 @@ build-all: $(DOCS) $(TOOLS) recurse-all config-host.h: config-host.h-timestamp config-host.h-timestamp: config-host.mak -qemu-options.def: qemu-options.hx +qemu-options.def: $(SRC_PATH)/qemu-options.hx $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $@") SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) |