Commit b5d54bd4 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'qemu-kvm/uq/master' into stable-1.5 



* qemu-kvm/uq/master:
  kvm-stub: fix compilation
  kvm: shorten the parameter list for get_real_device()
  kvm: i386: fix LAPIC TSC deadline timer save/restore
  kvm-all.c: max_cpus should not exceed KVM vcpu limit
  kvm: Simplify kvm_handle_io
  kvm: x86: fix setting IA32_FEATURE_CONTROL with nested VMX disabled
  kvm: add KVM_IRQFD_FLAG_RESAMPLE support
  kvm: migrate vPMU state
  target-i386: remove tabs from target-i386/cpu.h
  Initialize IA32_FEATURE_CONTROL MSR in reset and migration

Conflicts:
	target-i386/cpu.h
	target-i386/kvm.c

aliguori: fixup trivial conflicts due to whitespace and added cpu
          argument

Signed-off-by: default avatarAnthony Liguori <anthony@codemonkey.ws>
parents e560992f 821c808b

hw/i386/kvm/pci-assign.c

+4 −5
Original line number Diff line number Diff line
@@ -568,8 +568,7 @@ static int get_real_device_id(const char *devpath, uint16_t *val) 
    return get_real_id(devpath, "device", val);

}



static int get_real_device(AssignedDevice *pci_dev, uint16_t r_seg,

                           uint8_t r_bus, uint8_t r_dev, uint8_t r_func)

static int get_real_device(AssignedDevice *pci_dev)

{

    char dir[128], name[128];

    int fd, r = 0, v;
@@ -582,7 +581,8 @@ static int get_real_device(AssignedDevice *pci_dev, uint16_t r_seg, 
    dev->region_number = 0;



    snprintf(dir, sizeof(dir), "/sys/bus/pci/devices/%04x:%02x:%02x.%x/",

             r_seg, r_bus, r_dev, r_func);

             pci_dev->host.domain, pci_dev->host.bus,

             pci_dev->host.slot, pci_dev->host.function);



    snprintf(name, sizeof(name), "%sconfig", dir);
@@ -1769,8 +1769,7 @@ static int assigned_initfn(struct PCIDevice *pci_dev) 
    memcpy(dev->emulate_config_write, dev->emulate_config_read,

           sizeof(dev->emulate_config_read));



    if (get_real_device(dev, dev->host.domain, dev->host.bus,

                        dev->host.slot, dev->host.function)) {

    if (get_real_device(dev)) {

        error_report("pci-assign: Error: Couldn't get real device (%s)!",

                     dev->dev.qdev.id);

        goto out;

hw/misc/vfio.c

+2 −2
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ static int vfio_msix_vector_do_use(PCIDevice *pdev, unsigned int nr, 
    vector->virq = msg ? kvm_irqchip_add_msi_route(kvm_state, *msg) : -1;

    if (vector->virq < 0 ||

        kvm_irqchip_add_irqfd_notifier(kvm_state, &vector->interrupt,

                                       vector->virq) < 0) {

                                       NULL, vector->virq) < 0) {

        if (vector->virq >= 0) {

            kvm_irqchip_release_virq(kvm_state, vector->virq);

            vector->virq = -1;
@@ -814,7 +814,7 @@ retry: 
        vector->virq = kvm_irqchip_add_msi_route(kvm_state, msg);

        if (vector->virq < 0 ||

            kvm_irqchip_add_irqfd_notifier(kvm_state, &vector->interrupt,

                                           vector->virq) < 0) {

                                           NULL, vector->virq) < 0) {

            qemu_set_fd_handler(event_notifier_get_fd(&vector->interrupt),

                                vfio_msi_interrupt, NULL, vector);

        }

hw/virtio/virtio-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static int kvm_virtio_pci_irqfd_use(VirtIOPCIProxy *proxy, 
    VirtQueue *vq = virtio_get_queue(proxy->vdev, queue_no);

    EventNotifier *n = virtio_queue_get_guest_notifier(vq);

    int ret;

    ret = kvm_irqchip_add_irqfd_notifier(kvm_state, n, irqfd->virq);

    ret = kvm_irqchip_add_irqfd_notifier(kvm_state, n, NULL, irqfd->virq);

    return ret;

}

include/sysemu/kvm.h

+2 −1
Original line number Diff line number Diff line
@@ -309,7 +309,8 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg); 
int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg);

void kvm_irqchip_release_virq(KVMState *s, int virq);



int kvm_irqchip_add_irqfd_notifier(KVMState *s, EventNotifier *n, int virq);

int kvm_irqchip_add_irqfd_notifier(KVMState *s, EventNotifier *n,

                                   EventNotifier *rn, int virq);

int kvm_irqchip_remove_irqfd_notifier(KVMState *s, EventNotifier *n, int virq);

void kvm_pc_gsi_handler(void *opaque, int n, int level);

void kvm_pc_setup_irq_routing(bool pci_enabled);

kvm-all.c

+22 −30
Original line number Diff line number Diff line
@@ -1230,7 +1230,8 @@ int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg) 
    return kvm_update_routing_entry(s, &kroute);

}



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

