[Qemu-commits] [qemu/qemu] 0ec8df: qxl: always update displaysurface on resize

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 0ec8df3974d2a4ff95b5fd4785b9bd3def7252f3
      
https://github.com/qemu/qemu/commit/0ec8df3974d2a4ff95b5fd4785b9bd3def7252f3
  Author: Gerd Hoffmann <address@hidden>
  Date:   2012-10-07 (Sun, 07 Oct 2012)

  Changed paths:
    M hw/qxl-render.c

  Log Message:
  -----------
  qxl: always update displaysurface on resize

Don't try to be clever and skip displaysurface reinitialization in case
the size hasn't changed.  Other parameters might have changed
nevertheless, for example depth or stride, resulting in rendering being
broken then.

Trigger: boot linux guest with vesafb, start X11, make sure both vesafb
and X11 use the display same resolution.  Then watch X11 screen being
upside down.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 36a03e0ba5202cf49749b2128bb62d41983681d6
      
https://github.com/qemu/qemu/commit/36a03e0ba5202cf49749b2128bb62d41983681d6
  Author: Michael Tokarev <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/qxl.c

  Log Message:
  -----------
  qxl/update_area_io: cleanup invalid parameters handling

This cleans up two additions of almost the same code in commits
511b13e2c9 and ccc2960d654.  While at it, make error paths
consistent (always use 'break' instead of 'return').

Signed-off-by: Michael Tokarev <address@hidden>
Cc: Dunrong Huang <address@hidden>
Cc: Alon Levy <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: ffe01e599f106bedf13ba0e0f6956735b1942a0c
      
https://github.com/qemu/qemu/commit/ffe01e599f106bedf13ba0e0f6956735b1942a0c
  Author: Gerd Hoffmann <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/qxl.c

  Log Message:
  -----------
  qxl: fix range check for rev3 io commands.

Enables QXL_IO_FLUSH_SURFACES_ASYNC and QXL_IO_FLUSH_RELEASE
which are part of the qxl rev3 feature set.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: e25a0651f4be22099122b5e14c77c354be0aa88b
      
https://github.com/qemu/qemu/commit/e25a0651f4be22099122b5e14c77c354be0aa88b
  Author: Alon Levy <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/qxl.c

  Log Message:
  -----------
  hw/qxl: exit on failure to register qxl interface

This prevents a segfault later on when the device reset handler
tries to access a NULL ssd.worker since interface_attach_worker has
not been called.

Signed-off-by: Alon Levy <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: d96aafca057845a4d58cd7b36771f2c97c78cd56
      
https://github.com/qemu/qemu/commit/d96aafca057845a4d58cd7b36771f2c97c78cd56
  Author: Alon Levy <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/qxl.c

  Log Message:
  -----------
  hw/qxl: fix condition for exiting guest_bug

Reported and suggested by Paolo Bonzini, thanks.

Signed-off-by: Alon Levy <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: c5825ac6c861bfe1a4adfa27517931b56079e298
      
https://github.com/qemu/qemu/commit/c5825ac6c861bfe1a4adfa27517931b56079e298
  Author: Alon Levy <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/qxl.c

  Log Message:
  -----------
  hw/qxl: qxl_dirty_surfaces: use uintptr_t

As suggested by Paolo Bonzini, to avoid possible integer overflow issues.

Signed-off-by: Alon Levy <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 67be6726b6459472103ee87ceaf2e8e97c154965
      
https://github.com/qemu/qemu/commit/67be6726b6459472103ee87ceaf2e8e97c154965
  Author: Gerd Hoffmann <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M configure
    M hw/qxl.c
    M ui/spice-core.c
    M ui/spice-display.c
    M ui/spice-display.h

  Log Message:
  -----------
  spice: raise requirement to 0.12

With the next qemu version (1.3) we are going to bump the qxl device
revision to 4.  The new features available require a recent spice-server
version, so raise up the bar.  Otherwise we would end up with different
qxl revisions depending on the spice-server version installed, which
would be a major PITA when it comes to compat properties.

