hostmem: add properties for NUMA memory policy

[qemu.git] / kvm-all.c

diff --git a/kvm-all.c b/kvm-all.c
index 82a91199e11a4544266d956a75fb81dc845d9608..92f56d8a315b27e20a0caf13075df303dde04cb6 100644 (file)
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -27,6 +27,7 @@
 #include "sysemu/sysemu.h"
 #include "hw/hw.h"
 #include "hw/pci/msi.h"
 #include "sysemu/sysemu.h"
 #include "hw/hw.h"
 #include "hw/pci/msi.h"

+#include "hw/s390x/adapter.h"

 #include "exec/gdbstub.h"
 #include "sysemu/kvm.h"
 #include "qemu/bswap.h"
 #include "exec/gdbstub.h"
 #include "sysemu/kvm.h"
 #include "qemu/bswap.h"


@@ -112,6 +113,7 @@ KVMState *kvm_state;
 bool kvm_kernel_irqchip;
 bool kvm_async_interrupts_allowed;
 bool kvm_halt_in_kernel_allowed;
 bool kvm_kernel_irqchip;
 bool kvm_async_interrupts_allowed;
 bool kvm_halt_in_kernel_allowed;

+bool kvm_eventfds_allowed;

 bool kvm_irqfds_allowed;
 bool kvm_msi_via_irqfd_allowed;
 bool kvm_gsi_routing_allowed;
 bool kvm_irqfds_allowed;
 bool kvm_msi_via_irqfd_allowed;
 bool kvm_gsi_routing_allowed;


@@ -223,13 +225,6 @@ static int kvm_set_user_memory_region(KVMState *s, KVMSlot *slot)
     return kvm_vm_ioctl(s, KVM_SET_USER_MEMORY_REGION, &mem);
 }
 
     return kvm_vm_ioctl(s, KVM_SET_USER_MEMORY_REGION, &mem);
 }
 

-static void kvm_reset_vcpu(void *opaque)
-{
-    CPUState *cpu = opaque;
-
-    kvm_arch_reset_vcpu(cpu);
-}
-

 int kvm_init_vcpu(CPUState *cpu)
 {
     KVMState *s = kvm_state;
 int kvm_init_vcpu(CPUState *cpu)
 {
     KVMState *s = kvm_state;


@@ -269,10 +264,6 @@ int kvm_init_vcpu(CPUState *cpu)
     }
 
     ret = kvm_arch_init_vcpu(cpu);
     }
 
     ret = kvm_arch_init_vcpu(cpu);

-    if (ret == 0) {
-        qemu_register_reset(kvm_reset_vcpu, cpu);
-        kvm_arch_reset_vcpu(cpu);
-    }

 err:
     return ret;
 }
 err:
     return ret;
 }


@@ -1247,6 +1238,35 @@ static int kvm_irqchip_assign_irqfd(KVMState *s, int fd, int rfd, int virq,
     return kvm_vm_ioctl(s, KVM_IRQFD, &irqfd);
 }
 
     return kvm_vm_ioctl(s, KVM_IRQFD, &irqfd);
 }
 

+int kvm_irqchip_add_adapter_route(KVMState *s, AdapterInfo *adapter)
+{
+    struct kvm_irq_routing_entry kroute;
+    int virq;
+
+    if (!kvm_gsi_routing_enabled()) {
+        return -ENOSYS;
+    }
+
+    virq = kvm_irqchip_get_virq(s);
+    if (virq < 0) {
+        return virq;
+    }
+
+    kroute.gsi = virq;
+    kroute.type = KVM_IRQ_ROUTING_S390_ADAPTER;
+    kroute.flags = 0;
+    kroute.u.adapter.summary_addr = adapter->summary_addr;
+    kroute.u.adapter.ind_addr = adapter->ind_addr;
+    kroute.u.adapter.summary_offset = adapter->summary_offset;
+    kroute.u.adapter.ind_offset = adapter->ind_offset;
+    kroute.u.adapter.adapter_id = adapter->adapter_id;
+
+    kvm_add_routing_entry(s, &kroute);
+    kvm_irqchip_commit_routes(s);
+
+    return virq;
+}
+

 #else /* !KVM_CAP_IRQ_ROUTING */
 
 void kvm_init_irq_routing(KVMState *s)
 #else /* !KVM_CAP_IRQ_ROUTING */
 
 void kvm_init_irq_routing(KVMState *s)


@@ -1267,6 +1287,11 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg)
     return -ENOSYS;
 }
 
     return -ENOSYS;
 }
 

