[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv7 05/16] Store IDE bus id in IDEBus structure for ea
From: |
Gleb Natapov |
Subject: |
[Qemu-devel] [PATCHv7 05/16] Store IDE bus id in IDEBus structure for easy access. |
Date: |
Mon, 6 Dec 2010 15:54:36 +0200 |
Signed-off-by: Gleb Natapov <address@hidden>
---
hw/ide/cmd646.c | 4 ++--
hw/ide/internal.h | 3 ++-
hw/ide/isa.c | 2 +-
hw/ide/piix.c | 4 ++--
hw/ide/qdev.c | 3 ++-
hw/ide/via.c | 4 ++--
6 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c
index dfe6091..ea5d2dc 100644
--- a/hw/ide/cmd646.c
+++ b/hw/ide/cmd646.c
@@ -253,8 +253,8 @@ static int pci_cmd646_ide_initfn(PCIDevice *dev)
pci_conf[PCI_INTERRUPT_PIN] = 0x01; // interrupt on pin 1
irq = qemu_allocate_irqs(cmd646_set_irq, d, 2);
- ide_bus_new(&d->bus[0], &d->dev.qdev);
- ide_bus_new(&d->bus[1], &d->dev.qdev);
+ ide_bus_new(&d->bus[0], &d->dev.qdev, 0);
+ ide_bus_new(&d->bus[1], &d->dev.qdev, 1);
ide_init2(&d->bus[0], irq[0]);
ide_init2(&d->bus[1], irq[1]);
diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index 85f4a16..71af66f 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
@@ -449,6 +449,7 @@ struct IDEBus {
IDEDevice *slave;
BMDMAState *bmdma;
IDEState ifs[2];
+ int bus_id;
uint8_t unit;
uint8_t cmd;
qemu_irq irq;
@@ -567,7 +568,7 @@ void ide_init2_with_non_qdev_drives(IDEBus *bus, DriveInfo
*hd0,
void ide_init_ioport(IDEBus *bus, int iobase, int iobase2);
/* hw/ide/qdev.c */
-void ide_bus_new(IDEBus *idebus, DeviceState *dev);
+void ide_bus_new(IDEBus *idebus, DeviceState *dev, int bus_id);
IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive);
#endif /* HW_IDE_INTERNAL_H */
diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index 4206afd..8c59c5a 100644
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -67,7 +67,7 @@ static int isa_ide_initfn(ISADevice *dev)
{
ISAIDEState *s = DO_UPCAST(ISAIDEState, dev, dev);
- ide_bus_new(&s->bus, &s->dev.qdev);
+ ide_bus_new(&s->bus, &s->dev.qdev, 0);
ide_init_ioport(&s->bus, s->iobase, s->iobase2);
isa_init_irq(dev, &s->irq, s->isairq);
isa_init_ioport_range(dev, s->iobase, 8);
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index e02b89a..1c0cb0c 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -125,8 +125,8 @@ static int pci_piix_ide_initfn(PCIIDEState *d)
vmstate_register(&d->dev.qdev, 0, &vmstate_ide_pci, d);
- ide_bus_new(&d->bus[0], &d->dev.qdev);
- ide_bus_new(&d->bus[1], &d->dev.qdev);
+ ide_bus_new(&d->bus[0], &d->dev.qdev, 0);
+ ide_bus_new(&d->bus[1], &d->dev.qdev, 1);
ide_init_ioport(&d->bus[0], 0x1f0, 0x3f6);
ide_init_ioport(&d->bus[1], 0x170, 0x376);
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index 6d27b60..88ff657 100644
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -29,9 +29,10 @@ static struct BusInfo ide_bus_info = {
.size = sizeof(IDEBus),
};
-void ide_bus_new(IDEBus *idebus, DeviceState *dev)
+void ide_bus_new(IDEBus *idebus, DeviceState *dev, int bus_id)
{
qbus_create_inplace(&idebus->qbus, &ide_bus_info, dev, NULL);
+ idebus->bus_id = bus_id;
}
static int ide_qdev_init(DeviceState *qdev, DeviceInfo *base)
diff --git a/hw/ide/via.c b/hw/ide/via.c
index 66be0c4..78857e8 100644
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -154,8 +154,8 @@ static int vt82c686b_ide_initfn(PCIDevice *dev)
vmstate_register(&dev->qdev, 0, &vmstate_ide_pci, d);
- ide_bus_new(&d->bus[0], &d->dev.qdev);
- ide_bus_new(&d->bus[1], &d->dev.qdev);
+ ide_bus_new(&d->bus[0], &d->dev.qdev, 0);
+ ide_bus_new(&d->bus[1], &d->dev.qdev, 1);
ide_init2(&d->bus[0], isa_reserve_irq(14));
ide_init2(&d->bus[1], isa_reserve_irq(15));
ide_init_ioport(&d->bus[0], 0x1f0, 0x3f6);
--
1.7.2.3
- [Qemu-devel] [PATCHv7 03/16] Keep track of ISA ports ISA device is using in qdev., (continued)
- [Qemu-devel] [PATCHv7 03/16] Keep track of ISA ports ISA device is using in qdev., Gleb Natapov, 2010/12/06
- [Qemu-devel] [PATCHv7 13/16] Change fw_cfg_add_file() to get full file path as a parameter., Gleb Natapov, 2010/12/06
- [Qemu-devel] [PATCHv7 09/16] Record which USBDevice USBPort belongs too., Gleb Natapov, 2010/12/06
- [Qemu-devel] [PATCHv7 11/16] Add get_fw_dev_path callback to scsi bus., Gleb Natapov, 2010/12/06
- [Qemu-devel] [PATCHv7 15/16] Add notifier that will be called when machine is fully created., Gleb Natapov, 2010/12/06
- [Qemu-devel] [PATCHv7 02/16] Introduce new BusInfo callback get_fw_dev_path., Gleb Natapov, 2010/12/06
- [Qemu-devel] [PATCHv7 16/16] Pass boot device list to firmware., Gleb Natapov, 2010/12/06
- [Qemu-devel] [PATCHv7 14/16] Add bootindex for option roms., Gleb Natapov, 2010/12/06
- [Qemu-devel] [PATCHv7 08/16] Add get_fw_dev_path callback for pci bus., Gleb Natapov, 2010/12/06
- [Qemu-devel] [PATCHv7 12/16] Add bootindex parameter to net/block/fd device, Gleb Natapov, 2010/12/06
- [Qemu-devel] [PATCHv7 05/16] Store IDE bus id in IDEBus structure for easy access.,
Gleb Natapov <=
- [Qemu-devel] [PATCHv7 07/16] Add get_fw_dev_path callback for system bus., Gleb Natapov, 2010/12/06