refactory/qmp: Split qmp into multi mod

Split qmp into channel, response, schema and scoket.

Signed-off-by: Keqian Zhu <[email protected]>

Author: Keqian Zhu

cpu/src/lib.rs

@@ -72,7 +72,7 @@ use vmm_sys_util::signal::{register_signal_handler, Killable};
 use machine_manager::config::ShutdownAction::{ShutdownActionPause, ShutdownActionPoweroff};
 use machine_manager::event;
 use machine_manager::machine::MachineInterface;
-use machine_manager::{qmp::qmp_schema, qmp::QmpChannel};
+use machine_manager::qmp::{qmp_channel::QmpChannel, qmp_schema};
 #[cfg(not(test))]
 use util::test_helper::is_test_enabled;
 #[cfg(target_arch = "x86_64")]

devices/src/acpi/ged.rs

@@ -32,7 +32,7 @@ use acpi::{
 use address_space::GuestAddress;
 use machine_manager::event;
 use machine_manager::event_loop::EventLoop;
-use machine_manager::qmp::QmpChannel;
+use machine_manager::qmp::qmp_channel::QmpChannel;
 use util::loop_context::{read_fd, EventNotifier, NotifierOperation};
 use util::{loop_context::NotifierCallback, num_ops::write_data_u32};
 

devices/src/pci/root_port.rs

@@ -39,7 +39,7 @@ use crate::pci::{
 };
 use crate::{Device, DeviceBase};
 use address_space::Region;
-use machine_manager::qmp::send_device_deleted_msg;
+use machine_manager::qmp::qmp_channel::send_device_deleted_msg;
 use migration::{
     DeviceStateDesc, FieldDesc, MigrationError, MigrationHook, MigrationManager, StateTransfer,
 };

devices/src/usb/mod.rs

@@ -40,7 +40,7 @@ use self::descriptor::USB_MAX_INTERFACES;
 use crate::{Device, DeviceBase};
 use config::*;
 use descriptor::{UsbDescriptor, UsbDescriptorOps};
-use machine_manager::qmp::send_device_deleted_msg;
+use machine_manager::qmp::qmp_channel::send_device_deleted_msg;
 use util::aio::{mem_from_buf, mem_to_buf, Iovec};
 use util::byte_code::ByteCode;
 use xhci::xhci_controller::{UsbPort, XhciDevice};

machine/src/micro_vm/mod.rs

@@ -71,21 +71,19 @@ use devices::sysbus::{SysBusDevType, SysRes};
 use devices::{ICGICConfig, ICGICv2Config, ICGICv3Config, InterruptController, GIC_IRQ_MAX};
 #[cfg(target_arch = "x86_64")]
 use hypervisor::kvm::KVM_FDS;
-use machine_manager::config::DiskFormat;
+use machine_manager::config::{
+    parse_blk, parse_incoming_uri, parse_net, BlkDevConfig, BootSource, ConfigCheck, DiskFormat,
+    DriveFile, Incoming, MigrateMode, NetworkInterfaceConfig, NumaNodes, SerialConfig, VmConfig,
+    DEFAULT_VIRTQUEUE_SIZE,
+};
+use machine_manager::event;
 use machine_manager::event_loop::EventLoop;
-use machine_manager::qmp::qmp_schema::UpdateRegionArgument;
-use machine_manager::{
-    config::{
-        parse_blk, parse_incoming_uri, parse_net, BlkDevConfig, BootSource, ConfigCheck, DriveFile,
-        Incoming, MigrateMode, NetworkInterfaceConfig, NumaNodes, SerialConfig, VmConfig,
-        DEFAULT_VIRTQUEUE_SIZE,
-    },
-    event,
-    machine::{
-        DeviceInterface, KvmVmState, MachineAddressInterface, MachineExternalInterface,
-        MachineInterface, MachineLifecycle, MigrateInterface,
-    },
-    qmp::{qmp_schema, QmpChannel, Response},
+use machine_manager::machine::{
+    DeviceInterface, KvmVmState, MachineAddressInterface, MachineExternalInterface,
+    MachineInterface, MachineLifecycle, MigrateInterface,
+};
+use machine_manager::qmp::{
+    qmp_channel::QmpChannel, qmp_response::Response, qmp_schema, qmp_schema::UpdateRegionArgument,
 };
 use mem_layout::{LayoutEntryType, MEM_LAYOUT};
 use migration::{MigrationManager, MigrationStatus};

machine/src/standard_vm/aarch64/mod.rs

@@ -70,7 +70,7 @@ use machine_manager::machine::{
     KvmVmState, MachineAddressInterface, MachineExternalInterface, MachineInterface,
     MachineLifecycle, MachineTestInterface, MigrateInterface,
 };
-use machine_manager::qmp::{qmp_schema, QmpChannel, Response};
+use machine_manager::qmp::{qmp_channel::QmpChannel, qmp_response::Response, qmp_schema};
 use migration::{MigrationManager, MigrationStatus};
 use pci_host_root::PciHostRoot;
 use syscall::syscall_whitelist;

machine/src/standard_vm/mod.rs

@@ -69,7 +69,7 @@ use machine_manager::event_loop::EventLoop;
 use machine_manager::machine::MachineLifecycle;
 use machine_manager::machine::{DeviceInterface, KvmVmState};
 use machine_manager::qmp::qmp_schema::{BlockDevAddArgument, UpdateRegionArgument};
-use machine_manager::qmp::{qmp_schema, QmpChannel, Response};
+use machine_manager::qmp::{qmp_channel::QmpChannel, qmp_response::Response, qmp_schema};
 use migration::MigrationManager;
 use ui::input::{key_event, point_event};
 #[cfg(feature = "vnc")]

machine/src/standard_vm/x86_64/mod.rs

@@ -58,7 +58,7 @@ use machine_manager::machine::{
     KvmVmState, MachineAddressInterface, MachineExternalInterface, MachineInterface,
     MachineLifecycle, MachineTestInterface, MigrateInterface,
 };
-use machine_manager::qmp::{qmp_schema, QmpChannel, Response};
+use machine_manager::qmp::{qmp_channel::QmpChannel, qmp_response::Response, qmp_schema};
 use mch::Mch;
 use migration::{MigrationManager, MigrationStatus};
 use syscall::syscall_whitelist;

machine_manager/src/config/network.rs

@@ -21,7 +21,7 @@ use crate::config::{
     check_arg_too_long, CmdParser, ConfigCheck, ExBool, VmConfig, DEFAULT_VIRTQUEUE_SIZE,
     MAX_PATH_LENGTH, MAX_VIRTIO_QUEUE,
 };
-use crate::qmp::{qmp_schema, QmpChannel};
+use crate::qmp::{qmp_channel::QmpChannel, qmp_schema};
 
 const MAC_ADDRESS_LENGTH: usize = 17;
 

machine_manager/src/machine.rs

@@ -17,14 +17,14 @@ use once_cell::sync::Lazy;
 use strum::VariantNames;
 
 use crate::config::ShutdownAction;
+use crate::qmp::qmp_response::{Response, Version};
 use crate::qmp::qmp_schema::{
     BlockDevAddArgument, BlockdevSnapshotInternalArgument, CameraDevAddArgument,
     CharDevAddArgument, ChardevInfo, Cmd, CmdLine, CmdParameter, DeviceAddArgument, DeviceProps,
     Events, GicCap, HumanMonitorCmdArgument, IothreadInfo, KvmInfo, MachineInfo,
     MigrateCapabilities, NetDevAddArgument, PropList, QmpCommand, QmpErrorClass, QmpEvent, Target,
     TypeLists, UpdateRegionArgument,
 };
-use crate::qmp::{Response, Version};
 
 #[derive(Clone)]
 pub struct PathInfo {