Merge remote-tracking branch 'kwolf/for-anthony' into staging

diff --cc hw/pflash_cfi01.c
Simple merge

diff --cc hw/pflash_cfi02.c
index 4dbec8721ea9e9cd89106fbb69b5774a1b3e39b5,919cfc466f35a356695ca49336972d1a4ab8e452..e5a63da595b8819a84ab2db06fd7cbe1e1793b39
--- 1/hw/pflash_cfi02.c
--- 2/hw/pflash_cfi02.c
+++ b/hw/pflash_cfi02.c
@@@ -641,10 -642,9 +641,11 @@@ pflash_t *pflash_cfi02_register(target_
              g_free(pfl);
              return NULL;
          }
+         bdrv_attach_dev_nofail(pfl->bs, pfl);
      }
 +    pflash_setup_mappings(pfl);
 +    pfl->rom_mode = 1;
 +    memory_region_add_subregion(get_system_memory(), pfl->base, &pfl->mem);
  #if 0 /* XXX: there should be a bit to set up read-only,
         *      the same way the hardware does (with WP pin).
         */