YVR-XMN-KMG-DMK Do I need a visa?

Hi,

I'm a Canadian flying from YVR-XMN-KMG-DMKin December. My stopover in XMN is 2.5 hours and I will not leave the airport. My stopover in KMG is 26 hours and I plan to leave the airport. My total time in China from the time that I land in XMN to the time that I depart from KMG will be 32 hours. Will I need a entry permit?

Thanks,

Tú