| commit | ebe780cd56d9f641436a6280ba0b10404d95cdcb | |
| author | Avi Kivity <avi@redhat.com> | |
| Thu, 25 Jun 2009 14:22:07 +0000 (25 17:22 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Thu, 25 Jun 2009 14:22:07 +0000 (25 17:22 +0300) | ||
| tree | cf263cd812893a2a4f9fc5c781bd079ce31ef423 | treesnapshot (tar.gz zip) |
| parent | 61c7199ab3c02e2c8cb2d3e0f888fb30a3d9ccde | commitdiff |
| parent | 4a24470497360d8b77568b83008d0e9d6eb0787d | commitdiff |
Merge commit '4a24470497360d8b77568b83008d0e9d6eb0787d' into upstream-merge
* commit '4a24470497360d8b77568b83008d0e9d6eb0787d':
Disable _FORTIFY_SOURCE to fix Ubuntu build with -Werror
Apply TCGV_UNUSED on variables that GCC mistakenly thinks can be used
Restore consistent formatting of audio devices
linux-user: strace now handles guest stringscorrectly [v2]
fix qemu_alloc/qemu_free for audio subsystem
alsa: fix warning
xilinx-eth: Remove debug print.
Don't set IRQs on device reset and loadvm/savevm
Call piix4_reset() on system reset.
Don't set IRQs on device reset and loadvm/savevm
Conflicts:
Makefile.target
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '4a24470497360d8b77568b83008d0e9d6eb0787d':
Disable _FORTIFY_SOURCE to fix Ubuntu build with -Werror
Apply TCGV_UNUSED on variables that GCC mistakenly thinks can be used
Restore consistent formatting of audio devices
linux-user: strace now handles guest stringscorrectly [v2]
fix qemu_alloc/qemu_free for audio subsystem
alsa: fix warning
xilinx-eth: Remove debug print.
Don't set IRQs on device reset and loadvm/savevm
Call piix4_reset() on system reset.
Don't set IRQs on device reset and loadvm/savevm
Conflicts:
Makefile.target
Signed-off-by: Avi Kivity <avi@redhat.com>
| Makefile | diff1 | diff2 | blobhistory |
| Makefile.target | diff1 | diff2 | blobhistory |
| hw/piix_pci.c | diff1 | diff2 | blobhistory |