qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 9e52c5: blkdebug: report errors on flush too


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 9e52c5: blkdebug: report errors on flush too
Date: Mon, 18 Aug 2014 05:00:07 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 9e52c53b8c7821ce06e8b995b960e81b469e6847
      
https://github.com/qemu/qemu/commit/9e52c53b8c7821ce06e8b995b960e81b469e6847
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M block/blkdebug.c

  Log Message:
  -----------
  blkdebug: report errors on flush too

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


  Commit: 7c282cb4c5e84119832f777b40255aac5c65b1d7
      
https://github.com/qemu/qemu/commit/7c282cb4c5e84119832f777b40255aac5c65b1d7
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M tests/libqtest.c

  Log Message:
  -----------
  libqtest: add QTEST_LOG for debugging qtest testcases

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


  Commit: 14a92e5fe1d81fe36630582dadd387fba10a63c9
      
https://github.com/qemu/qemu/commit/14a92e5fe1d81fe36630582dadd387fba10a63c9
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M tests/ide-test.c

  Log Message:
  -----------
  ide-test: add test for werror=stop

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


  Commit: 69f72a22213a6909bf4aef06133c976b508e370a
      
https://github.com/qemu/qemu/commit/69f72a22213a6909bf4aef06133c976b508e370a
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/core.c

  Log Message:
  -----------
  ide: stash aiocb for flushes

This ensures that operations are completed after a reset

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


  Commit: 1374bec0634aac9a460fe3b57bbe8b1aa7a99cb7
      
https://github.com/qemu/qemu/commit/1374bec0634aac9a460fe3b57bbe8b1aa7a99cb7
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/ahci.c
    M hw/ide/core.c
    M hw/ide/internal.h
    M hw/ide/macio.c
    M hw/ide/pci.c

  Log Message:
  -----------
  ide: simplify reset callbacks

Drop the unused return value and make the callback optional.

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


  Commit: 829b933b704a329d60d2ea1fe4c8e8e0a5505d8a
      
https://github.com/qemu/qemu/commit/829b933b704a329d60d2ea1fe4c8e8e0a5505d8a
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/ahci.c
    M hw/ide/core.c
    M hw/ide/internal.h
    M hw/ide/macio.c
    M hw/ide/pci.c

  Log Message:
  -----------
  ide: simplify set_inactive callbacks

Drop the unused return value and make the callback optional.

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


  Commit: c039cb1e5a7bf1f71fddbbe199eff7fbbfddb416
      
https://github.com/qemu/qemu/commit/c039cb1e5a7bf1f71fddbbe199eff7fbbfddb416
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/ahci.c
    M hw/ide/internal.h

  Log Message:
  -----------
  ide: simplify async_cmd_done callbacks

Drop the unused return value.

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


  Commit: 446351236b6e9c53b25e30d107c6235347df1dde
      
https://github.com/qemu/qemu/commit/446351236b6e9c53b25e30d107c6235347df1dde
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/ahci.c
    M hw/ide/core.c
    M hw/ide/internal.h
    M hw/ide/macio.c
    M hw/ide/pci.c

  Log Message:
  -----------
  ide: simplify start_transfer callbacks

Drop the unused return value and make the callback optional.

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


  Commit: 4855b57639d181362678ab09614a7f753df8e466
      
https://github.com/qemu/qemu/commit/4855b57639d181362678ab09614a7f753df8e466
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/atapi.c
    M hw/ide/core.c
    M hw/ide/internal.h

  Log Message:
  -----------
  ide: wrap start_dma callback

Make it optional and prepare for the next patches.

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


  Commit: 0def37baf9add908c5462b0b8e2d3f80b563a9f9
      
https://github.com/qemu/qemu/commit/0def37baf9add908c5462b0b8e2d3f80b563a9f9
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/ahci.c
    M hw/ide/atapi.c

  Log Message:
  -----------
  ide: remove wrong setting of BM_STATUS_INT

