This patch is very different from v1. I sent a v2 to Aline to test, but she found a problem with iSCSI, which Royce provided a fix for. v1 : Change the way storage is represented (as volumes). v1->v2: - Royce pointed out that the concept of a volume was a new feature to libvirt, and after some investigation I found that this would break kimchi on RHEL 6. - I changed from using the pool:vol label to identify storage to using the path alone. This will make it easier to track disks not in pools. v2->v3: - Rebase and fixed conflicts - Add ref_cnt checking on update. This problem was found by the model test that ejects a CD ROM, leaving a blank 'path' element in the XML. - Resolve issue with circular include of [s,g]et_ref_cnt functions in both vmstorages.py and storagevolumes.py by creating a new diskutils module. Christy Perez (1): Prevent disks from being added twice src/kimchi/model/diskutils.py | 75 ++++++++++++++++++++++++++++++++++++++ src/kimchi/model/storagevolumes.py | 51 +++++++++----------------- src/kimchi/model/vmstorages.py | 70 +++++++++++++++++++++++++++++++---- 3 files changed, 154 insertions(+), 42 deletions(-) create mode 100644 src/kimchi/model/diskutils.py -- 1.9.3