static int kvm_irqchip_assign_irqfd(KVMState *s, int fd, int rfd, int virq,

                                    bool assign)

{

    struct kvm_irqfd irqfd = {

        .fd = fd,
@@ -1238,6 +1239,11 @@ static int kvm_irqchip_assign_irqfd(KVMState *s, int fd, int virq, bool assign) 
        .flags = assign ? 0 : KVM_IRQFD_FLAG_DEASSIGN,

    };



    if (rfd != -1) {

        irqfd.flags |= KVM_IRQFD_FLAG_RESAMPLE;

        irqfd.resamplefd = rfd;

    }



    if (!kvm_irqfds_enabled()) {

        return -ENOSYS;

    }
@@ -1276,14 +1282,17 @@ int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg) 
}

#endif /* !KVM_CAP_IRQ_ROUTING */



int kvm_irqchip_add_irqfd_notifier(KVMState *s, EventNotifier *n, int virq)

int kvm_irqchip_add_irqfd_notifier(KVMState *s, EventNotifier *n,

                                   EventNotifier *rn, int virq)

{

    return kvm_irqchip_assign_irqfd(s, event_notifier_get_fd(n), virq, true);

    return kvm_irqchip_assign_irqfd(s, event_notifier_get_fd(n),

           rn ? event_notifier_get_fd(rn) : -1, virq, true);

}



int kvm_irqchip_remove_irqfd_notifier(KVMState *s, EventNotifier *n, int virq)

{

    return kvm_irqchip_assign_irqfd(s, event_notifier_get_fd(n), virq, false);

    return kvm_irqchip_assign_irqfd(s, event_notifier_get_fd(n), -1, virq,

           false);

}



static int kvm_irqchip_create(KVMState *s)
@@ -1391,6 +1400,13 @@ int kvm_init(void) 
        goto err;

    }



    if (max_cpus > max_vcpus) {

        ret = -EINVAL;

        fprintf(stderr, "Number of hotpluggable cpus requested (%d) exceeds max cpus "

                "supported by KVM (%d)\n", max_cpus, max_vcpus);

        goto err;

    }



    s->vmfd = kvm_ioctl(s, KVM_CREATE_VM, 0);

    if (s->vmfd < 0) {

#ifdef TARGET_S390X
@@ -1499,32 +1515,8 @@ static void kvm_handle_io(uint16_t port, void *data, int direction, int size, 
    uint8_t *ptr = data;



    for (i = 0; i < count; i++) {

        if (direction == KVM_EXIT_IO_IN) {

            switch (size) {

            case 1:

                stb_p(ptr, cpu_inb(port));

                break;

            case 2:

                stw_p(ptr, cpu_inw(port));

                break;

            case 4:

                stl_p(ptr, cpu_inl(port));

                break;

            }

        } else {

            switch (size) {

            case 1:

                cpu_outb(port, ldub_p(ptr));

                break;

            case 2:

                cpu_outw(port, lduw_p(ptr));

                break;

            case 4:

                cpu_outl(port, ldl_p(ptr));

                break;

            }

        }



        address_space_rw(&address_space_io, port, ptr, size,

                         direction == KVM_EXIT_IO_OUT);

        ptr += size;

    }

}