Changeset
hw/block/virtio-blk.c |  4 +++-
hw/ide/core.c         | 10 +++++++++-
tests/ide-test.c      | 19 +++++++++++++++++++
3 files changed, 31 insertions(+), 2 deletions(-)
Git apply log
Switched to a new branch '20170810174824.9580-1-stefanha@redhat.com'
Applying: IDE: Do not flush empty CDROM drives
Applying: IDE: test flush on empty CDROM
Applying: virtio-blk: handle blk_getlength() errors
To https://github.com/patchew-project/qemu
 * [new tag]               patchew/20170810174824.9580-1-stefanha@redhat.com -> patchew/20170810174824.9580-1-stefanha@redhat.com
Test passed: FreeBSD

loading

Test passed: checkpatch

loading

Test passed: docker

loading

Test passed: s390x

loading

[Qemu-devel] [PULL for-2.10 0/3] Block patches
Posted by Stefan Hajnoczi, 1 week ago
The following changes since commit b38df311c174c98ef8cce7dec9f46603b083018e:

  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.10-20170809' into staging (2017-08-10 11:12:36 +0100)

are available in the git repository at:

  git://github.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 17d0bc01bfcce0ad4fb5105d4502595224569ff0:

  virtio-blk: handle blk_getlength() errors (2017-08-10 14:33:43 +0100)

----------------------------------------------------------------

----------------------------------------------------------------

Kevin Wolf (1):
  IDE: test flush on empty CDROM

Stefan Hajnoczi (2):
  IDE: Do not flush empty CDROM drives
  virtio-blk: handle blk_getlength() errors

 hw/block/virtio-blk.c |  4 +++-
 hw/ide/core.c         | 10 +++++++++-
 tests/ide-test.c      | 19 +++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

-- 
2.13.4


Re: [Qemu-devel] [PULL for-2.10 0/3] Block patches
Posted by Peter Maydell, 1 week ago
On 10 August 2017 at 18:48, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit b38df311c174c98ef8cce7dec9f46603b083018e:
>
>   Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.10-20170809' into staging (2017-08-10 11:12:36 +0100)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/block-pull-request
>
> for you to fetch changes up to 17d0bc01bfcce0ad4fb5105d4502595224569ff0:
>
>   virtio-blk: handle blk_getlength() errors (2017-08-10 14:33:43 +0100)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> Kevin Wolf (1):
>   IDE: test flush on empty CDROM
>
> Stefan Hajnoczi (2):
>   IDE: Do not flush empty CDROM drives
>   virtio-blk: handle blk_getlength() errors
>
>  hw/block/virtio-blk.c |  4 +++-
>  hw/ide/core.c         | 10 +++++++++-
>  tests/ide-test.c      | 19 +++++++++++++++++++
>  3 files changed, 31 insertions(+), 2 deletions(-)
>
> --

Applied, thanks.

-- PMM

[Qemu-devel] [PULL for-2.10 1/3] IDE: Do not flush empty CDROM drives
Posted by Stefan Hajnoczi, 1 week ago
The block backend changed in a way that flushing empty CDROM drives now
crashes.  Amend IDE to avoid doing so until the root problem can be
addressed for 2.11.

Original patch by John Snow <jsnow@redhat.com>.

Reported-by: Kieron Shorrock <kshorrock@paloaltonetworks.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20170809160212.29976-2-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/ide/core.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/hw/ide/core.c b/hw/ide/core.c
index 0b48b64d3a..bea39536b0 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -1063,7 +1063,15 @@ static void ide_flush_cache(IDEState *s)
     s->status |= BUSY_STAT;
     ide_set_retry(s);
     block_acct_start(blk_get_stats(s->blk), &s->acct, 0, BLOCK_ACCT_FLUSH);
-    s->pio_aiocb = blk_aio_flush(s->blk, ide_flush_cb, s);
+
+    if (blk_bs(s->blk)) {
+        s->pio_aiocb = blk_aio_flush(s->blk, ide_flush_cb, s);
+    } else {
+        /* XXX blk_aio_flush() crashes when blk_bs(blk) is NULL, remove this
+         * temporary workaround when blk_aio_*() functions handle NULL blk_bs.
+         */
+        ide_flush_cb(s, 0);
+    }
 }
 
 static void ide_cfata_metadata_inquiry(IDEState *s)
-- 
2.13.4


[Qemu-devel] [PULL for-2.10 2/3] IDE: test flush on empty CDROM
Posted by Stefan Hajnoczi, 1 week ago
From: Kevin Wolf <kwolf@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20170809160212.29976-3-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 tests/ide-test.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/ide-test.c b/tests/ide-test.c
index bfd79ddbdc..aa9de065fc 100644
--- a/tests/ide-test.c
+++ b/tests/ide-test.c
@@ -689,6 +689,24 @@ static void test_flush_nodev(void)
     ide_test_quit();
 }
 
+static void test_flush_empty_drive(void)
+{
+    QPCIDevice *dev;
+    QPCIBar bmdma_bar, ide_bar;
+
+    ide_test_start("-device ide-cd,bus=ide.0");
+    dev = get_pci_device(&bmdma_bar, &ide_bar);
+
+    /* FLUSH CACHE command on device 0 */
+    qpci_io_writeb(dev, ide_bar, reg_device, 0);
+    qpci_io_writeb(dev, ide_bar, reg_command, CMD_FLUSH_CACHE);
+
+    /* Just testing that qemu doesn't crash... */
+
+    free_pci_device(dev);
+    ide_test_quit();
+}
+
 static void test_pci_retry_flush(void)
 {
     test_retry_flush("pc");
@@ -954,6 +972,7 @@ int main(int argc, char **argv)
 
     qtest_add_func("/ide/flush", test_flush);
     qtest_add_func("/ide/flush/nodev", test_flush_nodev);
+    qtest_add_func("/ide/flush/empty_drive", test_flush_empty_drive);
     qtest_add_func("/ide/flush/retry_pci", test_pci_retry_flush);
     qtest_add_func("/ide/flush/retry_isa", test_isa_retry_flush);
 
-- 
2.13.4


[Qemu-devel] [PULL for-2.10 3/3] virtio-blk: handle blk_getlength() errors
Posted by Stefan Hajnoczi, 1 week ago
If blk_getlength() fails in virtio_blk_update_config() consider the disk
image length to be 0 bytes.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Message-id: 20170808122251.29815-1-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/block/virtio-blk.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index b750bd8b53..a16ac75090 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -730,6 +730,7 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config)
     BlockConf *conf = &s->conf.conf;
     struct virtio_blk_config blkcfg;
     uint64_t capacity;
+    int64_t length;
     int blk_size = conf->logical_block_size;
 
     blk_get_geometry(s->blk, &capacity);
@@ -752,7 +753,8 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config)
      * divided by 512 - instead it is the amount of blk_size blocks
      * per track (cylinder).
      */
-    if (blk_getlength(s->blk) /  conf->heads / conf->secs % blk_size) {
+    length = blk_getlength(s->blk);
+    if (length > 0 && length / conf->heads / conf->secs % blk_size) {
         blkcfg.geometry.sectors = conf->secs & ~s->sector_mask;
     } else {
         blkcfg.geometry.sectors = conf->secs;
-- 
2.13.4