Clear out a big bunch of #ifdefs which are not needed any more.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 591af14359f698d89cd334622237a20f19ae7060
      
https://github.com/qemu/qemu/commit/591af14359f698d89cd334622237a20f19ae7060
  Author: Gerd Hoffmann <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/pc_piix.c
    M hw/qxl.h

  Log Message:
  -----------
  qxl: set default revision to 4

Set qxl pci revision to 4 (for pc-1.3+) so guests know
spice-server 0.12 features are available.

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 9e12c5aff2cfdd1574bf732c4bbf579d0c2e85c1
      
https://github.com/qemu/qemu/commit/9e12c5aff2cfdd1574bf732c4bbf579d0c2e85c1
  Author: Jason Wang <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/rtl8139.c

  Log Message:
  -----------
  rtl8139: implement 8139cp link status

Add a link status chang callback and change the link status bit in BMSR
& MSR accordingly. Tested in Linux/Windows guests.

The link status bit of MediaStatus is infered from BasicModeStatus,
they are inverse.

nc.link_down could not be migrated, this patch updates link_down in
rtl8139_post_load() to keep it coincident with real link status.

Signed-off-by: Jason Wang <address@hidden>
Signed-off-by: Amos Kong <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: e4b823644044de1b8070fde82d0aad8053dc3333
      
https://github.com/qemu/qemu/commit/e4b823644044de1b8070fde82d0aad8053dc3333
  Author: Amos Kong <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/e1000.c

  Log Message:
  -----------
  e1000: update nc.link_down in e1000_post_load()

This patch introduced e1000_post_load(), it will be called in the end of
migration. nc.link_down could not be migrated, this patch updates
link_down in e1000_post_load() to keep it coincident with real link
status.

Signed-off-by: Amos Kong <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 9899148110627da388f82c02997bca6d678d1aa1
      
https://github.com/qemu/qemu/commit/9899148110627da388f82c02997bca6d678d1aa1
  Author: Amos Kong <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/virtio-net.c

  Log Message:
  -----------
  virtio-net: update nc.link_down in virtio_net_load()

nc.link_down could not be migrated, this patch updates link_down in
virtio_post_load() to keep it coincident with real link status.

Signed-off-by: Amos Kong <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: a245fc18352fe286ba45ae0661a73b3841514889
      
https://github.com/qemu/qemu/commit/a245fc18352fe286ba45ae0661a73b3841514889
  Author: Paolo Bonzini <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M net.c
    A net/clients.h
    M net/dump.c
    R net/dump.h
    M net/hub.c
    M net/hub.h
    M net/slirp.c
    M net/slirp.h
    M net/socket.c
    R net/socket.h
    M net/tap-win32.c
    M net/tap.c
    M net/tap.h
    M net/vde.c
    R net/vde.h

  Log Message:
  -----------
  net: consolidate NetClientState header files into one

This patch doesn't seem much useful alone, I must admit.  However,
it makes sense as part of the upcoming directory reorganization,
where I want to have include/net/tap.h as the net<->hw interface
for tap.  Then having both net/tap.h and include/net/tap.h does
not work.  "Fixed" by moving all the init functions to a single
header file net/clients.h.

