Re: [Qemu-ppc] [PATCH for-1.7] spapr: tie spapr-nvram to -pflash

[Alexander Graf]

> Am 22.11.2013 um 10:27 schrieb Paolo Bonzini <address@hidden>:
> 
> 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 <address@hidden>

Makes sense, but why for 1.7?

Alex

> ---
> hw/ppc/spapr.c | 14 +++-----------
> 1 file changed, 3 insertions(+), 11 deletions(-)
> 
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 7e53a5f..38b43c9 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);
> -- 
> 1.8.4.2
>