| Message ID | 1392899343-5226-1-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 20 February 2014 12:28, Paolo Bonzini <pbonzini@redhat.com> wrote: > Anthony, Peter, > > The following changes since commit 89e4a51ca9546a7bbe1998c4e3d4a3ac3a0c19be: > > Merge remote-tracking branch 'stefanha/tags/tracing-pull-request' into staging (2014-01-31 11:13:08 +0000) > > are available in the git repository at: > > git://github.com/bonzini/qemu.git configure > > for you to fetch changes up to f966f9ddd175bdf82f12650c3b7b5a93cc421d88: > > build: softmmu targets do not have a "main.o" file (2014-02-20 13:14:18 +0100) > > No changes except context, but close enough to modified lines that git flags > a conflict. Applied, thanks. -- PMM
Anthony, Peter, The following changes since commit 89e4a51ca9546a7bbe1998c4e3d4a3ac3a0c19be: Merge remote-tracking branch 'stefanha/tags/tracing-pull-request' into staging (2014-01-31 11:13:08 +0000) are available in the git repository at: git://github.com/bonzini/qemu.git configure for you to fetch changes up to f966f9ddd175bdf82f12650c3b7b5a93cc421d88: build: softmmu targets do not have a "main.o" file (2014-02-20 13:14:18 +0100) No changes except context, but close enough to modified lines that git flags a conflict. Paolo ---------------------------------------------------------------- Don Slutz (1): configure: Disable libtool if -fPIE does not work with it (bug #1257099) Fam Zheng (9): util: Split out exec_dir from os_find_datadir rules.mak: fix $(obj) to a real relative path rules.mak: allow per object cflags and libs block: use per-object cflags and libs rules.mak: introduce DSO rules module: implement module loading Makefile: install modules with "make install" Makefile: introduce common-obj-m and block-obj-m for DSO block: convert block drivers linked with libs to modules Paolo Bonzini (2): darwin: do not use -mdynamic-no-pic build: softmmu targets do not have a "main.o" file .gitignore | 3 + Makefile | 29 +++++++++- Makefile.objs | 19 +----- Makefile.target | 23 ++++++-- block/Makefile.objs | 13 ++++- configure | 156 ++++++++++++++++++++++++++++++++++++++++---------- include/qemu-common.h | 2 +- include/qemu/module.h | 23 +++++++- include/qemu/osdep.h | 9 +++ module-common.c | 10 ++++ os-posix.c | 42 +++----------- os-win32.c | 21 +------ qemu-img.c | 1 + qemu-io.c | 1 + qemu-nbd.c | 1 + rules.mak | 80 +++++++++++++++++++++----- scripts/create_config | 3 + util/module.c | 145 +++++++++++++++++++++++++++++++++++++++++++++- util/oslib-posix.c | 54 +++++++++++++++++ util/oslib-win32.c | 30 ++++++++++ vl.c | 3 +- 21 files changed, 541 insertions(+), 127 deletions(-) create mode 100644 module-common.c