On 11/05/14 13:35, Michal Privoznik wrote: > This practically boils down to: > 1) rename DomainResume implementation to DomainResumeFlags > 2) make DomainResume call DomainResumeFlags(dom, 0); > > Signed-off-by: Michal Privoznik <[email protected]> > --- > src/esx/esx_driver.c | 14 +++++++++++++- > src/hyperv/hyperv_driver.c | 14 +++++++++++++- > src/libxl/libxl_driver.c | 14 ++++++++++++-- > src/lxc/lxc_driver.c | 15 +++++++++++++-- > src/openvz/openvz_driver.c | 13 ++++++++++++- > src/parallels/parallels_driver.c | 11 ++++++++++- > src/phyp/phyp_driver.c | 12 +++++++++++- > src/qemu/qemu_driver.c | 15 +++++++++++++-- > src/test/test_driver.c | 13 ++++++++++++- > src/vbox/vbox_common.c | 11 ++++++++++- > src/vmware/vmware_driver.c | 12 +++++++++++- > src/xen/xen_driver.c | 14 ++++++++++++-- > src/xenapi/xenapi_driver.c | 21 +++++++++++++++++++-- > 13 files changed, 161 insertions(+), 18 deletions(-) > > diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c > index 0770e89..aaca532 100644 > --- a/src/esx/esx_driver.c > +++ b/src/esx/esx_driver.c
> @@ -1838,6 +1841,14 @@ esxDomainResume(virDomainPtr domain)
>
>
> static int
> +esxDomainResume(virDomainPtr domain)
> +{
> + return esxDomainResumeFlags(domain, 0);
> +}
> +
> +
> +
3 empty lines.
> +static int
> esxDomainShutdownFlags(virDomainPtr domain, unsigned int flags)
> {
> int result = -1;
> @@ -5310,6 +5321,7 @@ static virHypervisorDriver esxDriver = {
> .domainLookupByName = esxDomainLookupByName, /* 0.7.0 */
> .domainSuspend = esxDomainSuspend, /* 0.7.0 */
> .domainResume = esxDomainResume, /* 0.7.0 */
> + .domainResumeFlags = esxDomainResumeFlags, /* 1.2.10 */
1.2.11
> .domainShutdown = esxDomainShutdown, /* 0.7.0 */
> .domainShutdownFlags = esxDomainShutdownFlags, /* 0.9.10 */
> .domainReboot = esxDomainReboot, /* 0.7.0 */
> diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
> index 5ffcb85..ac8f745 100644
> --- a/src/hyperv/hyperv_driver.c
> +++ b/src/hyperv/hyperv_driver.c
> @@ -598,6 +601,14 @@ hypervDomainResume(virDomainPtr domain)
>
>
> static int
> +hypervDomainResume(virDomainPtr domain)
> +{
> + return hypervDomainResumeFlags(domain, 0);
> +}
> +
> +
3 empty lines.
> +
> + .domainResumeFlags = hypervDomainResumeFlags, /* 1.2.10 */
> + .domainResumeFlags = libxlDomainResumeFlags, /* 1.2.10 */
> + .domainResumeFlags = lxcDomainResumeFlags, /* 1.2.10 */
> + .domainResumeFlags = openvzDomainResumeFlags, /* 1.2.10 */
> + .domainResumeFlags = parallelsDomainResumeFlags, /* 1.2.10 */
> + .domainResumeFlags = phypDomainResumeFlags, /* 1.2.10 */
> + .domainResumeFlags = qemuDomainResumeFlags, /* 1.2.10 */
> + .domainResumeFlags = testDomainResumeFlags, /* 1.2.10 */
> + .domainResumeFlags = vboxDomainResumeFlags, /* 1.2.10 */
> + .domainResumeFlags = vmwareDomainResumeFlags, /* 1.2.10 */
> + .domainResumeFlags = xenUnifiedDomainResumeFlags, /* 1.2.10 */
> + .domainResumeFlags = xenapiDomainResumeFlags, /* 1.2.10 */
s/1.2.10/1.2.11/
Looks reasonable, I ACK it with the changes, but we should reach
agreement on 4/5 before pushing.
Peter
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list [email protected] https://www.redhat.com/mailman/listinfo/libvir-list