Similar to the case removed in commit 69c38b8 (ide/core: Remove explicit
setting of BM_STATUS_INT, 2011-05-19), the only remaining use of
add_status(..., BM_STATUS_INT) is for short PRDs.  The flag should
not be raised in this case.

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


  Commit: 0e7ce54cf5fb9b7e8d19a5a4eb1facf123edbcef
      
https://github.com/qemu/qemu/commit/0e7ce54cf5fb9b7e8d19a5a4eb1facf123edbcef
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/ahci.c
    M hw/ide/atapi.c
    M hw/ide/core.c
    M hw/ide/internal.h
    M hw/ide/macio.c
    M hw/ide/pci.c

  Log Message:
  -----------
  ide: fold add_status callback into set_inactive

It is now called only after the set_inactive callback.  Put the two together.

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


  Commit: 7e2648df86a36c063a34196b3bede0a13ebc6809
      
https://github.com/qemu/qemu/commit/7e2648df86a36c063a34196b3bede0a13ebc6809
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/internal.h
    M hw/ide/pci.c
    M hw/ide/pci.h

  Log Message:
  -----------
  ide: move BM_STATUS bits to pci.[ch]

They are not used by AHCI, and should not be even available there.

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


  Commit: fd648f10af1ef41ac37d99ccc341261d6db69ff4
      
https://github.com/qemu/qemu/commit/fd648f10af1ef41ac37d99ccc341261d6db69ff4
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/core.c
    M hw/ide/internal.h
    M hw/ide/pci.c

  Log Message:
  -----------
  ide: move retry constants out of BM_STATUS_* namespace

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


  Commit: 1f88f77348e14bd9f781db7ff66d2f680daa1d62
      
https://github.com/qemu/qemu/commit/1f88f77348e14bd9f781db7ff66d2f680daa1d62
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/ahci.c
    M hw/ide/ahci.h

  Log Message:
  -----------
  ahci: remove duplicate PORT_IRQ_* constants

These are defined twice, just use one set consistently.

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


  Commit: 08ee9e3368be0e9394037d339fc4ebf1392a9896
      
https://github.com/qemu/qemu/commit/08ee9e3368be0e9394037d339fc4ebf1392a9896
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/core.c

  Log Message:
  -----------
  ide: stop PIO transfer on errors

This will provide a hook for sending the result of the command via the
FIS receive area.

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


  Commit: c7e73adb48abb9fc5cbfc4f1ce6090fbdb0bdbea
      
https://github.com/qemu/qemu/commit/c7e73adb48abb9fc5cbfc4f1ce6090fbdb0bdbea
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/ahci.c
    M hw/ide/atapi.c
    M hw/ide/core.c
    M hw/ide/internal.h

  Log Message:
  -----------
  ide: make all commands go through cmd_done

AHCI has code to fill in the D2H FIS trigger the IRQ all over the place.
Centralize this in a single cmd_done callback by generalizing the existing
async_cmd_done callback.

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


  Commit: 088415202b9dadb387cb6d9fd25324ae7fd4da4b
      
https://github.com/qemu/qemu/commit/088415202b9dadb387cb6d9fd25324ae7fd4da4b
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/ahci.c

  Log Message:
  -----------
  ahci: construct PIO Setup FIS for PIO commands

PIO commands should put a PIO Setup FIS in the receive area when data
transfer ends.  Currently QEMU does not do this and only places the
D2H FIS at the end of the operation.

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


  Commit: 552b48f44df99e095f04245a48d3b839bbe9912c
      
https://github.com/qemu/qemu/commit/552b48f44df99e095f04245a48d3b839bbe9912c
  Author: John Snow <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/i386/pc_q35.c

  Log Message:
  -----------
  q35: Enable the ioapic device to be seen by qtest.

Currently, the ioapic device can not be found in a qtest environment
when requesting "irq_interrupt_in ioapic" via the qtest socket.

By mirroring how the ioapic is added in i44ofx (hw/i440/pc_piix.c),
as a child of "q35," the device is able to be seen by qtest.

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


  Commit: 86298845e127365e8a5b7419a5ee9039bbd1837f
      
