| Message ID | 1336832466-29363-1-git-send-email-afaerber@suse.de |
|---|---|
| State | New |
| Headers | show |
On Sat, May 12, 2012 at 04:21:06PM +0200, Andreas Färber wrote: > From: Paolo Bonzini <pbonzini@redhat.com> > > This was erroneously dropped in d6c730086cbf24382eb8cff25551798769edfd84 > (pc: reduce duplication in compat machine types). > > Cc: Michael S. Tsirkin <mst@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- > This is a backport from Paolo's QBus series, as requested by mst. > > hw/pc_piix.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/hw/pc_piix.c b/hw/pc_piix.c > index 6a75718..a7aad4b 100644 > --- a/hw/pc_piix.c > +++ b/hw/pc_piix.c > @@ -522,6 +522,10 @@ static QEMUMachine pc_machine_v0_12 = { > .driver = "virtio-blk-pci",\ > .property = "vectors",\ > .value = stringify(0),\ > + },{\ > + .driver = "PCI",\ > + .property = "rombar",\ > + .value = stringify(0),\ > } > > static QEMUMachine pc_machine_v0_11 = { So I looked at d6c730086cbf24382eb8cff25551798769edfd84 which has: @@ -583,43 +526,6 @@ static QEMUMachine pc_machine_v0_11 = { .driver = "scsi-disk", .property = "ver", .value = "0.11", - },{ - .driver = "PCI", - .property = "rombar", - .value = stringify(0), while this patch readds this property to 0_12. Intentional? > -- > 1.7.7
Am 13.05.2012 12:59, schrieb Michael S. Tsirkin: > On Sat, May 12, 2012 at 04:21:06PM +0200, Andreas Färber wrote: >> From: Paolo Bonzini <pbonzini@redhat.com> >> >> This was erroneously dropped in d6c730086cbf24382eb8cff25551798769edfd84 >> (pc: reduce duplication in compat machine types). >> >> Cc: Michael S. Tsirkin <mst@redhat.com> >> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> >> Signed-off-by: Andreas Färber <afaerber@suse.de> >> --- >> This is a backport from Paolo's QBus series, as requested by mst. >> >> hw/pc_piix.c | 4 ++++ >> 1 files changed, 4 insertions(+), 0 deletions(-) >> >> diff --git a/hw/pc_piix.c b/hw/pc_piix.c >> index 6a75718..a7aad4b 100644 >> --- a/hw/pc_piix.c >> +++ b/hw/pc_piix.c >> @@ -522,6 +522,10 @@ static QEMUMachine pc_machine_v0_12 = { >> .driver = "virtio-blk-pci",\ >> .property = "vectors",\ >> .value = stringify(0),\ >> + },{\ >> + .driver = "PCI",\ >> + .property = "rombar",\ >> + .value = stringify(0),\ >> } >> >> static QEMUMachine pc_machine_v0_11 = { > > So I looked at d6c730086cbf24382eb8cff25551798769edfd84 > which has: > > @@ -583,43 +526,6 @@ static QEMUMachine pc_machine_v0_11 = { > .driver = "scsi-disk", > .property = "ver", > .value = "0.11", > - },{ > - .driver = "PCI", > - .property = "rombar", > - .value = stringify(0), > > while this patch readds this property to 0_12. > Intentional? According to my reading of http://repo.or.cz/w/qemu.git/commitdiff/d6c730086cbf24382eb8cff25551798769edfd84?hp=d50c6c8b0fc28c2dd91f3f7ab2a0bbb56419214b both v0_11 and v0_10 had it before your change. Paolo's patch adds it to your PC_COMPAT_0_11 macro, which adds it back to those two machines. Note that the diff ignores the containing macro and names the preceding struct. If you apply it locally you can verify. Andreas
On Sun, May 13, 2012 at 03:53:55PM +0200, Andreas Färber wrote: > Am 13.05.2012 12:59, schrieb Michael S. Tsirkin: > > On Sat, May 12, 2012 at 04:21:06PM +0200, Andreas Färber wrote: > >> From: Paolo Bonzini <pbonzini@redhat.com> > >> > >> This was erroneously dropped in d6c730086cbf24382eb8cff25551798769edfd84 > >> (pc: reduce duplication in compat machine types). > >> > >> Cc: Michael S. Tsirkin <mst@redhat.com> > >> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > >> Signed-off-by: Andreas Färber <afaerber@suse.de> > >> --- > >> This is a backport from Paolo's QBus series, as requested by mst. > >> > >> hw/pc_piix.c | 4 ++++ > >> 1 files changed, 4 insertions(+), 0 deletions(-) > >> > >> diff --git a/hw/pc_piix.c b/hw/pc_piix.c > >> index 6a75718..a7aad4b 100644 > >> --- a/hw/pc_piix.c > >> +++ b/hw/pc_piix.c > >> @@ -522,6 +522,10 @@ static QEMUMachine pc_machine_v0_12 = { > >> .driver = "virtio-blk-pci",\ > >> .property = "vectors",\ > >> .value = stringify(0),\ > >> + },{\ > >> + .driver = "PCI",\ > >> + .property = "rombar",\ > >> + .value = stringify(0),\ > >> } > >> > >> static QEMUMachine pc_machine_v0_11 = { > > > > So I looked at d6c730086cbf24382eb8cff25551798769edfd84 > > which has: > > > > @@ -583,43 +526,6 @@ static QEMUMachine pc_machine_v0_11 = { > > .driver = "scsi-disk", > > .property = "ver", > > .value = "0.11", > > - },{ > > - .driver = "PCI", > > - .property = "rombar", > > - .value = stringify(0), > > > > while this patch readds this property to 0_12. > > Intentional? > > According to my reading of > > http://repo.or.cz/w/qemu.git/commitdiff/d6c730086cbf24382eb8cff25551798769edfd84?hp=d50c6c8b0fc28c2dd91f3f7ab2a0bbb56419214b > > both v0_11 and v0_10 had it before your change. > > Paolo's patch adds it to your PC_COMPAT_0_11 macro, which adds it back > to those two machines. Note that the diff ignores the containing macro > and names the preceding struct. If you apply it locally you can verify. > > Andreas Right, I misread the patch. > -- > SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany > GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
On Sat, May 12, 2012 at 04:21:06PM +0200, Andreas Färber wrote: > From: Paolo Bonzini <pbonzini@redhat.com> > > This was erroneously dropped in d6c730086cbf24382eb8cff25551798769edfd84 > (pc: reduce duplication in compat machine types). > > Cc: Michael S. Tsirkin <mst@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Michael S. Tsirkin <mst@redhat.com> Anthony ca you apply this to 1.1 please? > --- > This is a backport from Paolo's QBus series, as requested by mst. > > hw/pc_piix.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/hw/pc_piix.c b/hw/pc_piix.c > index 6a75718..a7aad4b 100644 > --- a/hw/pc_piix.c > +++ b/hw/pc_piix.c > @@ -522,6 +522,10 @@ static QEMUMachine pc_machine_v0_12 = { > .driver = "virtio-blk-pci",\ > .property = "vectors",\ > .value = stringify(0),\ > + },{\ > + .driver = "PCI",\ > + .property = "rombar",\ > + .value = stringify(0),\ > } > > static QEMUMachine pc_machine_v0_11 = { > -- > 1.7.7
Am 13.05.2012 16:40, schrieb Michael S. Tsirkin: > On Sat, May 12, 2012 at 04:21:06PM +0200, Andreas Färber wrote: >> From: Paolo Bonzini <pbonzini@redhat.com> >> >> This was erroneously dropped in d6c730086cbf24382eb8cff25551798769edfd84 >> (pc: reduce duplication in compat machine types). >> >> Cc: Michael S. Tsirkin <mst@redhat.com> >> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> >> Signed-off-by: Andreas Färber <afaerber@suse.de> > > Acked-by: Michael S. Tsirkin <mst@redhat.com> > > Anthony ca you apply this to 1.1 please? Thanks, I'll include it in the QOM 1.1 pull (and apply to qom-next): http://repo.or.cz/w/qemu/afaerber.git/shortlog/refs/heads/qom-1.1 Andreas
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 6a75718..a7aad4b 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -522,6 +522,10 @@ static QEMUMachine pc_machine_v0_12 = { .driver = "virtio-blk-pci",\ .property = "vectors",\ .value = stringify(0),\ + },{\ + .driver = "PCI",\ + .property = "rombar",\ + .value = stringify(0),\ } static QEMUMachine pc_machine_v0_11 = {