Re: [libvirt] [PATCH v2 04/10] vz: add Hypervisor prefix to vz and parallels Driver structures

On 07.04.2016 23:09, Maxim Nestratov wrote: > --- > src/vz/vz_driver.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c > index 9de88cd..f2bbf1e 100644 > --- a/src/vz/vz_driver.c > +++ b/src/vz/vz_driver.c > @@ -1491,7 +1491,7 @@ vzConnectUnregisterCloseCallback(virConnectPtr conn, virConnectCloseFunc cb) > return ret; > } > > -static virHypervisorDriver vzDriver = { > +static virHypervisorDriver vzHypervisorDriver = { > .name = "vz", > .connectOpen = vzConnectOpen, /* 0.10.0 */ > .connectClose = vzConnectClose, /* 0.10.0 */ > @@ -1558,11 +1558,11 @@ static virHypervisorDriver vzDriver = { > }; > > static virConnectDriver vzConnectDriver = { > - .hypervisorDriver = &vzDriver, > + .hypervisorDriver = &vzHypervisorDriver, > }; > > /* Parallels domain type backward compatibility*/ > -static virHypervisorDriver parallelsDriver; > +static virHypervisorDriver parallelsHypervisorDriver; > static virConnectDriver parallelsConnectDriver; > > /** > @@ -1584,10 +1584,10 @@ vzRegister(void) > VIR_FREE(prlctl_path); > > /* Backward compatibility with Parallels domain type */ > - parallelsDriver = vzDriver; > - parallelsDriver.name = "Parallels"; > + parallelsHypervisorDriver = vzHypervisorDriver; > + parallelsHypervisorDriver.name = "Parallels"; > parallelsConnectDriver = vzConnectDriver; > - parallelsConnectDriver.hypervisorDriver = &parallelsDriver; > + parallelsConnectDriver.hypervisorDriver = &parallelsHypervisorDriver; > if (virRegisterConnectDriver(&parallelsConnectDriver, false) < 0) > return -1; > > ACK