[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv8 07/16] Add get_fw_dev_path callback for system bus
From: |
Gleb Natapov |
Subject: |
[Qemu-devel] [PATCHv8 07/16] Add get_fw_dev_path callback for system bus. |
Date: |
Wed, 8 Dec 2010 13:35:00 +0200 |
Prints out mmio or pio used to access child device.
Signed-off-by: Gleb Natapov <address@hidden>
---
hw/pci_host.c | 2 ++
hw/sysbus.c | 30 ++++++++++++++++++++++++++++++
hw/sysbus.h | 4 ++++
3 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/hw/pci_host.c b/hw/pci_host.c
index bc5b771..28d45bf 100644
--- a/hw/pci_host.c
+++ b/hw/pci_host.c
@@ -197,6 +197,7 @@ void pci_host_conf_register_ioport(pio_addr_t ioport,
PCIHostState *s)
{
pci_host_init(s);
register_ioport_simple(&s->conf_noswap_handler, ioport, 4, 4);
+ sysbus_init_ioports(&s->busdev, ioport, 4);
}
int pci_host_data_register_mmio(PCIHostState *s, int swap)
@@ -215,4 +216,5 @@ void pci_host_data_register_ioport(pio_addr_t ioport,
PCIHostState *s)
register_ioport_simple(&s->data_noswap_handler, ioport, 4, 1);
register_ioport_simple(&s->data_noswap_handler, ioport, 4, 2);
register_ioport_simple(&s->data_noswap_handler, ioport, 4, 4);
+ sysbus_init_ioports(&s->busdev, ioport, 4);
}
diff --git a/hw/sysbus.c b/hw/sysbus.c
index d817721..1583bd8 100644
--- a/hw/sysbus.c
+++ b/hw/sysbus.c
@@ -22,11 +22,13 @@
#include "monitor.h"
static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent);
+static char *sysbus_get_fw_dev_path(DeviceState *dev);
struct BusInfo system_bus_info = {
.name = "System",
.size = sizeof(BusState),
.print_dev = sysbus_dev_print,
+ .get_fw_dev_path = sysbus_get_fw_dev_path,
};
void sysbus_connect_irq(SysBusDevice *dev, int n, qemu_irq irq)
@@ -106,6 +108,16 @@ void sysbus_init_mmio_cb(SysBusDevice *dev,
target_phys_addr_t size,
dev->mmio[n].cb = cb;
}
+void sysbus_init_ioports(SysBusDevice *dev, pio_addr_t ioport, pio_addr_t size)
+{
+ pio_addr_t i;
+
+ for (i = 0; i < size; i++) {
+ assert(dev->num_pio < QDEV_MAX_PIO);
+ dev->pio[dev->num_pio++] = ioport++;
+ }
+}
+
static int sysbus_device_init(DeviceState *dev, DeviceInfo *base)
{
SysBusDeviceInfo *info = container_of(base, SysBusDeviceInfo, qdev);
@@ -171,3 +183,21 @@ static void sysbus_dev_print(Monitor *mon, DeviceState
*dev, int indent)
indent, "", s->mmio[i].addr, s->mmio[i].size);
}
}
+
+static char *sysbus_get_fw_dev_path(DeviceState *dev)
+{
+ SysBusDevice *s = sysbus_from_qdev(dev);
+ char path[40];
+ int off;
+
+ off = snprintf(path, sizeof(path), "%s", qdev_fw_name(dev));
+
+ if (s->num_mmio) {
+ snprintf(path + off, sizeof(path) - off, "@"TARGET_FMT_plx,
+ s->mmio[0].addr);
+ } else if (s->num_pio) {
+ snprintf(path + off, sizeof(path) - off, "@i%04x", s->pio[0]);
+ }
+
+ return strdup(path);
+}
diff --git a/hw/sysbus.h b/hw/sysbus.h
index 5980901..e9eb618 100644
--- a/hw/sysbus.h
+++ b/hw/sysbus.h
@@ -6,6 +6,7 @@
#include "qdev.h"
#define QDEV_MAX_MMIO 32
+#define QDEV_MAX_PIO 32
#define QDEV_MAX_IRQ 256
typedef struct SysBusDevice SysBusDevice;
@@ -23,6 +24,8 @@ struct SysBusDevice {
mmio_mapfunc cb;
ram_addr_t iofunc;
} mmio[QDEV_MAX_MMIO];
+ int num_pio;
+ pio_addr_t pio[QDEV_MAX_PIO];
};
typedef int (*sysbus_initfn)(SysBusDevice *dev);
@@ -45,6 +48,7 @@ void sysbus_init_mmio_cb(SysBusDevice *dev,
target_phys_addr_t size,
mmio_mapfunc cb);
void sysbus_init_irq(SysBusDevice *dev, qemu_irq *p);
void sysbus_pass_irq(SysBusDevice *dev, SysBusDevice *target);
+void sysbus_init_ioports(SysBusDevice *dev, pio_addr_t ioport, pio_addr_t
size);
void sysbus_connect_irq(SysBusDevice *dev, int n, qemu_irq irq);
--
1.7.2.3
- [Qemu-devel] [PATCHv8 15/16] Add notifier that will be called when machine is fully created., (continued)
- [Qemu-devel] [PATCHv8 15/16] Add notifier that will be called when machine is fully created., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 03/16] Keep track of ISA ports ISA device is using in qdev., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 05/16] Store IDE bus id in IDEBus structure for easy access., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 14/16] Add bootindex for option roms., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 16/16] Pass boot device list to firmware., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 09/16] Record which USBDevice USBPort belongs too., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 08/16] Add get_fw_dev_path callback for pci bus., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 11/16] Add get_fw_dev_path callback to scsi bus., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 04/16] Add get_fw_dev_path callback to ISA bus in qdev., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 12/16] Add bootindex parameter to net/block/fd device, Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 07/16] Add get_fw_dev_path callback for system bus.,
Gleb Natapov <=
- [Qemu-devel] [PATCHv8 06/16] Add get_fw_dev_path callback to IDE bus., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 13/16] Change fw_cfg_add_file() to get full file path as a parameter., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 10/16] Add get_fw_dev_path callback for usb bus., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 01/16] Introduce fw_name field to DeviceInfo structure., Gleb Natapov, 2010/12/08
- [Qemu-devel] Re: [PATCHv8 00/16] boot order specification, Blue Swirl, 2010/12/11