The patch also adopts a uniform style for including net/*.h files
from net/*.c, without the net/ path.

Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: ea486926b07d2ebd73ef67315ebb1eecf39faf5a
      
https://github.com/qemu/qemu/commit/ea486926b07d2ebd73ef67315ebb1eecf39faf5a
  Author: Alex Williamson <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/vfio_pci.c
    M hw/vfio_pci_int.h

  Log Message:
  -----------
  vfio-pci: Update slow path INTx algorithm

We can't afford the overhead of switching out and back into mmap mode
around each interrupt, but we can do it lazily via a timer.  On INTx
interrupt, disable the mmap'd memory regions and set a timer.  On
every interrupt, push the timer out.  If the timer expires and the
interrupt is no longer pending, switch back to mmap mode.

This has the benefit that things like graphics cards, which rarely or
never, fire an interrupt don't need manual user intervention to add
the x-intx=off parameter.  They'll just remain in mmap mode until they
trigger an interrupt, and if they don't continue to regularly fire
interrupts, they'll switch back.

The default timeout is tuned for network cards so that a ping is just
enough to keep them in non-mmap mode, where they have much better
latency.  It is tunable with an experimental option,
x-intx-mmap-timeout-ms.  A value of 0 keeps the device in non-mmap
mode after the first interrupt.

It's possible we could look at the class code of devices and come up
with reasonable per-class defaults based on expected interrupt
frequency and latency.  None of this is used for MSI interrupts and
also won't be used if we can bypass through KVM.

Signed-off-by: Alex Williamson <address@hidden>


  Commit: af6bc27e39fafadbc03c8876ffa95851c5869683
      
https://github.com/qemu/qemu/commit/af6bc27e39fafadbc03c8876ffa95851c5869683
  Author: Alex Williamson <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/vfio_pci.c

  Log Message:
  -----------
  vfio-pci: Re-order map/unmap

This cleans up the next patch that calls unmap from map.

Signed-off-by: Alex Williamson <address@hidden>


  Commit: 12af1344871aee4a8df011c3b0548f7c77332d54
      
https://github.com/qemu/qemu/commit/12af1344871aee4a8df011c3b0548f7c77332d54
  Author: Alex Williamson <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/vfio_pci.c

  Log Message:
  -----------
  vfio-pci: Unmap and retry DMA mapping

Occasionally we get regions added that overlap with existing mappings.
These always seems to be in the VGA ROM range.  VFIO returns EBUSY
for these mapping attempts.  We can try a little harder and assume
that the latest mapping is correct by removing any overlapping ranges
and retrying the original request.

Signed-off-by: Alex Williamson <address@hidden>


  Commit: fd704adc479810477606c3418aeb64a590f51fe3
      
https://github.com/qemu/qemu/commit/fd704adc479810477606c3418aeb64a590f51fe3
  Author: Alex Williamson <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/vfio_pci.c

  Log Message:
  -----------
  vfio-pci: Rework MSIX setup/teardown

We try to do lazy initialization of MSIX since we don't actually need
to setup anything until MSIX vectors start getting used.  This leads
to problems if MSIX is enabled, but never used (we can end up trying
to re-enable INTx while it's still enabled).  We also run into
problems trying to expand our reset function to tear down interrupts
as we can then get vector release notifications after we've released
data structures.  By making explicit initialization and teardown we
can avoid both of these problems and behave more similar to bare
metal.

Signed-off-by: Alex Williamson <address@hidden>


  Commit: 98cd5a5eaf4ad96d240e680eb1b26460dc278c33
      
https://github.com/qemu/qemu/commit/98cd5a5eaf4ad96d240e680eb1b26460dc278c33
  Author: Alex Williamson <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/vfio_pci.c

  Log Message:
  -----------
  vfio-pci: No spurious MSIs

FreeBSD doesn't like these spurious MSIs, remove them as they're
mostly paranoia anyway.

Signed-off-by: Alex Williamson <address@hidden>


  Commit: 5c97e5eba665b66395eee87d88cf2f8301594145
      
https://github.com/qemu/qemu/commit/5c97e5eba665b66395eee87d88cf2f8301594145
  Author: Alex Williamson <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/vfio_pci.c
    R hw/vfio_pci_int.h

  Log Message:
  -----------
  vfio-pci: Roll the header into the .c file

It's only ~100 lines and nobody else should be using this.
Suggested by Michael Tsirkin.

Signed-off-by: Alex Williamson <address@hidden>


  Commit: e43b9a5a4fb2b501fbbec411faff899b74a2d451
      
https://github.com/qemu/qemu/commit/e43b9a5a4fb2b501fbbec411faff899b74a2d451
  Author: Alex Williamson <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/vfio_pci.c

  Log Message:
  -----------
  vfio-pci: Don't peak at msi_supported

Let the init function fail, just don't warn for -ENOTSUP.

Signed-off-by: Alex Williamson <address@hidden>


  Commit: 5976cdd58b657692e8c1af5310d55a60aecc9089
      
https://github.com/qemu/qemu/commit/5976cdd58b657692e8c1af5310d55a60aecc9089
  Author: Alex Williamson <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/vfio_pci.c

  Log Message:
  -----------
  vfio-pci: Use uintptr_t for void* cast

We don't seem to run into any sign extension problems, but
unsigned looks more correct.

Signed-off-by: Alex williamson <address@hidden>


  Commit: 9b1e45c8f1355592cb60c6aed9ac1f90b606a1a8
      
https://github.com/qemu/qemu/commit/9b1e45c8f1355592cb60c6aed9ac1f90b606a1a8
  Author: Alex Williamson <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/vfio_pci.c

  Log Message:
  -----------
  vfio-pci: Remove setting of MSI qsize

This was a misinterpretation of the spec, hardware doesn't get to
specify how many were actually enabled through this field.

Signed-off-by: Alex Williamson <address@hidden>


  Commit: 5834a83f4803de88949162346e6dfa2060d3fca6
      
https://github.com/qemu/qemu/commit/5834a83f4803de88949162346e6dfa2060d3fca6
  Author: Alex Williamson <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/vfio_pci.c

  Log Message:
  -----------
  vfio-pci: Extend reset

Take what we've learned from pci-assign and apply it to vfio-pci.
On reset, disable previous interrupt config, perform a device
reset if available, re-enable INTx, and disable memory regions on
the device to prevent continuing DMA.

Signed-off-by: Alex Williamson <address@hidden>


  Commit: ce59af2dba6fde2e3990b831f4c9a83641f5609e
      
https://github.com/qemu/qemu/commit/ce59af2dba6fde2e3990b831f4c9a83641f5609e
  Author: Alex Williamson <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/vfio_pci.c

  Log Message:
  -----------
  vfio-pci: Cleanup on INTx setup failure

Missing some unwind code.

Signed-off-by: Alex Williamson <address@hidden>


  Commit: 1a40313381262ebb5f30fb95d5550b674280f396
      
https://github.com/qemu/qemu/commit/1a40313381262ebb5f30fb95d5550b674280f396
  Author: Alex Williamson <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/vfio_pci.c

  Log Message:
  -----------
  vfio-pci: Clang cleanup

Blue Swirl reports that Clang doesn't like the structure we define to
avoid dynamic allocation for a number of calls to VFIO_DEVICE_SET_IRQS.
Adding an element after a variable sized type is a GNU extension.
Switch back to dynamic allocation, which really isn't a problem since
this is only done on interrupt setup changes.

Cc: Blue Swirl <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: 3a4f2816fac1b0f9cc197bb2208ddf03dc7bc592
      
https://github.com/qemu/qemu/commit/3a4f2816fac1b0f9cc197bb2208ddf03dc7bc592
  Author: Jan Kiszka <address@hidden>
  Date:   2012-10-08 (Mon, 08 Oct 2012)

  Changed paths:
    M hw/vfio_pci.c

  Log Message:
  -----------
  vfio-pci: Fix BAR->VFIODevice translation in

DO_UPCAST is supposed to translate from the first member of a struct to
that struct, not from arbitrary ones. And it (usually) breaks the build
when neglecting this rule. Use container_of to fix the build breakage
and likely also the runtime behavior.

Signed-off-by: Jan Kiszka <address@hidden>
aw: runtime behavior is actually the same, but clearly misuse of DO_UPCAST
Signed-off-by: Alex Williamson <address@hidden>


  Commit: 785c23ae5cf1d697834a635daf45b0a6bd93c00f
      
https://github.com/qemu/qemu/commit/785c23ae5cf1d697834a635daf45b0a6bd93c00f
  Author: Luiz Capitulino <address@hidden>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: add --localstatedir

Next commit wants to use it.

Signed-off-by: Luiz Capitulino <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 6a3c8c14c8467c5db3539f1b6e43e03318e5e21b
      
https://github.com/qemu/qemu/commit/6a3c8c14c8467c5db3539f1b6e43e03318e5e21b
  Author: Luiz Capitulino <address@hidden>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
    M qemu-ga.c

  Log Message:
  -----------
  qemu-ga: use state dir from CONFIG_QEMU_LOCALSTATEDIR

Has the side effect of changing the default directory used to
save the freeze status file from /tmp to ${prefix}/var/run.

This is a beneficial change for two reasons:

  1. FHS states that programs must not assume that files in /tmp will
     still exist between invocations of the program. This defeats
         the purpose of the freeze status file

  2. FHS dictates that /var/run must be cleaned on boot, this
     ensures that a stale freeze status file will be removed on boot

Signed-off-by: Luiz Capitulino <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 9d6f1b73f83a02fb28438fa9a487f5c7d245e4af
      
https://github.com/qemu/qemu/commit/9d6f1b73f83a02fb28438fa9a487f5c7d245e4af
  Author: Luiz Capitulino <address@hidden>
  Date:   2012-10-09 (Tue, 09 Oct 2012)

  Changed paths:
    M qemu-ga.c

  Log Message:
  -----------
  qemu-ga: ga_open_pidfile(): add new line to pidfile

FHS requires that pid files should end with a new line. Also change to
snprintf() while there.

Signed-off-by: Luiz Capitulino <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: dbbf01958e777b6f03fc4ab425879f84800b9cda
      
https://github.com/qemu/qemu/commit/dbbf01958e777b6f03fc4ab425879f84800b9cda
  Author: Hans de Goede <address@hidden>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M hw/usb/redirect.c

  Log Message:
  -----------
  usb-redir: Change usbredir_open_chardev into usbredir_create_parser

As we need to create the parser at more places.

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


  Commit: 5c16f767813602fbf57414e2a11057e252e0d422
      
https://github.com/qemu/qemu/commit/5c16f767813602fbf57414e2a11057e252e0d422
  Author: Hans de Goede <address@hidden>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M hw/usb/redirect.c

  Log Message:
  -----------
  usb-redir: Don't make migration fail in none seamless case

Instead simple disconnect the device like host redirection does on
migration.

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


  Commit: 883bca776daa43111e9c39008f0038f7c62ae723
      
https://github.com/qemu/qemu/commit/883bca776daa43111e9c39008f0038f7c62ae723
  Author: Hans de Goede <address@hidden>
  Date:   2012-10-11 (Thu, 11 Oct 2012)

  Changed paths:
    M hw/usb/hcd-uhci.c

  Log Message:
  -----------
  uhci: Raise interrupt when requested even for non active tds

According to the spec we must raise an interrupt when one is requested
even for non active tds.

Linux depends on this, for bulk transfers it runs an inactivity timer
to work around a bug in early uhci revisions, when we take longer then
200 ms to process a packet, this timer goes of, and as part of the
handling Linux then unlinks the qh, and relinks it after the frindex
has increased by atleast 1, the problem is Linux only checks for the
frindex increases on an interrupt, and we don't send that, causing
the qh to go inactive for more then 32 frames, at which point we
consider the packet cancelled.

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


  Commit: 3f42ac89ba7197872c1bc6ddc850184fc83622a0
      
https://github.com/qemu/qemu/commit/3f42ac89ba7197872c1bc6ddc850184fc83622a0
  Author: Anthony Liguori <address@hidden>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    M configure
    M hw/pc_piix.c
    M hw/qxl-render.c
    M hw/qxl.c
    M hw/qxl.h
    M ui/spice-core.c
    M ui/spice-display.c
    M ui/spice-display.h

  Log Message:
  -----------
  Merge remote-tracking branch 'spice/spice.v61' into staging

* spice/spice.v61:
  qxl: set default revision to 4
  spice: raise requirement to 0.12
  hw/qxl: qxl_dirty_surfaces: use uintptr_t
  hw/qxl: fix condition for exiting guest_bug
  hw/qxl: exit on failure to register qxl interface
  qxl: fix range check for rev3 io commands.
  qxl/update_area_io: cleanup invalid parameters handling
  qxl: always update displaysurface on resize


  Commit: 4336ef7a55751c867422c0df9f42877c5661c278
      
https://github.com/qemu/qemu/commit/4336ef7a55751c867422c0df9f42877c5661c278
  Author: Anthony Liguori <address@hidden>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    M hw/e1000.c
    M hw/rtl8139.c
    M hw/virtio-net.c
    M net.c
    A net/clients.h
    M net/dump.c
    R net/dump.h
    M net/hub.c
    M net/hub.h
    M net/slirp.c
    M net/slirp.h
    M net/socket.c
    R net/socket.h
    M net/tap-win32.c
    M net/tap.c
    M net/tap.h
    M net/vde.c
    R net/vde.h

  Log Message:
  -----------
  Merge remote-tracking branch 'stefanha/net' into staging

* stefanha/net:
  net: consolidate NetClientState header files into one
  virtio-net: update nc.link_down in virtio_net_load()
  e1000: update nc.link_down in e1000_post_load()
  rtl8139: implement 8139cp link status


  Commit: 557e01a3f9956ba53f804a7394dc1ff2a9540109
      
https://github.com/qemu/qemu/commit/557e01a3f9956ba53f804a7394dc1ff2a9540109
  Author: Anthony Liguori <address@hidden>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    M hw/vfio_pci.c
    R hw/vfio_pci_int.h

  Log Message:
  -----------
  Merge remote-tracking branch 'awilliam/tags/vfio-pci-for-qemu-20121008.0' 
into staging

* awilliam/tags/vfio-pci-for-qemu-20121008.0:
  vfio-pci: Fix BAR->VFIODevice translation in
  vfio-pci: Clang cleanup
  vfio-pci: Cleanup on INTx setup failure
  vfio-pci: Extend reset
  vfio-pci: Remove setting of MSI qsize
  vfio-pci: Use uintptr_t for void* cast
  vfio-pci: Don't peak at msi_supported
  vfio-pci: Roll the header into the .c file
  vfio-pci: No spurious MSIs
  vfio-pci: Rework MSIX setup/teardown
  vfio-pci: Unmap and retry DMA mapping
  vfio-pci: Re-order map/unmap
  vfio-pci: Update slow path INTx algorithm


  Commit: 453162e132023b319a23e6d7d25f51ba498105a7
      
https://github.com/qemu/qemu/commit/453162e132023b319a23e6d7d25f51ba498105a7
  Author: Anthony Liguori <address@hidden>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    M configure
    M qemu-ga.c

  Log Message:
  -----------
  Merge remote-tracking branch 'mdroth/qga-pull-10-9-12' into staging

* mdroth/qga-pull-10-9-12:
  qemu-ga: ga_open_pidfile(): add new line to pidfile
  qemu-ga: use state dir from CONFIG_QEMU_LOCALSTATEDIR
  configure: add --localstatedir


  Commit: 628cc97df70476c9e1f30791dcfb70511bb1ebdd
      
https://github.com/qemu/qemu/commit/628cc97df70476c9e1f30791dcfb70511bb1ebdd
  Author: Anthony Liguori <address@hidden>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    M hw/usb/hcd-uhci.c
    M hw/usb/redirect.c

  Log Message:
  -----------
  Merge remote-tracking branch 'kraxel/usb.67' into staging

* kraxel/usb.67:
  uhci: Raise interrupt when requested even for non active tds
  usb-redir: Don't make migration fail in none seamless case
  usb-redir: Change usbredir_open_chardev into usbredir_create_parser


Compare: https://github.com/qemu/qemu/compare/b4ae3cfa57b8...628cc97df704