| Message ID | ea318d8766a5c58950bdb4b7dde73ae2c3533af6.1433052532.git.crosthwaite.peter@gmail.com |
|---|---|
| State | New |
| Headers | show |
On Sat, May 30, 2015 at 11:11 PM, Peter Crosthwaite <crosthwaitepeter@gmail.com> wrote: > This won't work in multi-arch where this service is not provided to > core code. The architecture specific uses of this in monitor.c should > have their functionality migrated out of monitor.c to arch specific > virtualised hooks. For the moment, just get rid of it to enable testing > of multi-arch on platforms that don't need this. > > Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> > --- > monitor.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/monitor.c b/monitor.c > index f3ee785..ab6024a 100644 > --- a/monitor.c > +++ b/monitor.c > @@ -66,7 +66,6 @@ > #include "trace/simple.h" > #endif > #include "exec/memory.h" > -#include "exec/cpu_ldst.h" So this may actually be legitimate, I cherry-picked this to the master and cant get the build to fail, so I'm guessing the header is obsoleted since its inclusion. $ touch monitor.c $ make -j16 make all-recursive Making all in pixman CHK version_gen.h make[3]: Nothing to be done for `all'. Making all in demos make[3]: Nothing to be done for `all'. Making all in test make[3]: Nothing to be done for `all'. CC lm32-softmmu/monitor.o CC cris-softmmu/monitor.o CC or32-softmmu/monitor.o CC microblazeel-softmmu/monitor.o CC microblaze-softmmu/monitor.o CC moxie-softmmu/monitor.o CC alpha-softmmu/monitor.o CC m68k-softmmu/monitor.o CC mips64el-softmmu/monitor.o CC mips64-softmmu/monitor.o CC ppc-softmmu/monitor.o CC i386-softmmu/monitor.o CC mipsel-softmmu/monitor.o CC mips-softmmu/monitor.o CC arm-softmmu/monitor.o CC aarch64-softmmu/monitor.o LINK cris-softmmu/qemu-system-cris LINK lm32-softmmu/qemu-system-lm32 LINK microblaze-softmmu/qemu-system-microblaze LINK alpha-softmmu/qemu-system-alpha LINK moxie-softmmu/qemu-system-moxie LINK microblazeel-softmmu/qemu-system-microblazeel LINK or32-softmmu/qemu-system-or32 LINK m68k-softmmu/qemu-system-m68k LINK mips64el-softmmu/qemu-system-mips64el LINK mips-softmmu/qemu-system-mips LINK mips64-softmmu/qemu-system-mips64 LINK arm-softmmu/qemu-system-arm LINK i386-softmmu/qemu-system-i386 LINK ppc-softmmu/qemu-system-ppc LINK mipsel-softmmu/qemu-system-mipsel LINK aarch64-softmmu/qemu-system-aarch64 CC s390x-softmmu/monitor.o CC tricore-softmmu/monitor.o CC sparc-softmmu/monitor.o CC ppcemb-softmmu/monitor.o CC sh4-softmmu/monitor.o CC sh4eb-softmmu/monitor.o CC ppc64-softmmu/monitor.o CC sparc64-softmmu/monitor.o CC unicore32-softmmu/monitor.o CC xtensa-softmmu/monitor.o CC xtensaeb-softmmu/monitor.o CC x86_64-softmmu/monitor.o LINK s390x-softmmu/qemu-system-s390x LINK tricore-softmmu/qemu-system-tricore LINK sparc-softmmu/qemu-system-sparc LINK ppcemb-softmmu/qemu-system-ppcemb LINK sparc64-softmmu/qemu-system-sparc64 LINK ppc64-softmmu/qemu-system-ppc64 LINK sh4-softmmu/qemu-system-sh4 LINK sh4eb-softmmu/qemu-system-sh4eb LINK xtensa-softmmu/qemu-system-xtensa LINK unicore32-softmmu/qemu-system-unicore32 LINK x86_64-softmmu/qemu-system-x86_64 LINK xtensaeb-softmmu/qemu-system-xtensaeb $ echo $? 0 I'll fix the commit message in the next spin. Regards, Peter > #include "qmp-commands.h" > #include "hmp.h" > #include "qemu/thread.h" > -- > 1.9.1 > >
diff --git a/monitor.c b/monitor.c index f3ee785..ab6024a 100644 --- a/monitor.c +++ b/monitor.c @@ -66,7 +66,6 @@ #include "trace/simple.h" #endif #include "exec/memory.h" -#include "exec/cpu_ldst.h" #include "qmp-commands.h" #include "hmp.h" #include "qemu/thread.h"
This won't work in multi-arch where this service is not provided to core code. The architecture specific uses of this in monitor.c should have their functionality migrated out of monitor.c to arch specific virtualised hooks. For the moment, just get rid of it to enable testing of multi-arch on platforms that don't need this. Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> --- monitor.c | 1 - 1 file changed, 1 deletion(-)