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

Merge remote-tracking branch 'quintela/thread-20121220.next' into staging 



* quintela/thread-20121220.next: (79 commits)
  migration: merge QEMUFileBuffered into MigrationState
  migration: fix qemu_get_fd for BufferedFile
  ram: refactor ram_save_block() return value
  ram: account the amount of transferred ram better
  ram: optimize migration bitmap walking
  ram: Use memory_region_test_and_clear_dirty
  memory: introduce memory_region_test_and_clear_dirty
  ram: Add last_sent_block
  ram: rename last_block to last_seen_block
  migration: move migration notifier
  migration: Inline qemu_fopen_ops_buffered into migrate_fd_connect
  migration: move migration_fd_put_ready()
  migration: add XFER_LIMIT_RATIO
  migration: move buffered_file.c code into migration.c
  savevm: New save live migration method: pending
  buffered_file: unfold buffered_append in buffered_put_buffer
  buffered_file: don't flush on put buffer
  buffered_file: Unfold the trick to restart generating migration data
  migration: just lock migrate_fd_put_ready
  migration: remove unfreeze logic
  ...

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 914606d2 9848a404

.gitignore

+1 −0
Original line number Diff line number Diff line 
config-devices.*

config-all-devices.*

config-all-disas.*

config-host.*

config-target.*

trace.h

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -490,6 +490,7 @@ F: hw/omap* 
PCI

M: Michael S. Tsirkin <mst@redhat.com>

S: Supported

