| Message ID | 1467377145-32385-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 07/01/2016 06:45 AM, Peter Maydell wrote: > On Windows 'aux.*' is a reserved name and cannot be used for > filenames; see > https://msdn.microsoft.com/en-gb/library/windows/desktop/aa365247(v=vs.85).aspx > > This prevents cloning the QEMU git repo on Windows: > > C:\Java\sources\kvm> git clone https://github.com/qemu/qemu.git > Cloning into 'qemu'... > remote: Counting objects: 279563, done. > remote: Total 279563 (delta 0), reused 0 (delta 0), pack-reused 279563R > Receiving objects: 100% (279563/279563), 122.45 MiB | 3.52 MiB/s, done. > Resolving deltas: 100% (221942/221942), done. > Checking connectivity... done. > error: unable to create file hw/misc/aux.c (No such file or directory) > error: unable to create file include/hw/misc/aux.h (No such file or directory) > Checking out files: 100% (4795/4795), done. > fatal: unable to checkout working tree > warning: Clone succeeded, but checkout failed. > You can inspect what was checked out with 'git status' > and retry the checkout with 'git checkout -f HEAD' > > (bug https://bugs.launchpad.net/bugs/1595240) > > Rename the offending files for the benefit of Windows. > > Reported-by: Алексей Курган <akurgan@yandex.ru> > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- Reviewed-by: Eric Blake <eblake@redhat.com>
On 07/01/2016 07:45 AM, Peter Maydell wrote: > On Windows 'aux.*' is a reserved name and cannot be used for > filenames; see > https://msdn.microsoft.com/en-gb/library/windows/desktop/aa365247(v=vs.85).aspx > > This prevents cloning the QEMU git repo on Windows: > > C:\Java\sources\kvm> git clone https://github.com/qemu/qemu.git > Cloning into 'qemu'... > remote: Counting objects: 279563, done. > remote: Total 279563 (delta 0), reused 0 (delta 0), pack-reused 279563R > Receiving objects: 100% (279563/279563), 122.45 MiB | 3.52 MiB/s, done. > Resolving deltas: 100% (221942/221942), done. > Checking connectivity... done. > error: unable to create file hw/misc/aux.c (No such file or directory) > error: unable to create file include/hw/misc/aux.h (No such file or directory) > Checking out files: 100% (4795/4795), done. > fatal: unable to checkout working tree > warning: Clone succeeded, but checkout failed. > You can inspect what was checked out with 'git status' > and retry the checkout with 'git checkout -f HEAD' > > (bug https://bugs.launchpad.net/bugs/1595240) > > Rename the offending files for the benefit of Windows. > > Reported-by: Алексей Курган <akurgan@yandex.ru> > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> This patch looks legit. I tested compilation on aarch64 platform and didn't see any problems. So, Reviewed-by: Wei Huang <wei@redhat.com> -Wei > --- > hw/display/dpcd.c | 2 +- > hw/misc/Makefile.objs | 2 +- > hw/misc/{aux.c => auxbus.c} | 4 ++-- > include/hw/display/xlnx_dp.h | 2 +- > include/hw/misc/{aux.h => auxbus.h} | 2 +- > 5 files changed, 6 insertions(+), 6 deletions(-) > rename hw/misc/{aux.c => auxbus.c} (99%) > rename include/hw/misc/{aux.h => auxbus.h} (99%) > > diff --git a/hw/display/dpcd.c b/hw/display/dpcd.c > index 5a36855..ce92ff6 100644 > --- a/hw/display/dpcd.c > +++ b/hw/display/dpcd.c > @@ -28,7 +28,7 @@ > > #include "qemu/osdep.h" > #include "qemu/log.h" > -#include "hw/misc/aux.h" > +#include "hw/misc/auxbus.h" > #include "hw/display/dpcd.h" > > #ifndef DEBUG_DPCD > diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs > index 54020aa..4cfbd10 100644 > --- a/hw/misc/Makefile.objs > +++ b/hw/misc/Makefile.objs > @@ -51,5 +51,5 @@ obj-$(CONFIG_MIPS_ITU) += mips_itu.o > obj-$(CONFIG_PVPANIC) += pvpanic.o > obj-$(CONFIG_EDU) += edu.o > obj-$(CONFIG_HYPERV_TESTDEV) += hyperv_testdev.o > -obj-$(CONFIG_AUX) += aux.o > +obj-$(CONFIG_AUX) += auxbus.o > obj-$(CONFIG_ASPEED_SOC) += aspeed_scu.o > diff --git a/hw/misc/aux.c b/hw/misc/auxbus.c > similarity index 99% > rename from hw/misc/aux.c > rename to hw/misc/auxbus.c > index 25d7712..df2414b 100644 > --- a/hw/misc/aux.c > +++ b/hw/misc/auxbus.c > @@ -1,5 +1,5 @@ > /* > - * aux.c > + * auxbus.c > * > * Copyright 2015 : GreenSocs Ltd > * http://www.greensocs.com/ , email: info@greensocs.com > @@ -28,7 +28,7 @@ > > #include "qemu/osdep.h" > #include "qemu/log.h" > -#include "hw/misc/aux.h" > +#include "hw/misc/auxbus.h" > #include "hw/i2c/i2c.h" > #include "monitor/monitor.h" > > diff --git a/include/hw/display/xlnx_dp.h b/include/hw/display/xlnx_dp.h > index d3a03f1..ee046a5 100644 > --- a/include/hw/display/xlnx_dp.h > +++ b/include/hw/display/xlnx_dp.h > @@ -24,7 +24,7 @@ > > #include "hw/sysbus.h" > #include "ui/console.h" > -#include "hw/misc/aux.h" > +#include "hw/misc/auxbus.h" > #include "hw/i2c/i2c.h" > #include "hw/display/dpcd.h" > #include "hw/i2c/i2c-ddc.h" > diff --git a/include/hw/misc/aux.h b/include/hw/misc/auxbus.h > similarity index 99% > rename from include/hw/misc/aux.h > rename to include/hw/misc/auxbus.h > index 759c3bf..af39db7 100644 > --- a/include/hw/misc/aux.h > +++ b/include/hw/misc/auxbus.h > @@ -1,5 +1,5 @@ > /* > - * aux.h > + * auxbus.h > * > * Copyright (C)2014 : GreenSocs Ltd > * http://www.greensocs.com/ , email: info@greensocs.com >
On 07/01/2016 02:45 PM, Peter Maydell wrote: > On Windows 'aux.*' is a reserved name and cannot be used for > filenames; see > https://msdn.microsoft.com/en-gb/library/windows/desktop/aa365247(v=vs.85).aspx > > This prevents cloning the QEMU git repo on Windows: > > C:\Java\sources\kvm> git clone https://github.com/qemu/qemu.git > Cloning into 'qemu'... > remote: Counting objects: 279563, done. > remote: Total 279563 (delta 0), reused 0 (delta 0), pack-reused 279563R > Receiving objects: 100% (279563/279563), 122.45 MiB | 3.52 MiB/s, done. > Resolving deltas: 100% (221942/221942), done. > Checking connectivity... done. > error: unable to create file hw/misc/aux.c (No such file or directory) > error: unable to create file include/hw/misc/aux.h (No such file or directory) > Checking out files: 100% (4795/4795), done. > fatal: unable to checkout working tree > warning: Clone succeeded, but checkout failed. > You can inspect what was checked out with 'git status' > and retry the checkout with 'git checkout -f HEAD' > > (bug https://bugs.launchpad.net/bugs/1595240) > > Rename the offending files for the benefit of Windows. > > Reported-by: Алексей Курган <akurgan@yandex.ru> > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> oops sorry for that :). Tested-by: KONRAD Frederic <fred.konrad@greensocs.com> Thanks, Fred > --- > hw/display/dpcd.c | 2 +- > hw/misc/Makefile.objs | 2 +- > hw/misc/{aux.c => auxbus.c} | 4 ++-- > include/hw/display/xlnx_dp.h | 2 +- > include/hw/misc/{aux.h => auxbus.h} | 2 +- > 5 files changed, 6 insertions(+), 6 deletions(-) > rename hw/misc/{aux.c => auxbus.c} (99%) > rename include/hw/misc/{aux.h => auxbus.h} (99%) > > diff --git a/hw/display/dpcd.c b/hw/display/dpcd.c > index 5a36855..ce92ff6 100644 > --- a/hw/display/dpcd.c > +++ b/hw/display/dpcd.c > @@ -28,7 +28,7 @@ > > #include "qemu/osdep.h" > #include "qemu/log.h" > -#include "hw/misc/aux.h" > +#include "hw/misc/auxbus.h" > #include "hw/display/dpcd.h" > > #ifndef DEBUG_DPCD > diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs > index 54020aa..4cfbd10 100644 > --- a/hw/misc/Makefile.objs > +++ b/hw/misc/Makefile.objs > @@ -51,5 +51,5 @@ obj-$(CONFIG_MIPS_ITU) += mips_itu.o > obj-$(CONFIG_PVPANIC) += pvpanic.o > obj-$(CONFIG_EDU) += edu.o > obj-$(CONFIG_HYPERV_TESTDEV) += hyperv_testdev.o > -obj-$(CONFIG_AUX) += aux.o > +obj-$(CONFIG_AUX) += auxbus.o > obj-$(CONFIG_ASPEED_SOC) += aspeed_scu.o > diff --git a/hw/misc/aux.c b/hw/misc/auxbus.c > similarity index 99% > rename from hw/misc/aux.c > rename to hw/misc/auxbus.c > index 25d7712..df2414b 100644 > --- a/hw/misc/aux.c > +++ b/hw/misc/auxbus.c > @@ -1,5 +1,5 @@ > /* > - * aux.c > + * auxbus.c > * > * Copyright 2015 : GreenSocs Ltd > * http://www.greensocs.com/ , email: info@greensocs.com > @@ -28,7 +28,7 @@ > > #include "qemu/osdep.h" > #include "qemu/log.h" > -#include "hw/misc/aux.h" > +#include "hw/misc/auxbus.h" > #include "hw/i2c/i2c.h" > #include "monitor/monitor.h" > > diff --git a/include/hw/display/xlnx_dp.h b/include/hw/display/xlnx_dp.h > index d3a03f1..ee046a5 100644 > --- a/include/hw/display/xlnx_dp.h > +++ b/include/hw/display/xlnx_dp.h > @@ -24,7 +24,7 @@ > > #include "hw/sysbus.h" > #include "ui/console.h" > -#include "hw/misc/aux.h" > +#include "hw/misc/auxbus.h" > #include "hw/i2c/i2c.h" > #include "hw/display/dpcd.h" > #include "hw/i2c/i2c-ddc.h" > diff --git a/include/hw/misc/aux.h b/include/hw/misc/auxbus.h > similarity index 99% > rename from include/hw/misc/aux.h > rename to include/hw/misc/auxbus.h > index 759c3bf..af39db7 100644 > --- a/include/hw/misc/aux.h > +++ b/include/hw/misc/auxbus.h > @@ -1,5 +1,5 @@ > /* > - * aux.h > + * auxbus.h > * > * Copyright (C)2014 : GreenSocs Ltd > * http://www.greensocs.com/ , email: info@greensocs.com >
diff --git a/hw/display/dpcd.c b/hw/display/dpcd.c index 5a36855..ce92ff6 100644 --- a/hw/display/dpcd.c +++ b/hw/display/dpcd.c @@ -28,7 +28,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/misc/aux.h" +#include "hw/misc/auxbus.h" #include "hw/display/dpcd.h" #ifndef DEBUG_DPCD diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 54020aa..4cfbd10 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -51,5 +51,5 @@ obj-$(CONFIG_MIPS_ITU) += mips_itu.o obj-$(CONFIG_PVPANIC) += pvpanic.o obj-$(CONFIG_EDU) += edu.o obj-$(CONFIG_HYPERV_TESTDEV) += hyperv_testdev.o -obj-$(CONFIG_AUX) += aux.o +obj-$(CONFIG_AUX) += auxbus.o obj-$(CONFIG_ASPEED_SOC) += aspeed_scu.o diff --git a/hw/misc/aux.c b/hw/misc/auxbus.c similarity index 99% rename from hw/misc/aux.c rename to hw/misc/auxbus.c index 25d7712..df2414b 100644 --- a/hw/misc/aux.c +++ b/hw/misc/auxbus.c @@ -1,5 +1,5 @@ /* - * aux.c + * auxbus.c * * Copyright 2015 : GreenSocs Ltd * http://www.greensocs.com/ , email: info@greensocs.com @@ -28,7 +28,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "hw/misc/aux.h" +#include "hw/misc/auxbus.h" #include "hw/i2c/i2c.h" #include "monitor/monitor.h" diff --git a/include/hw/display/xlnx_dp.h b/include/hw/display/xlnx_dp.h index d3a03f1..ee046a5 100644 --- a/include/hw/display/xlnx_dp.h +++ b/include/hw/display/xlnx_dp.h @@ -24,7 +24,7 @@ #include "hw/sysbus.h" #include "ui/console.h" -#include "hw/misc/aux.h" +#include "hw/misc/auxbus.h" #include "hw/i2c/i2c.h" #include "hw/display/dpcd.h" #include "hw/i2c/i2c-ddc.h" diff --git a/include/hw/misc/aux.h b/include/hw/misc/auxbus.h similarity index 99% rename from include/hw/misc/aux.h rename to include/hw/misc/auxbus.h index 759c3bf..af39db7 100644 --- a/include/hw/misc/aux.h +++ b/include/hw/misc/auxbus.h @@ -1,5 +1,5 @@ /* - * aux.h + * auxbus.h * * Copyright (C)2014 : GreenSocs Ltd * http://www.greensocs.com/ , email: info@greensocs.com
On Windows 'aux.*' is a reserved name and cannot be used for filenames; see https://msdn.microsoft.com/en-gb/library/windows/desktop/aa365247(v=vs.85).aspx This prevents cloning the QEMU git repo on Windows: C:\Java\sources\kvm> git clone https://github.com/qemu/qemu.git Cloning into 'qemu'... remote: Counting objects: 279563, done. remote: Total 279563 (delta 0), reused 0 (delta 0), pack-reused 279563R Receiving objects: 100% (279563/279563), 122.45 MiB | 3.52 MiB/s, done. Resolving deltas: 100% (221942/221942), done. Checking connectivity... done. error: unable to create file hw/misc/aux.c (No such file or directory) error: unable to create file include/hw/misc/aux.h (No such file or directory) Checking out files: 100% (4795/4795), done. fatal: unable to checkout working tree warning: Clone succeeded, but checkout failed. You can inspect what was checked out with 'git status' and retry the checkout with 'git checkout -f HEAD' (bug https://bugs.launchpad.net/bugs/1595240) Rename the offending files for the benefit of Windows. Reported-by: Алексей Курган <akurgan@yandex.ru> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/display/dpcd.c | 2 +- hw/misc/Makefile.objs | 2 +- hw/misc/{aux.c => auxbus.c} | 4 ++-- include/hw/display/xlnx_dp.h | 2 +- include/hw/misc/{aux.h => auxbus.h} | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename hw/misc/{aux.c => auxbus.c} (99%) rename include/hw/misc/{aux.h => auxbus.h} (99%)