Merge pull request #6879 from openanolis/chao/update_upstream_upcall_feature

Dragonball: optimize the placement of dbs-upcall features

src/dragonball/src/api/v1/vmm_action.rs

@@ -692,6 +692,7 @@ impl VmmService {
             ));
         }
 
+        #[cfg(feature = "dbs-upcall")]
         vm.resize_vcpu(config, None).map_err(|e| {
             if let VcpuResizeError::UpcallServerNotReady = e {
                 return VmmActionError::UpcallServerNotReady;

src/dragonball/src/vm/mod.rs

@@ -763,7 +763,6 @@ impl Vm {
 impl Vm {
     #[cfg(feature = "dbs-upcall")]
     /// initialize upcall client for guest os
-    #[cfg(feature = "dbs-upcall")]
     fn new_upcall(&mut self) -> std::result::Result<(), StartMicroVmError> {
         // get vsock inner connector for upcall
         let inner_connector = self
@@ -805,7 +804,6 @@ impl Vm {
 
     #[cfg(feature = "dbs-upcall")]
     /// Get upcall client.
-    #[cfg(feature = "dbs-upcall")]
     pub fn upcall_client(&self) -> &Option<Arc<UpcallClient<DevMgrService>>> {
         &self.upcall_client
     }
@@ -825,7 +823,7 @@ impl Vm {
     }
 
     /// Resize MicroVM vCPU number
-    #[cfg(feature = "hotplug")]
+    #[cfg(feature = "dbs-upcall")]
     pub fn resize_vcpu(
         &mut self,
         config: VcpuResizeInfo,