From: Gonglei <arei.gong...@huawei.com> Introduce del_boot_device_path() to clean up fw_cfg content when hot-unplugging a device that refers to a bootindex.
Signed-off-by: Gonglei <arei.gong...@huawei.com> Signed-off-by: Chenliang <chenlian...@huawei.com> --- include/sysemu/sysemu.h | 1 + vl.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index e1b0659..7a79ff4 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -209,6 +209,7 @@ void usb_info(Monitor *mon, const QDict *qdict); void add_boot_device_path(int32_t bootindex, DeviceState *dev, const char *suffix); +void del_boot_device_path(DeviceState *dev); void modify_boot_device_path(int32_t bootindex, DeviceState *dev, const char *suffix); char *get_boot_devices_list(size_t *size, bool ignore_suffixes); diff --git a/vl.c b/vl.c index 825f9fd..49328df 100644 --- a/vl.c +++ b/vl.c @@ -1263,6 +1263,26 @@ static bool is_same_fw_dev_path(DeviceState *src, DeviceState *dst) return ret; } +void del_boot_device_path(DeviceState *dev) +{ + FWBootEntry *i; + + assert(dev != NULL); + + /* remove all entries of the assigned device */ + QTAILQ_FOREACH(i, &fw_boot_order, link) { + if ((i->dev->id && dev->id && + !strcmp(i->dev->id, dev->id)) || + (!i->dev->id && is_same_fw_dev_path(i->dev, dev))) { + QTAILQ_REMOVE(&fw_boot_order, i, link); + g_free(i->suffix); + g_free(i); + + break; + } + } +} + void modify_boot_device_path(int32_t bootindex, DeviceState *dev, const char *suffix) { -- 1.7.12.4