Re: [Qemu-devel] [PATCH] Add remove_boot_device_path() function for hot-unplug device

[lijun]

Hi Markus,
  Really appreciate your review first. I almost a new participant. And 
I read other's patches very little. So maybe this patch is duplicate to 
one of Marcel's patch. But I really do not know. And I really don't 
copying Marcel's. This is my own analysis. When I modify this issue, I 
only check the current version of qemu still has this issue or not. And 
I don't check whether someone has submitted a similar patch for this in 
mailing list.
  I am interested in qemu. So I will submit some patches at my leisure. 
If this patch is duplicate to some of Marcel's patch and his patch is 
better, please ignore my submit. And if so, I am so sorry for Marcel, 
but I really don't know. Pardon me, Marcel.
  At last, when you have time, could you help me to find out the url of 
Marcel's patch for this issue? I can not find the corresponding patch of 
Marcel's. And maybe I can learn a lot from it. Thanks again Markus.

Best Regards,
Jun Li

On 04/14/2014 04:59 PM, Markus Armbruster wrote:
Copying Marcel.

Jun Li<junm...@gmail.com>  writes:

Add remove_boot_device_path() function to remove bootindex when hot-unplug
a device. This patch fixed virtio-blk/virtio-net/scsi-disk/scsi-generic device.
So it has fixed bug1086603, ref:
https://bugzilla.redhat.com/show_bug.cgi?id=1086603

Signed-off-by: Jun Li<junm...@gmail.com>
---
  hw/block/virtio-blk.c   |  1 +
  hw/net/virtio-net.c     |  1 +
  hw/scsi/scsi-disk.c     |  1 +
  hw/scsi/scsi-generic.c  |  1 +
  include/sysemu/sysemu.h |  2 ++
  vl.c                    | 16 ++++++++++++++++
  6 files changed, 22 insertions(+)

diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 8a568e5..ecdd266 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -752,6 +752,7 @@ static void virtio_blk_device_unrealize(DeviceState *dev, 
Error **errp)
      unregister_savevm(dev, "virtio-blk", s);
      blockdev_mark_auto_del(s->bs);
      virtio_cleanup(vdev);
+    remove_boot_device_path(s->conf->bootindex, dev, "/disk@0,0");
  }
  
  static Property virtio_blk_properties[] = {
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 33bd233..520c029 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -1633,6 +1633,7 @@ static void virtio_net_device_unrealize(DeviceState *dev, 
Error **errp)
      g_free(n->vqs);
      qemu_del_nic(n->nic);
      virtio_cleanup(vdev);
+    remove_boot_device_path(n->nic_conf.bootindex, dev, "/ethernet-phy@0");
  }
  
  static void virtio_net_instance_init(Object *obj)
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 48a28ae..f7303e8 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -2156,6 +2156,7 @@ static void scsi_destroy(SCSIDevice *dev)
  
      scsi_device_purge_requests(&s->qdev, SENSE_CODE(NO_SENSE));
      blockdev_mark_auto_del(s->qdev.conf.bs);
+    remove_boot_device_path(s->qdev.conf.bootindex, &dev->qdev, NULL);
  }
  
  static void scsi_disk_resize_cb(void *opaque)
diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
index 8d92e0d..22b9752 100644
--- a/hw/scsi/scsi-generic.c
+++ b/hw/scsi/scsi-generic.c
@@ -390,6 +390,7 @@ static void scsi_destroy(SCSIDevice *s)
  {
      scsi_device_purge_requests(s, SENSE_CODE(NO_SENSE));
      blockdev_mark_auto_del(s->conf.bs);
+    remove_boot_device_path(s->conf.bootindex, &s->qdev, NULL);
  }
  
  static int scsi_generic_initfn(SCSIDevice *s)
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index ba5c7f8..f7ad1e2 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -193,6 +193,8 @@ void rtc_change_mon_event(struct tm *tm);
  
  void add_boot_device_path(int32_t bootindex, DeviceState *dev,
                            const char *suffix);
+void remove_boot_device_path(int32_t bootindex, DeviceState *dev,
+                             const char *suffix);
  char *get_boot_devices_list(size_t *size, bool ignore_suffixes);
  
  DeviceState *get_boot_device(uint32_t position);
diff --git a/vl.c b/vl.c
index 9975e5a..8aaa1d6 100644
--- a/vl.c
+++ b/vl.c
@@ -1184,6 +1184,22 @@ void add_boot_device_path(int32_t bootindex, DeviceState 
*dev,
      QTAILQ_INSERT_TAIL(&fw_boot_order, node, link);
  }
  
+void remove_boot_device_path(int32_t bootindex, DeviceState *dev,
+                             const char *suffix)
+{
+    FWBootEntry *i;
+
+    if (bootindex == -1) {
+        return;
+    }
+
+    QTAILQ_FOREACH(i, &fw_boot_order, link)
+        if (i->bootindex == bootindex) {
+            QTAILQ_REMOVE(&fw_boot_order, i, link);
+            return;
+        }
+}
+
  DeviceState *get_boot_device(uint32_t position)
  {
      uint32_t counter = 0;