Commit 940a8ce0 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



fixes for 2.9-rc1, plus removal of -mno-cygwin references

# gpg: Signature made Mon 20 Mar 2017 11:25:07 GMT
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# 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:
  hax: fix breakage in locking
  configure: remove Cygwin
  xen: do not build backends for targets that do not support xen
  qemu-ga: obey LISTEN_PID when using systemd socket activation

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 373967b2 b3d3a426

Makefile

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ endif 


CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y)

CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y)

CONFIG_XEN := $(CONFIG_XEN_BACKEND)

CONFIG_ALL=y

-include config-all-devices.mak

-include config-all-disas.mak

cpus.c

+2 −1
Original line number Diff line number Diff line
@@ -1344,8 +1344,9 @@ static void *qemu_hax_cpu_thread_fn(void *arg) 
{

    CPUState *cpu = arg;

    int r;



    qemu_mutex_lock_iothread();

    qemu_thread_get_self(cpu->thread);

    qemu_mutex_lock(&qemu_global_mutex);



    cpu->thread_id = qemu_get_thread_id();

    cpu->created = true;

hw/block/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ common-obj-$(CONFIG_SSI_M25P80) += m25p80.o 
common-obj-$(CONFIG_NAND) += nand.o

common-obj-$(CONFIG_PFLASH_CFI01) += pflash_cfi01.o

common-obj-$(CONFIG_PFLASH_CFI02) += pflash_cfi02.o

common-obj-$(CONFIG_XEN_BACKEND) += xen_disk.o

common-obj-$(CONFIG_XEN) += xen_disk.o

common-obj-$(CONFIG_ECC) += ecc.o

common-obj-$(CONFIG_ONENAND) += onenand.o

common-obj-$(CONFIG_NVME_PCI) += nvme.o

hw/char/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ common-obj-$(CONFIG_SERIAL_ISA) += serial-isa.o 
common-obj-$(CONFIG_SERIAL_PCI) += serial-pci.o

common-obj-$(CONFIG_VIRTIO) += virtio-console.o

common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o

common-obj-$(CONFIG_XEN_BACKEND) += xen_console.o

common-obj-$(CONFIG_XEN) += xen_console.o

common-obj-$(CONFIG_CADENCE) += cadence_uart.o



obj-$(CONFIG_EXYNOS4) += exynos4210_uart.o

hw/display/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ common-obj-$(CONFIG_JAZZ_LED) += jazz_led.o 
common-obj-$(CONFIG_PL110) += pl110.o

common-obj-$(CONFIG_SSD0303) += ssd0303.o

common-obj-$(CONFIG_SSD0323) += ssd0323.o

common-obj-$(CONFIG_XEN_BACKEND) += xenfb.o

common-obj-$(CONFIG_XEN) += xenfb.o



common-obj-$(CONFIG_VGA_PCI) += vga-pci.o

common-obj-$(CONFIG_VGA_ISA) += vga-isa.o