| Message ID | e01c2c9621a1e3fd90b4eb0654b6619eec76c2c4.1253272938.git.quintela@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Sep 18, 2009 at 01:41:13PM +0200, Juan Quintela wrote: > And mips still don't have pci assignment support :) > > Signed-off-by: Juan Quintela <quintela@redhat.com> > --- > Makefile.target | 2 +- > hw/piix_pci.c | 3 --- > 2 files changed, 1 insertions(+), 4 deletions(-) > > diff --git a/Makefile.target b/Makefile.target > index 5fad812..58f8b9e 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -209,9 +209,9 @@ obj-i386-y += cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o > obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o > obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o > obj-i386-y += extboot.o > -obj-i386-y += piix4.o > obj-i386-y += ne2000-isa.o > obj-i386-y += testdev.o > + > ifeq ($(USE_KVM_PIT), 1) > obj-i386-y += i8254-kvm.o > endif > diff --git a/hw/piix_pci.c b/hw/piix_pci.c > index 26e00db..d177e97 100644 > --- a/hw/piix_pci.c > +++ b/hw/piix_pci.c > @@ -291,9 +291,6 @@ int piix_get_irq(int pin) > { > if (piix3_dev) > return piix3_dev->dev.config[0x60+pin]; > - if (piix4_dev) > - return piix4_dev->config[0x60+pin]; > - > return 0; > } Not applying because its dead code with the current state of pc.c configuration but this prevents one to use piix4. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Marcelo Tosatti <mtosatti@redhat.com> wrote: > On Fri, Sep 18, 2009 at 01:41:13PM +0200, Juan Quintela wrote: >> And mips still don't have pci assignment support :) >> >> Signed-off-by: Juan Quintela <quintela@redhat.com> >> --- >> Makefile.target | 2 +- >> hw/piix_pci.c | 3 --- >> 2 files changed, 1 insertions(+), 4 deletions(-) >> >> diff --git a/Makefile.target b/Makefile.target >> index 5fad812..58f8b9e 100644 >> --- a/Makefile.target >> +++ b/Makefile.target >> @@ -209,9 +209,9 @@ obj-i386-y += cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o >> obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o >> obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o >> obj-i386-y += extboot.o >> -obj-i386-y += piix4.o >> obj-i386-y += ne2000-isa.o >> obj-i386-y += testdev.o >> + >> ifeq ($(USE_KVM_PIT), 1) >> obj-i386-y += i8254-kvm.o >> endif >> diff --git a/hw/piix_pci.c b/hw/piix_pci.c >> index 26e00db..d177e97 100644 >> --- a/hw/piix_pci.c >> +++ b/hw/piix_pci.c >> @@ -291,9 +291,6 @@ int piix_get_irq(int pin) >> { >> if (piix3_dev) >> return piix3_dev->dev.config[0x60+pin]; >> - if (piix4_dev) >> - return piix4_dev->config[0x60+pin]; >> - >> return 0; >> } > > Not applying because its dead code with the current state of pc.c > configuration but this prevents one to use piix4. piix4 is not used for pci irq assignement in pc. It is only used on mips. I am the one that split the file in qemu upstream. piix4 and piix3 are the same from the irq point of view. next pc chipset is not going to be piix4 :) Later, Juan. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 09/19/2009 12:42 AM, Juan Quintela wrote: > >> Not applying because its dead code with the current state of pc.c >> configuration but this prevents one to use piix4. >> > piix4 is not used for pci irq assignement in pc. It is only used on > mips. I am the one that split the file in qemu upstream. piix4 and > piix3 are the same from the irq point of view. > > next pc chipset is not going to be piix4 :) > I agree with Marcelo - even if mips never gains device assignment or pc never uses piix4, the code is more complete the way it is.
Avi Kivity <avi@redhat.com> wrote: > On 09/19/2009 12:42 AM, Juan Quintela wrote: >> >>> Not applying because its dead code with the current state of pc.c >>> configuration but this prevents one to use piix4. >>> >> piix4 is not used for pci irq assignement in pc. It is only used on >> mips. I am the one that split the file in qemu upstream. piix4 and >> piix3 are the same from the irq point of view. >> >> next pc chipset is not going to be piix4 :) >> > > I agree with Marcelo - even if mips never gains device assignment or > pc never uses piix4, the code is more complete the way it is. Ok, it forces to compile back piix4.o in a pc. In qemu upstream piix4.o is only compiled for MIPS. That is the reason why I noticed. (Yes, I am the one that did the split). Later, Juan. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 09/21/2009 12:37 PM, Juan Quintela wrote: > Avi Kivity<avi@redhat.com> wrote: > >> On 09/19/2009 12:42 AM, Juan Quintela wrote: >> >>> >>>> Not applying because its dead code with the current state of pc.c >>>> configuration but this prevents one to use piix4. >>>> >>>> >>> piix4 is not used for pci irq assignement in pc. It is only used on >>> mips. I am the one that split the file in qemu upstream. piix4 and >>> piix3 are the same from the irq point of view. >>> >>> next pc chipset is not going to be piix4 :) >>> >>> >> I agree with Marcelo - even if mips never gains device assignment or >> pc never uses piix4, the code is more complete the way it is. >> > Ok, it forces to compile back piix4.o in a pc. In qemu upstream piix4.o > is only compiled for MIPS. That is the reason why I noticed. (Yes, I am > the one that did the split). > Ah, in that case it's better to apply the patch. Thanks.
diff --git a/Makefile.target b/Makefile.target index 5fad812..58f8b9e 100644 --- a/Makefile.target +++ b/Makefile.target @@ -209,9 +209,9 @@ obj-i386-y += cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o obj-i386-y += extboot.o -obj-i386-y += piix4.o obj-i386-y += ne2000-isa.o obj-i386-y += testdev.o + ifeq ($(USE_KVM_PIT), 1) obj-i386-y += i8254-kvm.o endif diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 26e00db..d177e97 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -291,9 +291,6 @@ int piix_get_irq(int pin) { if (piix3_dev) return piix3_dev->dev.config[0x60+pin]; - if (piix4_dev) - return piix4_dev->config[0x60+pin]; - return 0; }
And mips still don't have pci assignment support :) Signed-off-by: Juan Quintela <quintela@redhat.com> --- Makefile.target | 2 +- hw/piix_pci.c | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-)