Merge tag 'v2.0.2' into master

diff --cc hw/char/cadence_uart.c
Simple merge

diff --cc hw/i386/pc.c
Simple merge

diff --cc hw/i386/pc_piix.c
Simple merge

diff --cc hw/i386/pc_q35.c
Simple merge