Commit 695e2fc2 authored by Peter Maydell's avatar Peter Maydell Committed by Paolo Bonzini
Browse files

hw/nvram/fw_cfg: Use memberwise copy of MemoryRegionOps struct 



We've now removed the 'old_mmio' member from MemoryRegionOps,
so we can perform the copy as a simple struct copy rather
than having to do it via a memberwise copy.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-Id: <20180824170422.5783-3-peter.maydell@linaro.org>
Based-on: <20180802174042.29234-1-peter.maydell@linaro.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 62a0db94

hw/nvram/fw_cfg.c

+1 −6
Original line number Diff line number Diff line
@@ -1115,12 +1115,7 @@ static void fw_cfg_mem_realize(DeviceState *dev, Error **errp) 
    sysbus_init_mmio(sbd, &s->ctl_iomem);



    if (s->data_width > data_ops->valid.max_access_size) {

        /* memberwise copy because the "old_mmio" member is const */

        s->wide_data_ops.read       = data_ops->read;

        s->wide_data_ops.write      = data_ops->write;

        s->wide_data_ops.endianness = data_ops->endianness;

        s->wide_data_ops.valid      = data_ops->valid;

        s->wide_data_ops.impl       = data_ops->impl;

        s->wide_data_ops = *data_ops;



        s->wide_data_ops.valid.max_access_size = s->data_width;

        s->wide_data_ops.impl.max_access_size  = s->data_width;