summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* audio: Unbreak capturing in mixemu caseqemu-kvm-1.1.1-gentoo-3qemu-kvm-1.1.1-gentoomalc2012-08-121-0/+1
| | | | audio: Unbreak capturing in mixemu case
* usb-ehci: Fix an assert whenever isoc transfers are usedHans de Goede2012-08-121-0/+1
| | | | | | | | | hcd-ehci.c is missing an usb_packet_init() call for the ipacket UsbPacket it uses for isoc transfers, triggering an assert (taking the entire vm down) in usb_packet_setup as soon as any isoc transfers are done by a high speed USB device. Signed-off-by: Hans de Goede <hdegoede@redhat.com>
* usb-redir: Correctly handle the usb_redir_babble usbredir statusHans de Goede2012-08-121-0/+2
| | | | Signed-off-by: Hans de Goede <hdegoede@redhat.com>
* Replace 'struct siginfo' with 'siginfo_t'.Richard W.M. Jones2012-08-122-5/+5
| | | | | | | | | | | | | glibc 2.16 will remove the undocumented definition of 'struct siginfo' from <bits/siginfo.h>. This change is already present in glibc 2.15.90, so qemu compilation of certain targets (eg. cris-user) breaks. This struct was always typedef'd to be the same as 'siginfo_t' which is what POSIX documents, so use that instead. Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
* qemu-kvm: Fix default machine optionsDaniel P. Berrange2012-08-121-9/+15
| | | | | | | qemu-kvm-specific machine defaults were missing for pc-0.15 to pc-1.1. Then Daniel noted that --disable-kvm caused problems as the generated binaries would be unable to run. As we are at it, we can drop the kernel_irqchip=on that is now enable by default in upstream.
* Add 'query-events' command to QMP to query async eventsDaniel P. Berrange2012-07-214-62/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes it is neccessary for an application to determine whether a particular QMP event is available, so they can decide whether to use compatibility code instead. This introduces a new 'query-events' command to QMP to do just that { "execute": "query-events" } {"return": [{"name": "WAKEUP"}, {"name": "SUSPEND"}, {"name": "DEVICE_TRAY_MOVED"}, {"name": "BLOCK_JOB_CANCELLED"}, {"name": "BLOCK_JOB_COMPLETED"}, ...snip... {"name": "SHUTDOWN"}]} * monitor.c: Turn MonitorEvent -> string conversion into a lookup from a static table of constant strings. Add impl of qmp_query_events monitor command handler * qapi-schema.json, qmp-commands.hx: Define contract of query-events command Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
* kvm: Enable use of kvm_irqchip_in_kernel in hwlib codeJan Kiszka2012-07-211-0/+1
| | | | | | | | Provide a dummy kvm_kernel_irqchip so that kvm_irqchip_in_kernel can be used by code that is not under CONFIG_KVM protection. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Avi Kivity <avi@redhat.com>
* Merge tag 'v1.1.1' into stable-1.1Avi Kivity2012-07-1627-83/+412
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tag 'v1.1.1': (34 commits) update VERSION for v1.1.1 s390x: fix s390 virtio aliases rtl8139: validate rx ring before receiving packets ahci: SATA FIS is 20 bytes, not 0x20 qemu-img: document qed format on qemu-img man page virtio: Fix compiler warning for non Linux hosts sheepdog: fix return value of do_load_save_vm_state qemu/xendisk: set maximum number of grants to be used build: install qmp-commands.txt fdc: fix implied seek while there is no media in drive qcow2: fix autoclear image header update Prevent disk data loss when closing qemu qcow2: fix endianness conversion pci_bridge_dev: fix error path in pci_bridge_dev_initfn() qdev: release parent properties on dc->init failure intel-hda: Fix reset of MSI function ahci: Fix reset of MSI function rtl8139: honor RxOverflow flag in can_receive method configure: Fix build for some versions of glibc (9pfs) monitor: Fix memory leak with readline completion ... Signed-off-by: Avi Kivity <avi@redhat.com>
| * update VERSION for v1.1.1Michael Roth2012-07-121-1/+1
| | | | | | | | Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * Merge remote-tracking branch 'agraf/s390-for-upstream-1.1' into HEADMichael Roth2012-07-101-7/+20
| |\
| | * s390x: fix s390 virtio aliasesAlexander Graf2012-07-101-7/+20
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the virtio devices have the same frontend name, but actually implement different devices behind the scenes through aliases. The indicator which device type to use is the architecture. On s390, we want s390 virtio devices. On everything else, we want PCI devices. Reflect this in the alias selection code. This way we fix commands like -device virtio-blk on s390x which with this patch applied select the correct virtio-blk-s390 device rather than virtio-blk-pci. Reported-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Alexander Graf <agraf@suse.de>
| * rtl8139: validate rx ring before receiving packetsJason Wang2012-06-291-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit ff71f2e8cacefae99179993204172bc65e4303df prevent the possible crash during initialization of linux driver by checking the operating mode.This seems too strict as: - the real card could still work in mode other than normal - some buggy driver who does not set correct opmode after eeprom access So, considering rx ring address were reset to zero (which could be safely trated as an address not intened to DMA to), in order to both letting old guest work and preventing the unexpected DMA to guest, we can forbid packet receiving when rx ring address is zero. Tested-by: Avi Kivity <avi@redhat.com> Signed-off-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit fcce6fd25f3e233f9da9ef01230a668ab35bd343) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * ahci: SATA FIS is 20 bytes, not 0x20Daniel Verkamp2012-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | As in the SATA and AHCI specifications, a FIS is 5 Dwords of 4 bytes each, which comes to 20 bytes (decimal), not 0x20. Signed-off-by: Daniel Verkamp <daniel@drv.nu> Signed-off-by: Kevin Wolf <kwolf@redhat.com> (cherry picked from commit 4bb9c939a57103898f5a51aa6a7336eb3320d923) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * qemu-img: document qed format on qemu-img man pageStefan Hajnoczi2012-06-251-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | The qemu-img.1 man page is missing the qed format from its list of supported formats. Document the image creation options for qed. Suggested-by: Michael Tokarev <mjt@tls.msk.ru> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> (cherry picked from commit f085800e245836fed27fddb3b624a29326637657) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * virtio: Fix compiler warning for non Linux hostsStefan Weil2012-06-251-1/+3
| | | | | | | | | | | | | | | | | | | | The local variables ret, i are only used if __linux__ is defined. Signed-off-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: Kevin Wolf <kwolf@redhat.com> (cherry picked from commit 47ce9ef7f89032c4079bf5132a12d1bfd4d5bca5) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * sheepdog: fix return value of do_load_save_vm_stateMORITA Kazutaka2012-06-251-5/+5
| | | | | | | | | | | | | | | | | | | | | | bdrv_save_vmstate and bdrv_load_vmstate should return the vmstate size on success, and -errno on error. Signed-off-by: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp> Signed-off-by: Kevin Wolf <kwolf@redhat.com> (cherry picked from commit 6f3c714eb7730630241fd0b33b799352d7feb876) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * qemu/xendisk: set maximum number of grants to be usedJan Beulich2012-06-251-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | Legacy (non-pvops) gntdev drivers may require this to be done when the number of grants intended to be used simultaneously exceeds a certain driver specific default limit. Signed-off-by: Jan Beulich <jbeulich@suse.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> (cherry picked from commit 64c27e5b1fdb6d94bdc0bda3b1869d7383a35c65) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * build: install qmp-commands.txtBruce Rogers2012-06-251-0/+1
| | | | | | | | | | | | | | | | | | | | File is targeted for install, but is never installed. Signed-off-by: Bruce Rogers <brogers@suse.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> (cherry picked from commit 0cd23fcc0afe0a847e2e68797b64b297b20121f9) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * fdc: fix implied seek while there is no media in drivePavel Hrdina2012-06-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | The Windows uses 'READ' command at the start of an instalation without checking the 'dir' register. We have to abort the transfer with an abnormal termination if there is no media in the drive. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> (cherry picked from commit c52acf60b6c12ff5eb58eb6ac568c159ae0c8737) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * qcow2: fix autoclear image header updateStefan Hajnoczi2012-06-251-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The autoclear feature bits can be used for qcow2 file format features that are safe to "drop" by old programs that do not understand the feature. Upon opening the image file unknown autoclear feature bits are cleared and the image file header is rewritten, but this was happening too early in the code when critical header fields were not yet loaded. Process autoclear feature bits after all necessary header information has been loaded. Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> (cherry picked from commit af7b708db2d03eb47f7ba44a050439ad9ee65e7a) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * Prevent disk data loss when closing qemuPavel Dovgaluk2012-06-251-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | Prevent disk data loss when closing qemu console window under Windows 7. v3. Comment for Sleep() parameter was updated. Signed-off-by: Pavel Dovgalyuk<pavel.dovgaluk@gmail.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> (cherry picked from commit b75a02829dde98723dfe16fa098338cb267b28b9) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * qcow2: fix endianness conversionZhi Yong Wu2012-06-251-1/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com> Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> (cherry picked from commit 87267753a36798e25262ee48264bea2ab70921aa) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * pci_bridge_dev: fix error path in pci_bridge_dev_initfn()Jason Baron2012-06-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Currently, we do not properly cleanup, if pci_bridge_dev_initfn fails to initialize properly. Make sure to call pci_bridge_exitfn() in the error path. Signed-off-by: Jason Baron <jbaron@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> (cherry picked from commit 80aa796bf38b7ef21daa42673b4711510c450d8a) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * qdev: release parent properties on dc->init failureJason Baron2012-06-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While looking into hot-plugging bridges, I can create a qemu segfault via: $ device_add pci-bridge Bridge chassis not specified. Each bridge is required to be assigned a unique chassis id > 0. ** ERROR:qom/object.c:389:object_delete: assertion failed: (obj->ref == 0) I'm proposing to fix this by adding a call to 'object_unparent()', before the call to qdev_free(). I see there is already a precedent for this usage pattern as seen in qdev_simple_unplug_cb(): /* can be used as ->unplug() callback for the simple cases */ int qdev_simple_unplug_cb(DeviceState *dev) { /* just zap it */ object_unparent(OBJECT(dev)); qdev_free(dev); return 0; } Signed-off-by: Jason Baron <jbaron@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> (cherry picked from commit 266ca11a0433643a3cc3146a9837d9f2b0bfbe3b) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * intel-hda: Fix reset of MSI functionJan Kiszka2012-06-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Call msi_reset on device reset as still required by the core. CC: Gerd Hoffmann <kraxel@redhat.com> CC: qemu-stable@nongnu.org Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> (cherry picked from commit 8e729e3b521d9fcd87fc2e40b6322e684f58bb2e) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * ahci: Fix reset of MSI functionJan Kiszka2012-06-251-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | Call msi_reset on device reset as still required by the core. CC: Alexander Graf <agraf@suse.de> CC: qemu-stable@nongnu.org Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> (cherry picked from commit 868a1a52267daddf933ee18480ae036da029b561) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * rtl8139: honor RxOverflow flag in can_receive methodFernando Luis Vazquez Cao2012-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some drivers (Linux' 8139too among them) rely on the NIC injecting an interrupt in the event of a receive buffer overflow and, accordingly, set the RxOverflow bit in the interrupt mask. Unfortunately rtl8139's can_receive method ignores the RxOverflow flag, which may lead to a situation where rtl8139 stops receiving packets (can_receive returns 0) when the receive buffer becomes full. If the driver eventually read from the receive buffer or reset the card the emulator could recover from this situation. However some implementations only do this upon receiving an interrupt with either RxOK or RxOverflow set in the ISR; interrupt that will never come because QEMU's flow control mechanisms would prevent rtl8139 from receiving any packet. Letting packets go through when the overflow interrupt is enabled makes the QEMU emulator compliant to the spec and solves the problem. This patch should fix a relatively common (in our experience) network stall observed when running enterprise distros with rtl8139 as the NIC; in some cases the 8139too device driver gets loaded and when under heavy load the network eventually stops working. Reported-by: Hayato Kakuta <kakuta.hayato@oss.ntt.co.jp> Tested-by: Hayato Kakuta <kakuta.hayato@oss.ntt.co.jp> Acked-by: Igor Kovalenko <igor.v.kovalenko@gmail.com> Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> (cherry picked from commit fee9d348ffc5c9f80068086799a948996f633f7e) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * configure: Fix build for some versions of glibc (9pfs)Stefan Weil2012-06-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Some versions declare open_by_handle_at, but don't define AT_EMPTY_PATH. Extend the check in configure to test both preconditions. Signed-off-by: Stefan Weil <sw@weilnetz.de> Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Acked-by: Serge Hallyn <serge.hallyn@ubuntu.com> (cherry picked from commit acc55ba8b1519bda27be19fad50b65d2b0c7d26d) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * monitor: Fix memory leak with readline completionStefan Weil2012-06-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Each string which is shown during readline completion in the QEMU monitor is allocated dynamically but currently never deallocated. Add the missing loop which calls g_free for the allocated strings. Signed-off-by: Stefan Weil <sw@weilnetz.de> Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> (cherry picked from commit fc9fa4bd0a295ac18808c4cd2cfac484bc4649d3) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * qcow2: Silence false warningKevin Wolf2012-06-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Some gcc versions seem not to be able to figure out that the switch statement covers all possible values and that c is therefore always initialised. Add a default branch for them. Reported-by: malc <av1474@comtv.ru> Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: malc <av1474@comtv.ru> (cherry picked from commit 1417d7e40eaf1418333fb2ec43d0c7f4245b10e7) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * kvm: i8254: Fix conversion of in-kernel to userspace stateJan Kiszka2012-06-251-5/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a offset between the clock used to generate the in-kernel count_load_time (CLOCK_MONOTONIC) and the clock used for processing this in userspace (vm_clock), reading back the output of PIT channel 2 via port 0x61 was broken. One use cases that suffered from it was the CPU frequency calibration of SeaBIOS, which also affected IDE/AHCI timeouts. This fixes it by calibrating the offset between both clocks on kvm_pit_get and adjusting the kernel value before saving it in the userspace state. As the calibration only works while the vm_clock is running, we cache the in-kernel state across stopped phases. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Avi Kivity <avi@redhat.com> (cherry picked from commit 0cdd3d14447da1a04e778c219c77db8b96f9cf33) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * kvm/apic: correct short memsetJim Meyering2012-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | kvm_put_apic_state's attempt to clear *kapic before setting its bits cleared sizeof(void*) bytes (no more than 8) rather than the intended 1024 (KVM_APIC_REG_SIZE) bytes. Spotted by coverity. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com> (cherry picked from commit 0614cb82ca27bdffb83864e693fc29e29182667b) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * configure: report missing libraries for virtfsHarsh Prateek Bora2012-06-251-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Harsh Prateek Bora <harsh@linux.vnet.ibm.com> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> (cherry picked from commit 263ddcc81bf45d475ef86100a8567b3fb2129b8d) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * trace/simple.c: fix deprecated glib2 interfaceHarsh Prateek Bora2012-06-251-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Harsh Prateek Bora <harsh@linux.vnet.ibm.com> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> (cherry picked from commit 0d665005c7fd3800f1ae590701f60fe7e4c9a57a) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * target-xtensa: fix CCOUNT for conditional branchesMax Filippov2012-06-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Taken conditional branches fail to update CCOUNT register because accumulated ccount_delta is reset during translation of non-taken branch. To fix it only update CCOUNT once per conditional branch instruction translation. This fixes guest linux freeze on LTP waitpid06 test. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com> (cherry picked from commit d865f307399441919d6646545b7735e57920da04) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * exec: fix TB invalidation after breakpoint insertion/deletionMax Filippov2012-06-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tb_invalidate_phys_addr has to be called with the exact physical address of the breakpoint we add/remove, not just the page's base address. Otherwise we easily fail to flush the right TB. This breakage was introduced by the commit f3705d5329 "memory: make phys_page_find() return an unadjusted". This appeared to work for some guest architectures because their cpu_get_phys_page_debug implementation returns full translated physical address, not just the base of the TARGET_PAGE_SIZE-sized page. Reported-by: TeLeMan <geleman@gmail.com> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com> (cherry picked from commit 9d70c4b7b8a580959cc4f739e7c9a04964d00d46) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * target-xtensa: add MMU pagewalking testsMax Filippov2012-06-251-14/+207
| | | | | | | | | | | | | | | | Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com> (cherry picked from commit c305e32f4336e29fd3f86fc32ffce7b00e5bd9e1) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * target-xtensa: control page table lookup explicitlyMax Filippov2012-06-251-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Hardware pagetable walking may not be nested. Stop guessing and pass explicit flag to the get_physical_addr_mmu function that controls page table lookup. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com> (cherry picked from commit 57705a676c65e6ecacc44c23b192f3d7ed2cdedd) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * target-xtensa: update autorefill TLB entries conditionallyMax Filippov2012-06-253-27/+35
| | | | | | | | | | | | | | | | | | | | | | | | This is to avoid interference of internal QEMU helpers (cpu_get_phys_page_debug, tb_invalidate_virtual_addr) with guest-visible TLB state. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com> (cherry picked from commit ae4e7982e6db8b88e90db74779f4693bc2c636a8) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * target-xtensa: extract TLB entry setting methodMax Filippov2012-06-252-4/+14
| | | | | | | | | | | | | | | | Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com> (cherry picked from commit 16bde77a298acfe15f5e948aceff550d0cb173e8) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * target-xtensa: update EXCVADDR in case of page table lookupMax Filippov2012-06-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | According to ISA, 4.4.2.6, EXCVADDR may be changed by any TLB miss, even if the miss is handled entirely by processor hardware. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com> (cherry picked from commit 39e7d37f0f25823c00d1105e8eb9b61182fd349c) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * target-xtensa: flush TLB page for new MMU mappingMax Filippov2012-06-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | Both old and new mappings need flushing because their VPN may be different in MMU case. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com> (cherry picked from commit e323bdeff28f3bd647bf02cc9df57971eff3e258) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| * virtio-blk: Fix geometry sector calculationChristian Borntraeger2012-06-251-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the sector value for the geometry is masked, even if the user usesa command line parameter that explicitely gives a number. This breaks dasd devices on s390. A dasd device can have a physical block size of 4096 (== same for logical block size) and a typcial geometry of 15 heads and 12 sectors per cyl. The ibm partition detection relies on a correct geometry reported by the device. Unfortunately the current code changes 12 to 8. This would be necessary if the total size is not a multiple of logical sector size, but for dasd this is not the case. This patch checks the device size and only applies sector mask if necessary. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> CC: Christoph Hellwig <hch@lst.de> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> (cherry picked from commit 136be99e6e2130d3cd960b6b7d0ca86b6f011e5f) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
* | qemu-kvm: virtio: Do not register mask notifiers without in-kernel irqchip ↵Jan Kiszka2012-07-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | support We crash if we registers mask notifiers without backing in-kernel irqchip. This corresponds to the check in QEMU upstream after 1.1 now. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* | qemu-kvm: Add missing default machine optionsJan Kiszka2012-07-031-0/+2
| | | | | | | | | | | | | | qemu-kvm-specific machine defaults were missing for pc-0.15 and pc-1.0. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* | fdc: fix implied seek while there is no media in drivePavel Hrdina2012-06-291-0/+4
| | | | | | | | | | | | | | | | | | The Windows uses 'READ' command at the start of an instalation without checking the 'dir' register. We have to abort the transfer with an abnormal termination if there is no media in the drive. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
* | kvm: i8254: Fix conversion of in-kernel to userspace stateJan Kiszka2012-06-291-5/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a offset between the clock used to generate the in-kernel count_load_time (CLOCK_MONOTONIC) and the clock used for processing this in userspace (vm_clock), reading back the output of PIT channel 2 via port 0x61 was broken. One use cases that suffered from it was the CPU frequency calibration of SeaBIOS, which also affected IDE/AHCI timeouts. This fixes it by calibrating the offset between both clocks on kvm_pit_get and adjusting the kernel value before saving it in the userspace state. As the calibration only works while the vm_clock is running, we cache the in-kernel state across stopped phases. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Avi Kivity <avi@redhat.com>
* | Merge tag 'v1.1.0' into nextAvi Kivity2012-06-031-1/+1
|\| | | | | | | | | | | | | * tag 'v1.1.0': Update version for 1.1.0 release Signed-off-by: Avi Kivity <avi@redhat.com>
| * Update version for 1.1.0 releaseAnthony Liguori2012-06-011-1/+1
| | | | | | | | Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | pci-assign: Drop kvm_assigned_irq::host_irq initializationJan Kiszka2012-06-011-1/+0
| | | | | | | | | | | | | | | | real_device.irq is never set explicitly, thus remains 0. So we can simply drop this line as assigned_irq_data is zero-initialized anyway. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>