hw/i386: changes towards enabling -Wshadow=local for x86 machines