From 7dc5b8234131ecdf2465a83484dac6f6423e815b Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Tue, 9 Aug 2011 13:51:00 +0300 Subject: spice2: add --multifunction --- spice2 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/spice2 b/spice2 index c1d461e..d633828 100755 --- a/spice2 +++ b/spice2 @@ -166,6 +166,10 @@ shutdown /p %RESCHANGE% -attach -mon 1024,768,32,0,0 -mon 800,600,32,1024,0 %RESCHANGE% -attach -mon 1024,768,32,0,0 """ * 60), files=[res_change_exe]), +# /Device All takes a ton of time. +whql_pnpdtest=dict(contents=r""" +c:\pnpdtest /Device All /concurrentio /stress /driverpath c:\qxl /noenddialog /except display test 1 /except display test 5 +""", files=whql_pnpdtest_files), ) ################################################################################ @@ -471,8 +475,8 @@ def build_qemu_cmdline(args): if args.cmdlog > 0: cmdline.extend(['-global', 'qxl-vga.cmdlog=%d' % args.cmdlog]) if args.qxl > 1: - cmdline.extend((['-device', 'qxl,guestdebug=%d,cmdlog=%d,debug=%d' % (args.guestdebug, - args.cmdlog, args.qxldebug)]) * (args.qxl - 1)) + cmdline.extend((['-device', 'qxl,guestdebug=%d,cmdlog=%d,debug=%d,multifunction=%s' % ( + args.guestdebug, args.cmdlog, args.qxldebug, 'on' if args.multifunction else 'off')]) * (args.qxl - 1)) if args.revision: cmdline.extend(['-global', 'qxl-vga.revision=%d' % args.revision]) if args.tablet: @@ -503,7 +507,7 @@ def build_qemu_cmdline(args): print "error calling brctl" sys.exit(1) cmdline.extend(['-netdev', 'tap,id=hostnet0,ifname=%s,script=no,downscript=no' % args.tun]) - cmdline.extend(["-device", "virtio-net-pci,netdev=hostnet0,id=net0,mac=%s" % args.mac]) + cmdline.extend(["-device", "%s,netdev=hostnet0,id=net0,mac=%s" % (args.network_device, args.mac)]) #cmdline.extend(["-net", "nic,model=virtio,macaddr=%s" % args.mac]) # windbg (TODO - better then serial) if args.windbg_server: @@ -688,6 +692,7 @@ def parseargs(): image = images[base_part] parser = argparse.ArgumentParser(description='SPICE Launcher script, mark 2. Run spice, qemu, spice tests, automated tests on pre prepared images. Still missing: automated driver installation.') parser.add_argument('--record-cmd', dest='record_cmd', help='record qxl command ring') + parser.add_argument('--network-device', choices=['virtio-net-pci', 'rtl8139'], default='virtio-net-pci') parser.add_argument('--copy-in', dest='copy_in', action='append') parser.add_argument('--no-backing-file', default=True, action='store_false', dest='backing_file', help='use the image as a backing file for the actual image') parser.add_argument('--startup', dest='startup') @@ -764,6 +769,7 @@ def parseargs(): choices=test_progs.keys()) parser.add_argument('--test-func', dest='test_func', choices=tests) parser.add_argument('--replay-file', dest='replay_file') + parser.add_argument('--multifunction', action='store_true', default=False, help='libvirt uses multifunction exclusively') args = parser.parse_args(default_args + sys.argv[1:]) if args.image in images.keys(): args.image = images[args.image] -- cgit v1.2.3