aboutsummaryrefslogtreecommitdiff
path: root/bootdevice.c
diff options
context:
space:
mode:
authorGonglei <arei.gonglei@huawei.com>2015-02-27 09:49:44 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2015-02-27 15:15:56 +0100
commit57fe6a6e4a050f639ac3d2f7c32b4cd3bcde3978 (patch)
tree8a8fb97642e6d2a62551b56aedc178dbff0185b6 /bootdevice.c
parent2ed1ebcf65edf6757d8904000889ce52cc0a9d1b (diff)
downloadqemu-arm-57fe6a6e4a050f639ac3d2f7c32b4cd3bcde3978.tar.gz
bootdevice: fix segment fault when booting guest with '-kernel' and '-initrd'
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 <edivaldoapereira@yahoo.com.br> Signed-off-by: Gonglei <arei.gonglei@huawei.com> Message-Id: <1425001784-6752-1-git-send-email-arei.gonglei@huawei.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'bootdevice.c')
-rw-r--r--bootdevice.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/bootdevice.c b/bootdevice.c
index c3a010c094..eacd8c88c2 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);
}