Re: [libvirt] [PATCHv2 08/62] qemu: hotplug: consolidate media change code paths

Use qemuDomainAttachDeviceDiskLive to change the media in qemuDomainChangeDiskLive as the former function already does all the necessary steps to prepare the new medium. This also allows us to turn qemuDomainChangeEjectableMedia static. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_driver.c | 18 ++---------------- src/qemu/qemu_hotplug.c | 18 +++++++++++++++--- src/qemu/qemu_hotplug.h | 9 ++------- tests/qemuhotplugtest.c | 2 +- 4 files changed, 20 insertions(+), 27 deletions(-) @@ -7884,16 +7878,8 @@ qemuDomainChangeDiskLive(virDomainObjPtr vm, goto cleanup; } - /* Add the new disk src into shared disk hash table */ - if (qemuAddSharedDevice(driver, dev, vm->def->name) < 0) - goto cleanup; - - if (qemuDomainChangeEjectableMedia(driver, vm, orig_disk, - dev->data.disk->src, force) < 0) { - ignore_value(qemuRemoveSharedDisk(driver, dev->data.disk, - vm->def->name)); + if (qemuDomainAttachDeviceDiskLive(driver, vm, dev, force) < 0) goto cleanup; - } dev->data.disk->src = NULL;

}