https://github.com/qemu/qemu/commit/86298845e127365e8a5b7419a5ee9039bbd1837f
  Author: John Snow <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M tests/libqtest.c
    M tests/libqtest.h

  Log Message:
  -----------
  qtest: Adding qtest_memset and qmemset.

Currently, libqtest allows for memread and memwrite, but
does not offer a simple way to zero out regions of memory.
This patch adds a simple function to do so.

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


  Commit: f3cdcbaee16d32b52d5015a8b1e8ddf5a27f7089
      
https://github.com/qemu/qemu/commit/f3cdcbaee16d32b52d5015a8b1e8ddf5a27f7089
  Author: John Snow <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M tests/libqos/malloc-pc.c

  Log Message:
  -----------
  libqos: Correct memory leak

Fix a small memory leak inside of libqos, in the pc_alloc_init routine.

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


  Commit: a7afc6b8c13c70e9c40b4f666be80600f8ad0b3d
      
https://github.com/qemu/qemu/commit/a7afc6b8c13c70e9c40b4f666be80600f8ad0b3d
  Author: John Snow <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M tests/libqtest.c

  Log Message:
  -----------
  libqtest: Correct small memory leak.

Fixes a small memory leak inside of libqtest.
After we produce a test path and glib copies the string
for itself, we should clean up our temporary copy.

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


  Commit: 7f2a5ae6c1194b1676f1a7239fbcacd9d59637be
      
https://github.com/qemu/qemu/commit/7f2a5ae6c1194b1676f1a7239fbcacd9d59637be
  Author: John Snow <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M tests/libqos/pci-pc.c
    M tests/libqos/pci-pc.h

  Log Message:
  -----------
  libqos: Fixes a small memory leak.

Allow users the chance to clean up the QPCIBusPC structure
by adding a small cleanup routine. Helps clear up small
memory leaks during setup/teardown, to allow for cleaner
debug output messages.

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


  Commit: 6ce7100e7ff986c1f214f6bccca89dfd7256d8ec
      
https://github.com/qemu/qemu/commit/6ce7100e7ff986c1f214f6bccca89dfd7256d8ec
  Author: John Snow <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M tests/ide-test.c
    M tests/libqos/pci-pc.c
    M tests/libqos/pci.c
    M tests/libqos/pci.h
    M tests/usb-hcd-ehci-test.c

  Log Message:
  -----------
  libqos: allow qpci_iomap to return BAR mapping size

This patch allows qpci_iomap to return the size of the
BAR mapping that it created, to allow driver applications
(e.g, ahci-test) to make determinations about the suitability
or the mapping size, or in the specific case of AHCI, how
many ports are supported by the HBA.

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


  Commit: e42de189e8eaf3dc93f22e88beca4f5b62ef336c
      
https://github.com/qemu/qemu/commit/e42de189e8eaf3dc93f22e88beca4f5b62ef336c
  Author: John Snow <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M tests/ide-test.c

  Log Message:
  -----------
  qtest/ide: Fix small memory leak

For libqos debugging purposes, it's nice to
be able to assert that tests and associated libraries
have no memory leaks. To that end, free up the
trivial cmdline leak.

The remaining leaks caused by pc_alloc_init are fixed
instead by my first-fit pc_alloc implementation already
on the qemu-devel mailing list.

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


  Commit: 58f16a7b47e0e8418b1222b6adc08d2b7079a4c0
      
https://github.com/qemu/qemu/commit/58f16a7b47e0e8418b1222b6adc08d2b7079a4c0
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/cmd646.c

  Log Message:
  -----------
  cmd646: add constants for CNTRL register access

Signed-off-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 5bbc0a703d8241a866f51856336aeb2a2d54b79f
      
https://github.com/qemu/qemu/commit/5bbc0a703d8241a866f51856336aeb2a2d54b79f
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/cmd646.c

  Log Message:
  -----------
  cmd646: synchronise DMA interrupt status with UDMA interrupt status

