From: Gleb Natapov <gleb@redhat.com> To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, blauwirbel@gmail.com, armbru@redhat.com, alex.williamson@redhat.com Subject: [PATCHv2 4/8] Store IDE bus id in IDEBus structure for easy access. Date: Sun, 31 Oct 2010 13:40:05 +0200 [thread overview] Message-ID: <1288525209-3303-5-git-send-email-gleb@redhat.com> (raw) In-Reply-To: <1288525209-3303-1-git-send-email-gleb@redhat.com> Signed-off-by: Gleb Natapov <gleb@redhat.com> --- 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 ff80dd5..b2cbdbc 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -257,8 +257,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 4165543..bde2664 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -448,6 +448,7 @@ struct IDEBus { IDEDevice *slave; BMDMAState *bmdma; IDEState ifs[2]; + uint8_t bus_id; uint8_t unit; uint8_t cmd; qemu_irq irq; @@ -564,7 +565,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, uint8_t 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 9b94495..0f54c3d 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 6206201..e56777f 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -129,8 +129,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 341548e..3ad2138 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, uint8_t 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 b2c7cad..cc48b2b 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -158,8 +158,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.1
WARNING: multiple messages have this Message-ID (diff)
From: Gleb Natapov <gleb@redhat.com> To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, alex.williamson@redhat.com, armbru@redhat.com, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCHv2 4/8] Store IDE bus id in IDEBus structure for easy access. Date: Sun, 31 Oct 2010 13:40:05 +0200 [thread overview] Message-ID: <1288525209-3303-5-git-send-email-gleb@redhat.com> (raw) In-Reply-To: <1288525209-3303-1-git-send-email-gleb@redhat.com> Signed-off-by: Gleb Natapov <gleb@redhat.com> --- 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 ff80dd5..b2cbdbc 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -257,8 +257,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 4165543..bde2664 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -448,6 +448,7 @@ struct IDEBus { IDEDevice *slave; BMDMAState *bmdma; IDEState ifs[2]; + uint8_t bus_id; uint8_t unit; uint8_t cmd; qemu_irq irq; @@ -564,7 +565,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, uint8_t 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 9b94495..0f54c3d 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 6206201..e56777f 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -129,8 +129,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 341548e..3ad2138 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, uint8_t 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 b2c7cad..cc48b2b 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -158,8 +158,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.1
next prev parent reply other threads:[~2010-10-31 11:40 UTC|newest] Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-10-31 11:40 [PATCHv2 0/8 RFC] boot order specification Gleb Natapov 2010-10-31 11:40 ` [Qemu-devel] " Gleb Natapov 2010-10-31 11:40 ` [PATCHv2 1/8] Introduce deriver_name field to DeviceInfo structure Gleb Natapov 2010-10-31 11:40 ` [Qemu-devel] " Gleb Natapov 2010-11-04 9:20 ` Markus Armbruster 2010-11-04 9:20 ` Markus Armbruster 2010-11-04 9:42 ` Gleb Natapov 2010-11-04 9:42 ` Gleb Natapov 2010-11-04 14:58 ` Markus Armbruster 2010-11-04 15:44 ` Gleb Natapov 2010-11-05 14:14 ` Markus Armbruster 2010-11-05 15:41 ` Gleb Natapov 2010-11-05 16:24 ` Markus Armbruster 2010-11-05 18:31 ` Gleb Natapov 2010-11-06 9:01 ` Markus Armbruster 2010-11-06 11:53 ` Gleb Natapov 2010-11-06 12:55 ` Markus Armbruster 2010-10-31 11:40 ` [PATCHv2 2/8] Keep track of ISA ports ISA device is using in qdev Gleb Natapov 2010-10-31 11:40 ` [Qemu-devel] " Gleb Natapov 2010-10-31 11:40 ` [PATCHv2 3/8] Add get_dev_path callback to ISA bus " Gleb Natapov 2010-10-31 11:40 ` [Qemu-devel] " Gleb Natapov 2010-10-31 11:40 ` Gleb Natapov [this message] 2010-10-31 11:40 ` [Qemu-devel] [PATCHv2 4/8] Store IDE bus id in IDEBus structure for easy access Gleb Natapov 2010-11-03 13:39 ` Markus Armbruster 2010-11-03 13:39 ` Markus Armbruster 2010-11-03 13:47 ` Gleb Natapov 2010-11-03 13:47 ` Gleb Natapov 2010-11-03 15:18 ` Markus Armbruster 2010-11-03 16:43 ` Gleb Natapov 2010-11-03 17:22 ` Markus Armbruster 2010-11-04 8:07 ` Gleb Natapov 2010-11-04 8:46 ` Markus Armbruster 2010-11-04 9:23 ` Gleb Natapov 2010-11-04 14:22 ` Markus Armbruster 2010-11-04 15:26 ` Gleb Natapov 2010-11-05 14:04 ` Markus Armbruster 2010-11-05 15:54 ` Gleb Natapov 2010-11-05 16:31 ` Markus Armbruster 2010-11-05 18:44 ` Gleb Natapov 2010-11-06 9:25 ` Markus Armbruster 2010-11-06 11:37 ` Gleb Natapov 2010-11-06 12:46 ` Markus Armbruster 2010-10-31 11:40 ` [PATCHv2 5/8] Add get_dev_path callback to IDE bus Gleb Natapov 2010-10-31 11:40 ` [Qemu-devel] " Gleb Natapov 2010-10-31 11:40 ` [PATCHv2 6/8] Add get_dev_path callback for system bus Gleb Natapov 2010-10-31 11:40 ` [Qemu-devel] " Gleb Natapov 2010-10-31 11:40 ` [PATCHv2 7/8] Change pci bus get_dev_path callback to print only slot and func Gleb Natapov 2010-10-31 11:40 ` [Qemu-devel] " Gleb Natapov 2010-11-08 17:17 ` Michael S. Tsirkin 2010-11-08 17:17 ` [Qemu-devel] " Michael S. Tsirkin 2010-11-08 17:29 ` Gleb Natapov 2010-11-08 17:29 ` [Qemu-devel] " Gleb Natapov 2010-11-08 18:12 ` Michael S. Tsirkin 2010-11-08 18:12 ` [Qemu-devel] " Michael S. Tsirkin 2010-11-08 18:22 ` Gleb Natapov 2010-11-08 18:22 ` [Qemu-devel] " Gleb Natapov 2010-11-08 21:00 ` Michael S. Tsirkin 2010-11-08 21:00 ` [Qemu-devel] " Michael S. Tsirkin 2010-11-08 21:12 ` Gleb Natapov 2010-11-08 21:12 ` [Qemu-devel] " Gleb Natapov 2010-11-08 17:26 ` Michael S. Tsirkin 2010-11-08 17:26 ` [Qemu-devel] " Michael S. Tsirkin 2010-10-31 11:40 ` [PATCHv2 8/8] Add bootindex parameter to net/block/fd device Gleb Natapov 2010-10-31 11:40 ` [Qemu-devel] " Gleb Natapov 2010-10-31 22:25 ` [PATCHv2 0/8 RFC] boot order specification Kevin O'Connor 2010-10-31 22:25 ` [Qemu-devel] " Kevin O'Connor 2010-11-01 7:53 ` Gleb Natapov 2010-11-01 7:53 ` [Qemu-devel] " Gleb Natapov 2010-11-04 9:24 ` Markus Armbruster 2010-11-04 9:45 ` Gleb Natapov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1288525209-3303-5-git-send-email-gleb@redhat.com \ --to=gleb@redhat.com \ --cc=alex.williamson@redhat.com \ --cc=armbru@redhat.com \ --cc=blauwirbel@gmail.com \ --cc=kvm@vger.kernel.org \ --cc=qemu-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.