[libvirt] [PATCH] remote generator: handle remoteDomainCreateWithFlags()
This commit removes the handcrafted code for remoteDomainCreateWithFlags() and lets it auto generate. A little bit of history repeating... Commit 03d813bbcd7b4a183601055006 removed the auto generation of remoteDomainCreateWithFlags() because it was thought that the design flaw in the remote protocol for virDomainCreate is also within the remote protocol for virDomainCreateWithFlags. As the commit message of ddaf15d7a3863d54e242f8ff75 mentions this is not the case therefore we can auto generate the client part. Even worse there was a typo in remoteDomainCreateWithFlags() 'remote_domain_create_with_flags_args ret;' but in fact it has to be 'remote_domain_create_with_flags_ret ret;'. Signed-off-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com> Reviewed-by: Bjoern Walk <bwalk@linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com> --- src/remote/remote_driver.c | 29 ----------------------------- src/remote/remote_protocol.x | 2 +- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 8880520..7be9f17 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2627,35 +2627,6 @@ remoteDomainCreate(virDomainPtr domain) return rv; } -static int -remoteDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) -{ - int rv = -1; - struct private_data *priv = dom->conn->privateData; - remote_domain_create_with_flags_args args; - remote_domain_create_with_flags_args ret; - - remoteDriverLock(priv); - - make_nonnull_domain(&args.dom, dom); - args.flags = flags; - - memset(&ret, 0, sizeof(ret)); - if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_CREATE_WITH_FLAGS, - (xdrproc_t)xdr_remote_domain_create_with_flags_args, (char *)&args, - (xdrproc_t)xdr_remote_domain_create_with_flags_ret, (char *)&ret) == -1) { - goto done; - } - - dom->id = ret.dom.id; - xdr_free((xdrproc_t) &xdr_remote_domain_create_with_flags_ret, (char *) &ret); - rv = 0; - - done: - remoteDriverUnlock(priv); - return rv; -} - static char * remoteDomainGetSchedulerType(virDomainPtr domain, int *nparams) { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index e8382dc..5b594ea 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -4741,7 +4741,7 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_EVENT_IO_ERROR_REASON = 195, /** - * @generate: server + * @generate: both * @acl: domain:start */ REMOTE_PROC_DOMAIN_CREATE_WITH_FLAGS = 196, -- 2.5.5
On Thu, Jan 19, 2017 at 09:17 PM +0100, Marc Hartmayer <mhartmay@linux.vnet.ibm.com> wrote:
This commit removes the handcrafted code for remoteDomainCreateWithFlags() and lets it auto generate.
A little bit of history repeating... Commit 03d813bbcd7b4a183601055006 removed the auto generation of remoteDomainCreateWithFlags() because it was thought that the design flaw in the remote protocol for virDomainCreate is also within the remote protocol for virDomainCreateWithFlags. As the commit message of ddaf15d7a3863d54e242f8ff75 mentions this is not the case therefore we can auto generate the client part.
Even worse there was a typo in remoteDomainCreateWithFlags()
'remote_domain_create_with_flags_args ret;' but in fact it has to be 'remote_domain_create_with_flags_ret ret;'.
Signed-off-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com> Reviewed-by: Bjoern Walk <bwalk@linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com> --- src/remote/remote_driver.c | 29 ----------------------------- src/remote/remote_protocol.x | 2 +- 2 files changed, 1 insertion(+), 30 deletions(-)
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 8880520..7be9f17 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2627,35 +2627,6 @@ remoteDomainCreate(virDomainPtr domain) return rv; }
-static int -remoteDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) -{ - int rv = -1; - struct private_data *priv = dom->conn->privateData; - remote_domain_create_with_flags_args args; - remote_domain_create_with_flags_args ret; - - remoteDriverLock(priv); - - make_nonnull_domain(&args.dom, dom); - args.flags = flags; - - memset(&ret, 0, sizeof(ret)); - if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_CREATE_WITH_FLAGS, - (xdrproc_t)xdr_remote_domain_create_with_flags_args, (char *)&args, - (xdrproc_t)xdr_remote_domain_create_with_flags_ret, (char *)&ret) == -1) { - goto done; - } - - dom->id = ret.dom.id; - xdr_free((xdrproc_t) &xdr_remote_domain_create_with_flags_ret, (char *) &ret); - rv = 0; - - done: - remoteDriverUnlock(priv); - return rv; -} - static char * remoteDomainGetSchedulerType(virDomainPtr domain, int *nparams) { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index e8382dc..5b594ea 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -4741,7 +4741,7 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_EVENT_IO_ERROR_REASON = 195,
/** - * @generate: server + * @generate: both * @acl: domain:start */ REMOTE_PROC_DOMAIN_CREATE_WITH_FLAGS = 196, -- 2.5.5
Polite ping. -- Beste Grüße / Kind regards Marc Hartmayer IBM Deutschland Research & Development GmbH Vorsitzende des Aufsichtsrats: Martina Koederitz Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294
On 01/19/2017 03:17 PM, Marc Hartmayer wrote:
This commit removes the handcrafted code for remoteDomainCreateWithFlags() and lets it auto generate.
A little bit of history repeating... Commit 03d813bbcd7b4a183601055006 removed the auto generation of remoteDomainCreateWithFlags() because it was thought that the design flaw in the remote protocol for virDomainCreate is also within the remote protocol for virDomainCreateWithFlags. As the commit message of ddaf15d7a3863d54e242f8ff75 mentions this is not the case therefore we can auto generate the client part.
Even worse there was a typo in remoteDomainCreateWithFlags()
'remote_domain_create_with_flags_args ret;' but in fact it has to be 'remote_domain_create_with_flags_ret ret;'.
Signed-off-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com> Reviewed-by: Bjoern Walk <bwalk@linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com> --- src/remote/remote_driver.c | 29 ----------------------------- src/remote/remote_protocol.x | 2 +- 2 files changed, 1 insertion(+), 30 deletions(-)
Nice catch - ACK (and pushed) John
On Thu, Feb 09, 2017 at 11:39 PM +0100, John Ferlan <jferlan@redhat.com> wrote:
On 01/19/2017 03:17 PM, Marc Hartmayer wrote:
This commit removes the handcrafted code for remoteDomainCreateWithFlags() and lets it auto generate.
A little bit of history repeating... Commit 03d813bbcd7b4a183601055006 removed the auto generation of remoteDomainCreateWithFlags() because it was thought that the design flaw in the remote protocol for virDomainCreate is also within the remote protocol for virDomainCreateWithFlags. As the commit message of ddaf15d7a3863d54e242f8ff75 mentions this is not the case therefore we can auto generate the client part.
Even worse there was a typo in remoteDomainCreateWithFlags()
'remote_domain_create_with_flags_args ret;' but in fact it has to be 'remote_domain_create_with_flags_ret ret;'.
Signed-off-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com> Reviewed-by: Bjoern Walk <bwalk@linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com> --- src/remote/remote_driver.c | 29 ----------------------------- src/remote/remote_protocol.x | 2 +- 2 files changed, 1 insertion(+), 30 deletions(-)
Nice catch -
ACK (and pushed)
John
Thanks. -- Beste Grüße / Kind regards Marc Hartmayer IBM Deutschland Research & Development GmbH Vorsitzende des Aufsichtsrats: Martina Koederitz Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294
participants (2)
-
John Ferlan -
Marc Hartmayer