Make sure that the standard DMA interrupt status bits reflect any changes made
to the UDMA interrupt status bits. The CMD646U2 datasheet claims that these
bits are equivalent, and they must be synchronised for guests that manipulate
both registers.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: dab91a1e138e9d0cb7dc0744c1e41e9f18af0fc4
      
https://github.com/qemu/qemu/commit/dab91a1e138e9d0cb7dc0744c1e41e9f18af0fc4
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/cmd646.c

  Log Message:
  -----------
  cmd646: switch cmd646_update_irq() to accept PCIDevice instead of PCIIDEState

This is in preparation for adding configuration space accessors which accept
PCIDevice as a parameter.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 1d113ef874c04486cf4ee2894b2ef84bf8d17543
      
https://github.com/qemu/qemu/commit/1d113ef874c04486cf4ee2894b2ef84bf8d17543
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/cmd646.c

  Log Message:
  -----------
  cmd646: allow MRDMODE interrupt status bits clearing from PCI config space

Make sure that we also update the normal DMA interrupt status bits at the
same time, and alter the IRQ if being cleared accordingly.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 271dddd133125ee00e347b154bb9d44e228929bb
      
https://github.com/qemu/qemu/commit/271dddd133125ee00e347b154bb9d44e228929bb
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/cmd646.c

  Log Message:
  -----------
  cmd646: synchronise UDMA interrupt status with DMA interrupt status

Make sure that both registers are synchronised when being accessed through
PCI configuration space.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 4ff12bdb1d7c74d95b7315f0a00d17e5cea32249
      
https://github.com/qemu/qemu/commit/4ff12bdb1d7c74d95b7315f0a00d17e5cea32249
  Author: Gonglei <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M qemu-char.c

  Log Message:
  -----------
  qemu-char: using qemu_set_nonblock() instead of fcntl(O_NONBLOCK)

Technically, fcntl(soc, F_SETFL, O_NONBLOCK)
is incorrect since it clobbers all other file flags.
We can use F_GETFL to get the current flags, set or
clear the O_NONBLOCK flag, then use F_SETFL to set the flags.

Using the qemu_set_nonblock() wrapper.

Signed-off-by: Wangxin <address@hidden>
Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 16b38080e3383252f9606c484eb5b43cff70b673
      
https://github.com/qemu/qemu/commit/16b38080e3383252f9606c484eb5b43cff70b673
  Author: Gonglei <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M qga/channel-posix.c

  Log Message:
  -----------
  channel-posix: using qemu_set_nonblock() instead of fcntl(O_NONBLOCK)

Technically, fcntl(soc, F_SETFL, O_NONBLOCK)
is incorrect since it clobbers all other file flags.
We can use F_GETFL to get the current flags, set or
clear the O_NONBLOCK flag, then use F_SETFL to set the flags.

Using the qemu_set_nonblock() wrapper.

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Wangxin <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 267e1a204c073eac28b1510bcc2404668d306e17
      
https://github.com/qemu/qemu/commit/267e1a204c073eac28b1510bcc2404668d306e17
  Author: Cornelia Huck <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/block/dataplane/virtio-blk.c

  Log Message:
  -----------
  dataplane: print why starting failed

Setting up guest or host notifiers may fail, but the user will have
no idea why: Let's print the error returned by the callback.

Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: f9907ebc4cc37d0317ee67cfa8d6618eaf8f658b
      
https://github.com/qemu/qemu/commit/f9907ebc4cc37d0317ee67cfa8d6618eaf8f658b
  Author: Cornelia Huck <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/block/dataplane/virtio-blk.c

  Log Message:
  -----------
  dataplane: fail notifier setting gracefully

The dataplane code is currently doing a hard exit if it fails to set
up either guest or host notifiers. In practice, this may mean that a
guest suddenly dies after a dataplane device failed to come up (e.g.,
when a file descriptor limit is hit for tne nth device).

