|
|
@ -321,7 +321,6 @@ class VirtualBoxVM(BaseVM):
|
|
|
|
|
|
|
|
|
|
|
|
if self._linked_clone:
|
|
|
|
if self._linked_clone:
|
|
|
|
hdd_table = []
|
|
|
|
hdd_table = []
|
|
|
|
hdd_files_to_close = []
|
|
|
|
|
|
|
|
if os.path.exists(self.working_dir):
|
|
|
|
if os.path.exists(self.working_dir):
|
|
|
|
hdd_files = yield from self._get_all_hdd_files()
|
|
|
|
hdd_files = yield from self._get_all_hdd_files()
|
|
|
|
vm_info = yield from self._get_vm_info()
|
|
|
|
vm_info = yield from self._get_vm_info()
|
|
|
@ -332,7 +331,6 @@ class VirtualBoxVM(BaseVM):
|
|
|
|
port = match.group(2)
|
|
|
|
port = match.group(2)
|
|
|
|
device = match.group(3)
|
|
|
|
device = match.group(3)
|
|
|
|
if value in hdd_files:
|
|
|
|
if value in hdd_files:
|
|
|
|
hdd_files_to_close.append(value)
|
|
|
|
|
|
|
|
log.info("VirtualBox VM '{name}' [{id}] detaching HDD {controller} {port} {device}".format(name=self.name,
|
|
|
|
log.info("VirtualBox VM '{name}' [{id}] detaching HDD {controller} {port} {device}".format(name=self.name,
|
|
|
|
id=self.id,
|
|
|
|
id=self.id,
|
|
|
|
controller=controller,
|
|
|
|
controller=controller,
|
|
|
@ -353,12 +351,6 @@ class VirtualBoxVM(BaseVM):
|
|
|
|
log.info("VirtualBox VM '{name}' [{id}] unregistering".format(name=self.name, id=self.id))
|
|
|
|
log.info("VirtualBox VM '{name}' [{id}] unregistering".format(name=self.name, id=self.id))
|
|
|
|
yield from self.manager.execute("unregistervm", [self._name])
|
|
|
|
yield from self.manager.execute("unregistervm", [self._name])
|
|
|
|
|
|
|
|
|
|
|
|
for hdd_file in hdd_files_to_close:
|
|
|
|
|
|
|
|
log.info("VirtualBox VM '{name}' [{id}] closing disk {disk}".format(name=self.name,
|
|
|
|
|
|
|
|
id=self.id,
|
|
|
|
|
|
|
|
disk=os.path.basename(hdd_file)))
|
|
|
|
|
|
|
|
yield from self.manager.execute("closemedium", ["disk", hdd_file])
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if hdd_table:
|
|
|
|
if hdd_table:
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
hdd_info_file = os.path.join(self.working_dir, self._vmname, "hdd_info.json")
|
|
|
|
hdd_info_file = os.path.join(self.working_dir, self._vmname, "hdd_info.json")
|
|
|
|