6 more pre-patches relating to CPUState

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>