1. Patchew
  2. Libvirt
  3. [libvirt] [PATCH 0/6] Various disk-related fixes/cleanups
  4. View patch

[libvirt] [PATCH 4/6] conf: Punt 'driverName' back to disk definition structure

Peter Krempa posted 6 patches 7 years ago
[libvirt] [PATCH 4/6] conf: Punt 'driverName' back to disk definition structure
Posted by Peter Krempa 7 years ago 
Currently it is not used in backing chains and does not seem that we
will need to use it so return it back to the disk definition. Thankfully
most accesses are done via the accessors.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 src/conf/domain_conf.c    | 11 ++++++-----
 src/conf/domain_conf.h    |  2 ++
 src/util/virstoragefile.c |  6 ------
 src/util/virstoragefile.h |  1 -
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 987f65df23..1ae742a110 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1790,6 +1790,7 @@ virDomainDiskDefFree(virDomainDiskDefPtr def)
     VIR_FREE(def->dst);
     virStorageSourceFree(def->mirror);
     VIR_FREE(def->wwn);
+    VIR_FREE(def->driverName);
     VIR_FREE(def->vendor);
     VIR_FREE(def->product);
     VIR_FREE(def->domain_name);
@@ -1854,7 +1855,7 @@ virDomainDiskEmptySource(virDomainDiskDefPtr def)
 const char *
 virDomainDiskGetDriver(const virDomainDiskDef *def)
 {
-    return def->src->driverName;
+    return def->driverName;
 }


