Patchwork [v2,00/36] hw/ reorganization, part 2

login
register
mail settings
Submitter Paolo Bonzini
Date April 2, 2013, 5:23 p.m.
Message ID <515B1406.7040005@redhat.com>
Download mbox | patch
Permalink /patch/233100/
State New
Headers show

Comments

Paolo Bonzini - April 2, 2013, 5:23 p.m.
Il 02/04/2013 19:01, Stefano Stabellini ha scritto:
> On Tue, 2 Apr 2013, Paolo Bonzini wrote:
>> This is part 2 of the reorganization.  Following the discussion
>> of March 18 between me and Peter, the ARM CPU cores are in hw/cpu
>> (the i386 ICC device will also go there).
>>
>> The following changes since commit 5d45de9796539f95eb6b1201588362981f8cb2d4:
>>
>>   microblaze: Add support for the sleep insn (2013-04-02 10:47:29 +0200)
>>
>> are available in the git repository at:
>>
>>   git://github.com/bonzini/qemu.git hw-dirs
>>
>> for you to fetch changes up to 99490dcb5ef42ab1fac14600ceb83b99687a9b42:
>>
>>   hw: move private headers to hw/ subdirectories. (2013-04-02 14:54:44 +0200)
>>
> 
> I tried to build your branch but I got the following:
> 
> ./configure --disable-xen --target-list=i386-softmmu 
> 
> ./configure --enable-xen --target-list=i386-softmmu --extra-cflags="-I$DIR/tools/include -I$DIR/tools/libxc -I$DIR/tools/xenstore"  --extra-ldflags="-L$DIR/tools/libxc -L$$DIR/tools/xenstore" --disable-kvm
> 
> both produce this:
> 
> make -j8
> /local/scratch/sstabellini/qemu/Makefile.objs:121: /local/scratch/sstabellini/qemu/hw/cpu/Makefile.objs: No such file or directory
> make: *** No rule to make target `/local/scratch/sstabellini/qemu/hw/cpu/Makefile.objs'.  Stop.

Didn't "git add" it.  Pushing a new branch at the same place, commit
9b4763e5c036b8e5f8889af9c1ae1aaba3af5dae, rebased and with the file.

The contents is simply


Paolo
Stefano Stabellini - April 2, 2013, 5:46 p.m.
On Tue, 2 Apr 2013, Paolo Bonzini wrote:
> Il 02/04/2013 19:01, Stefano Stabellini ha scritto:
> > On Tue, 2 Apr 2013, Paolo Bonzini wrote:
> >> This is part 2 of the reorganization.  Following the discussion
> >> of March 18 between me and Peter, the ARM CPU cores are in hw/cpu
> >> (the i386 ICC device will also go there).
> >>
> >> The following changes since commit 5d45de9796539f95eb6b1201588362981f8cb2d4:
> >>
> >>   microblaze: Add support for the sleep insn (2013-04-02 10:47:29 +0200)
> >>
> >> are available in the git repository at:
> >>
> >>   git://github.com/bonzini/qemu.git hw-dirs
> >>
> >> for you to fetch changes up to 99490dcb5ef42ab1fac14600ceb83b99687a9b42:
> >>
> >>   hw: move private headers to hw/ subdirectories. (2013-04-02 14:54:44 +0200)
> >>
> > 
> > I tried to build your branch but I got the following:
> > 
> > ./configure --disable-xen --target-list=i386-softmmu 
> > 
> > ./configure --enable-xen --target-list=i386-softmmu --extra-cflags="-I$DIR/tools/include -I$DIR/tools/libxc -I$DIR/tools/xenstore"  --extra-ldflags="-L$DIR/tools/libxc -L$$DIR/tools/xenstore" --disable-kvm
> > 
> > both produce this:
> > 
> > make -j8
> > /local/scratch/sstabellini/qemu/Makefile.objs:121: /local/scratch/sstabellini/qemu/hw/cpu/Makefile.objs: No such file or directory
> > make: *** No rule to make target `/local/scratch/sstabellini/qemu/hw/cpu/Makefile.objs'.  Stop.
> 
> Didn't "git add" it.  Pushing a new branch at the same place, commit
> 9b4763e5c036b8e5f8889af9c1ae1aaba3af5dae, rebased and with the file.
> 
> The contents is simply
> 
> diff --git a/hw/cpu/Makefile.objs b/hw/cpu/Makefile.objs
> index e69de29..a49ca04 100644
> --- a/hw/cpu/Makefile.objs
> +++ b/hw/cpu/Makefile.objs
> @@ -0,0 +1,4 @@
> +obj-$(CONFIG_ARM11MPCORE) += arm11mpcore.o
> +obj-$(CONFIG_ARM9MPCORE) += a9mpcore.o
> +obj-$(CONFIG_ARM15MPCORE) += a15mpcore.o

