[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH 4/4] tests: update qemuhelptest data



On 20.11.2012 19:47, Ján Tomko wrote:
> Both generated with
> qemu-system-x86_64 --help > qemu-1.2.0
> 
> qemu-system-x86_64 \
> -device ? \
> -device pci-assign,? \
> -device virtio-blk-pci,? \
> -device virtio-net-pci,? \
> -device scsi-disk,? \
> -device PIIX4_PM,? \
> -device usb-redir,? \
> -device ide-drive,? \
> -device usb-host,? 2> qemu-1.2.0-device
> 
> It seems I missed a few -device flags when doing this last time and I
> mixed up qemu and qemu-kvm.
> ---
>  tests/qemuhelpdata/qemu-1.2.0            |    1 +
>  tests/qemuhelpdata/qemu-1.2.0-device     |   51 +++++--
>  tests/qemuhelpdata/qemu-kvm-1.2.0        |  276 ++++++++++++++++++++++++++++++
>  tests/qemuhelpdata/qemu-kvm-1.2.0-device |  222 ++++++++++++++++++++++++
>  tests/qemuhelptest.c                     |  106 +++++++++++-
>  5 files changed, 644 insertions(+), 12 deletions(-)
>  create mode 100644 tests/qemuhelpdata/qemu-kvm-1.2.0
>  create mode 100644 tests/qemuhelpdata/qemu-kvm-1.2.0-device
> 
> diff --git a/tests/qemuhelpdata/qemu-1.2.0 b/tests/qemuhelpdata/qemu-1.2.0
> index f52fdcb..78375f3 100644
> --- a/tests/qemuhelpdata/qemu-1.2.0
> +++ b/tests/qemuhelpdata/qemu-1.2.0
> @@ -175,6 +175,7 @@ Character device options:
>  -chardev stdio,id=id[,mux=on|off][,signal=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]
>  
>  -iscsi [user=user][,password=password]
>         [,header-digest=CRC32C|CR32C-NONE|NONE-CRC32C|NONE
> diff --git a/tests/qemuhelpdata/qemu-1.2.0-device b/tests/qemuhelpdata/qemu-1.2.0-device
> index 9230a93..5613e00 100644
> --- a/tests/qemuhelpdata/qemu-1.2.0-device
> +++ b/tests/qemuhelpdata/qemu-1.2.0-device
> @@ -8,6 +8,7 @@ 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"
> @@ -32,6 +33,7 @@ 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"
> @@ -64,9 +66,9 @@ 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 "kvm-pci-assign", bus PCI, alias "pci-assign", desc "KVM-based PCI passthrough"
>  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
> @@ -95,16 +97,6 @@ name "vt82c686b-usb-uhci", bus PCI
>  name "usb-ehci", bus PCI
>  name "i6300esb", bus PCI
>  name "virtio-scsi-pci", bus PCI
> -kvm-pci-assign.host=pci-host-devaddr
> -kvm-pci-assign.prefer_msi=on/off
> -kvm-pci-assign.share_intx=on/off
> -kvm-pci-assign.bootindex=int32
> -kvm-pci-assign.configfd=string
> -kvm-pci-assign.addr=pci-devfn
> -kvm-pci-assign.romfile=string
> -kvm-pci-assign.rombar=uint32
> -kvm-pci-assign.multifunction=on/off
> -kvm-pci-assign.command_serr_enable=on/off
>  virtio-blk-pci.class=hex32
>  virtio-blk-pci.drive=drive
>  virtio-blk-pci.logical_block_size=blocksize
> @@ -179,3 +171,40 @@ 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
> diff --git a/tests/qemuhelpdata/qemu-kvm-1.2.0 b/tests/qemuhelpdata/qemu-kvm-1.2.0
> new file mode 100644
> index 0000000..372002a
> --- /dev/null
> +++ b/tests/qemuhelpdata/qemu-kvm-1.2.0
> @@ -0,0 +1,276 @@
> +QEMU emulator version 1.2.0 (qemu-kvm-devel), Copyright (c) 2003-2008 Fabrice Bellard
> +usage: qemu-system-x86_64 [options] [disk_image]
> +
> +'disk_image' is a raw hard disk image for IDE hard disk 0
> +
> +Standard options:
> +-h or -help     display this help and exit
> +-version        display version information and exit
> +-machine [type=]name[,prop[=value][,...]]
> +                selects emulated machine (-machine ? for list)
> +                property accel=accel1[:accel2[:...]] selects accelerator
> +                supported accelerators are kvm, xen, tcg (default: tcg)
> +                kernel_irqchip=on|off controls accelerated irqchip support
> +                kvm_shadow_mem=size of KVM shadow MMU
> +                dump-guest-core=on|off include guest memory in a core dump (default=on)
> +-cpu cpu        select CPU (-cpu ? for list)
> +-smp n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets]
> +                set the number of CPUs to 'n' [default=1]
> +                maxcpus= maximum number of total cpus, including
> +                offline CPUs for hotplug, etc
> +                cores= number of CPU cores on one socket
> +                threads= number of threads on one CPU core
> +                sockets= number of discrete sockets in the system
> +-numa node[,mem=size][,cpus=cpu[-cpu]][,nodeid=node]
> +-fda/-fdb file  use 'file' as floppy disk 0/1 image
> +-hda/-hdb file  use 'file' as IDE hard disk 0/1 image
> +-hdc/-hdd file  use 'file' as IDE hard disk 2/3 image
> +-cdrom file     use 'file' as IDE cdrom image (cdrom is ide1 master)
> +-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i]
> +       [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off]
> +       [,cache=writethrough|writeback|none|directsync|unsafe][,format=f]
> +       [,serial=s][,addr=A][,id=name][,aio=threads|native]
> +       [,readonly=on|off][,copy-on-read=on|off]
> +       [[,bps=b]|[[,bps_rd=r][,bps_wr=w]]][[,iops=i]|[[,iops_rd=r][,iops_wr=w]]
> +                use 'file' as a drive image
> +-set group.id.arg=value
> +                set <arg> parameter for item <id> of type <group>
> +                i.e. -set drive.$id.file=/path/to/image
> +-global driver.prop=value
> +                set a global default for a driver property
> +-mtdblock file  use 'file' as on-board Flash memory image
> +-sd file        use 'file' as SecureDigital card image
> +-pflash file    use 'file' as a parallel flash image
> +-boot [order=drives][,once=drives][,menu=on|off]
> +      [,splash=sp_name][,splash-time=sp_time]
> +                'drives': floppy (a), hard disk (c), CD-ROM (d), network (n)
> +                'sp_name': the file's name that would be passed to bios as logo picture, if menu=on
> +                'sp_time': the period that splash picture last if menu=on, unit is ms
> +-snapshot       write to temporary files instead of disk image files
> +-m megs         set virtual RAM size to megs MB [default=128]
> +-mem-path FILE  provide backing storage for guest RAM
> +-mem-prealloc   preallocate guest memory (use with -mem-path)
> +-k language     use keyboard layout (for example 'fr' for French)
> +-audio-help     print list of audio drivers and their options
> +-soundhw c1,... enable audio support
> +                and only specified sound cards (comma separated list)
> +                use -soundhw ? to get the list of supported cards
> +                use -soundhw all to enable all of them
> +-balloon none   disable balloon device
> +-balloon virtio[,addr=str]
> +                enable virtio balloon device (default)
> +-usb            enable the USB driver (will be the default soon)
> +-usbdevice name add the host or guest USB device 'name'
> +-device driver[,prop[=value][,...]]
> +                add device (based on driver)
> +                prop=value,... sets driver properties
> +                use -device ? to print all possible drivers
> +                use -device driver,? to print all possible properties
> +
> +File system options:
> +-fsdev fsdriver,id=id[,path=path,][security_model={mapped-xattr|mapped-file|passthrough|none}]
> + [,writeout=immediate][,readonly][,socket=socket|sock_fd=sock_fd]
> +
> +Virtual File system pass-through options:
> +-virtfs local,path=path,mount_tag=tag,security_model=[mapped-xattr|mapped-file|passthrough|none]
> +        [,writeout=immediate][,readonly][,socket=socket|sock_fd=sock_fd]
> +-virtfs_synth Create synthetic file system image
> +
> +-name string1[,process=string2]
> +                set the name of the guest
> +                string1 sets the window title and string2 the process name (on Linux)
> +-uuid %08x-%04x-%04x-%04x-%012x
> +                specify machine UUID
> +
> +Display options:
> +-display sdl[,frame=on|off][,alt_grab=on|off][,ctrl_grab=on|off]
> +            [,window_close=on|off]|curses|none|
> +            vnc=<display>[,<optargs>]
> +                select display type
> +-nographic      disable graphical output and redirect serial I/Os to console
> +-curses         use a curses/ncurses interface instead of SDL
> +-no-frame       open SDL window without a frame and window decorations
> +-alt-grab       use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt)
> +-ctrl-grab      use Right-Ctrl to grab mouse (instead of Ctrl-Alt)
> +-no-quit        disable SDL window close capability
> +-sdl            enable SDL
> +-spice <args>   enable spice
> +-portrait       rotate graphical output 90 deg left (only PXA LCD)
> +-rotate <deg>   rotate graphical output some deg left (only PXA LCD)
> +-vga [std|cirrus|vmware|qxl|xenfb|none]
> +                select video card type
> +-full-screen    start in full screen
> +-vnc display    start a VNC server on display
> +
> +i386 target only:
> +-win2k-hack     use it when installing Windows 2000 to avoid a disk full bug
> +-no-fd-bootchk  disable boot signature checking for floppy disks
> +-no-acpi        disable ACPI
> +-no-hpet        disable HPET
> +-acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,{data|file}=file1[:file2]...]
> +                ACPI table description
> +-smbios file=binary
> +                load SMBIOS entry from binary file
> +-smbios type=0[,vendor=str][,version=str][,date=str][,release=%d.%d]
> +                specify SMBIOS type 0 fields
> +-smbios type=1[,manufacturer=str][,product=str][,version=str][,serial=str]
> +              [,uuid=uuid][,sku=str][,family=str]
> +                specify SMBIOS type 1 fields
> +
> +Network options:
> +-net nic[,vlan=n][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v]
> +                create a new Network Interface Card and connect it to VLAN 'n'
> +-net user[,vlan=n][,name=str][,net=addr[/mask]][,host=addr][,restrict=on|off]
> +         [,hostname=host][,dhcpstart=addr][,dns=addr][,tftp=dir][,bootfile=f]
> +         [,hostfwd=rule][,guestfwd=rule][,smb=dir[,smbserver=addr]]
> +                connect the user mode network stack to VLAN 'n', configure its
> +                DHCP server and enabled optional services
> +-net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,helper=helper][,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h][,vhostforce=on|off]
> +                connect the host TAP network interface to VLAN 'n' 

This line adds a space at EOL.


ACK if that's fixed.

Michal


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]