Skip to content

Commit 8a94dcb

Browse files
committed
fix minor cherry pick error
1 parent e8e5820 commit 8a94dcb

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

plugins/hypervisors/simulator/src/main/java/com/cloud/simulator/SimulatorGuru.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import com.cloud.vm.VirtualMachineProfile;
3939
import com.cloud.vm.dao.VMInstanceDao;
4040
import com.cloud.vm.dao.NicDao;
41+
import org.apache.cloudstack.backup.BackupProvider;
4142

4243
public class SimulatorGuru extends HypervisorGuruBase implements HypervisorGuru {
4344
@Inject
@@ -74,7 +75,7 @@ public VirtualMachineTO implement(VirtualMachineProfile vm) {
7475

7576
@Override
7677
public VirtualMachine importVirtualMachineFromBackup(long zoneId, long domainId, long accountId, long userId,
77-
String vmInternalName, Backup backup) {
78+
String vmInternalName, Backup backup, BackupProvider backupProvider) {
7879
VMInstanceVO vm = instanceDao.findVMByInstanceNameIncludingRemoved(vmInternalName);
7980
if (vm.getRemoved() != null) {
8081
vm.setState(VirtualMachine.State.Stopped);
@@ -92,7 +93,7 @@ public VirtualMachine importVirtualMachineFromBackup(long zoneId, long domainId,
9293
}
9394

9495
@Override
95-
public boolean attachRestoredVolumeToVirtualMachine(long zoneId, String location, Backup.VolumeInfo volumeInfo, VirtualMachine vm, long poolId, Backup backup) {
96+
public boolean attachRestoredVolumeToVirtualMachine(long zoneId, String location, Backup.VolumeInfo volumeInfo, VirtualMachine vm, long poolId, Backup backup, BackupProvider backupProvider) {
9697

9798
VMInstanceVO targetVM = instanceDao.findVMByInstanceNameIncludingRemoved(vm.getName());
9899
List<VolumeVO> vmVolumes = volumeDao.findByInstance(targetVM.getId());

0 commit comments

Comments
 (0)