Commit 109b2504 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



* "info mtree" improvements (Alexey)
* fake VPD block limits for SCSI passthrough (Daniel Barboza)
* chardev and main loop fixes (Daniel Berrangé, Sergio, Stefan)
* help fixes (Eduardo)
* pc-dimm refactoring (David)
* tests improvements and fixes (Emilio, Thomas)
* SVM emulation fixes (Jan)
* MemoryRegionCache fix (Eric)
* WHPX improvements (Justin)
* ESP cleanup (Mark)
* -overcommit option (Michael)
* qemu-pr-helper fixes (me)
* "info pic" improvements for x86 (Peter)
* x86 TCG emulation fixes (Richard)
* KVM slot handling fix (Shannon)
* Next round of deprecation (Thomas)
* Windows dump format support (Viktor)

# gpg: Signature made Fri 29 Jun 2018 12:03:05 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: (60 commits)
  tests/boot-serial: Do not delete the output file in case of errors
  hw/scsi: add VPD Block Limits emulation
  hw/scsi: centralize SG_IO calls into single function
  hw/scsi: cleanups before VPD BL emulation
  dump: add Windows live system dump
  dump: add fallback KDBG using in Windows dump
  dump: use system context in Windows dump
  dump: add Windows dump format to dump-guest-memory
  i386/cpu: make -cpu host support monitor/mwait
  kvm: support -overcommit cpu-pm=on|off
  hmp: obsolete "info ioapic"
  ioapic: support "info irq"
  ioapic: some proper indents when dump info
  ioapic: support "info pic"
  doc: another fix to "info pic"
  target-i386: Mark cpu_vmexit noreturn
  target-i386: Allow interrupt injection after STGI
  target-i386: Add NMI interception to SVM
  memory/hmp: Print owners/parents in "info mtree"
  WHPX: register for unrecognized MSR exits
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 609ef9f4 28a3cfc1

Makefile.target

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ obj-y += hw/ 
obj-y += memory.o

obj-y += memory_mapping.o

obj-y += dump.o

obj-$(TARGET_X86_64) += win_dump.o

obj-y += migration/ram.o

LIBS := $(libs_softmmu) $(LIBS)

accel/kvm/kvm-all.c

+8 −9
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ int kvm_physical_memory_addr_from_host(KVMState *s, void *ram, 
    return 0;

}



static int kvm_set_user_memory_region(KVMMemoryListener *kml, KVMSlot *slot)

static int kvm_set_user_memory_region(KVMMemoryListener *kml, KVMSlot *slot, bool new)

{

    KVMState *s = kvm_state;

    struct kvm_userspace_memory_region mem;
@@ -267,7 +267,7 @@ static int kvm_set_user_memory_region(KVMMemoryListener *kml, KVMSlot *slot) 
    mem.userspace_addr = (unsigned long)slot->ram;

    mem.flags = slot->flags;



    if (slot->memory_size && mem.flags & KVM_MEM_READONLY) {

    if (slot->memory_size && !new && (mem.flags ^ slot->old_flags) & KVM_MEM_READONLY) {

        /* Set the slot size to 0 before setting the slot to the desired

         * value. This is needed based on KVM commit 75d61fbc. */

        mem.memory_size = 0;
@@ -275,6 +275,7 @@ static int kvm_set_user_memory_region(KVMMemoryListener *kml, KVMSlot *slot) 
    }

    mem.memory_size = slot->memory_size;

    ret = kvm_vm_ioctl(s, KVM_SET_USER_MEMORY_REGION, &mem);

    slot->old_flags = mem.flags;

    trace_kvm_set_user_memory(mem.slot, mem.flags, mem.guest_phys_addr,

                              mem.memory_size, mem.userspace_addr, ret);

    return ret;
@@ -391,17 +392,14 @@ static int kvm_mem_flags(MemoryRegion *mr) 
static int kvm_slot_update_flags(KVMMemoryListener *kml, KVMSlot *mem,

                                 MemoryRegion *mr)

{

    int old_flags;



    old_flags = mem->flags;

    mem->flags = kvm_mem_flags(mr);



    /* If nothing changed effectively, no need to issue ioctl */

    if (mem->flags == old_flags) {

    if (mem->flags == mem->old_flags) {

        return 0;

    }



    return kvm_set_user_memory_region(kml, mem);

    return kvm_set_user_memory_region(kml, mem, false);

}



static int kvm_section_update_flags(KVMMemoryListener *kml,
@@ -755,7 +753,8 @@ static void kvm_set_phys_mem(KVMMemoryListener *kml, 


        /* unregister the slot */

        mem->memory_size = 0;

        err = kvm_set_user_memory_region(kml, mem);

        mem->flags = 0;

        err = kvm_set_user_memory_region(kml, mem, false);

        if (err) {

            fprintf(stderr, "%s: error unregistering slot: %s\n",

                    __func__, strerror(-err));
@@ -771,7 +770,7 @@ static void kvm_set_phys_mem(KVMMemoryListener *kml, 
    mem->ram = ram;

    mem->flags = kvm_mem_flags(mr);



    err = kvm_set_user_memory_region(kml, mem);

    err = kvm_set_user_memory_region(kml, mem, true);

    if (err) {

        fprintf(stderr, "%s: error registering slot: %s\n", __func__,

                strerror(-err));

accel/tcg/translate-all.c

+6 −22
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
#endif

#endif

#else

#include "exec/address-spaces.h"

#include "exec/ram_addr.h"

#endif



#include "exec/cputlb.h"
@@ -1934,7 +1934,11 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, 
 *

 * Called with mmap_lock held for user-mode emulation.

 */

void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end)

#ifdef CONFIG_SOFTMMU

void tb_invalidate_phys_range(ram_addr_t start, ram_addr_t end)

#else

void tb_invalidate_phys_range(target_ulong start, target_ulong end)

#endif

{

    struct page_collection *pages;

    tb_page_addr_t next;
@@ -2073,26 +2077,6 @@ static bool tb_invalidate_phys_page(tb_page_addr_t addr, uintptr_t pc) 
}

#endif



#if !defined(CONFIG_USER_ONLY)

void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr, MemTxAttrs attrs)

{

    ram_addr_t ram_addr;

    MemoryRegion *mr;

    hwaddr l = 1;



    rcu_read_lock();

    mr = address_space_translate(as, addr, &addr, &l, false, attrs);

    if (!(memory_region_is_ram(mr)

          || memory_region_is_romd(mr))) {

        rcu_read_unlock();

        return;

    }

    ram_addr = memory_region_get_ram_addr(mr) + addr;

    tb_invalidate_phys_page_range(ram_addr, ram_addr + 1, 0);

    rcu_read_unlock();

}

#endif /* !defined(CONFIG_USER_ONLY) */



/* user-mode: call with mmap_lock held */

void tb_check_watchpoint(CPUState *cpu)

{

accel/tcg/translate-all.h

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ void tb_invalidate_phys_page_fast(struct page_collection *pages, 
                                  tb_page_addr_t start, int len);

void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end,

                                   int is_cpu_write_access);

void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end);

void tb_check_watchpoint(CPUState *cpu);



#ifdef CONFIG_USER_ONLY

accel/tcg/user-exec-stub.c

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 
#include "qemu-common.h"

#include "qom/cpu.h"

#include "sysemu/replay.h"

#include "sysemu/sysemu.h"



bool enable_cpu_pm = false;



void cpu_resume(CPUState *cpu)

{