* docs/schemas/capabilities.rng: allow multiple machines per domain just like they are allowed for guests --- docs/schemas/capability.rng | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index dbfe1c5..a9daa40 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -224,9 +224,9 @@ <optional> <ref name='emulator'/> </optional> - <optional> + <zeroOrMore> <ref name='machine'/> - </optional> + </zeroOrMore> </element> </define> -- 1.6.2.5

* docs/schemas/capabilities.rng: add arm and sort arches --- docs/schemas/capability.rng | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index a9daa40..3e8944c 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -279,15 +279,16 @@ <define name='archnames'> <choice> + <value>arm</value> <value>i686</value> - <value>x86_64</value> - <value>ppc</value> - <value>ppc64</value> <value>ia64</value> - <value>s390</value> <value>mips</value> <value>mipsel</value> + <value>ppc64</value> + <value>ppc</value> + <value>s390</value> <value>sparc</value> + <value>x86_64</value> </choice> </define> -- 1.6.2.5

Things added include - x86_64 host - Migration features - NUMA topology - Security model - Canonical machine types - Domain machine types - An arm guest - More machine types for mips, mipsel, sparc and ppc - An x86_64 xenner guest This file was generated on a Fedora 12 machine using latest libvirt and qemu-kvm-0.11.0-rc2 * tests/capabilityschemadata/caps-qemu-kvm.xml: add more features to test --- tests/capabilityschemadata/caps-qemu-kvm.xml | 114 +++++++++++++++++++++++++- 1 files changed, 110 insertions(+), 4 deletions(-) diff --git a/tests/capabilityschemadata/caps-qemu-kvm.xml b/tests/capabilityschemadata/caps-qemu-kvm.xml index a70e1a4..47accde 100644 --- a/tests/capabilityschemadata/caps-qemu-kvm.xml +++ b/tests/capabilityschemadata/caps-qemu-kvm.xml @@ -2,8 +2,30 @@ <host> <cpu> - <arch>i686</arch> + <arch>x86_64</arch> </cpu> + <migration_features> + <live/> + <uri_transports> + <uri_transport>tcp</uri_transport> + </uri_transports> + </migration_features> + <topology> + <cells num='1'> + <cell id='0'> + <cpus num='4'> + <cpu id='0'/> + <cpu id='1'/> + <cpu id='2'/> + <cpu id='3'/> + </cpus> + </cell> + </cells> + </topology> + <secmodel> + <model>selinux</model> + <doi>0</doi> + </secmodel> </host> <guest> @@ -11,12 +33,18 @@ <arch name='i686'> <wordsize>32</wordsize> <emulator>/usr/bin/qemu</emulator> - <machine>pc</machine> + <machine>pc-0.11</machine> + <machine canonical='pc-0.11'>pc</machine> + <machine>pc-0.10</machine> <machine>isapc</machine> <domain type='qemu'> </domain> <domain type='kvm'> <emulator>/usr/bin/qemu-kvm</emulator> + <machine>pc-0.11</machine> + <machine canonical='pc-0.11'>pc</machine> + <machine>pc-0.10</machine> + <machine>isapc</machine> </domain> </arch> <features> @@ -32,10 +60,19 @@ <arch name='x86_64'> <wordsize>64</wordsize> <emulator>/usr/bin/qemu-system-x86_64</emulator> - <machine>pc</machine> + <machine>pc-0.11</machine> + <machine canonical='pc-0.11'>pc</machine> + <machine>pc-0.10</machine> <machine>isapc</machine> <domain type='qemu'> </domain> + <domain type='kvm'> + <emulator>/usr/bin/qemu-kvm</emulator> + <machine>pc-0.11</machine> + <machine canonical='pc-0.11'>pc</machine> + <machine>pc-0.10</machine> + <machine>isapc</machine> + </domain> </arch> <features> <acpi default='on' toggle='yes'/> @@ -45,9 +82,44 @@ <guest> <os_type>hvm</os_type> + <arch name='arm'> + <wordsize>32</wordsize> + <emulator>/usr/bin/qemu-system-arm</emulator> + <machine>integratorcp</machine> + <machine>syborg</machine> + <machine>musicpal</machine> + <machine>mainstone</machine> + <machine>n800</machine> + <machine>n810</machine> + <machine>cheetah</machine> + <machine>sx1</machine> + <machine>sx1-v1</machine> + <machine>tosa</machine> + <machine>akita</machine> + <machine>spitz</machine> + <machine>borzoi</machine> + <machine>terrier</machine> + <machine>connex</machine> + <machine>verdex</machine> + <machine>lm3s811evb</machine> + <machine>lm3s6965evb</machine> + <machine>realview</machine> + <machine>versatilepb</machine> + <machine>versatileab</machine> + <domain type='qemu'> + </domain> + </arch> + </guest> + + <guest> + <os_type>hvm</os_type> <arch name='mips'> <wordsize>32</wordsize> <emulator>/usr/bin/qemu-system-mips</emulator> + <machine>malta</machine> + <machine>mipssim</machine> + <machine>magnum</machine> + <machine>pica61</machine> <machine>mips</machine> <domain type='qemu'> </domain> @@ -59,6 +131,10 @@ <arch name='mipsel'> <wordsize>32</wordsize> <emulator>/usr/bin/qemu-system-mipsel</emulator> + <machine>malta</machine> + <machine>mipssim</machine> + <machine>magnum</machine> + <machine>pica61</machine> <machine>mips</machine> <domain type='qemu'> </domain> @@ -70,7 +146,18 @@ <arch name='sparc'> <wordsize>32</wordsize> <emulator>/usr/bin/qemu-system-sparc</emulator> - <machine>sun4m</machine> + <machine>SS-5</machine> + <machine>SS-10</machine> + <machine>SS-600MP</machine> + <machine>SS-20</machine> + <machine>Voyager</machine> + <machine>LX</machine> + <machine>SS-4</machine> + <machine>SPARCClassic</machine> + <machine>SPARCbook</machine> + <machine>SS-1000</machine> + <machine>SS-2000</machine> + <machine>SS-2</machine> <domain type='qemu'> </domain> </arch> @@ -82,6 +169,10 @@ <wordsize>32</wordsize> <emulator>/usr/bin/qemu-system-ppc</emulator> <machine>g3beige</machine> + <machine>mpc8544ds</machine> + <machine>bamboo</machine> + <machine>ref405ep</machine> + <machine>taihu</machine> <machine>mac99</machine> <machine>prep</machine> <domain type='qemu'> @@ -106,4 +197,19 @@ </features> </guest> + <guest> + <os_type>xen</os_type> + <arch name='x86_64'> + <wordsize>64</wordsize> + <emulator>/usr/bin/xenner</emulator> + <machine>xenner</machine> + <domain type='kvm'> + </domain> + </arch> + <features> + <acpi default='on' toggle='yes'/> + <apic default='on' toggle='no'/> + </features> + </guest> + </capabilities> -- 1.6.2.5

