Statistics
| Branch: | Revision:

root / hw @ 234e810c

# Date Author Comment
88793816 11/21/2012 03:55 pm Hans de Goede

uhci: Add a completions_only flag for async completions

Add a completions_only flag, and set this when running process_frame for async
completion handling, this fixes 2 issues in a single patch:

1) It makes sure async completed packets get written to guest mem immediately,...

1cbdde90 11/21/2012 03:55 pm Hans de Goede

uhci: Don't allow the guest to set port-enabled when there is no dev connected

It is possible for device disconnect and the guest trying to reset the port
(because of USB xact errors prior to the disconnect getting signaled) to race,
when we hit this race, the guest will write the port-control register with its...

71d2c9cf 11/21/2012 03:55 pm Hans de Goede

uhci: Fix double unlink

uhci_async_cancel() already does a uhci_async_unlink().

Signed-off-by: Hans de Goede <>
Signed-off-by: Gerd Hoffmann <>

33c1a685 11/21/2012 03:55 pm Hans de Goede

usb-bt: Return NAK instead of STALL when interrupt ep has no data

I noticed this while making all devices with interrupt endpoints properly
do wakeup. While at it also add wakeup support.

Note that I've not tested this, but returning STALL for an interrupt ep...

c4020746 11/21/2012 03:55 pm Hans de Goede

usb-smartcard-reader: Properly NAK interrupt eps when we've no events

When we've no data to return from the interrupt endpoint, return NAK rather
then a 0 length packet.

CC: Alon Levy <>
Signed-off-by: Hans de Goede <>...

234e810c 11/21/2012 03:55 pm Hans de Goede

usb-redir: Split usb_handle_interrupt_data into separate in/out functions

No functional changes.

Signed-off-by: Hans de Goede <>
Signed-off-by: Gerd Hoffmann <>

ad1db3b3 11/19/2012 05:27 pm Anthony Liguori

Merge remote-tracking branch 'kwolf/for-anthony' into staging

  • kwolf/for-anthony: (26 commits)
    qemu-io: Use bdrv_drain_all instead of qemu_aio_flush
    megasas: Use bdrv_drain_all instead of qemu_aio_flush
    vmdk: Fix data corruption bug in WRITE and READ handling...
5cc82c2d 11/19/2012 05:26 pm Anthony Liguori

Merge remote-tracking branch 'kraxel/usb.71' into staging

  • kraxel/usb.71:
    usb-host: fix splitted transfers
    usb-host: update tracing
    usb-redir: Set default debug level to warning
    usb-redir: Only add actually in flight packets to the in flight queue...
698229eb 11/19/2012 04:31 pm Anthony Liguori

Merge remote-tracking branch 'amit/loadvm-irq-inj-fix' into staging

  • amit/loadvm-irq-inj-fix:
    virtio-serial-bus: post_load send_event when vm is running

Signed-off-by: Anthony Liguori <>

f44d771a 11/19/2012 04:31 pm Anthony Liguori

Merge remote-tracking branch 'afaerber/qom-cpu' into staging

  • afaerber/qom-cpu:
    target-i386: Add Haswell CPU model
    target-i386/cpu: Add new Opteron CPU model
    target-i386/cpu: Name new CPUID bits
    qapi-types.h: Don't include qemu-common.h
    osdep: Move qemu_{open,close}() prototypes...
d167dac9 11/19/2012 04:30 pm Anthony Liguori

Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

  • qemu-kvm/uq/master:
    kvm: Actually remove software breakpoints from list on cleanup
    acpi_piix4: fix migration of gpe fields

Signed-off-by: Anthony Liguori <>

ab4dd33d 11/17/2012 06:38 pm Blue Swirl

Merge branch 'vga.1' of git://git.kraxel.org/qemu

  • 'vga.1' of git://git.kraxel.org/qemu:
    vga: fix mmio vga register mapping
    vga: fix bochs alignment issue
500054f1 11/16/2012 04:36 pm Anthony Liguori

virtio-rng-pci: create a default backend if none exists

This allows you to specify:

$ qemu -device virtio-rng-pci

And things will Just Work with a reasonable default.

Signed-off-by: Anthony Liguori <>

16c915ba 11/16/2012 04:36 pm Amit Shah

virtio-rng: hardware random number generator device

The Linux kernel already has a virtio-rng driver, this is the device
implementation.

