OSDN Git Service

hw/ide/core.c: Prevent SIGSEGV during migration
authorDon Slutz <dslutz@verizon.com>
Mon, 17 Nov 2014 21:20:39 +0000 (16:20 -0500)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 18 Nov 2014 17:36:14 +0000 (17:36 +0000)
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>
hw/ide/core.c

index 00e21cf..d4af5e2 100644 (file)
@@ -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;