[Xen-changelog] [qemu-upstream-unstable] hw/ide/core.c: Prevent SIGSEGV during migration

[patchbot@xxxxxxx]

commit a230ec3101ddda868252c036ea960af2b2d6cd5a
Author:     Don Slutz <dslutz@xxxxxxxxxxx>
AuthorDate: Mon Nov 17 16:20:39 2014 -0500
Commit:     Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
CommitDate: Wed Nov 19 11:18:38 2014 +0000

    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@xxxxxxxxxxx>
    Reviewed-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
    Reviewed-by: Stefan Hajnoczi <stefanha@xxxxxxxxxx>
    Message-id: 1416259239-13281-1-git-send-email-dslutz@xxxxxxxxxxx
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
    Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
    Release-Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
    
    Conflicts:
        hw/ide/core.c
---
 hw/ide/core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/ide/core.c b/hw/ide/core.c
index c943a4d..227d903 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;
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog