From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38002) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SgcV1-0001iY-BL for qemu-devel@nongnu.org; Mon, 18 Jun 2012 10:00:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SgcUb-0003YE-D6 for qemu-devel@nongnu.org; Mon, 18 Jun 2012 10:00:10 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53264 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SgcUb-0003Xt-3V for qemu-devel@nongnu.org; Mon, 18 Jun 2012 09:59:45 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 18 Jun 2012 15:59:07 +0200 Message-Id: <1340027954-19045-16-git-send-email-afaerber@suse.de> In-Reply-To: <1340027954-19045-1-git-send-email-afaerber@suse.de> References: <1340027954-19045-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 15/22] qdev: Use wrapper for qdev_get_path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Anthony Liguori , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori From: Anthony Liguori This makes it easier to remove it from BusInfo. Signed-off-by: Anthony Liguori Signed-off-by: Paolo Bonzini [AF: Drop now unnecessary NULL initialization in scsibus_get_dev_path()] Signed-off-by: Andreas F=C3=A4rber --- exec.c | 4 ++-- hw/qdev.c | 16 ++++++++++++++++ hw/qdev.h | 2 ++ hw/scsi-bus.c | 6 ++---- hw/usb/bus.c | 5 ++--- hw/usb/desc.c | 5 +++-- savevm.c | 12 ++++++------ 7 files changed, 33 insertions(+), 17 deletions(-) diff --git a/exec.c b/exec.c index 5c9b762..b5d6885 100644 --- a/exec.c +++ b/exec.c @@ -2603,8 +2603,8 @@ void qemu_ram_set_idstr(ram_addr_t addr, const char= *name, DeviceState *dev) assert(new_block); assert(!new_block->idstr[0]); =20 - if (dev && dev->parent_bus && dev->parent_bus->info->get_dev_path) { - char *id =3D dev->parent_bus->info->get_dev_path(dev); + if (dev) { + char *id =3D qdev_get_dev_path(dev); if (id) { snprintf(new_block->idstr, sizeof(new_block->idstr), "%s/", = id); g_free(id); diff --git a/hw/qdev.c b/hw/qdev.c index 7f18590..7b2802d 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -494,6 +494,22 @@ char* qdev_get_fw_dev_path(DeviceState *dev) return strdup(path); } =20 +char *qdev_get_dev_path(DeviceState *dev) +{ + BusInfo *businfo; + + if (!dev || !dev->parent_bus) { + return NULL; + } + + businfo =3D dev->parent_bus->info; + if (businfo->get_dev_path) { + return businfo->get_dev_path(dev); + } + + return NULL; +} + /** * Legacy property handling */ diff --git a/hw/qdev.h b/hw/qdev.h index 1af5382..013ccf2 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -352,4 +352,6 @@ void qdev_set_parent_bus(DeviceState *dev, BusState *= bus); =20 extern int qdev_hotplug; =20 +char *qdev_get_dev_path(DeviceState *dev); + #endif diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index a1d75b9..e79bb54 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -1453,12 +1453,10 @@ static char *scsibus_get_dev_path(DeviceState *de= v) { SCSIDevice *d =3D DO_UPCAST(SCSIDevice, qdev, dev); DeviceState *hba =3D dev->parent_bus->parent; - char *id =3D NULL; + char *id; char *path; =20 - if (hba && hba->parent_bus && hba->parent_bus->info->get_dev_path) { - id =3D hba->parent_bus->info->get_dev_path(hba); - } + id =3D qdev_get_dev_path(hba); if (id) { path =3D g_strdup_printf("%s/%d:%d:%d", id, d->channel, d->id, d= ->lun); } else { diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 64887d5..8b08f93 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -467,9 +467,8 @@ static char *usb_get_dev_path(DeviceState *qdev) DeviceState *hcd =3D qdev->parent_bus->parent; char *id =3D NULL; =20 - if ((dev->flags & (1 << USB_DEV_FLAG_FULL_PATH)) && - hcd && hcd->parent_bus && hcd->parent_bus->info->get_dev_path) { - id =3D hcd->parent_bus->info->get_dev_path(hcd); + if (dev->flags & (1 << USB_DEV_FLAG_FULL_PATH)) { + id =3D qdev_get_dev_path(hcd); } if (id) { char *ret =3D g_strdup_printf("%s/%s", id, dev->port->path); diff --git a/hw/usb/desc.c b/hw/usb/desc.c index e8a3c6a..0a9d3c9 100644 --- a/hw/usb/desc.c +++ b/hw/usb/desc.c @@ -432,12 +432,13 @@ void usb_desc_create_serial(USBDevice *dev) const USBDesc *desc =3D usb_device_get_usb_desc(dev); int index =3D desc->id.iSerialNumber; char serial[64]; + char *path; int dst; =20 assert(index !=3D 0 && desc->str[index] !=3D NULL); dst =3D snprintf(serial, sizeof(serial), "%s", desc->str[index]); - if (hcd && hcd->parent_bus && hcd->parent_bus->info->get_dev_path) { - char *path =3D hcd->parent_bus->info->get_dev_path(hcd); + path =3D qdev_get_dev_path(hcd); + if (path) { dst +=3D snprintf(serial+dst, sizeof(serial)-dst, "-%s", path); } dst +=3D snprintf(serial+dst, sizeof(serial)-dst, "-%s", dev->port->= path); diff --git a/savevm.c b/savevm.c index 2d18bab..818ddfc 100644 --- a/savevm.c +++ b/savevm.c @@ -1248,8 +1248,8 @@ int register_savevm_live(DeviceState *dev, se->is_ram =3D 1; } =20 - if (dev && dev->parent_bus && dev->parent_bus->info->get_dev_path) { - char *id =3D dev->parent_bus->info->get_dev_path(dev); + if (dev) { + char *id =3D qdev_get_dev_path(dev); if (id) { pstrcpy(se->idstr, sizeof(se->idstr), id); pstrcat(se->idstr, sizeof(se->idstr), "/"); @@ -1292,8 +1292,8 @@ void unregister_savevm(DeviceState *dev, const char= *idstr, void *opaque) SaveStateEntry *se, *new_se; char id[256] =3D ""; =20 - if (dev && dev->parent_bus && dev->parent_bus->info->get_dev_path) { - char *path =3D dev->parent_bus->info->get_dev_path(dev); + if (dev) { + char *path =3D qdev_get_dev_path(dev); if (path) { pstrcpy(id, sizeof(id), path); pstrcat(id, sizeof(id), "/"); @@ -1334,8 +1334,8 @@ int vmstate_register_with_alias_id(DeviceState *dev= , int instance_id, se->alias_id =3D alias_id; se->no_migrate =3D vmsd->unmigratable; =20 - if (dev && dev->parent_bus && dev->parent_bus->info->get_dev_path) { - char *id =3D dev->parent_bus->info->get_dev_path(dev); + if (dev) { + char *id =3D qdev_get_dev_path(dev); if (id) { pstrcpy(se->idstr, sizeof(se->idstr), id); pstrcat(se->idstr, sizeof(se->idstr), "/"); --=20 1.7.7