| Message ID | 20110408151238.GA13940@elte.hu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 8 Apr 2011, Ingo Molnar wrote: > When running a simple, diskless 'kvm ./bzImage' KVM session we currently > segfault at the end of the session: Good catch! Applied both patches, thanks Ingo! -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/tools/kvm/disk-image.c b/tools/kvm/disk-image.c index 80999c1..4099720 100644 --- a/tools/kvm/disk-image.c +++ b/tools/kvm/disk-image.c @@ -90,6 +90,10 @@ struct disk_image *disk_image__open(const char *filename) void disk_image__close(struct disk_image *self) { + /* If there was no disk image then there's nothing to do: */ + if (!self) + return; + if (self->ops->close) self->ops->close(self);
When running a simple, diskless 'kvm ./bzImage' KVM session we currently segfault at the end of the session: [ 4.895488] Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0) [ 4.899371] Rebooting in 1 seconds.. Program received signal SIGSEGV, Segmentation fault. disk_image__close (self=0x0) at disk-image.c:93 93 if (self->ops->close) (gdb) Because disk_image__close() assumes that 'self' is never NULL. Add a NULL check to allow a clean exit. Signed-off-by: Ingo Molnar <mingo@elte.hu> --- tools/kvm/disk-image.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html