F: hw/pci/*

F: hw/pci*

F: hw/piix*

Makefile

+14 −33
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ defconfig: 
	rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)



-include config-all-devices.mak

-include config-all-disas.mak



all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all
@@ -129,9 +130,9 @@ $(SRC_PATH)/pixman/configure: 


$(SUBDIR_RULES): libqemustub.a



$(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(common-obj-y) $(extra-obj-y) subdir-libdis

$(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(common-obj-y) $(extra-obj-y)



$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) subdir-libdis-user subdir-libuser

$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(user-obj-y)



ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))

romsubdir-%:
@@ -141,18 +142,6 @@ ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS)) 


recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)



audio/audio.o audio/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS)



QEMU_CFLAGS+=$(CURL_CFLAGS)



QEMU_CFLAGS += -I$(SRC_PATH)/include



ui/cocoa.o: ui/cocoa.m



ui/sdl.o audio/sdlaudio.o ui/sdl_zoom.o hw/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS)



ui/vnc.o: QEMU_CFLAGS += $(VNC_TLS_CFLAGS)



bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS)



version.o: $(SRC_PATH)/version.rc config-host.h
@@ -169,19 +158,11 @@ libqemustub.a: $(stub-obj-y) 
# Support building shared library libcacard



.PHONY: libcacard.la install-libcacard

ifeq ($(LIBTOOL),)

libcacard.la:

	@echo "libtool is missing, please install and rerun configure"; exit 1



install-libcacard:

	@echo "libtool is missing, please install and rerun configure"; exit 1

else

libcacard.la: $(oslib-obj-y) qemu-timer-common.o $(addsuffix .lo, $(basename $(trace-obj-y)))

libcacard.la: $(oslib-obj-y) qemu-timer-common.o $(trace-obj-y)

	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" libcacard.la,)



install-libcacard: libcacard.la

	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" install-libcacard,)

endif



######################################################################
@@ -197,8 +178,9 @@ qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y) libqemustub.a 


qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o



vscclient$(EXESUF): LIBS += $(libcacard_libs)

vscclient$(EXESUF): $(libcacard-y) $(oslib-obj-y) $(trace-obj-y) libcacard/vscclient.o libqemustub.a

	$(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(libcacard_libs) $(LIBS),"  LINK  $@")

	$(call LINK, $^)



fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o oslib-posix.o $(trace-obj-y)

fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
@@ -218,13 +200,13 @@ endif 
qapi-py = $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.py



qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h :\

$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)

$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, "  GEN   $@")

qga/qapi-generated/qga-qapi-visit.c qga/qapi-generated/qga-qapi-visit.h :\

$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py)

$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py)

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, "  GEN   $@")

qga/qapi-generated/qga-qmp-commands.h qga/qapi-generated/qga-qmp-marshal.c :\

$(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)

$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -o qga/qapi-generated -p "qga-" < $<, "  GEN   $@")



qapi-types.c qapi-types.h :\
@@ -240,9 +222,8 @@ $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) 
QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h)

$(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)



qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(oslib-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) libqemustub.a



QEMULIBS=libuser libdis libdis-user

qemu-ga$(EXESUF): $(qga-obj-y) $(oslib-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) libqemustub.a

	$(call LINK, $^)



clean:

# avoid old build problems by removing potentially incorrect old files
@@ -260,7 +241,7 @@ clean: 
	rm -rf qapi-generated

	rm -rf qga/qapi-generated

	$(MAKE) -C tests/tcg clean

	for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \

	for d in $(ALL_SUBDIRS) libcacard; do \

	if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \

	rm -f $$d/qemu-options.def; \

        done
@@ -274,7 +255,7 @@ qemu-%.tar.bz2: 


distclean: clean

	rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi

	rm -f config-all-devices.mak

	rm -f config-all-devices.mak config-all-disas.mak

	rm -f roms/seabios/config.mak roms/vgabios/config.mak

	rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps qemu-doc.dvi

	rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys
@@ -283,7 +264,7 @@ distclean: clean 
	rm -f config.log

	rm -f linux-headers/asm

	rm -f qemu-tech.info qemu-tech.aux qemu-tech.cp qemu-tech.dvi qemu-tech.fn qemu-tech.info qemu-tech.ky qemu-tech.log qemu-tech.pdf qemu-tech.pg qemu-tech.toc qemu-tech.tp qemu-tech.vr

	for d in $(TARGET_DIRS) $(QEMULIBS); do \

	for d in $(TARGET_DIRS); do \

	rm -rf $$d || exit 1 ; \

        done

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

Makefile.dis

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
# Makefile for disassemblers.



include ../config-host.mak

include config.mak

include $(SRC_PATH)/rules.mak



.PHONY: all



$(call set-vpath, $(SRC_PATH))



QEMU_CFLAGS+=-I..



include $(SRC_PATH)/Makefile.objs



all: $(libdis-y)

# Dummy command so that make thinks it has done something

	@true



clean:

	rm -f *.o *.d *.a *~

Makefile.objs

+12 −23
Original line number Diff line number Diff line
@@ -66,10 +66,9 @@ endif 
# single QEMU executable should support all CPUs and machines.



common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/

common-obj-y += net.o net/

common-obj-y += net/

common-obj-y += qom/

common-obj-y += readline.o console.o cursor.o

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

common-obj-y += readline.o

common-obj-y += $(oslib-obj-y)

common-obj-$(CONFIG_WIN32) += os-win32.o

common-obj-$(CONFIG_POSIX) += os-posix.o
@@ -78,8 +77,8 @@ common-obj-$(CONFIG_LINUX) += fsdev/ 
extra-obj-$(CONFIG_LINUX) += fsdev/



common-obj-y += tcg-runtime.o host-utils.o main-loop.o

common-obj-y += input.o

common-obj-y += buffered_file.o migration.o migration-tcp.o

common-obj-y += migration.o migration-tcp.o

common-obj-y += migration.o migration-tcp.o

common-obj-y += qemu-char.o #aio.o

common-obj-y += block-migration.o iohandler.o

common-obj-y += bitmap.o bitops.o
@@ -92,6 +91,8 @@ common-obj-$(CONFIG_SPICE) += spice-qemu-char.o 


common-obj-y += audio/

common-obj-y += hw/

extra-obj-y += hw/



common-obj-y += ui/

common-obj-y += bt-host.o bt-vhci.o
@@ -121,28 +122,13 @@ user-obj-y += tcg-runtime.o host-utils.o 
user-obj-y += cache-utils.o

user-obj-y += module.o

user-obj-y += qemu-user.o

user-obj-y += $(trace-obj-y)

user-obj-y += qom/



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

# libdis

# disassemblers

# NOTE: the disassembler code is only needed for debugging



libdis-y =

libdis-$(CONFIG_ALPHA_DIS) += alpha-dis.o

libdis-$(CONFIG_ARM_DIS) += arm-dis.o

libdis-$(CONFIG_CRIS_DIS) += cris-dis.o

libdis-$(CONFIG_HPPA_DIS) += hppa-dis.o

libdis-$(CONFIG_I386_DIS) += i386-dis.o

libdis-$(CONFIG_IA64_DIS) += ia64-dis.o

libdis-$(CONFIG_M68K_DIS) += m68k-dis.o

libdis-$(CONFIG_MICROBLAZE_DIS) += microblaze-dis.o

libdis-$(CONFIG_MIPS_DIS) += mips-dis.o

libdis-$(CONFIG_PPC_DIS) += ppc-dis.o

libdis-$(CONFIG_S390_DIS) += s390-dis.o

libdis-$(CONFIG_SH4_DIS) += sh4-dis.o

libdis-$(CONFIG_SPARC_DIS) += sparc-dis.o

libdis-$(CONFIG_LM32_DIS) += lm32-dis.o

universal-obj-y += disas/



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

# trace
@@ -208,6 +194,8 @@ trace-obj-y += trace/control.o 


$(trace-obj-y): $(GENERATED_HEADERS)



universal-obj-y += $(trace-obj-y)



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

# smartcard
@@ -233,7 +221,7 @@ universal-obj-y += $(qapi-obj-y) 
######################################################################

# guest agent



qga-obj-y = qga/ qemu-ga.o module.o qemu-tool.o

qga-obj-y = qga/ module.o qemu-tool.o

qga-obj-$(CONFIG_POSIX) += qemu-sockets.o qemu-option.o



vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
@@ -250,5 +238,6 @@ nested-vars += \ 
	block-obj-y \

	user-obj-y \

	common-obj-y \

	universal-obj-y \

	extra-obj-y

dummy := $(call unnest-vars)