When the guest asks for entropy from the virtio hwrng, it puts a buffer
in the vq. We then put entropy into that buffer, and push it back to...

904d6f58 11/16/2012 04:36 pm Anthony Liguori

virtio-rng: add rate limiting support

This adds parameters to virtio-rng-pci to allow rate limiting the entropy a
guest receives. An example command line:

$ qemu -device virtio-rng-pci,max-bytes=1024,period=1000

Would limit entropy collection to 1Kb/s....

537e8f1a 11/16/2012 12:27 pm Jan Kiszka

usb: host-linux: Ignore parsing errors of the device descriptors

The Linux is more tolerant here as well: Just stop parsing the device
descriptors when an error is detected but do not reset what was found
so far. This allows to run buggy devices with partially invalid...

30d68cf6 11/16/2012 12:27 pm Hans de Goede

ehci: Don't access packet after freeing it

ehci_state_writeback() will free the packet, so we should not access
the packet after calling ehci_state_writeback().

Signed-off-by: Hans de Goede <>
Signed-off-by: Gerd Hoffmann <>

ff80ce59 11/16/2012 12:27 pm Hans de Goede

ehci: Fixup q->qtdaddr after cancelling an already completed packet

This avoids the q->qtdaddr == p->qtdaddr asserts we have triggering, when
a queue contains multiple completed packages when we cancel the queue.

I triggered this with windows7 + async interrupt endpoint handling (*)...

601a2347 11/16/2012 12:27 pm Hans de Goede

ehci: Better detection for qtd-s linked in circles

Windows links interrupt qtd-s in circles, which means that when interrupt
endpoints return USB_RET_ASYNC, combined with the recent
"ehci: Retry to fill the queue while waiting for td completion" patch,
we keep adding the tds to the queue over and over again, as we detect the...

2c7b15c1 11/16/2012 12:27 pm Hans de Goede

ehci: Don't verify the next pointer for periodic qh-s and qtd-s

While testing the move to async packet handling for interrupt endpoints I
noticed that Windows-XP likes to play tricks with the next pointer for
periodic qh-s, so we should not fail qh / qtd verification when it changes....

40862309 11/16/2012 12:27 pm Gerd Hoffmann

ehci: keep the frame timer running in case the guest asked for frame list rollover interrupts

Signed-off-by: Gerd Hoffmann <>

55903f1d 11/16/2012 12:27 pm Gerd Hoffmann

ehci: handle dma errors

Starting with commit 1c380f9460522f32c8dd2577b2a53d518ec91c6d dma
transfers can actually fail. This patch makes ehci keep track
of the busmaster bit in pci config space, by setting/clearing the
dma_context pointer. Attempts to dma without context will result...

2cb343b4 11/16/2012 12:27 pm Hans de Goede

usb-redir: Only add actually in flight packets to the in flight queue

Packets which are queued up, but not yet handed over to the device, are
not in flight.

Signed-off-by: Hans de Goede <>
Signed-off-by: Gerd Hoffmann <>

618fbc95 11/16/2012 12:27 pm Hans de Goede

usb-redir: Set default debug level to warning

The previous default of 0 means that even errors and warnings would not
get printed, which is really not a good default.

Signed-off-by: Hans de Goede <>
Signed-off-by: Gerd Hoffmann <>

8c908fca 11/16/2012 12:27 pm Gerd Hoffmann

usb-host: update tracing

Now that we have separate status and length fields in USBPacket
update the completion tracepoint to log both.

Signed-off-by: Gerd Hoffmann <>

71e0aa39 11/16/2012 12:27 pm Gerd Hoffmann

usb-host: fix splitted transfers

USBPacket->actual_length wasn't updated correctly for USBPackets
splitted into multiple urbs. Fix it.

Signed-off-by: Gerd Hoffmann <>

c96c53b5 11/16/2012 12:27 pm Gerd Hoffmann

vga: fix mmio vga register mapping

df9ffb72 11/16/2012 12:27 pm Gerd Hoffmann

vga: fix bochs alignment issue

The bochs dispi interface traditionally uses port 0x1ce as 16bit index
register and port 0x1cf as 16bit data register. The later is unaligned,
and probably for that reason the the data register was moved to 0x1d0
for non-x86 archs....

4ea375bf 11/16/2012 12:27 pm Gerd Hoffmann

fix live migration

Commit 1c380f9460522f32c8dd2577b2a53d518ec91c6d breaks live migration.
DMA stops working for ehci (and probably for any pci device) after
restoring the guest because the bus master region never gets enabled.
Add code doing that after loading the pci config space from vmstate....

