From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eACS2-0000OD-Ma for qemu-devel@nongnu.org; Thu, 02 Nov 2017 06:10:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eACRy-0002bC-2B for qemu-devel@nongnu.org; Thu, 02 Nov 2017 06:10:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36596) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eACRx-0002a7-Lm for qemu-devel@nongnu.org; Thu, 02 Nov 2017 06:10:13 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7CF965D685 for ; Thu, 2 Nov 2017 10:10:12 +0000 (UTC) From: Thomas Huth Date: Thu, 2 Nov 2017 11:10:04 +0100 Message-Id: <1509617407-21191-1-git-send-email-thuth@redhat.com> Subject: [Qemu-devel] [PATCH for-2.11 v3 0/2] Check for the availability of a hotplug controller before adding a device List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Eduardo Habkost , Igor Mammedov , "Dr. David Alan Gilbert" Cc: Markus Armbruster , Paolo Bonzini , david@redhat.com First patch is a small clean up to the error handling code in qdev_device_add(), and the second patch adds a proper check for the availability of a hotplug controller to prevent the possibility of a crash with device_del. The crash can currently be triggered for example like this: $ s390x-softmmu/qemu-system-s390x -M none -nographic QEMU 2.10.50 monitor - type 'help' for more information (qemu) device_add qemu-s390x-cpu,id=x (qemu) device_del x ** ERROR:qemu/qdev-monitor.c:872:qdev_unplug: assertion failed: (hotplug_ctrl) Aborted (core dumped) v3: - Invert the logic of the second error check in the first patch as suggested by Igor - Updated the patch description of the second patch with the current way to crash QEMU v2: - Do the check for the availability of the hotplug controller earlier in qdev_device_add - Use common new err_dev_del handler in case of failure Thomas Huth (2): qdev_monitor: Simplify error handling in qdev_device_add() qdev: Check for the availability of a hotplug controller before adding a device hw/core/qdev.c | 28 ++++++++++++++++++++-------- include/hw/qdev-core.h | 1 + qdev-monitor.c | 21 +++++++++++++-------- 3 files changed, 34 insertions(+), 16 deletions(-) -- 1.8.3.1