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

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



* RTC fixes (Artem)
* icount fixes (Artem)
* rr fixes (Pavel, myself)
* hotplug cleanup (Igor)
* SCSI fixes (myself)
* 4.20-rc1 KVM header update (myself)
* coalesced PIO support (Peng Hao)
* HVF fixes (Roman B.)
* Hyper-V refactoring (Roman K.)
* Support for Hyper-V IPI (Vitaly)

# gpg: Signature made Fri 19 Oct 2018 12:47:58 BST
# gpg:                using RSA key BFFBD25F78C7AE83
# 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: (47 commits)
  replay: pass raw icount value to replay_save_clock
  target/i386: kvm: just return after migrate_add_blocker failed
  hyperv_testdev: add SynIC message and event testmodes
  hyperv: process POST_MESSAGE hypercall
  hyperv: add support for KVM_HYPERV_EVENTFD
  hyperv: process SIGNAL_EVENT hypercall
  hyperv: add synic event flag signaling
  hyperv: add synic message delivery
  hyperv: make overlay pages for SynIC
  hyperv: only add SynIC in compatible configurations
  hyperv: qom-ify SynIC
  hyperv:synic: split capability testing and setting
  i386: add hyperv-stub for CONFIG_HYPERV=n
  default-configs: collect CONFIG_HYPERV* in hyperv.mak
  hyperv: factor out arch-independent API into hw/hyperv
  hyperv: make hyperv_vp_index inline
  hyperv: split hyperv-proto.h into x86 and arch-independent parts
  hyperv: rename kvm_hv_sint_route_set_sint
  hyperv: make HvSintRoute reference-counted
  hyperv: address HvSintRoute by X86CPU pointer
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 31e213e3 74c0b816

accel/kvm/kvm-all.c

+53 −3
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ struct KVMState 
    int fd;

    int vmfd;

    int coalesced_mmio;

    int coalesced_pio;

    struct kvm_coalesced_mmio_ring *coalesced_mmio_ring;

    bool coalesced_flush_in_progress;

    int vcpu_events;
@@ -560,6 +561,45 @@ static void kvm_uncoalesce_mmio_region(MemoryListener *listener, 
    }

}



static void kvm_coalesce_pio_add(MemoryListener *listener,

                                MemoryRegionSection *section,

                                hwaddr start, hwaddr size)

{

    KVMState *s = kvm_state;



    if (s->coalesced_pio) {

        struct kvm_coalesced_mmio_zone zone;



        zone.addr = start;

        zone.size = size;

        zone.pio = 1;



        (void)kvm_vm_ioctl(s, KVM_REGISTER_COALESCED_MMIO, &zone);

    }

}



static void kvm_coalesce_pio_del(MemoryListener *listener,

                                MemoryRegionSection *section,

                                hwaddr start, hwaddr size)

{

    KVMState *s = kvm_state;



    if (s->coalesced_pio) {

        struct kvm_coalesced_mmio_zone zone;



        zone.addr = start;

        zone.size = size;

        zone.pio = 1;



        (void)kvm_vm_ioctl(s, KVM_UNREGISTER_COALESCED_MMIO, &zone);

     }

}



static MemoryListener kvm_coalesced_pio_listener = {

    .coalesced_io_add = kvm_coalesce_pio_add,

    .coalesced_io_del = kvm_coalesce_pio_del,

};



int kvm_check_extension(KVMState *s, unsigned int extension)

{

    int ret;
@@ -1616,6 +1656,8 @@ static int kvm_init(MachineState *ms) 
    }



    s->coalesced_mmio = kvm_check_extension(s, KVM_CAP_COALESCED_MMIO);

    s->coalesced_pio = s->coalesced_mmio &&

                       kvm_check_extension(s, KVM_CAP_COALESCED_PIO);



#ifdef KVM_CAP_VCPU_EVENTS

    s->vcpu_events = kvm_check_extension(s, KVM_CAP_VCPU_EVENTS);
@@ -1686,13 +1728,15 @@ static int kvm_init(MachineState *ms) 
        s->memory_listener.listener.eventfd_add = kvm_mem_ioeventfd_add;

        s->memory_listener.listener.eventfd_del = kvm_mem_ioeventfd_del;

    }

    s->memory_listener.listener.coalesced_mmio_add = kvm_coalesce_mmio_region;

    s->memory_listener.listener.coalesced_mmio_del = kvm_uncoalesce_mmio_region;

    s->memory_listener.listener.coalesced_io_add = kvm_coalesce_mmio_region;

    s->memory_listener.listener.coalesced_io_del = kvm_uncoalesce_mmio_region;



    kvm_memory_listener_register(s, &s->memory_listener,

                                 &address_space_memory, 0);

    memory_listener_register(&kvm_io_listener,

                             &address_space_io);

    memory_listener_register(&kvm_coalesced_pio_listener,

                             &address_space_io);



    s->many_ioeventfds = kvm_check_many_ioeventfds();
@@ -1778,7 +1822,13 @@ void kvm_flush_coalesced_mmio_buffer(void) 


            ent = &ring->coalesced_mmio[ring->first];



            if (ent->pio == 1) {

                address_space_rw(&address_space_io, ent->phys_addr,

                                 MEMTXATTRS_UNSPECIFIED, ent->data,

                                 ent->len, true);

            } else {

                cpu_physical_memory_write(ent->phys_addr, ent->data, ent->len);

            }

            smp_wmb();

            ring->first = (ring->first + 1) % KVM_COALESCED_MMIO_MAX;

        }

cpus.c

+2 −2
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ static void icount_warp_rt(void) 
    seqlock_write_lock(&timers_state.vm_clock_seqlock,

                       &timers_state.vm_clock_lock);

    if (runstate_is_running()) {

        int64_t clock = REPLAY_CLOCK(REPLAY_CLOCK_VIRTUAL_RT,

        int64_t clock = REPLAY_CLOCK_LOCKED(REPLAY_CLOCK_VIRTUAL_RT,

                                            cpu_get_clock_locked());

        int64_t warp_delta;

default-configs/hyperv.mak

0 → 100644
+2 −0
Original line number Diff line number Diff line 
CONFIG_HYPERV=$(CONFIG_KVM)

CONFIG_HYPERV_TESTDEV=y

default-configs/i386-softmmu.mak

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
include pci.mak

include sound.mak

include usb.mak

include hyperv.mak

CONFIG_QXL=$(CONFIG_SPICE)

CONFIG_VGA_ISA=y

CONFIG_VGA_CIRRUS=y
@@ -58,7 +59,6 @@ CONFIG_XIO3130=y 
CONFIG_IOH3420=y

CONFIG_I82801B11=y

CONFIG_SMBIOS=y

CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)

CONFIG_PXB=y

CONFIG_ACPI_VMGENID=y

CONFIG_FW_CFG_DMA=y

hw/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += cpu/ 
devices-dirs-$(CONFIG_SOFTMMU) += display/

devices-dirs-$(CONFIG_SOFTMMU) += dma/

devices-dirs-$(CONFIG_SOFTMMU) += gpio/

devices-dirs-$(CONFIG_HYPERV) += hyperv/

devices-dirs-$(CONFIG_SOFTMMU) += i2c/

devices-dirs-$(CONFIG_SOFTMMU) += ide/

devices-dirs-$(CONFIG_SOFTMMU) += input/