Re: [PULL v2 00/62] Misc patches for 2019-12-16

[Paolo Bonzini]

On 17/12/19 19:13, Peter Maydell wrote:
> On Tue, 17 Dec 2019 at 17:59, Paolo Bonzini <address@hidden> wrote:
>>
>> The following changes since commit 084a398bf8aa7634738e6c6c0103236ee1b3b72f:
>>
>>   Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' 
>> into staging (2019-12-13 18:14:07 +0000)
>>
>> are available in the git repository at:
>>
>>
>>   git://github.com/bonzini/qemu.git tags/for-upstream
>>
>> for you to fetch changes up to 74c14076700436f9d340652042c81f46eaf0cf9f:
>>
>>   colo: fix return without releasing RCU (2019-12-17 14:03:44 +0100)
>>
>> ----------------------------------------------------------------
>> * More uses of RCU_READ_LOCK_GUARD (Dave, myself)
>> * QOM doc improvments (Greg)
>> * Cleanups from the Meson conversion (Marc-André)
>> * Support for multiple -accel options (myself)
>> * Many x86 machine cleanup (Philippe, myself)
>> * tests/migration-test cleanup (Juan)
>>
>> ----------------------------------------------------------------
> 
> Conflict:
> 
> diff --cc hw/ppc/spapr_irq.c
> index 07e08d6544,15c3dd4812..0000000000
> --- a/hw/ppc/spapr_irq.c
> +++ b/hw/ppc/spapr_irq.c
> @@@ -70,17 -70,15 +70,22 @@@ void spapr_irq_msi_free(SpaprMachineSta
>       bitmap_clear(spapr->irq_map, irq - SPAPR_IRQ_MSI, num);
>   }
> 
>  -int spapr_irq_init_kvm(int (*fn)(SpaprInterruptController *, Error **),
>  +int spapr_irq_init_kvm(SpaprInterruptControllerInitKvm fn,
>                          SpaprInterruptController *intc,
>  +                       uint32_t nr_servers,
>                          Error **errp)
>   {
> -     MachineState *machine = MACHINE(qdev_get_machine());
>       Error *local_err = NULL;
> 
> ++<<<<<<< HEAD
>  +    if (kvm_enabled() && machine_kernel_irqchip_allowed(machine)) {
>  +        if (fn(intc, nr_servers, &local_err) < 0) {
>  +            if (machine_kernel_irqchip_required(machine)) {
> ++=======
> +     if (kvm_enabled() && kvm_kernel_irqchip_allowed()) {
> +         if (fn(intc, &local_err) < 0) {
> +             if (kvm_kernel_irqchip_required()) {
> ++>>>>>>> remotes/bonzini/tags/for-upstream
>                   error_prepend(&local_err,
>                                 "kernel_irqchip requested but unavailable: ");
>                   error_propagate(errp, local_err);
> 
> 
> I could probably figure out the resolution but I'm about 5 minutes
> from having to leave the office; sorry.

I pushed a merge commit to the same place.

Paolo