am ccddc498: Merge "x86_64: Fix 079-Phantom hang with QCG enabled"

* commit 'ccddc49852a69094aecf9eb7c7de67a9c2c5c31a':
  x86_64: Fix 079-Phantom hang with QCG enabled