aboutsummaryrefslogtreecommitdiff
path: root/exec.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '299e0bc52a5d56ff89ad8d7d09c82233cd8ccb6a' into stable-0.12-mergeMarcelo Tosatti2010-02-251-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '299e0bc52a5d56ff89ad8d7d09c82233cd8ccb6a': cirrus: Properly re-register cirrus_linear_io_addr on vram unmap qcow2: Don't ignore qcow2_alloc_clusters return value qcow2: Don't ignore update_refcount return value qcow2: Allow updating no refcounts qcow2: Improve error handling in update_refcount qcow2: Fix error handling in grow_refcount_table block: Return original error codes in bdrv_pread/write qcow2: Return 0/-errno in qcow2_alloc_cluster_offset qcow2: Return 0/-errno in get_cluster_table qcow2: Fix error handling in qcow_save_vmstate qcow2: Fix error handling in qcow2_grow_l1_table win32/sdl: Fix toggle full screen win32: pair qemu_memalign() with qemu_vfree() vnc_refresh: calling vnc_update_client might free vs Musicpal: Fix descriptor walk in eth_send Musicpal: Fix wm8750 I2C address fix savevm command without id or tag reduce number of reinjects on ACK QMP: Fix asynchronous events delivery Conflicts: hw/cirrus_vga.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * win32: pair qemu_memalign() with qemu_vfree()Herve Poussineau2010-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | Win32 suffers from a very big memory leak when dealing with SCSI devices. Each read/write request allocates memory with qemu_memalign (ie VirtualAlloc) but frees it with qemu_free (ie free). Pair all qemu_memalign() calls with qemu_vfree() to prevent such leaks. Signed-off-by: Herve Poussineau <hpoussin@reactos.org> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit f8a83245d9ec685bc6aa6173d6765fe03e20688f)
* | Merge commit '6b02494d64a15476e26a6e8468623d01c4c75c58' into upstream-mergeAvi Kivity2009-12-071-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '6b02494d64a15476e26a6e8468623d01c4c75c58': Allocate physical memory in low virtual address space Add KVM support for S390x S/390 fake TCG implementation S/390 host/target build system support Conflicts: exec.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * Allocate physical memory in low virtual address spaceAlexander Graf2009-12-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | KVM on S390x requires the virtual address space of the guest's RAM to be within the first 256GB. The general direction I'd like to see KVM on S390 move is that this requirement is losened, but for now that's what we're stuck with. So let's just hack up qemu_ram_alloc until KVM behaves nicely :-). Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* | Merge commit '365369847f2827b14b96c52d0fbaf9cce404e68a' into upstream-mergeAvi Kivity2009-12-021-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '365369847f2827b14b96c52d0fbaf9cce404e68a': tcg: increase TCG_MAX_OP_SIZE to 192 tcg: initial mips support target-mips: use physical address in lladdr target-mips: add a function to do virtual -> physical translations target-mips: split code raising MMU exception in a separate function target-mips: factorize load/store code in op_helper.c Fix commit a167ba50851cdac2fa36633587e98c5956cd6b18 Add support for GNU/kFreeBSD Signed-off-by: Avi Kivity <avi@redhat.com>
| * Add support for GNU/kFreeBSDAurelien Jarno2009-11-291-1/+1
| | | | | | | | Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
| * ksm supportIzik Eidus2009-10-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | Call MADV_MERGEABLE on guest memory allocations. MADV_MERGABLE will be available starting in Linux 2.6.32. This system call registers a region of virtual address space with Linux as a candidate for transparent memory sharing. Patchworks-ID: 35447 Signed-off-by: Izik Eidus <ieidus@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | use a more upstream friendly version of irqchip-in-kernel testGlauber Costa2009-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | Upstream now has tests for irqchip_in_kernel. It differs from our signature, as it does not take any parameter. For consistency, convert our usage. Also, use a field in KVMState to store it, so we can have the exact same function as qemu upstream does. Signed-off-by: Glauber Costa <glommer@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* | Merge commit '5a1fc5e8529afb6041a3dfa406a94c187d2afc1d' into upstream-mergeAvi Kivity2009-10-061-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5a1fc5e8529afb6041a3dfa406a94c187d2afc1d': qemu: clean up target page usage in msix fix comment on cpu_register_physical_memory_offset qemu/pci: reset device registers on bus reset qemu/pci: refactor code/symbolic constants qemu/virtio: fix reset with device removal qemu/qdev: type safety in reset handler serial: convert isa to qdev qdev: don't crash on unset drive properties. floppy: move dma setup + drive connect to fdctrl_init_common() floppy: add drive properties. store a pointer to QemuOpts in DeviceState, release it when zapping a device. allow if=none for drive_add refactor drive_hot_add drive cleanup fixes. Conflicts: hw/msix.c hw/pci.h Signed-off-by: Avi Kivity <avi@redhat.com>
| * fix comment on cpu_register_physical_memory_offsetMichael S. Tsirkin2009-10-051-2/+3
| | | | | | | | | | | | | | | | We don't require full pages in cpu_register_physical_memory, except for RAM. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit 'e5cc6429dee00f3170bb6a18600d6d29b854b7d9' into upstream-mergeAvi Kivity2009-10-051-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e5cc6429dee00f3170bb6a18600d6d29b854b7d9': (35 commits) x86: mcg_cap is never 0 x86: send mce_banks as an array x86: mce_banks always have the same size x86: add fpregs_format_vmstate x86: add pending_irq_vmstate to the state x86: add fptag_vmstate to the state x86: fpus is uint16_t not unsigned int x86: fpuc is uint16_t not unsigned int x86: make a20_mask int32_t x86: hflags is not modified at all, just save it directly vmstate: remove i2c_slave_load/save vmstate: port lm832x device lm832x: make fields to have the same types that they are saved/loaded vmstate: add support for arrays of pointers vmstate: port twl92230 device twl92230: change pwrbtn_state to uint8_t vmstate: port tmp105 device tmp105: change len and alorm to uint8_t vmstate: create VMSTATE_INT16_ARRAY vmstate: port ssd0303 device ... Conflicts: target-i386/machine.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * vmstate: remove const from pre_save() functionsJuan Quintela2009-10-051-2/+2
| | | | | | | | | | Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * vmstate: add version_id argument to post_loadJuan Quintela2009-10-051-1/+1
| | | | | | | | | | Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * Revert "Get rid of _t suffix"Anthony Liguori2009-10-011-109/+109
| | | | | | | | | | | | | | | | | | | | | | | | In the very least, a change like this requires discussion on the list. The naming convention is goofy and it causes a massive merge problem. Something like this _must_ be presented on the list first so people can provide input and cope with it. This reverts commit 99a0949b720a0936da2052cb9a46db04ffc6db29. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * Get rid of _t suffixmalc2009-10-011-109/+109
| | | | | | | | | | | | | | Some not so obvious bits, slirp and Xen were left alone for the time being. Signed-off-by: malc <av1474@comtv.ru>
* | ksm supportIzik Eidus2009-10-041-0/+3
| | | | | | | | | | | | | | | | Call madvise(MADV_MERGEABLE) on the memory allocations to allow the kernel to merge them. Signed-off-by: Izik Eidus <ieidus@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
* | MCE: Relay UCR MCE to guestHuang Ying2009-09-211-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UCR (uncorrected recovery) MCE is supported in recent Intel CPUs, where some hardware error such as some memory error can be reported without PCC (processor context corrupted). To recover from such MCE, the corresponding memory will be unmapped, and all processes accessing the memory will be killed via SIGBUS. For KVM, if QEMU/KVM is killed, all guest processes will be killed too. So we relay SIGBUS from host OS to guest system via a UCR MCE injection. Then guest OS can isolate corresponding memory and kill necessary guest processes only. SIGBUS sent to main thread (not VCPU threads) will be broadcast to all VCPU threads as UCR MCE. Signed-off-by: Huang Ying <ying.huang@intel.com> Signed-off-by: Avi Kivity <avi@redhat.com>
* | Get CONFIG_CPU_EMULATION back to lifeJuan Quintela2009-09-211-0/+2
| | | | | | | | | | | | | | | | Code compile with --disable-cpu-emulation, and that don't compile tcg. This is the minimal set of changes to get it working Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
* | Merge commit '72cf2d4f0e181d0d3a3122e04129c58a95da713e' into upstream-mergeMarcelo Tosatti2009-09-141-25/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '72cf2d4f0e181d0d3a3122e04129c58a95da713e': Fix sys-queue.h conflict for good Try to fix BSD breakage by 806b60248218bd5f74a8b070f5a99a864e8e51c6 Include sys-queue.h early to override system queue definitions on BSD Unbreak BSD: use qemu_fdatasync instead of fdatasync Use proper format conversion specifier when printing size_t value audio: remove lsbindex/popcount in favour of host-utils's ctz32 alsa: poll mode handling oss: poll mode handling audio: poll mode infrastructure gus: Do not manually free the state, qdev does it for us oss: Unbreak mmaping the ability to mmap oss fd on Linux Conflicts: exec.c kvm.h sysemu.h vl.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * Fix sys-queue.h conflict for goodBlue Swirl2009-09-121-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: Our file sys-queue.h is a copy of the BSD file, but there are some additions and it's not entirely compatible. Because of that, there have been conflicts with system headers on BSD systems. Some hacks have been introduced in the commits 15cc9235840a22c289edbe064a9b3c19c5f49896, f40d753718c72693c5f520f0d9899f6e50395e94, 96555a96d724016e13190b28cffa3bc929ac60dc and 3990d09adf4463eca200ad964cc55643c33feb50 but the fixes were fragile. Solution: Avoid the conflict entirely by renaming the functions and the file. Revert the previous hacks. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Merge commit '77eea83830d8616ad657bb87313953002dfb85f0' into upstream-mergeMarcelo Tosatti2009-09-141-14/+25
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '77eea83830d8616ad657bb87313953002dfb85f0': vmstate: port i8259 device vmstate: port fw_cfg device vmstate: port cpu_comon Conflicts: hw/i8259.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * vmstate: port cpu_comonJuan Quintela2009-09-111-14/+25
| | | | | | | | | | Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '3aa80988430f41847e1b78d165440ac03503b6d0' into upstream-mergeMarcelo Tosatti2009-09-031-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3aa80988430f41847e1b78d165440ac03503b6d0': microblaze: Compute masks for alignment checks at translation time. microblaze: Trap on bus accesses to unmapped areas. microblaze: MMU shows more respect to synthesis config. microblaze: Trap on unaligned data accesses. microblaze: Trap on divizions by zero. microblaze: Correct mfs into r0. microblaze: Catch illegal insns and privilege violations. microblaze: Add infrastructure for supporting hw exceptions. microblaze: Clear exception in dslot ESR bit if not in dslot. microblaze: Correct MMU debug log. Fix warning on x86_64 Sparc32: port sun4c interrupt controller to VMState design Sparc32: port timers to VMState design Sparc32: timer field is never NULL Add VMState support for ptimers esp (sparc32) Extra scsi data. Fix compiler warnings Fix breakage due to __thread Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * microblaze: Trap on bus accesses to unmapped areas.Edgar E. Iglesias2009-09-031-6/+6
| | | | | | | | Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
* | Merge commit '4c0960c0c483fffc5f8e1dab169d946ac295bf44' into upstream-mergeAvi Kivity2009-08-301-2/+2
|\| | | | | | | | | | | | | | | | | | | | | * commit '4c0960c0c483fffc5f8e1dab169d946ac295bf44': kvm: Simplify cpu_synchronize_state() Conflicts: hw/apic.c target-i386/machine.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * kvm: Simplify cpu_synchronize_state()Avi Kivity2009-08-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | cpu_synchronize_state() is a little unreadable since the 'modified' argument isn't self-explanatory. Simplify it by making it always synchronize the kernel state into qemu, and automatically flush the registers back to the kernel if they've been synchronized on this exit. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit 'e2d52ad32abb158f272f120dc1ba06c74abe4824' into upstream-mergeAvi Kivity2009-08-291-14/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e2d52ad32abb158f272f120dc1ba06c74abe4824': Add feature configure help Use the same structure for list of libs in curses and pthread Make vnc configure options less verbose. Remove a hack introduced by d19076faca944c31bb051b95d285e75ec67902f7 Fix dsound typos Remove kqemu.c accidentally added by d60efc6b0d3d4e90cbbb86e21451e55263c29416 Sparc32: improve interrupt handling Make CPURead/WriteFunc structure 'const' target-mips: fix conditional moves off fp condition codes ARM back-end: Fix encode_imm Conflicts: configure Signed-off-by: Avi Kivity <avi@redhat.com>
| * Make CPURead/WriteFunc structure 'const'Blue Swirl2009-08-251-14/+14
| | | | | | | | Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Merge commit '4a1418e07bdcfaa3177739e04707ecaec75d89e1' into upstream-mergeAvi Kivity2009-08-241-89/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4a1418e07bdcfaa3177739e04707ecaec75d89e1': Unbreak large mem support by removing kqemu Add a configure switch to enable / disable all user targets. I felt compelled to do it for symmetry, mostly it is useful to disable user targets when you don't want to build them. Migration via unix sockets. Conflicts: Makefile.target exec.c osdep.c vl.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * Unbreak large mem support by removing kqemuAnthony Liguori2009-08-241-89/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'master' of git://git.sv.gnu.org/qemuAvi Kivity2009-08-041-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://git.sv.gnu.org/qemu: (30 commits) linux-user: make FUTEX_* calls honor timeout parameter enable NPTL for ppc-linux-user targets in configure linux-user: handle POWERPC_EXCP_STCX target-ppc: add exceptions for conditional stores target-ppc: retain l{w,d}arx loaded value target-ppc: add cpu_set_tls target-ppc: fix cpu_clone_regs Fix Sparse warning about missing prototype Fix Sparse warning about "expression using sizeof on a function" Add missing "static" More NULL pointer fixes Fix Sparse warnings: "Using plain integer as NULL pointer" PPC: convert Uni-north to qdev: also fixes Mac99 machine crash PPC: convert Grackle to qdev Option rom makefile fixes Save/restore ARMv6 MMU state esp: fix interrupt register read sparc64 flush pending conditional evaluations before exposing cpu state Fix SDL zooming with pl110 (cf. d3ffcafe25b5966b351ea6100160c2156688f22f) e1000.c doesn't properly emulate EERD and ICS registers ... Conflicts: target-ppc/cpu.h Signed-off-by: Avi Kivity <avi@redhat.com>
| * Fix Sparse warnings: "Using plain integer as NULL pointer"Blue Swirl2009-07-311-3/+4
| | | | | | | | Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Merge commit '2f7bb8780af4a007e90045b4cc97f558e956adf9' into upstream-mergeAvi Kivity2009-07-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '2f7bb8780af4a007e90045b4cc97f558e956adf9': rename USE_NPTL to CONFIG_USE_NPTL rename NEEDS_LIBSUNMATH to CONFIG_NEEDS_LIBSUNMATH define ENOTSUP the same that the other errors Conflicts: create_config Signed-off-by: Avi Kivity <avi@redhat.com>
| * rename USE_NPTL to CONFIG_USE_NPTLJuan Quintela2009-07-271-1/+1
| | | | | | | | | | Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit 'dfe5fff3eaab1285cd1565fa0a33e5acd13b279c' into upstream-mergeAvi Kivity2009-07-291-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dfe5fff3eaab1285cd1565fa0a33e5acd13b279c': change HOST_SOLARIS to CONFIG_SOLARIS{_VERSION} Enable USE_DIRECT_JUMP on Win32. Remove special Win32 code in vl.c that's no longer needed. Remove setvbuf(<handle>, NULL, _IOLBF, 0) calls for Win32 Conflicts: cpu-exec.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * Remove setvbuf(<handle>, NULL, _IOLBF, 0) calls for Win32Filip Navara2009-07-271-1/+2
| | | | | | | | | | | | | | On Win32 the setvbuf function requires the last parameter to be size between 2 and INT_MAX bytes, so the calls always failed. Since the whole point of the calls is to set line-buffered mode for the file handle and that's not supported on Win32 anyway, conditionally remove them. Signed-off-by: Filip Navara <filip.navara@gmail.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '452e475196a3f8b6b96d16bbaca727ebc1278a97' into upstream-mergeAvi Kivity2009-07-281-22/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '452e475196a3f8b6b96d16bbaca727ebc1278a97': (55 commits) introduce on_vcpu qemu-io: reject invalid pattern qemu-io: Rework alloc command qmu-img: fix qemu-img convert to generate a valid image when the source referenced a backing file vmdk: Fix backing file handling use struct initializer for audio.c Add save/restore support to the LSI logic SCSI device model. Handle BH's queued by AIO completions in qemu_aio_flush() Fake dirty loggin when it's not there Use correct input constant Fix warning in kvm-all.c Set PVR in sregs Enable PPC KVM for non-embedded Sparc32: convert Sun4c interrupt controller to qdev Sparc32: convert SBI to qdev Fix CONFIG_PROFILER Sparc32/64: use 64 bit type for memory size qdev: add 64 bit type Sparc64: refactor kernel init Sparc64: refactor CPU init ... Conflicts: kvm-all.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * Fix most warnings (errors with -Werror) when debugging is enabledBlue Swirl2009-07-201-22/+3
| | | | | | | | | | | | | | I used the following command to enable debugging: perl -p -i -e 's/^\/\/#define DEBUG/#define DEBUG/g' * */* */*/* Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Merge commit '0ba99fc6a188988f11361cb41eba7c1afce346d4' into upstream-mergeAvi Kivity2009-07-281-8/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ba99fc6a188988f11361cb41eba7c1afce346d4': (46 commits) configure already knows what TARGET_BASE_ARCH we need, no need to put the logic in Makefile.target already defined several lines before in block-obj-y Remove unused Makefile variable use nwfpe-obj-y for consistence use block-nested-y for files inside block/ Remove duplicated definition fix sparc not solaris build fix XEN Build fix for bad macaddr of e1000 in Windows 2003 server with original MS driver qdev: es1370+ac97 description qdev/compat: virtio-net-pci 0.10 compatibility. qdev: print device id in "info pci". qdev/compat: virtio-console-pci 0.10 compatibility. qdev: add id= support for pci nics. qdev/compat: virtio-blk-pci 0.10 compatibility. qdev: add user-specified identifier to devices. qdev/compat: add pc-0.10 machine type. qdev: add no_user, alias and desc qdev/compat: compat property infrastructure. qdev: factor out driver search to qdev_find_info() ... Conflicts: Makefile.target Signed-off-by: Avi Kivity <avi@redhat.com>
| * tlb flush cleanupIgor Kovalenko2009-07-161-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | Use static empty variable s_cputlb_empty_entry to clear entries, also reset addend member when clearing entries. This helps running with valgrind/memcheck Signed-off-by: igor.v.kovalenko@gmail.com -- Kind regards, Igor V. Kovalenko Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * Update to a hopefully more future proof FSF addressBlue Swirl2009-07-161-2/+1
| | | | | | | | Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Merge commit 'c9e0df738918b1d5d39a283500abc3a3ac433f78' into upstream-mergeAvi Kivity2009-06-301-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c9e0df738918b1d5d39a283500abc3a3ac433f78': Rename LIBOBJS to libobj-y Rename OBJS to obj-y cpu_unregister_map_client: fix memory leak. Add documentation for Multiboot Conflicts: Makefile.target Signed-off-by: Avi Kivity <avi@redhat.com>
| * cpu_unregister_map_client: fix memory leak.Isaku Yamahata2009-06-291-1/+2
| | | | | | | | | | | | | | fix memory leak in cpu_unregister_map_client() and cpu_notify_map_clients(). Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge branch 'master' of git://git.sv.gnu.org/qemu into upstream-mergeAvi Kivity2009-06-251-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://git.sv.gnu.org/qemu: add sparc64-softmmu to default configure targets list sparc64 follow pci_nic_init change microblaze: Support the latest mmu-kernel stat64 ABI. target-ppc: permit linux-user to read PVR cris: Remove unused internal flag. Win32: Reduce section alignment for Windows. Win: Install keymaps for Windows, too (needed for VNC). Win32: Fix compilation with SDL. Signed-off-by: Avi Kivity <avi@redhat.com>
| * Win32: Reduce section alignment for Windows.Stefan Weil2009-06-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | Maximum alignment for Win32 is 16, so don't try to set it to 32. Otherwise the compiler complains: exec.c:102: warning: alignment of 'code_gen_prologue' is greater than maximum object file alignment. Using 16 Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge branch 'master' of git://git.sv.gnu.org/qemuAvi Kivity2009-06-171-125/+116
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://git.sv.gnu.org/qemu: (58 commits) exec.c: remove unnecessary #if NB_MMU_MODES Fix vga_screen_dump_blank() PPM generation Prevent CD-ROM media eject while device is locked set migration max downtime add non-arbitrary migration stop condition kvm: Fix IRQ injection into full queue Call qemu_bh_delete at bdrv_aio_bh_cb. Remove dead code QEMU KVM: i386: Fix the cpu reset state allow CPUID vendor override Fix help message for new configure option --enable-debug. provide cpu_index to env mapping pci: add define for communication class devices vnc: improve numpad support for qemu console. virtio blk: fix warning. lsi53c895a: Implement write access to DMA Byte Counter lsi53c895a: Implement read and write access to DMA Next Address lsi53c895a: Implement Scratch Byte Register Rename pci_register_io_region() to pci_register_bar() Rearrange io_mem_init() ... Conflicts: configure Signed-off-by: Avi Kivity <avi@redhat.com>
| * exec.c: remove unnecessary #if NB_MMU_MODESIsaku Yamahata2009-06-161-76/+23
| | | | | | | | | | | | | | | | remove unnecessary #if NB_MMU_MODES by using loop. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * provide cpu_index to env mappingGlauber Costa2009-06-161-0/+13
| | | | | | | | | | | | | | | | | | There are some people interested in, given a cpu number, pick its CPUState. KVM is an example, although not yet in tree. This patch provides a way of doing that. Signed-off-by: Glauber Costa <glommer@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * Rearrange io_mem_init()Avi Kivity2009-06-161-26/+21
| | | | | | | | | | | | | | Move io_mem_init() downwards to avoid a forward declaration. No code change. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| * Remove io_index argument from cpu_register_io_memory()Avi Kivity2009-06-161-9/+22
| | | | | | | | | | | | | | | | | | The parameter is always zero except when registering the three internal io regions (ROM, unassigned, notdirty). Remove the parameter to reduce the API's power, thus facilitating future change. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>