[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/15] bootdevice: fix segment fault when booting gue
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 05/15] bootdevice: fix segment fault when booting guest with '-kernel' and '-initrd' |
Date: |
Mon, 2 Mar 2015 11:08:44 +0100 |
From: Gonglei <address@hidden>
Reproducer:
$./qemu-system-x86_64 --enable-kvm -kernel /home/vmlinuz-2.6.32.12-0.7-default
\
-initrd /home/initrd-2.6.32.12-0.7-default -append \
"root=/dev/ram rw console=ttyS0,115200" -dtb guest.dtb -vnc :10 --monitor
stdio -smp 2
QEMU 2.2.50 monitor - type 'help' for more information
(qemu) Segmentation fault (core dumped)
Reported-by: Edivaldo de Araujo Pereira <address@hidden>
Signed-off-by: Gonglei <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
bootdevice.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/bootdevice.c b/bootdevice.c
index c3a010c..eacd8c8 100644
--- a/bootdevice.c
+++ b/bootdevice.c
@@ -221,10 +221,15 @@ char *get_boot_devices_list(size_t *size, bool
ignore_suffixes)
}
if (!ignore_suffixes) {
- d = qdev_get_own_fw_dev_path_from_handler(i->dev->parent_bus,
i->dev);
- if (d) {
- assert(!i->suffix);
- suffix = d;
+ if (i->dev) {
+ d = qdev_get_own_fw_dev_path_from_handler(i->dev->parent_bus,
+ i->dev);
+ if (d) {
+ assert(!i->suffix);
+ suffix = d;
+ } else {
+ suffix = g_strdup(i->suffix);
+ }
} else {
suffix = g_strdup(i->suffix);
}
--
2.3.0
- [Qemu-devel] [PULL 00/15] Misc changes for 2015-03-02, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 02/15] block: Forbid bdrv_set_aio_context outside BQL, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 03/15] virtio-scsi-dataplane: Call blk_set_aio_context within BQL, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 04/15] timer: replace time() with QEMU_CLOCK_HOST, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 05/15] bootdevice: fix segment fault when booting guest with '-kernel' and '-initrd',
Paolo Bonzini <=
- [Qemu-devel] [PULL 06/15] Add specific config options for PCI-E bridges, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 07/15] Create specific config option for "platform-bus", Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 08/15] Give ivshmem its own config option, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 01/15] scsi: give device a parent before setting properties, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 09/15] iscsi: Handle write protected case in reopen, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 13/15] virtio-scsi: Allocate op blocker reason before blocking, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 10/15] Makefile: fix up parallel building under MSYS+MinGW, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 11/15] Makefile: don't silence mak file test with V=1, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 14/15] cpus: fix deadlock and segfault in qemu_mutex_lock_iothread, Paolo Bonzini, 2015/03/02
- [Qemu-devel] [PULL 15/15] cpus: be more paranoid in avoiding deadlocks, Paolo Bonzini, 2015/03/02