From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:56776)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1YRLho-00036i-32
	for qemu-devel@nongnu.org; Fri, 27 Feb 2015 09:15:52 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1YRLhj-0007UY-Vk
	for qemu-devel@nongnu.org; Fri, 27 Feb 2015 09:15:52 -0500
Received: from mx1.redhat.com ([209.132.183.28]:45439)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1YRLhj-0007UQ-Le
	for qemu-devel@nongnu.org; Fri, 27 Feb 2015 09:15:47 -0500
Message-ID: <54F07C06.1090808@redhat.com>
Date: Fri, 27 Feb 2015 15:15:34 +0100
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1425001784-6752-1-git-send-email-arei.gonglei@huawei.com>
In-Reply-To: <1425001784-6752-1-git-send-email-arei.gonglei@huawei.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] bootdevice: fix segment fault when booting
 guest with '-kernel' and '-initrd'
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: arei.gonglei@huawei.com, qemu-devel@nongnu.org
Cc: peter.huangpeng@huawei.com, edivaldoapereira@yahoo.com.br

Looks good, I am applying it locally so that it can get into qemu.git
very soon.

Paolo

On 27/02/2015 02:49, arei.gonglei@huawei.com wrote:
> From: Gonglei <arei.gonglei@huawei.com>
> 
> 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>
> ---
>  bootdevice.c | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/bootdevice.c b/bootdevice.c
> index df9ab0e..673bfef 100644
> --- a/bootdevice.c
> +++ b/bootdevice.c
> @@ -223,10 +223,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);
>              }
>