155de06f 11/16/2012 12:27 pm David Gibson

usb: Fix (another) bug in usb_packet_map() for IOMMU handling

Elements in qemu SGLists can cross IOMMU page boundaries. So, in commit
39c138c8420f51a7da7b35233a8d7400a0b589ac "usb: Fix usb_packet_map() in the
presence of IOMMUs", I changed usb_packet_map() to split up each SGList...

c06c68c9 11/16/2012 12:27 pm Gerd Hoffmann

usb-host: scan for usb devices when the vm starts

Commit a844ed842d9a9d929645c09ae0f52f753d7a02e0 leads to usb-host
detecting devices not right after qemu startup because the guest
isn't running yet. Instead they are found on the first of the
regular usb device poll runs. Which is too late for seabios to see...

80dcfb85 11/16/2012 10:40 am Alon Levy

virtio-serial-bus: post_load send_event when vm is running

Alexander Larsson found irq injection to Windows guests stopped after a
migration. The symptom was the mouse stopped working.

Reproduction steps are:
1. On src, start qemu with a virtio-serial port without any backend...

68d00192 11/15/2012 03:37 pm Aurelien Jarno

mips/malta: fix CBUS UART interrupt pin

According to the MIPS Malta Developement Platform User's Manual, the
i8259 interrupt controller is supposed to be connected to the hardware
IRQ0, and the CBUS UART to the hardware interrupt 2.

In QEMU they are both connected to hardware interrupt 0, the CBUS UART...

074a86fc 11/15/2012 03:18 am Anthony Liguori

qdev: Split up header so it can be used in cpu.h

Header file dependency is a frickin' nightmare right now. cpu.h tends
to get included in our 'include everything' header files but qdev also
needs to include those headers mainly for qdev-properties since it knows...

5202ef94 11/15/2012 02:57 am Igor Mammedov

Move qemu_irq typedef out of qemu-common.h

It's necessary for making CPU child of DEVICE without
causing circular header deps.

Signed-off-by: Igor Mammedov <>
[ehabkost: re-added the typedef to hw/irq.h after rebasing]
Signed-off-by: Eduardo Habkost <>...

b0b873a0 11/15/2012 12:15 am Marcelo Tosatti

acpi_piix4: fix migration of gpe fields

Migrate 16 bytes for en/sts fields (which is the correct size),
increase version to 3, and document how to support incoming
migration from qemu-kvm 1.2.

Acked-by: Paolo Bonzini <>
Signed-off-by: Marcelo Tosatti <>

b618f4a1 11/14/2012 07:20 pm Kevin Wolf

megasas: Use bdrv_drain_all instead of qemu_aio_flush

Calling qemu_aio_flush() directly can hang when combined with I/O
throttling.

Signed-off-by: Kevin Wolf <>
Acked-by: Paolo Bonzini <>

d497d534 11/14/2012 07:19 pm Hervé Poussineau

fdc: use status0 field instead of a local variable

Signed-off-by: Hervé Poussineau <>
Signed-off-by: Kevin Wolf <>

c5139bd9 11/14/2012 07:19 pm Hervé Poussineau

fdc: fix FD_SR0_SEEK for non-DMA transfers and multi sectors transfers

On non-DMA transfers, fdctrl_stop_transfer() used to set FD_SR0_SEEK
no matter if there actually was a seek or not. This is obviously wrong.

fdctrl_seek_to_next_sect() has this information because it performs...

d6ed4e21 11/14/2012 07:19 pm Hervé Poussineau

fdc: fix FD_SR0_SEEK for initial seek on DMA transfers

fdctrl_start_transfer() used to set FD_SR0_SEEK no matter if
there actually was a seek or not. This is obviously wrong.

fdctrl_start_transfer() has this information because it performs
the initial seek itself....

075f5532 11/14/2012 07:19 pm Hervé Poussineau

fdc: fix false FD_SR0_SEEK

Do not always set FD_SR0_SEEK, as callers already set it if needed.

Signed-off-by: Hervé Poussineau <>
Signed-off-by: Kevin Wolf <>

7ea004ed 11/14/2012 07:19 pm Hervé Poussineau

fdc: implement VERIFY command

VERIFY command is like a READ command, except that read data is not
transfered by DMA.
As DMA engine is not used, so we have to start data transfer ourselves.

