[Qemu-commits] [qemu/qemu] 58ddcd: tap: reset vnet header size on open

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 58ddcd50f30cb5c020bd4f9f36b01ee160a27cac
      
https://github.com/qemu/qemu/commit/58ddcd50f30cb5c020bd4f9f36b01ee160a27cac
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M net/tap.c

  Log Message:
  -----------
  tap: reset vnet header size on open

For tap, we currently assume the vnet header size is 10
(the default value) but that might not be the case
if tap is persistent and has been used by qemu previously.
To fix, set host header size in tap device on open.

Signed-off-by: Michael S. Tsirkin <address@hidden>
Tested-by: Alexander Graf <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 1bc6b705eed02dab9feb0e663219b5623f3d684d
      
https://github.com/qemu/qemu/commit/1bc6b705eed02dab9feb0e663219b5623f3d684d
  Author: Jeff Cody <address@hidden>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M block/raw-posix.c

  Log Message:
  -----------
  block: add bdrv_reopen() support for raw hdev, floppy, and cdrom

For hdev, floppy, and cdrom, the reopen() handlers are the same as
for the file reopen handler.  For floppy and cdrom types, however,
we keep O_NONBLOCK, as in the _open function.

Signed-off-by: Jeff Cody <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 8ba2aae32c40f544def6be7ae82be9bcb781e01d
      
https://github.com/qemu/qemu/commit/8ba2aae32c40f544def6be7ae82be9bcb781e01d
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M block/vdi.c

  Log Message:
  -----------
  vdi: don't override libuuid symbols

It's poor symbol hygiene to provide a global symbols that collide with a
common library like libuuid.  If QEMU links against a shared library
that depends on uuid_generate() it can end up calling our stub version
of the function.

This exact scenario happened with GlusterFS libgfapi.so, which depends
on libglusterfs.so's uuid_generate().

Scope the uuid stubs for vdi.c only and avoid affecting other shared
objects.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>


  Commit: 08448d5195aeff49bf25fb62b4a6218f079f5284
      
https://github.com/qemu/qemu/commit/08448d5195aeff49bf25fb62b4a6218f079f5284
  Author: Stefan Priebe <address@hidden>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M block/rbd.c

  Log Message:
  -----------
  use int64_t for return values from rbd instead of int

rbd / rados tends to return pretty often length of writes
or discarded blocks. These values might be bigger than int.

The steps to reproduce are:

  mkfs.xfs -f a whole device bigger than int in bytes. mkfs.xfs sends
  a discard. Important is that you use scsi-hd and set
  discard_granularity=512. Otherwise rbd disabled discard support.

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


  Commit: 038268e2e8087ee2fd8987a77ba580e15f14c147
      
https://github.com/qemu/qemu/commit/038268e2e8087ee2fd8987a77ba580e15f14c147
  Author: Kevin Wolf <address@hidden>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M hw/ide/core.c

  Log Message:
  -----------
  ide: Fix crash with too long PRD

Without this, s->nsector can become negative and badness happens (trying
to malloc huge amount of memory and glib calls abort())

Signed-off-by: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 72bcca73c7a67c8506fa737618861ad413dabf38
      
https://github.com/qemu/qemu/commit/72bcca73c7a67c8506fa737618861ad413dabf38
  Author: Kevin Wolf <address@hidden>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M hw/ide/core.c

  Log Message:
  -----------
  ide: Fix status register after short PRDs

When failing a request because the length of the regions described by
the PRDT was too short for the requested number of sectors, the IDE
emulation forgot to update the status register, so that the device would
keep the BSY flag set indefinitely.

Signed-off-by: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 9995c0b706a2270a49c5bebbcda0b62263a31aa3
      
https://github.com/qemu/qemu/commit/9995c0b706a2270a49c5bebbcda0b62263a31aa3
  Author: Lei Li <address@hidden>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M ui/spice-core.c

  Log Message:
  -----------
  Fix the inconsistency in x509-dh-key-file parameter

Commit c448e8552b0f6135dabddf944a7110f929c08320 (spice: tls
support) added options to the -spice command line. But there
is an inconsistency between the declaration of the option
'x509-dh-key-file' to -spice command line and its parameter
parsing 'x509-dh-file' in function qemu_spice_init.

https://bugs.launchpad.net/qemu/+bug/1035042

