falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
(cherry picked from commit 6b896ab261)

Conflicts:
	hw/ide/core.c

*removed dependency on 4be746345

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Don Slutz 2014-11-17 16:20:39 -05:00 committed by Michael Roth
parent 844470158c
commit cd2f44cc3e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/ide/core.c
View File

@ -2299,7 +2299,7 @@ static int ide_drive_post_load(void *opaque, int version_id)
{ {
IDEState *s = opaque; 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))); bdrv_set_enable_write_cache(s->bs, !!(s->identify_data[85] & (1 << 5)));
} }
return 0; return 0;