| Message ID | 1438977359-29840-16-git-send-email-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Aug 07, 2015 at 04:55:56PM -0300, Eduardo Habkost wrote: > Remove arguments that can be found in PCMachineState. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > hw/i386/pc_piix.c | 4 +--- > hw/i386/pc_q35.c | 4 +--- > include/hw/xen/xen.h | 4 ++-- > xen-hvm.c | 25 ++++++++++++------------- > 4 files changed, 16 insertions(+), 21 deletions(-) > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index ce51cd1..d964f8d 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 cd4ecc3..b7b8709 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.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; This breaks the build: you didn't update the version in xen-hvm-stub.c Please test on config with all options enabled. > @@ -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); > > -- > 2.1.0
On Thu, Aug 13, 2015 at 02:06:04PM +0300, Michael S. Tsirkin wrote: > On Fri, Aug 07, 2015 at 04:55:56PM -0300, Eduardo Habkost wrote: [...] > > @@ -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; > > This breaks the build: you didn't update the version in xen-hvm-stub.c Oops, sorry. > > Please test on config with all options enabled. I incorrectly assumed the changes wouldn't affect anything except PC, so I was building it with --target-list=x86_64-softmmu --enable-xen. I should remember to build it at least once with all targets enabled, next time.
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ce51cd1..d964f8d 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 cd4ecc3..b7b8709 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.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);
Remove arguments that can be found in PCMachineState. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- hw/i386/pc_piix.c | 4 +--- hw/i386/pc_q35.c | 4 +--- include/hw/xen/xen.h | 4 ++-- xen-hvm.c | 25 ++++++++++++------------- 4 files changed, 16 insertions(+), 21 deletions(-)