From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:42267) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaCPP-0005Ir-El for qemu-devel@nongnu.org; Mon, 12 Dec 2011 15:23:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RaCPO-0000oQ-54 for qemu-devel@nongnu.org; Mon, 12 Dec 2011 15:23:35 -0500 Received: from cpe-70-123-132-139.austin.res.rr.com ([70.123.132.139]:44610 helo=localhost6.localdomain6) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaCPN-0000oD-Va for qemu-devel@nongnu.org; Mon, 12 Dec 2011 15:23:34 -0500 From: Anthony Liguori Date: Mon, 12 Dec 2011 14:18:24 -0600 Message-Id: <1323721273-32404-29-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1323721273-32404-1-git-send-email-aliguori@us.ibm.com> References: <1323721273-32404-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH v3 028/197] more renames List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Maydell , Anthony Liguori , Stefan Hajnoczi , Jan Kiszka , Markus Armbruster , Luiz Capitulino --- hw/object.h | 4 ++-- hw/qdev.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/object.h b/hw/object.h index 1ac2f92..834e89e 100644 --- a/hw/object.h +++ b/hw/object.h @@ -11,8 +11,8 @@ * */ -#ifndef QOBJECT_H -#define QOBJECT_H +#ifndef QEMU_OBJECT_H +#define QEMU_OBJECT_H #include "qemu-common.h" diff --git a/hw/qdev.h b/hw/qdev.h index 0702b18..aabaaa3 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -6,7 +6,7 @@ #include "qemu-char.h" #include "qemu-option.h" #include "qapi/qapi-visit-core.h" -#include "qobject.h" +#include "object.h" typedef struct Property Property; @@ -68,13 +68,13 @@ typedef struct DeviceProperty } DeviceProperty; typedef struct DeviceClass { - QObjectClass parent_class; + ObjectClass parent_class; } DeviceClass; /* This structure should not be accessed directly. We declare it here so that it can be embedded in individual device state structures. */ struct DeviceState { - QObject parent_obj; + Object parent_obj; const char *id; enum DevState state; -- 1.7.4.1