Re: [Qemu-devel] [PATCH] Rename qemu -> qemu-system-i386

[Andreas Färber]

Am 02.09.2011 um 17:40 schrieb Anthony Liguori:

> On 08/29/2011 09:55 AM, Anthony Liguori wrote:
> > This has been discussed before in the past.  The special casing  
> > really makes no
> > sense anymore.  This seems like a good change to make for 1.0.
> >
> > Signed-off-by: Anthony Liguori<address@hidden>
>
> Applied.
>
> Regards,
>
> Anthony Liguori
>
> > ---
> >  Makefile        |    5 ++---
> >  Makefile.target |    4 ----
> >  2 files changed, 2 insertions(+), 7 deletions(-)
> >
> > diff --git a/Makefile b/Makefile
> > index 8606849..51ecdb5 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -365,9 +365,8 @@ tar:
> >         rm -rf /tmp/$(FILE)
> >
> >  SYSTEM_TARGETS=$(filter %-softmmu,$(TARGET_DIRS))
> > -SYSTEM_PROGS=$(patsubst qemu-system-i386,qemu, \
> > -             $(patsubst %-softmmu,qemu-system-%, \
> > -             $(SYSTEM_TARGETS)))
> > +SYSTEM_PROGS=$(patsubst %-softmmu,qemu-system-%, \
> > +             $(SYSTEM_TARGETS))
> >
> >  USER_TARGETS=$(filter %-user,$(TARGET_DIRS))
> >  USER_PROGS=$(patsubst %-bsd-user,qemu-%, \
> > diff --git a/Makefile.target b/Makefile.target
> > index 07af4d4..29287ed 100644
> > --- a/Makefile.target
> > +++ b/Makefile.target
> > @@ -27,12 +27,8 @@ ifdef CONFIG_USER_ONLY
> >  QEMU_PROG=qemu-$(TARGET_ARCH2)
> >  else
> >  # system emulator name
> > -ifeq ($(TARGET_ARCH), i386)
> > -QEMU_PROG=qemu$(EXESUF)
> > -else
> >  QEMU_PROG=qemu-system-$(TARGET_ARCH2)$(EXESUF)
> >  endif
> > -endif
> >
> >  PROGS=$(QEMU_PROG)
> >  STPFILES=

This will leave an old qemu executable from a previous `make install`  
behind.
We should check for it and, unless it's a symlink to qemu-system-i386,  
remove it in the install target.

Andreas