Signed-off-by: Hervé Poussineau <>
Signed-off-by: Kevin Wolf <>

27c86e24 11/14/2012 07:19 pm Hervé Poussineau

fdc: remove double affectation of FD_MSR_CMDBUSY flag

FD_MSR_CMDBUSY flag is already set in fdctrl_write_data(), just
before calling the command handler (fdctrl_start_transfer() here).

Signed-off-by: Hervé Poussineau <>
Signed-off-by: Kevin Wolf <>

c83f97b5 11/14/2012 07:19 pm Hervé Poussineau

fdc: fix typo in zero constant

Signed-off-by: Hervé Poussineau <>
Signed-off-by: Kevin Wolf <>

cd30b53d 11/14/2012 07:19 pm Hervé Poussineau

fdc: remove last usage of FD_STATE_SEEK

Replace it by directly setting FD_SR0_SEEK if required

Signed-off-by: Hervé Poussineau <>
Signed-off-by: Kevin Wolf <>

d7331bed 11/14/2012 07:19 pm Stefan Hajnoczi

aio: rename AIOPool to AIOCBInfo

Now that AIOPool no longer keeps a freelist, it isn't really a "pool"
anymore. Rename it to AIOCBInfo and make it const since it no longer
needs to be modified.

Signed-off-by: Stefan Hajnoczi <>
Signed-off-by: Kevin Wolf <>

34abf9a7 11/14/2012 07:19 pm Kevin Wolf

fdc: Remove status0 parameter from fdctrl_set_fifo()

It decided whether an interrupt is triggered. Only one caller made use
of this functionality, so move the code there.

In this one caller, the interrupt must actually be triggered
unconditionally, like it was before commit 2fee0088. For example, a...

ce34cf72 11/14/2012 04:53 pm Anthony Liguori

Merge remote-tracking branch 'awilliam/tags/vfio-pci-for-qemu-1.3.0-rc0' into staging

vfio-pci: KVM INTx accel & common msi_get_message

  • awilliam/tags/vfio-pci-for-qemu-1.3.0-rc0:
    vfio-pci: Use common msi_get_message
    vfio-pci: Add KVM INTx acceleration...
5f580e94 11/14/2012 04:50 pm Anthony Liguori

Merge remote-tracking branch 'bonzini/scsi-next' into staging

  • bonzini/scsi-next:
    virtio-scsi: use dma_context_memory
    dma: Define dma_context_memory and use in sysbus-ohci
    megasas: Correct target/lun mapping
    scsi-disk: flush cache after disabling it...
ce5e5b52 11/14/2012 04:50 pm Anthony Liguori

Merge remote-tracking branch 'kraxel/usb.70' into staging

  • kraxel/usb.70:
    ehci: fix migration
    xhci: Fix some DMA host endian bugs
    usb/combined-packet: Move freeing of combined to usb_combined_packet_remove()
    xhci: Add support for packets with both data and an error status...
bf0dfb69 11/14/2012 04:49 pm Anthony Liguori

Merge remote-tracking branch 'spice/spice.v63' into staging

  • spice/spice.v63:
    spice: fix initialization order
    pflib: unused, remove it.
    spice: switch to pixman
    qxl: call dpy_gfx_resize when entering vga mode
    qxl: fix cursor reset
    hw/qxl: qxl_send_events: nop if stopped...
e1d1e586 11/13/2012 09:27 pm Alex Williamson

vfio-pci: Add KVM INTx acceleration

