* [PATCH] ff Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
@ 2019-12-11 14:46 Paolo Bonzini
2019-12-11 15:02 ` Daniel P. Berrangé
0 siblings, 1 reply; 3+ messages in thread
From: Paolo Bonzini @ 2019-12-11 14:46 UTC (permalink / raw)
To: qemu-devel
---
hw/ppc/e500.c | 1 -
hw/ppc/spapr_irq.c | 8 --------
2 files changed, 9 deletions(-)
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 928efaa..12b6a5b 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -793,7 +793,6 @@ static DeviceState *ppce500_init_mpic(PPCE500MachineState *pms,
MemoryRegion *ccsr,
IrqLines *irqs)
{
- MachineState *machine = MACHINE(pms);
const PPCE500MachineClass *pmc = PPCE500_MACHINE_GET_CLASS(pms);
DeviceState *dev = NULL;
SysBusDevice *s;
diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
index c3f8870..15c3dd4 100644
--- a/hw/ppc/spapr_irq.c
+++ b/hw/ppc/spapr_irq.c
@@ -74,7 +74,6 @@ int spapr_irq_init_kvm(int (*fn)(SpaprInterruptController *, Error **),
SpaprInterruptController *intc,
Error **errp)
{
- MachineState *machine = MACHINE(qdev_get_machine());
Error *local_err = NULL;
if (kvm_enabled() && kvm_kernel_irqchip_allowed()) {
@@ -287,7 +286,6 @@ uint32_t spapr_irq_nr_msis(SpaprMachineState *spapr)
void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
{
- MachineState *machine = MACHINE(spapr);
SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
if (kvm_enabled() && kvm_kernel_irqchip_split()) {
@@ -295,12 +293,6 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
return;
}
- if (!kvm_enabled() && kvm_kernel_irqchip_required()) {
- error_setg(errp,
- "kernel_irqchip requested but only available with KVM");
- return;
- }
-
if (spapr_irq_check(spapr, errp) < 0) {
return;
}
--
1.8.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ff Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2019-12-11 14:46 [PATCH] ff Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Paolo Bonzini
@ 2019-12-11 15:02 ` Daniel P. Berrangé
2019-12-11 15:19 ` Paolo Bonzini
0 siblings, 1 reply; 3+ messages in thread
From: Daniel P. Berrangé @ 2019-12-11 15:02 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel
Missing commit message subject line :-)
On Wed, Dec 11, 2019 at 03:46:33PM +0100, Paolo Bonzini wrote:
> ---
> hw/ppc/e500.c | 1 -
> hw/ppc/spapr_irq.c | 8 --------
> 2 files changed, 9 deletions(-)
>
> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
> index 928efaa..12b6a5b 100644
> --- a/hw/ppc/e500.c
> +++ b/hw/ppc/e500.c
> @@ -793,7 +793,6 @@ static DeviceState *ppce500_init_mpic(PPCE500MachineState *pms,
> MemoryRegion *ccsr,
> IrqLines *irqs)
> {
> - MachineState *machine = MACHINE(pms);
> const PPCE500MachineClass *pmc = PPCE500_MACHINE_GET_CLASS(pms);
> DeviceState *dev = NULL;
> SysBusDevice *s;
> diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> index c3f8870..15c3dd4 100644
> --- a/hw/ppc/spapr_irq.c
> +++ b/hw/ppc/spapr_irq.c
> @@ -74,7 +74,6 @@ int spapr_irq_init_kvm(int (*fn)(SpaprInterruptController *, Error **),
> SpaprInterruptController *intc,
> Error **errp)
> {
> - MachineState *machine = MACHINE(qdev_get_machine());
> Error *local_err = NULL;
>
> if (kvm_enabled() && kvm_kernel_irqchip_allowed()) {
> @@ -287,7 +286,6 @@ uint32_t spapr_irq_nr_msis(SpaprMachineState *spapr)
>
> void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
> {
> - MachineState *machine = MACHINE(spapr);
> SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
>
> if (kvm_enabled() && kvm_kernel_irqchip_split()) {
> @@ -295,12 +293,6 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
> return;
> }
>
> - if (!kvm_enabled() && kvm_kernel_irqchip_required()) {
> - error_setg(errp,
> - "kernel_irqchip requested but only available with KVM");
> - return;
> - }
> -
> if (spapr_irq_check(spapr, errp) < 0) {
> return;
> }
> --
> 1.8.3.1
>
>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ff Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2019-12-11 15:02 ` Daniel P. Berrangé
@ 2019-12-11 15:19 ` Paolo Bonzini
0 siblings, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2019-12-11 15:19 UTC (permalink / raw)
To: Daniel P. Berrangé; +Cc: qemu-devel
On 11/12/19 16:02, Daniel P. Berrangé wrote:
> Missing commit message subject line :-)
I'm not fast enough at Ctrl-C, it seems!
Paolo
> On Wed, Dec 11, 2019 at 03:46:33PM +0100, Paolo Bonzini wrote:
>> ---
>> hw/ppc/e500.c | 1 -
>> hw/ppc/spapr_irq.c | 8 --------
>> 2 files changed, 9 deletions(-)
>>
>> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
>> index 928efaa..12b6a5b 100644
>> --- a/hw/ppc/e500.c
>> +++ b/hw/ppc/e500.c
>> @@ -793,7 +793,6 @@ static DeviceState *ppce500_init_mpic(PPCE500MachineState *pms,
>> MemoryRegion *ccsr,
>> IrqLines *irqs)
>> {
>> - MachineState *machine = MACHINE(pms);
>> const PPCE500MachineClass *pmc = PPCE500_MACHINE_GET_CLASS(pms);
>> DeviceState *dev = NULL;
>> SysBusDevice *s;
>> diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
>> index c3f8870..15c3dd4 100644
>> --- a/hw/ppc/spapr_irq.c
>> +++ b/hw/ppc/spapr_irq.c
>> @@ -74,7 +74,6 @@ int spapr_irq_init_kvm(int (*fn)(SpaprInterruptController *, Error **),
>> SpaprInterruptController *intc,
>> Error **errp)
>> {
>> - MachineState *machine = MACHINE(qdev_get_machine());
>> Error *local_err = NULL;
>>
>> if (kvm_enabled() && kvm_kernel_irqchip_allowed()) {
>> @@ -287,7 +286,6 @@ uint32_t spapr_irq_nr_msis(SpaprMachineState *spapr)
>>
>> void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
>> {
>> - MachineState *machine = MACHINE(spapr);
>> SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
>>
>> if (kvm_enabled() && kvm_kernel_irqchip_split()) {
>> @@ -295,12 +293,6 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
>> return;
>> }
>>
>> - if (!kvm_enabled() && kvm_kernel_irqchip_required()) {
>> - error_setg(errp,
>> - "kernel_irqchip requested but only available with KVM");
>> - return;
>> - }
>> -
>> if (spapr_irq_check(spapr, errp) < 0) {
>> return;
>> }
>> --
>> 1.8.3.1
>>
>>
>
> Regards,
> Daniel
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-11 15:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-11 14:46 [PATCH] ff Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Paolo Bonzini
2019-12-11 15:02 ` Daniel P. Berrangé
2019-12-11 15:19 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).