From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39165) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxzsu-0004T1-0B for qemu-devel@nongnu.org; Thu, 28 May 2015 11:38:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yxzst-0005A1-3X for qemu-devel@nongnu.org; Thu, 28 May 2015 11:38:15 -0400 From: Gerd Hoffmann Date: Thu, 28 May 2015 17:37:41 +0200 Message-Id: <1432827461-1117-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH] floppy: fix I/O ranges in both portio and acpi dsdt List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Eduardo Habkost , "open list:Floppy" , "Michael S. Tsirkin" , Gerd Hoffmann , Paolo Bonzini , John Snow , Richard Henderson Signed-off-by: Gerd Hoffmann --- hw/block/fdc.c | 2 +- hw/i386/acpi-dsdt-isa.dsl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index d8a8edd..c761291 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2186,7 +2186,7 @@ static void fdctrl_realize_common(FDCtrl *fdctrl, Error **errp) } static const MemoryRegionPortio fdc_portio_list[] = { - { 1, 5, 1, .read = fdctrl_read, .write = fdctrl_write }, + { 0, 6, 1, .read = fdctrl_read, .write = fdctrl_write }, { 7, 1, 1, .read = fdctrl_read, .write = fdctrl_write }, PORTIO_END_OF_LIST(), }; diff --git a/hw/i386/acpi-dsdt-isa.dsl b/hw/i386/acpi-dsdt-isa.dsl index 89caa16..f71d7df 100644 --- a/hw/i386/acpi-dsdt-isa.dsl +++ b/hw/i386/acpi-dsdt-isa.dsl @@ -58,7 +58,7 @@ Scope(\_SB.PCI0.ISA) { } } Name(_CRS, ResourceTemplate() { - IO(Decode16, 0x03F2, 0x03F2, 0x00, 0x04) + IO(Decode16, 0x03F0, 0x03F0, 0x00, 0x06) IO(Decode16, 0x03F7, 0x03F7, 0x00, 0x01) IRQNoFlags() { 6 } DMA(Compatibility, NotBusMaster, Transfer8) { 2 } -- 1.8.3.1