From patchwork Wed Dec 2 01:46:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 551124 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id F0702140134 for ; Wed, 2 Dec 2015 12:49:37 +1100 (AEDT) Received: from localhost ([::1]:55679 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3wY4-0000AP-1m for incoming@patchwork.ozlabs.org; Tue, 01 Dec 2015 20:49:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3wVz-000478-Vv for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3wVy-0001yL-Pc for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52652) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3wVy-0001yG-KO for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:26 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 3FE6EC0CC621 for ; Wed, 2 Dec 2015 01:47:26 +0000 (UTC) Received: from localhost (ovpn-113-125.phx2.redhat.com [10.3.113.125]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tB21lPH5000344; Tue, 1 Dec 2015 20:47:25 -0500 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 1 Dec 2015 23:46:57 -0200 Message-Id: <1449020831-8414-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1449020831-8414-1-git-send-email-ehabkost@redhat.com> References: <1449020831-8414-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Igor Mammedov , Marcel Apfelbaum , "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 02/16] pc: Eliminate struct PcGuestInfoState 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 Instead of allocating a new struct just for PcGuestInfo and the mchine_done Notifier, place them inside PCMachineState. Signed-off-by: Eduardo Habkost --- hw/i386/pc.c | 27 ++++++++++----------------- include/hw/i386/pc.h | 2 ++ 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index f32000a..30cdfaf 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1155,18 +1155,12 @@ typedef struct PcRomPciInfo { uint64_t w64_max; } PcRomPciInfo; -typedef struct PcGuestInfoState { - PcGuestInfo info; - Notifier machine_done; -} PcGuestInfoState; - static -void pc_guest_info_machine_done(Notifier *notifier, void *data) +void pc_machine_done(Notifier *notifier, void *data) { - PcGuestInfoState *guest_info_state = container_of(notifier, - PcGuestInfoState, - machine_done); - PCIBus *bus = PC_MACHINE(qdev_get_machine())->bus; + PCMachineState *pcms = container_of(notifier, + PCMachineState, machine_done); + PCIBus *bus = pcms->bus; if (bus) { int extra_hosts = 0; @@ -1177,21 +1171,20 @@ void pc_guest_info_machine_done(Notifier *notifier, void *data) extra_hosts++; } } - if (extra_hosts && guest_info_state->info.fw_cfg) { + if (extra_hosts && pcms->acpi_guest_info.fw_cfg) { uint64_t *val = g_malloc(sizeof(*val)); *val = cpu_to_le64(extra_hosts); - fw_cfg_add_file(guest_info_state->info.fw_cfg, + fw_cfg_add_file(pcms->acpi_guest_info.fw_cfg, "etc/extra-pci-roots", val, sizeof(*val)); } } - acpi_setup(&guest_info_state->info); + acpi_setup(&pcms->acpi_guest_info); } PcGuestInfo *pc_guest_info_init(PCMachineState *pcms) { - PcGuestInfoState *guest_info_state = g_malloc0(sizeof *guest_info_state); - PcGuestInfo *guest_info = &guest_info_state->info; + PcGuestInfo *guest_info = &pcms->acpi_guest_info; int i, j; guest_info->ram_size_below_4g = pcms->below_4g_mem_size; @@ -1219,8 +1212,8 @@ PcGuestInfo *pc_guest_info_init(PCMachineState *pcms) } } - guest_info_state->machine_done.notify = pc_guest_info_machine_done; - qemu_add_machine_init_done_notifier(&guest_info_state->machine_done); + pcms->machine_done.notify = pc_machine_done; + qemu_add_machine_init_done_notifier(&pcms->machine_done); return guest_info; } diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index a74bded..61aa6ee 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -55,6 +55,8 @@ struct PCMachineState { OnOffAuto smm; ram_addr_t below_4g_mem_size, above_4g_mem_size; PCIBus *bus; + PcGuestInfo acpi_guest_info; + Notifier machine_done; }; #define PC_MACHINE_ACPI_DEVICE_PROP "acpi-device"