yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
958e1b
From 3272771d5dd899876eb8d7ea3af3ed1d2b2472d2 Mon Sep 17 00:00:00 2001
958e1b
From: Kevin Wolf <kwolf@redhat.com>
958e1b
Date: Wed, 10 Sep 2014 11:06:09 +0200
958e1b
Subject: [PATCH 10/12] ide: Fix segfault when flushing a device that doesn't exist
958e1b
958e1b
Message-id: <1410347169-4368-4-git-send-email-kwolf@redhat.com>
958e1b
Patchwork-id: 60955
958e1b
O-Subject: [RHEL-7.1 qemu-kvm PATCH 3/3] ide: Fix segfault when flushing a device that doesn't exist
958e1b
Bugzilla: 1123372
958e1b
RH-Acked-by: Max Reitz <mreitz@redhat.com>
958e1b
RH-Acked-by: Fam Zheng <famz@redhat.com>
958e1b
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
958e1b
958e1b
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
958e1b
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
958e1b
(cherry picked from commit f7f3ff1da0c451befc8d32f977f9c352d1303f40)
958e1b
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
958e1b
958e1b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
958e1b
---
958e1b
 hw/ide/core.c    |    4 +++-
958e1b
 tests/ide-test.c |   14 ++++++++++++++
958e1b
 2 files changed, 17 insertions(+), 1 deletions(-)
958e1b
958e1b
diff --git a/hw/ide/core.c b/hw/ide/core.c
958e1b
index 0313250..a2947a9 100644
958e1b
--- a/hw/ide/core.c
958e1b
+++ b/hw/ide/core.c
958e1b
@@ -810,7 +810,9 @@ static void ide_flush_cb(void *opaque, int ret)
958e1b
         }
958e1b
     }
958e1b
 
958e1b
-    bdrv_acct_done(s->bs, &s->acct);
958e1b
+    if (s->bs) {
958e1b
+        bdrv_acct_done(s->bs, &s->acct);
958e1b
+    }
958e1b
     s->status = READY_STAT | SEEK_STAT;
958e1b
     ide_async_cmd_done(s);
958e1b
     ide_set_irq(s->bus);
958e1b
diff --git a/tests/ide-test.c b/tests/ide-test.c
958e1b
index 739d2bf..51f9239 100644
958e1b
--- a/tests/ide-test.c
958e1b
+++ b/tests/ide-test.c
958e1b
@@ -462,6 +462,19 @@ static void test_flush(void)
958e1b
     ide_test_quit();
958e1b
 }
958e1b
 
958e1b
+static void test_flush_nodev(void)
958e1b
+{
958e1b
+    ide_test_start("");
958e1b
+
958e1b
+    /* FLUSH CACHE command on device 0*/
958e1b
+    outb(IDE_BASE + reg_device, 0);
958e1b
+    outb(IDE_BASE + reg_command, CMD_FLUSH_CACHE);
958e1b
+
958e1b
+    /* Just testing that qemu doesn't crash... */
958e1b
+
958e1b
+    ide_test_quit();
958e1b
+}
958e1b
+
958e1b
 int main(int argc, char **argv)
958e1b
 {
958e1b
     const char *arch = qtest_get_arch();
958e1b
@@ -493,6 +506,7 @@ int main(int argc, char **argv)
958e1b
     qtest_add_func("/ide/bmdma/teardown", test_bmdma_teardown);
958e1b
 
958e1b
     qtest_add_func("/ide/flush", test_flush);
958e1b
+    qtest_add_func("/ide/flush_nodev", test_flush_nodev);
958e1b
 
958e1b
     ret = g_test_run();
958e1b
 
958e1b
-- 
958e1b
1.7.1
958e1b