Commit 760df0d1 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



* Register qdev properties as class properties (Marc-André)
* Cleanups (Philippe)
* virtio-scsi fix (Pan Nengyuan)
* Tweak Skylake-v3 model id (Kashyap)
* x86 UCODE_REV support and nested live migration fix (myself)
* Advisory mode for pvpanic (Zhenwei)

# gpg: Signature made Fri 24 Jan 2020 20:16:23 GMT
# 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: (58 commits)
  build-sys: clean up flags included in the linker command line
  target/i386: Add the 'model-id' for Skylake -v3 CPU models
  qdev: use object_property_help()
  qapi/qmp: add ObjectPropertyInfo.default-value
  qom: introduce object_property_help()
  qom: simplify qmp_device_list_properties()
  vl: print default value in object help
  qdev: register properties as class properties
  qdev: move instance properties to class properties
  qdev: rename DeviceClass.props
  qdev: set properties with device_class_set_props()
  object: return self in object_ref()
  object: release all props
  object: add object_class_property_add_link()
  object: express const link with link property
  object: add direct link flag
  object: rename link "child" to "target"
  object: check strong flag with &
  object: do not free class properties
  object: add object_property_set_default
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ba2ed84f db5adeaa

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ matrix: 
        - TEST_CMD=""

      before_script:

        - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}

        - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-g3 -O0 -Wno-error=stringop-truncation -fsanitize=thread -fuse-ld=gold" || { cat config.log && exit 1; }

        - ${SRC_DIR}/configure ${CONFIG} --extra-cflags="-g3 -O0 -Wno-error=stringop-truncation -fsanitize=thread" --extra-ldflags="-fuse-ld=gold" || { cat config.log && exit 1; }





    # Run check-tcg against linux-user

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt 


.PHONY: dtc/all

dtc/all: .git-submodule-status dtc/libfdt dtc/tests

	$(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CPPFLAGS)" CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt/libfdt.a,)

	$(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CPPFLAGS)" CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(QEMU_LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt/libfdt.a,)



dtc/%: .git-submodule-status

	@mkdir -p $@
@@ -525,7 +525,7 @@ slirp/all: .git-submodule-status 
		BUILD_DIR="$(BUILD_DIR)/slirp" 			\

		PKG_CONFIG="$(PKG_CONFIG)" 				\

		CC="$(CC)" AR="$(AR)" 	LD="$(LD)" RANLIB="$(RANLIB)"	\

		CFLAGS="$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)")

		CFLAGS="$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS="$(QEMU_LDFLAGS)")



# Compatibility gunk to keep make working across the rename of targets

# for recursion, to be removed some time after 4.1.

Makefile.objs

+10 −21
Original line number Diff line number Diff line
@@ -2,16 +2,16 @@ 
# Common libraries for tools and emulators

stub-obj-y = stubs/

util-obj-y = crypto/ util/ qobject/ qapi/



chardev-obj-y = chardev/

qom-obj-y = qom/



#######################################################################

# authz-obj-y is code used by both qemu system emulation and qemu-img

# code used by both qemu system emulation and qemu-img



authz-obj-y = authz/

ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y)



#######################################################################

# block-obj-y is code used by both qemu system emulation and qemu-img

chardev-obj-y = chardev/



authz-obj-y = authz/



block-obj-y = nbd/

block-obj-y += block.o blockjob.o job.o
@@ -21,21 +21,12 @@ block-obj-$(CONFIG_REPLICATION) += replication.o 


block-obj-m = block/



#######################################################################

# crypto-obj-y is code used by both qemu system emulation and qemu-img



crypto-obj-y = crypto/



#######################################################################

# qom-obj-y is code used by both qemu system emulation and qemu-img



qom-obj-y = qom/



#######################################################################

# io-obj-y is code used by both qemu system emulation and qemu-img



io-obj-y = io/



endif # CONFIG_SOFTMMU or CONFIG_TOOLS



######################################################################

# Target independent part of system emulation. The long term path is to

# suppress *all* target specific code in case of system emulation, i.e. a
@@ -80,11 +71,9 @@ qemu-seccomp.o-libs := $(SECCOMP_LIBS) 


common-obj-$(CONFIG_FDT) += device_tree.o



######################################################################

# qapi



common-obj-y += qapi/

endif



endif # CONFIG_SOFTMMU



#######################################################################

# Target-independent parts used in system and user emulation

accel/accel.c

+5 −0
Original line number Diff line number Diff line
@@ -63,6 +63,11 @@ int accel_init_machine(AccelState *accel, MachineState *ms) 
    return ret;

}



AccelState *current_accel(void)

{

    return current_machine->accelerator;

}



void accel_setup_post(MachineState *ms)

{

    AccelState *accel = ms->accelerator;

accel/kvm/kvm-all.c

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static NotifierList kvm_irqchip_change_notifiers = 


int kvm_get_max_memslots(void)

{

    KVMState *s = KVM_STATE(current_machine->accelerator);

    KVMState *s = KVM_STATE(current_accel());



    return s->nr_slots;

}
@@ -1848,7 +1848,7 @@ static int kvm_max_vcpu_id(KVMState *s) 


bool kvm_vcpu_id_is_valid(int vcpu_id)

{

    KVMState *s = KVM_STATE(current_machine->accelerator);

    KVMState *s = KVM_STATE(current_accel());

    return vcpu_id >= 0 && vcpu_id < kvm_max_vcpu_id(s);

}