Let's just try to unwind the setup instead and return.

Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 2f5f70fa5f41e3893a781c065be76e56db4f2e32
      
https://github.com/qemu/qemu/commit/2f5f70fa5f41e3893a781c065be76e56db4f2e32
  Author: Cornelia Huck <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/block/dataplane/virtio-blk.c

  Log Message:
  -----------
  dataplane: stop trying on notifier error

If we fail to set up guest or host notifiers, there's no use trying again
every time the guest kicks, so disable dataplane in that case.

Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 8c27d54fa0a289809dc0c62d8c1f44d5bab2b3bb
      
https://github.com/qemu/qemu/commit/8c27d54fa0a289809dc0c62d8c1f44d5bab2b3bb
  Author: Denis V. Lunev <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M block/parallels.c

  Log Message:
  -----------
  parallels: extend parallels format header with actual data values

Parallels image format has several additional fields inside:
- nb_sectors is actually 64 bit wide. Upper 32bits are not used for
  images with signature "WithoutFreeSpace" and must be explicitly
  zeroed according to Parallels. They will be used for images with
  signature "WithouFreSpacExt"
- inuse is magic which means that the image is currently opened for
  read/write or was not closed correctly, the magic is 0x746f6e59
- data_off is the location of the first data block. It can be zero
  and in this case data starts just beyond the header aligned to
  512 bytes. Though this field does not matter for read-only driver

This patch adds these values to struct parallels_header and adds
proper handling of nb_sectors for currently supported WithoutFreeSpace
images.

WithouFreSpacExt will be covered in next patches.

Signed-off-by: Denis V. Lunev <address@hidden>
CC: Kevin Wolf <address@hidden>
CC: Stefan Hajnoczi <address@hidden>
CC: Jeff Cody <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: f08e2f8465197c65c61b1ab1e0df3cdef4d8567c
      
https://github.com/qemu/qemu/commit/f08e2f8465197c65c61b1ab1e0df3cdef4d8567c
  Author: Denis V. Lunev <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M block/parallels.c

  Log Message:
  -----------
  parallels: replace tabs with spaces in block/parallels.c

Signed-off-by: Denis V. Lunev <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
CC: Kevin Wolf <address@hidden>
CC: Stefan Hajnoczi <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 418a7adb77abbbc09a17d5626cbaa5e9e54be709
      
https://github.com/qemu/qemu/commit/418a7adb77abbbc09a17d5626cbaa5e9e54be709
  Author: Denis V. Lunev <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M block/parallels.c

  Log Message:
  -----------
  parallels: split check for parallels format in parallels_open

and rework error path a bit. There is no difference at the moment, but
the code will be definitely shorter when additional processing will
be required for WithouFreSpacExt

Signed-off-by: Denis V. Lunev <address@hidden>
CC: Jeff Cody <address@hidden>
CC: Kevin Wolf <address@hidden>
CC: Stefan Hajnoczi <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: d25d59802021a747812472780d80a0e792078f40
      
https://github.com/qemu/qemu/commit/d25d59802021a747812472780d80a0e792078f40
  Author: Denis V. Lunev <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M block/parallels.c

  Log Message:
  -----------
  parallels: 2TB+ parallels images support

Parallels has released in the recent updates of Parallels Server 5/6
new addition to his image format. Images with signature WithouFreSpacExt
have offsets in the catalog coded not as offsets in sectors (multiple
of 512 bytes) but offsets coded in blocks (i.e. header->tracks * 512)

In this case all 64 bits of header->nb_sectors are used for image size.

This patch implements support of this for qemu-img and also adds specific
check for an incorrect image. Images with block size greater than
INT_MAX/513 are not supported. The biggest available Parallels image
cluster size in the field is 1 Mb. Thus this limit will not hurt
anyone.

Signed-off-by: Denis V. Lunev <address@hidden>
CC: Jeff Cody <address@hidden>
CC: Kevin Wolf <address@hidden>
CC: Stefan Hajnoczi <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 2f7133b2e540342809a35bb4f52e0abdc5fff9ff
      
