| Submitter | Andreas Färber |
|---|---|
| Date | May 7, 2012, 5:47 p.m. |
| Message ID | <1336412858-9366-1-git-send-email-afaerber@suse.de> |
| Download | mbox | patch |
| Permalink | /patch/157365/ |
| State | New |
| Headers | show |
Comments
Il 07/05/2012 19:47, Andreas Färber ha scritto: > The script is organized as a sequence of binfmt registrations, with a > check whether the to be registered architecture matches the host. > > Add a missing fi for the SuperH section. > > Reported-by: Alexander Graf <agraf@suse.de> > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- > scripts/qemu-binfmt-conf.sh | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh > index 83a44d8..0da2618 100644 > --- a/scripts/qemu-binfmt-conf.sh > +++ b/scripts/qemu-binfmt-conf.sh > @@ -63,6 +63,7 @@ fi > if [ $cpu != "sh" ] ; then > echo ':sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-sh4:' > /proc/sys/fs/binfmt_misc/register > echo ':sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-sh4eb:' > /proc/sys/fs/binfmt_misc/register > +fi > if [ $cpu != "s390x" ] ; then > echo ':s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-s390x:' > /proc/sys/fs/binfmt_misc/register > fi Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> FWIW, in Fedora I changed qemu-binfmt-conf.sh to use systemd's embedded ability to register binfmt_misc file formats. I couldn't push it upstream because half of it is in the spec file, but you're welcome to lift it into OpenSUSE. Paolo
On 05/07/2012 12:47 PM, Andreas Färber wrote: > The script is organized as a sequence of binfmt registrations, with a > check whether the to be registered architecture matches the host. > > Add a missing fi for the SuperH section. > > Reported-by: Alexander Graf<agraf@suse.de> > Signed-off-by: Andreas Färber<afaerber@suse.de> Applied. Thanks. Regards, Anthony Liguori > --- > scripts/qemu-binfmt-conf.sh | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh > index 83a44d8..0da2618 100644 > --- a/scripts/qemu-binfmt-conf.sh > +++ b/scripts/qemu-binfmt-conf.sh > @@ -63,6 +63,7 @@ fi > if [ $cpu != "sh" ] ; then > echo ':sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-sh4:'> /proc/sys/fs/binfmt_misc/register > echo ':sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-sh4eb:'> /proc/sys/fs/binfmt_misc/register > +fi > if [ $cpu != "s390x" ] ; then > echo ':s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-s390x:'> /proc/sys/fs/binfmt_misc/register > fi
Patch
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh index 83a44d8..0da2618 100644 --- a/scripts/qemu-binfmt-conf.sh +++ b/scripts/qemu-binfmt-conf.sh @@ -63,6 +63,7 @@ fi if [ $cpu != "sh" ] ; then echo ':sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-sh4:' > /proc/sys/fs/binfmt_misc/register echo ':sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-sh4eb:' > /proc/sys/fs/binfmt_misc/register +fi if [ $cpu != "s390x" ] ; then echo ':s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-s390x:' > /proc/sys/fs/binfmt_misc/register fi
The script is organized as a sequence of binfmt registrations, with a check whether the to be registered architecture matches the host. Add a missing fi for the SuperH section. Reported-by: Alexander Graf <agraf@suse.de> Signed-off-by: Andreas Färber <afaerber@suse.de> --- scripts/qemu-binfmt-conf.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)