From: Don Slutz <dslutz@verizon.com>
Date: Mon, 17 Nov 2014 21:20:39 +0000 (-0500)
Subject: hw/ide/core.c: Prevent SIGSEGV during migration
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6b896ab261942f441a16836e3fa3c83f3f4488b9;p=qemu.git

hw/ide/core.c: Prevent SIGSEGV during migration

The other callers to blk_set_enable_write_cache() in this file
already check for s->blk == NULL.

Signed-off-by: Don Slutz <dslutz@verizon.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1416259239-13281-1-git-send-email-dslutz@verizon.com
Cc: qemu-stable@nongnu.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/hw/ide/core.c b/hw/ide/core.c
index 00e21cf7ef..d4af5e2eb1 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -2401,7 +2401,7 @@ static int ide_drive_post_load(void *opaque, int version_id)
 {
     IDEState *s = opaque;
 
-    if (s->identify_set) {
+    if (s->blk && s->identify_set) {
         blk_set_enable_write_cache(s->blk, !!(s->identify_data[85] & (1 << 5)));
     }
     return 0;