summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '6173d56bdcb53389c54e803873e6bf8f87836a4f' into stable-0.12-mergeMarcelo Tosatti2010-02-251-5/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6173d56bdcb53389c54e803873e6bf8f87836a4f': (27 commits) Update version and change for 0.12.3 release qcow2: Fix access after end of array ide save/restore pio/atapi cmd transfer fields and io buffer net: Monitor command set_link finds only VLAN clients, fix net: info network shows only VLAN clients, fix net: net_check_clients() checks only VLAN clients, fix net: Fix bogus "Warning: vlan 0 with no nics" with -device net: net_check_clients() runs too early to see -device, fix net: Remove unused net_client_uninit() don't dereference NULL after failed strdup virtio-net: fix network stall under load json: fix PRId64 on Win32 fix inet_parse typo iothread: fix vcpu stop with smp tcg segfault due to buffer overrun in usb-serial qcow2: Fix signedness bugs Do not ignore error, if open file failed (-serial /dev/tty) pc-bios: update to newer version of (stable) seabios kvm: Fix eflags corruption in kvm mode target-mips: fix ROTR and DROTR by zero ... Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> modified: net/slirp.c
| * kvm: Fix eflags corruption in kvm modeJan Kiszka2010-02-231-5/+7
| | | | | | | | | | | | | | | | | | | | | | This should explain a lot of the weird breakages of upstream KVM we've seen recently (actually we should have seen it much earlier): Stop translating eflags into TCG format when in kvm mode as we never translate it back and rather sync this broken state into the kernel. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Avi Kivity <avi@redhat.com>
* | Merge commit '10ec51174ca69a4c3c5149b0b3baaa6ccba66273' into upstream-mergeAvi Kivity2009-12-071-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '10ec51174ca69a4c3c5149b0b3baaa6ccba66273': S/390 CPU fake emulation Sparc64: handle MMU global bit and nucleus context monitor: fix use of plain integer as NULL pointer, spotted by Sparse Add "static" to please Sparse scsi: fix incorrect ?: use Conflicts: cpu-exec.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * S/390 CPU fake emulationAlexander Graf2009-12-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Because Qemu currently requires a TCG target to exist and there are quite some useful helpers here to lay the groundwork for out KVM target, let's create a stub TCG emulation target for S390X CPUs. This is required to make tcg happy. The emulation target itself won't work though. Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* | Merge commit '59f2689d9082f2f631253c810f73cd22290144a9' into upstream-mergeAvi Kivity2009-11-221-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '59f2689d9082f2f631253c810f73cd22290144a9': Added readonly flag to -drive command qcow2: Allow qcow2 disk images with size zero (x86/Sparc/PPC)-user: fix cpu_copy IDE: Fix reset handling user: move CPU reset call to main.c for x86/PPC/Sparc PPC: rename cpu_ppc_reset to cpu_reset for consistency Sparc64/x86: remove unneeded calls to device reset PPC: remove unneeded calls to device reset sparc32 (mostly): remove unneeded calls to device reset v3: don't call reset functions on cpu initialization vga: fix line comparison vga: Respect Line Compare Register in text modes Conflicts: qemu-config.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * PPC: rename cpu_ppc_reset to cpu_reset for consistencyBlue Swirl2009-11-071-1/+1
| | | | | | | | Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Merge commit '93db66850d99fd9885edeff6af5679be51e1c610' into upstream-mergeMark McLoughlin2009-10-281-2/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '93db66850d99fd9885edeff6af5679be51e1c610': (81 commits) ne2k_isa: use qdev properties for configuration. qdev/net: common nic property bits qdev: add vlan property qdev: add netdev property qdev: mac addr property fixups net: add macaddr type. Send a RARP packet after migration. multiboot.S patch for old as(1) (was: Re: [Qemu-devel] Some OpenBSD/amd64 build fixes) raw/linux-aio: Also initialize POSIX AIO qcow2: Fix grow_refcount_table error handling usb-linux: return USB_RET_STALL on -EPIPE Makefile: Change make to be quiet again when doing nothing eepro100: Restructure code target-arm: use native tcg-ops for ror/bic/vorn target-arm: fix neon shift helper functions target-arm: fix neon vsri, vshl and vsli ops target-arm: allow modifying vfp fpexc en bit only target-arm: add support for neon vld1.64/vst1.64 instructions target-arm: fix neon vshrn/vrshrn ops target-arm: fix incorrect temporary variable freeing ... Signed-off-by: Mark McLoughlin <markmc@redhat.com>
| * bsd-user: FreeBSD updateJuergen Lock2009-10-181-2/+25
| | | | | | | | | | | | | | | | basic FreeBSD sysarch(2) handling fixed syscall errno return Signed-off-by: Juergen Lock <nox@jelal.kn-bremen.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Merge commit '72cf2d4f0e181d0d3a3122e04129c58a95da713e' into upstream-mergeMarcelo Tosatti2009-09-141-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '4dd75c702c96ec84db4efe24fcc80a4d7bb32df2' into upstream-mergeAvi Kivity2009-08-241-409/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4dd75c702c96ec84db4efe24fcc80a4d7bb32df2': make pthreads mandatory qemu: move virtio-pci.o to near pci.o char: Emit 'CLOSED' events on char device close cleanup cpu-exec.c, part 0/N: consolidate handle_cpu_signal unify popen/fopen qemu wrappers Only build osdep once Conflicts: block/raw-posix.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * cleanup cpu-exec.c, part 0/N: consolidate handle_cpu_signalNathan Froyd2009-08-241-409/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handle_cpu_signal is very nearly copy-paste code for each target, with a few minor variations. This patch sets up appropriate defaults for a generic handle_cpu_signal and provides overrides for particular targets that did things differently. Fixing things like the persistent (XXX: use sigsetjmp) should now become somewhat easier. Previous comments on this patch suggest that the "activate soft MMU for this block" comments refer to defunct functionality. I have removed such blocks for the appropriate targets in this patch. Signed-off-by: Nathan Froyd <froydnj@codesourcery.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '4a1418e07bdcfaa3177739e04707ecaec75d89e1' into upstream-mergeAvi Kivity2009-08-241-37/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-37/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 commit '1452411b25fb207e7f442e5a5128f34b4939d31c' into upstream-mergeAvi Kivity2009-08-241-3/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1452411b25fb207e7f442e5a5128f34b4939d31c': (38 commits) Route PC irqs to ISA bus instead of i8259 directly Makefile: fixed rule TAGS QEMU set irq0override in fw_cfg SMART ATA Functionality Add missing linefeed in error message Clean up VGA type selection; far too many variables being used to track one state leads to confusion if new variables are added. When using stdio monitor and VNC display, one can set or clear a VNC password; this should set or turn off VNC authentication as well. Don't segfault when changing VNC password on an SDL display. Fix detached migration with exec. Do not disable autostart for live migration make vga screen_dump use DisplayState properly Restore consistent formatting es1370: Remove unused indirection of PCIES1370State and ES1370State Fix device name completion for 'eject' Revert my commit c00a9de060124a988bd9847c095e5836488c6f01 Fix segfault of qemu-system-arm with PXA target sdl.c: support 32 bpp cursors Use corect depth from DisplaySurface in vmware_vga.c Remove the unnecessary and only global in musicpal.c Make musicpal.c use the I2C device and the Marvell 88w8618 audio device ... Conflicts: hw/pc.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * sparc32 remove an unnecessary cpu irq setBlue Swirl2009-08-221-3/+0
| | | | | | | | | | Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Merge commit 'eb82284f180196f911fd70ebf0cddfbfdf5af3e3' into upstream-mergeAvi Kivity2009-07-291-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eb82284f180196f911fd70ebf0cddfbfdf5af3e3': (38 commits) simplify brlapi selection simplify curses library selection Define and use xen libs in a single place indent with 2 spaces sdl tests remove sdl_static. Just do the right thing if static is yes target_softmmu is undefined at that point instead of setup sdl_x11 just add -lX11 to sdl_libs Calculate sdl_libs and sdl_flags and use them everywhere sdl_config value was always sdl-config the else part of this test is obsolete We are testing for sdl = yes inside the else part of the test if sdl = yes Use CONFIG_POSIX to simplify Makefile Add CONFIG_POSIX rename WORDS_BIGENDIAN to HOST_WORDS_BIGENDIAN rename DEBUG_EXEC to CONFIG_DEBUG_EXEC rename DEBUG_TCG to CONFIG_DEBUG_TCG rename HAVE_BYTESWAP_H to CONFIG_BYTESWAP_H rename HAVE_GPROF to TARGET_GPROF rename HAVE_MACHINE_BSWAP_H to CONFIG_MACHINE_BSWAP_H rename HAVE_FNMATCH_H to CONFIG_FNMATCH rename HAVE_IOVEC to CONFIG_IOVEC ... Conflicts: configure Signed-off-by: Avi Kivity <avi@redhat.com>
| * rename DEBUG_EXEC to CONFIG_DEBUG_EXECJuan Quintela2009-07-271-3/+3
| | | | | | | | | | 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-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * change HOST_SOLARIS to CONFIG_SOLARIS{_VERSION}Juan Quintela2009-07-271-5/+5
| | | | | | | | | | Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit '0ba99fc6a188988f11361cb41eba7c1afce346d4' into upstream-mergeAvi Kivity2009-07-281-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Update to a hopefully more future proof FSF addressBlue Swirl2009-07-161-2/+1
| | | | | | | | Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Merge commit '344b983d9b653b47468b6f5b5a4fbbdc8894995f' into upstream-mergeAvi Kivity2009-07-121-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '344b983d9b653b47468b6f5b5a4fbbdc8894995f': target-mips: remove useless code in gen_st_cond() Fix MIPS SC Sparc64: convert ebus to qdev sparc64: trap handling corrections Sparc32: convert eccmemctl to qdev sparc64: fix helper_st_asi little endian case typo sparc64: really initialize irq sparc64: unify mmu tag matching code sparc64: mmu bypass mode correction Fix PCI IRQ breakage Revert "Fix the PCI header type of APB" Fix APB by reverting 16eaedf2668e9b347a59d73346fcc4c764c58348 partially Indent ac97 and es1370 according to audio formatting block: Clean up after deleting BHs flush pending aio requests kvm: Work around borken MSR_GET_INDEX_LIST qemu/virtio: mark msi vectors used on load Signed-off-by: Avi Kivity <avi@redhat.com>
| * sparc64: trap handling correctionsIgor Kovalenko2009-07-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Sun, Jul 12, 2009 at 12:09 PM, Blue Swirl<blauwirbel@gmail.com> wrote: > On 7/12/09, Igor Kovalenko <igor.v.kovalenko@gmail.com> wrote: >> Good trap handling is required to process interrupts. >>  This patch fixes the following: >> >>  - sparc64 has no wim register >>  - sparc64 has no psret register, use IE bit of pstate >>   extract IE checking code to cpu_interrupts_enabled >>  - alternate globals are not available if cpu has GL feature >>   in this case bit AG of pstate is constant zero >>  - write to pstate must actually write pstate >>   even if cpu has GL feature >> >>  Also timer interrupt is handled using do_interrupt. > > A bit too much for one patch. Please also remove the code instead of > commenting out. I now excluded timer interrupt related part. To my mind other changes are essentially tied together. > PUT_PSR for Sparc64 needs CC_OP = CC_OP_FLAGS; like Sparc32. Fixed, please find attached the updated version. -- Kind regards, Igor V. Kovalenko
* | Merge commit '79c4f6b08009a1d23177c2be8bd003253cf3686a' into upstream-mergeAvi Kivity2009-07-121-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '79c4f6b08009a1d23177c2be8bd003253cf3686a': QEMU: MCE: Add MCE simulation to qemu/tcg getrlimit conversion mix-up wrap path for access syscall 64-bit clean socketcall syscall pipe argument should not be signed configure: remove bogus linux-user check linux-user/syscall.c: remove warning: ‘array’ may be used uninitialized in this function linux-user: check some parameters for some socket syscalls. linux-user: increment MAX_ARG_PAGES Conflicts: qemu-monitor.hx Signed-off-by: Avi Kivity <avi@redhat.com>
| * QEMU: MCE: Add MCE simulation to qemu/tcgHuang Ying2009-07-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | - MCE features are initialized when VCPU is intialized according to CPUID. - A monitor command "mce" is added to inject a MCE. - A new interrupt mask: CPU_INTERRUPT_MCE is added to inject the MCE. aliguori: fix build for linux-user Signed-off-by: Huang Ying <ying.huang@intel.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge commit 'b09ea7d55cfab5a75912bb56ed1fcd757604a759' into upstream-mergeAvi Kivity2009-06-251-1/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b09ea7d55cfab5a75912bb56ed1fcd757604a759': Handle init/sipi in a main cpu exec loop. (v2) Add pci_bus_reset() function. virtio: add support for indirect ring entries virtio: make vring_desc_*() take phys addrs Add O_BINARY to open call in net_dump_init. Conflicts: hw/apic.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * Handle init/sipi in a main cpu exec loop. (v2)Gleb Natapov2009-06-221-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | This should fix compilation problem in case of CONFIG_USER_ONLY. Currently INIT/SIPI is handled in the context of CPU that sends IPI. This patch changes this to handle them like all other events in a main cpu exec loop. When KVM will gain thread per vcpu capability it will be much more clear to handle those event by cpu thread itself and not modify one cpu's state from the context of the other. Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | Merge branch 'master' of git://git.sv.gnu.org/qemuAvi Kivity2009-06-031-1/+67
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://git.sv.gnu.org/qemu: (40 commits) Update maintainer list. Install keymaps from new location vvfat: one more missing BlockDriver C99 initializer conversion Move keymaps into pc-bios kvm: Mark full address range dirty on live migration start Add detection of pthread library name User networking: Show active connections User Networking: Enable removal of redirections Allow monitor interaction when using migrate -exec fully split aio_pool from BlockDriver qcow: add qcow_aio_setup helper raw-posix: fix hdev_create fix raw_pread_aligned return value VNC: Fix memory allocation (wrong structure size). Drop bdrv_create2 qcow2: Update multiple refcounts at once qcow2: Refactor update_refcount qcow/qcow2: Drop synchronous qcow_write() e1000: Ignore reset command Fix output of uninitialized strings ... Signed-off-by: Avi Kivity <avi@redhat.com>
| * microblaze: linux-user support.Edgar E. Iglesias2009-05-261-1/+67
| | | | | | | | Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
* | Merge branch 'master' of git://git.sv.gnu.org/qemuAvi Kivity2009-05-061-0/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://git.sv.gnu.org/qemu: (84 commits) ETRAX: Simplify serport control logic. ETRAX: Drop _t for the serial type. ETRAX: Use NULL for subwidth serport reg accesses. ETRAX: Drop the _t for the internal PIC type. ETRAX: Simplify the interrupt controller model. ETRAX: Simplify interrupt signaling. Fix compiler warnings in nwfpe code. target-mips: proper sign extension for 'SUBU rd, zero, rt' target-mips: fix comments about SUB/DSUB qemu-options.hx: fix description of cache=none suboption Suppress type mismatch warnings in VDE code. minor fix of pci_register_bus() use PCI_HEADER_TYPE. Fix typos in comments in exec.c Optimize cmp x, 0 case Reindent Handle NULL bdrv. Improve instruction name comments for easier searching Clarify: dmmuregs[1] is not a typo Optimize operations with immediate parameters ... Conflicts: Makefile.target hw/vga.c qemu-common.h vl.c (iothread merge by Marcelo) Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
| * Recognize V9 stores and CAS accesses as writesBlue Swirl2009-04-251-0/+12
| | | | | | | | Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| * qemu: per-arch cpu_has_work (Marcelo Tosatti)aliguori2009-04-241-0/+5
| | | | | | | | | | | | | | | | | | | | Blue Swirl: fix Sparc32 breakage Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7238 c046a42c-6fe2-441c-8c8c-71466251a162
* | Remove extra call to kvm_cpu_exec()Anthony Liguori2009-04-301-6/+0
| | | | | | | | | | | | | | It's just duplicated code now since we do the same thing in upstream. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Avi Kivity <avi@redhat.com>
* | Merge branch 'master' of git://git.sv.gnu.org/qemu into masterAvi Kivity2009-04-231-15/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'master': (180 commits) xen: add -vga xenfb option, configure xenfb (Gerd Hoffmann) simplify vga selection (Gerd Hoffmann) xen: pv domain builder. (Gerd Hoffmann) xen: blk & nic configuration via cmd line. (Gerd Hoffmann) xen: add net backend driver. (Gerd Hoffmann) xen: add block device backend driver. (Gerd Hoffmann) xen: add framebuffer backend driver (Gerd Hoffmann) xen: add console backend driver. (Gerd Hoffmann) xen: backend driver core (Gerd Hoffmann) xen: groundwork for xen support (Gerd Hoffmann) update .gitignore: add qemu-io (Gerd Hoffmann) qcow2: Add plausibility check for L1/L2 entries (Kevin Wolf) qcow2: Refcount checking code cleanup (Kevin Wolf) Introduce qemu-img check subcommand (Kevin Wolf) Introduce bdrv_check (Kevin Wolf) qcow2: Fix warnings in check_refcount() (Kevin Wolf) sending NUMA topology to BIOS (Andre Przywara) add info numa command to monitor (Andre Przywara) added -numa cmdline parameter parser (Andre Przywara) Safety net for the cases where disassembler/translator disagree over instruction decoding ... Conflicts: Makefile Makefile.target configure cpu-all.h gdbstub.c hw/apic.c hw/cirrus_vga.c hw/eepro100.c hw/pc.c hw/pcnet.c hw/rtl8139.c hw/vga.c net.c pc-bios/bios.bin sysemu.h vl.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * kqemu: merge CONFIG_KQEMU and USE_KQEMUblueswir12009-04-191-3/+3
| | | | | | | | | | | | | | | | | | | | Basically a recursive ":%s/USE_KQEMU/CONFIG_KQEMU/g". Signed-off-by: Paul Bolle <pebolle@tiscali.nl> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7189 c046a42c-6fe2-441c-8c8c-71466251a162
| * BSD user: add support for OpenBSD/amd64 hostblueswir12009-04-101-11/+19
| | | | | | | | git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7066 c046a42c-6fe2-441c-8c8c-71466251a162
| * BSD user: add support for OpenBSD/i386 hostblueswir12009-04-101-1/+12
| | | | | | | | git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7065 c046a42c-6fe2-441c-8c8c-71466251a162
* | Merge commit 'qemu-svn/trunk'Avi Kivity2009-04-061-0/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'qemu-svn/trunk': (38 commits) Remove WIN32 guard around -k Add new command line option -singlestep for tcg single stepping. tcg/x86_64: optimize register allocation order stop dirty tracking just at the end of migration (Glauber Costa) create qemu_file_set_error (Glauber Costa) propagate error on failed completion (Glauber Costa) Disable qemu-io on Win32 Add files not included in previous commit. Fix savevm after BDRV_FILE size enforcement Fix the build for --disable-aio gdbstub: Rework configuration via command line and monitor (Jan Kiszka) Make `-icount' help fit 80 chars screen width (Robert Riebisch) qemu-io - an I/O path exerciser (Christoph Hellwig) Fix display breakage when resizing the screen (v2) (Avi Kivity) Fix some win32 compile warnings Make binary stripping conditional (Riku Voipio) qcow2: fix image creation for large, > ~2TB, images (Chris Wright) pci_add storage: fix error handling for 'if' parameter (Eduardo Habkost) build system: clean qemu-options.texi and gdbstub-xml.c (Jan Kiszka) build system: silent generation of doc files and qemu-options.h (Jan Kiszka) ... Conflicts: qemu/Makefile.target qemu/hw/vga.c qemu/vl.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * Make i386-softmmu boot on Sparc hostblueswir12009-04-041-0/+10
| | | | | | | | git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6971 c046a42c-6fe2-441c-8c8c-71466251a162
* | Merge branch 'qemu-cvs'Avi Kivity2009-03-181-1/+0
|\| | | | | | | | | | | * qemu-cvs: Fix VGA issue introduced by r6349 Fix ARM quadword VDUP (core register). Delete some unused macros detected with -Wp,-Wunused-macros use
| * Delete some unused macros detected with -Wp,-Wunused-macros useblueswir12009-03-161-1/+0
| | | | | | | | git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6856 c046a42c-6fe2-441c-8c8c-71466251a162
* | Merge branch 'qemu-cvs'Avi Kivity2009-03-081-8/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qemu-cvs: (135 commits) Use firmware configuration instead of NVRAM (initial patch by Aurelien Jarno) Add new entries to firmware configuration device Rename _BSD to HOST_BSD so that it's more obvious that it's defined by configure target-mips: remove dead code target-mips: rename helpers from do_ to helper_ do not pretend to support low voltage operation Fix correct reset value for ARM CP15 c1 auxiliary control register Work around QEMU GDB stub suboptimality Fix off-by-one errors for Altivec and SPE registers Use C99 initializers for BlockDriver methods clean build: Fix remaining m68k warnings clean build: Fix arm build warnings arm: Fix gic_irq_state.level bitfield type target-ppc: move the CD-ROM drive to the second IDE ppc_oldworld: swap the MACIO and CMD646 IDE controllers Use a dedicated function to request exit from execution loop Fix texinfo syntax errors. Disable BAT for 970 Fix mfcr on ppc64-softmmu Keep SLB in-CPU ... Conflicts: qemu/configure qemu/cpu-defs.h qemu/exec.c qemu/hw/pci-hotplug.c qemu/monitor.c qemu/net.c qemu/pc-bios/Makefile qemu/pc-bios/bios.bin qemu/qemu-tool.c qemu/sysemu.h qemu/vl.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * Fix race condition on access to env->interrupt_requestaurel322009-03-061-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | env->interrupt_request is accessed as the bit level from both main code and signal handler, making a race condition possible even on CISC CPU. This causes freeze of QEMU under high load when running the dyntick clock. The patch below move the bit corresponding to CPU_INTERRUPT_EXIT in a separate variable, declared as volatile sig_atomic_t, so it should be work even on RISC CPU. We may want to move the cpu_interrupt(env, CPU_INTERRUPT_EXIT) case in its own function and get rid of CPU_INTERRUPT_EXIT. That can be done later, I wanted to keep the patch short for easier review. Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6728 c046a42c-6fe2-441c-8c8c-71466251a162
* | Merge branch 'qemu-cvs'Avi Kivity2009-01-181-23/+20
|\| | | | | | | | | | | | | | | | | | | Conflicts: qemu/hw/cirrus_vga.c qemu/hw/pc.c qemu/hw/pcnet.c qemu/hw/vga.c qemu/vl.c Signed-off-by: Avi Kivity <avi@redhat.com>
| * global s/loglevel & X/qemu_loglevel_mask(X)/ (Eduardo Habkost)aliguori2009-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | These are references to 'loglevel' that aren't on a simple 'if (loglevel & X) qemu_log()' statement. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6340 c046a42c-6fe2-441c-8c8c-71466251a162
| * Convert references to logfile/loglevel to use qemu_log*() macrosaliguori2009-01-151-19/+14
| | | | | | | | | | | | | | | | | | | | | | | | This is a large patch that changes all occurrences of logfile/loglevel global variables to use the new qemu_log*() macros. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6338 c046a42c-6fe2-441c-8c8c-71466251a162
| * Get rid of user_mode_onlyaurel322009-01-141-2/+4
| | | | | | | | | | | | Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6305 c046a42c-6fe2-441c-8c8c-71466251a162
| * Remove all traces of __powerpc__malc2009-01-141-1/+1
| | | | | | | | | | | | | | | | According to $GCC/gcc/config/rs6000/rs6000-c.c _ARCH_PPC is the ubiquitous define which should be used to test whether gcc targets PowerPC, on 64bit platforms _ARCH_PPC64 will be also defined. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6301 c046a42c-6fe2-441c-8c8c-71466251a162
* | Merge branch 'qemu-cvs'Avi Kivity2009-01-051-1/+1
|\|