<refactor>[kvm]: reorganize vm host file management packages

Move common vm host file classes from efi to vmfiles package
Move message classes to message subdirectories
Update all import statements to reference new package paths
Update Spring configuration files with new class locations
Update test configuration files to match new package paths

Related: ZSV-11310

Change-Id: I7362626862666d717265766979786b687270776d

Author: Zhang Wenhao

conf/springConfigXml/Kvm.xml

@@ -279,7 +279,7 @@
         </zstack:plugin>
     </bean>
 
-    <bean id="VmHostFileTracker" class="org.zstack.kvm.efi.VmHostFileTracker">
+    <bean id="VmHostFileTracker" class="org.zstack.kvm.vmfiles.VmHostFileTracker">
         <zstack:plugin>
             <zstack:extension interface="org.zstack.header.Component"/>
         </zstack:plugin>

plugin/kvm/src/main/java/org/zstack/kvm/efi/KvmSecureBootExtensions.java

@@ -62,6 +62,7 @@
 import org.zstack.kvm.KvmCommandSender;
 import org.zstack.kvm.KvmResponseWrapper;
 import org.zstack.kvm.VolumeTO;
+import org.zstack.kvm.vmfiles.message.SyncVmHostFilesFromHostMsg;
 import org.zstack.resourceconfig.ResourceConfig;
 import org.zstack.resourceconfig.ResourceConfigFacade;
 import org.zstack.utils.Utils;

plugin/kvm/src/main/java/org/zstack/kvm/efi/KvmSecureBootManager.java

@@ -47,6 +47,14 @@
 import org.zstack.kvm.KVMConstant;
 import org.zstack.kvm.KvmCommandSender;
 import org.zstack.kvm.KvmResponseWrapper;
+import org.zstack.kvm.vmfiles.message.BackupVmHostFileMsg;
+import org.zstack.kvm.vmfiles.message.BackupVmHostFileOnHypervisorMsg;
+import org.zstack.kvm.vmfiles.message.BackupVmHostFileOnHypervisorReply;
+import org.zstack.kvm.vmfiles.message.BackupVmHostFileReply;
+import org.zstack.kvm.vmfiles.message.CloneVmHostFileMsg;
+import org.zstack.kvm.vmfiles.message.CloneVmHostFileReply;
+import org.zstack.kvm.vmfiles.message.SyncVmHostFilesFromHostMsg;
+import org.zstack.kvm.vmfiles.message.SyncVmHostFilesFromHostReply;
 import org.zstack.resourceconfig.ResourceConfig;
 import org.zstack.resourceconfig.ResourceConfigFacade;
 import org.zstack.utils.DebugUtils;

plugin/kvm/src/main/java/org/zstack/kvm/efi/KvmVmHostFileFactory.java

@@ -4,6 +4,8 @@
 import org.zstack.header.vm.additions.VmHostFileVO;
 import org.zstack.kvm.tpm.TpmStateVmHostBackupFileBase;
 import org.zstack.kvm.tpm.TpmStateVmHostFileBase;
+import org.zstack.kvm.vmfiles.AbstractVmHostBackupFileBase;
+import org.zstack.kvm.vmfiles.AbstractVmHostFileBase;
 
 import static org.zstack.core.Platform.operr;
 

plugin/kvm/src/main/java/org/zstack/kvm/efi/NvRamVmHostBackupFileBase.java

@@ -2,6 +2,7 @@
 
 import org.zstack.header.vm.additions.VmHostBackupFileVO;
 import org.zstack.header.vm.additions.VmHostFileType;
+import org.zstack.kvm.vmfiles.AbstractVmHostBackupFileBase;
 
 public class NvRamVmHostBackupFileBase extends AbstractVmHostBackupFileBase {
     public NvRamVmHostBackupFileBase(VmHostBackupFileVO self) {

plugin/kvm/src/main/java/org/zstack/kvm/efi/NvRamVmHostFileBase.java

@@ -2,6 +2,7 @@
 
 import org.zstack.header.vm.additions.VmHostFileType;
 import org.zstack.header.vm.additions.VmHostFileVO;
+import org.zstack.kvm.vmfiles.AbstractVmHostFileBase;
 
 public class NvRamVmHostFileBase extends AbstractVmHostFileBase {
     public NvRamVmHostFileBase(VmHostFileVO self) {

plugin/kvm/src/main/java/org/zstack/kvm/tpm/KvmTpmManager.java

@@ -53,6 +53,8 @@
 import org.zstack.header.vm.additions.VmHostFileType;
 import org.zstack.header.vm.additions.VmHostFileVO;
 import org.zstack.header.vm.additions.VmHostFileVO_;
+import org.zstack.kvm.tpm.message.CloneVmTpmMsg;
+import org.zstack.kvm.tpm.message.CloneVmTpmReply;
 import org.zstack.resourceconfig.ResourceConfig;
 import org.zstack.resourceconfig.ResourceConfigFacade;
 import org.zstack.utils.CollectionUtils;

plugin/kvm/src/main/java/org/zstack/kvm/tpm/TpmStateVmHostBackupFileBase.java

@@ -9,7 +9,7 @@
 import org.zstack.header.vm.additions.VmHostFileType;
 import org.zstack.header.vm.additions.VmHostFileVO;
 import org.zstack.kvm.KVMSystemTags;
-import org.zstack.kvm.efi.AbstractVmHostBackupFileBase;
+import org.zstack.kvm.vmfiles.AbstractVmHostBackupFileBase;
 import org.zstack.tag.SystemTagCreator;
 import org.zstack.utils.Utils;
 import org.zstack.utils.logging.CLogger;

plugin/kvm/src/main/java/org/zstack/kvm/tpm/TpmStateVmHostFileBase.java

@@ -2,7 +2,7 @@
 
 import org.zstack.header.vm.additions.VmHostFileType;
 import org.zstack.header.vm.additions.VmHostFileVO;
-import org.zstack.kvm.efi.AbstractVmHostFileBase;
+import org.zstack.kvm.vmfiles.AbstractVmHostFileBase;
 
 public class TpmStateVmHostFileBase extends AbstractVmHostFileBase {
     public TpmStateVmHostFileBase(VmHostFileVO self) {

…va/org/zstack/kvm/tpm/CloneVmTpmMsg.java …stack/kvm/tpm/message/CloneVmTpmMsg.javaplugin/kvm/src/main/java/org/zstack/kvm/tpm/CloneVmTpmMsg.java renamed to plugin/kvm/src/main/java/org/zstack/kvm/tpm/message/CloneVmTpmMsg.java plugin/kvm/src/main/java/org/zstack/kvm/tpm/CloneVmTpmMsg.java renamed to plugin/kvm/src/main/java/org/zstack/kvm/tpm/message/CloneVmTpmMsg.java

@@ -1,4 +1,4 @@
-package org.zstack.kvm.tpm;
+package org.zstack.kvm.tpm.message;
 
 import org.zstack.header.message.NeedReplyMessage;