@@ -1862,11 +1863,11 @@ int
 virDomainDiskSetDriver(virDomainDiskDefPtr def, const char *name)
 {
     int ret;
-    char *tmp = def->src->driverName;
+    char *tmp = def->driverName;

-    ret = VIR_STRDUP(def->src->driverName, name);
+    ret = VIR_STRDUP(def->driverName, name);
     if (ret < 0)
-        def->src->driverName = tmp;
+        def->driverName = tmp;
     else
         VIR_FREE(tmp);
     return ret;
@@ -9132,7 +9133,7 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
     char *tmp = NULL;
     int ret = -1;

-    def->src->driverName = virXMLPropString(cur, "name");
+    def->driverName = virXMLPropString(cur, "name");

     if ((tmp = virXMLPropString(cur, "cache")) &&
         (def->cachemode = virDomainDiskCacheTypeFromString(tmp)) < 0) {
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 3a3ec6f6c3..7e20b8837b 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -644,6 +644,8 @@ struct _virDomainDiskDef {

     virDomainBlockIoTuneInfo blkdeviotune;

+    char *driverName;
+
     char *serial;
     char *wwn;
     char *vendor;
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 67b9ec71ac..531540ac91 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -2048,7 +2048,6 @@ virStorageSourceCopy(const virStorageSource *src,

     if (VIR_STRDUP(ret->path, src->path) < 0 ||
         VIR_STRDUP(ret->volume, src->volume) < 0 ||
-        VIR_STRDUP(ret->driverName, src->driverName) < 0 ||
         VIR_STRDUP(ret->relPath, src->relPath) < 0 ||
         VIR_STRDUP(ret->backingStoreRaw, src->backingStoreRaw) < 0 ||
         VIR_STRDUP(ret->snapshot, src->snapshot) < 0 ||
@@ -2135,10 +2134,6 @@ virStorageSourceInitChainElement(virStorageSourcePtr newelem,
         virStorageSourceSeclabelsCopy(newelem, old) < 0)
         goto cleanup;

-    if (!newelem->driverName &&
-        VIR_STRDUP(newelem->driverName, old->driverName) < 0)
-        goto cleanup;
-
     newelem->shared = old->shared;
     newelem->readonly = old->readonly;

@@ -2266,7 +2261,6 @@ virStorageSourceClear(virStorageSourcePtr def)
     VIR_FREE(def->snapshot);
     VIR_FREE(def->configFile);
     virStorageSourcePoolDefFree(def->srcpool);
-    VIR_FREE(def->driverName);
     virBitmapFree(def->features);
     VIR_FREE(def->compat);
     virStorageEncryptionFree(def->encryption);
diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 596746ccb7..d129e81978 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -246,7 +246,6 @@ struct _virStorageSource {

     virObjectPtr privateData;

-    char *driverName;
     int format; /* virStorageFileFormat in domain backing chains, but
                  * pool-specific enum for storage volumes */
     virBitmapPtr features;
-- 
2.16.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 4/6] conf: Punt 'driverName' back to disk definition structure
Posted by Ján Tomko 7 years ago 
s/Punt/put/

On Wed, Apr 18, 2018 at 12:55:41PM +0200, Peter Krempa wrote:
>Currently it is not used in backing chains and does not seem that we
>will need to use it so return it back to the disk definition. Thankfully
>most accesses are done via the accessors.
>
>Signed-off-by: Peter Krempa <pkrempa@redhat.com>
>---
> src/conf/domain_conf.c    | 11 ++++++-----
> src/conf/domain_conf.h    |  2 ++
> src/util/virstoragefile.c |  6 ------
> src/util/virstoragefile.h |  1 -
> 4 files changed, 8 insertions(+), 12 deletions(-)
>

Spellchecked-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 4/6] conf: Punt 'driverName' back to disk definition structure
Posted by Peter Krempa 7 years ago 
On Wed, Apr 18, 2018 at 13:31:34 +0200, Ján Tomko wrote:
> s/Punt/put/

I actually meant 'punt'

https://en.wiktionary.org/wiki/punt#Verb_2

But I can use your suggestion as well.

> 
> On Wed, Apr 18, 2018 at 12:55:41PM +0200, Peter Krempa wrote:
> > Currently it is not used in backing chains and does not seem that we
> > will need to use it so return it back to the disk definition. Thankfully
> > most accesses are done via the accessors.
> > 
> > Signed-off-by: Peter Krempa <pkrempa@redhat.com>
> > ---
> > src/conf/domain_conf.c    | 11 ++++++-----
> > src/conf/domain_conf.h    |  2 ++
> > src/util/virstoragefile.c |  6 ------
> > src/util/virstoragefile.h |  1 -
> > 4 files changed, 8 insertions(+), 12 deletions(-)
> > 
> 
> Spellchecked-by: Ján Tomko <jtomko@redhat.com>
> Reviewed-by: Ján Tomko <jtomko@redhat.com>
> 
> Jano


--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 4/6] conf: Punt 'driverName' back to disk definition structure
Posted by Ján Tomko 7 years ago 
On Wed, Apr 18, 2018 at 01:49:43PM +0200, Peter Krempa wrote:
>On Wed, Apr 18, 2018 at 13:31:34 +0200, Ján Tomko wrote:
>> s/Punt/put/
>
>I actually meant 'punt'
>
>https://en.wiktionary.org/wiki/punt#Verb_2
>
>But I can use your suggestion as well.

Either way, do not use the Spellchecked-by tag.

Spellcheck-privileges-revoked-by: Peter Krempa

Jano

>
>>
>> On Wed, Apr 18, 2018 at 12:55:41PM +0200, Peter Krempa wrote:
>> > Currently it is not used in backing chains and does not seem that we
>> > will need to use it so return it back to the disk definition. Thankfully
>> > most accesses are done via the accessors.
>> >
>> > Signed-off-by: Peter Krempa <pkrempa@redhat.com>
>> > ---
>> > src/conf/domain_conf.c    | 11 ++++++-----
>> > src/conf/domain_conf.h    |  2 ++
>> > src/util/virstoragefile.c |  6 ------
>> > src/util/virstoragefile.h |  1 -
>> > 4 files changed, 8 insertions(+), 12 deletions(-)
>> >
>>
>> Spellchecked-by: Ján Tomko <jtomko@redhat.com>
>> Reviewed-by: Ján Tomko <jtomko@redhat.com>
>>
>> Jano
>
>


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

Patchew 2.1-devel-8c64711

© 2016 - 2025 Red Hat, Inc.