+int kvm_irqchip_add_adapter_route(KVMState *s, AdapterInfo *adapter)
+{
+    return -ENOSYS;
+}
+

 static int kvm_irqchip_assign_irqfd(KVMState *s, int fd, int virq, bool assign)
 {
     abort();
 static int kvm_irqchip_assign_irqfd(KVMState *s, int fd, int virq, bool assign)
 {
     abort();


@@ -1296,7 +1321,8 @@ static int kvm_irqchip_create(KVMState *s)
     int ret;
 
     if (!qemu_opt_get_bool(qemu_get_machine_opts(), "kernel_irqchip", true) ||
     int ret;
 
     if (!qemu_opt_get_bool(qemu_get_machine_opts(), "kernel_irqchip", true) ||

-        !kvm_check_extension(s, KVM_CAP_IRQCHIP)) {
+        (!kvm_check_extension(s, KVM_CAP_IRQCHIP) &&
+         (kvm_vm_enable_cap(s, KVM_CAP_S390_IRQCHIP, 0) < 0))) {

         return 0;
     }
 
         return 0;
     }
 


@@ -1341,7 +1367,7 @@ static int kvm_max_vcpus(KVMState *s)
     return (ret) ? ret : kvm_recommended_vcpus(s);
 }
 
     return (ret) ? ret : kvm_recommended_vcpus(s);
 }
 

-int kvm_init(QEMUMachine *machine)
+int kvm_init(MachineClass *mc)

 {
     static const char upgrade_note[] =
         "Please upgrade to at least kernel 2.6.29 or recent kvm-kmod\n"
 {
     static const char upgrade_note[] =
         "Please upgrade to at least kernel 2.6.29 or recent kvm-kmod\n"


@@ -1385,7 +1411,7 @@ int kvm_init(QEMUMachine *machine)
 
     ret = kvm_ioctl(s, KVM_GET_API_VERSION, 0);
     if (ret < KVM_API_VERSION) {
 
     ret = kvm_ioctl(s, KVM_GET_API_VERSION, 0);
     if (ret < KVM_API_VERSION) {

-        if (ret > 0) {
+        if (ret >= 0) {

             ret = -EINVAL;
         }
         fprintf(stderr, "kvm version too old\n");
             ret = -EINVAL;
         }
         fprintf(stderr, "kvm version too old\n");


@@ -1433,9 +1459,10 @@ int kvm_init(QEMUMachine *machine)
     }
 
     kvm_type = qemu_opt_get(qemu_get_machine_opts(), "kvm-type");
     }
 
     kvm_type = qemu_opt_get(qemu_get_machine_opts(), "kvm-type");

-    if (machine->kvm_type) {
-        type = machine->kvm_type(kvm_type);
+    if (mc->kvm_type) {
+        type = mc->kvm_type(kvm_type);

     } else if (kvm_type) {
     } else if (kvm_type) {

+        ret = -EINVAL;

         fprintf(stderr, "Invalid argument kvm-type=%s\n", kvm_type);
         goto err;
     }
         fprintf(stderr, "Invalid argument kvm-type=%s\n", kvm_type);
         goto err;
     }


@@ -1515,6 +1542,9 @@ int kvm_init(QEMUMachine *machine)
         (kvm_check_extension(s, KVM_CAP_READONLY_MEM) > 0);
 #endif
 
         (kvm_check_extension(s, KVM_CAP_READONLY_MEM) > 0);
 #endif
 

+    kvm_eventfds_allowed =
+        (kvm_check_extension(s, KVM_CAP_IOEVENTFD) > 0);
+

     ret = kvm_arch_init(s);
     if (ret < 0) {
         goto err;
     ret = kvm_arch_init(s);
     if (ret < 0) {
         goto err;


@@ -1536,6 +1566,7 @@ int kvm_init(QEMUMachine *machine)
     return 0;
 
 err:
     return 0;
 
 err:

+    assert(ret < 0);

     if (s->vmfd >= 0) {
         close(s->vmfd);
     }
     if (s->vmfd >= 0) {
         close(s->vmfd);
     }


@@ -2114,3 +2145,31 @@ int kvm_create_device(KVMState *s, uint64_t type, bool test)
 
     return test ? 0 : create_dev.fd;
 }
 
     return test ? 0 : create_dev.fd;
 }

+
+int kvm_set_one_reg(CPUState *cs, uint64_t id, void *source)
+{
+    struct kvm_one_reg reg;
+    int r;
+
+    reg.id = id;
+    reg.addr = (uintptr_t) source;
+    r = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, &reg);
+    if (r) {
+        trace_kvm_failed_reg_set(id, strerror(r));
+    }
+    return r;
+}
+
+int kvm_get_one_reg(CPUState *cs, uint64_t id, void *target)
+{
+    struct kvm_one_reg reg;
+    int r;
+
+    reg.id = id;
+    reg.addr = (uintptr_t) target;
+    r = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, &reg);
+    if (r) {
+        trace_kvm_failed_reg_get(id, strerror(r));
+    }
+    return r;
+}