This patch is being moved to the 5.2.0-1 QEMU configuration because the
Xilinx QEMU build uses the 5-1 configuration and this patch does not
apply to Xilinx's modified tree. This also adds a new patch that applies
correctly to Xilinx's modified QEMU tree.
Updates #4919