Reported-by: Alon Bar-Lev <address@hidden>
Signed-off-by: Lei Li <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 21a50d0b1a0745e485eff3e5aa393cdc4a1980b6
      
https://github.com/qemu/qemu/commit/21a50d0b1a0745e485eff3e5aa393cdc4a1980b6
  Author: Gerd Hoffmann <address@hidden>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M ui/spice-display.c

  Log Message:
  -----------
  spice: add new spice-server callbacks to ui/spice-display.c

Otherwise qemu crashes with non-qxl graphics cards.

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


  Commit: 887938160e5d631c56ee115b1817613a60184138
      
https://github.com/qemu/qemu/commit/887938160e5d631c56ee115b1817613a60184138
  Author: Hans de Goede <address@hidden>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

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

  Log Message:
  -----------
  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,
even if all the bandwidth for the frame was consumed from the timer run
process_frame. This is necessary as delaying their writeback to the next frame
can cause the completion to get lost on migration.

2) The calling of process_frame from a bh on async completion causes iso
tds to get server more often they should, messing up usb sound class device
timing. By only processing completed packets, the iso tds get skipped fixing
this.

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


  Commit: 1cbdde909f70fd15ff85f068a6318b73865c7fa3
      
https://github.com/qemu/qemu/commit/1cbdde909f70fd15ff85f068a6318b73865c7fa3
  Author: Hans de Goede <address@hidden>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

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

  Log Message:
  -----------
  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
pre-disconnect value + the reset bit set, after which we have a disconnected
device with its port-enabled bit set in its port-control register, which
is no good :)

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


  Commit: 71d2c9cf656cb8b55a71057c1943ade197c1bb5b
      
https://github.com/qemu/qemu/commit/71d2c9cf656cb8b55a71057c1943ade197c1bb5b
  Author: Hans de Goede <address@hidden>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

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

  Log Message:
  -----------
  uhci: Fix double unlink

uhci_async_cancel() already does a uhci_async_unlink().

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


  Commit: 33c1a6856f06fccd7cbfe53e06f9ebbe95bd565f
      
https://github.com/qemu/qemu/commit/33c1a6856f06fccd7cbfe53e06f9ebbe95bd565f
  Author: Hans de Goede <address@hidden>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M hw/usb/dev-bluetooth.c

  Log Message:
  -----------
  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
which has no data is cleary the wrong thing to do.

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


  Commit: c4020746ff49b2156b4f98672c077d1a3b86fa8b
      
https://github.com/qemu/qemu/commit/c4020746ff49b2156b4f98672c077d1a3b86fa8b
  Author: Hans de Goede <address@hidden>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M hw/usb/dev-smartcard-reader.c

  Log Message:
  -----------
  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 <address@hidden>
Signed-off-by: Hans de Goede <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 234e810cce018daf2030e04e399a17b744fa3e0d
      
https://github.com/qemu/qemu/commit/234e810cce018daf2030e04e399a17b744fa3e0d
  Author: Hans de Goede <address@hidden>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M hw/usb/redirect.c

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

No functional changes.

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


  Commit: 723aedd53281cfa0997457cb156a59909a75f5a8
      
https://github.com/qemu/qemu/commit/723aedd53281cfa0997457cb156a59909a75f5a8
  Author: Hans de Goede <address@hidden>
  Date:   2012-11-21 (Wed, 21 Nov 2012)

  Changed paths:
    M hw/usb/redirect.c

  Log Message:
  -----------
  usb-redir: Don't handle interrupt output packets async

Instead report them as successfully completed directly on submission, this
has 2 advantages:

1) This matches the timing of interrupt output packets on real hardware,
with the previous async handling, if an ep has an interval of say 500 ms,
then there would be 500+ ms between the submission and the guest seeing the
completion, as we wont do the write back until the qh gets polled again. And
in the mean time the guest may very well have timed out, as the guest can
reasonable expect a much quicker completion.

2) This fixes interrupt output packets potentially getting send twice
surrounding a migration. As we delay the writeback to guest memory until
the qh gets polled again, there is a window between completion and writeback
where migration can happen, in this case the destination will not know
about the completion, and it will execute the packet *again*

But it does also come with a disadvantage:

1) If the actual interrupt out to the real usb device fails, there is no
way to report this back to the guest.

