Because these 2 patches target to the same function, so put them together. Cao's patch is simply a copy of v3; Dou's patch is taken from AER series, rebase on Cao's, it would be no trouble letting it in first. Both have been reviewed.
v4 changelog: 1. simply put 2 reviewed patch into a series 2. rebase & add the reviewer's R-b. Test: 1. make check pass. 2. command line test with -device ioh3420,aer_log_max=0xffff/0/10/-1, the results meet the expectation. Cao jin (1): pcie_aer: Convert pcie_aer_init to Error Dou Liyang (1): pcie_aer: support configurable AER capa version hw/net/e1000e.c | 3 ++- hw/pci-bridge/ioh3420.c | 4 +++- hw/pci-bridge/xio3130_downstream.c | 4 +++- hw/pci-bridge/xio3130_upstream.c | 4 +++- hw/pci/pcie_aer.c | 19 ++++++++----------- include/hw/pci/pcie_aer.h | 4 ++-- 6 files changed, 21 insertions(+), 17 deletions(-) -- 2.1.0
