Hi, This is my take at salvaging some NEMU good work. Samuel worked in adding the fw_cfg device to the x86-virt NEMU machine. This series is inspired by NEMU's commit 3cb92d080835 [*] and adapted to upstream style. The result makes the upstream codebase more modularizable. There are very little logical changes, this is mostly a cleanup refactor. Since v1: - Addressed Li and MST comments $ git backport-diff -u v1 Key: [----] : patches are identical [####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively 001/20:[----] [-C] 'hw/i386/pc: Use unsigned type to index arrays' 002/20:[----] [-C] 'hw/i386/pc: Use size_t type to hold/return a size of array' 003/20:[----] [--] 'hw/i386/pc: Let e820_add_entry() return a ssize_t type' 004/20:[0008] [FC] 'hw/i386/pc: Add the E820Type enum type' 005/20:[----] [-C] 'hw/i386/pc: Add documentation to the e820_*() functions' 006/20:[----] [--] 'hw/i386/pc: Use e820_get_num_entries() to access e820_entries' 007/20:[0016] [FC] 'hw/i386/pc: Extract e820 memory layout code' 008/20:[----] [--] 'hw/i386/pc: Use address_space_memory in place' 009/20:[down] 'hw/i386/pc: Rename bochs_bios_init as more generic fw_cfg_arch_create' 010/20:[0009] [FC] 'hw/i386/pc: Pass the boot_cpus value by argument' 011/20:[0010] [FC] 'hw/i386/pc: Pass the apic_id_limit value by argument' 012/20:[0009] [FC] 'hw/i386/pc: Pass the CPUArchIdList array by argument' 013/20:[0008] [FC] 'hw/i386/pc: Let fw_cfg_init() use the generic MachineState' 014/20:[----] [--] 'hw/i386/pc: Let pc_build_smbios() take a FWCfgState argument' 015/20:[----] [--] 'hw/i386/pc: Let pc_build_smbios() take a generic MachineState argument' 016/20:[----] [--] 'hw/i386/pc: Rename pc_build_smbios() as generic fw_cfg_build_smbios()' 017/20:[----] [--] 'hw/i386/pc: Let pc_build_feature_control() take a FWCfgState argument' 018/20:[----] [--] 'hw/i386/pc: Let pc_build_feature_control() take a MachineState argument' 019/20:[----] [--] 'hw/i386/pc: Rename pc_build_feature_control() as generic fw_cfg_build_*' 020/20:[0132] [FC] 'hw/i386/pc: Extract the x86 generic fw_cfg code' Do you want to view the diffs using meld? y/[n]: Regards, Phil. [*] https://github.com/intel/nemu/commit/3cb92d080835ac8d47c8b713156338afa33cff5c Philippe Mathieu-Daudé (20): hw/i386/pc: Use unsigned type to index arrays hw/i386/pc: Use size_t type to hold/return a size of array hw/i386/pc: Let e820_add_entry() return a ssize_t type hw/i386/pc: Add the E820Type enum type hw/i386/pc: Add documentation to the e820_*() functions hw/i386/pc: Use e820_get_num_entries() to access e820_entries hw/i386/pc: Extract e820 memory layout code hw/i386/pc: Use address_space_memory in place hw/i386/pc: Rename bochs_bios_init as more generic fw_cfg_arch_create hw/i386/pc: Pass the boot_cpus value by argument hw/i386/pc: Pass the apic_id_limit value by argument hw/i386/pc: Pass the CPUArchIdList array by argument hw/i386/pc: Let fw_cfg_init() use the generic MachineState hw/i386/pc: Let pc_build_smbios() take a FWCfgState argument hw/i386/pc: Let pc_build_smbios() take a generic MachineState argument hw/i386/pc: Rename pc_build_smbios() as generic fw_cfg_build_smbios() hw/i386/pc: Let pc_build_feature_control() take a FWCfgState argument hw/i386/pc: Let pc_build_feature_control() take a MachineState argument hw/i386/pc: Rename pc_build_feature_control() as generic fw_cfg_build_* hw/i386/pc: Extract the x86 generic fw_cfg code hw/i386/Makefile.objs | 2 +- hw/i386/e820_memory_layout.c | 60 +++++++++++ hw/i386/e820_memory_layout.h | 76 +++++++++++++ hw/i386/fw_cfg.c | 137 ++++++++++++++++++++++++ hw/i386/fw_cfg.h | 8 ++ hw/i386/pc.c | 201 ++--------------------------------- include/hw/i386/pc.h | 11 -- target/i386/kvm.c | 1 + 8 files changed, 291 insertions(+), 205 deletions(-) create mode 100644 hw/i386/e820_memory_layout.c create mode 100644 hw/i386/e820_memory_layout.h -- 2.20.1
