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-Tag: qemu-xen-4.5.0-rc3^0
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a230ec3101ddda868252c036ea960af2b2d6cd5a;p=qemu-upstream-4.6-testing.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.

upstream-commit-id: 6b896ab261942f441a16836e3fa3c83f3f4488b9

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
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Release-Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Conflicts:
	hw/ide/core.c
---

diff --git a/hw/ide/core.c b/hw/ide/core.c
index c943a4d76..227d903bd 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -2270,7 +2270,7 @@ static int ide_drive_post_load(void *opaque, int version_id)
 {
     IDEState *s = opaque;
 
-    if (s->identify_set) {
+    if (s->bs && s->identify_set) {
         bdrv_set_enable_write_cache(s->bs, !!(s->identify_data[85] & (1 << 5)));
     }
     return 0;