| Message ID | 1258453721-4530-1-git-send-email-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
Gerd Hoffmann <kraxel@redhat.com> writes: > This patch adds a 'index' property to the isa-parallel and isa-serial > devices. This can be used to create devices with the default isa irqs > and ioports by simply specifying the index, i.e. > > -device isa-serial,index=1 > > instead of > > -device isa-serial,iobase=0x2f8,irq=3 > > for ttyS1 aka com2. Likewise for parallel ports. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > hw/parallel.c | 2 +- > hw/serial.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/parallel.c b/hw/parallel.c > index 5ae8348..12693d4 100644 > --- a/hw/parallel.c > +++ b/hw/parallel.c > @@ -587,7 +587,7 @@ static ISADeviceInfo parallel_isa_info = { > .qdev.size = sizeof(ISAParallelState), > .init = parallel_isa_initfn, > .qdev.props = (Property[]) { > - DEFINE_PROP_HEX32("index", ISAParallelState, index, -1), > + DEFINE_PROP_UINT32("index", ISAParallelState, index, -1), > DEFINE_PROP_HEX32("iobase", ISAParallelState, iobase, -1), > DEFINE_PROP_UINT32("irq", ISAParallelState, isairq, 7), > DEFINE_PROP_CHR("chardev", ISAParallelState, state.chr), > diff --git a/hw/serial.c b/hw/serial.c > index 0063260..e7538ac 100644 > --- a/hw/serial.c > +++ b/hw/serial.c > @@ -900,7 +900,7 @@ static ISADeviceInfo serial_isa_info = { > .qdev.size = sizeof(ISASerialState), > .init = serial_isa_initfn, > .qdev.props = (Property[]) { > - DEFINE_PROP_HEX32("index", ISASerialState, index, -1), > + 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), The commit message is bogus. The patch is a minor fix of commit e8ee28fb, and the message is a copy of that commit's message.
Markus Armbruster wrote: > The commit message is bogus. The patch is a minor fix of commit > e8ee28fb, and the message is a copy of that commit's message. > Thanks, I've updated the commit message appropriately. Regards, Anthony Liguori
diff --git a/hw/parallel.c b/hw/parallel.c index 5ae8348..12693d4 100644 --- a/hw/parallel.c +++ b/hw/parallel.c @@ -587,7 +587,7 @@ static ISADeviceInfo parallel_isa_info = { .qdev.size = sizeof(ISAParallelState), .init = parallel_isa_initfn, .qdev.props = (Property[]) { - DEFINE_PROP_HEX32("index", ISAParallelState, index, -1), + DEFINE_PROP_UINT32("index", ISAParallelState, index, -1), DEFINE_PROP_HEX32("iobase", ISAParallelState, iobase, -1), DEFINE_PROP_UINT32("irq", ISAParallelState, isairq, 7), DEFINE_PROP_CHR("chardev", ISAParallelState, state.chr), diff --git a/hw/serial.c b/hw/serial.c index 0063260..e7538ac 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -900,7 +900,7 @@ static ISADeviceInfo serial_isa_info = { .qdev.size = sizeof(ISASerialState), .init = serial_isa_initfn, .qdev.props = (Property[]) { - DEFINE_PROP_HEX32("index", ISASerialState, index, -1), + 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),
This patch adds a 'index' property to the isa-parallel and isa-serial devices. This can be used to create devices with the default isa irqs and ioports by simply specifying the index, i.e. -device isa-serial,index=1 instead of -device isa-serial,iobase=0x2f8,irq=3 for ttyS1 aka com2. Likewise for parallel ports. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- hw/parallel.c | 2 +- hw/serial.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)