This patch assumes however that interrupt outs in practice never fail, as
they are only used by specialized drivers, which are unlikely to issue illegal
requests (unlike general class drivers which often issue requests which some
devices don't implement). And that thus the advantages outway the disadvantage.

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


  Commit: c6e88b3b27b411e3f1c924deb8b71b20f8a11107
      
https://github.com/qemu/qemu/commit/c6e88b3b27b411e3f1c924deb8b71b20f8a11107
  Author: Bruce Rogers <address@hidden>
  Date:   2012-11-23 (Fri, 23 Nov 2012)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  Legacy qemu-kvm options have no argument

The options no-kvm, no-kvm-pit, no-kvm-pit-reinjection, and no-kvm-irqchip
should be marked as having no argument.

Signed-off-by: Bruce Rogers <address@hidden>
Reviewed-by: Jan Kiszka <address@hidden>
Signed-off-by: Marcelo Tosatti <address@hidden>


  Commit: 7eff57421ff31657434545104b9f91a28e7869ff
      
https://github.com/qemu/qemu/commit/7eff57421ff31657434545104b9f91a28e7869ff
  Author: Catalin Patulea <address@hidden>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  vnc: fix option misspelling ("non-adapative" -> "non-adaptive")

Signed-off-by: Catalin Patulea <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: f8c4382e2cfe9b28b7d652b94712d258c751627b
      
https://github.com/qemu/qemu/commit/f8c4382e2cfe9b28b7d652b94712d258c751627b
  Author: Anthony Liguori <address@hidden>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M net/tap.c

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

* stefanha/net:
  tap: reset vnet header size on open

Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 0a87470116a169f0c764894e46014a77f5d32a9e
      
https://github.com/qemu/qemu/commit/0a87470116a169f0c764894e46014a77f5d32a9e
  Author: Anthony Liguori <address@hidden>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M block/raw-posix.c
    M block/rbd.c
    M block/vdi.c
    M hw/ide/core.c

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

* stefanha/block:
  ide: Fix status register after short PRDs
  ide: Fix crash with too long PRD
  use int64_t for return values from rbd instead of int
  vdi: don't override libuuid symbols
  block: add bdrv_reopen() support for raw hdev, floppy, and cdrom

Signed-off-by: Anthony Liguori <address@hidden>


  Commit: fb43a4807ec06307048018d93a7f9e0828308bb5
      
https://github.com/qemu/qemu/commit/fb43a4807ec06307048018d93a7f9e0828308bb5
  Author: Anthony Liguori <address@hidden>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M ui/spice-core.c
    M ui/spice-display.c

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

* spice/spice.v64:
  spice: add new spice-server callbacks to ui/spice-display.c
  Fix the inconsistency in x509-dh-key-file parameter

Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 95a6e48d776b208d085854358313346ebdb2924d
      
https://github.com/qemu/qemu/commit/95a6e48d776b208d085854358313346ebdb2924d
  Author: Anthony Liguori <address@hidden>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M hw/usb/dev-bluetooth.c
    M hw/usb/dev-smartcard-reader.c
    M hw/usb/hcd-uhci.c
    M hw/usb/redirect.c

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

* kraxel/usb.72:
  usb-redir: Don't handle interrupt output packets async
  usb-redir: Split usb_handle_interrupt_data into separate in/out functions
  usb-smartcard-reader: Properly NAK interrupt eps when we've no events
  usb-bt: Return NAK instead of STALL when interrupt ep has no data
  uhci: Fix double unlink
  uhci: Don't allow the guest to set port-enabled when there is no dev connected
  uhci: Add a completions_only flag for async completions

Signed-off-by: Anthony Liguori <address@hidden>


  Commit: cab1e8f3e37d8e883c270e3afd9c7c1c18332f0e
      
https://github.com/qemu/qemu/commit/cab1e8f3e37d8e883c270e3afd9c7c1c18332f0e
  Author: Anthony Liguori <address@hidden>
  Date:   2012-11-26 (Mon, 26 Nov 2012)

  Changed paths:
    M qemu-options.hx

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

* qemu-kvm/uq/master:
  Legacy qemu-kvm options have no argument

Signed-off-by: Anthony Liguori <address@hidden>


Compare: https://github.com/qemu/qemu/compare/06dec08374a4...cab1e8f3e37d