On Jan 7, 2014, at 4:45 PM, Paolo Bonzini <pbonz...@redhat.com> wrote:
> Il 05/01/2014 16:04, Miki Mishael ha scritto: >> Support for pci-serial-2x and pci-serial-4x added to inf file. >> Standard Windows driver mf.sys used to split single function >> device into per-port nodes. >> >> Signed-off-by: Miki Mishael <mmish...@redhat.com> >> Signed-off-by: Dmitry Fleytman <dfley...@redhat.com> >> --- >> docs/qemupciserial.inf | 227 >> ++++++++++++++++++++++++++++++------------------- >> 1 file changed, 140 insertions(+), 87 deletions(-) >> >> diff --git a/docs/qemupciserial.inf b/docs/qemupciserial.inf >> index 3474310..c6988b9 100644 >> --- a/docs/qemupciserial.inf >> +++ b/docs/qemupciserial.inf >> @@ -11,99 +11,152 @@ >> ; (Com+Lpt)" from the list. Click "Have a disk". Select this file. >> ; Procedure may vary a bit depending on the windows version. >> >> -; FIXME: This file covers the single port version only. >> +; This file covers all options: pci-serial, pci-serial-2x, pci-serial-4x >> +; for both 32 and 64 bit platforms. >> >> [Version] >> -Signature="$CHICAGO$" >> -Class=Ports >> -ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318} >> +Signature="$Windows NT$" >> +Class=MultiFunction >> +ClassGUID={4d36e971-e325-11ce-bfc1-08002be10318} >> Provider=%QEMU% >> -DriverVer=09/24/2012,1.3.0 >> - >> -[SourceDisksNames] >> -3426=windows cd >> - >> -[SourceDisksFiles] >> -serial.sys = 3426 >> -serenum.sys = 3426 >> - >> -[DestinationDirs] >> -DefaultDestDir = 11 ;LDID_SYS >> -ComPort.NT.Copy = 12 ;DIRID_DRIVERS >> -SerialEnumerator.NT.Copy=12 ;DIRID_DRIVERS >> - >> -; Drivers >> -;---------------------------------------------------------- >> +DriverVer=12/29/2013,1.3.0 >> +[ControlFlags] >> +ExcludeFromSelect=* >> [Manufacturer] >> -%QEMU%=QEMU,NTx86 >> +%QEMU%=QEMU,NTx86,NTAMD64 >> >> [QEMU.NTx86] >> -%QEMU-PCI_SERIAL.DeviceDesc% = ComPort, "PCI\VEN_1b36&DEV_0002&CC_0700" >> +%QEMU-PCI_SERIAL_1_PORT%=ComPort_inst1, >> PCI\VEN_1B36&DEV_0002&SUBSYS_11001AF4&REV_01 >> +%QEMU-PCI_SERIAL_2_PORT%=ComPort_inst2, >> PCI\VEN_1B36&DEV_0003&SUBSYS_11001AF4&REV_01 >> +%QEMU-PCI_SERIAL_4_PORT%=ComPort_inst4, >> PCI\VEN_1B36&DEV_0004&SUBSYS_11001AF4&REV_01 > > I think checking the subsystem is not necessary (and I think downstreams > could legitimately change it). Can you check CC and REV but not SUBSYS? PNP ID can be reduced to vendor and device ID only, for example: PCI\VEN_1B36&DEV_0002 . But in this case we cannot check revision. Yan. > > Otherwise I cannot pretend I know what's going on, but it makes sense. :) > > Paolo