Remove the separare usb_cdrom test, just hook up both disk and cdrom via usb in a single variant.
Signed-off-by: Gerd Hoffmann <[email protected]> --- client/virt/guest-hw.cfg.sample | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/client/virt/guest-hw.cfg.sample b/client/virt/guest-hw.cfg.sample index d6a5ae2..2eb1721 100644 --- a/client/virt/guest-hw.cfg.sample +++ b/client/virt/guest-hw.cfg.sample @@ -69,14 +69,11 @@ variants: - ahci: drive_format=ahci cd_format=ahci - - usb_stick: + - usb2: drive_format=usb2 - usbs += " default-ehci" - usb_type_default-ehci = usb-ehci - - usb_cdrom: cd_format=usb2 - usbs += " default-ehci-cd" - usb_type_default-ehci-cd = usb-ehci + usbs += " install_ehci" + usb_type_install_ehci = ich9-usb-ehci1 - xenblk: # placeholder -- 1.7.1 _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