* tests/qemuhelpdata/qemu-kvm-0.11.0-rc2: add data * tests/qemuhelptest.c: add expected output --- .gnulib | 2 +- tests/qemuhelpdata/qemu-kvm-0.11.0-rc2 | 177 ++++++++++++++++++++++++++++++++ tests/qemuhelptest.c | 19 ++++ 3 files changed, 197 insertions(+), 1 deletions(-) create mode 100644 tests/qemuhelpdata/qemu-kvm-0.11.0-rc2 diff --git a/.gnulib b/.gnulib index 28db629..b653eda 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 28db629d4f20b514087389b0339b5ba8c83a707b +Subproject commit b653eda3ac4864de205419d9f41eec267cb89eeb diff --git a/tests/qemuhelpdata/qemu-kvm-0.11.0-rc2 b/tests/qemuhelpdata/qemu-kvm-0.11.0-rc2 new file mode 100644 index 0000000..0eb0b76 --- /dev/null +++ b/tests/qemuhelpdata/qemu-kvm-0.11.0-rc2 @@ -0,0 +1,177 @@ +QEMU PC emulator version 0.10.92 (qemu-kvm-0.11.0-rc2), Copyright (c) 2003-2008 Fabrice Bellard +usage: qemu [options] [disk_image] + +'disk_image' is a raw hard image image for IDE hard disk 0 + +Standard options: +-h or -help display this help and exit +-version display version information and exit +-M machine select emulated machine (-M ? for list) +-cpu cpu select CPU (-cpu ? for list) +-smp n set the number of CPUs to 'n' [default=1] +-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][,format=f][,serial=s] + [,addr=A] + [,boot=on|off] + use 'file' as a drive image +-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] + 'drives': floppy (a), hard disk (c), CD-ROM (d), network (n) +-snapshot write to temporary files instead of disk image files +-m megs set virtual RAM size to megs MB [default=128] +-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 +-usb enable the USB driver (will be the default soon) +-usbdevice name add the host or guest USB device 'name' +-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: +-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) +-no-quit disable SDL window close capability +-sdl enable SDL +-portrait rotate graphical output 90 deg left (only PXA LCD) +-vga [std|cirrus|vmware|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 +-rtc-td-hack use it to fix time drift in Windows ACPI HAL +-no-fd-bootchk disable boot signature checking for floppy disks +-no-acpi disable ACPI +-no-hpet disable HPET +-balloon none disable balloon device +-balloon virtio[,addr=str] + enable virtio balloon device (default) +-acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,data=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=y|n] + [,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][,sndbuf=nbytes] + connect the host TAP network interface to VLAN 'n' and use the + network scripts 'file' (default=/etc/qemu-ifup) + and 'dfile' (default=/etc/qemu-ifdown); + use '[down]script=no' to disable script execution; + use 'fd=h' to connect to an already opened TAP interface + use 'sndbuf=nbytes' to limit the size of the send buffer; the + default of 'sndbuf=1048576' can be disabled using 'sndbuf=0' +-net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port] + connect the vlan 'n' to another VLAN using a socket connection +-net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port] + connect the vlan 'n' to multicast maddr and port +-net dump[,vlan=n][,file=f][,len=n] + dump traffic on vlan 'n' to file 'f' (max n bytes per packet) +-net none use it alone to have zero network devices; if no -net option + is provided, the default is '-net nic -net user' + +-bt hci,null dumb bluetooth HCI - doesn't respond to commands +-bt hci,host[:id] + use host's HCI with the given name +-bt hci[,vlan=n] + emulate a standard HCI in virtual scatternet 'n' +-bt vhci[,vlan=n] + add host computer to virtual scatternet 'n' using VHCI +-bt device:dev[,vlan=n] + emulate a bluetooth device 'dev' in scatternet 'n' + +Linux/Multiboot boot specific: +-kernel bzImage use 'bzImage' as kernel image +-append cmdline use 'cmdline' as kernel command line +-initrd file use 'file' as initial ram disk + +Debug/Expert options: +-serial dev redirect the serial port to char device 'dev' +-parallel dev redirect the parallel port to char device 'dev' +-monitor dev redirect the monitor to char device 'dev' +-pidfile file write PID to 'file' +-singlestep always run in singlestep mode +-S freeze CPU at startup (use 'c' to start execution) +-gdb dev wait for gdb connection on 'dev' +-s shorthand for -gdb tcp::1234 +-d item1,... output log to /tmp/qemu.log (use -d ? for a list of log items) +-hdachs c,h,s[,t] + force hard disk 0 physical geometry and the optional BIOS + translation (t=none or lba) (usually qemu can guess them) +-L path set the directory for the BIOS, VGA BIOS and keymaps +-bios file set the filename for the BIOS +-enable-kvm enable KVM full virtualization support +-no-reboot exit instead of rebooting +-no-shutdown stop before shutdown +-loadvm [tag|id] + start right away with a saved state (loadvm in monitor) +-daemonize daemonize QEMU after initializing +-option-rom rom load a file, rom, into the option ROM space +-clock force the use of the given methods for timer alarm. + To see what timers are available use -clock ? +-localtime set the real time clock to local time [default=utc] +-startdate select initial date of the clock +-icount [N|auto] + enable virtual instruction counter with 2^N clock ticks per + instruction +-watchdog i6300esb|ib700 + enable virtual hardware watchdog [default=none] +-watchdog-action reset|shutdown|poweroff|pause|debug|none + action when watchdog fires [default=reset] +-echr chr set terminal escape character instead of ctrl-a +-virtioconsole c + set virtio console +-show-cursor show cursor +-tb-size n set TB size +-incoming p prepare for incoming migration, listen on port p +-chroot dir Chroot to dir just before starting the VM. +-runas user Change to user id user just before starting the VM. +-no-kvm disable KVM hardware virtualization +-no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC +-no-kvm-pit disable KVM kernel mode PIT +-no-kvm-pit-reinjection disable KVM kernel mode PIT interrupt reinjection +-pcidevice host=bus:dev.func[,dma=none][,name=string] + expose a PCI device to the guest OS. + dma=none: don't perform any dma translations (default is to use an iommu) + 'string' is used in log output. +-enable-nesting enable support for running a VM inside the VM (AMD only) +-nvram FILE provide ia64 nvram contents +-tdf enable guest time drift compensation +-kvm-shadow-memory MEGABYTES + allocate MEGABYTES for kvm mmu shadowing +-mem-path FILE provide backing storage for guest RAM +-mem-prealloc preallocate guest memory (use with -mempath) + +During emulation, the following keys are useful: +ctrl-alt-f toggle full screen +ctrl-alt-n switch to virtual console 'n' +ctrl-alt toggle mouse and keyboard grab + +When using -nographic, press 'ctrl-a h' to get some help. diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 15bdbc9..20677e0 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -160,6 +160,25 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_0_10 | QEMUD_CMD_FLAG_PCIDEVICE, 10050, 1, 0); + DO_TEST("qemu-kvm-0.11.0-rc2", + QEMUD_CMD_FLAG_VNC_COLON | + QEMUD_CMD_FLAG_NO_REBOOT | + QEMUD_CMD_FLAG_DRIVE | + QEMUD_CMD_FLAG_DRIVE_BOOT | + QEMUD_CMD_FLAG_NAME | + QEMUD_CMD_FLAG_UUID | + QEMUD_CMD_FLAG_VNET_HDR | + QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP | + QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC | + QEMUD_CMD_FLAG_DRIVE_CACHE_V2 | + QEMUD_CMD_FLAG_KVM | + QEMUD_CMD_FLAG_DRIVE_FORMAT | + QEMUD_CMD_FLAG_DRIVE_SERIAL | + QEMUD_CMD_FLAG_VGA | + QEMUD_CMD_FLAG_0_10 | + QEMUD_CMD_FLAG_PCIDEVICE | + QEMUD_CMD_FLAG_MEM_PATH, + 10092, 1, 0); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.6.2.5

On Thu, 2009-09-10 at 13:32 +0200, Daniel Veillard wrote: Well spotted. Not sure how that happened. I've removed it from the patches in my staging tree now. Cheers, Mark.