target/s390x: use "core-id" for cpu number/address/id handling