From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58458) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eF2G1-0002zt-Se for qemu-devel@nongnu.org; Wed, 15 Nov 2017 13:17:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eF2G0-0002ej-P1 for qemu-devel@nongnu.org; Wed, 15 Nov 2017 13:17:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49010) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eF2G0-0002eG-IX for qemu-devel@nongnu.org; Wed, 15 Nov 2017 13:17:52 -0500 Date: Wed, 15 Nov 2017 20:17:47 +0200 From: "Michael S. Tsirkin" Message-ID: <1510769835-31902-2-git-send-email-mst@redhat.com> References: <1510769835-31902-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1510769835-31902-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 01/10] fix: unrealize virtio device if we fail to hotplug it List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , linzhecheng , Stefan Hajnoczi From: linzhecheng If we fail to hotplug virtio-blk device and then suspend or shutdown VM, qemu is likely to crash. Re-production steps: 1. Run VM named vm001 2. Create a virtio-blk.xml which contains wrong configurations: 3. Run command : virsh attach-device vm001 virtio-blk.xml error: Failed to attach device from blk-scsi.xml error: internal error: unable to execute QEMU command 'device_add': Pleas= e set scsi=3Doff for virtio-blk devices in order to use virtio 1.0 it means hotplug virtio-blk device failed. 4. Suspend or shutdown VM will leads to qemu crash Problem happens in virtio_vmstate_change which is called by vm_state_notify: vdev=E2=80=99s parent_bus is NULL, so qdev_get_parent_bus(DEVICE(vdev)) w= ill crash. virtio_vmstate_change is added to the list vm_change_state_head at virtio= _blk_device_realize(virtio_init), but after hotplug virtio-blk failed, virtio_vmstate_change will not be re= moved from vm_change_state_head. Adding unrealize function of virtio-blk device can solve this problem. Signed-off-by: linzhecheng Reviewed-by: Stefan Hajnoczi Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/virtio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 5884ce3..ea532dc 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2491,6 +2491,7 @@ static void virtio_device_realize(DeviceState *dev,= Error **errp) virtio_bus_device_plugged(vdev, &err); if (err !=3D NULL) { error_propagate(errp, err); + vdc->unrealize(dev, NULL); return; } =20 --=20 MST