Failed in applying to current master (
apply log)
docs/formatdomain.rst | 55 ++++++++++---------
src/conf/domain_conf.c | 42 ++++++++++----
src/conf/domain_conf.h | 5 ++
src/conf/schemas/domaincommon.rng | 5 ++
src/qemu/qemu_command.c | 3 +
...ce.args => sound-device.x86_64-4.2.0.args} | 13 ++---
.../sound-device.x86_64-latest.args | 50 +++++++++++++++++
tests/qemuxml2argvdata/sound-device.xml | 12 +---
tests/qemuxml2argvdata/sound.args | 37 -------------
tests/qemuxml2argvdata/sound.xml | 34 ------------
tests/qemuxml2argvtest.c | 8 +--
...ice.xml => sound-device.x86_64-latest.xml} | 17 +++---
tests/qemuxml2xmloutdata/sound.xml | 43 ---------------
tests/qemuxml2xmltest.c | 8 +--
14 files changed, 142 insertions(+), 190 deletions(-)
rename tests/qemuxml2argvdata/{sound-device.args => sound-device.x86_64-4.2.0.args} (80%)
create mode 100644 tests/qemuxml2argvdata/sound-device.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/sound.args
delete mode 100644 tests/qemuxml2argvdata/sound.xml
rename tests/qemuxml2xmloutdata/{sound-device.xml => sound-device.x86_64-latest.xml} (82%)
delete mode 100644 tests/qemuxml2xmloutdata/sound.xml