Re: [libvirt] [REPOST PATCH v6 3/8] qemu: Remove private hostdev

[Peter Krempa]

On Thu, Nov 23, 2017 at 08:43:02 -0500, John Ferlan wrote:
> 
> 
> On 11/23/2017 05:26 AM, Peter Krempa wrote:
> > On Wed, Nov 08, 2017 at 08:15:56 -0500, John Ferlan wrote:
> >> Since it's not longer used to shuttle the @secinfo, let's remove
> >> the private hostdev completely.
> >>
> >> Signed-off-by: John Ferlan 
> >> ---
> >>  src/conf/domain_conf.c| 12 ++--
> >>  src/conf/domain_conf.h|  4 +---
> >>  src/lxc/lxc_native.c  |  2 +-
> >>  src/qemu/qemu_domain.c| 44 
> >> ---
> >>  src/qemu/qemu_domain.h| 14 --
> >>  src/qemu/qemu_parse_command.c |  4 ++--
> >>  src/vbox/vbox_common.c|  2 +-
> >>  src/xenconfig/xen_common.c|  2 +-
> >>  src/xenconfig/xen_sxpr.c  |  2 +-
> >>  src/xenconfig/xen_xl.c|  2 +-
> >>  tests/virhostdevtest.c|  2 +-
> >>  11 files changed, 11 insertions(+), 79 deletions(-)
> > 
> > I guess we could have kept the allocation callback in XMLopt along with
> > the utiluty code around it for possible future use and just remove the
> > qemu-specific stuff, but I guess it does not matter much.
> > 
> > ACK
> > 
> 
> I can adjust if you'd really prefer - it's not all that difficult to
> adjust. This patch then becomes just the qemu_domain.{c,h} adjustment.

I think it does not matter really. Adding it back will not be such a
problem if anybody would need it.


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

Re: [libvirt] [REPOST PATCH v6 3/8] qemu: Remove private hostdev

[John Ferlan]

On 11/23/2017 05:26 AM, Peter Krempa wrote:
> On Wed, Nov 08, 2017 at 08:15:56 -0500, John Ferlan wrote:
>> Since it's not longer used to shuttle the @secinfo, let's remove
>> the private hostdev completely.
>>
>> Signed-off-by: John Ferlan 
>> ---
>>  src/conf/domain_conf.c| 12 ++--
>>  src/conf/domain_conf.h|  4 +---
>>  src/lxc/lxc_native.c  |  2 +-
>>  src/qemu/qemu_domain.c| 44 
>> ---
>>  src/qemu/qemu_domain.h| 14 --
>>  src/qemu/qemu_parse_command.c |  4 ++--
>>  src/vbox/vbox_common.c|  2 +-
>>  src/xenconfig/xen_common.c|  2 +-
>>  src/xenconfig/xen_sxpr.c  |  2 +-
>>  src/xenconfig/xen_xl.c|  2 +-
>>  tests/virhostdevtest.c|  2 +-
>>  11 files changed, 11 insertions(+), 79 deletions(-)
> 
> I guess we could have kept the allocation callback in XMLopt along with
> the utiluty code around it for possible future use and just remove the
> qemu-specific stuff, but I guess it does not matter much.
> 
> ACK
> 

I can adjust if you'd really prefer - it's not all that difficult to
adjust. This patch then becomes just the qemu_domain.{c,h} adjustment.


John

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

Re: [libvirt] [REPOST PATCH v6 3/8] qemu: Remove private hostdev

[Peter Krempa]

On Wed, Nov 08, 2017 at 08:15:56 -0500, John Ferlan wrote:
> Since it's not longer used to shuttle the @secinfo, let's remove
> the private hostdev completely.
> 
> Signed-off-by: John Ferlan 
> ---
>  src/conf/domain_conf.c| 12 ++--
>  src/conf/domain_conf.h|  4 +---
>  src/lxc/lxc_native.c  |  2 +-
>  src/qemu/qemu_domain.c| 44 
> ---
>  src/qemu/qemu_domain.h| 14 --
>  src/qemu/qemu_parse_command.c |  4 ++--
>  src/vbox/vbox_common.c|  2 +-
>  src/xenconfig/xen_common.c|  2 +-
>  src/xenconfig/xen_sxpr.c  |  2 +-
>  src/xenconfig/xen_xl.c|  2 +-
>  tests/virhostdevtest.c|  2 +-
>  11 files changed, 11 insertions(+), 79 deletions(-)