https://github.com/qemu/qemu/commit/2f7133b2e540342809a35bb4f52e0abdc5fff9ff
  Author: Peter Lieven <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  qemu-options: add missing -drive discard option to cmdline help

Signed-off-by: Peter Lieven <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: f7f3ff1da0c451befc8d32f977f9c352d1303f40
      
https://github.com/qemu/qemu/commit/f7f3ff1da0c451befc8d32f977f9c352d1303f40
  Author: Kevin Wolf <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/core.c
    M tests/ide-test.c

  Log Message:
  -----------
  ide: Fix segfault when flushing a device that doesn't exist

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


  Commit: ae74f18782d83c249e8bb9566bf5a2ad501ab82c
      
https://github.com/qemu/qemu/commit/ae74f18782d83c249e8bb9566bf5a2ad501ab82c
  Author: Marc Marí <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M tests/libqtest.c

  Log Message:
  -----------
  libqtest: add QTEST_LOG for debugging qtest testcases

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


  Commit: f75ffc585717a26169d180a905aa1f4299aa57e7
      
https://github.com/qemu/qemu/commit/f75ffc585717a26169d180a905aa1f4299aa57e7
  Author: Marc Marí <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M tests/libqos/malloc-pc.c

  Log Message:
  -----------
  libqos: Correct mask to align size to PAGE_SIZE in malloc-pc

Reviewed-by: John Snow <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Marc Marí <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 220c1a2fadee125909e88d61637be307fea02d88
      
https://github.com/qemu/qemu/commit/220c1a2fadee125909e88d61637be307fea02d88
  Author: Marc Marí <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M tests/libqos/malloc.h

  Log Message:
  -----------
  libqos: Change free function called in malloc

Reviewed-by: John Snow <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Marc Marí <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: a83ceea8ffa5ed8f0b09d6ed1f33da6aae8b14e4
      
https://github.com/qemu/qemu/commit/a83ceea8ffa5ed8f0b09d6ed1f33da6aae8b14e4
  Author: Marc Marí <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/block/virtio-blk.c

  Log Message:
  -----------
  virtio-blk: Correct bug in support for flexible descriptor layout

Without this correction, only a three descriptor layout is accepted, and
requests with just two descriptors are not completed and no error message is
displayed.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Marc Marí <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: d66168ed687325aa6d338ce3a3cff18ce3098ed6
      
https://github.com/qemu/qemu/commit/d66168ed687325aa6d338ce3a3cff18ce3098ed6
  Author: Michael Tokarev <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M hw/ide/core.c

  Log Message:
  -----------
  ide: only constrain read/write requests to drive size, not other types

Commit 58ac321135a introduced a check to ide dma processing which
constrains all requests to drive size.  However, apparently, some
valid requests (like TRIM) does not fit in this constraint, and
fails in 2.1.  So check the range only for reads and writes.

Cc: address@hidden
Signed-off-by: Michael Tokarev <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: d6dc10aad8f4dd5503bd8b6d42ed9ab07e03fb01
      
https://github.com/qemu/qemu/commit/d6dc10aad8f4dd5503bd8b6d42ed9ab07e03fb01
  Author: Maria Kustova <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    A docs/image-fuzzer.txt

  Log Message:
  -----------
  docs: Specification for the image fuzzer

'Overall fuzzer requirements' chapter contains the current product vision and
features done and to be done. This chapter is still in progress.

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


  Commit: ad724dd7282520ea13f0626f1c3ef45d65a1b994
      
https://github.com/qemu/qemu/commit/ad724dd7282520ea13f0626f1c3ef45d65a1b994
  Author: Maria Kustova <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    A tests/image-fuzzer/runner.py

  Log Message:
  -----------
  image-fuzzer: Tool for fuzz tests execution

The purpose of the test runner is to prepare the test environment (e.g. create
a work directory, a test image, etc), execute a program under test with
parameters, indicate a test failure if the program was killed during the test
execution and collect core dumps, logs and other test artifacts.

