Commit a8a7ef14 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Another round of small fixes.  I am not including the
virtio-blk fix, because Wen only posted a prototype and the changes
I made were pretty large.  It definitely needs another pair of eyes
(but it is a 2.3 regression and a blocker).

# gpg: Signature made Thu Apr  2 14:59:56 2015 BST using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# 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:
  Use $(MAKE) for recursive make
  kvm-all: Sync dirty-bitmap from kvm before kvm destroy the corresponding dirty_bitmap
  util/qemu-config: fix regression of qmp_query_command_line_options
  target-i386: clear bsp bit when designating bsp
  qga: fitering out -fstack-protector-strong
  target-i386: save 64-bit CR3 in 64-bit SMM state save area

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 913fbe9a fb8597bb

Makefile

+3 −3
Original line number Diff line number Diff line
@@ -331,8 +331,8 @@ distclean: clean 
	rm -rf $$d || exit 1 ; \

        done

	rm -Rf .sdk

	if test -f pixman/config.log; then make -C pixman distclean; fi

	if test -f dtc/version_gen.h; then make $(DTC_MAKE_ARGS) clean; fi

	if test -f pixman/config.log; then $(MAKE) -C pixman distclean; fi

	if test -f dtc/version_gen.h; then $(MAKE) $(DTC_MAKE_ARGS) clean; fi



KEYMAPS=da     en-gb  et  fr     fr-ch  is  lt  modifiers  no  pt-br  sv \

ar      de     en-us  fi  fr-be  hr     it  lv  nl         pl  ru     th \
@@ -532,7 +532,7 @@ installer: $(INSTALLER) 
INSTDIR=/tmp/qemu-nsis



$(INSTALLER): $(SRC_PATH)/qemu.nsi

	make install prefix=${INSTDIR}

	$(MAKE) install prefix=${INSTDIR}

ifdef SIGNCODE

	(cd ${INSTDIR}; \

         for i in *.exe; do \

hw/intc/apic_common.c

+6 −2
Original line number Diff line number Diff line
@@ -215,14 +215,18 @@ void apic_init_reset(DeviceState *dev) 
    }

}



void apic_designate_bsp(DeviceState *dev)

void apic_designate_bsp(DeviceState *dev, bool bsp)

{

    if (dev == NULL) {

        return;

    }



    APICCommonState *s = APIC_COMMON(dev);

    if (bsp) {

        s->apicbase |= MSR_IA32_APICBASE_BSP;

    } else {

        s->apicbase &= ~MSR_IA32_APICBASE_BSP;

    }

}



static void apic_reset_common(DeviceState *dev)

include/hw/i386/apic.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ void apic_sipi(DeviceState *s); 
void apic_handle_tpr_access_report(DeviceState *d, target_ulong ip,

                                   TPRAccess access);

void apic_poll_irq(DeviceState *d);

void apic_designate_bsp(DeviceState *d);

void apic_designate_bsp(DeviceState *d, bool bsp);



/* pc.c */

DeviceState *cpu_get_current_apic(void);

kvm-all.c

+1 −1
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ static void kvm_set_phys_mem(MemoryRegionSection *section, bool add) 


        old = *mem;



        if (mem->flags & KVM_MEM_LOG_DIRTY_PAGES) {

        if ((mem->flags & KVM_MEM_LOG_DIRTY_PAGES) || s->migration_log) {

            kvm_physical_sync_dirty_bitmap(section);

        }

qga/vss-win32/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
qga-vss-dll-obj-y += requester.o provider.o install.o



obj-qga-vss-dll-obj-y = $(addprefix $(obj)/, $(qga-vss-dll-obj-y))

$(obj-qga-vss-dll-obj-y): QEMU_CXXFLAGS = $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wold-style-declaration -Wold-style-definition -Wredundant-decls -fstack-protector-all, $(QEMU_CFLAGS)) -Wno-unknown-pragmas -Wno-delete-non-virtual-dtor

$(obj-qga-vss-dll-obj-y): QEMU_CXXFLAGS = $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wold-style-declaration -Wold-style-definition -Wredundant-decls -fstack-protector-all -fstack-protector-strong, $(QEMU_CFLAGS)) -Wno-unknown-pragmas -Wno-delete-non-virtual-dtor



$(obj)/qga-vss.dll: LDFLAGS = -shared -Wl,--add-stdcall-alias,--enable-stdcall-fixup -lole32 -loleaut32 -lshlwapi -luuid -static

$(obj)/qga-vss.dll: $(obj-qga-vss-dll-obj-y) $(SRC_PATH)/$(obj)/qga-vss.def