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

* Miscellaneous fixes and feature enablement (many)
* SEV refactoring (David)
* Hyper-V initial support (Jon)
* i386 TCG fixes (x87 and SSE, Joseph)
* vmport cleanup and improvements (Philippe, Liran)
* Use-after-free with vCPU hot-unplug (Nengyuan)
* run-coverity-scan improvements (myself)
* Record/replay fixes (Pavel)
* -machine kernel_irqchip=split improvements for INTx (Peter)
* Code cleanups (Philippe)
* Crash and security fixes (PJP)
* HVF cleanups (Roman)

# gpg: Signature made Fri 12 Jun 2020 16:57:04 BST
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# 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: (116 commits)
  target/i386: Remove obsolete TODO file
  stubs: move Xen stubs to accel/
  replay: fix replay shutdown for console mode
  exec/cpu-common: Move MUSB specific typedefs to 'hw/usb/hcd-musb.h'
  hw/usb: Move device-specific declarations to new 'hcd-musb.h' header
  exec/memory: Remove unused MemoryRegionMmio type
  checkpatch: reversed logic with acpi test checks
  target/i386: sev: Unify SEVState and SevGuestState
  target/i386: sev: Remove redundant handle field
  target/i386: sev: Remove redundant policy field
  target/i386: sev: Remove redundant cbitpos and reduced_phys_bits fields
  target/i386: sev: Partial cleanup to sev_state global
  target/i386: sev: Embed SEVState in SevGuestState
  target/i386: sev: Rename QSevGuestInfo
  target/i386: sev: Move local structure definitions into .c file
  target/i386: sev: Remove unused QSevGuestInfoClass
  xen: fix build without pci passthrough
  i386: hvf: Drop HVFX86EmulatorState
  i386: hvf: Move mmio_buf into CPUX86State
  i386: hvf: Move lazy_flags into CPUX86State
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# Conflicts:
#	hw/i386/acpi-build.c

diff --cc MAINTAINERS
Simple merge

diff --cc chardev/char-socket.c
Simple merge

diff --cc configure
Simple merge

diff --cc exec.c
Simple merge

diff --cc hw/block/vhost-user-blk.c
Simple merge

diff --cc hw/core/machine.c
Simple merge

