Re: [libvirt] [PATCH 2/3] Introduce virDomainChrSourceDefNew for virDomainChrDefPtr

[Pavel Hrdina]

On Fri, Oct 21, 2016 at 09:01:43AM -0400, John Ferlan wrote:
> Change the virDomainChrDef to use a pointer to 'source' and allocate
> that pointer during virDomainChrDefNew.
> 
> This has tremendous "fallout" in the rest of the code which mainly
> has to change source.$field to source->$field.
> 
> Signed-off-by: John Ferlan 
> ---

ACK

Pavel


signature.asc
Description: Digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH 2/3] Introduce virDomainChrSourceDefNew for virDomainChrDefPtr

[John Ferlan]

Change the virDomainChrDef to use a pointer to 'source' and allocate
that pointer during virDomainChrDefNew.

This has tremendous "fallout" in the rest of the code which mainly
has to change source.$field to source->$field.

Signed-off-by: John Ferlan 
---
 src/bhyve/bhyve_command.c|  8 ++---
 src/bhyve/bhyve_driver.c |  2 +-
 src/bhyve/bhyve_parse_command.c  | 20 +--
 src/conf/domain_audit.c  |  4 +--
 src/conf/domain_conf.c   | 50 +-
 src/conf/domain_conf.h   |  2 +-
 src/libxl/libxl_conf.c   | 42 +++---
 src/libxl/libxl_domain.c | 22 ++--
 src/libxl/libxl_driver.c |  4 +--
 src/lxc/lxc_driver.c |  4 +--
 src/lxc/lxc_native.c |  2 +-
 src/lxc/lxc_process.c|  6 ++--
 src/qemu/qemu_cgroup.c   |  2 +-
 src/qemu/qemu_command.c  | 28 +++
 src/qemu/qemu_domain.c   | 16 -
 src/qemu/qemu_driver.c   |  8 ++---
 src/qemu/qemu_hotplug.c  |  6 ++--
 src/qemu/qemu_parse_command.c|  4 +--
 src/qemu/qemu_process.c  | 28 +++
 src/security/security_dac.c  |  4 +--
 src/security/security_selinux.c  |  4 +--
 src/security/virt-aa-helper.c| 70 ++--
 src/uml/uml_conf.c   | 14 
 src/uml/uml_driver.c | 12 +++
 src/vbox/vbox_common.c   | 46 
 src/vmx/vmx.c| 74 +++---
 src/vz/vz_sdk.c  | 78 
 src/xen/xen_driver.c |  4 +--
 src/xenconfig/xen_sxpr.c | 76 +++
 src/xenconfig/xen_xl.c   | 14 
 tests/securityselinuxlabeltest.c | 14 
 31 files changed, 343 insertions(+), 325 deletions(-)

diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index 55ad950..022b03b 100644
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -130,7 +130,7 @@ bhyveBuildConsoleArgStr(const virDomainDef *def, 
virCommandPtr cmd)
 
 chr = def->serials[0];
 
-if (chr->source.type != VIR_DOMAIN_CHR_TYPE_NMDM) {
+if (chr->source->type != VIR_DOMAIN_CHR_TYPE_NMDM) {
 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("only nmdm console types are supported"));
 return -1;
@@ -146,7 +146,7 @@ bhyveBuildConsoleArgStr(const virDomainDef *def, 
virCommandPtr cmd)
 virCommandAddArgList(cmd, "-s", "1,lpc", NULL);
 virCommandAddArg(cmd, "-l");
 virCommandAddArgFormat(cmd, "com%d,%s",
-   chr->target.port + 1, chr->source.data.file.path);
+   chr->target.port + 1, chr->source->data.file.path);
 
 return 0;
 }
@@ -505,14 +505,14 @@ virBhyveProcessBuildGrubbhyveCmd(virDomainDefPtr def,
 
 chr = def->serials[0];
 
-if (chr->source.type != VIR_DOMAIN_CHR_TYPE_NMDM) {
+if (chr->source->type != VIR_DOMAIN_CHR_TYPE_NMDM) {
 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("only nmdm console types are supported"));
 return NULL;
 }
 
 virCommandAddArg(cmd, "--cons-dev");
-virCommandAddArg(cmd, chr->source.data.file.path);
+virCommandAddArg(cmd, chr->source->data.file.path);
 }
 
 /* VM name */
diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index 04be78b..38fb9f0 100644
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -1080,7 +1080,7 @@ bhyveDomainOpenConsole(virDomainPtr dom,
 
 chr = vm->def->serials[0];
 
-if (virFDStreamOpenPTY(st, chr->source.data.nmdm.slave,
+if (virFDStreamOpenPTY(st, chr->source->data.nmdm.slave,
0, 0, O_RDWR) < 0)
 goto cleanup;
 
diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c
index 1a7de3d..0ae7a83 100644
--- a/src/bhyve/bhyve_parse_command.c
+++ b/src/bhyve/bhyve_parse_command.c
@@ -290,9 +290,9 @@ bhyveParseBhyveLPCArg(virDomainDefPtr def,
 if (!(chr = virDomainChrDefNew(NULL)))
 goto error;
 
-chr->source.type = VIR_DOMAIN_CHR_TYPE_NMDM;
-chr->source.data.nmdm.master = NULL;
-chr->source.data.nmdm.slave = NULL;
+chr->source->type = VIR_DOMAIN_CHR_TYPE_NMDM;
+chr->source->data.nmdm.master = NULL;
+chr->source->data.nmdm.slave = NULL;
 chr->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL;
 
 if (!STRPREFIX(param, "/dev/nmdm")) {
@@ -302,12 +302,12 @@ bhyveParseBhyveLPCArg(virDomainDefPtr def,
 goto error;
 }
 
-if (VIR_STRDUP(chr->source.data.nmdm.master, param) < 0) {
+if (VIR_STRDUP(chr->source->data.nmdm.master, param) < 0) {
 virDomainChrDefFree(chr);
 goto error;
 }
 
-if