I guess we could have kept the allocation callback in XMLopt along with
the utiluty code around it for possible future use and just remove the
qemu-specific stuff, but I guess it does not matter much.

ACK


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

[libvirt] [REPOST PATCH v6 3/8] qemu: Remove private hostdev

[John Ferlan]

Since it's not longer used to shuttle the @secinfo, let's remove
the private hostdev completely.

Signed-off-by: John Ferlan 
---
 src/conf/domain_conf.c| 12 ++--
 src/conf/domain_conf.h|  4 +---
 src/lxc/lxc_native.c  |  2 +-
 src/qemu/qemu_domain.c| 44 ---
 src/qemu/qemu_domain.h| 14 --
 src/qemu/qemu_parse_command.c |  4 ++--
 src/vbox/vbox_common.c|  2 +-
 src/xenconfig/xen_common.c|  2 +-
 src/xenconfig/xen_sxpr.c  |  2 +-
 src/xenconfig/xen_xl.c|  2 +-
 tests/virhostdevtest.c|  2 +-
 11 files changed, 11 insertions(+), 79 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 32b4cc9da9..9641295c57 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2451,7 +2451,7 @@ void virDomainVideoDefFree(virDomainVideoDefPtr def)
 
 
 virDomainHostdevDefPtr
-virDomainHostdevDefNew(virDomainXMLOptionPtr xmlopt)
+virDomainHostdevDefNew(void)
 {
 virDomainHostdevDefPtr def;
 
@@ -2461,11 +2461,6 @@ virDomainHostdevDefNew(virDomainXMLOptionPtr xmlopt)
 if (VIR_ALLOC(def->info) < 0)
 goto error;
 
-if (xmlopt &&
-xmlopt->privateData.hostdevNew &&
-!(def->privateData = xmlopt->privateData.hostdevNew()))
-goto error;
-
 return def;
 
  error:
@@ -2544,9 +2539,6 @@ void virDomainHostdevDefClear(virDomainHostdevDefPtr def)
 }
 break;
 }
-
-virObjectUnref(def->privateData);
-def->privateData = NULL;
 }
 
 void virDomainTPMDefFree(virDomainTPMDefPtr def)
