From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4zzH-0007qL-1k for qemu-devel@nongnu.org; Wed, 09 Jul 2014 18:05:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X4zzA-000079-QU for qemu-devel@nongnu.org; Wed, 09 Jul 2014 18:05:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15130) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4zzA-00006p-HD for qemu-devel@nongnu.org; Wed, 09 Jul 2014 18:05:08 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s69M57aF007294 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 9 Jul 2014 18:05:07 -0400 From: Eduardo Habkost Date: Wed, 9 Jul 2014 19:04:10 -0300 Message-Id: <1404943462-711-14-git-send-email-ehabkost@redhat.com> In-Reply-To: <1404943462-711-1-git-send-email-ehabkost@redhat.com> References: <1404943462-711-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 13/25] accel: Rename 'init' method to 'init_machine' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This makes more explicit the fact that the method is for machine initialization, not just for accelerator object initialization. Signed-off-by: Eduardo Habkost --- hw/core/accel.c | 8 ++++---- include/hw/accel.h | 2 +- kvm-all.c | 2 +- qtest.c | 2 +- xen-common.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/core/accel.c b/hw/core/accel.c index 85e60eb..9552690 100644 --- a/hw/core/accel.c +++ b/hw/core/accel.c @@ -57,11 +57,11 @@ static AccelClass *accel_find(const char *opt_name) return ac; } -static int accel_init(AccelClass *acc, MachineClass *mc) +static int accel_init_machine(AccelClass *acc, MachineClass *mc) { int ret; *(acc->allowed) = true; - ret = acc->init(mc); + ret = acc->init_machine(mc); if (ret < 0) { *(acc->allowed) = false; } @@ -98,7 +98,7 @@ int configure_accelerator(MachineClass *mc) acc->name); continue; } - ret = accel_init(acc, mc); + ret = accel_init_machine(acc, mc); if (ret < 0) { init_failed = true; fprintf(stderr, "failed to initialize %s: %s\n", @@ -128,7 +128,7 @@ static void tcg_accel_class_init(ObjectClass *oc, void *data) { AccelClass *ac = ACCEL_CLASS(oc); ac->name = "tcg"; - ac->init = tcg_init; + ac->init_machine = tcg_init; ac->allowed = &tcg_allowed; } diff --git a/include/hw/accel.h b/include/hw/accel.h index 01f9831..20b0ec7 100644 --- a/include/hw/accel.h +++ b/include/hw/accel.h @@ -39,7 +39,7 @@ typedef struct AccelClass { const char *opt_name; const char *name; int (*available)(void); - int (*init)(MachineClass *mc); + int (*init_machine)(MachineClass *mc); bool *allowed; } AccelClass; diff --git a/kvm-all.c b/kvm-all.c index cd4f9fa..f96512f 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -2206,7 +2206,7 @@ static void kvm_accel_class_init(ObjectClass *oc, void *data) { AccelClass *ac = ACCEL_CLASS(oc); ac->name = "KVM"; - ac->init = kvm_init; + ac->init_machine = kvm_init; ac->allowed = &kvm_allowed; } diff --git a/qtest.c b/qtest.c index f7c0432..7bd81ea 100644 --- a/qtest.c +++ b/qtest.c @@ -555,7 +555,7 @@ static void qtest_accel_class_init(ObjectClass *oc, void *data) AccelClass *ac = ACCEL_CLASS(oc); ac->name = "QTest"; ac->available = qtest_available; - ac->init = qtest_init_accel; + ac->init_machine = qtest_init_accel; ac->allowed = &qtest_allowed; } diff --git a/xen-common.c b/xen-common.c index ef853f6..3867a87 100644 --- a/xen-common.c +++ b/xen-common.c @@ -126,7 +126,7 @@ static void xen_accel_class_init(ObjectClass *oc, void *data) { AccelClass *ac = ACCEL_CLASS(oc); ac->name = "Xen"; - ac->init = xen_init; + ac->init_machine = xen_init; ac->allowed = &xen_allowed; } -- 1.9.3