From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUAIm-0003SF-Fj for qemu-devel@nongnu.org; Tue, 25 Aug 2015 05:13:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZUAIg-0007IF-AO for qemu-devel@nongnu.org; Tue, 25 Aug 2015 05:13:56 -0400 Received: from mail-wi0-x231.google.com ([2a00:1450:400c:c05::231]:38543) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUAIg-0007I2-02 for qemu-devel@nongnu.org; Tue, 25 Aug 2015 05:13:50 -0400 Received: by wicja10 with SMTP id ja10so8588933wic.1 for ; Tue, 25 Aug 2015 02:13:49 -0700 (PDT) References: <1439836952-15739-1-git-send-email-ehabkost@redhat.com> <1439836952-15739-2-git-send-email-ehabkost@redhat.com> From: Marcel Apfelbaum Message-ID: <55DC31CA.5050802@gmail.com> Date: Tue, 25 Aug 2015 12:13:46 +0300 MIME-Version: 1.0 In-Reply-To: <1439836952-15739-2-git-send-email-ehabkost@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 1/4] pc: Remove redundant arguments from xen_hvm_init() Reply-To: marcel@redhat.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost , "Michael S. Tsirkin" Cc: qemu-devel@nongnu.org On 08/17/2015 09:42 PM, Eduardo Habkost wrote: > Remove arguments that can be found in PCMachineState. > > Signed-off-by: Eduardo Habkost > --- > Changes v1 -> v2: > * Change prototype on xen-hvm-stub.c too > --- > hw/i386/pc_piix.c | 4 +--- > hw/i386/pc_q35.c | 4 +--- > include/hw/xen/xen.h | 4 ++-- > xen-hvm-stub.c | 3 +-- > xen-hvm.c | 25 ++++++++++++------------- > 5 files changed, 17 insertions(+), 23 deletions(-) > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 9558467..2b7afc8 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -134,9 +134,7 @@ static void pc_init1(MachineState *machine) > pcms->below_4g_mem_size = machine->ram_size; > } > > - if (xen_enabled() && xen_hvm_init(&pcms->below_4g_mem_size, > - &pcms->above_4g_mem_size, > - &ram_memory) != 0) { > + if (xen_enabled() && xen_hvm_init(pcms, &ram_memory) != 0) { > fprintf(stderr, "xen hardware virtual machine initialisation failed\n"); > exit(1); > } > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index c07d65b..36dd6a4 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -125,9 +125,7 @@ static void pc_q35_init(MachineState *machine) > pcms->below_4g_mem_size = machine->ram_size; > } > > - if (xen_enabled() && xen_hvm_init(&pcms->below_4g_mem_size, > - &pcms->above_4g_mem_size, > - &ram_memory) != 0) { > + if (xen_enabled() && xen_hvm_init(pcms, &ram_memory) != 0) { > fprintf(stderr, "xen hardware virtual machine initialisation failed\n"); > exit(1); > } > diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h > index 4356af4..e90931a 100644 > --- a/include/hw/xen/xen.h > +++ b/include/hw/xen/xen.h > @@ -10,6 +10,7 @@ > > #include "hw/irq.h" > #include "qemu-common.h" > +#include "qemu/typedefs.h" > > /* xen-machine.c */ > enum xen_mode { > @@ -38,8 +39,7 @@ qemu_irq *xen_interrupt_controller_init(void); > void xenstore_store_pv_console_info(int i, struct CharDriverState *chr); > > #if defined(NEED_CPU_H) && !defined(CONFIG_USER_ONLY) > -int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, > - MemoryRegion **ram_memory); > +int xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory); > void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, > struct MemoryRegion *mr); > void xen_modified_memory(ram_addr_t start, ram_addr_t length); > diff --git a/xen-hvm-stub.c b/xen-hvm-stub.c > index 46867d8..6a39425 100644 > --- a/xen-hvm-stub.c > +++ b/xen-hvm-stub.c > @@ -47,8 +47,7 @@ void xen_modified_memory(ram_addr_t start, ram_addr_t length) > { > } > > -int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, > - MemoryRegion **ram_memory) > +int xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) > { > return 0; > } > diff --git a/xen-hvm.c b/xen-hvm.c > index 0408462..55bce3a 100644 > --- a/xen-hvm.c > +++ b/xen-hvm.c > @@ -180,8 +180,7 @@ qemu_irq *xen_interrupt_controller_init(void) > > /* Memory Ops */ > > -static void xen_ram_init(ram_addr_t *below_4g_mem_size, > - ram_addr_t *above_4g_mem_size, > +static void xen_ram_init(PCMachineState *pcms, > ram_addr_t ram_size, MemoryRegion **ram_memory_p) > { > MemoryRegion *sysmem = get_system_memory(); > @@ -198,20 +197,20 @@ static void xen_ram_init(ram_addr_t *below_4g_mem_size, > } > > if (ram_size >= user_lowmem) { > - *above_4g_mem_size = ram_size - user_lowmem; > - *below_4g_mem_size = user_lowmem; > + pcms->above_4g_mem_size = ram_size - user_lowmem; > + pcms->below_4g_mem_size = user_lowmem; > } else { > - *above_4g_mem_size = 0; > - *below_4g_mem_size = ram_size; > + pcms->above_4g_mem_size = 0; > + pcms->below_4g_mem_size = ram_size; > } > - if (!*above_4g_mem_size) { > + if (!pcms->above_4g_mem_size) { > block_len = ram_size; > } else { > /* > * Xen does not allocate the memory continuously, it keeps a > * hole of the size computed above or passed in. > */ > - block_len = (1ULL << 32) + *above_4g_mem_size; > + block_len = (1ULL << 32) + pcms->above_4g_mem_size; > } > memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len, > &error_abort); > @@ -229,12 +228,12 @@ static void xen_ram_init(ram_addr_t *below_4g_mem_size, > */ > memory_region_init_alias(&ram_lo, NULL, "xen.ram.lo", > &ram_memory, 0xc0000, > - *below_4g_mem_size - 0xc0000); > + pcms->below_4g_mem_size - 0xc0000); > memory_region_add_subregion(sysmem, 0xc0000, &ram_lo); > - if (*above_4g_mem_size > 0) { > + if (pcms->above_4g_mem_size > 0) { > memory_region_init_alias(&ram_hi, NULL, "xen.ram.hi", > &ram_memory, 0x100000000ULL, > - *above_4g_mem_size); > + pcms->above_4g_mem_size); > memory_region_add_subregion(sysmem, 0x100000000ULL, &ram_hi); > } > } > @@ -1159,7 +1158,7 @@ static void xen_wakeup_notifier(Notifier *notifier, void *data) > } > > /* return 0 means OK, or -1 means critical issue -- will exit(1) */ > -int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, > +int xen_hvm_init(PCMachineState *pcms, > MemoryRegion **ram_memory) > { > int i, rc; > @@ -1270,7 +1269,7 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size, > > /* Init RAM management */ > xen_map_cache_init(xen_phys_offset_to_gaddr, state); > - xen_ram_init(below_4g_mem_size, above_4g_mem_size, ram_size, ram_memory); > + xen_ram_init(pcms, ram_size, ram_memory); > > qemu_add_vm_change_state_handler(xen_hvm_change_state_handler, state); > > Reviewed-by: Marcel Apfelbaum Thanks, Marcel