Commit 0a3c7385 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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



# By Jan Kiszka (1) and others
# Via Gleb Natapov
* qemu-kvm/uq/master:
  kvm: Fix uninitialized cpuid_data
  pci-assign: Remove dead code for direct I/O region access from userspace
  KVM: x86: fix typo in KVM_GET_XCRS

Message-id: cover.1385040432.git.gleb@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parents ffb62da7 ef4cbe14

hw/i386/kvm/pci-assign.c

+10 −46
Original line number Diff line number Diff line
@@ -154,56 +154,20 @@ static uint64_t assigned_dev_ioport_rw(AssignedDevRegion *dev_region, 
    uint64_t val = 0;

    int fd = dev_region->region->resource_fd;



    if (fd >= 0) {

    if (data) {

        DEBUG("pwrite data=%" PRIx64 ", size=%d, e_phys=" TARGET_FMT_plx

              ", addr="TARGET_FMT_plx"\n", *data, size, addr, addr);

        if (pwrite(fd, data, size, addr) != size) {

                error_report("%s - pwrite failed %s",

                             __func__, strerror(errno));

            error_report("%s - pwrite failed %s", __func__, strerror(errno));

        }

    } else {

        if (pread(fd, &val, size, addr) != size) {

                error_report("%s - pread failed %s",

                             __func__, strerror(errno));

            error_report("%s - pread failed %s", __func__, strerror(errno));

            val = (1UL << (size * 8)) - 1;

        }

        DEBUG("pread val=%" PRIx64 ", size=%d, e_phys=" TARGET_FMT_plx

              ", addr=" TARGET_FMT_plx "\n", val, size, addr, addr);

    }

    } else {

        uint32_t port = addr + dev_region->u.r_baseport;



        if (data) {

            DEBUG("out data=%" PRIx64 ", size=%d, e_phys=" TARGET_FMT_plx

                  ", host=%x\n", *data, size, addr, port);

            switch (size) {

            case 1:

                outb(*data, port);

                break;

            case 2:

                outw(*data, port);

                break;

            case 4:

                outl(*data, port);

                break;

            }

        } else {

            switch (size) {

            case 1:

                val = inb(port);

                break;

            case 2:

                val = inw(port);

                break;

            case 4:

                val = inl(port);

                break;

            }

            DEBUG("in data=%" PRIx64 ", size=%d, e_phys=" TARGET_FMT_plx

                  ", host=%x\n", val, size, addr, port);

        }

    }

    return val;

}

target-i386/kvm.c

+4 −9
Original line number Diff line number Diff line
@@ -456,11 +456,12 @@ int kvm_arch_init_vcpu(CPUState *cs) 
    uint32_t signature[3];

    int r;



    memset(&cpuid_data, 0, sizeof(cpuid_data));



    cpuid_i = 0;



    /* Paravirtualization CPUIDs */

    c = &cpuid_data.entries[cpuid_i++];

    memset(c, 0, sizeof(*c));

    c->function = KVM_CPUID_SIGNATURE;

    if (!hyperv_enabled(cpu)) {

        memcpy(signature, "KVMKVMKVM\0\0\0", 12);
@@ -474,7 +475,6 @@ int kvm_arch_init_vcpu(CPUState *cs) 
    c->edx = signature[2];



    c = &cpuid_data.entries[cpuid_i++];

    memset(c, 0, sizeof(*c));

    c->function = KVM_CPUID_FEATURES;

    c->eax = env->features[FEAT_KVM];
@@ -483,13 +483,11 @@ int kvm_arch_init_vcpu(CPUState *cs) 
        c->eax = signature[0];



        c = &cpuid_data.entries[cpuid_i++];

        memset(c, 0, sizeof(*c));

        c->function = HYPERV_CPUID_VERSION;

        c->eax = 0x00001bbc;

        c->ebx = 0x00060001;



        c = &cpuid_data.entries[cpuid_i++];

        memset(c, 0, sizeof(*c));

        c->function = HYPERV_CPUID_FEATURES;

        if (cpu->hyperv_relaxed_timing) {

            c->eax |= HV_X64_MSR_HYPERCALL_AVAILABLE;
@@ -500,7 +498,6 @@ int kvm_arch_init_vcpu(CPUState *cs) 
        }



        c = &cpuid_data.entries[cpuid_i++];

        memset(c, 0, sizeof(*c));

        c->function = HYPERV_CPUID_ENLIGHTMENT_INFO;

        if (cpu->hyperv_relaxed_timing) {

            c->eax |= HV_X64_RELAXED_TIMING_RECOMMENDED;
@@ -511,13 +508,11 @@ int kvm_arch_init_vcpu(CPUState *cs) 
        c->ebx = cpu->hyperv_spinlock_attempts;



        c = &cpuid_data.entries[cpuid_i++];

        memset(c, 0, sizeof(*c));

        c->function = HYPERV_CPUID_IMPLEMENT_LIMITS;

        c->eax = 0x40;

        c->ebx = 0x40;



        c = &cpuid_data.entries[cpuid_i++];

        memset(c, 0, sizeof(*c));

        c->function = KVM_CPUID_SIGNATURE_NEXT;

        memcpy(signature, "KVMKVMKVM\0\0\0", 12);

        c->eax = 0;
@@ -1314,8 +1309,8 @@ static int kvm_get_xcrs(X86CPU *cpu) 


    for (i = 0; i < xcrs.nr_xcrs; i++) {

        /* Only support xcr0 now */

        if (xcrs.xcrs[0].xcr == 0) {

            env->xcr0 = xcrs.xcrs[0].value;

        if (xcrs.xcrs[i].xcr == 0) {

            env->xcr0 = xcrs.xcrs[i].value;

            break;

        }

    }