From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57590) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6NFr-0004ir-5O for qemu-devel@nongnu.org; Tue, 08 Dec 2015 13:44:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a6NFn-00083f-U9 for qemu-devel@nongnu.org; Tue, 08 Dec 2015 13:44:51 -0500 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]:34225) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6NFn-000838-GP for qemu-devel@nongnu.org; Tue, 08 Dec 2015 13:44:47 -0500 Received: by wmvv187 with SMTP id v187so226895060wmv.1 for ; Tue, 08 Dec 2015 10:44:46 -0800 (PST) References: <1449020831-8414-1-git-send-email-ehabkost@redhat.com> <1449020831-8414-7-git-send-email-ehabkost@redhat.com> <5665A831.2060504@gmail.com> <20151208175927.GN14490@thinpad.lan.raisama.net> From: Marcel Apfelbaum Message-ID: <56672516.3020809@gmail.com> Date: Tue, 8 Dec 2015 20:44:38 +0200 MIME-Version: 1.0 In-Reply-To: <20151208175927.GN14490@thinpad.lan.raisama.net> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 06/16] acpi: Save PCMachineState on AcpiBuildState Reply-To: marcel@redhat.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost , marcel@redhat.com Cc: Igor Mammedov , Marcel Apfelbaum , qemu-devel@nongnu.org, "Michael S. Tsirkin" On 12/08/2015 07:59 PM, Eduardo Habkost wrote: > On Mon, Dec 07, 2015 at 05:39:29PM +0200, Marcel Apfelbaum wrote: >> On 12/02/2015 03:47 AM, Eduardo Habkost wrote: >>> PCMachineState will be used in some of the steps of ACPI table >>> building. >>> >>> Signed-off-by: Eduardo Habkost >>> --- >>> hw/i386/acpi-build.c | 8 ++++---- >>> 1 file changed, 4 insertions(+), 4 deletions(-) >>> >>> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c >>> index 85a5c53..ca11c88 100644 >>> --- a/hw/i386/acpi-build.c >>> +++ b/hw/i386/acpi-build.c >>> @@ -1644,7 +1644,7 @@ struct AcpiBuildState { >>> MemoryRegion *table_mr; >>> /* Is table patched? */ >>> uint8_t patched; >>> - PcGuestInfo *guest_info; >>> + PCMachineState *pcms; >>> void *rsdp; >>> MemoryRegion *rsdp_mr; >>> MemoryRegion *linker_mr; >>> @@ -1855,7 +1855,7 @@ static void acpi_build_update(void *build_opaque, uint32_t offset) >>> >>> acpi_build_tables_init(&tables); >>> >>> - acpi_build(build_state->guest_info, &tables); >>> + acpi_build(&build_state->pcms->acpi_guest_info, &tables); >>> >>> acpi_ram_update(build_state->table_mr, tables.table_data); >>> >>> @@ -1916,12 +1916,12 @@ void acpi_setup(PCMachineState *pcms) >>> >>> build_state = g_malloc0(sizeof *build_state); >>> >>> - build_state->guest_info = guest_info; >>> + build_state->pcms = pcms; >> >> I am not "sold" on keeping a reference to machine in the build_state. >> We can always query current machine using qdev_machine() or something. >> >> Keeping the "guest info" made sense since is used especially for ACPI, >> however the machine has a wider scope. (And not having to keep it >> around is a very good thing!) > > I wouldn't mind using qdev_get_machine() if preferred by the > maintainer of that code, but I like to avoid it when possible. To > me, qdev_get_machine() is just a global variable disguised as a > harder-to-understand API. Really? Hmm, for me is looking like the other way around :) I see it as "query the QOM tree", instead of "keep the reference around" everywhere. But it may be just a personal preference. Thanks, Marcel >