The test runner doesn't depend on an image format, so it can be used with any
external image generator.

[Fixed path to qcow2 format module "qcow2" instead of "../qcow2" since
runner.py is no longer in a sub-directory.
--Stefan]

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Maria Kustova <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 6d5e9372f6d968cbee1d6708198abd087db07260
      
https://github.com/qemu/qemu/commit/6d5e9372f6d968cbee1d6708198abd087db07260
  Author: Maria Kustova <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    A tests/image-fuzzer/qcow2/fuzz.py

  Log Message:
  -----------
  image-fuzzer: Fuzzing functions for qcow2 images

The fuzz submodule of the qcow2 image generator contains fuzzing functions for
image fields.
Each fuzzing function contains a list of constraints and a call of a helper
function that randomly selects a fuzzed value satisfied to one of constraints.
For now constraints include only known as invalid or potentially dangerous
values. But after investigation of code coverage by fuzz tests they will be
expanded by heuristic values based on inner checks and flows of a program
under test.

Now fuzzing of a header, header extensions and a backing file name is
supported.

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Maria Kustova <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: e123232331305fce0c69a3fb170d3f5d8003abf4
      
https://github.com/qemu/qemu/commit/e123232331305fce0c69a3fb170d3f5d8003abf4
  Author: Maria Kustova <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    A tests/image-fuzzer/qcow2/layout.py

  Log Message:
  -----------
  image-fuzzer: Generator of fuzzed qcow2 images

The layout submodule of the qcow2 package creates a random valid image,
randomly selects some amount of its fields, fuzzes them and write the fuzzed
image to the file. Fuzzing process can be controlled by an external
configuration.

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Maria Kustova <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 071e6491947acff53196c119ea4713593e7a8b11
      
https://github.com/qemu/qemu/commit/071e6491947acff53196c119ea4713593e7a8b11
  Author: Maria Kustova <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    A tests/image-fuzzer/qcow2/__init__.py

  Log Message:
  -----------
  image-fuzzer: Public API for image-fuzzer/runner/runner.py

__init__.py provides the public API required by the test runner

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Maria Kustova <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 489cb4d7f958f443556a6e47fbd23344183408ac
      
https://github.com/qemu/qemu/commit/489cb4d7f958f443556a6e47fbd23344183408ac
  Author: Maria Kustova <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M docs/image-fuzzer.txt

  Log Message:
  -----------
  docs: Expand the list of supported image elements with L1/L2 tables

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


  Commit: eeadd9248707c3952de22012974ebdc1e17f2cba
      
https://github.com/qemu/qemu/commit/eeadd9248707c3952de22012974ebdc1e17f2cba
  Author: Maria Kustova <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M tests/image-fuzzer/qcow2/fuzz.py

  Log Message:
  -----------
  image-fuzzer: Add fuzzing functions for L1/L2 table entries

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


  Commit: 38eb193b8b14844a5d5ef65b54a4926e931ac311
      
https://github.com/qemu/qemu/commit/38eb193b8b14844a5d5ef65b54a4926e931ac311
  Author: Maria Kustova <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M tests/image-fuzzer/qcow2/layout.py

  Log Message:
  -----------
  image-fuzzer: Add generators of L1/L2 tables

Entries in L1/L2 entries are based on a portion of random guest clusters.
L2 entries contain offsets to host image clusters filled with random data.
Clusters for L1/L2 tables and guest data are selected randomly.

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


  Commit: 94c83a24c1956cd50ab979725a730f7d8649ac15
      
https://github.com/qemu/qemu/commit/94c83a24c1956cd50ab979725a730f7d8649ac15
  Author: Maria Kustova <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M tests/image-fuzzer/qcow2/layout.py

  Log Message:
  -----------
  image-fuzzer: Reduce number of generator functions in __init__

