summaryrefslogtreecommitdiffstats
path: root/hw
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'c24a9c6ef946ec1b5b280061d4f7b579aaac6707' into upstream-mergeAvi Kivity2011-06-2822-85/+142
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c24a9c6ef946ec1b5b280061d4f7b579aaac6707': (56 commits) tcg/ppc64: Remove tcg_out_addi tcg/ppc: Remove tcg_out_addi vnc: Fix compilation with --enable-vnc-png virtio-serial: Fix segfault on guest boot Fix MinGW compilation when --enable-vnc-jpeg is specified TCG/Sparc64: use stack for TCG temps TCG/x86: use stack for TCG temps TCG/x86: use TCG_REG_CALL_STACK instead of TCG_REG_ESP TCG: remove broken stack allocation for call arguments TCG: fix negative frame offset calculations Delegate setup of TCG temporaries to targets cpu-exec.c: avoid AREG0 use qemu-kvm: fix pulseaudio detection in configure exec: last_first_tb was only used in !ONLY_USER case w32: Remove redundant definitions of PRI*64 Do not include compatfd for WIN32 Fix comment typos in hw/armv7m.c MAINTAINERS: Fix typo in email address blockdev: Put space after comma in error message Spell "unkown" correctly in error_report() arguments ... Signed-off-by: Avi Kivity <[email protected]>
| * Merge remote-tracking branch 'kraxel/usb.17' into stagingAnthony Liguori2011-06-277-38/+91
| |\
| | * usb: ignore USB_DT_DEBUGGerd Hoffmann2011-06-232-0/+5
| | | | | | | | | | | | Signed-off-by: Gerd Hoffmann <[email protected]>
| | * usb-storage: Turn drive serial into a qdev property usb-storage.serialMarkus Armbruster2011-06-231-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It needs to be a qdev property, because it belongs to the drive's guest part. Precedence: commit a0fef654 and 6ced55a5. Bonus: info qtree now shows the serial number. Signed-off-by: Markus Armbruster <[email protected]> Signed-off-by: Gerd Hoffmann <[email protected]>
| | * hw/usb-ohci.c: Fix handling of remote wakeup corner casesPeter Maydell2011-06-231-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct a number of minor errors in the OHCI wakeup implementation: * when the port is suspended but the controller is not, raise RHSC * when the controller is suspended but the port is not, raise RD * when the controller is suspended, move it to resume state These fix some edge cases where a USB device might not successfully get the attention of the guest OS if it tried to do so at the wrong time. Signed-off-by: Peter Maydell <[email protected]> Signed-off-by: Gerd Hoffmann <[email protected]>
| | * usb-bus: Don't allow speed mismatch while attaching devicesHans de Goede2011-06-231-0/+5
| | | | | | | | | | | | Signed-off-by: Gerd Hoffmann <[email protected]>
| | * usb: Add a speedmask to devicesHans de Goede2011-06-233-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is used to indicate at which speed[s] the device can operate, so that this can be checked to match the ports capabilities when it gets attached to a bus. Note that currently all usb1 emulated device claim to be fullspeed, this seems to not cause any problems, but still seems wrong, because with real hardware keyboards, mice and tablets usually are lo-speed, so reporting these as fullspeed devices seems wrong. Signed-off-by: Gerd Hoffmann <[email protected]>
| | * usb: Proper error propagation for usb_device_attach errorsHans de Goede2011-06-232-14/+16
| | | | | | | | | | | | Signed-off-by: Gerd Hoffmann <[email protected]>
| | * usb-bus: Don't allow attaching a device to a bus with no free portsHans de Goede2011-06-231-0/+5
| | | | | | | | | | | | Signed-off-by: Gerd Hoffmann <[email protected]>
| | * ehci: switch to nanosecondsGerd Hoffmann2011-06-231-18/+11
| | | | | | | | | | | | | | | | | | | | | Make ehci use nanoseconds everywhere. Simplifies time calculations. Signed-off-by: Gerd Hoffmann <[email protected]>
| | * ehci: add freq + maxframes propertiesGerd Hoffmann2011-06-231-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add properties for the wakeup rate and the max number of frames ehci will process at once. The wakeup rate defaults to 1000 which equals the usb frame rate. This can be reduced to make qemu wake up less often when ehci is active. In case the wakeup rate is reduced or the ehci timer is delayed due to latency issues elsewhere in qemu ehci will process multiple frames at once. The maxframes property specifies the upper limit for this. Signed-off-by: Gerd Hoffmann <[email protected]>
| * | Merge remote-tracking branch 'amit/for-anthony' into stagingAnthony Liguori2011-06-271-10/+14
| |\ \
| | * | virtio-serial: Fix segfault on guest bootLuiz Capitulino2011-06-271-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If I start qemu with: # qemu -hda disks/test.img -enable-kvm -m 1G -snapshot \ -device virtio-serial \ -chardev socket,host=localhost,port=1234,server,nowait,id=foo \ -device virtserialport,chardev=foo,name=org.qemu.guest_agent I get a segfault when booting a Fedora 14 guest. The backtrace says: Program terminated with signal 11, Segmentation fault. #0 0x0000000000420850 in handle_control_message (vser=0x3732bd0, buf=0x2c173e0, len=8) at /home/lcapitulino/src/qmp-unstable/hw/virtio-serial-bus.c:335 335 info = DO_UPCAST(VirtIOSerialPortInfo, qdev, port->dev.info); What's happening is VIRTIO_CONSOLE_DEVICE_READY is a message for the whole device, not for an individual port. So port is NULL. This bug was introduced by commit a15bb0d6a981de749452a5180fc8084d625671da. This commit fixes that by making the port returned by find_port_by_id() be used only by the VIRTIO_CONSOLE_PORT_READY and VIRTIO_CONSOLE_PORT_OPEN messages. Signed-off-by: Luiz Capitulino <[email protected]> Reviewed-by: Markus Armbruster <[email protected]> Signed-off-by: Amit Shah <[email protected]>
| * | | Merge remote-tracking branch 'stefanha/trivial-patches' into stagingAnthony Liguori2011-06-2716-37/+37
| |\ \ \ | | |/ / | |/| |
| | * | Fix comment typos in hw/armv7m.cMatthew Fernandez2011-06-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a couple of typos in comments. Signed-off-by: Matthew Fernandez <[email protected]> Acked-by: Stefan Weil <[email protected]> Signed-off-by: Stefan Hajnoczi <[email protected]>
| | * | Spell "unkown" correctly in error_report() argumentsMarkus Armbruster2011-06-246-11/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Markus Armbruster <[email protected]> Signed-off-by: Stefan Hajnoczi <[email protected]>
| | * | Strip trailing '\n' from error_report()'s first argumentMarkus Armbruster2011-06-249-24/+24
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | error_report() prepends location, and appends a newline. The message constructed from the arguments should not contain a newline. Fix the obvious offenders. Signed-off-by: Markus Armbruster <[email protected]> Signed-off-by: Stefan Hajnoczi <[email protected]>
* | | Merge commit '2b41f10e186ccb4f0058815161586f8d6d006ea3' into upstream-mergeAvi Kivity2011-06-282-2/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2b41f10e186ccb4f0058815161586f8d6d006ea3': Remove exec-all.h include directives Move cpu_has_work and cpu_pc_from_tb to cpu.h exec.h: fix coding style and change cpu_has_work to return bool Conflicts: exec.c Signed-off-by: Avi Kivity <[email protected]>
| * | Remove exec-all.h include directivesBlue Swirl2011-06-262-2/+0
| | | | | | | | | | | | | | | | | | Most exec-all.h include directives are now useless, remove them. Signed-off-by: Blue Swirl <[email protected]>
* | | Merge commit '3c688828bcb3afa2744e1f1729a40eef4a575b56' into upstream-mergeAvi Kivity2011-06-281-0/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c688828bcb3afa2744e1f1729a40eef4a575b56': m68k: use caller supplied CPUState for interrupt related stuff x86: use caller supplied CPUState for interrupt related stuff sparc: move do_interrupt to helper.c sparc: fix coding style of the area to be moved cpu_loop_exit: avoid using AREG0 Sparc32: dummy implementation of MXCC MMU breakpoint registers Fix fallouts from Linux header inclusion coreaudio: Fix OSStatus format specifier coreaudio: Avoid formatting UInt32 type Conflicts: cpu-exec.c Signed-off-by: Avi Kivity <[email protected]>
| * | Fix fallouts from Linux header inclusionJan Kiszka2011-06-261-0/+10
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an all-in-one fix for the smaller and bigger mistakes of the build system changes for accompanied Linux headers: - only enable KVM and vhost on Linux hosts - fix powerpc asm header symlink - do not use Linux headers on non-Linux hosts - fix kvmclock for !CONFIG_KVM - fix s390 build on non-Linux hosts Signed-off-by: Jan Kiszka <[email protected]> Tested-by: Andreas Färber <[email protected]> Tested-by: Stefan Weil <[email protected]> Signed-off-by: Blue Swirl <[email protected]>
* | qemu-kvm: Fix in-kernel PIT resetJan Kiszka2011-06-281-0/+3
| | | | | | | | | | | | | | | | | | Analogously to the PIC, we were lacking sync of the PIT user space state to the kernel after reset. Fix it pragmatically, the code will be reworked for upstream anyway. Signed-off-by: Jan Kiszka <[email protected]> Signed-off-by: Avi Kivity <[email protected]>
* | qemu-kvm: Fix in-kernel PIC resetJan Kiszka2011-06-281-1/+6
| | | | | | | | | | | | | | | | | | Lacking sync of the user space state to the kernel after system reset left the PIC behind in an undefined state. This broke IRQ delivery in some scenarios, e.g. when resetting while in the BIOS. Signed-off-by: Jan Kiszka <[email protected]> Signed-off-by: Avi Kivity <[email protected]>
* | qemu-kvm: Drop or replace useless device-assignment.h inclusionsJan Kiszka2011-06-282-2/+0
| | | | | | | | | | Signed-off-by: Jan Kiszka <[email protected]> Signed-off-by: Avi Kivity <[email protected]>
* | qemu-kvm: Remove qemu_ram_unmapJan Kiszka2011-06-281-1/+1
| | | | | | | | | | | | | | Upstream gained identical qemu_ram_free_from_ptr. Signed-off-by: Jan Kiszka <[email protected]> Signed-off-by: Avi Kivity <[email protected]>
* | qemu-kvm: Drop some no longer needed #ifdefsJan Kiszka2011-06-281-45/+7
| | | | | | | | | | | | | | | | Not a complete cleanup, other code has more subtle dependencies. Will be resolved during upstream merge. Signed-off-by: Jan Kiszka <[email protected]> Signed-off-by: Avi Kivity <[email protected]>
* | Merge commit '48e2faf222cbf4abab7c8e4b3f44229ec98eae7f' into upstream-mergeMarcelo Tosatti2011-06-222-3/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '48e2faf222cbf4abab7c8e4b3f44229ec98eae7f': net: Warn about "-net nic" options which were ignored net: Don't warn about the default network setup Revert "net: Improve the warnings for dubious command line option combinations" Optimize screendump kvm: fix FPU state subsection KVM: Fix XSAVE feature bit enumeration Reset system before loadvm Allow silent system resets error framework: Fix compilation for w32/w64 Signed-off-by: Marcelo Tosatti <[email protected]>
| * net: Warn about "-net nic" options which were ignoredPeter Maydell2011-06-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | Diagnose the case where the user asked for a NIC via "-net nic" but the board didn't instantiate that NIC (for example where the user asked for two NICs but the board only supports one). Note that this diagnostic doesn't apply to NICs created through -device, because those are always instantiated. Signed-off-by: Peter Maydell <[email protected]> Signed-off-by: Anthony Liguori <[email protected]>
| * Optimize screendumpAvi Kivity2011-06-221-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | When running kvm-autotest, fputc() is often the second highest (sometimes #1) function showing up in a profile. This is due to fputc() locking the file for every byte written. Optimize by buffering a line's worth of pixels and writing that out in a single call. Reviewed-by: Stefan Hajnoczi <[email protected]> Signed-off-by: Avi Kivity <[email protected]> Signed-off-by: Anthony Liguori <[email protected]>
| * Merge remote-tracking branch 'qemu-kvm/uq/master' into stagingAnthony Liguori2011-06-221-9/+0
| |\
* | \ Merge commit 'fdba9594df8eb2e2ac16bba95308e4159ffbb9e4' into upstream-mergeMarcelo Tosatti2011-06-2218-110/+557
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fdba9594df8eb2e2ac16bba95308e4159ffbb9e4': cmd: fix operator precedence Fix typo in cpus.c lsi: Fix unused-but-set-variable warning xen: Add the Xen platform pci device xen: fix interrupt routing xen: only track the linear framebuffer cirrus_vga: reset lfb_addr after a pci config write if the BAR is unmapped wdt: remove unused variables alpha: remove unused variable alpha/translate: remve unused variables get_maintainer: update to match qemu tree get_maintainer.pl: copy utility from Linux usb-ehci: move device/vendor/class id to qdev ppce500: move device/vendor/class id to qdev pci: don't call qdev pci init method print meaningful error message in case of --disable-vhost-net virtio: compat event idx support virtio: event index support Conflicts: hw/piix_pci.c hw/virtio-pci.c hw/virtio-pci.h Signed-off-by: Marcelo Tosatti <[email protected]>
| * | Merge remote-tracking branch 'mst/for_anthony' into stagingAnthony Liguori2011-06-2253-432/+552
| |\ \ | | | | | | | | | | | | | | | | Conflicts: hw/usb-uhci.c
| | * | wdt: remove unused variablesMichael S. Tsirkin2011-06-151-3/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael S. Tsirkin <[email protected]> Acked-off-by: Isaku Yamahata <[email protected]>
| | * | usb-ehci: move device/vendor/class id to qdevMichael S. Tsirkin2011-06-151-5/+4
| | | | | | | | | | | | | | | | Signed-off-by: Michael S. Tsirkin <[email protected]>
| | * | ppce500: move device/vendor/class id to qdevMichael S. Tsirkin2011-06-151-10/+3
| | | | | | | | | | | | | | | | Signed-off-by: Michael S. Tsirkin <[email protected]>
| | * | pci: don't call qdev pci init methodIsaku Yamahata2011-06-151-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As pci id initialization is moved to common layer, some initialization function can be empty. So don't call init method if NULL. Signed-off-by: Isaku Yamahata <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]>
| | * | Merge remote-tracking branch 'origin/master' into pciMichael S. Tsirkin2011-06-15105-3048/+5163
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: hw/virtio-pci.c
| | * | | print meaningful error message in case of --disable-vhost-netMichael Tokarev2011-06-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When qemu gets compiled without support of vhost-net, any attempt to use it fails with a very clear error message: qemu-system-x86_64: -netdev ...,vhost=on: vhost-net requested but could not be initialized there's absolutely no reason given _why_ it coult not be initialized, and even strace'ing the process in question does not reveal any errors. So print a message telling what's going on. Signed-off-by: Michael Tokarev <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]>
| | * | | virtio: compat event idx supportMichael S. Tsirkin2011-06-141-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable event index for compat machine types. Signed-off-by: Michael S. Tsirkin <[email protected]>
| | * | | virtio: event index supportMichael S. Tsirkin2011-06-123-10/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for event_idx feature, and utilize it to reduce the number of interrupts and exits for the guest. Signed-off-by: Michael S. Tsirkin <[email protected]>
| * | | | Merge remote-tracking branch 'agraf/xen-next' into stagingAnthony Liguori2011-06-228-39/+402
| |\ \ \ \
| | * | | | xen: Add the Xen platform pci deviceSteven Smith2011-06-194-0/+349
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a new emulated PCI device, specific to fully virtualized Xen guests. The device is necessary for PV on HVM drivers to work. Signed-off-by: Steven Smith <[email protected]> Signed-off-by: Anthony PERARD <[email protected]> Signed-off-by: Stefano Stabellini <[email protected]> Signed-off-by: Alexander Graf <[email protected]>
| | * | | | xen: fix interrupt routingStefano Stabellini2011-06-193-38/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compared to the last version I only added a comment to the code. - remove i440FX-xen and i440fx_write_config_xen we don't need to intercept pci config writes to i440FX anymore; - introduce PIIX3-xen and piix3_write_config_xen we do need to intercept pci config write to the PCI-ISA bridge to update the PCI link routing; - set the number of PIIX3-xen interrupts line to 128; Signed-off-by: Stefano Stabellini <[email protected]> Signed-off-by: Alexander Graf <[email protected]>
| | * | | | cirrus_vga: reset lfb_addr after a pci config write if the BAR is unmappedStefano Stabellini2011-06-191-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the cirrus_vga PCI BAR is unmapped than we should not only reset map_addr but also lfb_addr, otherwise we'll keep trying to map the old lfb_addr in map_linear_vram. Signed-off-by: Stefano Stabellini <[email protected]> Acked-by: Jan Kiszka <[email protected]> Signed-off-by: Alexander Graf <[email protected]>
| * | | | | lsi: Fix unused-but-set-variable warningChristophe Fergeau2011-06-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This warning is new in gcc 4.6. Signed-off-by: Christophe Fergeau <[email protected]> Acked-by: Paolo Bonzini <[email protected]> Signed-off-by: Stefan Hajnoczi <[email protected]>
* | | | | | Merge commit '0bed3bba7d68b35e4b0c63d597b377c49a14e509' into upstream-mergeMarcelo Tosatti2011-06-221-9/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0bed3bba7d68b35e4b0c63d597b377c49a14e509': kvm: ppc: Drop CONFIG_KVM_PPC_PVR kvm: Drop CONFIG_KVM_PARA Conflicts: configure Signed-off-by: Marcelo Tosatti <[email protected]>
| * | | | | kvm: Drop CONFIG_KVM_PARAJan Kiszka2011-06-201-9/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The kvm_para.h header is now always available. Signed-off-by: Jan Kiszka <[email protected]> Signed-off-by: Marcelo Tosatti <[email protected]>
* | | | | Merge commit '712c2b41490a986a5dd99bec99b854bac4322201' into upstream-mergeMarcelo Tosatti2011-06-221-0/+14
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '712c2b41490a986a5dd99bec99b854bac4322201': xen: mapcache performance improvements exec.c: refactor cpu_physical_memory_map xen: remove xen_map_block and xen_unmap_block xen: remove qemu_map_cache_unlock xen: fix qemu_map_cache with size != MCACHE_BUCKET_SIZE xen: Introduce VGA sync dirty bitmap support xen: Add xc_domain_add_to_physmap to xen_interface. Signed-off-by: Marcelo Tosatti <[email protected]>
| * | | | xen: Add xc_domain_add_to_physmap to xen_interface.Anthony PERARD2011-06-191-0/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function will be used to support sync dirty bitmap. This come with a check against every Xen release, and special implementation for Xen version that doesn't have this specific call. This function will not be usable with Xen 3.3 because the behavior is different. Signed-off-by: Anthony PERARD <[email protected]> Signed-off-by: Alexander Graf <[email protected]>
* | | | Merge commit '01731cfb39ae234a8df852f56fc21efd155dbc26' into upstream-mergeMarcelo Tosatti2011-06-223-36/+81
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '01731cfb39ae234a8df852f56fc21efd155dbc26': msix: Use replace local defines with pci_regs versions pci: Update pci_regs header Conflicts: hw/msix.c Signed-off-by: Marcelo Tosatti <[email protected]>