This makes use of the new level irqfd support enabling bypass of qemu
userspace both on INTx injection and unmask. This significantly
boosts the performance of devices making use of legacy interrupts (ex.
~60% better netperf TCP_RR scores for an e1000e assigned to a Linux...

a771c517 11/13/2012 09:27 pm Alex Williamson

vfio-pci: Use common msi_get_message

We can get rid of our local version now that a helper exists.

Signed-off-by: Alex Williamson <>

9e11908f 11/12/2012 05:44 pm Peter Maydell

dma: Define dma_context_memory and use in sysbus-ohci

Define a new global dma_context_memory which is a DMAContext corresponding
to the global address_space_memory AddressSpace. This can be used by
sysbus peripherals like sysbus-ohci which need to do DMA....

dd72fdd0 11/12/2012 05:44 pm Paolo Bonzini

virtio-scsi: use dma_context_memory

Until address_space_rw was introduced, NULL was accepted as a
placeholder for DMA with no IOMMU (to address_space_memory).

This does not work anymore, and dma_context_memory needs to
be specified explicitly.

Signed-off-by: Paolo Bonzini <>

4003e24f 11/12/2012 05:42 pm Hannes Reinecke

megasas: Correct target/lun mapping

The structure to reference a logical drive has an unused field,
which can be used to carry the lun ID. This enabled seabios to
establish the proper target/LUN mapping.

Cc: Paolo Bonzini <>
Cc: Gerd Hoffmann <>...

c8dcb531 11/12/2012 04:00 pm Paolo Bonzini

scsi: do not return short responses for emulated commands

The inquiry command, for the case of VPD=1, was returning short
responses; the number of returned bytes was just the number of bytes
in the request, without padding to the specified allocation length...

cd41a671 11/12/2012 04:00 pm Paolo Bonzini

virtio-scsi: factor checks for VIRTIO_SCSI_S_DRIVER_OK when reporting events

Suggested by Laszlo Ersek.

Signed-off-by: Paolo Bonzini <>

b5232e90 11/12/2012 04:00 pm Paolo Bonzini

scsi: remove superfluous call to scsi_device_set_ua

Suggested by Laszlo Ersek.

Signed-off-by: Paolo Bonzini <>

346a3017 11/12/2012 04:00 pm Paolo Bonzini

megasas: do not include block_int.h

Signed-off-by: Paolo Bonzini <>

accfeb2d 11/12/2012 04:00 pm Paolo Bonzini

scsi-disk: flush cache after disabling it

SBC says that "if an application client changes the WCE bit from one to
zero via a MODE SELECT command, then the device server shall write
any data in volatile cache to non-volatile medium before completing
the command"....

4d4d9b3a 11/10/2012 03:49 pm Blue Swirl

m48t59: remove unused m48t59_set_addr

Signed-off-by: Blue Swirl <>

e62774c4 11/10/2012 03:49 pm Blue Swirl

sun4c: remove unused functions

Signed-off-by: Blue Swirl <>

1f202568 11/10/2012 02:26 pm BALATON Zoltan

vmware_vga: Add back some info in local state partially reverting aa32b38c

Keep saving display surface parameters at init and using these cached
values instead of getting them when needed. Not sure why this is
needed (maybe due to the interaction with the vga device) but not...

5c61afec 11/10/2012 02:25 pm Jan Kiszka

kvmvapic: Fix TB invalidation after instruction patching

Since 0b57e287, cpu_memory_rw_debug already triggers a TB invalidation.
As it doesn't (and cannot) set is_cpu_write_access=1 but "consumes" the
currently executed TB, the tb_invalidate_phys_page_range call from...

9d153047 11/09/2012 10:09 am Gerd Hoffmann

ehci: fix migration

Commit 5010d4dc618b6b8e7c21129c487c06f6493f71fc reorganized vmstate to
split core + pci, but got two little details wrong. Fix them.

Signed-off-by: Gerd Hoffmann <>

616b5d53 11/09/2012 09:27 am David Gibson

xhci: Fix some DMA host endian bugs

The xhci device does correct endian switches on the results of some DMAs
but not all. In particular, there are many DMAs of what are essentially
arrays of 32-bit integers which never get byteswapped. This causes them...

e696b1da 11/08/2012 07:41 pm Hans de Goede

ehci: Add support for packets with both data and an error status

Signed-off-by: Hans de Goede <>
Signed-off-by: Gerd Hoffmann <>

9b8251c5 11/08/2012 07:41 pm Hans de Goede

xhci: Add support for packets with both data and an error status

Signed-off-by: Hans de Goede <>
Signed-off-by: Gerd Hoffmann <>

ffd8a97f 11/08/2012 07:41 pm Hans de Goede

usb/combined-packet: Move freeing of combined to usb_combined_packet_remove()

Signed-off-by: Hans de Goede <>
Signed-off-by: Gerd Hoffmann <>

9a77a0f5 11/08/2012 07:41 pm Hans de Goede

usb: split packet result into actual_length + status

Since with the ehci and xhci controllers a single packet can be larger
then maxpacketsize, it is possible for the result of a single packet
to be both having transferred some data as well as the transfer to have...

e94ca437 11/08/2012 07:41 pm Hans de Goede

usb-redir: Allow packets to have both data and an error-status

Signed-off-by: Hans de Goede <>
Signed-off-by: Gerd Hoffmann <>

01e26b0e 11/08/2012 07:41 pm Hans de Goede

ehci: Get rid of the magical PROC_ERR status

Instead make ehci_execute and ehci_fill_queue return the again value.

Signed-off-by: Hans de Goede <>
Signed-off-by: Gerd Hoffmann <>

bdd4df33 11/05/2012 12:54 pm Gerd Hoffmann

spice: fix initialization order

Register displaychangelistener last, after spice is fully initialized,
otherwise we may hit NULL pointer dereferences when qemu starts calling
our callbacks.

Commit e250d949feb1334828f27f0d145c35f29c4b7639 triggers this bug....

511aefb0 11/05/2012 12:49 pm Alon Levy

hw/qxl: qxl_send_events: nop if stopped

Added a trace point for easy logging.

RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=870972

Signed-off-by: Alon Levy <>
Signed-off-by: Gerd Hoffmann <>

958c2bce 11/05/2012 12:49 pm Gerd Hoffmann

qxl: fix cursor reset

When resetting the qxl cursor notify the qemu displaystate too.

Signed-off-by: Gerd Hoffmann <>

e32c25b5 11/05/2012 12:49 pm Gerd Hoffmann

qxl: call dpy_gfx_resize when entering vga mode

When entering vga mode the display size likely changes,
notify all displaychangelisteners about this.

Probably went unnoticed for a while as one if the first
things the guest does after leaving qxl native mode and...

48f4ba67 11/05/2012 12:49 pm Alon Levy

hw/qxl: guest bug on primary create with stride %4 != 0

Due to usage of pixman for rendering on all spice surfaces we have
pixman's requirement that the stride be word aligned. A guest not
honoring that can crash spice and qemu with it due to failure to create...

b51d7b2e 11/03/2012 03:26 pm BALATON Zoltan

vmware_vga: Allow simple drivers to work without using the fifo

Postpone stopping the dirty log to the point where the command fifo is
configured to allow drivers which don't use the fifo to work too.
(Without this the picture rendered into the vram never got to the...

5b9575c8 11/03/2012 03:26 pm BALATON Zoltan

vmware_vga: Return a value for FB_SIZE before the device is enabled

According to the documentation drivers using this device should read
FB_SIZE before enabling the device to know what memory to map. This
would not work if we return 0 before enabled. The docs also mention...

aa32b38c 11/03/2012 03:26 pm BALATON Zoltan

vmware_vga: Remove duplicated info from local state

Removed info from vmsvga_state that is available from elsewhere and
thus was duplicated here unnecessarily.

Signed-off-by: BALATON Zoltan <>
Signed-off-by: Blue Swirl <>

0d793797 11/03/2012 03:26 pm BALATON Zoltan

vmware_vga: Coding style cleanup

Fix coding style as suggested by checkpatch.pl

Signed-off-by: BALATON Zoltan <>
Signed-off-by: Blue Swirl <>

ef84755e 11/03/2012 02:55 pm Blue Swirl

Merge branch 'trivial-patches' of git://github.com/stefanha/qemu

  • 'trivial-patches' of git://github.com/stefanha/qemu:
    pc: Drop redundant test for ROM memory region
    exec: make some functions static
    target-ppc: make some functions static
    ppc: add missing static...
dc63936d 11/02/2012 06:12 pm Gerd Hoffmann

xenfb: fix build breakage caused by console cleanup series

Console cleanup series renamed dpy_resize and dpy_update all over the
tree, but hw/xenfb.c was forgotten. Update it too so it builds again.

Reported-by: Jan Kiszka <>
Signed-off-by: Gerd Hoffmann <>...

de0a36cd 11/01/2012 09:34 pm Anthony Liguori

Merge remote-tracking branch 'kraxel/usb.69' into staging

  • kraxel/usb.69: (31 commits)
    usb-redir: Allow redirecting super speed devices to high speed controllers
    usb-redir: Allow to attach USB 2.0 devices to 1.1 host controller
    usb-redir: Use reject rather the disconnect on bad ep info...
0d3cf3b6 11/01/2012 08:50 pm Jan Kiszka

pc: Drop redundant test for ROM memory region

Just a few lines above, we already initialize rom_memory accordingly.

Signed-off-by: Jan Kiszka <>
Signed-off-by: Stefan Hajnoczi <>

43448292 11/01/2012 08:49 pm Blue Swirl

ppc: add missing static

Add missing 'static' qualifiers.

Signed-off-by: Blue Swirl <>
Acked-by: Alexander Graf <>
Signed-off-by: Stefan Hajnoczi <>

2ddef11b 11/01/2012 08:42 pm Peter Crosthwaite

cadence_uart: More debug information

Add more helpful debug information to the cadence UART.

Signed-off-by: Peter Crosthwaite <>
Reviewed-by: Peter Maydell <>
Signed-off-by: Stefan Hajnoczi <>

4ba79505 11/01/2012 06:14 pm Anthony Liguori

Merge remote-tracking branch 'kraxel/pixman.v3' into staging

  • kraxel/pixman.v3: (22 commits)
    pixman: drop obsolete fields from DisplaySurface
    pixman/vnc: remove dead code.
    pixman/vnc: remove rgb_prepare_row* functions
    pixman/vnc: use pixman images in vnc....
d971919f 11/01/2012 06:13 pm Anthony Liguori

Merge remote-tracking branch 'stefanha/net' into staging

  • stefanha/net:
    e1000: pre-initialize RAH/RAL registers
    net: Reject non-netdevs in qmp_netdev_del()
    net: use "socket" model name for UDP sockets
    e1000: drop check_rxov, always treat RX ring with RDH == RDT as empty...
5a34dbb5 11/01/2012 06:13 pm Anthony Liguori

Merge remote-tracking branch 'bonzini/threadpool' into staging

  • bonzini/threadpool: (39 commits)
    raw-win32: implement native asynchronous I/O
    raw-posix: move linux-aio.c to block/
    raw-win32: add emulated AIO support
    raw-posix: rename raw-posix-aio.h, hide unavailable prototypes...
43552994 11/01/2012 06:12 pm Anthony Liguori

Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

  • qemu-kvm/uq/master: (28 commits)
    update-linux-headers.sh: Handle new kernel uapi/ directories
    target-i386: kvm_cpu_fill_host: use GET_SUPPORTED_CPUID
    target-i386: cpu: make -cpu host/check/enforce code KVM-specific...
98c8a73b 11/01/2012 06:12 pm Anthony Liguori

Merge remote-tracking branch 'afaerber/qom-cpu' into staging

  • afaerber/qom-cpu: (35 commits)
    target-i386: Pass X86CPU to kvm_handle_halt()
    target-i386: Pass X86CPU to kvm_get_mp_state()
    cpu: Move thread_id to CPUState
    cpus: Pass CPUState to run_on_cpu()...
fc53b7d4 11/01/2012 06:04 pm Peter Maydell

arm_boot: Change initrd load address to "halfway through RAM"

To avoid continually having to bump the initrd load address
to account for larger kernel images, put the initrd halfway
through RAM. This allows large kernels on new boards with lots
of RAM to work OK, without breaking existing usecases for...

46a3f234 11/01/2012 05:42 pm Aurelien Jarno

Merge branch 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf

  • 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf:
    pseries: Cleanup duplications of ics_valid_irq() code
    pseries: Clean up inconsistent variable name in xics.c
    target-ppc: Extend FPU state for newer POWER CPUs...
735c1eeb 11/01/2012 05:42 pm Aurelien Jarno

Merge branch 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm

  • 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm: (28 commits)
    hw/sd.c: add SD card save/load support
    vmstate: Add support for saving/loading bitmaps...
7e03d178 11/01/2012 04:21 pm Hans de Goede

usb-redir: Add an usbredir_setup_usb_eps() helper function

Signed-off-by: Hans de Goede <>
Signed-off-by: Gerd Hoffmann <>

24ac283a 11/01/2012 04:21 pm Hans de Goede

usb-redir: Use reject rather the disconnect on bad ep info

So that the client gets a notification about us disconnecting the device.

Signed-off-by: Hans de Goede <>
Signed-off-by: Gerd Hoffmann <>

cdfd3530 11/01/2012 04:21 pm Jan Kiszka

usb-redir: Allow to attach USB 2.0 devices to 1.1 host controller

This follows the logic of host-linux: If a 2.0 device has no ISO
endpoint and no interrupt endpoint with a packet size > 64, we can
attach it also to an 1.1 host controller. In case the redir server does...

95a59dc0 11/01/2012 04:21 pm Hans de Goede

usb-redir: Allow redirecting super speed devices to high speed controllers

Signed-off-by: Hans de Goede <>
Signed-off-by: Gerd Hoffmann <>