Updates the existing image stored in @path, in case @dxml contains valid
XML supported by the fake host.

Signed-off-by: Ilias Stamatis <stamatis.iliass@gmail.com>
---
 src/test/test_driver.c | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 1b92cb43dd..906c9d5365 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -2255,6 +2255,42 @@ testDomainRestore(virConnectPtr conn,
     return testDomainRestoreFlags(conn, path, NULL, 0);
 }

+
+static int
+testDomainSaveImageDefineXML(virConnectPtr conn,
+                             const char *path,
+                             const char *dxml,
+                             unsigned int flags)
+{
+    int ret = -1;
+    int fd = -1;
+    virDomainDefPtr def = NULL;
+    virDomainDefPtr newdef = NULL;
+    testDriverPtr privconn = conn->privateData;
+
+    virCheckFlags(VIR_DOMAIN_SAVE_RUNNING |
+                  VIR_DOMAIN_SAVE_PAUSED, -1);
+
+    if ((fd = testDomainSaveImageOpen(privconn, path, &def)) < 0)
+        goto cleanup;
+
+    if ((newdef = virDomainDefParseString(dxml, privconn->caps, privconn->xmlopt, NULL,
+                                          VIR_DOMAIN_DEF_PARSE_INACTIVE)) == NULL)
+        goto cleanup;
+
+    if (!testDomainSaveImageWrite(privconn, path, newdef))
+        goto cleanup;
+
+    ret = 0;
+
+ cleanup:
+    VIR_FORCE_CLOSE(fd);
+    virDomainDefFree(def);
+    virDomainDefFree(newdef);
+    return ret;
+}
+
+
 static int testDomainCoreDumpWithFormat(virDomainPtr domain,
                                         const char *to,
                                         unsigned int dumpformat,
@@ -7077,6 +7113,7 @@ static virHypervisorDriver testHypervisorDriver = {
     .domainSaveFlags = testDomainSaveFlags, /* 0.9.4 */
     .domainRestore = testDomainRestore, /* 0.3.2 */
     .domainRestoreFlags = testDomainRestoreFlags, /* 0.9.4 */
+    .domainSaveImageDefineXML = testDomainSaveImageDefineXML, /* 5.5.0 */
     .domainCoreDump = testDomainCoreDump, /* 0.3.2 */
     .domainCoreDumpWithFormat = testDomainCoreDumpWithFormat, /* 1.2.3 */
     .domainSetVcpus = testDomainSetVcpus, /* 0.1.4 */
--
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

On Mon, Jun 10, 2019 at 11:05:00AM +0200, Ilias Stamatis wrote:
> Updates the existing image stored in @path, in case @dxml contains valid
> XML supported by the fake host.
>
> Signed-off-by: Ilias Stamatis <stamatis.iliass@gmail.com>
> ---
>  src/test/test_driver.c | 37 +++++++++++++++++++++++++++++++++++++
>  1 file changed, 37 insertions(+)
>
> diff --git a/src/test/test_driver.c b/src/test/test_driver.c
> index 1b92cb43dd..906c9d5365 100644
> --- a/src/test/test_driver.c
> +++ b/src/test/test_driver.c
> @@ -2255,6 +2255,42 @@ testDomainRestore(virConnectPtr conn,
>      return testDomainRestoreFlags(conn, path, NULL, 0);
>  }
>
> +
> +static int
> +testDomainSaveImageDefineXML(virConnectPtr conn,
> +                             const char *path,
> +                             const char *dxml,
> +                             unsigned int flags)
> +{
> +    int ret = -1;
> +    int fd = -1;
> +    virDomainDefPtr def = NULL;
> +    virDomainDefPtr newdef = NULL;
> +    testDriverPtr privconn = conn->privateData;
> +
> +    virCheckFlags(VIR_DOMAIN_SAVE_RUNNING |
> +                  VIR_DOMAIN_SAVE_PAUSED, -1);
> +
> +    if ((fd = testDomainSaveImageOpen(privconn, path, &def)) < 0)
> +        goto cleanup;

Since we're not going to use @fd anymore, I'd move VIR_FORCE_CLOSE(fd) here to
be more explicit.
I'll make the change before pushing:

Reviewed-by: Erik Skultety <eskultet@redhat.com>

> +
> +    if ((newdef = virDomainDefParseString(dxml, privconn->caps, privconn->xmlopt, NULL,
> +                                          VIR_DOMAIN_DEF_PARSE_INACTIVE)) == NULL)
> +        goto cleanup;
> +
> +    if (!testDomainSaveImageWrite(privconn, path, newdef))
> +        goto cleanup;
> +
> +    ret = 0;
> +
> + cleanup:
> +    VIR_FORCE_CLOSE(fd);
> +    virDomainDefFree(def);
> +    virDomainDefFree(newdef);
> +    return ret;
> +}
> +
> +
>  static int testDomainCoreDumpWithFormat(virDomainPtr domain,
>                                          const char *to,
>                                          unsigned int dumpformat,
> @@ -7077,6 +7113,7 @@ static virHypervisorDriver testHypervisorDriver = {
>      .domainSaveFlags = testDomainSaveFlags, /* 0.9.4 */
>      .domainRestore = testDomainRestore, /* 0.3.2 */
>      .domainRestoreFlags = testDomainRestoreFlags, /* 0.9.4 */
> +    .domainSaveImageDefineXML = testDomainSaveImageDefineXML, /* 5.5.0 */
>      .domainCoreDump = testDomainCoreDump, /* 0.3.2 */
>      .domainCoreDumpWithFormat = testDomainCoreDumpWithFormat, /* 1.2.3 */
>      .domainSetVcpus = testDomainSetVcpus, /* 0.1.4 */
> --
> 2.21.0
>
> --
> libvir-list mailing list
> libvir-list@redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list