[PATCH 0/2] qemu: Build fixes following merge of mapped-ram