summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* slirp: remove dead initialization, spotted by clangBlue Swirl2010-03-071-4/+0
| | | | | | Value stored during initialization is never read. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* slirp: remove dead increments, spotted by clangBlue Swirl2010-03-073-2/+4
| | | | | | Value stored is never read. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* slirp: remove dead assignments, spotted by clangBlue Swirl2010-03-072-15/+7
| | | | | | Value stored is never read. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* target-arm: Fix missing 'return' in SRS handling.Adam Lackorzynski2010-03-061-0/+1
| | | | | | | | There's a return missing in the srs handling which leads to srs always being treated an an invalid op. Signed-off-by: Adam Lackorzynski <adam@os.inf.tu-dresden.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* Fix curses interaction with keymapsSamuel Thibault2010-03-066-94/+149
| | | | | | | | | | The combination of keymap support (-k option) and curses is currently very broken. The patch below fixes it by first extending keymap support to interpret the shift, ctrl, altgr and addupper keywords in keymaps, and to fix curses into properly using keymaps. Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
* use absolute URLs for .gitmodulesPaolo Bonzini2010-03-061-2/+2
| | | | | | | | The relative URLs do not work when cloning a fork of qemu or when cloning from the Savannah URL. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* Documentation: Modify rule for html output (better looking output format)Stefan Weil2010-03-062-3/+6
| | | | | | | | | | | | | | | | | | To create html output from texi input, texi2html was used. Output from makeinfo looks cleaner, so replace the old rule and use makeinfo now. For those who want to use their own variant of html output, the macros MAKEINFO and MAKEINFOFLAGS allow customisation. Option "-I ." is not needed (the current directory is searched by default), so remove it. Please note that the build requirements changed, too: makeinfo is required for doc builds. texi2html is no longer used. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* scsi: update comment on the standards revisionChristoph Hellwig2010-03-061-2/+6
| | | | | Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* qemu-nbd: Fix wrong description in qemu-nbd.texiRyota Ozaki2010-03-061-2/+2
| | | | | | | | -c option needs argument <dev> but it's missing now. This patch fixes it. Signed-off-by: Ryota Ozaki <ozaki.ryota@gmail.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* Build usb-ohci for PCsKevin Wolf2010-03-062-0/+4
| | | | | | | | The OHCI emulation isn't obviously broken and there are people who want to use it. Let's build it by default so that it can be enabled via -device. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* ppc440_bamboo: Disable new virtio-serial features for 0.12 machine typeAmit Shah2010-03-061-0/+12
| | | | | | | | Disable the MULTIPORT feature and MSI vectors for the 0.12 machine types; those features are added only for 0.13 onwards. Signed-off-by: Amit Shah <amit.shah@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* ppc440_bamboo: Add 0.12 and 0.13 machine types for backward compatAmit Shah2010-03-061-1/+10
| | | | | | | | Add a 0.12 machine type for compatibility with older versions. Mark the default one as 0.13. Signed-off-by: Amit Shah <amit.shah@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* s390-virtio: Fix compile error for virtio-block initAmit Shah2010-03-061-1/+1
| | | | | | | | | | Commit 428c149b0be790b440e1cbee185b152cdb22feec modified the argument that virtio_blk_init takes. Update the s390 bus code that calls this function. Signed-off-by: Amit Shah <amit.shah@redhat.com> CC: Christoph Hellwig <hch@lst.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* json-parser: Fix segfault on malformed inputKevin Wolf2010-03-061-1/+1
| | | | | | | | | If the parser fails to parse the key in parse_pair, it will access a NULL pointer. A simple way to trigger this is sending {foo} via QMP. This patch turns the segfault into a syntax error reply. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* hw/serial.c: fix THRE interrupt clearingAurelien Jarno2010-03-061-1/+1
| | | | | | | | | UART_IIR_THRI is not a mask, but a possible value for the IIR ID. Use UART_IIR_ID to extract this value. Broken by commit 71e605f80313a632cc6714cde7bd240042dbdd95. Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* hw/serial.c: fix indentationAurelien Jarno2010-03-061-8/+8
| | | | Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* linux-user: Save/restore fpu registers to signal context on sh4takasi-y@ops.dti.ne.jp2010-03-061-8/+21
| | | | | | | | As "todo" comment in source code. And modify restore_sigcontext() to have three args as kernel's does. Signed-off-by: Takashi YOSHII <takasi-y@ops.dti.ne.jp> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* linux-user: Fix syscall pipe2() retval on sh4takasi-y@ops.dti.ne.jp2010-03-061-3/+6
| | | | | | | | | On linux/sh4 pipe() return values by r0:r1 as SH C calling convention. pipe2() return values on memory as traditional unix way. Signed-off-by: Takashi YOSHII <takasi-y@ops.dti.ne.jp> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* target-i386: Fix long jumps/calls in long mode with REX.W setmalc2010-03-061-3/+1
| | | | | Signed-off-by: malc <av1474@comtv.ru> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* target-i386: fix lddqu SSE instructionAurelien Jarno2010-03-061-1/+1
| | | | | | This instruction load data from memory to register and not the reverse. Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* Update to latest SeaBIOSAnthony Liguori2010-03-052-0/+0
| | | | | | | - 8f469b9 Dynamically allocate ata_channel info; introduce custom atadrive_s struct. - 575ffc8 Cleanup - build drive description in temp memory during init. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* Makefile: Fix names of GPXE ROM filesStefan Weil2010-03-041-1/+3
| | | | | | | | | | | | | da51e79b7ff2126cc2448749d657a4f6e3b1270f added two new ROM files and removed an old one for eepro100.c. These changes were missing in Makefile (which resulted in a broken "make install"). Reported by Lucas Meneghel Rodrigues, thanks. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* target-mips: use newer logical opsAurelien Jarno2010-03-041-8/+4
| | | | Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* Merge remote branch 'qemu-kvm/uq/master' into pullsAnthony Liguori2010-03-0418-89/+300
|\
| * x86: Extend validity of bsp_to_cpuJan Kiszka2010-03-041-1/+2
| | | | | | | | | | | | | | | | | | As we hard-wire the BSP to CPU 0 anyway and cpuid_apic_id equals cpu_index, bsp_to_cpu can also be based on the latter directly. This will help an early user of it: KVM while initializing mp_state. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * KVM: x86: Restrict writeback of VCPU stateJan Kiszka2010-03-041-12/+20
| | | | | | | | | | | | | | | | | | | | Do not write nmi_pending, sipi_vector, and mpstate unless we at least go through a reset. And TSC as well as KVM wallclocks should only be written on full sync, otherwise we risk to drop some time on state read-modify-write. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * KVM: Rework VCPU state writeback APIJan Kiszka2010-03-0415-52/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This grand cleanup drops all reset and vmsave/load related synchronization points in favor of four(!) generic hooks: - cpu_synchronize_all_states in qemu_savevm_state_complete (initial sync from kernel before vmsave) - cpu_synchronize_all_post_init in qemu_loadvm_state (writeback after vmload) - cpu_synchronize_all_post_init in main after machine init - cpu_synchronize_all_post_reset in qemu_system_reset (writeback after system reset) These writeback points + the existing one of VCPU exec after cpu_synchronize_state map on three levels of writeback: - KVM_PUT_RUNTIME_STATE (during runtime, other VCPUs continue to run) - KVM_PUT_RESET_STATE (on synchronous system reset, all VCPUs stopped) - KVM_PUT_FULL_STATE (on init or vmload, all VCPUs stopped as well) This level is passed to the arch-specific VCPU state writing function that will decide which concrete substates need to be written. That way, no writer of load, save or reset functions that interact with in-kernel KVM states will ever have to worry about synchronization again. That also means that a lot of reasons for races, segfaults and deadlocks are eliminated. cpu_synchronize_state remains untouched, just as Anthony suggested. We continue to need it before reading or writing of VCPU states that are also tracked by in-kernel KVM subsystems. Consequently, this patch removes many cpu_synchronize_state calls that are now redundant, just like remaining explicit register syncs. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * KVM: Rework of guest debug state writingJan Kiszka2010-03-043-12/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far we synchronized any dirty VCPU state back into the kernel before updating the guest debug state. This was a tribute to a deficite in x86 kernels before 2.6.33. But as this is an arch-dependent issue, it is better handle in the x86 part of KVM and remove the writeback point for generic code. This also avoids overwriting the flushed state later on if user space decides to change some more registers before resuming the guest. We furthermore need to reinject guest exceptions via the appropriate mechanism. That is KVM_SET_GUEST_DEBUG for older kernels and KVM_SET_VCPU_EVENTS for recent ones. Using both mechanisms at the same time will cause state corruptions. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| * Add option to use file backed guest memoryMarcelo Tosatti2010-03-044-5/+141
| | | | | | | | | | | | | | | | Port qemu-kvm's -mem-path and -mem-prealloc options. These are useful for backing guest memory with huge pages via hugetlbfs. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> CC: john cooper <john.cooper@redhat.com>
| * Allocate memory below 4GB as one chunkAvi Kivity2010-03-041-9/+2
| | | | | | | | | | | | | | | | | | Instead of allocating a separate chunk for the first 640KB and another for 1MB+, allocate one large chunk. This plays well in terms of alignment and size with large pages. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* | eepro100: Keep includes sortedStefan Weil2010-03-031-1/+1
| | | | | | | | | | | | | | | | | | I always try to keep standard includes sorted and add a comment why they are there (so they can be removed when they are no longer needed). Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* | eepro100: Remove C++ commentsStefan Weil2010-03-031-59/+126
| | | | | | | | | | | | | | | | | | | | C++ comments are unwanted, so this is fixed here. * Replace C++ comments by C comments. * Put code which was deactivated by a C++ comment in #if 0...#endif. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* | eepro100: Add diagnose commandStefan Weil2010-03-031-0/+5
| | | | | | | | | | | | | | | | | | | | Real hardware would run an internal self-test. The emulation just returns a passed status. Original patch was from Reimar Döffinger, thanks. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* | eepro100: New function for reading command blockStefan Weil2010-03-031-14/+28
| | | | | | | | | | | | | | | | | | | | | | Move code which reads the command block to the new function read_cb. The patch also fixes some endianess issues related to the command block and moves declarations of local variables to the beginning of the block. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* | eepro100: Use tx.statusStefan Weil2010-03-031-3/+3
| | | | | | | | | | | | | | | | | | There is no need for a local variable "status". Using tx.status makes it clearer which status is addressed. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* | eepro100: Prettify code (no functional changes)Stefan Weil2010-03-031-4/+4
| | | | | | | | | | | | | | * Fix indentation. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* | eepro100: Fix CU Start commandStefan Weil2010-03-031-6/+6
| | | | | | | | | | | | | | CU Start is allowed when the CU is in the idle or suspended state. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* | eepro100: Support RNR interruptStefan Weil2010-03-031-3/+10
| | | | | | | | | | | | | | | | | | | | The RNR interrupt is triggered under these conditions: * the RU is not ready to receive a frame due to missing resources * the RU is ready and a RU abort command was requested Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* | eepro100: Replace variable name to fix a compiler warningStefan Weil2010-03-031-6/+6
| | | | | | | | | | | | | | | | When compiling with -Wshadow, gcc gives a warning which is fixed by renaming stat -> status. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* | eepro100: Use symbolic names for bits in EEPROM idStefan Weil2010-03-031-1/+16
| | | | | | | | | | | | | | V2 - Use UPPER_CASE for enum values Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* | eepro100: Remove old unused codeStefan Weil2010-03-031-18/+0
| | | | | | | | | | | | | | This code is no longer needed. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* | eepro100: Use symbolic names and BIT macros in binary operationsStefan Weil2010-03-031-19/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of magic numbers like 0x8000, symbolic names are used for the SCB command and status bits. There are too many configuration bits to use symbolic names there, too. Using the BIT macro is a little help when comparing code and documentation. For the same reason, some other constants were replaced by the BITS macro. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* | eepro100: Add device descriptionsStefan Weil2010-03-031-0/+12
| | | | | | | | | | | | | | | | | | Add descriptions for all devices. These descriptions are shown when users call qemu -device ? Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* | eepro100: Update copyright noticeStefan Weil2010-03-031-5/+5
| | | | | | | | | | Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* | eepro100: Add TODO listStefan Weil2010-03-031-0/+8
| | | | | | | | | | Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* | eepro100: Support gpxe boot for all eepro100 devicesStefan Weil2010-03-034-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only two boot ROM files are needed for all devices. * Add these GPXE ROM files using new naming convention (as discussed on qemu-devel). Both files were created with http://rom-o-matic.net/, PCI vendor / device ids as in ROM filenames and option BANNER_TIMEOUT = 0. * Remove old PXE ROM file for i82559er. It was replaced by gpxe-eepro100-80861209.rom. * Update pc-bios/README (and sort entries). Full support still needs additional eepro100 fixes. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* | eepro100: Fix PXE bootStefan Weil2010-03-031-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | The phy handling was wrong for PXE, GPXE boot: GPXE's eepro100 driver did not detect a valid link. This is fixed here. V2 - Use UPPER_CASE for enum values Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* | eepro100: Add missing SCB register namesStefan Weil2010-03-031-6/+10
| | | | | | | | | | | | | | | | | | Some system control block registers were addressed using their offset value. Use symbolic names now and clean the documentation. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* | eepro100: Fix compiler errors from debug messagesStefan Weil2010-03-031-6/+7
|/ | | | | | | | | | When debug output was enabled (by defining DEBUG_EEPRO100), some debug messages resulted in a compiler error. This is fixed here. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* (curses) Use more descriptive valuesSamuel Thibault2010-03-031-101/+110
| | | | | | | | | | | | | | Hello, curses_keys.h is using obscure constant values while the curses.h header provides fine defines, let's use the latter. To be applied on top of my previous patch. Samuel Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
OpenPOWER on IntegriCloud