Commit c5d69e6b authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote branch 'qemu-kvm/uq/master' into staging

parents 630ecca0 0ec329da

Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ common-obj-y += $(addprefix ui/, $(ui-obj-y)) 


common-obj-y += iov.o acl.o

common-obj-$(CONFIG_THREAD) += qemu-thread.o

common-obj-$(CONFIG_IOTHREAD) += compatfd.o

common-obj-$(CONFIG_POSIX) += compatfd.o

common-obj-y += notify.o event_notifier.o

common-obj-y += qemu-timer.o qemu-timer-common.o

Makefile.target

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ ifndef CONFIG_HAIKU 
LIBS+=-lm

endif



kvm.o kvm-all.o vhost.o vhost_net.o: QEMU_CFLAGS+=$(KVM_CFLAGS)

kvm.o kvm-all.o vhost.o vhost_net.o kvmclock.o: QEMU_CFLAGS+=$(KVM_CFLAGS)



config-target.h: config-target.h-timestamp

config-target.h-timestamp: config-target.mak
@@ -218,7 +218,7 @@ obj-i386-y += cirrus_vga.o apic.o ioapic.o piix_pci.o 
obj-i386-y += vmport.o applesmc.o

obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o

obj-i386-y += debugcon.o multiboot.o

obj-i386-y += pc_piix.o

obj-i386-y += pc_piix.o kvmclock.o

obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o



# shared objects

configure

+6 −0
Original line number Diff line number Diff line
@@ -2057,6 +2057,12 @@ EOF 


if compile_prog "" "" ; then

  signalfd=yes

elif test "$kvm" = "yes" -a "$io_thread" != "yes"; then

  echo

  echo "ERROR: Host kernel lacks signalfd() support,"

  echo "but KVM depends on it when the IO thread is disabled."

  echo

  exit 1

fi



# check if eventfd is supported

cpu-all.h

+6 −0
Original line number Diff line number Diff line
@@ -959,6 +959,12 @@ int cpu_physical_memory_get_dirty_tracking(void); 
int cpu_physical_sync_dirty_bitmap(target_phys_addr_t start_addr,

                                   target_phys_addr_t end_addr);



int cpu_physical_log_start(target_phys_addr_t start_addr,

                           ram_addr_t size);



int cpu_physical_log_stop(target_phys_addr_t start_addr,

                          ram_addr_t size);



void dump_exec_info(FILE *f, fprintf_function cpu_fprintf);

#endif /* !CONFIG_USER_ONLY */

cpu-common.h

+4 −0
Original line number Diff line number Diff line
@@ -96,6 +96,10 @@ struct CPUPhysMemoryClient { 
                             target_phys_addr_t end_addr);

    int (*migration_log)(struct CPUPhysMemoryClient *client,

                         int enable);

    int (*log_start)(struct CPUPhysMemoryClient *client,

                     target_phys_addr_t phys_addr, ram_addr_t size);

    int (*log_stop)(struct CPUPhysMemoryClient *client,

                    target_phys_addr_t phys_addr, ram_addr_t size);

    QLIST_ENTRY(CPUPhysMemoryClient) list;

};