From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:58111) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUhGJ-0001gv-1l for qemu-devel@nongnu.org; Thu, 09 Jun 2011 11:35:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QUhGF-00036S-3x for qemu-devel@nongnu.org; Thu, 09 Jun 2011 11:35:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47240) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUhGE-00035q-Ij for qemu-devel@nongnu.org; Thu, 09 Jun 2011 11:35:06 -0400 From: Markus Armbruster References: <4DEF2F25.5070104@redhat.com> <1307559319-16183-1-git-send-email-andreas.faerber@web.de> <1307559319-16183-2-git-send-email-andreas.faerber@web.de> <1307559319-16183-3-git-send-email-andreas.faerber@web.de> <1307559319-16183-4-git-send-email-andreas.faerber@web.de> <1307559319-16183-5-git-send-email-andreas.faerber@web.de> <1307559319-16183-6-git-send-email-andreas.faerber@web.de> <1307559319-16183-7-git-send-email-andreas.faerber@web.de> <1307559319-16183-8-git-send-email-andreas.faerber@web.de> Date: Thu, 09 Jun 2011 17:35:03 +0200 In-Reply-To: <1307559319-16183-8-git-send-email-andreas.faerber@web.de> ("Andreas =?utf-8?Q?F=C3=A4rber=22's?= message of "Wed, 8 Jun 2011 20:55:14 +0200") Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [RFC v4 07/12] serial: Implement ISA set_state() callback List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andreas =?utf-8?Q?F=C3=A4rber?= Cc: hpoussin@reactos.org, qemu-devel@nongnu.org, kraxel@redhat.com Andreas F=C3=A4rber writes: > Incorporate ISA VMState. Add "enabled" property. Could you explain why you need to stick VMSTATE_ISA_DEVICE_V() into vmstate_isa_serial, but not for the other devices? > > Signed-off-by: Andreas F=C3=A4rber > --- > hw/serial.c | 30 +++++++++++++++++++++++++----- > 1 files changed, 25 insertions(+), 5 deletions(-) > > diff --git a/hw/serial.c b/hw/serial.c > index 0ee61dd..a058cb6 100644 > --- a/hw/serial.c > +++ b/hw/serial.c > @@ -752,6 +752,26 @@ void serial_set_frequency(SerialState *s, uint32_t f= requency) > serial_update_parameters(s); > } >=20=20 > +static int serial_isa_statefn(ISADevice *dev, bool enabled) > +{ > + ISASerialState *isa =3D DO_UPCAST(ISASerialState, dev, dev); > + SerialState *s =3D &isa->state; > + > + if (enabled) { > + isa_init_irq(dev, &s->irq, isa->isairq); > + > + register_ioport_write(isa->iobase, 8, 1, serial_ioport_write, s); > + register_ioport_read(isa->iobase, 8, 1, serial_ioport_read, s); > + isa_init_ioport_range(dev, isa->iobase, 8); > + } else { > + isa_discard_irq(dev, isa->isairq); > + > + isa_discard_ioport_range(dev, isa->iobase, 8); > + isa_unassign_ioport(isa->iobase, 8); > + } > + return 0; > +} > + > static const int isa_serial_io[MAX_SERIAL_PORTS] =3D { 0x3f8, 0x2f8, 0x3= e8, 0x2e8 }; > static const int isa_serial_irq[MAX_SERIAL_PORTS] =3D { 4, 3, 4, 3 }; >=20=20 > @@ -772,21 +792,19 @@ static int serial_isa_initfn(ISADevice *dev) > index++; >=20=20 > s->baudbase =3D 115200; > - isa_init_irq(dev, &s->irq, isa->isairq); > serial_init_core(s); > qdev_set_legacy_instance_id(&dev->qdev, isa->iobase, 3); >=20=20 > - register_ioport_write(isa->iobase, 8, 1, serial_ioport_write, s); > - register_ioport_read(isa->iobase, 8, 1, serial_ioport_read, s); > - isa_init_ioport_range(dev, isa->iobase, 8); > + serial_isa_statefn(dev, true); > return 0; > } >=20=20 > static const VMStateDescription vmstate_isa_serial =3D { > .name =3D "serial", > - .version_id =3D 3, > + .version_id =3D 4, > .minimum_version_id =3D 2, > .fields =3D (VMStateField []) { > + VMSTATE_ISA_DEVICE_V(dev, ISASerialState, 4), > VMSTATE_STRUCT(state, ISASerialState, 0, vmstate_serial, SerialS= tate), > VMSTATE_END_OF_LIST() > } If I understand vmstate correctly, this breaks migration new -> old. Do we care? > @@ -962,11 +980,13 @@ static ISADeviceInfo serial_isa_info =3D { > .qdev.size =3D sizeof(ISASerialState), > .qdev.vmsd =3D &vmstate_isa_serial, > .init =3D serial_isa_initfn, > + .set_state =3D serial_isa_statefn, > .qdev.props =3D (Property[]) { > DEFINE_PROP_UINT32("index", ISASerialState, index, -1), > DEFINE_PROP_HEX32("iobase", ISASerialState, iobase, -1), > DEFINE_PROP_UINT32("irq", ISASerialState, isairq, -1), > DEFINE_PROP_CHR("chardev", ISASerialState, state.chr), > + DEFINE_PROP_BOOL("enabled", ISASerialState, dev.enabled, true), > DEFINE_PROP_END_OF_LIST(), > }, > };