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

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



* remotes/kvm/uq/master:
  pc: port 92 reset requires a low->high transition
  cpu: make CPU_INTERRUPT_RESET available on all targets
  apic: do not accept SIPI on the bootstrap processor
  target-i386: preserve FPU and MSR state on INIT
  target-i386: fix set of registers zeroed on reset
  kvm: forward INIT signals coming from the chipset
  kvm: reset state from the CPU's reset method
  target-i386: the x86 CPL is stored in CS.selector - auto update hflags accordingly.
  target-i386: set eflags prior to calling cpu_x86_load_seg_cache() in seg_helper.c
  target-i386: set eflags and cr0 prior to calling cpu_x86_load_seg_cache() in smm_helper.c
  target-i386: set eflags prior to calling svm_load_seg_cache() in svm_helper.c
  pci-assign: limit # of msix vectors
  pci-assign: Fix a bug when map MSI-X table memory failed
  kvm: make one_reg helpers available for everyone
  target-i386: Remove unused data from local array

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 06e33c1c 4700a316

bsd-user/main.c

+0 −2
Original line number Diff line number Diff line
@@ -1003,8 +1003,6 @@ int main(int argc, char **argv) 
    cpu->opaque = ts;



#if defined(TARGET_I386)

    cpu_x86_set_cpl(env, 3);



    env->cr[0] = CR0_PG_MASK | CR0_WP_MASK | CR0_PE_MASK;

    env->hflags |= HF_PE_MASK;

    if (env->features[FEAT_1_EDX] & CPUID_SSE) {

cpu-exec.c

+13 −10
Original line number Diff line number Diff line
@@ -335,6 +335,18 @@ int cpu_exec(CPUArchState *env) 
                        cpu_loop_exit(cpu);

                    }

#endif

#if defined(TARGET_I386)

                    if (interrupt_request & CPU_INTERRUPT_INIT) {

                        cpu_svm_check_intercept_param(env, SVM_EXIT_INIT, 0);

                        do_cpu_init(x86_cpu);

                        cpu->exception_index = EXCP_HALTED;

                        cpu_loop_exit(cpu);

                    }

#else

                    if (interrupt_request & CPU_INTERRUPT_RESET) {

                        cpu_reset(cpu);

                    }

#endif

#if defined(TARGET_I386)

#if !defined(CONFIG_USER_ONLY)

                    if (interrupt_request & CPU_INTERRUPT_POLL) {
@@ -342,13 +354,7 @@ int cpu_exec(CPUArchState *env) 
                        apic_poll_irq(x86_cpu->apic_state);

                    }

#endif

                    if (interrupt_request & CPU_INTERRUPT_INIT) {

                            cpu_svm_check_intercept_param(env, SVM_EXIT_INIT,

                                                          0);

                            do_cpu_init(x86_cpu);

                            cpu->exception_index = EXCP_HALTED;

                            cpu_loop_exit(cpu);

                    } else if (interrupt_request & CPU_INTERRUPT_SIPI) {

                    if (interrupt_request & CPU_INTERRUPT_SIPI) {

                            do_cpu_sipi(x86_cpu);

                    } else if (env->hflags2 & HF2_GIF_MASK) {

                        if ((interrupt_request & CPU_INTERRUPT_SMI) &&
@@ -405,9 +411,6 @@ int cpu_exec(CPUArchState *env) 
                        }

                    }

#elif defined(TARGET_PPC)

                    if ((interrupt_request & CPU_INTERRUPT_RESET)) {

                        cpu_reset(cpu);

                    }

                    if (interrupt_request & CPU_INTERRUPT_HARD) {

                        ppc_hw_interrupt(env);

                        if (env->pending_interrupts == 0) {

hw/i386/kvm/pci-assign.c

+7 −6
Original line number Diff line number Diff line
@@ -1300,6 +1300,7 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev, Error **errp) 
    if (pos != 0 && kvm_device_msix_supported(kvm_state)) {

        int bar_nr;

        uint32_t msix_table_entry;

        uint16_t msix_max;



        verify_irqchip_in_kernel(&local_err);

        if (local_err) {
@@ -1315,9 +1316,10 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev, Error **errp) 
        }

        pci_dev->msix_cap = pos;



        pci_set_word(pci_dev->config + pos + PCI_MSIX_FLAGS,

                     pci_get_word(pci_dev->config + pos + PCI_MSIX_FLAGS) &

                     PCI_MSIX_FLAGS_QSIZE);

        msix_max = (pci_get_word(pci_dev->config + pos + PCI_MSIX_FLAGS) &

                    PCI_MSIX_FLAGS_QSIZE) + 1;

        msix_max = MIN(msix_max, KVM_MAX_MSIX_PER_DEV);

        pci_set_word(pci_dev->config + pos + PCI_MSIX_FLAGS, msix_max - 1);



        /* Only enable and function mask bits are writable */

        pci_set_word(pci_dev->wmask + pos + PCI_MSIX_FLAGS,
@@ -1327,9 +1329,7 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev, Error **errp) 
        bar_nr = msix_table_entry & PCI_MSIX_FLAGS_BIRMASK;

        msix_table_entry &= ~PCI_MSIX_FLAGS_BIRMASK;

        dev->msix_table_addr = pci_region[bar_nr].base_addr + msix_table_entry;

        dev->msix_max = pci_get_word(pci_dev->config + pos + PCI_MSIX_FLAGS);

        dev->msix_max &= PCI_MSIX_FLAGS_QSIZE;

        dev->msix_max += 1;

        dev->msix_max = msix_max;

    }



    /* Minimal PM support, nothing writable, device appears to NAK changes */
@@ -1664,6 +1664,7 @@ static void assigned_dev_register_msix_mmio(AssignedDevice *dev, Error **errp) 
                           MAP_ANONYMOUS|MAP_PRIVATE, 0, 0);

    if (dev->msix_table == MAP_FAILED) {

        error_setg_errno(errp, errno, "failed to allocate msix_table");

        dev->msix_table = NULL;

        return;

    }

hw/i386/pc.c

+2 −1
Original line number Diff line number Diff line
@@ -471,11 +471,12 @@ static void port92_write(void *opaque, hwaddr addr, uint64_t val, 
                         unsigned size)

{

    Port92State *s = opaque;

    int oldval = s->outport;



    DPRINTF("port92: write 0x%02x\n", val);

    s->outport = val;

    qemu_set_irq(*s->a20_out, (val >> 1) & 1);

    if (val & 1) {

    if ((val & 1) && !(oldval & 1)) {

        qemu_system_reset_request();

    }

}

hw/intc/apic_common.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ void apic_init_reset(DeviceState *dev) 
    s->initial_count = 0;

    s->initial_count_load_time = 0;

    s->next_time = 0;

    s->wait_for_sipi = 1;

    s->wait_for_sipi = !cpu_is_bsp(s->cpu);



    if (s->timer) {

        timer_del(s->timer);