From: Anthony Liguori <aliguori@us.ibm.com>
Date: Thu, 8 Sep 2011 14:05:14 +0000 (-0500)
Subject: Merge remote-tracking branch 'kwolf/for-anthony' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=220724ca4ada4e30bcfff326b62822a69c23e181;p=qemu.git

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

220724ca4ada4e30bcfff326b62822a69c23e181
diff --cc hw/pflash_cfi02.c
index 4dbec8721e,919cfc466f..e5a63da595
--- a/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).
         */