China called for an end to conflict in the Gulf and said the safety of waterways should not be disturbed on Thursday, adding that it was ready to work with Southeast Asia to address energy shortages as oil markets reel from supply shocks.