@@ -756,6 +756,7 @@ static void virtio_blk_device_unrealize(DeviceState *dev, Error **errp)
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIOBlock *s = VIRTIO_BLK(dev);
+ del_boot_device_path(-1, dev, "/disk@0,0");
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
remove_migration_state_change_notifier(&s->migration_state_notifier);
virtio_blk_data_plane_destroy(s->dataplane);
@@ -1853,6 +1853,7 @@ static void assigned_exitfn(struct PCIDevice *pci_dev)
{
AssignedDevice *dev = DO_UPCAST(AssignedDevice, dev, pci_dev);
+ del_boot_device_path(-1, &pci_dev->qdev, NULL);
deassign_device(dev);
free_assigned_device(dev);
}
@@ -4220,6 +4220,7 @@ static void vfio_exitfn(PCIDevice *pdev)
VFIODevice *vdev = DO_UPCAST(VFIODevice, pdev, pdev);
VFIOGroup *group = vdev->group;
+ del_boot_device_path(-1, &pdev->qdev, NULL);
vfio_unregister_err_notifier(vdev);
pci_device_set_intx_routing_notifier(&vdev->pdev, NULL);
vfio_disable_interrupts(vdev);
@@ -1492,6 +1492,7 @@ pci_e1000_uninit(PCIDevice *dev)
{
E1000State *d = E1000(dev);
+ del_boot_device_path(-1, DEVICE(dev), "/ethernet-phy@0");
timer_del(d->autoneg_timer);
timer_free(d->autoneg_timer);
timer_del(d->mit_timer);
@@ -1843,6 +1843,7 @@ static void pci_nic_uninit(PCIDevice *pci_dev)
{
EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, pci_dev);
+ del_boot_device_path(-1, &pci_dev->qdev, "/ethernet-phy@0");
memory_region_destroy(&s->mmio_bar);
memory_region_destroy(&s->io_bar);
memory_region_destroy(&s->flash_bar);
@@ -748,6 +748,7 @@ static void pci_ne2000_exit(PCIDevice *pci_dev)
PCINE2000State *d = DO_UPCAST(PCINE2000State, dev, pci_dev);
NE2000State *s = &d->ne2000;
+ del_boot_device_path(-1, &pci_dev->qdev, "/ethernet-phy@0");
memory_region_destroy(&s->io);
qemu_del_nic(s->nic);
qemu_free_irq(s->irq);
@@ -3462,6 +3462,7 @@ static void pci_rtl8139_uninit(PCIDevice *dev)
{
RTL8139State *s = RTL8139(dev);
+ del_boot_device_path(-1, DEVICE(dev), "/ethernet-phy@0");
memory_region_destroy(&s->bar_io);
memory_region_destroy(&s->bar_mem);
if (s->cplus_txbuffer) {
@@ -1626,6 +1626,7 @@ static void virtio_net_device_unrealize(DeviceState *dev, Error **errp)
virtio_net_set_status(vdev, 0);
unregister_savevm(dev, "virtio-net", n);
+ del_boot_device_path(-1, dev, "/ethernet-phy@0");
g_free(n->netclient_name);
n->netclient_name = NULL;
@@ -2176,6 +2176,7 @@ static void vmxnet3_pci_uninit(PCIDevice *pci_dev)
VMW_CBPRN("Starting uninit...");
unregister_savevm(dev, "vmxnet3-msix", s);
+ del_boot_device_path(-1, dev, "/ethernet-phy@0");
vmxnet3_net_uninit(s);
@@ -388,6 +388,7 @@ static void scsi_generic_reset(DeviceState *dev)
static void scsi_destroy(SCSIDevice *s)
{
+ del_boot_device_path(-1, &s->qdev, NULL);
scsi_device_purge_requests(s, SENSE_CODE(NO_SENSE));
blockdev_mark_auto_del(s->conf.bs);
}
@@ -1329,6 +1329,7 @@ static void usb_net_handle_destroy(USBDevice *dev)
USBNetState *s = (USBNetState *) dev;
/* TODO: remove the nd_table[] entry */
+ del_boot_device_path(-1, &dev->qdev, "/ethernet@0");
rndis_clear_responsequeue(s);
qemu_del_nic(s->nic);
}
@@ -984,6 +984,7 @@ static void usb_host_handle_destroy(USBDevice *udev)
{
USBHostDevice *s = USB_HOST_DEVICE(udev);
+ del_boot_device_path(-1, &udev->qdev, NULL);
qemu_remove_exit_notifier(&s->exit);
QTAILQ_REMOVE(&hostdevs, s, next);
usb_host_close(s);
@@ -1416,6 +1416,7 @@ static void usbredir_handle_destroy(USBDevice *udev)
{
USBRedirDevice *dev = DO_UPCAST(USBRedirDevice, dev, udev);
+ del_boot_device_path(-1, &udev->qdev, NULL);
qemu_chr_delete(dev->cs);
dev->cs = NULL;
/* Note must be done after qemu_chr_close, as that causes a close event */