Some issues can be found only when a fuzzed image has a partial structure,
e.g. has L1/L2 tables but no refcount ones. Generation of an entirely
defined image limits these cases. Now the Image constructor creates only
a header and a backing file name (if any), other image elements are generated
in the 'create_image' API.

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


  Commit: 39ba3bf69c4ef4d8a8b683ee7282efd25b3f01ff
      
https://github.com/qemu/qemu/commit/39ba3bf69c4ef4d8a8b683ee7282efd25b3f01ff
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M block/qcow2-refcount.c

  Log Message:
  -----------
  qcow2: fix new_blocks double-free in alloc_refcount_block()

Commit de82815db1c89da058b7fb941dab137d6d9ab738 ("qcow2: Handle failure
for potentially large allocations") introduced a double-free of
new_blocks in the alloc_refcount_block() error path.

The qemu-iotests qcow2 026 test case was failing because qemu-io
segfaulted.

Make sure new_blocks is NULL after we free it the first time.

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


  Commit: da398fcc256b226217c92c8a83abf3a6ff247e8b
      
https://github.com/qemu/qemu/commit/da398fcc256b226217c92c8a83abf3a6ff247e8b
  Author: Peter Maydell <address@hidden>
  Date:   2014-08-18 (Mon, 18 Aug 2014)

  Changed paths:
    M block/blkdebug.c
    M block/parallels.c
    M block/qcow2-refcount.c
    A docs/image-fuzzer.txt
    M hw/block/dataplane/virtio-blk.c
    M hw/block/virtio-blk.c
    M hw/i386/pc_q35.c
    M hw/ide/ahci.c
    M hw/ide/ahci.h
    M hw/ide/atapi.c
    M hw/ide/cmd646.c
    M hw/ide/core.c
    M hw/ide/internal.h
    M hw/ide/macio.c
    M hw/ide/pci.c
    M hw/ide/pci.h
    M qemu-char.c
    M qemu-options.hx
    M qga/channel-posix.c
    M tests/ide-test.c
    A tests/image-fuzzer/qcow2/__init__.py
    A tests/image-fuzzer/qcow2/fuzz.py
    A tests/image-fuzzer/qcow2/layout.py
    A tests/image-fuzzer/runner.py
    M tests/libqos/malloc-pc.c
    M tests/libqos/malloc.h
    M tests/libqos/pci-pc.c
    M tests/libqos/pci-pc.h
    M tests/libqos/pci.c
    M tests/libqos/pci.h
    M tests/libqtest.c
    M tests/libqtest.h
    M tests/usb-hcd-ehci-test.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into 
staging

Block pull request

# gpg: Signature made Fri 15 Aug 2014 18:04:23 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"

* remotes/stefanha/tags/block-pull-request: (55 commits)
  qcow2: fix new_blocks double-free in alloc_refcount_block()
  image-fuzzer: Reduce number of generator functions in __init__
  image-fuzzer: Add generators of L1/L2 tables
  image-fuzzer: Add fuzzing functions for L1/L2 table entries
  docs: Expand the list of supported image elements with L1/L2 tables
  image-fuzzer: Public API for image-fuzzer/runner/runner.py
  image-fuzzer: Generator of fuzzed qcow2 images
  image-fuzzer: Fuzzing functions for qcow2 images
  image-fuzzer: Tool for fuzz tests execution
  docs: Specification for the image fuzzer
  ide: only constrain read/write requests to drive size, not other types
  virtio-blk: Correct bug in support for flexible descriptor layout
  libqos: Change free function called in malloc
  libqos: Correct mask to align size to PAGE_SIZE in malloc-pc
  libqtest: add QTEST_LOG for debugging qtest testcases
  ide: Fix segfault when flushing a device that doesn't exist
  qemu-options: add missing -drive discard option to cmdline help
  parallels: 2TB+ parallels images support
  parallels: split check for parallels format in parallels_open
  parallels: replace tabs with spaces in block/parallels.c
  ...

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/142f4ac5d5e0...da398fcc256b

reply via email to

[Prev in Thread] Current Thread [Next in Thread]