Macron and Xi talk trade in Paris amid efforts to ease subsidy spat