Commit 88c1fd4c authored by Peter Maydell's avatar Peter Maydell
Browse files

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



* Bulgarian translation update (Alexander)
* RTC and PC refactorings (Hervé, Philippe, Sergio)
* RTC fix (Marcelo)
* More comprehensive MCE logging (Mario)
* x86 IGNNE implementation (Paolo)
* Microvm machine type (Sergio)
* Support for UMONITOR/UMWAIT/TPAUSE (Tao)
* Do not use %m in common code (Thomas)
* NoNonArchitecturalCoreSharing Hyper-V enlightenment (Vitaly)
* getpagesize cleanups (Wei)

# gpg: Signature made Sat 26 Oct 2019 14:39:56 BST
# gpg:                using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# 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: (39 commits)
  i386: implement IGNNE
  target/i386: introduce cpu_set_fpus
  target/i386: move FERR handling to target/i386
  core: replace getpagesize() with qemu_real_host_page_size
  audio: fix missing break
  mc146818rtc: always register rtc to rtc list
  mc146818rtc: Include mc146818rtc_regs.h directly in mc146818rtc.c
  mc146818rtc: Move RTC_ISA_IRQ definition
  mc146818rtc: move structure to header file
  hw/i386/pc: Remove kvm_i386.h include
  hw/i386/pc: Extract pc_i8259_create()
  hw/i386/pc: Move gsi_state creation code
  hw/i386/pc: Extract pc_gsi_create()
  target/i386: Add support for save/load IA32_UMWAIT_CONTROL MSR
  x86/cpu: Add support for UMONITOR/UMWAIT/TPAUSE
  hw/timer/mc146818rtc: Only include qapi-commands-misc on I386
  runstate: ignore exit request in finish migrate state
  checkpatch: suggest qemu_real_host_page_size instead of getpagesize() or sysconf(_SC_PAGESIZE)
  MAINTAINERS: add microvm related files
  hw/i386: Introduce the microvm machine type
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 187f3551 bf13bfab

.gitmodules

+3 −0
Original line number Diff line number Diff line
@@ -58,3 +58,6 @@ 
[submodule "roms/opensbi"]

	path = roms/opensbi

	url = 	https://git.qemu.org/git/opensbi.git

[submodule "roms/qboot"]

	path = roms/qboot

	url = https://github.com/bonzini/qboot

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -1275,6 +1275,15 @@ F: include/hw/timer/hpet.h 
F: include/hw/timer/i8254*

F: include/hw/rtc/mc146818rtc*



microvm

M: Sergio Lopez <slp@redhat.com>

M: Paolo Bonzini <pbonzini@redhat.com>

S: Maintained

F: docs/microvm.rst

F: hw/i386/microvm.c

F: include/hw/i386/microvm.h

F: pc-bios/bios-microvm.bin



Machine core

M: Eduardo Habkost <ehabkost@redhat.com>

M: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>

accel/kvm/kvm-all.c

+3 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
/* KVM uses PAGE_SIZE in its definition of KVM_COALESCED_MMIO_MAX. We

 * need to use the real host PAGE_SIZE, as that's what KVM will use.

 */

#define PAGE_SIZE getpagesize()

#define PAGE_SIZE qemu_real_host_page_size



//#define DEBUG_KVM
@@ -507,7 +507,7 @@ static int kvm_get_dirty_pages_log_range(MemoryRegionSection *section, 
{

    ram_addr_t start = section->offset_within_region +

                       memory_region_get_ram_addr(section->mr);

    ram_addr_t pages = int128_get64(section->size) / getpagesize();

    ram_addr_t pages = int128_get64(section->size) / qemu_real_host_page_size;



    cpu_physical_memory_set_dirty_lebitmap(bitmap, start, pages);

    return 0;
@@ -1841,7 +1841,7 @@ static int kvm_init(MachineState *ms) 
     * even with KVM.  TARGET_PAGE_SIZE is assumed to be the minimum

     * page size for the system though.

     */

    assert(TARGET_PAGE_SIZE <= getpagesize());

    assert(TARGET_PAGE_SIZE <= qemu_real_host_page_size);



    s->sigmask_len = 8;

audio/paaudio.c

+1 −0
Original line number Diff line number Diff line
@@ -385,6 +385,7 @@ static pa_stream *qpa_simple_new ( 
        map.map[5] = PA_CHANNEL_POSITION_REAR_RIGHT;

        map.map[6] = PA_CHANNEL_POSITION_SIDE_LEFT;

        map.map[7] = PA_CHANNEL_POSITION_SIDE_RIGHT;

        break;



    default:

        dolog("Internal error: unsupported channel count %d\n", ss->channels);

backends/hostmem.c

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ size_t host_memory_backend_pagesize(HostMemoryBackend *memdev) 
#else

size_t host_memory_backend_pagesize(HostMemoryBackend *memdev)

{

    return getpagesize();

    return qemu_real_host_page_size;

}

#endif