Patchwork [PATCHv3,04/14] Add get_fw_dev_path callback to ISA bus in qdev.

login
register
mail settings
Submitter Gleb Natapov
Date Nov. 10, 2010, 5:14 p.m.
Message ID <1289409261-5418-5-git-send-email-gleb@redhat.com>
Download mbox | patch
Permalink /patch/70663/
State New
Headers show

Comments

Gleb Natapov - Nov. 10, 2010, 5:14 p.m.
Use device ioports to create unique device path.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
---
 hw/isa-bus.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)
Blue Swirl - Nov. 10, 2010, 6:34 p.m.
On Wed, Nov 10, 2010 at 5:14 PM, Gleb Natapov <gleb@redhat.com> wrote:
> Use device ioports to create unique device path.
>
> Signed-off-by: Gleb Natapov <gleb@redhat.com>
> ---
>  hw/isa-bus.c |   15 +++++++++++++++
>  1 files changed, 15 insertions(+), 0 deletions(-)
>
> diff --git a/hw/isa-bus.c b/hw/isa-bus.c
> index c0ac7e9..741d28e 100644
> --- a/hw/isa-bus.c
> +++ b/hw/isa-bus.c
> @@ -31,11 +31,13 @@ static ISABus *isabus;
>  target_phys_addr_t isa_mem_base = 0;
>
>  static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent);
> +static char *isabus_get_fw_dev_path(DeviceState *dev);
>
>  static struct BusInfo isa_bus_info = {
>     .name      = "ISA",
>     .size      = sizeof(ISABus),
>     .print_dev = isabus_dev_print,
> +    .get_fw_dev_path = isabus_get_fw_dev_path,
>  };
>
>  ISABus *isa_bus_new(DeviceState *dev)
> @@ -188,4 +190,17 @@ static void isabus_register_devices(void)
>     sysbus_register_withprop(&isabus_bridge_info);
>  }
>
> +static char *isabus_get_fw_dev_path(DeviceState *dev)
> +{
> +    ISADevice *d = (ISADevice*)dev;
> +    char path[40];
> +    int off;
> +
> +    off = snprintf(path, sizeof(path), "%s", qdev_fw_name(dev));
> +    if (d->nioports)

Braces.

Patch

diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index c0ac7e9..741d28e 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -31,11 +31,13 @@  static ISABus *isabus;
 target_phys_addr_t isa_mem_base = 0;
 
 static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent);
+static char *isabus_get_fw_dev_path(DeviceState *dev);
 
 static struct BusInfo isa_bus_info = {
     .name      = "ISA",
     .size      = sizeof(ISABus),
     .print_dev = isabus_dev_print,
+    .get_fw_dev_path = isabus_get_fw_dev_path,
 };
 
 ISABus *isa_bus_new(DeviceState *dev)
@@ -188,4 +190,17 @@  static void isabus_register_devices(void)
     sysbus_register_withprop(&isabus_bridge_info);
 }
 
+static char *isabus_get_fw_dev_path(DeviceState *dev)
+{
+    ISADevice *d = (ISADevice*)dev;
+    char path[40];
+    int off;
+
+    off = snprintf(path, sizeof(path), "%s", qdev_fw_name(dev));
+    if (d->nioports)
+        snprintf(path + off, sizeof(path) - off, "@%04x", d->ioports[0]);
+
+    return strdup(path);
+}
+
 device_init(isabus_register_devices)