This patch also removes device data for qemu-1.2.0 as it was removed for qemu-kvm-1.2.0 by commit ae3e29e6e. They are not required because we parse only version from help output and return with error that this qemu is too new to use help parsing. Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- tests/qemuhelpdata/qemu-1.2.0 | 1 + tests/qemuhelpdata/qemu-1.2.0-device | 226 ----------------------------------- 2 files changed, 1 insertion(+), 226 deletions(-) delete mode 100644 tests/qemuhelpdata/qemu-1.2.0-device diff --git a/tests/qemuhelpdata/qemu-1.2.0 b/tests/qemuhelpdata/qemu-1.2.0 index 78375f3..32a2431 100644 --- a/tests/qemuhelpdata/qemu-1.2.0 +++ b/tests/qemuhelpdata/qemu-1.2.0 @@ -173,6 +173,7 @@ Character device options: -chardev pipe,id=id,path=path[,mux=on|off] -chardev pty,id=id[,mux=on|off] -chardev stdio,id=id[,mux=on|off][,signal=on|off] +-chardev braille,id=id[,mux=on|off] -chardev tty,id=id,path=path[,mux=on|off] -chardev parport,id=id,path=path[,mux=on|off] -chardev spicevmc,id=id,name=name[,debug=debug] diff --git a/tests/qemuhelpdata/qemu-1.2.0-device b/tests/qemuhelpdata/qemu-1.2.0-device deleted file mode 100644 index bfc3a4d..0000000 --- a/tests/qemuhelpdata/qemu-1.2.0-device +++ /dev/null @@ -1,226 +0,0 @@ -name "VGA", bus PCI -name "usb-storage", bus usb-bus -name "scsi-hd", bus SCSI, desc "virtual SCSI disk" -name "i82559a", bus PCI, desc "Intel i82559A Ethernet" -name "i82559b", bus PCI, desc "Intel i82559B Ethernet" -name "i82559c", bus PCI, desc "Intel i82559C Ethernet" -name "esp", bus System -name "sysbus-ohci", bus System, desc "OHCI USB Controller" -name "virtio-blk-pci", bus PCI, alias "virtio-blk" -name "usb-uas", bus usb-bus -name "qxl-vga", bus PCI, desc "Spice QXL GPU (primary, vga compatible)" -name "ide-drive", bus IDE, desc "virtual IDE disk or CD-ROM (legacy)" -name "x3130-upstream", bus PCI, desc "TI X3130 Upstream Port of PCI Express Switch" -name "cirrus-vga", bus PCI, desc "Cirrus CLGD 54xx VGA" -name "ide-hd", bus IDE, desc "virtual IDE disk" -name "ES1370", bus PCI, desc "ENSONIQ AudioPCI ES1370" -name "ioh3420", bus PCI, desc "Intel IOH device id 3420 PCIE Root Port" -name "sga", bus ISA, desc "Serial Graphics Adapter" -name "scsi-block", bus SCSI, desc "SCSI block device passthrough" -name "usb-serial", bus usb-bus -name "pc-sysfw", bus System, desc "PC System Firmware" -name "usb-mouse", bus usb-bus -name "usb-net", bus usb-bus -name "usb-hub", bus usb-bus -name "ccid-card-emulated", bus ccid-bus, desc "emulated smartcard" -name "ne2k_isa", bus ISA -name "scsi-generic", bus SCSI, desc "pass through generic scsi device (/dev/sg*)" -name "pcnet", bus PCI -name "lsi53c895a", bus PCI, alias "lsi" -name "scsi-disk", bus SCSI, desc "virtual SCSI disk or CD-ROM (legacy)" -name "hda-micro", bus HDA, desc "HDA Audio Codec, duplex (speaker, microphone)" -name "pci-ohci", bus PCI, desc "Apple USB Controller" -name "nec-usb-xhci", bus PCI -name "xio3130-downstream", bus PCI, desc "TI X3130 Downstream Port of PCI Express Switch" -name "virtserialport", bus virtio-serial-bus -name "usb-redir", bus usb-bus -name "usb-braille", bus usb-bus -name "scsi-cd", bus SCSI, desc "virtual SCSI CD-ROM" -name "usb-wacom-tablet", bus usb-bus, desc "QEMU PenPartner Tablet" -name "isa-serial", bus ISA -name "i82550", bus PCI, desc "Intel i82550 Ethernet" -name "i82551", bus PCI, desc "Intel i82551 Ethernet" -name "isa-debugcon", bus ISA -name "ide-cd", bus IDE, desc "virtual IDE CD-ROM" -name "SUNW,fdtwo", bus System -name "ich9-usb-uhci2", bus PCI -name "ich9-usb-uhci3", bus PCI -name "ich9-usb-uhci1", bus PCI -name "isa-parallel", bus ISA -name "virtconsole", bus virtio-serial-bus -name "ne2k_pci", bus PCI -name "virtio-serial-pci", bus PCI, alias "virtio-serial" -name "hda-duplex", bus HDA, desc "HDA Audio Codec, duplex (line-out, line-in)" -name "intel-hda", bus PCI, desc "Intel HD Audio Controller" -name "megasas", bus PCI, desc "LSI MegaRAID SAS 1078" -name "i82559er", bus PCI, desc "Intel i82559ER Ethernet" -name "hda-output", bus HDA, desc "HDA Audio Codec, output-only (line-out)" -name "i82562", bus PCI, desc "Intel i82562 Ethernet" -name "sysbus-ahci", bus System -name "usb-ccid", bus usb-bus, desc "CCID Rev 1.1 smartcard reader" -name "ivshmem", bus PCI -name "AC97", bus PCI, desc "Intel 82801AA AC97 Audio" -name "e1000", bus PCI, desc "Intel Gigabit Ethernet" -name "sysbus-fdc", bus System -name "usb-bt-dongle", bus usb-bus -name "usb-tablet", bus usb-bus -name "isa-vga", bus ISA -name "usb-kbd", bus usb-bus -name "isa-applesmc", bus ISA -name "rtl8139", bus PCI -name "qxl", bus PCI, desc "Spice QXL GPU (secondary)" -name "i82557a", bus PCI, desc "Intel i82557A Ethernet" -name "i82557c", bus PCI, desc "Intel i82557C Ethernet" -name "usb-audio", bus usb-bus -name "ib700", bus ISA -name "piix3-usb-uhci", bus PCI -name "i82557b", bus PCI, desc "Intel i82557B Ethernet" -name "piix4-usb-uhci", bus PCI -name "ccid-card-passthru", bus ccid-bus, desc "passthrough smartcard" -name "i82801", bus PCI, desc "Intel i82801 Ethernet" -name "smbus-eeprom", bus i2c-bus -name "vmware-svga", bus PCI -name "dc390", bus PCI, desc "Tekram DC-390 SCSI adapter" -name "isa-cirrus-vga", bus ISA -name "sb16", bus ISA, desc "Creative Sound Blaster 16" -name "am53c974", bus PCI, desc "AMD Am53c974 PCscsi-PCI SCSI adapter" -name "pci-bridge", bus PCI, desc "Standard PCI Bridge" -name "i82558a", bus PCI, desc "Intel i82558A Ethernet" -name "i82558b", bus PCI, desc "Intel i82558B Ethernet" -name "virtio-net-pci", bus PCI, alias "virtio-net" -name "virtio-balloon-pci", bus PCI, alias "virtio-balloon" -name "ich9-usb-ehci1", bus PCI -name "isa-ide", bus ISA -name "usb-host", bus usb-bus -name "ich9-ahci", bus PCI, alias "ahci" -name "vt82c686b-usb-uhci", bus PCI -name "usb-ehci", bus PCI -name "i6300esb", bus PCI -name "virtio-scsi-pci", bus PCI -virtio-blk-pci.class=hex32 -virtio-blk-pci.drive=drive -virtio-blk-pci.logical_block_size=blocksize -virtio-blk-pci.physical_block_size=blocksize -virtio-blk-pci.min_io_size=uint16 -virtio-blk-pci.opt_io_size=uint32 -virtio-blk-pci.bootindex=int32 -virtio-blk-pci.discard_granularity=uint32 -virtio-blk-pci.cyls=uint32 -virtio-blk-pci.heads=uint32 -virtio-blk-pci.secs=uint32 -virtio-blk-pci.serial=string -virtio-blk-pci.scsi=on/off -virtio-blk-pci.config-wce=on/off -virtio-blk-pci.ioeventfd=on/off -virtio-blk-pci.vectors=uint32 -virtio-blk-pci.indirect_desc=on/off -virtio-blk-pci.event_idx=on/off -virtio-blk-pci.config-wce=on/off -virtio-blk-pci.addr=pci-devfn -virtio-blk-pci.romfile=string -virtio-blk-pci.rombar=uint32 -virtio-blk-pci.multifunction=on/off -virtio-blk-pci.command_serr_enable=on/off -virtio-net-pci.ioeventfd=on/off -virtio-net-pci.vectors=uint32 -virtio-net-pci.indirect_desc=on/off -virtio-net-pci.event_idx=on/off -virtio-net-pci.csum=on/off -virtio-net-pci.guest_csum=on/off -virtio-net-pci.gso=on/off -virtio-net-pci.guest_tso4=on/off -virtio-net-pci.guest_tso6=on/off -virtio-net-pci.guest_ecn=on/off -virtio-net-pci.guest_ufo=on/off -virtio-net-pci.host_tso4=on/off -virtio-net-pci.host_tso6=on/off -virtio-net-pci.host_ecn=on/off -virtio-net-pci.host_ufo=on/off -virtio-net-pci.mrg_rxbuf=on/off -virtio-net-pci.status=on/off -virtio-net-pci.ctrl_vq=on/off -virtio-net-pci.ctrl_rx=on/off -virtio-net-pci.ctrl_vlan=on/off -virtio-net-pci.ctrl_rx_extra=on/off -virtio-net-pci.mac=macaddr -virtio-net-pci.vlan=vlan -virtio-net-pci.netdev=netdev -virtio-net-pci.bootindex=int32 -virtio-net-pci.x-txtimer=uint32 -virtio-net-pci.x-txburst=int32 -virtio-net-pci.tx=string -virtio-net-pci.addr=pci-devfn -virtio-net-pci.romfile=string -virtio-net-pci.rombar=uint32 -virtio-net-pci.multifunction=on/off -virtio-net-pci.command_serr_enable=on/off -scsi-disk.drive=drive -scsi-disk.logical_block_size=blocksize -scsi-disk.physical_block_size=blocksize -scsi-disk.min_io_size=uint16 -scsi-disk.opt_io_size=uint32 -scsi-disk.bootindex=int32 -scsi-disk.discard_granularity=uint32 -scsi-disk.ver=string -scsi-disk.serial=string -scsi-disk.vendor=string -scsi-disk.product=string -scsi-disk.removable=on/off -scsi-disk.dpofua=on/off -scsi-disk.wwn=hex64 -scsi-disk.channel=uint32 -scsi-disk.scsi-id=uint32 -scsi-disk.lun=uint32 -PIIX4_PM.smb_io_base=uint32 -PIIX4_PM.disable_s3=uint8 -PIIX4_PM.disable_s4=uint8 -PIIX4_PM.s4_val=uint8 -PIIX4_PM.addr=pci-devfn -PIIX4_PM.romfile=string -PIIX4_PM.rombar=uint32 -PIIX4_PM.multifunction=on/off -PIIX4_PM.command_serr_enable=on/off -usb-redir.chardev=chr -usb-redir.debug=uint8 -usb-redir.filter=string -usb-redir.bootindex=int32 -usb-redir.port=string -usb-redir.full-path=on/off -ide-drive.drive=drive -ide-drive.logical_block_size=blocksize -ide-drive.physical_block_size=blocksize -ide-drive.min_io_size=uint16 -ide-drive.opt_io_size=uint32 -ide-drive.bootindex=int32 -ide-drive.discard_granularity=uint32 -ide-drive.ver=string -ide-drive.wwn=hex64 -ide-drive.serial=string -ide-drive.model=string -ide-drive.unit=uint32 -usb-host.hostbus=uint32 -usb-host.hostaddr=uint32 -usb-host.hostport=string -usb-host.vendorid=hex32 -usb-host.productid=hex32 -usb-host.isobufs=uint32 -usb-host.bootindex=int32 -usb-host.pipeline=on/off -usb-host.port=string -usb-host.full-path=on/off -scsi-generic.drive=drive -scsi-generic.bootindex=int32 -scsi-generic.channel=uint32 -scsi-generic.scsi-id=uint32 -scsi-generic.lun=uint32 -usb-storage.drive=drive -usb-storage.logical_block_size=blocksize -usb-storage.physical_block_size=blocksize -usb-storage.min_io_size=uint16 -usb-storage.opt_io_size=uint32 -usb-storage.bootindex=int32 -usb-storage.discard_granularity=uint32 -usb-storage.serial=string -usb-storage.removable=on/off -usb-storage.port=string -usb-storage.full-path=on/off -- 2.10.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list