diff --cc hw/i386/acpi-build.c
index 473cbdfffd05a15fa2865fc22bc02f078bea6716,dcdfbd89065f010f37f434e4a48410031cbf4888..900f786d08de90d7b7e6bbbf05cd9767796d6fee
--- 1/hw/i386/acpi-build.c
--- 2/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@@ -1052,6 -1190,124 +1053,43 @@@ static Aml *build_mouse_device_aml(void
      return dev;
  }
  
 -static Aml *build_lpt_device_aml(void)
 -{
 -    Aml *dev;
 -    Aml *crs;
 -    Aml *method;
 -    Aml *if_ctx;
 -    Aml *else_ctx;
 -    Aml *zero = aml_int(0);
 -    Aml *is_present = aml_local(0);
 -
 -    dev = aml_device("LPT");
 -    aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0400")));
 -
 -    method = aml_method("_STA", 0, AML_NOTSERIALIZED);
 -    aml_append(method, aml_store(aml_name("LPEN"), is_present));
 -    if_ctx = aml_if(aml_equal(is_present, zero));
 -    {
 -        aml_append(if_ctx, aml_return(aml_int(0x00)));
 -    }
 -    aml_append(method, if_ctx);
 -    else_ctx = aml_else();
 -    {
 -        aml_append(else_ctx, aml_return(aml_int(0x0f)));
 -    }
 -    aml_append(method, else_ctx);
 -    aml_append(dev, method);
 -
 -    crs = aml_resource_template();
 -    aml_append(crs, aml_io(AML_DECODE16, 0x0378, 0x0378, 0x08, 0x08));
 -    aml_append(crs, aml_irq_no_flags(7));
 -    aml_append(dev, aml_name_decl("_CRS", crs));
 -
 -    return dev;
 -}
 -
 -static Aml *build_com_device_aml(uint8_t uid)
 -{
 -    Aml *dev;
 -    Aml *crs;
 -    Aml *method;
 -    Aml *if_ctx;
 -    Aml *else_ctx;
 -    Aml *zero = aml_int(0);
 -    Aml *is_present = aml_local(0);
 -    const char *enabled_field = "CAEN";
 -    uint8_t irq = 4;
 -    uint16_t io_port = 0x03F8;
 -
 -    assert(uid == 1 || uid == 2);
 -    if (uid == 2) {
 -        enabled_field = "CBEN";
 -        irq = 3;
 -        io_port = 0x02F8;
 -    }
 -
 -    dev = aml_device("COM%d", uid);
 -    aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0501")));
 -    aml_append(dev, aml_name_decl("_UID", aml_int(uid)));
 -
 -    method = aml_method("_STA", 0, AML_NOTSERIALIZED);
 -    aml_append(method, aml_store(aml_name("%s", enabled_field), is_present));
 -    if_ctx = aml_if(aml_equal(is_present, zero));
 -    {
 -        aml_append(if_ctx, aml_return(aml_int(0x00)));
 -    }
 -    aml_append(method, if_ctx);
 -    else_ctx = aml_else();
 -    {
 -        aml_append(else_ctx, aml_return(aml_int(0x0f)));
 -    }
 -    aml_append(method, else_ctx);
 -    aml_append(dev, method);
 -
 -    crs = aml_resource_template();
 -    aml_append(crs, aml_io(AML_DECODE16, io_port, io_port, 0x00, 0x08));
 -    aml_append(crs, aml_irq_no_flags(irq));
 -    aml_append(dev, aml_name_decl("_CRS", crs));
 -
 -    return dev;
 -}
 -
+ static Aml *build_vmbus_device_aml(VMBusBridge *vmbus_bridge)
+ {
+     Aml *dev;
+     Aml *method;
+     Aml *crs;
+ 
+     dev = aml_device("VMBS");
+     aml_append(dev, aml_name_decl("STA", aml_int(0xF)));
+     aml_append(dev, aml_name_decl("_HID", aml_string("VMBus")));
+     aml_append(dev, aml_name_decl("_UID", aml_int(0x0)));
+     aml_append(dev, aml_name_decl("_DDN", aml_string("VMBUS")));
+ 
+     method = aml_method("_DIS", 0, AML_NOTSERIALIZED);
+     aml_append(method, aml_store(aml_and(aml_name("STA"), aml_int(0xD), NULL),
+                                      aml_name("STA")));
+     aml_append(dev, method);
+ 
+     method = aml_method("_PS0", 0, AML_NOTSERIALIZED);
+     aml_append(method, aml_store(aml_or(aml_name("STA"), aml_int(0xF), NULL),
+                                      aml_name("STA")));
+     aml_append(dev, method);
+ 
+     method = aml_method("_STA", 0, AML_NOTSERIALIZED);
+     aml_append(method, aml_return(aml_name("STA")));
+     aml_append(dev, method);
+ 
+     aml_append(dev, aml_name_decl("_PS3", aml_int(0x0)));
+ 
+     crs = aml_resource_template();
+     aml_append(crs, aml_irq_no_flags(vmbus_bridge->irq0));
+     /* FIXME: newer HyperV gets by with only one IRQ */
+     aml_append(crs, aml_irq_no_flags(vmbus_bridge->irq1));
+     aml_append(dev, aml_name_decl("_CRS", crs));
+ 
+     return dev;
+ }
+ 
  static void build_isa_devices_aml(Aml *table)
  {
      ISADevice *fdc = pc_find_fdc0();

diff --cc hw/i386/xen/xen-hvm.c
Simple merge

diff --cc hw/pci/msix.c
Simple merge

diff --cc scripts/coverity-scan/coverity-scan.docker
Simple merge

diff --cc target/i386/cpu.c
Simple merge

diff --cc tests/docker/Makefile.include
Simple merge