[v2,17/18] kvm: introduce kvm_kernel_irqchip_* functions
diff mbox series

Message ID 1575903705-12925-18-git-send-email-pbonzini@redhat.com
State New
Headers show
Series
  • Complete the implementation of -accel
Related show

Commit Message

Paolo Bonzini Dec. 9, 2019, 3:01 p.m. UTC
The KVMState struct is opaque, so provide accessors for the fields
that will be moved from current_machine to the accelerator.  For now
they just forward to the machine object, but this will change.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 accel/kvm/kvm-all.c  | 23 +++++++++++++++++++----
 hw/ppc/e500.c        |  4 ++--
 hw/ppc/spapr_irq.c   | 10 +++++-----
 include/sysemu/kvm.h |  7 +++++--
 target/arm/kvm.c     |  8 ++++----
 target/i386/kvm.c    |  4 ++--
 target/mips/kvm.c    |  2 +-
 target/ppc/kvm.c     |  2 +-
 target/s390x/kvm.c   |  2 +-
 9 files changed, 40 insertions(+), 22 deletions(-)

Comments

Philippe Mathieu-Daudé Dec. 10, 2019, 12:02 p.m. UTC | #1
On 12/9/19 4:01 PM, Paolo Bonzini wrote:
> The KVMState struct is opaque, so provide accessors for the fields
> that will be moved from current_machine to the accelerator.  For now
> they just forward to the machine object, but this will change.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>   accel/kvm/kvm-all.c  | 23 +++++++++++++++++++----
>   hw/ppc/e500.c        |  4 ++--
>   hw/ppc/spapr_irq.c   | 10 +++++-----
>   include/sysemu/kvm.h |  7 +++++--
>   target/arm/kvm.c     |  8 ++++----
>   target/i386/kvm.c    |  4 ++--
>   target/mips/kvm.c    |  2 +-
>   target/ppc/kvm.c     |  2 +-
>   target/s390x/kvm.c   |  2 +-
>   9 files changed, 40 insertions(+), 22 deletions(-)
> 
> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
> index f0b9294..c0a6351 100644
> --- a/accel/kvm/kvm-all.c
> +++ b/accel/kvm/kvm-all.c
> @@ -1760,7 +1760,7 @@ void kvm_irqchip_set_qemuirq_gsi(KVMState *s, qemu_irq irq, int gsi)
>       g_hash_table_insert(s->gsimap, irq, GINT_TO_POINTER(gsi));
>   }
>   
> -static void kvm_irqchip_create(MachineState *machine, KVMState *s)
> +static void kvm_irqchip_create(KVMState *s)
>   {
>       int ret;
>   
> @@ -1778,9 +1778,9 @@ static void kvm_irqchip_create(MachineState *machine, KVMState *s)
>   
>       /* First probe and see if there's a arch-specific hook to create the
>        * in-kernel irqchip for us */
> -    ret = kvm_arch_irqchip_create(machine, s);
> +    ret = kvm_arch_irqchip_create(s);
>       if (ret == 0) {
> -        if (machine_kernel_irqchip_split(machine)) {
> +        if (kvm_kernel_irqchip_split()) {
>               perror("Split IRQ chip mode not supported.");
>               exit(1);
>           } else {
> @@ -2052,7 +2052,7 @@ static int kvm_init(MachineState *ms)
>       }
>   
>       if (machine_kernel_irqchip_allowed(ms)) {
> -        kvm_irqchip_create(ms, s);
> +        kvm_irqchip_create(s);
>       }
>   
>       if (kvm_eventfds_allowed) {
> @@ -2969,6 +2969,21 @@ static void kvm_set_kvm_shadow_mem(Object *obj, Visitor *v,
>       s->kvm_shadow_mem = value;
>   }
>   
> +bool kvm_kernel_irqchip_allowed(void)
> +{
> +    return machine_kernel_irqchip_allowed(current_machine);
> +}
> +
> +bool kvm_kernel_irqchip_required(void)
> +{
> +    return machine_kernel_irqchip_required(current_machine);
> +}
> +
> +bool kvm_kernel_irqchip_split(void)
> +{
> +    return machine_kernel_irqchip_split(current_machine);
> +}
> +
>   static void kvm_accel_instance_init(Object *obj)
>   {
>       KVMState *s = KVM_STATE(obj);
> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
> index 91cd4c2..928efaa 100644
> --- a/hw/ppc/e500.c
> +++ b/hw/ppc/e500.c
> @@ -801,10 +801,10 @@ static DeviceState *ppce500_init_mpic(PPCE500MachineState *pms,
>       if (kvm_enabled()) {
>           Error *err = NULL;
>   
> -        if (machine_kernel_irqchip_allowed(machine)) {
> +        if (kvm_kernel_irqchip_allowed()) {
>               dev = ppce500_init_mpic_kvm(pmc, irqs, &err);
>           }
> -        if (machine_kernel_irqchip_required(machine) && !dev) {
> +        if (kvm_kernel_irqchip_required() && !dev) {
>               error_reportf_err(err,
>                                 "kernel_irqchip requested but unavailable: ");
>               exit(1);
> diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> index d6bb7fd..c3f8870 100644
> --- a/hw/ppc/spapr_irq.c
> +++ b/hw/ppc/spapr_irq.c
> @@ -77,9 +77,9 @@ int spapr_irq_init_kvm(int (*fn)(SpaprInterruptController *, Error **),
>       MachineState *machine = MACHINE(qdev_get_machine());
>       Error *local_err = NULL;
>   
> -    if (kvm_enabled() && machine_kernel_irqchip_allowed(machine)) {
> +    if (kvm_enabled() && kvm_kernel_irqchip_allowed()) {
>           if (fn(intc, &local_err) < 0) {
> -            if (machine_kernel_irqchip_required(machine)) {
> +            if (kvm_kernel_irqchip_required()) {
>                   error_prepend(&local_err,
>                                 "kernel_irqchip requested but unavailable: ");
>                   error_propagate(errp, local_err);
> @@ -184,7 +184,7 @@ static int spapr_irq_check(SpaprMachineState *spapr, Error **errp)
>        */
>       if (kvm_enabled() &&
>           spapr->irq == &spapr_irq_dual &&
> -        machine_kernel_irqchip_required(machine) &&
> +        kvm_kernel_irqchip_required() &&
>           xics_kvm_has_broken_disconnect(spapr)) {
>           error_setg(errp, "KVM is too old to support ic-mode=dual,kernel-irqchip=on");
>           return -1;
> @@ -290,12 +290,12 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
>       MachineState *machine = MACHINE(spapr);
>       SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
>   
> -    if (machine_kernel_irqchip_split(machine)) {
> +    if (kvm_enabled() && kvm_kernel_irqchip_split()) {
>           error_setg(errp, "kernel_irqchip split mode not supported on pseries");
>           return;
>       }
>   
> -    if (!kvm_enabled() && machine_kernel_irqchip_required(machine)) {
> +    if (!kvm_enabled() && kvm_kernel_irqchip_required()) {
>           error_setg(errp,
>                      "kernel_irqchip requested but only available with KVM");
>           return;
> diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
> index 9fe233b..aaf2a50 100644
> --- a/include/sysemu/kvm.h
> +++ b/include/sysemu/kvm.h
> @@ -519,10 +519,13 @@ void kvm_pc_gsi_handler(void *opaque, int n, int level);
>   void kvm_pc_setup_irq_routing(bool pci_enabled);
>   void kvm_init_irq_routing(KVMState *s);
>   
> +bool kvm_kernel_irqchip_allowed(void);
> +bool kvm_kernel_irqchip_required(void);
> +bool kvm_kernel_irqchip_split(void);
> +
>   /**
>    * kvm_arch_irqchip_create:
>    * @KVMState: The KVMState pointer
> - * @MachineState: The MachineState pointer
>    *
>    * Allow architectures to create an in-kernel irq chip themselves.
>    *
> @@ -530,7 +533,7 @@ void kvm_init_irq_routing(KVMState *s);
>    *            0: irq chip was not created
>    *          > 0: irq chip was created
>    */
> -int kvm_arch_irqchip_create(MachineState *ms, KVMState *s);
> +int kvm_arch_irqchip_create(KVMState *s);
>   
>   /**
>    * kvm_set_one_reg - set a register value in KVM via KVM_SET_ONE_REG ioctl
> diff --git a/target/arm/kvm.c b/target/arm/kvm.c
> index 5b82cef..b87b59a 100644
> --- a/target/arm/kvm.c
> +++ b/target/arm/kvm.c
> @@ -741,11 +741,11 @@ void kvm_arch_init_irq_routing(KVMState *s)
>   {
>   }
>   
> -int kvm_arch_irqchip_create(MachineState *ms, KVMState *s)
> +int kvm_arch_irqchip_create(KVMState *s)
>   {
> -     if (machine_kernel_irqchip_split(ms)) {
> -         perror("-machine kernel_irqchip=split is not supported on ARM.");
> -         exit(1);
> +    if (kvm_kernel_irqchip_split()) {
> +        perror("-machine kernel_irqchip=split is not supported on ARM.");
> +        exit(1);
>       }
>   
>       /* If we can create the VGIC using the newer device control API, we
> diff --git a/target/i386/kvm.c b/target/i386/kvm.c
> index 62ce681..ef63f3a 100644
> --- a/target/i386/kvm.c
> +++ b/target/i386/kvm.c
> @@ -4494,10 +4494,10 @@ void kvm_arch_init_irq_routing(KVMState *s)
>       }
>   }
>   
> -int kvm_arch_irqchip_create(MachineState *ms, KVMState *s)
> +int kvm_arch_irqchip_create(KVMState *s)
>   {
>       int ret;
> -    if (machine_kernel_irqchip_split(ms)) {
> +    if (kvm_kernel_irqchip_split()) {
>           ret = kvm_vm_enable_cap(s, KVM_CAP_SPLIT_IRQCHIP, 0, 24);
>           if (ret) {
>               error_report("Could not enable split irqchip mode: %s",
> diff --git a/target/mips/kvm.c b/target/mips/kvm.c
> index 578bc14..de3e26e 100644
> --- a/target/mips/kvm.c
> +++ b/target/mips/kvm.c
> @@ -57,7 +57,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
>       return 0;
>   }
>   
> -int kvm_arch_irqchip_create(MachineState *ms, KVMState *s)
> +int kvm_arch_irqchip_create(KVMState *s)
>   {
>       return 0;
>   }
> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> index c77f984..461dc6d 100644
> --- a/target/ppc/kvm.c
> +++ b/target/ppc/kvm.c
> @@ -152,7 +152,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
>       return 0;
>   }
>   
> -int kvm_arch_irqchip_create(MachineState *ms, KVMState *s)
> +int kvm_arch_irqchip_create(KVMState *s)
>   {
>       return 0;
>   }
> diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
> index 0c9d14b..f3a742b 100644
> --- a/target/s390x/kvm.c
> +++ b/target/s390x/kvm.c
> @@ -374,7 +374,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
>       return 0;
>   }
>   
> -int kvm_arch_irqchip_create(MachineState *ms, KVMState *s)
> +int kvm_arch_irqchip_create(KVMState *s)
>   {
>       return 0;
>   }
>

Patch
diff mbox series

diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index f0b9294..c0a6351 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -1760,7 +1760,7 @@  void kvm_irqchip_set_qemuirq_gsi(KVMState *s, qemu_irq irq, int gsi)
     g_hash_table_insert(s->gsimap, irq, GINT_TO_POINTER(gsi));
 }
 
-static void kvm_irqchip_create(MachineState *machine, KVMState *s)
+static void kvm_irqchip_create(KVMState *s)
 {
     int ret;
 
@@ -1778,9 +1778,9 @@  static void kvm_irqchip_create(MachineState *machine, KVMState *s)
 
     /* First probe and see if there's a arch-specific hook to create the
      * in-kernel irqchip for us */
-    ret = kvm_arch_irqchip_create(machine, s);
+    ret = kvm_arch_irqchip_create(s);
     if (ret == 0) {
-        if (machine_kernel_irqchip_split(machine)) {
+        if (kvm_kernel_irqchip_split()) {
             perror("Split IRQ chip mode not supported.");
             exit(1);
         } else {
@@ -2052,7 +2052,7 @@  static int kvm_init(MachineState *ms)
     }
 
     if (machine_kernel_irqchip_allowed(ms)) {
-        kvm_irqchip_create(ms, s);
+        kvm_irqchip_create(s);
     }
 
     if (kvm_eventfds_allowed) {
@@ -2969,6 +2969,21 @@  static void kvm_set_kvm_shadow_mem(Object *obj, Visitor *v,
     s->kvm_shadow_mem = value;
 }
 
+bool kvm_kernel_irqchip_allowed(void)
+{
+    return machine_kernel_irqchip_allowed(current_machine);
+}
+
+bool kvm_kernel_irqchip_required(void)
+{
+    return machine_kernel_irqchip_required(current_machine);
+}
+
+bool kvm_kernel_irqchip_split(void)
+{
+    return machine_kernel_irqchip_split(current_machine);
+}
+
 static void kvm_accel_instance_init(Object *obj)
 {
     KVMState *s = KVM_STATE(obj);
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 91cd4c2..928efaa 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -801,10 +801,10 @@  static DeviceState *ppce500_init_mpic(PPCE500MachineState *pms,
     if (kvm_enabled()) {
         Error *err = NULL;
 
-        if (machine_kernel_irqchip_allowed(machine)) {
+        if (kvm_kernel_irqchip_allowed()) {
             dev = ppce500_init_mpic_kvm(pmc, irqs, &err);
         }
-        if (machine_kernel_irqchip_required(machine) && !dev) {
+        if (kvm_kernel_irqchip_required() && !dev) {
             error_reportf_err(err,
                               "kernel_irqchip requested but unavailable: ");
             exit(1);
diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
index d6bb7fd..c3f8870 100644
--- a/hw/ppc/spapr_irq.c
+++ b/hw/ppc/spapr_irq.c
@@ -77,9 +77,9 @@  int spapr_irq_init_kvm(int (*fn)(SpaprInterruptController *, Error **),
     MachineState *machine = MACHINE(qdev_get_machine());
     Error *local_err = NULL;
 
-    if (kvm_enabled() && machine_kernel_irqchip_allowed(machine)) {
+    if (kvm_enabled() && kvm_kernel_irqchip_allowed()) {
         if (fn(intc, &local_err) < 0) {
-            if (machine_kernel_irqchip_required(machine)) {
+            if (kvm_kernel_irqchip_required()) {
                 error_prepend(&local_err,
                               "kernel_irqchip requested but unavailable: ");
                 error_propagate(errp, local_err);
@@ -184,7 +184,7 @@  static int spapr_irq_check(SpaprMachineState *spapr, Error **errp)
      */
     if (kvm_enabled() &&
         spapr->irq == &spapr_irq_dual &&
-        machine_kernel_irqchip_required(machine) &&
+        kvm_kernel_irqchip_required() &&
         xics_kvm_has_broken_disconnect(spapr)) {
         error_setg(errp, "KVM is too old to support ic-mode=dual,kernel-irqchip=on");
         return -1;
@@ -290,12 +290,12 @@  void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
     MachineState *machine = MACHINE(spapr);
     SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
 
-    if (machine_kernel_irqchip_split(machine)) {
+    if (kvm_enabled() && kvm_kernel_irqchip_split()) {
         error_setg(errp, "kernel_irqchip split mode not supported on pseries");
         return;
     }
 
-    if (!kvm_enabled() && machine_kernel_irqchip_required(machine)) {
+    if (!kvm_enabled() && kvm_kernel_irqchip_required()) {
         error_setg(errp,
                    "kernel_irqchip requested but only available with KVM");
         return;
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 9fe233b..aaf2a50 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -519,10 +519,13 @@  void kvm_pc_gsi_handler(void *opaque, int n, int level);
 void kvm_pc_setup_irq_routing(bool pci_enabled);
 void kvm_init_irq_routing(KVMState *s);
 
+bool kvm_kernel_irqchip_allowed(void);
+bool kvm_kernel_irqchip_required(void);
+bool kvm_kernel_irqchip_split(void);
+
 /**
  * kvm_arch_irqchip_create:
  * @KVMState: The KVMState pointer
- * @MachineState: The MachineState pointer
  *
  * Allow architectures to create an in-kernel irq chip themselves.
  *
@@ -530,7 +533,7 @@  void kvm_init_irq_routing(KVMState *s);
  *            0: irq chip was not created
  *          > 0: irq chip was created
  */
-int kvm_arch_irqchip_create(MachineState *ms, KVMState *s);
+int kvm_arch_irqchip_create(KVMState *s);
 
 /**
  * kvm_set_one_reg - set a register value in KVM via KVM_SET_ONE_REG ioctl
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index 5b82cef..b87b59a 100644
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -741,11 +741,11 @@  void kvm_arch_init_irq_routing(KVMState *s)
 {
 }
 
-int kvm_arch_irqchip_create(MachineState *ms, KVMState *s)
+int kvm_arch_irqchip_create(KVMState *s)
 {
-     if (machine_kernel_irqchip_split(ms)) {
-         perror("-machine kernel_irqchip=split is not supported on ARM.");
-         exit(1);
+    if (kvm_kernel_irqchip_split()) {
+        perror("-machine kernel_irqchip=split is not supported on ARM.");
+        exit(1);
     }
 
     /* If we can create the VGIC using the newer device control API, we
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index 62ce681..ef63f3a 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -4494,10 +4494,10 @@  void kvm_arch_init_irq_routing(KVMState *s)
     }
 }
 
-int kvm_arch_irqchip_create(MachineState *ms, KVMState *s)
+int kvm_arch_irqchip_create(KVMState *s)
 {
     int ret;
-    if (machine_kernel_irqchip_split(ms)) {
+    if (kvm_kernel_irqchip_split()) {
         ret = kvm_vm_enable_cap(s, KVM_CAP_SPLIT_IRQCHIP, 0, 24);
         if (ret) {
             error_report("Could not enable split irqchip mode: %s",
diff --git a/target/mips/kvm.c b/target/mips/kvm.c
index 578bc14..de3e26e 100644
--- a/target/mips/kvm.c
+++ b/target/mips/kvm.c
@@ -57,7 +57,7 @@  int kvm_arch_init(MachineState *ms, KVMState *s)
     return 0;
 }
 
-int kvm_arch_irqchip_create(MachineState *ms, KVMState *s)
+int kvm_arch_irqchip_create(KVMState *s)
 {
     return 0;
 }
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index c77f984..461dc6d 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -152,7 +152,7 @@  int kvm_arch_init(MachineState *ms, KVMState *s)
     return 0;
 }
 
-int kvm_arch_irqchip_create(MachineState *ms, KVMState *s)
+int kvm_arch_irqchip_create(KVMState *s)
 {
     return 0;
 }
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index 0c9d14b..f3a742b 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -374,7 +374,7 @@  int kvm_arch_init(MachineState *ms, KVMState *s)
     return 0;
 }
 
-int kvm_arch_irqchip_create(MachineState *ms, KVMState *s)
+int kvm_arch_irqchip_create(KVMState *s)
 {
     return 0;
 }