From 471fbf4ab87bc6a564d8050aa6bba242b978ea4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Boiteux?= Date: Fri, 8 Jun 2012 20:06:25 +0200 Subject: Install 'bepo' keymap already included in Qemu source MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The 'bepo' layout (a french dvorak-like keyboard layout) was added about one year ago, (see commit 2a3c633c1eb8692716220195b6d3fe78b7e411d0), but I missed to declare to install it. Signed-off-by: Frédéric Boiteux Signed-off-by: Stefan Hajnoczi --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a7281b02b6..277ae73619 100644 --- a/Makefile +++ b/Makefile @@ -250,7 +250,8 @@ distclean: clean 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 \ -common de-ch es fo fr-ca hu ja mk nl-be pt sl tr +common de-ch es fo fr-ca hu ja mk nl-be pt sl tr \ +bepo ifdef INSTALL_BLOBS BLOBS=bios.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \ -- cgit v1.2.3 From f69a9c666b6f8f1b688f5c0f0cf9b780c598f966 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 9 Jun 2012 09:08:38 +0200 Subject: Makefile: Remove BUILD_DIR from qapi-dir qapi-dir does not need an absolute path. All other build directories are relative. When BUILD_DIR is removed, the build output looks better (no long lines with absolute paths when everything else uses short lines): GEN qapi-generated/qga-qapi-types.c CC qapi-generated/qga-qapi-types.o GEN qapi-generated/qga-qapi-visit.c CC qapi-generated/qga-qapi-visit.o GEN qapi-generated/qga-qmp-marshal.c CC qapi-generated/qga-qmp-marshal.o Using a relative path also avoids potential problems when BUILD_DIR includes blanks. Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 277ae73619..d0847c5bc9 100644 --- a/Makefile +++ b/Makefile @@ -171,7 +171,7 @@ fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $@") -qapi-dir := $(BUILD_DIR)/qapi-generated +qapi-dir := qapi-generated qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) qemu-ga$(EXESUF): QEMU_CFLAGS += -I $(qapi-dir) -- cgit v1.2.3 From 8f0e5c6bb724671350df783c8bdb7ef8f54c4221 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 9 Jun 2012 09:08:39 +0200 Subject: Makefile: Remove macro qapi-dir As qapi-dir was now a constant, it can be replaced by its value. Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- Makefile | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index d0847c5bc9..26ffa51f8f 100644 --- a/Makefile +++ b/Makefile @@ -171,9 +171,8 @@ fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $@") -qapi-dir := qapi-generated qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) -qemu-ga$(EXESUF): QEMU_CFLAGS += -I $(qapi-dir) +qemu-ga$(EXESUF): QEMU_CFLAGS += -I qapi-generated gen-out-type = $(subst .,-,$(suffix $@)) @@ -181,15 +180,15 @@ ifneq ($(wildcard config-host.mak),) include $(SRC_PATH)/tests/Makefile endif -$(qapi-dir)/qga-qapi-types.c $(qapi-dir)/qga-qapi-types.h :\ +qapi-generated/qga-qapi-types.c qapi-generated/qga-qapi-types.h :\ $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-types.py - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o "$(qapi-dir)" -p "qga-" < $<, " GEN $@") -$(qapi-dir)/qga-qapi-visit.c $(qapi-dir)/qga-qapi-visit.h :\ + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(gen-out-type) -o qapi-generated -p "qga-" < $<, " GEN $@") +qapi-generated/qga-qapi-visit.c qapi-generated/qga-qapi-visit.h :\ $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-visit.py - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o "$(qapi-dir)" -p "qga-" < $<, " GEN $@") -$(qapi-dir)/qga-qmp-commands.h $(qapi-dir)/qga-qmp-marshal.c :\ + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py $(gen-out-type) -o qapi-generated -p "qga-" < $<, " GEN $@") +qapi-generated/qga-qmp-commands.h qapi-generated/qga-qmp-marshal.c :\ $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-commands.py - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -o "$(qapi-dir)" -p "qga-" < $<, " GEN $@") + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -o qapi-generated -p "qga-" < $<, " GEN $@") qapi-types.c qapi-types.h :\ $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py @@ -201,8 +200,8 @@ qmp-commands.h qmp-marshal.c :\ $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -m -o "." < $<, " GEN $@") -QGALIB_OBJ=$(addprefix $(qapi-dir)/, qga-qapi-types.o qga-qapi-visit.o qga-qmp-marshal.o) -QGALIB_GEN=$(addprefix $(qapi-dir)/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h) +QGALIB_OBJ=$(addprefix qapi-generated/, qga-qapi-types.o qga-qapi-visit.o qga-qmp-marshal.o) +QGALIB_GEN=$(addprefix qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h) $(QGALIB_OBJ): $(QGALIB_GEN) $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) @@ -226,7 +225,7 @@ clean: rm -f trace-dtrace.h trace-dtrace.h-timestamp rm -f $(foreach f,$(GENERATED_HEADERS),$(f) $(f)-timestamp) rm -f $(foreach f,$(GENERATED_SOURCES),$(f) $(f)-timestamp) - rm -rf $(qapi-dir) + rm -rf qapi-generated $(MAKE) -C tests/tcg clean for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \ if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \ -- cgit v1.2.3 From fc8c5b8c41ee5ba69d7a2be63b02a08c7b0b155b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 9 Jun 2012 13:56:42 +0200 Subject: Makefile.user: Define CONFIG_USER_ONLY for libuser/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In *-*-user/ build dirs CONFIG_USER_ONLY is defined via config-target.h. In libuser/ it is not defined. Add it via QEMU_CFLAGS. Signed-off-by: Andreas Färber Reviewed-by: Paolo Bonzini Signed-off-by: Stefan Hajnoczi --- Makefile.user | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.user b/Makefile.user index 0ffefe813f..1783b2a257 100644 --- a/Makefile.user +++ b/Makefile.user @@ -10,6 +10,7 @@ $(call set-vpath, $(SRC_PATH)) QEMU_CFLAGS+=-I.. QEMU_CFLAGS += -I$(SRC_PATH)/include +QEMU_CFLAGS += -DCONFIG_USER_ONLY include $(SRC_PATH)/Makefile.objs -- cgit v1.2.3 From b34d259516ae2377186171c58c3bc535eb9ed263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 28 May 2012 00:53:20 +0200 Subject: libqtest: Fix socket_accept() to pass address_len MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit accept() expects address_len to point to the length of the sockaddr on input. Initialize it accordingly. Resolves an assertion due to EFAULT on illumos. Signed-off-by: Andreas Färber Signed-off-by: Stefan Hajnoczi --- tests/libqtest.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/libqtest.c b/tests/libqtest.c index 6d333ef0ac..1d73fd1953 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -74,6 +74,7 @@ static int socket_accept(int sock) socklen_t addrlen; int ret; + addrlen = sizeof(addr); do { ret = accept(sock, (struct sockaddr *)&addr, &addrlen); } while (ret == -1 && errno == EINTR); -- cgit v1.2.3 From bf7eaa5ffcd65ccca2ace9db37a403202d7f1274 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 16 Jun 2012 09:29:10 +0200 Subject: qemu-config: Use QEMU instead of Qemu This new 'Qemu' was recently added. Replace it by the official all upper case 'QEMU'. Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- qemu-config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu-config.h b/qemu-config.h index e9f2ef4c7b..12ddf3ed97 100644 --- a/qemu-config.h +++ b/qemu-config.h @@ -19,7 +19,7 @@ int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname); int qemu_read_config_file(const char *filename); -/* Read default Qemu config files +/* Read default QEMU config files */ int qemu_read_default_config_files(bool userconfig); -- cgit v1.2.3 From 9964d8f9422e72fc6026049b966544c8e40a7b67 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 17 Jun 2012 06:57:41 +0200 Subject: checkpatch: Add QEMU specific rule The new rule detects two wrong variants of QEMU. It was tested with commit b5a8fe5e. Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- scripts/checkpatch.pl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 8850a5f436..b98dc6cad1 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2849,6 +2849,11 @@ sub process { ERROR("lockdep_no_validate class is reserved for device->mutex.\n" . $herecurr); } } + +# QEMU specific tests + if ($rawline =~ /\b(?:Qemu|QEmu)\b/) { + WARN("use QEMU instead of Qemu or QEmu\n" . $herecurr); + } } # If we have no input at all, then there is nothing to report on -- cgit v1.2.3 From 5eb98401719dfcccf42cf5ec61ac106c5aaa499e Mon Sep 17 00:00:00 2001 From: "Peter A. G. Crosthwaite" Date: Mon, 18 Jun 2012 11:00:18 +1000 Subject: arm_gic: Send dbg msgs to stderr not stdout Signed-off-by: Peter A. G. Crosthwaite Signed-off-by: Stefan Hajnoczi --- hw/arm_gic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm_gic.c b/hw/arm_gic.c index 72298b4b41..c78d58ea26 100644 --- a/hw/arm_gic.c +++ b/hw/arm_gic.c @@ -35,7 +35,7 @@ #ifdef DEBUG_GIC #define DPRINTF(fmt, ...) \ -do { printf("arm_gic: " fmt , ## __VA_ARGS__); } while (0) +do { fprintf(stderr, "arm_gic: " fmt , ## __VA_ARGS__); } while (0) #else #define DPRINTF(fmt, ...) do {} while(0) #endif -- cgit v1.2.3 From 4e1797f9a587ce39d1d67e25d73687eea7b1b04a Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Mon, 18 Jun 2012 22:11:06 +0200 Subject: configure: Fix typo The typo did not cause an error because open_by_handle_at was only compared to "yes". Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index b68c0ca194..1446f52c5b 100755 --- a/configure +++ b/configure @@ -2808,7 +2808,7 @@ fi ########################################## # check if we have open_by_handle_at -open_by_hande_at=no +open_by_handle_at=no cat > $TMPC << EOF #include #if !defined(AT_EMPTY_PATH) -- cgit v1.2.3 From 30fd45adb2e54c7369505ac840907dc33a1078fa Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 19 Jun 2012 15:55:38 +0100 Subject: Makefile.hw: avoid overly large 'make clean' rm command Avoid 'make clean' producing an 'rm' command which has a lot of duplicate 'hw//*.o' arguments, by using $(sort $(dir ..)) rather than $(dir $(sort ..)) so Make's sort function will remove the duplicates for us. We can also remove the double '//' safely because $(dir ..) is guaranteed to return a string ending in '/'. Signed-off-by: Peter Maydell Signed-off-by: Stefan Hajnoczi --- Makefile.hw | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.hw b/Makefile.hw index 2bcbaffb4f..28fe100fbe 100644 --- a/Makefile.hw +++ b/Makefile.hw @@ -19,8 +19,8 @@ all: $(hw-obj-y) @true clean: - rm -f $(addsuffix /*.o, $(dir $(sort $(hw-obj-y)))) - rm -f $(addsuffix /*.d, $(dir $(sort $(hw-obj-y)))) + rm -f $(addsuffix *.o, $(sort $(dir $(hw-obj-y)))) + rm -f $(addsuffix *.d, $(sort $(dir $(hw-obj-y)))) # Include automatically generated dependency files -include $(patsubst %.o, %.d, $(hw-obj-y)) -- cgit v1.2.3 From 09faecf257387d88c457ca255d5c6a003a96623f Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Wed, 20 Jun 2012 06:05:51 +0200 Subject: target-i386: Use QEMU instead of Qemu This new 'QEmu' was recently added. Replace it by the official all upper case 'QEMU'. Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- target-i386/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index fdd95be8cf..5521709240 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1303,7 +1303,7 @@ void x86_cpudef_setup(void) builtin_x86_defs[i].flags = 1; /* Look for specific "cpudef" models that */ - /* have the QEmu version in .model_id */ + /* have the QEMU version in .model_id */ for (j = 0; j < ARRAY_SIZE(model_with_versions); j++) { if (strcmp(model_with_versions[j], builtin_x86_defs[i].name) == 0) { pstrcpy(builtin_x86_defs[i].model_id, sizeof(builtin_x86_defs[i].model_id), "QEMU Virtual CPU version "); -- cgit v1.2.3 From 6a69226f22011673dbce99d5e32cfeaad5bff426 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Wed, 20 Jun 2012 18:07:24 +0200 Subject: tci: Support INDEX_op_bswap64_i64 Running the Windows 7 (64 bit) boot process needs INDEX_op_bswap64_i64. It was already implemented, but untested. Remove the TODO() statement. Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- tci.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tci.c b/tci.c index a412a4ed93..c79350d242 100644 --- a/tci.c +++ b/tci.c @@ -1014,7 +1014,6 @@ tcg_target_ulong tcg_qemu_tb_exec(CPUArchState *cpustate, uint8_t *tb_ptr) #endif #if TCG_TARGET_HAS_bswap64_i64 case INDEX_op_bswap64_i64: - TODO(); t0 = *tb_ptr++; t1 = tci_read_r64(&tb_ptr); tci_write_reg64(t0, bswap64(t1)); -- cgit v1.2.3