Commit 5f473241 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



* Support multiple -d trace:PATTERN arguments (Daniel)
* SCSI cleanups/fixes for removable meia (Fam)
* SCSI security fixes (Li Qiang, PJP)
* qemu-char segfault fix (Lin Ma)
* "make help" and qemu-socket cleanups (Marc-André)
* end of the buffer_is_zero reword (Richard)
* Fix target-i386 syscall segfault (Stanislav)
* split irqchip fix/robustification (Wanpeng)
* misc cleanups (me, Jiangang)
* x86 vmstate fixes (Pavel)

# gpg: Signature made Thu 15 Sep 2016 14:11:35 BST
# 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:
  pcspk: adding vmstate for save/restore
  kvmvapic: fix state change handler
  pc: apic: introduce APIC macro
  target-i386: Fixed syscall posssible segfault
  log: fix parsing of multiple trace:PATTERN log args
  qemu-char: avoid segfault if user lacks of permisson of a given logfile
  build-sys: add make 'help' target
  linux-user: complete omission of removing uses of strdup
  target-i386: fix ordering of fields in CPUX86State
  pc: apic: fix touch LAPIC when irqchip is split
  scsi: pvscsi: limit process IO loop to ring size
  memory: remove memory_region_destructor_rom_device
  Change net/socket.c to use socket_*() functions
  cutils: Rewrite x86 buffer zero checking
  scsi: mptsas: use g_new0 to allocate MPTSASRequest object
  virtio-scsi: Don't abort when media is ejected
  scsi-disk: Cleaning up around tray open state

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 518352b6 39c88f56

Makefile

+37 −0
Original line number Diff line number Diff line
@@ -669,3 +669,40 @@ endif 
-include $(wildcard *.d tests/*.d)



include $(SRC_PATH)/tests/docker/Makefile.include



.PHONY: help

help:

	@echo  'Generic targets:'

	@echo  '  all             - Build all'

	@echo  '  dir/file.o      - Build specified target only'

	@echo  '  install         - Install QEMU, documentation and tools'

	@echo  '  ctags/TAGS      - Generate tags file for editors'

	@echo  '  cscope          - Generate cscope index'

	@echo  ''

	@$(if $(TARGET_DIRS), \

		echo 'Architecture specific targets:'; \

		$(foreach t, $(TARGET_DIRS), \

		printf "  %-30s - Build for %s\\n" $(patsubst %,subdir-%,$(t)) $(t);) \

		echo '')

	@echo  'Cleaning targets:'

	@echo  '  clean           - Remove most generated files but keep the config'

	@echo  '  distclean       - Remove all generated files'

	@echo  '  dist            - Build a distributable tarball'

	@echo  ''

	@echo  'Test targets:'

	@echo  '  check           - Run all tests (check-help for details)'

	@echo  '  docker          - Help about targets running tests inside Docker containers'

	@echo  ''

	@echo  'Documentation targets:'

	@echo  '  dvi html info pdf'

	@echo  '                  - Build documentation in specified format'

	@echo  ''

ifdef CONFIG_WIN32

	@echo  'Windows targets:'

	@echo  '  installer       - Build NSIS-based installer for qemu-ga'

ifdef QEMU_GA_MSI_ENABLED

	@echo  '  msi             - Build MSI-based installer for qemu-ga'

endif

	@echo  ''

endif

	@echo  '  make V=0|1 [targets] 0 => quiet build (default), 1 => verbose build'

backends/msmouse.c

+3 −0
Original line number Diff line number Diff line
@@ -159,6 +159,9 @@ static CharDriverState *qemu_chr_open_msmouse(const char *id, 
    CharDriverState *chr;



    chr = qemu_chr_alloc(common, errp);

    if (!chr) {

        return NULL;

    }

    chr->chr_write = msmouse_chr_write;

    chr->chr_close = msmouse_chr_close;

    chr->chr_accept_input = msmouse_chr_accept_input;

hw/audio/pcspk.c

+15 −2
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ typedef struct { 
    unsigned int pit_count;

    unsigned int samples;

    unsigned int play_pos;

    int data_on;

    int dummy_refresh_clock;

    uint8_t data_on;

    uint8_t dummy_refresh_clock;

} PCSpkState;



static const char *s_spk = "pcspk";
@@ -187,6 +187,18 @@ static void pcspk_realizefn(DeviceState *dev, Error **errp) 
    pcspk_state = s;

}



static const VMStateDescription vmstate_spk = {

    .name = "pcspk",

    .version_id = 1,

    .minimum_version_id = 1,

    .minimum_version_id_old = 1,

    .fields      = (VMStateField[]) {

        VMSTATE_UINT8(data_on, PCSpkState),

        VMSTATE_UINT8(dummy_refresh_clock, PCSpkState),

        VMSTATE_END_OF_LIST()

    }

};



static Property pcspk_properties[] = {

    DEFINE_PROP_UINT32("iobase", PCSpkState, iobase,  -1),

    DEFINE_PROP_END_OF_LIST(),
@@ -198,6 +210,7 @@ static void pcspk_class_initfn(ObjectClass *klass, void *data) 


    dc->realize = pcspk_realizefn;

    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);

    dc->vmsd = &vmstate_spk;

    dc->props = pcspk_properties;

    /* Reason: realize sets global pcspk_state */

    dc->cannot_instantiate_with_device_add_yet = true;

hw/i386/kvmvapic.c

+1 −0
Original line number Diff line number Diff line
@@ -768,6 +768,7 @@ static void kvmvapic_vm_state_change(void *opaque, int running, 
    }



    qemu_del_vm_change_state_handler(s->vmsentry);

    s->vmsentry = NULL;

}



static int vapic_post_load(void *opaque, int version_id)

hw/i386/pc.c

+10 −8
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ int cpu_get_pic_interrupt(CPUX86State *env) 
    X86CPU *cpu = x86_env_get_cpu(env);

    int intno;



    if (!kvm_irqchip_in_kernel()) {

        intno = apic_get_interrupt(cpu->apic_state);

        if (intno >= 0) {

            return intno;
@@ -169,6 +170,7 @@ int cpu_get_pic_interrupt(CPUX86State *env) 
        if (!apic_accept_pic_intr(cpu->apic_state)) {

            return -1;

        }

    }



    intno = pic_read_irq(isa_pic);

    return intno;
@@ -180,7 +182,7 @@ static void pic_irq_request(void *opaque, int irq, int level) 
    X86CPU *cpu = X86_CPU(cs);



    DPRINTF("pic_irqs: %s irq %d\n", level? "raise" : "lower", irq);

    if (cpu->apic_state) {

    if (cpu->apic_state && !kvm_irqchip_in_kernel()) {

        CPU_FOREACH(cs) {

            cpu = X86_CPU(cs);

            if (apic_accept_pic_intr(cpu->apic_state)) {