diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2013-11-22 10:27:40 +0100 |
---|---|---|
committer | Alexander Graf <agraf@suse.de> | 2013-12-20 01:58:02 +0100 |
commit | 3978b863a5d8ac1c02848bf57d0a7f7067826a8a (patch) | |
tree | f9f312181986fe127d2971a9a91eeae13151904c | |
parent | 8a0e11045d5f50d300e0ab1ba05f4c8217fb5dcb (diff) |
spapr: tie spapr-nvram to -pflash
spapr-nvram's drive property is currently connected to a non-existent
"-machine nvram=<drivename>" option. Instead, tie it to -pflash like
other non-volatile RAM devices. This provides the following possibilities
for adding a backend for the sPAPR non-volatile RAM:
* -pflash filename
* -drive if=pflash,file=filename,format=raw,...
* -drive if=none,file=filename,format=raw,id=foo,... -global spapr-nvram.drive=foo
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
-rw-r--r-- | hw/ppc/spapr.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 7e53a5f977..38b43c9d82 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -739,18 +739,10 @@ static void spapr_cpu_reset(void *opaque) static void spapr_create_nvram(sPAPREnvironment *spapr) { DeviceState *dev = qdev_create(&spapr->vio_bus->bus, "spapr-nvram"); - const char *drivename = qemu_opt_get(qemu_get_machine_opts(), "nvram"); + DriveInfo *dinfo = drive_get(IF_PFLASH, 0, 0); - if (drivename) { - BlockDriverState *bs; - - bs = bdrv_find(drivename); - if (!bs) { - fprintf(stderr, "No such block device \"%s\" for nvram\n", - drivename); - exit(1); - } - qdev_prop_set_drive_nofail(dev, "drive", bs); + if (dinfo) { + qdev_prop_set_drive_nofail(dev, "drive", dinfo->bdrv); } qdev_init_nofail(dev); |