Commit d147f7e8 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



* iothread bugfix (Eduardo)
* Linux headers sync (Dave)
* .gitignore fix (Eric)
* KVM capability check fixes (Greg)
* kvmclock fix (Jim)

# gpg: Signature made Mon 02 Oct 2017 14:31:09 BST
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream:
  kvmclock: use the updated system_timer_msr
  kvm: check KVM_CAP_NR_VCPUS with kvm_vm_check_extension()
  kvm: check KVM_CAP_SYNC_MMU with kvm_vm_check_extension()
  linux-headers: sync against v4.14-rc1
  iothread: Make iothread_stop() idempotent
  scsi: Ignore executable for in-tree builds

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0b7fe5ae 346b1215

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
/qemu-version.h

/qemu-version.h.tmp

/module_block.h

/scsi/qemu-pr-helper

/vscclient

/vhost-user-scsi

/fsdev/virtfs-proxy-helper

accel/kvm/kvm-all.c

+27 −24
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ struct KVMState 
#endif

    int many_ioeventfds;

    int intx_set_mask;

    bool sync_mmu;

    /* The man page (and posix) say ioctl numbers are signed int, but

     * they're not.  Linux, glibc and *BSD all treat ioctl numbers as

     * unsigned, and treating them as signed here can break things */
@@ -1439,7 +1440,7 @@ static void kvm_irqchip_create(MachineState *machine, KVMState *s) 
 */

static int kvm_recommended_vcpus(KVMState *s)

{

    int ret = kvm_check_extension(s, KVM_CAP_NR_VCPUS);

    int ret = kvm_vm_check_extension(s, KVM_CAP_NR_VCPUS);

    return (ret) ? ret : 4;

}
@@ -1529,26 +1530,6 @@ static int kvm_init(MachineState *ms) 
        s->nr_slots = 32;

    }



    /* check the vcpu limits */

    soft_vcpus_limit = kvm_recommended_vcpus(s);

    hard_vcpus_limit = kvm_max_vcpus(s);



    while (nc->name) {

        if (nc->num > soft_vcpus_limit) {

            warn_report("Number of %s cpus requested (%d) exceeds "

                        "the recommended cpus supported by KVM (%d)",

                        nc->name, nc->num, soft_vcpus_limit);



            if (nc->num > hard_vcpus_limit) {

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

                        "the maximum cpus supported by KVM (%d)\n",

                        nc->name, nc->num, hard_vcpus_limit);

                exit(1);

            }

        }

        nc++;

    }



    kvm_type = qemu_opt_get(qemu_get_machine_opts(), "kvm-type");

    if (mc->kvm_type) {

        type = mc->kvm_type(kvm_type);
@@ -1583,6 +1564,27 @@ static int kvm_init(MachineState *ms) 
    }



    s->vmfd = ret;



    /* check the vcpu limits */

    soft_vcpus_limit = kvm_recommended_vcpus(s);

    hard_vcpus_limit = kvm_max_vcpus(s);



    while (nc->name) {

        if (nc->num > soft_vcpus_limit) {

            warn_report("Number of %s cpus requested (%d) exceeds "

                        "the recommended cpus supported by KVM (%d)",

                        nc->name, nc->num, soft_vcpus_limit);



            if (nc->num > hard_vcpus_limit) {

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

                        "the maximum cpus supported by KVM (%d)\n",

                        nc->name, nc->num, hard_vcpus_limit);

                exit(1);

            }

        }

        nc++;

    }



    missing_cap = kvm_check_extension_list(s, kvm_required_capabilites);

    if (!missing_cap) {

        missing_cap =
@@ -1664,6 +1666,8 @@ static int kvm_init(MachineState *ms) 


    s->many_ioeventfds = kvm_check_many_ioeventfds();



    s->sync_mmu = !!kvm_vm_check_extension(kvm_state, KVM_CAP_SYNC_MMU);



    return 0;



err:
@@ -2130,10 +2134,9 @@ int kvm_device_access(int fd, int group, uint64_t attr, 
    return err;

}



/* Return 1 on success, 0 on failure */

int kvm_has_sync_mmu(void)

bool kvm_has_sync_mmu(void)

{

    return kvm_check_extension(kvm_state, KVM_CAP_SYNC_MMU);

    return kvm_state->sync_mmu;

}



int kvm_has_vcpu_events(void)

accel/stubs/kvm-stub.c

+2 −2
Original line number Diff line number Diff line
@@ -64,9 +64,9 @@ int kvm_cpu_exec(CPUState *cpu) 
    abort();

}



int kvm_has_sync_mmu(void)

bool kvm_has_sync_mmu(void)

{

    return 0;

    return false;

}



int kvm_has_many_ioeventfds(void)

hw/i386/kvm/clock.c

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static uint64_t kvmclock_current_nsec(KVMClockState *s) 
{

    CPUState *cpu = first_cpu;

    CPUX86State *env = cpu->env_ptr;

    hwaddr kvmclock_struct_pa = env->system_time_msr & ~1ULL;

    hwaddr kvmclock_struct_pa;

    uint64_t migration_tsc = env->tsc;

    struct pvclock_vcpu_time_info time;

    uint64_t delta;
@@ -77,6 +77,7 @@ static uint64_t kvmclock_current_nsec(KVMClockState *s) 
        return 0;

    }



    kvmclock_struct_pa = env->system_time_msr & ~1ULL;

    cpu_physical_memory_read(kvmclock_struct_pa, &time, sizeof(time));



    assert(time.tsc_timestamp <= migration_tsc);

include/standard-headers/asm-x86/hyperv.h

+15 −4
Original line number Diff line number Diff line
@@ -149,12 +149,9 @@ 
 */

#define HV_X64_DEPRECATING_AEOI_RECOMMENDED	(1 << 9)



/*

 * HV_VP_SET available

 */

/* Recommend using the newer ExProcessorMasks interface */

#define HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED	(1 << 11)





/*

 * Crash notification flag.

 */
@@ -242,7 +239,11 @@ 
		(~((1ull << HV_X64_MSR_HYPERCALL_PAGE_ADDRESS_SHIFT) - 1))



/* Declare the various hypercall operations. */

#define HVCALL_FLUSH_VIRTUAL_ADDRESS_SPACE	0x0002

#define HVCALL_FLUSH_VIRTUAL_ADDRESS_LIST	0x0003

#define HVCALL_NOTIFY_LONG_SPIN_WAIT		0x0008

#define HVCALL_FLUSH_VIRTUAL_ADDRESS_SPACE_EX  0x0013

#define HVCALL_FLUSH_VIRTUAL_ADDRESS_LIST_EX   0x0014

#define HVCALL_POST_MESSAGE			0x005c

#define HVCALL_SIGNAL_EVENT			0x005d
@@ -259,6 +260,16 @@ 
#define HV_PROCESSOR_POWER_STATE_C2		2

#define HV_PROCESSOR_POWER_STATE_C3		3



#define HV_FLUSH_ALL_PROCESSORS			BIT(0)

#define HV_FLUSH_ALL_VIRTUAL_ADDRESS_SPACES	BIT(1)

#define HV_FLUSH_NON_GLOBAL_MAPPINGS_ONLY	BIT(2)

#define HV_FLUSH_USE_EXTENDED_RANGE_FORMAT	BIT(3)



enum HV_GENERIC_SET_FORMAT {

	HV_GENERIC_SET_SPARCE_4K,

	HV_GENERIC_SET_ALL,

};



/* hypercall status code */

#define HV_STATUS_SUCCESS			0

#define HV_STATUS_INVALID_HYPERCALL_CODE	2