This is what I get with the new branch:

In file included from tpm/tpm_int.h:16,
                 from tpm/tpm.c:19:
./tpm/tpm_tis.h:41: error: redefinition of typedef ‘TPMSizedBuffer’
/local/scratch/sstabellini/qemu/include/tpm/tpm.h:18: note: previous declaration of ‘TPMSizedBuffer’ was here
In file included from tpm/tpm.c:19:
tpm/tpm_int.h:19: error: redefinition of typedef ‘TPMDriverOps’
/local/scratch/sstabellini/qemu/include/backends/tpm.h:34: note: previous declaration of ‘TPMDriverOps’ was here
tpm/tpm_int.h:35: error: redefinition of typedef ‘TPMState’
/local/scratch/sstabellini/qemu/include/tpm/tpm.h:17: note: previous declaration of ‘TPMState’ was here
tpm/tpm_int.h:39: error: redefinition of typedef ‘TPMRecvDataCB’
/local/scratch/sstabellini/qemu/include/tpm/tpm.h:19: note: previous declaration of ‘TPMRecvDataCB’ was here
Paolo Bonzini - April 2, 2013, 5:55 p.m.
Il 02/04/2013 19:46, Stefano Stabellini ha scritto:
> This is what I get with the new branch:
> 
> In file included from tpm/tpm_int.h:16,
>                  from tpm/tpm.c:19:
> ./tpm/tpm_tis.h:41: error: redefinition of typedef ‘TPMSizedBuffer’
> /local/scratch/sstabellini/qemu/include/tpm/tpm.h:18: note: previous declaration of ‘TPMSizedBuffer’ was here
> In file included from tpm/tpm.c:19:
> tpm/tpm_int.h:19: error: redefinition of typedef ‘TPMDriverOps’
> /local/scratch/sstabellini/qemu/include/backends/tpm.h:34: note: previous declaration of ‘TPMDriverOps’ was here
> tpm/tpm_int.h:35: error: redefinition of typedef ‘TPMState’
> /local/scratch/sstabellini/qemu/include/tpm/tpm.h:17: note: previous declaration of ‘TPMState’ was here
> tpm/tpm_int.h:39: error: redefinition of typedef ‘TPMRecvDataCB’
> /local/scratch/sstabellini/qemu/include/tpm/tpm.h:19: note: previous declaration of ‘TPMRecvDataCB’ was here
> 

Do you get this with origin/master too?  I shouldn't have changed
anything (famous last words) related to TPM.

Paolo
Stefano Stabellini - April 2, 2013, 6:19 p.m.
On Tue, 2 Apr 2013, Paolo Bonzini wrote:
> Il 02/04/2013 19:46, Stefano Stabellini ha scritto:
> > This is what I get with the new branch:
> > 
> > In file included from tpm/tpm_int.h:16,
> >                  from tpm/tpm.c:19:
> > ./tpm/tpm_tis.h:41: error: redefinition of typedef ‘TPMSizedBuffer’
> > /local/scratch/sstabellini/qemu/include/tpm/tpm.h:18: note: previous declaration of ‘TPMSizedBuffer’ was here
> > In file included from tpm/tpm.c:19:
> > tpm/tpm_int.h:19: error: redefinition of typedef ‘TPMDriverOps’
> > /local/scratch/sstabellini/qemu/include/backends/tpm.h:34: note: previous declaration of ‘TPMDriverOps’ was here
> > tpm/tpm_int.h:35: error: redefinition of typedef ‘TPMState’
> > /local/scratch/sstabellini/qemu/include/tpm/tpm.h:17: note: previous declaration of ‘TPMState’ was here
> > tpm/tpm_int.h:39: error: redefinition of typedef ‘TPMRecvDataCB’
> > /local/scratch/sstabellini/qemu/include/tpm/tpm.h:19: note: previous declaration of ‘TPMRecvDataCB’ was here
> > 
> 
> Do you get this with origin/master too?  I shouldn't have changed
> anything (famous last words) related to TPM.

Yes, I do :P

Patch

diff --git a/hw/cpu/Makefile.objs b/hw/cpu/Makefile.objs
index e69de29..a49ca04 100644
--- a/hw/cpu/Makefile.objs
+++ b/hw/cpu/Makefile.objs
@@ -0,0 +1,4 @@ 
+obj-$(CONFIG_ARM11MPCORE) += arm11mpcore.o
+obj-$(CONFIG_ARM9MPCORE) += a9mpcore.o
+obj-$(CONFIG_ARM15MPCORE) += a15mpcore.o
+