From patchwork Mon Dec 12 20:18:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 130885 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1FA951007D4 for ; Tue, 13 Dec 2011 08:55:50 +1100 (EST) Received: from localhost ([::1]:40409 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaDqd-0000Jv-AK for incoming@patchwork.ozlabs.org; Mon, 12 Dec 2011 16:55:47 -0500 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 Received: from localhost6.localdomain6 (localhost.localdomain [127.0.0.1]) by localhost6.localdomain6 (8.14.4/8.14.4/Debian-2ubuntu1) with ESMTP id pBCKNRgn032630; Mon, 12 Dec 2011 14:23:27 -0600 Received: (from anthony@localhost) by localhost6.localdomain6 (8.14.4/8.14.4/Submit) id pBCKNPfQ032629; Mon, 12 Dec 2011 14:23:25 -0600 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Mon, 12 Dec 2011 14:18:24 -0600 Message-Id: <1323721273-32404-29-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1323721273-32404-1-git-send-email-aliguori@us.ibm.com> References: <1323721273-32404-1-git-send-email-aliguori@us.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 70.123.132.139 Cc: Kevin Wolf , Peter Maydell , Anthony Liguori , Stefan Hajnoczi , Jan Kiszka , Markus Armbruster , Luiz Capitulino Subject: [Qemu-devel] [PATCH v3 028/197] more renames X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org --- 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;