On 30.04.2015 22:40, Laine Stump wrote: > Back in 2013, commit 877bc089 added in some tests that made sure no > error was generated on a domain definition that had an automatically > added usb controller if that domain didn't have a PCI bus to attach > the usb controller to. In particular, two s390-specific tests were > added, one with <controller type='usb' model='none'/> and another > (called "s390-piix-controllers") that had both usb and ide > controllers, but nothing attached to them. > > Then in February of this year, commit 09ab9dcc eliminated the annoying > auto-adding of a usb device for s390 and s390x machines, stating: > > "Since s390 does not support usb the default creation of a usb > controller for a domain should not occur." > > Since s390 doesn't support usb and usb controllers aren't added to > s390 domain definitions automatically, there is no reason to have the > tests with a usb controller and expect them to succeed. And since the > only reference of an IDE controller wrt s390 that I've found is in the > one test case mentioned above, and the commit log that added it > specifically mentions the purpose to be quieting error messages on > machines with no PCI bus, I'm assuming that the s390 also doesn't > support IDE controllers. Based on that reasoning (and the fact that > s390-piix-controllers causes a test error for an upcoming patch), this > patch removes those two tests. > --- > .../qemuxml2argv-s390-piix-controllers.args | 12 -------- > .../qemuxml2argv-s390-piix-controllers.xml | 34 ---------------------- > .../qemuxml2argv-s390-usb-none.args | 12 -------- > .../qemuxml2argv-s390-usb-none.xml | 29 ------------------ > tests/qemuxml2argvtest.c | 10 ------- > 5 files changed, 97 deletions(-) > delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.args > delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.xml > delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.args > delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.xml Since Boris already checked the patch, just to obey the formal process: ACK Michal -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list