* [Qemu-devel] [PATCH v3 0/6] Remove libqemu related stuff from QEMU source tree @ 2011-11-15 12:47 Chen Wei-Ren (陳韋任) 2011-11-15 12:47 ` [Qemu-devel] [PATCH v3 1/6] tests/Makefile: Remove qruncom target Chen Wei-Ren (陳韋任) ` (8 more replies) 0 siblings, 9 replies; 13+ messages in thread From: Chen Wei-Ren (陳韋任) @ 2011-11-15 12:47 UTC (permalink / raw) To: qemu-devel; +Cc: Chen Wei-Ren From: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> According to [1], libqemu is not available anymore. Remove libqemu related stuff from QEMU source tree. [1] http://www.mail-archive.com/address@hidden/msg49809.html v2: - Remove entry "qruncom.c" from "3 Regression Tests" in qemu-tech.texi. - Undo the deletion of common-obj-y. Only remove libqemu_common.a from the comment. v3: - Change tests/Makefile first before removing tests/qruncom.c. - Only remove out-of-date comment about libqemu.a from Makefile.target, leave manually inserted dependencie alone. Chen Wei-Ren (6): tests/Makefile: Remove qruncom target tests/qruncom.c: Remove libqemu.a example qemu-tech.texi: Remove libqemu related stuff from the document Makefile.target: Remove out of date comment Makefile.objs: Remove libqemu_common.a from the comment LICENSE: There is no libqemu.a anymore LICENSE | 4 +- Makefile.objs | 7 +- Makefile.target | 2 - qemu-tech.texi | 10 -- tests/Makefile | 6 - tests/qruncom.c | 284 ------------------------------------------------------- 6 files changed, 4 insertions(+), 309 deletions(-) delete mode 100644 tests/qruncom.c -- 1.7.3.4 ^ permalink raw reply [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH v3 1/6] tests/Makefile: Remove qruncom target 2011-11-15 12:47 [Qemu-devel] [PATCH v3 0/6] Remove libqemu related stuff from QEMU source tree Chen Wei-Ren (陳韋任) @ 2011-11-15 12:47 ` Chen Wei-Ren (陳韋任) 2011-11-15 12:47 ` [Qemu-devel] [PATCH v3 2/6] tests/qruncom.c: Remove libqemu.a example Chen Wei-Ren (陳韋任) ` (7 subsequent siblings) 8 siblings, 0 replies; 13+ messages in thread From: Chen Wei-Ren (陳韋任) @ 2011-11-15 12:47 UTC (permalink / raw) To: qemu-devel; +Cc: Chen Wei-Ren From: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> Remove qruncom target from the Makefile file. Signed-off-by: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> --- tests/Makefile | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 430e0c1..15e36a2 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -115,12 +115,6 @@ speed: sha1 sha1-i386 time ./sha1 time $(QEMU) ./sha1-i386 -# broken test -# NOTE: -fomit-frame-pointer is currently needed : this is a bug in libqemu -qruncom: qruncom.c ../ioport-user.c ../i386-user/libqemu.a - $(CC) $(CFLAGS) -fomit-frame-pointer $(LDFLAGS) -I../target-i386 -I.. -I../i386-user -I../fpu \ - -o $@ $(filter %.c, $^) -L../i386-user -lqemu -lm - # arm test hello-arm: hello-arm.o arm-linux-ld -o $@ $< -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH v3 2/6] tests/qruncom.c: Remove libqemu.a example 2011-11-15 12:47 [Qemu-devel] [PATCH v3 0/6] Remove libqemu related stuff from QEMU source tree Chen Wei-Ren (陳韋任) 2011-11-15 12:47 ` [Qemu-devel] [PATCH v3 1/6] tests/Makefile: Remove qruncom target Chen Wei-Ren (陳韋任) @ 2011-11-15 12:47 ` Chen Wei-Ren (陳韋任) 2011-11-15 12:47 ` [Qemu-devel] [PATCH v3 3/6] qemu-tech.texi: Remove libqemu related stuff from the document Chen Wei-Ren (陳韋任) ` (6 subsequent siblings) 8 siblings, 0 replies; 13+ messages in thread From: Chen Wei-Ren (陳韋任) @ 2011-11-15 12:47 UTC (permalink / raw) To: qemu-devel; +Cc: Chen Wei-Ren From: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> Remove libqemu example since libqemu.a is not available anymore. Signed-off-by: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> --- tests/qruncom.c | 284 ------------------------------------------------------- 1 files changed, 0 insertions(+), 284 deletions(-) delete mode 100644 tests/qruncom.c diff --git a/tests/qruncom.c b/tests/qruncom.c deleted file mode 100644 index 2e93aaf..0000000 --- a/tests/qruncom.c +++ /dev/null @@ -1,284 +0,0 @@ -/* - * Example of use of user mode libqemu: launch a basic .com DOS - * executable - */ -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <inttypes.h> -#include <unistd.h> -#include <fcntl.h> -#include <sys/mman.h> -#include <signal.h> -#include <malloc.h> - -#include "cpu.h" - -//#define SIGTEST - -int cpu_get_pic_interrupt(CPUState *env) -{ - return -1; -} - -uint64_t cpu_get_tsc(CPUState *env) -{ - return 0; -} - -static void set_gate(void *ptr, unsigned int type, unsigned int dpl, - unsigned long addr, unsigned int sel) -{ - unsigned int e1, e2; - e1 = (addr & 0xffff) | (sel << 16); - e2 = (addr & 0xffff0000) | 0x8000 | (dpl << 13) | (type << 8); - stl((uint8_t *)ptr, e1); - stl((uint8_t *)ptr + 4, e2); -} - -uint64_t idt_table[256]; - -/* only dpl matters as we do only user space emulation */ -static void set_idt(int n, unsigned int dpl) -{ - set_gate(idt_table + n, 0, dpl, 0, 0); -} - -void g_free(void *ptr) -{ - free(ptr); -} - -void *g_malloc(size_t size) -{ - return malloc(size); -} - -void *g_malloc0(size_t size) -{ - void *ptr; - ptr = g_malloc(size); - if (!ptr) - return NULL; - memset(ptr, 0, size); - return ptr; -} - -void *qemu_vmalloc(size_t size) -{ - return memalign(4096, size); -} - -void qemu_vfree(void *ptr) -{ - free(ptr); -} - -void qemu_printf(const char *fmt, ...) -{ - va_list ap; - va_start(ap, fmt); - vprintf(fmt, ap); - va_end(ap); -} - -/* XXX: this is a bug in helper2.c */ -int errno; - -/**********************************************/ - -#define COM_BASE_ADDR 0x10100 - -static void usage(void) -{ - printf("qruncom version 0.1 (c) 2003 Fabrice Bellard\n" - "usage: qruncom file.com\n" - "user mode libqemu demo: run simple .com DOS executables\n"); - exit(1); -} - -static inline uint8_t *seg_to_linear(unsigned int seg, unsigned int reg) -{ - return (uint8_t *)((seg << 4) + (reg & 0xffff)); -} - -static inline void pushw(CPUState *env, int val) -{ - env->regs[R_ESP] = (env->regs[R_ESP] & ~0xffff) | ((env->regs[R_ESP] - 2) & 0xffff); - *(uint16_t *)seg_to_linear(env->segs[R_SS].selector, env->regs[R_ESP]) = val; -} - -static void host_segv_handler(int host_signum, siginfo_t *info, - void *puc) -{ - if (cpu_signal_handler(host_signum, info, puc)) { - return; - } - abort(); -} - -int main(int argc, char **argv) -{ - uint8_t *vm86_mem; - const char *filename; - int fd, ret, seg; - CPUState *env; - - if (argc != 2) - usage(); - filename = argv[1]; - - vm86_mem = mmap((void *)0x00000000, 0x110000, - PROT_WRITE | PROT_READ | PROT_EXEC, - MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0); - if (vm86_mem == MAP_FAILED) { - perror("mmap"); - exit(1); - } - - /* load the MSDOS .com executable */ - fd = open(filename, O_RDONLY); - if (fd < 0) { - perror(filename); - exit(1); - } - ret = read(fd, vm86_mem + COM_BASE_ADDR, 65536 - 256); - if (ret < 0) { - perror("read"); - exit(1); - } - close(fd); - - /* install exception handler for CPU emulator */ - { - struct sigaction act; - - sigfillset(&act.sa_mask); - act.sa_flags = SA_SIGINFO; - // act.sa_flags |= SA_ONSTACK; - - act.sa_sigaction = host_segv_handler; - sigaction(SIGSEGV, &act, NULL); - sigaction(SIGBUS, &act, NULL); - } - - // cpu_set_log(CPU_LOG_TB_IN_ASM | CPU_LOG_TB_OUT_ASM | CPU_LOG_EXEC); - - env = cpu_init("qemu32"); - - cpu_x86_set_cpl(env, 3); - - env->cr[0] = CR0_PG_MASK | CR0_WP_MASK | CR0_PE_MASK; - /* NOTE: hflags duplicates some of the virtual CPU state */ - env->hflags |= HF_PE_MASK | VM_MASK; - - /* flags setup : we activate the IRQs by default as in user - mode. We also activate the VM86 flag to run DOS code */ - env->eflags |= IF_MASK | VM_MASK; - - /* init basic registers */ - env->eip = 0x100; - env->regs[R_ESP] = 0xfffe; - seg = (COM_BASE_ADDR - 0x100) >> 4; - - cpu_x86_load_seg_cache(env, R_CS, seg, - (seg << 4), 0xffff, 0); - cpu_x86_load_seg_cache(env, R_SS, seg, - (seg << 4), 0xffff, 0); - cpu_x86_load_seg_cache(env, R_DS, seg, - (seg << 4), 0xffff, 0); - cpu_x86_load_seg_cache(env, R_ES, seg, - (seg << 4), 0xffff, 0); - cpu_x86_load_seg_cache(env, R_FS, seg, - (seg << 4), 0xffff, 0); - cpu_x86_load_seg_cache(env, R_GS, seg, - (seg << 4), 0xffff, 0); - - /* exception support */ - env->idt.base = (unsigned long)idt_table; - env->idt.limit = sizeof(idt_table) - 1; - set_idt(0, 0); - set_idt(1, 0); - set_idt(2, 0); - set_idt(3, 3); - set_idt(4, 3); - set_idt(5, 3); - set_idt(6, 0); - set_idt(7, 0); - set_idt(8, 0); - set_idt(9, 0); - set_idt(10, 0); - set_idt(11, 0); - set_idt(12, 0); - set_idt(13, 0); - set_idt(14, 0); - set_idt(15, 0); - set_idt(16, 0); - set_idt(17, 0); - set_idt(18, 0); - set_idt(19, 0); - - /* put return code */ - *seg_to_linear(env->segs[R_CS].selector, 0) = 0xb4; /* mov ah, $0 */ - *seg_to_linear(env->segs[R_CS].selector, 1) = 0x00; - *seg_to_linear(env->segs[R_CS].selector, 2) = 0xcd; /* int $0x21 */ - *seg_to_linear(env->segs[R_CS].selector, 3) = 0x21; - pushw(env, 0x0000); - - /* the value of these registers seem to be assumed by pi_10.com */ - env->regs[R_ESI] = 0x100; - env->regs[R_ECX] = 0xff; - env->regs[R_EBP] = 0x0900; - env->regs[R_EDI] = 0xfffe; - - /* inform the emulator of the mmaped memory */ - page_set_flags(0x00000000, 0x110000, - PAGE_WRITE | PAGE_READ | PAGE_EXEC | PAGE_VALID); - - for(;;) { - ret = cpu_x86_exec(env); - switch(ret) { - case EXCP0D_GPF: - { - int int_num, ah; - int_num = *(uint8_t *)(env->segs[R_CS].base + env->eip + 1); - if (int_num != 0x21) - goto unknown_int; - ah = (env->regs[R_EAX] >> 8) & 0xff; - switch(ah) { - case 0x00: /* exit */ - exit(0); - case 0x02: /* write char */ - { - uint8_t c = env->regs[R_EDX]; - write(1, &c, 1); - } - break; - case 0x09: /* write string */ - { - uint8_t c; - for(;;) { - c = *seg_to_linear(env->segs[R_DS].selector, env->regs[R_EAX]); - if (c == '$') - break; - write(1, &c, 1); - } - env->regs[R_EAX] = (env->regs[R_EAX] & ~0xff) | '$'; - } - break; - default: - unknown_int: - fprintf(stderr, "unsupported int 0x%02x\n", int_num); - cpu_dump_state(env, stderr, fprintf, 0); - // exit(1); - } - env->eip += 2; - } - break; - default: - fprintf(stderr, "unhandled cpu_exec return code (0x%x)\n", ret); - cpu_dump_state(env, stderr, fprintf, 0); - exit(1); - } - } -} -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH v3 3/6] qemu-tech.texi: Remove libqemu related stuff from the document 2011-11-15 12:47 [Qemu-devel] [PATCH v3 0/6] Remove libqemu related stuff from QEMU source tree Chen Wei-Ren (陳韋任) 2011-11-15 12:47 ` [Qemu-devel] [PATCH v3 1/6] tests/Makefile: Remove qruncom target Chen Wei-Ren (陳韋任) 2011-11-15 12:47 ` [Qemu-devel] [PATCH v3 2/6] tests/qruncom.c: Remove libqemu.a example Chen Wei-Ren (陳韋任) @ 2011-11-15 12:47 ` Chen Wei-Ren (陳韋任) 2011-11-15 12:47 ` [Qemu-devel] [PATCH v3 4/6] Makefile.target: Remove out of date comment Chen Wei-Ren (陳韋任) ` (5 subsequent siblings) 8 siblings, 0 replies; 13+ messages in thread From: Chen Wei-Ren (陳韋任) @ 2011-11-15 12:47 UTC (permalink / raw) To: qemu-devel; +Cc: Chen Wei-Ren From: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> Remove libqemu related stuff from the document since libqemu.a is not supported anymore. Signed-off-by: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> --- qemu-tech.texi | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/qemu-tech.texi b/qemu-tech.texi index 62afe45..5676fb7 100644 --- a/qemu-tech.texi +++ b/qemu-tech.texi @@ -96,10 +96,6 @@ Alpha and S390 hosts, but TCG (see below) doesn't support those yet. @item Precise exceptions support. -@item The virtual CPU is a library (@code{libqemu}) which can be used -in other projects (look at @file{qemu/tests/qruncom.c} to have an -example of user mode @code{libqemu} usage). - @item Floating point library supporting both full software emulation and native host FPU instructions. @@ -685,7 +681,6 @@ are available. They are used for regression testing. @menu * test-i386:: * linux-test:: -* qruncom.c:: @end menu @node test-i386 @@ -711,11 +706,6 @@ This program tests various Linux system calls. It is used to verify that the system call parameters are correctly converted between target and host CPUs. -@node qruncom.c -@section @file{qruncom.c} - -Example of usage of @code{libqemu} to emulate a user mode i386 CPU. - @node Index @chapter Index @printindex cp -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH v3 4/6] Makefile.target: Remove out of date comment 2011-11-15 12:47 [Qemu-devel] [PATCH v3 0/6] Remove libqemu related stuff from QEMU source tree Chen Wei-Ren (陳韋任) ` (2 preceding siblings ...) 2011-11-15 12:47 ` [Qemu-devel] [PATCH v3 3/6] qemu-tech.texi: Remove libqemu related stuff from the document Chen Wei-Ren (陳韋任) @ 2011-11-15 12:47 ` Chen Wei-Ren (陳韋任) 2011-11-15 12:47 ` [Qemu-devel] [PATCH v3 5/6] Makefile.objs: Remove libqemu_common.a from the comment Chen Wei-Ren (陳韋任) ` (4 subsequent siblings) 8 siblings, 0 replies; 13+ messages in thread From: Chen Wei-Ren (陳韋任) @ 2011-11-15 12:47 UTC (permalink / raw) To: qemu-devel; +Cc: Chen Wei-Ren From: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> Remove the out of date comment, i.e., "# libqemu" since libqemu.a is not available anymore. Signed-off-by: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> --- v3: - Only remove out-of-date comment about libqemu.a from Makefile.target, leave manually inserted dependencie alone. Makefile.target | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/Makefile.target b/Makefile.target index a111521..7369a89 100644 --- a/Makefile.target +++ b/Makefile.target @@ -92,8 +92,6 @@ tci-dis.o: QEMU_CFLAGS += -I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/tci $(libobj-y): $(GENERATED_HEADERS) -# libqemu - translate.o: translate.c cpu.h translate-all.o: translate-all.c cpu.h -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH v3 5/6] Makefile.objs: Remove libqemu_common.a from the comment 2011-11-15 12:47 [Qemu-devel] [PATCH v3 0/6] Remove libqemu related stuff from QEMU source tree Chen Wei-Ren (陳韋任) ` (3 preceding siblings ...) 2011-11-15 12:47 ` [Qemu-devel] [PATCH v3 4/6] Makefile.target: Remove out of date comment Chen Wei-Ren (陳韋任) @ 2011-11-15 12:47 ` Chen Wei-Ren (陳韋任) 2011-12-09 11:09 ` Andreas Färber 2011-11-15 12:47 ` [Qemu-devel] [PATCH v3 6/6] LICENSE: There is no libqemu.a anymore Chen Wei-Ren (陳韋任) ` (3 subsequent siblings) 8 siblings, 1 reply; 13+ messages in thread From: Chen Wei-Ren (陳韋任) @ 2011-11-15 12:47 UTC (permalink / raw) To: qemu-devel; +Cc: Chen Wei-Ren From: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> Remove libqemu_common.a from the comment. Signed-off-by: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> --- Makefile.objs | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index d7a6539..64c5c24 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -68,10 +68,9 @@ endif fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y)) ###################################################################### -# libqemu_common.a: 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 single QEMU executable should support all -# CPUs and machines. +# 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 single QEMU executable should support all CPUs and machines. common-obj-y = $(block-obj-y) blockdev.o common-obj-y += $(net-obj-y) -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH v3 5/6] Makefile.objs: Remove libqemu_common.a from the comment 2011-11-15 12:47 ` [Qemu-devel] [PATCH v3 5/6] Makefile.objs: Remove libqemu_common.a from the comment Chen Wei-Ren (陳韋任) @ 2011-12-09 11:09 ` Andreas Färber 2011-12-09 11:28 ` Stefan Hajnoczi 0 siblings, 1 reply; 13+ messages in thread From: Andreas Färber @ 2011-12-09 11:09 UTC (permalink / raw) To: Stefan Hajnoczi Cc: Peter Maydell, qemu-devel, "Chen Wei-Ren (陳韋任)" Am 15.11.2011 13:47, schrieb Chen Wei-Ren (陳韋任): > From: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> > > Remove libqemu_common.a from the comment. > > Signed-off-by: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> > --- > Makefile.objs | 7 +++---- > 1 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/Makefile.objs b/Makefile.objs > index d7a6539..64c5c24 100644 > --- a/Makefile.objs > +++ b/Makefile.objs > @@ -68,10 +68,9 @@ endif > fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y)) > > ###################################################################### > -# libqemu_common.a: 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 single QEMU executable should support all > -# CPUs and machines. > +# Target independent part of system emulation. The long term path is > +# to suppress *all* target specific code in case of # system emulation, Stefan, could you still fix this up, please? (stray comment sign) Andreas > +# i.e. a single QEMU executable should support all CPUs and machines. > > common-obj-y = $(block-obj-y) blockdev.o > common-obj-y += $(net-obj-y) -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH v3 5/6] Makefile.objs: Remove libqemu_common.a from the comment 2011-12-09 11:09 ` Andreas Färber @ 2011-12-09 11:28 ` Stefan Hajnoczi 2011-12-09 14:29 ` Stefan Hajnoczi 0 siblings, 1 reply; 13+ messages in thread From: Stefan Hajnoczi @ 2011-12-09 11:28 UTC (permalink / raw) To: Andreas Färber Cc: Peter Maydell, qemu-devel, "Chen Wei-Ren (陳韋任)" On Fri, Dec 9, 2011 at 11:09 AM, Andreas Färber <afaerber@suse.de> wrote: > Am 15.11.2011 13:47, schrieb Chen Wei-Ren (陳韋任): >> From: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> >> >> Remove libqemu_common.a from the comment. >> >> Signed-off-by: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> >> --- >> Makefile.objs | 7 +++---- >> 1 files changed, 3 insertions(+), 4 deletions(-) >> >> diff --git a/Makefile.objs b/Makefile.objs >> index d7a6539..64c5c24 100644 >> --- a/Makefile.objs >> +++ b/Makefile.objs >> @@ -68,10 +68,9 @@ endif >> fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y)) >> >> ###################################################################### >> -# libqemu_common.a: 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 single QEMU executable should support all >> -# CPUs and machines. >> +# Target independent part of system emulation. The long term path is >> +# to suppress *all* target specific code in case of # system emulation, > > Stefan, could you still fix this up, please? (stray comment sign) Fixed, though it's the second time today I modified someone's commit before merging it and I'm feeling a little dirty: http://repo.or.cz/w/qemu/stefanha.git/commitdiff/b745d5e0c0eef709eda618020d82a283a7576820 Stefan ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH v3 5/6] Makefile.objs: Remove libqemu_common.a from the comment 2011-12-09 11:28 ` Stefan Hajnoczi @ 2011-12-09 14:29 ` Stefan Hajnoczi 0 siblings, 0 replies; 13+ messages in thread From: Stefan Hajnoczi @ 2011-12-09 14:29 UTC (permalink / raw) To: Andreas Färber Cc: Peter Maydell, qemu-devel, "Chen Wei-Ren (陳韋任)" On Fri, Dec 9, 2011 at 11:28 AM, Stefan Hajnoczi <stefanha@gmail.com> wrote: > On Fri, Dec 9, 2011 at 11:09 AM, Andreas Färber <afaerber@suse.de> wrote: >> Am 15.11.2011 13:47, schrieb Chen Wei-Ren (陳韋任): >>> From: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> >>> >>> Remove libqemu_common.a from the comment. >>> >>> Signed-off-by: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> >>> --- >>> Makefile.objs | 7 +++---- >>> 1 files changed, 3 insertions(+), 4 deletions(-) >>> >>> diff --git a/Makefile.objs b/Makefile.objs >>> index d7a6539..64c5c24 100644 >>> --- a/Makefile.objs >>> +++ b/Makefile.objs >>> @@ -68,10 +68,9 @@ endif >>> fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y)) >>> >>> ###################################################################### >>> -# libqemu_common.a: 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 single QEMU executable should support all >>> -# CPUs and machines. >>> +# Target independent part of system emulation. The long term path is >>> +# to suppress *all* target specific code in case of # system emulation, >> >> Stefan, could you still fix this up, please? (stray comment sign) > > Fixed, though it's the second time today I modified someone's commit > before merging it and I'm feeling a little dirty: > http://repo.or.cz/w/qemu/stefanha.git/commitdiff/b745d5e0c0eef709eda618020d82a283a7576820 Thanks to Peter Maydell for pointing out that I posted the old commit URL instead of the fixed one. Here's the fixed version in the trivial patches -next tree: http://repo.or.cz/w/qemu/stefanha.git/commitdiff/050d99402845d3c5915e3abd8aea7cc772b85b8e Stefan ^ permalink raw reply [flat|nested] 13+ messages in thread
* [Qemu-devel] [PATCH v3 6/6] LICENSE: There is no libqemu.a anymore 2011-11-15 12:47 [Qemu-devel] [PATCH v3 0/6] Remove libqemu related stuff from QEMU source tree Chen Wei-Ren (陳韋任) ` (4 preceding siblings ...) 2011-11-15 12:47 ` [Qemu-devel] [PATCH v3 5/6] Makefile.objs: Remove libqemu_common.a from the comment Chen Wei-Ren (陳韋任) @ 2011-11-15 12:47 ` Chen Wei-Ren (陳韋任) 2011-12-06 16:15 ` [Qemu-devel] [PATCH v3 0/6] Remove libqemu related stuff from QEMU source tree Peter Maydell ` (2 subsequent siblings) 8 siblings, 0 replies; 13+ messages in thread From: Chen Wei-Ren (陳韋任) @ 2011-11-15 12:47 UTC (permalink / raw) To: qemu-devel; +Cc: Chen Wei-Ren From: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> Remove statement about libqemu.a from LICENSE. Signed-off-by: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> --- LICENSE | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index cbd92c0..acae9a3 100644 --- a/LICENSE +++ b/LICENSE @@ -6,9 +6,7 @@ The following points clarify the QEMU license: GNU General Public License. Hence each source file contains its own licensing information. -In particular, the QEMU virtual CPU core library (libqemu.a) is -released under the GNU Lesser General Public License. Many hardware -device emulation sources are released under the BSD license. +Many hardware device emulation sources are released under the BSD license. 3) The Tiny Code Generator (TCG) is released under the BSD license (see license headers in files). -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/6] Remove libqemu related stuff from QEMU source tree 2011-11-15 12:47 [Qemu-devel] [PATCH v3 0/6] Remove libqemu related stuff from QEMU source tree Chen Wei-Ren (陳韋任) ` (5 preceding siblings ...) 2011-11-15 12:47 ` [Qemu-devel] [PATCH v3 6/6] LICENSE: There is no libqemu.a anymore Chen Wei-Ren (陳韋任) @ 2011-12-06 16:15 ` Peter Maydell 2011-12-06 19:50 ` Stuart Brady 2011-12-09 10:57 ` Stefan Hajnoczi 8 siblings, 0 replies; 13+ messages in thread From: Peter Maydell @ 2011-12-06 16:15 UTC (permalink / raw) To: Chen Wei-Ren (陳韋任); +Cc: qemu-trivial, qemu-devel On 15 November 2011 12:47, Chen Wei-Ren (陳韋任) <chenwj@iis.sinica.edu.tw> wrote: > From: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> > > According to [1], libqemu is not available anymore. Remove libqemu > related stuff from QEMU source tree. Whole series: Reviewed-by: Peter Maydell <peter.maydell@linaro.org> (and tested it still applies to current master.) Can we call this a trivial patch? It's six patches, but they're all individually pretty trivial... -- PMM ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/6] Remove libqemu related stuff from QEMU source tree 2011-11-15 12:47 [Qemu-devel] [PATCH v3 0/6] Remove libqemu related stuff from QEMU source tree Chen Wei-Ren (陳韋任) ` (6 preceding siblings ...) 2011-12-06 16:15 ` [Qemu-devel] [PATCH v3 0/6] Remove libqemu related stuff from QEMU source tree Peter Maydell @ 2011-12-06 19:50 ` Stuart Brady 2011-12-09 10:57 ` Stefan Hajnoczi 8 siblings, 0 replies; 13+ messages in thread From: Stuart Brady @ 2011-12-06 19:50 UTC (permalink / raw) To: qemu-devel On Tue, Nov 15, 2011 at 08:47:06PM +0800, Chen Wei-Ren (陳韋任) wrote: > From: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> > > According to [1], libqemu is not available anymore. Remove libqemu > related stuff from QEMU source tree. > > [1] http://www.mail-archive.com/address@hidden/msg49809.html Since I've just gone looking for this message myself, anyway, hope you don't mind me posting the correct URL: [1] http://www.mail-archive.com/qemu-devel@nongnu.org/msg49809.html Cheers, -- Stuart ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/6] Remove libqemu related stuff from QEMU source tree 2011-11-15 12:47 [Qemu-devel] [PATCH v3 0/6] Remove libqemu related stuff from QEMU source tree Chen Wei-Ren (陳韋任) ` (7 preceding siblings ...) 2011-12-06 19:50 ` Stuart Brady @ 2011-12-09 10:57 ` Stefan Hajnoczi 8 siblings, 0 replies; 13+ messages in thread From: Stefan Hajnoczi @ 2011-12-09 10:57 UTC (permalink / raw) To: Chen Wei-Ren (陳韋任); +Cc: qemu-devel On Tue, Nov 15, 2011 at 08:47:06PM +0800, Chen Wei-Ren (陳韋任) wrote: > From: Chen Wei-Ren <chenwj@iis.sinica.edu.tw> > > According to [1], libqemu is not available anymore. Remove libqemu > related stuff from QEMU source tree. > > [1] http://www.mail-archive.com/address@hidden/msg49809.html > > v2: > - Remove entry "qruncom.c" from "3 Regression Tests" in qemu-tech.texi. > - Undo the deletion of common-obj-y. Only remove libqemu_common.a from > the comment. > > v3: > - Change tests/Makefile first before removing tests/qruncom.c. > - Only remove out-of-date comment about libqemu.a from Makefile.target, > leave manually inserted dependencie alone. > > Chen Wei-Ren (6): > tests/Makefile: Remove qruncom target > tests/qruncom.c: Remove libqemu.a example > qemu-tech.texi: Remove libqemu related stuff from the document > Makefile.target: Remove out of date comment > Makefile.objs: Remove libqemu_common.a from the comment > LICENSE: There is no libqemu.a anymore > > LICENSE | 4 +- > Makefile.objs | 7 +- > Makefile.target | 2 - > qemu-tech.texi | 10 -- > tests/Makefile | 6 - > tests/qruncom.c | 284 ------------------------------------------------------- > 6 files changed, 4 insertions(+), 309 deletions(-) > delete mode 100644 tests/qruncom.c Thanks, applied to the trivial patches -next tree: http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches-next Stefan ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2011-12-09 14:30 UTC | newest] Thread overview: 13+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-11-15 12:47 [Qemu-devel] [PATCH v3 0/6] Remove libqemu related stuff from QEMU source tree Chen Wei-Ren (陳韋任) 2011-11-15 12:47 ` [Qemu-devel] [PATCH v3 1/6] tests/Makefile: Remove qruncom target Chen Wei-Ren (陳韋任) 2011-11-15 12:47 ` [Qemu-devel] [PATCH v3 2/6] tests/qruncom.c: Remove libqemu.a example Chen Wei-Ren (陳韋任) 2011-11-15 12:47 ` [Qemu-devel] [PATCH v3 3/6] qemu-tech.texi: Remove libqemu related stuff from the document Chen Wei-Ren (陳韋任) 2011-11-15 12:47 ` [Qemu-devel] [PATCH v3 4/6] Makefile.target: Remove out of date comment Chen Wei-Ren (陳韋任) 2011-11-15 12:47 ` [Qemu-devel] [PATCH v3 5/6] Makefile.objs: Remove libqemu_common.a from the comment Chen Wei-Ren (陳韋任) 2011-12-09 11:09 ` Andreas Färber 2011-12-09 11:28 ` Stefan Hajnoczi 2011-12-09 14:29 ` Stefan Hajnoczi 2011-11-15 12:47 ` [Qemu-devel] [PATCH v3 6/6] LICENSE: There is no libqemu.a anymore Chen Wei-Ren (陳韋任) 2011-12-06 16:15 ` [Qemu-devel] [PATCH v3 0/6] Remove libqemu related stuff from QEMU source tree Peter Maydell 2011-12-06 19:50 ` Stuart Brady 2011-12-09 10:57 ` Stefan Hajnoczi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).