From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NALIp-0003XF-BO for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:28:51 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NALIk-0003W7-BC for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:28:50 -0500 Received: from [199.232.76.173] (port=55245 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NALIk-0003W1-2N for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:28:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34099) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NALIj-00008E-Mx for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:28:45 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAHASit2027666 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 17 Nov 2009 05:28:45 -0500 From: Gerd Hoffmann Date: Tue, 17 Nov 2009 11:28:41 +0100 Message-Id: <1258453721-4530-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH] isa: configure serial+parallel by index. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 --- 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), -- 1.6.2.5