On Wed, 28 Nov 2018 at 03:50, Peng Hao <peng.h...@zte.com.cn> wrote: > > Add configure interface for pvpanic-mmio. In qemu command line > use -device pvpanic-mmio to enable the device. > > Signed-off-by: Peng Hao <peng.h...@zte.com.cn> > --- > hw/arm/virt-acpi-build.c | 5 ++++- > hw/arm/virt.c | 7 +++---- > hw/misc/pvpanic.c | 1 + > 3 files changed, 8 insertions(+), 5 deletions(-)
> @@ -1330,6 +1328,9 @@ void virt_machine_done(Notifier *notifier, void *data) > struct arm_boot_info *info = &vms->bootinfo; > AddressSpace *as = arm_boot_address_space(cpu, info); > > + if (pvpanic_mmio()) { > + create_pvpanic_device(vms); > + } > /* > * If the user provided a dtb, we assume the dynamic sysbus nodes > * already are integrated there. This corresponds to a use case where > @@ -1551,8 +1552,6 @@ static void machvirt_init(MachineState *machine) > > create_flash(vms, sysmem, secure_sysmem ? secure_sysmem : sysmem); > > - create_pvpanic_device(vms); > - Please don't make changes in on patch of a patchset and then undo them in a later patch. It makes the patchset harder to read and review. thanks -- PMM