Xi Jinping warns against great-power conflict in the Gulf as China, Oman eye trade pact