From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQS6c-0000eA-Ps for qemu-devel@nongnu.org; Wed, 19 Mar 2014 21:49:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQS6T-00046h-MB for qemu-devel@nongnu.org; Wed, 19 Mar 2014 21:49:14 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 20 Mar 2014 02:48:53 +0100 Message-Id: <1395280135-10644-12-git-send-email-afaerber@suse.de> In-Reply-To: <1395280135-10644-1-git-send-email-afaerber@suse.de> References: <1395280135-10644-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] [PULL for-2.0 11/13] spapr_vio: Fix firmware names List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , qemu-ppc@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf From: Alexey Kardashevskiy This changes VIO bridge fw name from spapr-vio-bridge to vdevice and vscsi/veth node names from QEMU object names to VIO specific device tree names. Signed-off-by: Alexey Kardashevskiy Signed-off-by: Andreas F=C3=A4rber --- hw/ppc/spapr_vio.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index 4e33f46..2ae06a3 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -68,6 +68,7 @@ static void spapr_vio_bus_class_init(ObjectClass *klass= , void *data) BusClass *k =3D BUS_CLASS(klass); =20 k->get_dev_path =3D spapr_vio_get_dev_name; + k->get_fw_dev_path =3D spapr_vio_get_dev_name; } =20 static const TypeInfo spapr_vio_bus_info =3D { @@ -529,7 +530,9 @@ static int spapr_vio_bridge_init(SysBusDevice *dev) static void spapr_vio_bridge_class_init(ObjectClass *klass, void *data) { SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc =3D DEVICE_CLASS(klass); =20 + dc->fw_name =3D "vdevice"; k->init =3D spapr_vio_bridge_init; } =20 --=20 1.8.4.5