[libvirt] [RFC PATCHv2 1/5] domain_conf: split source data out from ChrDef

Daniel P. Berrange berrange at redhat.com
Fri Jan 14 12:19:22 UTC 2011


On Thu, Jan 13, 2011 at 05:34:33PM -0700, Eric Blake wrote:
> This opens up the possibility of reusing the smaller ChrSourceDef
> for both qemu monitor and a passthrough smartcard device.
> 
> * src/conf/domain_conf.h (_virDomainChrDef): Factor host
> details...
> (_virDomainChrSourceDef): ...into new struct.
> (virDomainChrSourceDefFree): New prototype.
> * src/conf/domain_conf.c (virDomainChrDefFree)
> (virDomainChrDefParseXML, virDomainChrDefFormat): Split...
> (virDomainChrSourceDefClear, virDomainChrSourceDefFree)
> (virDomainChrSourceDefParseXML, virDomainChrSourceDefFormat):
> ...into new functions.
> (virDomainChrDefParseTargetXML): Update clients to reflect type
> split.
> * src/vmx/vmx.c (virVMXParseSerial, virVMXParseParallel)
> (virVMXFormatSerial, virVMXFormatParallel): Likewise.
> * src/xen/xen_driver.c (xenUnifiedDomainOpenConsole): Likewise.
> * src/xen/xend_internal.c (xenDaemonParseSxprChar)
> (xenDaemonFormatSxprChr): Likewise.
> * src/vbox/vbox_tmpl.c (vboxDomainDumpXML, vboxAttachSerial)
> (vboxAttachParallel): Likewise.
> * src/security/security_dac.c (virSecurityDACSetChardevLabel)
> (virSecurityDACSetChardevCallback)
> (virSecurityDACRestoreChardevLabel)
> (virSecurityDACRestoreChardevCallback): Likewise.
> * src/security/security_selinux.c (SELinuxSetSecurityChardevLabel)
> (SELinuxSetSecurityChardevCallback)
> (SELinuxRestoreSecurityChardevLabel)
> (SELinuxSetSecurityChardevCallback): Likewise.
> * src/security/virt-aa-helper.c (get_files): Likewise.
> * src/lxc/lxc_driver.c (lxcVmStart, lxcDomainOpenConsole):
> Likewise.
> * src/uml/uml_conf.c (umlBuildCommandLineChr): Likewise.
> * src/uml/uml_driver.c (umlIdentifyOneChrPTY, umlIdentifyChrPTY)
> (umlDomainOpenConsole): Likewise.
> * src/qemu/qemu_command.c (qemuBuildChrChardevStr)
> (qemuBuildChrArgStr, qemuBuildCommandLine)
> (qemuParseCommandLineChr): Likewise.
> * src/qemu/qemu_domain.c (qemuDomainObjPrivateXMLFormat)
> (qemuDomainObjPrivateXMLParse): Likewise.
> * src/qemu/qemu_cgroup.c (qemuSetupChardevCgroup): Likewise.
> * src/qemu/qemu_hotplug.c (qemuDomainAttachNetDevice): Likewise.
> * src/qemu/qemu_driver.c (qemudFindCharDevicePTYsMonitor)
> (qemudFindCharDevicePTYs, qemuPrepareChardevDevice)
> (qemuPrepareMonitorChr, qemudShutdownVMDaemon)
> (qemuDomainOpenConsole): Likewise.
> * src/qemu/qemu_command.h (qemuBuildChrChardevStr)
> (qemuBuildChrArgStr): Delete, now that they are static.
> * src/libvirt_private.syms (domain_conf.h): New exports.
> * cfg.mk (useless_free_options): Update list.
> * tests/qemuxml2argvtest.c (testCompareXMLToArgvFiles): Update
> tests.
> ---
>  cfg.mk                          |    1 +
>  src/conf/domain_conf.c          |  342 +++++++++++++++++++++++---------------
>  src/conf/domain_conf.h          |   39 +++--
>  src/libvirt_private.syms        |    1 +
>  src/lxc/lxc_driver.c            |   12 +-
>  src/qemu/qemu_cgroup.c          |   10 +-
>  src/qemu/qemu_command.c         |  133 ++++++++-------
>  src/qemu/qemu_command.h         |    7 +-
>  src/qemu/qemu_domain.c          |   22 ++--
>  src/qemu/qemu_driver.c          |   45 +++---
>  src/qemu/qemu_hotplug.c         |    6 +-
>  src/qemu/qemu_monitor.c         |   10 +-
>  src/security/security_dac.c     |    8 +-
>  src/security/security_selinux.c |   10 +-
>  src/security/virt-aa-helper.c   |   42 +++---
>  src/uml/uml_conf.c              |   16 +-
>  src/uml/uml_driver.c            |   14 +-
>  src/vbox/vbox_tmpl.c            |   49 +++---
>  src/vmx/vmx.c                   |   84 +++++-----
>  src/xen/xen_driver.c            |    6 +-
>  src/xen/xend_internal.c         |   87 ++++++----
>  tests/qemuxml2argvtest.c        |    6 +-
>  22 files changed, 530 insertions(+), 420 deletions(-)

ACK

Daniel




More information about the libvir-list mailing list