Am 18.03.2013 17:30, schrieb Peter Maydell: > In preparation for switching to vmstate for migration support, fix > the sizes of various GIC state fields. In particular, we replace all > the bitfields (which VMState can't deal with) with straightforward > uint8_t values which we do bit operations on. (The bitfields made > more sense when NCPU was set differently in different situations, > but we now always model at the architectural limit of 8.) > > Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> [...] > diff --git a/hw/armv7m_nvic.c b/hw/armv7m_nvic.c > index d198cfd..b2a7fb7 100644 > --- a/hw/armv7m_nvic.c > +++ b/hw/armv7m_nvic.c > @@ -458,10 +458,10 @@ static void armv7m_nvic_reset(DeviceState *dev) > * as enabled by default, and with a priority mask which allows > * all interrupts through. > */ > - s->gic.cpu_enabled[0] = 1; > + s->gic.cpu_enabled[0] = false;
true? Andreas > s->gic.priority_mask[0] = 0x100; > /* The NVIC as a whole is always enabled. */ > - s->gic.enabled = 1; > + s->gic.enabled = true; > systick_reset(s); > } > > -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
