qemu-kvm: Remove some spurious diffs to upstream