@@ -14683,7 +14675,7 @@ virDomainHostdevDefParseXML(virDomainXMLOptionPtr 
xmlopt,
 
 ctxt->node = node;
 
-if (!(def = virDomainHostdevDefNew(xmlopt)))
+if (!(def = virDomainHostdevDefNew()))
 goto error;
 
 if (mode) {
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index c5a8d9b99a..5d01bb70d4 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -439,7 +439,6 @@ struct _virDomainHostdevCaps {
 /* basic device for direct passthrough */
 struct _virDomainHostdevDef {
 virDomainDeviceDef parent; /* higher level Def containing this */
-virObjectPtr privateData;
 
 int mode; /* enum virDomainHostdevMode */
 int startupPolicy; /* enum virDomainStartupPolicy */
@@ -2607,7 +2606,6 @@ struct _virDomainXMLPrivateDataCallbacks {
 /* note that private data for devices are not copied when using
  * virDomainDefCopy and similar functions */
 virDomainXMLPrivateDataNewFuncdiskNew;
-virDomainXMLPrivateDataNewFunchostdevNew;
 virDomainXMLPrivateDataNewFuncvcpuNew;
 virDomainXMLPrivateDataNewFuncchrSourceNew;
 virDomainXMLPrivateDataFormatFunc format;
@@ -2732,7 +2730,7 @@ void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def);
 void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def);
 virDomainVideoDefPtr virDomainVideoDefNew(void);
 void virDomainVideoDefFree(virDomainVideoDefPtr def);
-virDomainHostdevDefPtr virDomainHostdevDefNew(virDomainXMLOptionPtr xmlopt);
+virDomainHostdevDefPtr virDomainHostdevDefNew(void);
 void virDomainHostdevDefClear(virDomainHostdevDefPtr def);
 void virDomainHostdevDefFree(virDomainHostdevDefPtr def);
 void virDomainHubDefFree(virDomainHubDefPtr def);
diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
index 68636dc2a4..fdc03a57ea 100644
--- a/src/lxc/lxc_native.c
+++ b/src/lxc/lxc_native.c
@@ -394,7 +394,7 @@ lxcCreateNetDef(const char *type,
 static virDomainHostdevDefPtr
 lxcCreateHostdevDef(int mode, int type, const char *data)
 {
-virDomainHostdevDefPtr hostdev = virDomainHostdevDefNew(NULL);
+virDomainHostdevDefPtr hostdev = virDomainHostdevDefNew();
 
 if (!hostdev)
 return NULL;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 31ec91fa12..66fa069b6f 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -965,49 +965,6 @@ qemuDomainStorageSourcePrivateDispose(void *obj)
 }
 
 
-static virClassPtr qemuDomainHostdevPrivateClass;
-static void qemuDomainHostdevPrivateDispose(void *obj);
-
-static int
-qemuDomainHostdevPrivateOnceInit(void)
-{
-qemuDomainHostdevPrivateClass =
-virClassNew(virClassForObject(),
-"qemuDomainHostdevPrivate",
-sizeof(qemuDomainHostdevPrivate),
-qemuDomainHostdevPrivateDispose);
-if (!qemuDomainHostdevPrivateClass)
-return -1;
-else
-return 0;
-}
-
-VIR_ONCE_GLOBAL_INIT(qemuDomainHostdevPrivate)
-
-static virObjectPtr
-qemuDomainHostdevPrivateNew(void)
-{
-qemuDomainHostdevPrivatePtr priv;
-
-if (qemuDomainHostdevPrivateInitialize() < 0)
-return NULL;
-
-if (!(priv = virObjectNew(qemuDomainHostdevPrivateClass)))
-return NULL;
-
-return (virObjectPtr) priv;
-}
-
-
-static void
-qemuDomainHostdevPrivateDispose(void *obj)
-{
-qemuDomainHostdevPrivatePtr priv = obj;

[libvirt] [REPOST PATCH v6 3/8] qemu: Remove private hostdev

[John Ferlan]

Since it's not longer used to shuttle the @secinfo, let's remove
the private hostdev completely.

Signed-off-by: John Ferlan 
---
 src/conf/domain_conf.c| 12 ++--
 src/conf/domain_conf.h|  4 +---
 src/lxc/lxc_native.c  |  2 +-
 src/qemu/qemu_domain.c| 44 ---
 src/qemu/qemu_domain.h| 14 --
 src/qemu/qemu_parse_command.c |  4 ++--
 src/vbox/vbox_common.c|  2 +-
 src/xenconfig/xen_common.c|  2 +-
 src/xenconfig/xen_sxpr.c  |  2 +-
 src/xenconfig/xen_xl.c|  2 +-
 tests/virhostdevtest.c|  2 +-
 11 files changed, 11 insertions(+), 79 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 33b06f33e4..48b16a4668 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2446,7 +2446,7 @@ void virDomainVideoDefFree(virDomainVideoDefPtr def)
 
 
 virDomainHostdevDefPtr
-virDomainHostdevDefNew(virDomainXMLOptionPtr xmlopt)
+virDomainHostdevDefNew(void)
 {
 virDomainHostdevDefPtr def;
 
@@ -2456,11 +2456,6 @@ virDomainHostdevDefNew(virDomainXMLOptionPtr xmlopt)
 if (VIR_ALLOC(def->info) < 0)
 goto error;
 
-if (xmlopt &&
-xmlopt->privateData.hostdevNew &&
-!(def->privateData = xmlopt->privateData.hostdevNew()))
-goto error;
-
 return def;
 
  error:
@@ -2539,9 +2534,6 @@ void virDomainHostdevDefClear(virDomainHostdevDefPtr def)
 }
 break;
 }
-
-virObjectUnref(def->privateData);
-def->privateData = NULL;
 }
 
 void virDomainTPMDefFree(virDomainTPMDefPtr def)
@@ -14673,7 +14665,7 @@ virDomainHostdevDefParseXML(virDomainXMLOptionPtr 
xmlopt,
 
 ctxt->node = node;
 
-if (!(def = virDomainHostdevDefNew(xmlopt)))
+if (!(def = virDomainHostdevDefNew()))
 goto error;
 
 if (mode) {
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index ee9d06c5e9..9cb51d0608 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -439,7 +439,6 @@ struct _virDomainHostdevCaps {
 /* basic device for direct passthrough */
 struct _virDomainHostdevDef {
 virDomainDeviceDef parent; /* higher level Def containing this */
-virObjectPtr privateData;
 
 int mode; /* enum virDomainHostdevMode */
 int startupPolicy; /* enum virDomainStartupPolicy */
@@ -2599,7 +2598,6 @@ struct _virDomainXMLPrivateDataCallbacks {
 /* note that private data for devices are not copied when using
  * virDomainDefCopy and similar functions */
 virDomainXMLPrivateDataNewFuncdiskNew;
-virDomainXMLPrivateDataNewFunchostdevNew;
 virDomainXMLPrivateDataNewFuncvcpuNew;
 virDomainXMLPrivateDataNewFuncchrSourceNew;
 virDomainXMLPrivateDataFormatFunc format;
@@ -2724,7 +2722,7 @@ void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def);
 void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def);
 virDomainVideoDefPtr virDomainVideoDefNew(void);
 void virDomainVideoDefFree(virDomainVideoDefPtr def);
-virDomainHostdevDefPtr virDomainHostdevDefNew(virDomainXMLOptionPtr xmlopt);
+virDomainHostdevDefPtr virDomainHostdevDefNew(void);
 void virDomainHostdevDefClear(virDomainHostdevDefPtr def);
 void virDomainHostdevDefFree(virDomainHostdevDefPtr def);
 void virDomainHubDefFree(virDomainHubDefPtr def);
diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
index 68636dc2a4..fdc03a57ea 100644
--- a/src/lxc/lxc_native.c
+++ b/src/lxc/lxc_native.c
@@ -394,7 +394,7 @@ lxcCreateNetDef(const char *type,
 static virDomainHostdevDefPtr
 lxcCreateHostdevDef(int mode, int type, const char *data)
 {
-virDomainHostdevDefPtr hostdev = virDomainHostdevDefNew(NULL);
+virDomainHostdevDefPtr hostdev = virDomainHostdevDefNew();
 
 if (!hostdev)
 return NULL;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index afd306f062..f4ce1ad71e 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -965,49 +965,6 @@ qemuDomainStorageSourcePrivateDispose(void *obj)
 }
 
 
-static virClassPtr qemuDomainHostdevPrivateClass;
-static void qemuDomainHostdevPrivateDispose(void *obj);
-
-static int
-qemuDomainHostdevPrivateOnceInit(void)
-{
-qemuDomainHostdevPrivateClass =
-virClassNew(virClassForObject(),
-"qemuDomainHostdevPrivate",
-sizeof(qemuDomainHostdevPrivate),
-qemuDomainHostdevPrivateDispose);
-if (!qemuDomainHostdevPrivateClass)
-return -1;
-else
-return 0;
-}
-
-VIR_ONCE_GLOBAL_INIT(qemuDomainHostdevPrivate)
-
-static virObjectPtr
-qemuDomainHostdevPrivateNew(void)
-{
-qemuDomainHostdevPrivatePtr priv;
-
-if (qemuDomainHostdevPrivateInitialize() < 0)
-return NULL;
-
-if (!(priv = virObjectNew(qemuDomainHostdevPrivateClass)))
-return NULL;
-
-return (virObjectPtr) priv;
-}
-
-
-static void
-qemuDomainHostdevPrivateDispose(void *obj)
-{
-qemuDomainHostdevPrivatePtr priv = obj;