- Devel - libvirt List Archives

[libvirt] [PATCH] esx: Cleanup VI generator code
by Matthias Bolte 14 Apr '11

14 Apr '11

--- src/esx/esx_vi_generator.py | 177 +++++++++++++++++-------------------------- 1 files changed, 71 insertions(+), 106 deletions(-) diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 3d068f3..622a34a 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -41,6 +41,11 @@ valid_occurrences = [OCCURRENCE__REQUIRED_ITEM, +def aligned(left, right): + while len(left) < 59: + left += " " + + return left + right @@ -64,9 +69,6 @@ class Parameter: def is_enum(self): - global predefined_enums - global enums_by_name - return self.type in predefined_enums or self.type in enums_by_name @@ -88,10 +90,7 @@ class Parameter: else: string += ", " - while len(string) < 59: - string += " " - - return string + self.get_occurrence_comment() + "\n" + return aligned(string, self.get_occurrence_comment() + "\n") def generate_return(self, offset = 0, end_of_line = ";"): @@ -102,10 +101,7 @@ class Parameter: string += " " * offset string += "%s%s)%s" % (self.get_type_string(True), self.name, end_of_line) - while len(string) < 59: - string += " " - - return string + self.get_occurrence_comment() + "\n" + return aligned(string, self.get_occurrence_comment() + "\n") def generate_require_code(self): @@ -274,9 +270,6 @@ class Property: def is_enum(self): - global predefined_enums - global enums_by_name - return self.type in predefined_enums or self.type in enums_by_name @@ -286,10 +279,7 @@ class Property: else: string = " %s%s; " % (self.get_type_string(), self.name) - while len(string) < 59: - string += " " - - return string + self.get_occurrence_comment() + "\n" + return aligned(string, self.get_occurrence_comment() + "\n") def generate_free_code(self): @@ -380,7 +370,37 @@ class Property: -class Object: +class Base: + def __init__(self, kind, name): + self.kind = kind + self.name = name + + + def generate_typedef(self): + return "typedef %s _esxVI_%s esxVI_%s;\n" % (self.kind, self.name, self.name) + + + def generate_typeenum(self): + return " esxVI_Type_%s,\n" % self.name + + + def generate_typetostring(self): + string = " case esxVI_Type_%s:\n" % self.name + string += " return \"%s\";\n\n" % self.name + + return string + + + def generate_typefromstring(self): + string = " else if (STREQ(type, \"%s\")) {\n" % self.name + string += " return esxVI_Type_%s;\n" % self.name + string += " }\n" + + return string + + + +class Object(Base): FEATURE__DYNAMIC_CAST = (1 << 1) FEATURE__LIST = (1 << 2) FEATURE__DEEP_COPY = (1 << 3) @@ -390,34 +410,24 @@ class Object: def __init__(self, name, extends, properties, features = 0, extended_by = None): - self.name = name + Base.__init__(self, "struct", name) self.extends = extends self.features = features | Object.FEATURE__SERIALIZE | Object.FEATURE__DESERIALIZE self.properties = properties self.extended_by = extended_by if self.extended_by is not None: - self.extended_by.sort(); + self.extended_by.sort() - def generate_struct_members(self, add_banner = False, struct_gap = False): - global objects_by_name + def generate_struct_members(self, add_banner=False, struct_gap=False): members = "" - if self.extends is None: - struct_gap = True - string = " esxVI_Type _type; " - - while len(string) < 59: - string += " " - - members += string + "/* required */\n" - - if struct_gap and self.extends is None: + if struct_gap: members += "\n" if self.extends is not None: - members += objects_by_name[self.extends].generate_struct_members(add_banner = True, struct_gap = False) + "\n" + members += objects_by_name[self.extends].generate_struct_members(add_banner=True, struct_gap=False) + "\n" if self.extends is not None or add_banner: members += " /* %s */\n" % self.name @@ -431,12 +441,11 @@ class Object: return members - def generate_free_code(self, add_banner = False): - global objects_by_name + def generate_free_code(self, add_banner=False): source = "" if self.extends is not None: - source += objects_by_name[self.extends].generate_free_code(add_banner = True) + "\n" + source += objects_by_name[self.extends].generate_free_code(add_banner=True) + "\n" if self.extends is not None or add_banner: source += " /* %s */\n" % self.name @@ -457,12 +466,11 @@ class Object: return source - def generate_validate_code(self, add_banner = False): - global objects_by_name + def generate_validate_code(self, add_banner=False): source = "" if self.extends is not None: - source += objects_by_name[self.extends].generate_validate_code(add_banner = True) + "\n" + source += objects_by_name[self.extends].generate_validate_code(add_banner=True) + "\n" if self.extends is not None or add_banner: source += " /* %s */\n" % self.name @@ -484,7 +492,6 @@ class Object: def generate_dynamic_cast_code(self, is_first = True): - global objects_by_name source = "" if self.extended_by is not None: @@ -503,7 +510,6 @@ class Object: def generate_deep_copy_code(self, add_banner = False): - global objects_by_name source = "" if self.extends is not None: @@ -529,7 +535,6 @@ class Object: def generate_serialize_code(self, add_banner = False): - global objects_by_name source = "" if self.extends is not None: @@ -548,11 +553,10 @@ class Object: def generate_deserialize_code(self, add_banner = False): - global objects_by_name source = "" if self.extends is not None: - source += objects_by_name[self.extends].generate_deserialize_code(add_banner = True) + "\n" + source += objects_by_name[self.extends].generate_deserialize_code(add_banner=True) + "\n" if self.extends is not None or add_banner: source += " /* %s */\n" % self.name @@ -566,29 +570,6 @@ class Object: return source - def generate_typedef(self): - return "typedef struct _esxVI_%s esxVI_%s;\n" % (self.name, self.name) - - - def generate_typeenum(self): - return " esxVI_Type_%s,\n" % self.name - - - def generate_typetostring(self): - string = " case esxVI_Type_%s:\n" % self.name - string += " return \"%s\";\n\n" % self.name - - return string - - - def generate_typefromstring(self): - string = " else if (STREQ(type, \"%s\")) {\n" % self.name - string += " return esxVI_Type_%s;\n" % self.name - string += " }\n" - - return string - - def generate_header(self): header = "/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\n" header += " * VI Type: %s\n" % self.name @@ -612,17 +593,12 @@ class Object: header += "struct _esxVI_%s {\n" % self.name if self.features & Object.FEATURE__LIST: - string = " esxVI_%s *_next; " % self.name + header += aligned(" esxVI_%s *_next; " % self.name, "/* optional */\n") else: - string = " esxVI_%s *_unused; " % self.name - - while len(string) < 59: - string += " " - - header += string + "/* optional */\n" - - header += self.generate_struct_members(struct_gap = True) + header += aligned(" esxVI_%s *_unused; " % self.name, "/* optional */\n") + header += aligned(" esxVI_Type _type; ", "/* required */\n") + header += self.generate_struct_members(struct_gap=True) header += "};\n\n" # functions @@ -888,39 +864,28 @@ class Object: -class Enum: - FEATURE__ANY_TYPE = (1 << 1) - FEATURE__SERIALIZE = (1 << 2) - FEATURE__DESERIALIZE = (1 << 3) - def __init__(self, name, values, features = 0): - self.name = name - self.values = values - self.features = features | Enum.FEATURE__SERIALIZE | Enum.FEATURE__DESERIALIZE - def generate_typedef(self): - return "typedef enum _esxVI_%s esxVI_%s;\n" % (self.name, self.name) - def generate_typeenum(self): - return " esxVI_Type_%s,\n" % self.name - def generate_typetostring(self): - string = " case esxVI_Type_%s:\n" % self.name - string += " return \"%s\";\n\n" % self.name - return string - def generate_typefromstring(self): - string = " else if (STREQ(type, \"%s\")) {\n" % self.name - string += " return esxVI_Type_%s;\n" % self.name - string += " }\n" - return string +class Enum(Base): + FEATURE__ANY_TYPE = (1 << 1) + FEATURE__SERIALIZE = (1 << 2) + FEATURE__DESERIALIZE = (1 << 3) + + + def __init__(self, name, values, features=0): + Base.__init__(self, "enum", name) + self.values = values + self.features = features | Enum.FEATURE__SERIALIZE | Enum.FEATURE__DESERIALIZE def generate_header(self): @@ -1027,8 +992,8 @@ def parse_object(block): if items[2] not in valid_occurrences: report_error("line %d: invalid occurrence" % line[0]) - properties.append(Property(type = items[0], name = items[1], - occurrence = items[2])) + properties.append(Property(type=items[0], name=items[1], + occurrence=items[2])) return Object(name = name, extends = extends, properties = properties) @@ -1051,7 +1016,7 @@ def parse_enum(block): # expected format: <value> values.append(line[1]) - return Enum(name = name, values = values) + return Enum(name=name, values=values) @@ -1071,8 +1036,8 @@ def parse_method(block): if header_items[2] != "returns": report_error("line %d: invalid block header" % (number)) else: - returns = Parameter(type = header_items[3], name = "output", - occurrence = header_items[4]) + returns = Parameter(type=header_items[3], name="output", + occurrence=header_items[4]) parameters = [] @@ -1086,10 +1051,10 @@ def parse_method(block): if items[2] not in valid_occurrences: report_error("line %d: invalid occurrence" % line[0]) - parameters.append(Parameter(type = items[0], name = items[1], - occurrence = items[2])) + parameters.append(Parameter(type=items[0], name=items[1], + occurrence=items[2])) - return Method(name = name, parameters = parameters, returns = returns) + return Method(name=name, parameters=parameters, returns=returns) -- 1.7.0.4

2 2

[libvirt] [PATCH] Fix possible NULL dereference in driver
by Michal Privoznik 14 Apr '11

14 Apr '11

If brSetForwardDelay() fails, we go to err1 where we want to access macTapIfName variable which was just VIR_FREE'd a few lines above. --- src/network/bridge_driver.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index ea2bfd4..97d8ce0 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1616,7 +1616,7 @@ networkStartNetworkDaemon(struct network_driver *driver, bool v4present = false, v6present = false; virErrorPtr save_err = NULL; virNetworkIpDefPtr ipdef; - char *macTapIfName; + char *macTapIfName = NULL; if (virNetworkObjIsActive(network)) { networkReportError(VIR_ERR_OPERATION_INVALID, @@ -1657,7 +1657,6 @@ networkStartNetworkDaemon(struct network_driver *driver, VIR_FREE(macTapIfName); goto err0; } - VIR_FREE(macTapIfName); } /* Set bridge options */ @@ -1731,6 +1730,7 @@ networkStartNetworkDaemon(struct network_driver *driver, goto err5; } + VIR_FREE(macTapIfName); VIR_INFO(_("Starting up network '%s'"), network->def->name); network->active = 1; @@ -1778,6 +1778,7 @@ networkStartNetworkDaemon(struct network_driver *driver, macTapIfName, network->def->bridge, virStrerror(err, ebuf, sizeof ebuf)); } + VIR_FREE(macTapIfName); err0: if (!save_err) -- 1.7.4.2

2 2

[libvirt] [PATCH] docs: Serial and parallel device target ports actually start from 0
by Matthias Bolte 14 Apr '11

14 Apr '11

Reported by Igor Galić --- docs/formatdomain.html.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 574fee5..ea021e8 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1807,7 +1807,7 @@ qemu-kvm -net nic,model=? /dev/null <code>target</code> can have a <code>port</code> attribute, which - specifies the port number. Ports are numbered starting from 1. There are + specifies the port number. Ports are numbered starting from 0. There are usually 0, 1 or 2 parallel ports. @@ -1825,7 +1825,7 @@ qemu-kvm -net nic,model=? /dev/null <code>target</code> can have a <code>port</code> attribute, which - specifies the port number. Ports are numbered starting from 1. There are + specifies the port number. Ports are numbered starting from 0. There are usually 0, 1 or 2 serial ports. -- 1.7.0.4

2 2

[libvirt] virsh shutdown
by Zvi Dubitzky 14 Apr '11

14 Apr '11

Hi For some reason recent libvirt code (0.8.3 and even before) the 'virsh shutdown <domain> ' is not effective . It issues an ok message by the domians remains in a runnning state . Only th e destroy works fine. Any idea ? Zvi Dubitzky Email:dubi@il.ibm.com

3 2

[libvirt] [PATCH] Fix possible NULL dereference in driver
by Michal Privoznik 14 Apr '11

14 Apr '11

If brSetForwardDelay() fails, we go to err1 where we want to access macTapIfName variable which was just VIR_FREE'd a few lines above. --- src/network/bridge_driver.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index ea2bfd4..abde150 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1616,7 +1616,7 @@ networkStartNetworkDaemon(struct network_driver *driver, bool v4present = false, v6present = false; virErrorPtr save_err = NULL; virNetworkIpDefPtr ipdef; - char *macTapIfName; + char *macTapIfName = NULL; if (virNetworkObjIsActive(network)) { networkReportError(VIR_ERR_OPERATION_INVALID, @@ -1657,7 +1657,6 @@ networkStartNetworkDaemon(struct network_driver *driver, VIR_FREE(macTapIfName); goto err0; } - VIR_FREE(macTapIfName); } /* Set bridge options */ @@ -1687,6 +1686,8 @@ networkStartNetworkDaemon(struct network_driver *driver, if (networkAddIptablesRules(driver, network) < 0) goto err1; + VIR_FREE(macTapIfName); + for (ii = 0; (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, ii)); ii++) { -- 1.7.4.2

2 1

[libvirt] [PATCH] Fix checking of return codes in dispatcher
by Daniel P. Berrange 14 Apr '11

14 Apr '11

The libvirt APIs reserve any negative value for indicating an error. Thus checks if (virXXXX() == -1) Should instead be if (virXXXX() < 0) * daemon/remote.c: s/ == -1/ < 0/ --- daemon/remote.c | 339 +++++++++++++++++++++++++++++-------------------------- 1 files changed, 180 insertions(+), 159 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 8f4d6a6..325ba90 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -476,7 +476,7 @@ remoteDispatchSupportsFeature(struct qemud_server *server ATTRIBUTE_UNUSED, ret->supported = virDrvSupportsFeature(conn, args->feature); - if (ret->supported == -1) { + if (ret->supported < 0) { goto cleanup; } @@ -543,7 +543,7 @@ remoteDispatchGetVersion(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virConnectGetVersion(conn, &hvVer) == -1) { + if (virConnectGetVersion(conn, &hvVer) < 0) { goto cleanup; } @@ -573,7 +573,7 @@ remoteDispatchGetLibVersion(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virConnectGetLibVersion(conn, &libVer) == -1) { + if (virConnectGetLibVersion(conn, &libVer) < 0) { goto cleanup; } @@ -700,7 +700,7 @@ remoteDispatchGetMaxVcpus(struct qemud_server *server ATTRIBUTE_UNUSED, type = args->type ? *args->type : NULL; ret->max_vcpus = virConnectGetMaxVcpus(conn, type); - if (ret->max_vcpus == -1) { + if (ret->max_vcpus < 0) { goto cleanup; } @@ -729,7 +729,7 @@ remoteDispatchNodeGetInfo(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virNodeGetInfo(conn, &info) == -1) { + if (virNodeGetInfo(conn, &info) < 0) { goto cleanup; } @@ -938,7 +938,7 @@ remoteDispatchDomainGetSchedulerParameters(struct qemud_server *server ATTRIBUTE } r = virDomainGetSchedulerParameters(dom, params, &nparams); - if (r == -1) { + if (r < 0) { goto cleanup; } @@ -1051,7 +1051,7 @@ remoteDispatchDomainSetSchedulerParameters(struct qemud_server *server ATTRIBUTE } r = virDomainSetSchedulerParameters(dom, params, nparams); - if (r == -1) { + if (r < 0) { goto cleanup; } @@ -1091,7 +1091,7 @@ remoteDispatchDomainBlockStats(struct qemud_server *server ATTRIBUTE_UNUSED, } path = args->path; - if (virDomainBlockStats(dom, path, &stats, sizeof stats) == -1) { + if (virDomainBlockStats(dom, path, &stats, sizeof stats) < 0) { goto cleanup; } @@ -1136,7 +1136,7 @@ remoteDispatchDomainInterfaceStats(struct qemud_server *server ATTRIBUTE_UNUSED, } path = args->path; - if (virDomainInterfaceStats(dom, path, &stats, sizeof stats) == -1) { + if (virDomainInterfaceStats(dom, path, &stats, sizeof stats) < 0) { goto cleanup; } @@ -1170,7 +1170,7 @@ remoteDispatchDomainMemoryStats(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom = NULL; struct _virDomainMemoryStat *stats; - unsigned int nr_stats, i; + int nr_stats, i; int rv = -1; if (!conn) { @@ -1196,7 +1196,7 @@ remoteDispatchDomainMemoryStats(struct qemud_server *server ATTRIBUTE_UNUSED, } nr_stats = virDomainMemoryStats(dom, stats, args->maxStats, 0); - if (nr_stats == -1) { + if (nr_stats < 0) { goto cleanup; } @@ -1266,7 +1266,7 @@ remoteDispatchDomainBlockPeek(struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainBlockPeek(dom, path, offset, size, - ret->buffer.buffer_val, flags) == -1) { + ret->buffer.buffer_val, flags) < 0) { goto cleanup; } @@ -1323,7 +1323,7 @@ remoteDispatchDomainMemoryPeek(struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainMemoryPeek(dom, offset, size, - ret->buffer.buffer_val, flags) == -1) { + ret->buffer.buffer_val, flags) < 0) { goto cleanup; } if (dom) @@ -1363,7 +1363,7 @@ remoteDispatchDomainAttachDevice(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainAttachDevice(dom, args->xml) == -1) { + if (virDomainAttachDevice(dom, args->xml) < 0) { goto cleanup; } @@ -1399,7 +1399,7 @@ remoteDispatchDomainAttachDeviceFlags(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - if (virDomainAttachDeviceFlags(dom, args->xml, args->flags) == -1) { + if (virDomainAttachDeviceFlags(dom, args->xml, args->flags) < 0) { goto cleanup; } @@ -1435,7 +1435,7 @@ remoteDispatchDomainUpdateDeviceFlags(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - if (virDomainUpdateDeviceFlags(dom, args->xml, args->flags) == -1) { + if (virDomainUpdateDeviceFlags(dom, args->xml, args->flags) < 0) { goto cleanup; } @@ -1471,7 +1471,7 @@ remoteDispatchDomainCreate(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainCreate(dom) == -1) { + if (virDomainCreate(dom) < 0) { goto cleanup; } @@ -1502,7 +1502,7 @@ remoteDispatchDomainCreateWithFlags(struct qemud_server *server ATTRIBUTE_UNUSED goto cleanup; } - if (virDomainCreateWithFlags(dom, args->flags) == -1) { + if (virDomainCreateWithFlags(dom, args->flags) < 0) { goto cleanup; } @@ -1608,7 +1608,7 @@ remoteDispatchDomainDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainDestroy(dom) == -1) { + if (virDomainDestroy(dom) < 0) { goto cleanup; } @@ -1644,7 +1644,7 @@ remoteDispatchDomainDetachDevice(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainDetachDevice(dom, args->xml) == -1) { + if (virDomainDetachDevice(dom, args->xml) < 0) { goto cleanup; } @@ -1680,7 +1680,7 @@ remoteDispatchDomainDetachDeviceFlags(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - if (virDomainDetachDeviceFlags(dom, args->xml, args->flags) == -1) { + if (virDomainDetachDeviceFlags(dom, args->xml, args->flags) < 0) { goto cleanup; } @@ -1819,7 +1819,7 @@ remoteDispatchDomainGetAutostart(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainGetAutostart(dom, &ret->autostart) == -1) { + if (virDomainGetAutostart(dom, &ret->autostart) < 0) { goto cleanup; } @@ -1856,7 +1856,7 @@ remoteDispatchDomainGetInfo(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainGetInfo(dom, &info) == -1) { + if (virDomainGetInfo(dom, &info) < 0) { goto cleanup; } @@ -1936,7 +1936,7 @@ remoteDispatchDomainGetMaxVcpus(struct qemud_server *server ATTRIBUTE_UNUSED, } ret->num = virDomainGetMaxVcpus(dom); - if (ret->num == -1) { + if (ret->num < 0) { goto cleanup; } @@ -1978,7 +1978,7 @@ remoteDispatchDomainGetSecurityLabel(struct qemud_server *server ATTRIBUTE_UNUSE goto cleanup; } - if (virDomainGetSecurityLabel(dom, seclabel) == -1) { + if (virDomainGetSecurityLabel(dom, seclabel) < 0) { goto cleanup; } @@ -2019,7 +2019,7 @@ remoteDispatchNodeGetSecurityModel(struct qemud_server *server ATTRIBUTE_UNUSED, } memset(&secmodel, 0, sizeof secmodel); - if (virNodeGetSecurityModel(conn, &secmodel) == -1) { + if (virNodeGetSecurityModel(conn, &secmodel) < 0) { goto cleanup; } @@ -2127,7 +2127,7 @@ remoteDispatchDomainGetVcpus(struct qemud_server *server ATTRIBUTE_UNUSED, info_len = virDomainGetVcpus(dom, info, args->maxinfo, cpumaps, args->maplen); - if (info_len == -1) { + if (info_len < 0) { goto cleanup; } @@ -2192,7 +2192,7 @@ remoteDispatchDomainGetVcpusFlags(struct qemud_server *server ATTRIBUTE_UNUSED, } ret->num = virDomainGetVcpusFlags(dom, args->flags); - if (ret->num == -1) { + if (ret->num < 0) { goto cleanup; } @@ -2240,7 +2240,7 @@ remoteDispatchDomainMigratePrepare(struct qemud_server *server ATTRIBUTE_UNUSED, r = virDomainMigratePrepare(conn, &cookie, &cookielen, uri_in, uri_out, args->flags, dname, args->resource); - if (r == -1) { + if (r < 0) { goto cleanup; } @@ -2296,7 +2296,7 @@ remoteDispatchDomainMigratePerform(struct qemud_server *server ATTRIBUTE_UNUSED, args->cookie.cookie_len, args->uri, args->flags, dname, args->resource); - if (r == -1) { + if (r < 0) { goto cleanup; } @@ -2382,7 +2382,7 @@ remoteDispatchDomainMigratePrepare2(struct qemud_server *server ATTRIBUTE_UNUSED uri_in, uri_out, args->flags, dname, args->resource, args->dom_xml); - if (r == -1) { + if (r < 0) { goto cleanup; } @@ -2470,7 +2470,7 @@ remoteDispatchDomainMigratePrepareTunnel(struct qemud_server *server ATTRIBUTE_U r = virDomainMigratePrepareTunnel(conn, stream->st, args->flags, dname, args->resource, args->dom_xml); - if (r == -1) { + if (r < 0) { goto cleanup; } @@ -2501,6 +2501,7 @@ remoteDispatchListDefinedDomains(struct qemud_server *server ATTRIBUTE_UNUSED, remote_list_defined_domains_ret *ret) { int rv = -1; + int len; if (!conn) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); @@ -2519,12 +2520,12 @@ remoteDispatchListDefinedDomains(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ret->names.names_len = - virConnectListDefinedDomains(conn, - ret->names.names_val, args->maxnames); - if (ret->names.names_len == -1) { + len = virConnectListDefinedDomains(conn, + ret->names.names_val, args->maxnames); + if (len < 0) { goto cleanup; } + ret->names.names_len = len; rv = 0; @@ -2655,7 +2656,7 @@ remoteDispatchNumOfDefinedDomains(struct qemud_server *server ATTRIBUTE_UNUSED, } ret->num = virConnectNumOfDefinedDomains(conn); - if (ret->num == -1) { + if (ret->num < 0) { goto cleanup; } @@ -2697,7 +2698,7 @@ remoteDispatchDomainPinVcpu(struct qemud_server *server ATTRIBUTE_UNUSED, rv = virDomainPinVcpu(dom, args->vcpu, (unsigned char *) args->cpumap.cpumap_val, args->cpumap.cpumap_len); - if (rv == -1) { + if (rv < 0) { goto cleanup; } @@ -2733,7 +2734,7 @@ remoteDispatchDomainReboot(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainReboot(dom, args->flags) == -1) { + if (virDomainReboot(dom, args->flags) < 0) { goto cleanup; } @@ -2763,7 +2764,7 @@ remoteDispatchDomainRestore(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainRestore(conn, args->from) == -1) { + if (virDomainRestore(conn, args->from) < 0) { goto cleanup; } @@ -2797,7 +2798,7 @@ remoteDispatchDomainResume(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainResume(dom) == -1) { + if (virDomainResume(dom) < 0) { goto cleanup; } @@ -2833,7 +2834,7 @@ remoteDispatchDomainSave(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainSave(dom, args->to) == -1) { + if (virDomainSave(dom, args->to) < 0) { goto cleanup; } @@ -2869,7 +2870,7 @@ remoteDispatchDomainCoreDump(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainCoreDump(dom, args->to, args->flags) == -1) { + if (virDomainCoreDump(dom, args->to, args->flags) < 0) { goto cleanup; } @@ -2905,7 +2906,7 @@ remoteDispatchDomainSetAutostart(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainSetAutostart(dom, args->autostart) == -1) { + if (virDomainSetAutostart(dom, args->autostart) < 0) { goto cleanup; } @@ -2941,7 +2942,7 @@ remoteDispatchDomainSetMaxMemory(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainSetMaxMemory(dom, args->memory) == -1) { + if (virDomainSetMaxMemory(dom, args->memory) < 0) { goto cleanup; } @@ -2977,7 +2978,7 @@ remoteDispatchDomainSetMemory(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainSetMemory(dom, args->memory) == -1) { + if (virDomainSetMemory(dom, args->memory) < 0) { goto cleanup; } @@ -3013,7 +3014,7 @@ remoteDispatchDomainSetMemoryFlags(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainSetMemoryFlags(dom, args->memory, args->flags) == -1) { + if (virDomainSetMemoryFlags(dom, args->memory, args->flags) < 0) { goto cleanup; } @@ -3112,7 +3113,7 @@ remoteDispatchDomainSetMemoryParameters(struct qemud_server *server } r = virDomainSetMemoryParameters(dom, params, nparams, flags); - if (r == -1) { + if (r < 0) { goto cleanup; } @@ -3170,7 +3171,7 @@ remoteDispatchDomainGetMemoryParameters(struct qemud_server *server } r = virDomainGetMemoryParameters(dom, params, &nparams, flags); - if (r == -1) { + if (r < 0) { goto cleanup; } /* In this case, we need to send back the number of parameters @@ -3333,7 +3334,7 @@ remoteDispatchDomainSetBlkioParameters(struct qemud_server *server } r = virDomainSetBlkioParameters(dom, params, nparams, flags); - if (r == -1) { + if (r < 0) { goto cleanup; } @@ -3391,7 +3392,7 @@ remoteDispatchDomainGetBlkioParameters(struct qemud_server *server } r = virDomainGetBlkioParameters(dom, params, &nparams, flags); - if (r == -1) { + if (r < 0) { goto cleanup; } /* In this case, we need to send back the number of parameters @@ -3493,7 +3494,7 @@ remoteDispatchDomainSetVcpus(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainSetVcpus(dom, args->nvcpus) == -1) { + if (virDomainSetVcpus(dom, args->nvcpus) < 0) { goto cleanup; } @@ -3529,7 +3530,7 @@ remoteDispatchDomainSetVcpusFlags(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainSetVcpusFlags(dom, args->nvcpus, args->flags) == -1) { + if (virDomainSetVcpusFlags(dom, args->nvcpus, args->flags) < 0) { goto cleanup; } @@ -3565,7 +3566,7 @@ remoteDispatchDomainShutdown(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainShutdown(dom) == -1) { + if (virDomainShutdown(dom) < 0) { goto cleanup; } @@ -3601,7 +3602,7 @@ remoteDispatchDomainSuspend(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainSuspend(dom) == -1) { + if (virDomainSuspend(dom) < 0) { goto cleanup; } @@ -3637,7 +3638,7 @@ remoteDispatchDomainUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainUndefine(dom) == -1) { + if (virDomainUndefine(dom) < 0) { goto cleanup; } @@ -3661,6 +3662,7 @@ remoteDispatchListDefinedNetworks(struct qemud_server *server ATTRIBUTE_UNUSED, remote_list_defined_networks_ret *ret) { int rv = -1; + int len; if (!conn) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); @@ -3679,12 +3681,12 @@ remoteDispatchListDefinedNetworks(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ret->names.names_len = - virConnectListDefinedNetworks(conn, + len = virConnectListDefinedNetworks(conn, ret->names.names_val, args->maxnames); - if (ret->names.names_len == -1) { + if (len < 0) { goto cleanup; } + ret->names.names_len = len; rv = 0; @@ -3706,6 +3708,7 @@ remoteDispatchListDomains(struct qemud_server *server ATTRIBUTE_UNUSED, remote_list_domains_ret *ret) { int rv = -1; + int len; if (!conn) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); @@ -3724,11 +3727,12 @@ remoteDispatchListDomains(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ret->ids.ids_len = virConnectListDomains(conn, - ret->ids.ids_val, args->maxids); - if (ret->ids.ids_len == -1) { + len = virConnectListDomains(conn, + ret->ids.ids_val, args->maxids); + if (len < 0) { goto cleanup; } + ret->ids.ids_len = len; rv = 0; @@ -3762,7 +3766,7 @@ remoteDispatchDomainManagedSave(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainManagedSave(dom, args->flags) == -1) { + if (virDomainManagedSave(dom, args->flags) < 0) { goto cleanup; } @@ -3799,7 +3803,7 @@ remoteDispatchDomainHasManagedSaveImage(struct qemud_server *server ATTRIBUTE_UN } ret->ret = virDomainHasManagedSaveImage(dom, args->flags); - if (ret->ret == -1) { + if (ret->ret < 0) { goto cleanup; } @@ -3835,7 +3839,7 @@ remoteDispatchDomainManagedSaveRemove(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - if (virDomainManagedSaveRemove(dom, args->flags) == -1) { + if (virDomainManagedSaveRemove(dom, args->flags) < 0) { goto cleanup; } @@ -3859,6 +3863,7 @@ remoteDispatchListNetworks(struct qemud_server *server ATTRIBUTE_UNUSED, remote_list_networks_ret *ret) { int rv = -1; + int len; if (!conn) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); @@ -3877,12 +3882,12 @@ remoteDispatchListNetworks(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ret->names.names_len = - virConnectListNetworks(conn, - ret->names.names_val, args->maxnames); - if (ret->names.names_len == -1) { + len = virConnectListNetworks(conn, + ret->names.names_val, args->maxnames); + if (len < 0) { goto cleanup; } + ret->names.names_len = len; rv = 0; @@ -3916,7 +3921,7 @@ remoteDispatchNetworkCreate(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virNetworkCreate(net) == -1) { + if (virNetworkCreate(net) < 0) { goto cleanup; } @@ -4020,7 +4025,7 @@ remoteDispatchNetworkDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virNetworkDestroy(net) == -1) { + if (virNetworkDestroy(net) < 0) { goto cleanup; } @@ -4094,7 +4099,7 @@ remoteDispatchNetworkGetAutostart(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virNetworkGetAutostart(net, &ret->autostart) == -1) { + if (virNetworkGetAutostart(net, &ret->autostart) < 0) { goto cleanup; } @@ -4236,7 +4241,7 @@ remoteDispatchNetworkSetAutostart(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virNetworkSetAutostart(net, args->autostart) == -1) { + if (virNetworkSetAutostart(net, args->autostart) < 0) { goto cleanup; } @@ -4272,7 +4277,7 @@ remoteDispatchNetworkUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virNetworkUndefine(net) == -1) { + if (virNetworkUndefine(net) < 0) { goto cleanup; } @@ -4296,16 +4301,18 @@ remoteDispatchNumOfDefinedNetworks(struct qemud_server *server ATTRIBUTE_UNUSED, remote_num_of_defined_networks_ret *ret) { int rv = -1; + int len; if (!conn) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); goto cleanup; } - ret->num = virConnectNumOfDefinedNetworks(conn); - if (ret->num == -1) { + len = virConnectNumOfDefinedNetworks(conn); + if (len < 0) { goto cleanup; } + ret->num = len; rv = 0; @@ -4332,7 +4339,7 @@ remoteDispatchNumOfDomains(struct qemud_server *server ATTRIBUTE_UNUSED, } ret->num = virConnectNumOfDomains(conn); - if (ret->num == -1) { + if (ret->num < 0) { goto cleanup; } @@ -4361,7 +4368,7 @@ remoteDispatchNumOfNetworks(struct qemud_server *server ATTRIBUTE_UNUSED, } ret->num = virConnectNumOfNetworks(conn); - if (ret->num == -1) { + if (ret->num < 0) { goto cleanup; } @@ -4392,7 +4399,7 @@ remoteDispatchNumOfInterfaces(struct qemud_server *server ATTRIBUTE_UNUSED, } ret->num = virConnectNumOfInterfaces(conn); - if (ret->num == -1) { + if (ret->num < 0) { goto cleanup; } @@ -4414,6 +4421,7 @@ remoteDispatchListInterfaces(struct qemud_server *server ATTRIBUTE_UNUSED, remote_list_interfaces_ret *ret) { int rv = -1; + int len; if (!conn) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); @@ -4432,12 +4440,12 @@ remoteDispatchListInterfaces(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ret->names.names_len = - virConnectListInterfaces(conn, - ret->names.names_val, args->maxnames); - if (ret->names.names_len == -1) { + len = virConnectListInterfaces(conn, + ret->names.names_val, args->maxnames); + if (len < 0) { goto cleanup; } + ret->names.names_len = len; rv = 0; @@ -4459,16 +4467,18 @@ remoteDispatchNumOfDefinedInterfaces(struct qemud_server *server ATTRIBUTE_UNUSE remote_num_of_defined_interfaces_ret *ret) { int rv = -1; + int len; if (!conn) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); goto cleanup; } - ret->num = virConnectNumOfDefinedInterfaces(conn); - if (ret->num == -1) { + len = virConnectNumOfDefinedInterfaces(conn); + if (len < 0) { goto cleanup; } + ret->num = len; rv = 0; @@ -4488,6 +4498,7 @@ remoteDispatchListDefinedInterfaces(struct qemud_server *server ATTRIBUTE_UNUSED remote_list_defined_interfaces_ret *ret) { int rv = -1; + int len; if (!conn) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); @@ -4506,12 +4517,12 @@ remoteDispatchListDefinedInterfaces(struct qemud_server *server ATTRIBUTE_UNUSED goto cleanup; } - ret->names.names_len = - virConnectListDefinedInterfaces(conn, - ret->names.names_val, args->maxnames); - if (ret->names.names_len == -1) { + len = virConnectListDefinedInterfaces(conn, + ret->names.names_val, args->maxnames); + if (len < 0) { goto cleanup; } + ret->names.names_len = len; rv = 0; @@ -4685,7 +4696,7 @@ remoteDispatchInterfaceUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virInterfaceUndefine(iface) == -1) { + if (virInterfaceUndefine(iface) < 0) { goto cleanup; } @@ -4721,7 +4732,7 @@ remoteDispatchInterfaceCreate(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virInterfaceCreate(iface, args->flags) == -1) { + if (virInterfaceCreate(iface, args->flags) < 0) { goto cleanup; } @@ -4757,7 +4768,7 @@ remoteDispatchInterfaceDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virInterfaceDestroy(iface, args->flags) == -1) { + if (virInterfaceDestroy(iface, args->flags) < 0) { goto cleanup; } @@ -5585,6 +5596,7 @@ remoteDispatchListDefinedStoragePools(struct qemud_server *server ATTRIBUTE_UNUS remote_list_defined_storage_pools_ret *ret) { int rv = -1; + int len; if (!conn) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); @@ -5603,12 +5615,12 @@ remoteDispatchListDefinedStoragePools(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - ret->names.names_len = - virConnectListDefinedStoragePools(conn, - ret->names.names_val, args->maxnames); - if (ret->names.names_len == -1) { + len = virConnectListDefinedStoragePools(conn, + ret->names.names_val, args->maxnames); + if (len < 0) { goto cleanup; } + ret->names.names_len = len; rv = 0; @@ -5630,6 +5642,7 @@ remoteDispatchListStoragePools(struct qemud_server *server ATTRIBUTE_UNUSED, remote_list_storage_pools_ret *ret) { int rv = -1; + int len; if (!conn) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); @@ -5648,12 +5661,12 @@ remoteDispatchListStoragePools(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ret->names.names_len = - virConnectListStoragePools(conn, - ret->names.names_val, args->maxnames); - if (ret->names.names_len == -1) { + len = virConnectListStoragePools(conn, + ret->names.names_val, args->maxnames); + if (len < 0) { goto cleanup; } + ret->names.names_len = len; rv = 0; @@ -5721,7 +5734,7 @@ remoteDispatchStoragePoolCreate(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virStoragePoolCreate(pool, args->flags) == -1) { + if (virStoragePoolCreate(pool, args->flags) < 0) { goto cleanup; } @@ -5825,7 +5838,7 @@ remoteDispatchStoragePoolBuild(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virStoragePoolBuild(pool, args->flags) == -1) { + if (virStoragePoolBuild(pool, args->flags) < 0) { goto cleanup; } @@ -5862,7 +5875,7 @@ remoteDispatchStoragePoolDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virStoragePoolDestroy(pool) == -1) { + if (virStoragePoolDestroy(pool) < 0) { goto cleanup; } @@ -5898,7 +5911,7 @@ remoteDispatchStoragePoolDelete(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virStoragePoolDelete(pool, args->flags) == -1) { + if (virStoragePoolDelete(pool, args->flags) < 0) { goto cleanup; } @@ -5934,7 +5947,7 @@ remoteDispatchStoragePoolRefresh(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virStoragePoolRefresh(pool, args->flags) == -1) { + if (virStoragePoolRefresh(pool, args->flags) < 0) { goto cleanup; } @@ -5971,7 +5984,7 @@ remoteDispatchStoragePoolGetInfo(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virStoragePoolGetInfo(pool, &info) == -1) { + if (virStoragePoolGetInfo(pool, &info) < 0) { goto cleanup; } @@ -6050,7 +6063,7 @@ remoteDispatchStoragePoolGetAutostart(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - if (virStoragePoolGetAutostart(pool, &ret->autostart) == -1) { + if (virStoragePoolGetAutostart(pool, &ret->autostart) < 0) { goto cleanup; } @@ -6197,7 +6210,7 @@ remoteDispatchStoragePoolSetAutostart(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - if (virStoragePoolSetAutostart(pool, args->autostart) == -1) { + if (virStoragePoolSetAutostart(pool, args->autostart) < 0) { goto cleanup; } @@ -6233,7 +6246,7 @@ remoteDispatchStoragePoolUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virStoragePoolUndefine(pool) == -1) { + if (virStoragePoolUndefine(pool) < 0) { goto cleanup; } @@ -6264,7 +6277,7 @@ remoteDispatchNumOfStoragePools(struct qemud_server *server ATTRIBUTE_UNUSED, } ret->num = virConnectNumOfStoragePools(conn); - if (ret->num == -1) { + if (ret->num < 0) { goto cleanup; } @@ -6293,7 +6306,7 @@ remoteDispatchNumOfDefinedStoragePools(struct qemud_server *server ATTRIBUTE_UNU } ret->num = virConnectNumOfDefinedStoragePools(conn); - if (ret->num == -1) { + if (ret->num < 0) { goto cleanup; } @@ -6316,6 +6329,7 @@ remoteDispatchStoragePoolListVolumes(struct qemud_server *server ATTRIBUTE_UNUSE { virStoragePoolPtr pool = NULL; int rv = -1; + int len; if (!conn) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); @@ -6339,12 +6353,12 @@ remoteDispatchStoragePoolListVolumes(struct qemud_server *server ATTRIBUTE_UNUSE goto cleanup; } - ret->names.names_len = - virStoragePoolListVolumes(pool, - ret->names.names_val, args->maxnames); - if (ret->names.names_len == -1) { + len = virStoragePoolListVolumes(pool, + ret->names.names_val, args->maxnames); + if (len < 0) { goto cleanup; } + ret->names.names_len = len; rv = 0; @@ -6382,7 +6396,7 @@ remoteDispatchStoragePoolNumOfVolumes(struct qemud_server *server ATTRIBUTE_UNUS } ret->num = virStoragePoolNumOfVolumes(pool); - if (ret->num == -1) { + if (ret->num < 0) { goto cleanup; } @@ -6516,7 +6530,7 @@ remoteDispatchStorageVolDelete(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virStorageVolDelete(vol, args->flags) == -1) { + if (virStorageVolDelete(vol, args->flags) < 0) { goto cleanup; } @@ -6552,7 +6566,7 @@ remoteDispatchStorageVolWipe(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virStorageVolWipe(vol, args->flags) == -1) { + if (virStorageVolWipe(vol, args->flags) < 0) { goto cleanup; } @@ -6589,7 +6603,7 @@ remoteDispatchStorageVolGetInfo(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virStorageVolGetInfo(vol, &info) == -1) { + if (virStorageVolGetInfo(vol, &info) < 0) { goto cleanup; } @@ -6820,7 +6834,7 @@ remoteDispatchNodeNumOfDevices(struct qemud_server *server ATTRIBUTE_UNUSED, ret->num = virNodeNumOfDevices(conn, args->cap ? *args->cap : NULL, args->flags); - if (ret->num == -1) { + if (ret->num < 0) { goto cleanup; } @@ -6843,6 +6857,7 @@ remoteDispatchNodeListDevices(struct qemud_server *server ATTRIBUTE_UNUSED, remote_node_list_devices_ret *ret) { int rv = -1; + int len; if (!conn) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); @@ -6861,13 +6876,13 @@ remoteDispatchNodeListDevices(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ret->names.names_len = - virNodeListDevices(conn, - args->cap ? *args->cap : NULL, - ret->names.names_val, args->maxnames, args->flags); - if (ret->names.names_len == -1) { + len = virNodeListDevices(conn, + args->cap ? *args->cap : NULL, + ret->names.names_val, args->maxnames, args->flags); + if (len < 0) { goto cleanup; } + ret->names.names_len = len; rv = 0; @@ -7056,6 +7071,7 @@ remoteDispatchNodeDeviceListCaps(struct qemud_server *server ATTRIBUTE_UNUSED, { virNodeDevicePtr dev = NULL; int rv = -1; + int len; if (!conn) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); @@ -7079,12 +7095,12 @@ remoteDispatchNodeDeviceListCaps(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ret->names.names_len = - virNodeDeviceListCaps(dev, ret->names.names_val, - args->maxnames); - if (ret->names.names_len == -1) { + len = virNodeDeviceListCaps(dev, ret->names.names_val, + args->maxnames); + if (len < 0) { goto cleanup; } + ret->names.names_len = len; rv = 0; @@ -7121,7 +7137,7 @@ remoteDispatchNodeDeviceDettach(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virNodeDeviceDettach(dev) == -1) { + if (virNodeDeviceDettach(dev) < 0) { goto cleanup; } @@ -7158,7 +7174,7 @@ remoteDispatchNodeDeviceReAttach(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virNodeDeviceReAttach(dev) == -1) { + if (virNodeDeviceReAttach(dev) < 0) { goto cleanup; } @@ -7195,7 +7211,7 @@ remoteDispatchNodeDeviceReset(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virNodeDeviceReset(dev) == -1) { + if (virNodeDeviceReset(dev) < 0) { goto cleanup; } @@ -7267,7 +7283,7 @@ remoteDispatchNodeDeviceDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virNodeDeviceDestroy(dev) == -1) { + if (virNodeDeviceDestroy(dev) < 0) { goto cleanup; } @@ -7443,7 +7459,7 @@ remoteDispatchDomainEventsDeregister(struct qemud_server *server ATTRIBUTE_UNUSE goto cleanup; } - if (client->domainEventCallbackID[VIR_DOMAIN_EVENT_ID_LIFECYCLE] == -1) { + if (client->domainEventCallbackID[VIR_DOMAIN_EVENT_ID_LIFECYCLE] < 0) { virNetError(VIR_ERR_INTERNAL_ERROR, _("domain event %d not registered"), VIR_DOMAIN_EVENT_ID_LIFECYCLE); goto cleanup; } @@ -7543,7 +7559,7 @@ remoteDispatchNumOfSecrets(struct qemud_server *server ATTRIBUTE_UNUSED, } ret->num = virConnectNumOfSecrets(conn); - if (ret->num == -1) { + if (ret->num < 0) { goto cleanup; } @@ -7565,6 +7581,7 @@ remoteDispatchListSecrets(struct qemud_server *server ATTRIBUTE_UNUSED, remote_list_secrets_ret *ret) { int rv = -1; + int len; if (!conn) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); @@ -7582,11 +7599,12 @@ remoteDispatchListSecrets(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ret->uuids.uuids_len = virConnectListSecrets(conn, ret->uuids.uuids_val, - args->maxuuids); - if (ret->uuids.uuids_len == -1) { + len = virConnectListSecrets(conn, ret->uuids.uuids_val, + args->maxuuids); + if (len < 0) { goto cleanup; } + ret->uuids.uuids_len = len; rv = 0; @@ -8267,7 +8285,7 @@ remoteDispatchDomainGetJobInfo(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainGetJobInfo(dom, &info) == -1) { + if (virDomainGetJobInfo(dom, &info) < 0) { goto cleanup; } @@ -8317,7 +8335,7 @@ remoteDispatchDomainAbortJob(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainAbortJob(dom) == -1) { + if (virDomainAbortJob(dom) < 0) { goto cleanup; } @@ -8354,7 +8372,7 @@ remoteDispatchDomainMigrateSetMaxDowntime(struct qemud_server *server ATTRIBUTE_ goto cleanup; } - if (virDomainMigrateSetMaxDowntime(dom, args->downtime, args->flags) == -1) { + if (virDomainMigrateSetMaxDowntime(dom, args->downtime, args->flags) < 0) { goto cleanup; } @@ -8390,7 +8408,7 @@ remoteDispatchDomainMigrateSetMaxSpeed(struct qemud_server *server ATTRIBUTE_UNU goto cleanup; } - if (virDomainMigrateSetMaxSpeed(dom, args->bandwidth, args->flags) == -1) { + if (virDomainMigrateSetMaxSpeed(dom, args->bandwidth, args->flags) < 0) { goto cleanup; } @@ -8512,7 +8530,7 @@ remoteDispatchDomainSnapshotNum(struct qemud_server *server ATTRIBUTE_UNUSED, } ret->num = virDomainSnapshotNum(domain, args->flags); - if (ret->num == -1) { + if (ret->num < 0) { goto cleanup; } @@ -8537,6 +8555,7 @@ remoteDispatchDomainSnapshotListNames(struct qemud_server *server ATTRIBUTE_UNUS { virDomainPtr domain = NULL; int rv = -1; + int len; if (!conn) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); @@ -8560,13 +8579,14 @@ remoteDispatchDomainSnapshotListNames(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - ret->names.names_len = virDomainSnapshotListNames(domain, - ret->names.names_val, - args->nameslen, - args->flags); - if (ret->names.names_len == -1) { + len = virDomainSnapshotListNames(domain, + ret->names.names_val, + args->nameslen, + args->flags); + if (len < 0) { goto cleanup; } + ret->names.names_len = len; rv = 0; @@ -8730,7 +8750,7 @@ remoteDispatchDomainRevertToSnapshot(struct qemud_server *server ATTRIBUTE_UNUSE if (snapshot == NULL) goto cleanup; - if (virDomainRevertToSnapshot(snapshot, args->flags) == -1) + if (virDomainRevertToSnapshot(snapshot, args->flags) < 0) goto cleanup; rv = 0; @@ -8771,7 +8791,7 @@ remoteDispatchDomainSnapshotDelete(struct qemud_server *server ATTRIBUTE_UNUSED, if (snapshot == NULL) goto cleanup; - if (virDomainSnapshotDelete(snapshot, args->flags) == -1) + if (virDomainSnapshotDelete(snapshot, args->flags) < 0) goto cleanup; rv = 0; @@ -9004,7 +9024,7 @@ remoteDispatchNwfilterUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virNWFilterUndefine(nwfilter) == -1) { + if (virNWFilterUndefine(nwfilter) < 0) { goto cleanup; } @@ -9028,6 +9048,7 @@ remoteDispatchListNwfilters(struct qemud_server *server ATTRIBUTE_UNUSED, remote_list_nwfilters_ret *ret) { int rv = -1; + int len; if (!conn) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); @@ -9046,12 +9067,12 @@ remoteDispatchListNwfilters(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ret->names.names_len = - virConnectListNWFilters(conn, - ret->names.names_val, args->maxnames); - if (ret->names.names_len == -1) { + len = virConnectListNWFilters(conn, + ret->names.names_val, args->maxnames); + if (len < 0) { goto cleanup; } + ret->names.names_len = len; rv = 0; @@ -9120,7 +9141,7 @@ remoteDispatchNumOfNwfilters(struct qemud_server *server ATTRIBUTE_UNUSED, } ret->num = virConnectNumOfNWFilters(conn); - if (ret->num == -1) { + if (ret->num < 0) { goto cleanup; } @@ -9156,7 +9177,7 @@ remoteDispatchDomainGetBlockInfo(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainGetBlockInfo(dom, args->path, &info, args->flags) == -1) { + if (virDomainGetBlockInfo(dom, args->path, &info, args->flags) < 0) { goto cleanup; } @@ -9197,7 +9218,7 @@ qemuDispatchMonitorCommand(struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainQemuMonitorCommand(domain, args->cmd, &ret->result, - args->flags) == -1) { + args->flags) < 0) { goto cleanup; } @@ -9246,7 +9267,7 @@ remoteDispatchDomainOpenConsole(struct qemud_server *server ATTRIBUTE_UNUSED, args->devname ? *args->devname : NULL, stream->st, args->flags); - if (r == -1) { + if (r < 0) { goto cleanup; } -- 1.7.4.2

2 2

[libvirt] [libvirt-php 1/2] Add CFLAGS for compiler
by Lyre 14 Apr '11

14 Apr '11

The defualt CFLAGS is `-g -Wall'. We can change it with ./configure CFLAGS="your option". The `-g' options also make it able to build debugsource & debuginfo packages. --- src/Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 76ebee6..6fab5f0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,8 +8,8 @@ EXTRA_DIST = libvirt-php.c libvirt-php.h all-am: build clean-temp build: - $(CC) -Wall -fpic -DCOMPILE_DL_LIBVIRT=1 $(PHPINC) -c -o $(PACKAGE).o libvirt-php.c $(LIBXML_CFLAGS) $(DEFINES) - $(CC) -Wall -shared $(LIBS) -rdynamic -o $(PACKAGE).so $(PACKAGE).o -ldl -lvirt $(LIBXML_LIBS) + $(CC) $(CFLAGS) -fpic -DCOMPILE_DL_LIBVIRT=1 $(PHPINC) -c -o $(PACKAGE).o libvirt-php.c $(LIBXML_CFLAGS) $(DEFINES) + $(CC) $(CFLAGS) -shared $(LIBS) -rdynamic -o $(PACKAGE).so $(PACKAGE).o -ldl -lvirt $(LIBXML_LIBS) $(ECHO) "Extension compiled as $(PACKAGE).so" install-exec-local: -- 1.7.3.4

2 3

[libvirt] [PATCH] Introduce virDomainChrDefNew()
by Michal Novotny 14 Apr '11

14 Apr '11

Hi, this is the commit to introduce the function to create new character device definition for the domain as advices by Cole Robinson <crobinso(a)redhat.com>. The function is used on the relevant places and the make, make check and make syntax-check all passed. Michal Signed-off-by: Michal Novotny <minovotn(a)redhat.com> Signed-off-by: Michal Novotny <mignov(a)gmail.com> --- src/conf/domain_conf.c | 20 +++++++++++++++++--- src/conf/domain_conf.h | 2 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 3 ++- src/xenxs/xen_xm.c | 3 ++- 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 90a1317..a80719c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3212,6 +3212,22 @@ error: goto cleanup; } +/* Create a new character device definition and set + * default port. + */ +virDomainChrDefPtr +virDomainChrDefNew(void) { + virDomainChrDefPtr def = NULL; + + if (VIR_ALLOC(def) < 0) { + virReportOOMError(); + return NULL; + } + + def->target.port = -1; + return def; +} + /* Parse the XML definition for a character device * @param node XML nodeset to parse for net definition * @@ -3260,10 +3276,8 @@ virDomainChrDefParseXML(virCapsPtr caps, virDomainChrDefPtr def; int remaining; - if (VIR_ALLOC(def) < 0) { - virReportOOMError(); + if (!(def = virDomainChrDefNew())) return NULL; - } type = virXMLPropString(node, "type"); if (type == NULL) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 95bd11e..ecf44ca 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1229,6 +1229,8 @@ void virDomainObjRef(virDomainObjPtr vm); /* Returns 1 if the object was freed, 0 if more refs exist */ int virDomainObjUnref(virDomainObjPtr vm) ATTRIBUTE_RETURN_CHECK; +virDomainChrDefPtr virDomainChrDefNew(void); + /* live == true means def describes an active domain (being migrated or * restored) as opposed to a new persistent configuration of the domain */ virDomainObjPtr virDomainAssignDef(virCapsPtr caps, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 54e4482..c13e416 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -333,6 +333,7 @@ virDomainWatchdogActionTypeFromString; virDomainWatchdogActionTypeToString; virDomainWatchdogModelTypeFromString; virDomainWatchdogModelTypeToString; +virDomainChrDefNew; # domain_event.h diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fea0068..d258712 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -36,6 +36,7 @@ #include "c-ctype.h" #include "domain_nwfilter.h" #include "qemu_audit.h" +#include "domain_conf.h" #include <sys/utsname.h> #include <sys/stat.h> @@ -5315,7 +5316,7 @@ qemuParseCommandLineChr(const char *val) { virDomainChrDefPtr def; - if (VIR_ALLOC(def) < 0) + if (!(def = virDomainChrDefNew())) goto no_memory; if (STREQ(val, "null")) { diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index 22ad788..0b47f1f 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -36,6 +36,7 @@ #include "xenxs_private.h" #include "xen_xm.h" #include "xen_sxpr.h" +#include "domain_conf.h" /* Convenience method to grab a int from the config file object */ static int xenXMConfigGetBool(virConfPtr conf, @@ -981,7 +982,7 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, continue; } - if (VIR_ALLOC(chr) < 0) + if (!(chr = virDomainChrDefNew())) goto no_memory; if (!(chr = xenParseSxprChar(port, NULL))) goto cleanup; -- 1.7.3.2

3 4

[libvirt] [PATCH V2] check whether domain is active after qemuDomainObjExitMonitor* returns
by Wen Congyang 14 Apr '11

14 Apr '11

qemu may quited unexpectedly when invoking a monitor command. And priv->mon will be NULL after qemuDomainObjExitMonitor* returns. So we must not use it. Unfortunately we still use it, and it will cause libvirtd crashed. As Eric suggested, qemuDomainObjExitMonitor* should be made to return the value of vm active after regaining lock, and marked ATTRIBUTE_RETURN_CHECK, to force all other callers to detect the case of a monitor command completing successfully but then the VM disappearing in the window between command completion and regaining the vm lock. --- src/qemu/qemu_domain.c | 28 +++++++- src/qemu/qemu_domain.h | 6 +- src/qemu/qemu_driver.c | 51 ++++++++------ src/qemu/qemu_hotplug.c | 177 ++++++++++++++++++++++----------------------- src/qemu/qemu_migration.c | 73 +++++++++++-------- src/qemu/qemu_process.c | 38 ++++++---- 6 files changed, 212 insertions(+), 161 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a947b4e..44ad6a3 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -580,7 +580,7 @@ void qemuDomainObjEnterMonitor(virDomainObjPtr obj) * * Should be paired with an earlier qemuDomainObjEnterMonitor() call */ -void qemuDomainObjExitMonitor(virDomainObjPtr obj) +int qemuDomainObjExitMonitor(virDomainObjPtr obj) { qemuDomainObjPrivatePtr priv = obj->privateData; int refs; @@ -590,11 +590,22 @@ void qemuDomainObjExitMonitor(virDomainObjPtr obj) if (refs > 0) qemuMonitorUnlock(priv->mon); + /* Note: qemu may quited unexpectedly here, and the monitor will be freed. + * If it happened, priv->mon will be null. + */ + virDomainObjLock(obj); if (refs == 0) { priv->mon = NULL; } + + if (priv->mon == NULL) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("guest unexpectedly quit")); + return -1; + } else + return 0; } @@ -623,8 +634,8 @@ void qemuDomainObjEnterMonitorWithDriver(struct qemud_driver *driver, * * Should be paired with an earlier qemuDomainObjEnterMonitorWithDriver() call */ -void qemuDomainObjExitMonitorWithDriver(struct qemud_driver *driver, - virDomainObjPtr obj) +int qemuDomainObjExitMonitorWithDriver(struct qemud_driver *driver, + virDomainObjPtr obj) { qemuDomainObjPrivatePtr priv = obj->privateData; int refs; @@ -634,12 +645,23 @@ void qemuDomainObjExitMonitorWithDriver(struct qemud_driver *driver, if (refs > 0) qemuMonitorUnlock(priv->mon); + /* Note: qemu may quited unexpectedly here, and the monitor will be freed. + * If it happened, priv->mon will be null. + */ + qemuDriverLock(driver); virDomainObjLock(obj); if (refs == 0) { priv->mon = NULL; } + + if (priv->mon == NULL) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("guest unexpectedly quit")); + return -1; + } else + return 0; } void qemuDomainObjEnterRemoteWithDriver(struct qemud_driver *driver, diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 8258900..92fccda 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -99,11 +99,11 @@ int qemuDomainObjBeginJobWithDriver(struct qemud_driver *driver, virDomainObjPtr obj) ATTRIBUTE_RETURN_CHECK; int qemuDomainObjEndJob(virDomainObjPtr obj) ATTRIBUTE_RETURN_CHECK; void qemuDomainObjEnterMonitor(virDomainObjPtr obj); -void qemuDomainObjExitMonitor(virDomainObjPtr obj); +int qemuDomainObjExitMonitor(virDomainObjPtr obj) ATTRIBUTE_RETURN_CHECK; void qemuDomainObjEnterMonitorWithDriver(struct qemud_driver *driver, virDomainObjPtr obj); -void qemuDomainObjExitMonitorWithDriver(struct qemud_driver *driver, - virDomainObjPtr obj); +int qemuDomainObjExitMonitorWithDriver(struct qemud_driver *driver, + virDomainObjPtr obj) ATTRIBUTE_RETURN_CHECK; void qemuDomainObjEnterRemoteWithDriver(struct qemud_driver *driver, virDomainObjPtr obj); void qemuDomainObjExitRemoteWithDriver(struct qemud_driver *driver, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 04a5f65..cb9f3fa 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1452,7 +1452,8 @@ static int qemudDomainShutdown(virDomainPtr dom) { priv = vm->privateData; qemuDomainObjEnterMonitor(vm); ret = qemuMonitorSystemPowerdown(priv->mon); - qemuDomainObjExitMonitor(vm); + if (qemuDomainObjExitMonitor(vm) < 0) + ret = -1; endjob: if (qemuDomainObjEndJob(vm) == 0) @@ -1659,7 +1660,8 @@ static int qemudDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, priv = vm->privateData; qemuDomainObjEnterMonitor(vm); r = qemuMonitorSetBalloon(priv->mon, newmem); - qemuDomainObjExitMonitor(vm); + if (qemuDomainObjExitMonitor(vm) < 0) + r = -1; qemuAuditMemory(vm, vm->def->mem.cur_balloon, newmem, "update", r == 1); if (r < 0) @@ -1749,7 +1751,8 @@ static int qemudDomainGetInfo(virDomainPtr dom, else { qemuDomainObjEnterMonitor(vm); err = qemuMonitorGetBalloonInfo(priv->mon, &balloon); - qemuDomainObjExitMonitor(vm); + if (qemuDomainObjExitMonitor(vm) < 0) + err = -1; } if (qemuDomainObjEndJob(vm) == 0) { vm = NULL; @@ -2524,7 +2527,8 @@ static int qemudDomainHotplugVcpus(virDomainObjPtr vm, unsigned int nvcpus) ret = 0; cleanup: - qemuDomainObjExitMonitor(vm); + if (qemuDomainObjExitMonitor(vm) < 0) + ret = -1; vm->def->vcpus = vcpus; qemuAuditVcpu(vm, oldvcpus, nvcpus, "update", rc == 1); return ret; @@ -3295,7 +3299,8 @@ static char *qemudDomainDumpXML(virDomainPtr dom, qemuDomainObjEnterMonitorWithDriver(driver, vm); err = qemuMonitorGetBalloonInfo(priv->mon, &balloon); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + err = -1; if (qemuDomainObjEndJob(vm) == 0) { vm = NULL; goto cleanup; @@ -4843,7 +4848,8 @@ qemudDomainBlockStats (virDomainPtr dom, &stats->wr_req, &stats->wr_bytes, &stats->errs); - qemuDomainObjExitMonitor(vm); + if (qemuDomainObjExitMonitor(vm) < 0) + ret = -1; endjob: if (qemuDomainObjEndJob(vm) == 0) @@ -4944,7 +4950,8 @@ qemudDomainMemoryStats (virDomainPtr dom, qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjEnterMonitor(vm); ret = qemuMonitorGetMemoryStats(priv->mon, stats, nr_stats); - qemuDomainObjExitMonitor(vm); + if (qemuDomainObjExitMonitor(vm) < 0) + ret = -1; } else { qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); @@ -5085,17 +5092,15 @@ qemudDomainMemoryPeek (virDomainPtr dom, priv = vm->privateData; qemuDomainObjEnterMonitor(vm); if (flags == VIR_MEMORY_VIRTUAL) { - if (qemuMonitorSaveVirtualMemory(priv->mon, offset, size, tmp) < 0) { - qemuDomainObjExitMonitor(vm); - goto endjob; - } + ret = qemuMonitorSaveVirtualMemory(priv->mon, offset, size, tmp); } else { - if (qemuMonitorSavePhysicalMemory(priv->mon, offset, size, tmp) < 0) { - qemuDomainObjExitMonitor(vm); - goto endjob; - } + ret = qemuMonitorSavePhysicalMemory(priv->mon, offset, size, tmp); } - qemuDomainObjExitMonitor(vm); + if (qemuDomainObjExitMonitor(vm) < 0) + ret = -1; + + if (ret < -1) + goto endjob; /* Read the memory file into buffer. */ if (saferead (fd, buffer, size) == (ssize_t) -1) { @@ -5259,7 +5264,8 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom, ret = qemuMonitorGetBlockExtent(priv->mon, disk->info.alias, &info->allocation); - qemuDomainObjExitMonitor(vm); + if (qemuDomainObjExitMonitor(vm) < 0) + ret = -1; } if (qemuDomainObjEndJob(vm) == 0) @@ -6101,7 +6107,8 @@ qemuDomainSnapshotCreateActive(virConnectPtr conn, qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorCreateSnapshot(priv->mon, snap->def->name); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; cleanup: if (resume && virDomainObjIsActive(vm) && @@ -6434,7 +6441,8 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, priv = vm->privateData; qemuDomainObjEnterMonitorWithDriver(driver, vm); rc = qemuMonitorLoadSnapshot(priv->mon, snap->def->name); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + rc = -1; if (rc < 0) goto endjob; } @@ -6557,7 +6565,7 @@ static int qemuDomainSnapshotDiscard(struct qemud_driver *driver, qemuDomainObjEnterMonitorWithDriver(driver, vm); /* we continue on even in the face of error */ qemuMonitorDeleteSnapshot(priv->mon, snap->def->name); - qemuDomainObjExitMonitorWithDriver(driver, vm); + ignore_value(qemuDomainObjExitMonitorWithDriver(driver, vm)); } if (snap == vm->current_snapshot) { @@ -6770,7 +6778,8 @@ static int qemuDomainMonitorCommand(virDomainPtr domain, const char *cmd, goto cleanup; qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorArbitraryCommand(priv->mon, cmd, result, hmp); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; if (qemuDomainObjEndJob(vm) == 0) { vm = NULL; goto cleanup; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index b03f774..1ecac80 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -106,7 +106,8 @@ int qemuDomainChangeEjectableMedia(struct qemud_driver *driver, } else { ret = qemuMonitorEjectMedia(priv->mon, driveAlias, force); } - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; qemuAuditDisk(vm, origdisk, disk, "update", ret >= 0); @@ -201,7 +202,8 @@ int qemuDomainAttachPciDiskDevice(struct qemud_driver *driver, memcpy(&disk->info.addr.pci, &guestAddr, sizeof(guestAddr)); } } - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; qemuAuditDisk(vm, NULL, disk, "attach", ret >= 0); @@ -277,7 +279,8 @@ int qemuDomainAttachPciControllerDevice(struct qemud_driver *driver, type, &controller->info.addr.pci); } - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; if (ret == 0) { controller->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; @@ -433,7 +436,8 @@ int qemuDomainAttachSCSIDisk(struct qemud_driver *driver, memcpy(&disk->info.addr.drive, &driveAddr, sizeof(driveAddr)); } } - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; qemuAuditDisk(vm, NULL, disk, "attach", ret >= 0); @@ -516,7 +520,8 @@ int qemuDomainAttachUsbMassstorageDevice(struct qemud_driver *driver, } else { ret = qemuMonitorAddUSBDisk(priv->mon, disk->src); } - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; qemuAuditDisk(vm, NULL, disk, "attach", ret >= 0); @@ -632,21 +637,19 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, qemuDomainObjEnterMonitorWithDriver(driver, vm); if (qemuCapsGet(qemuCaps, QEMU_CAPS_NETDEV) && qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { - if (qemuMonitorAddNetdev(priv->mon, netstr, tapfd, tapfd_name, - vhostfd, vhostfd_name) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); - qemuAuditNet(vm, NULL, net, "attach", false); - goto cleanup; - } + ret = qemuMonitorAddNetdev(priv->mon, netstr, tapfd, tapfd_name, + vhostfd, vhostfd_name); } else { - if (qemuMonitorAddHostNetwork(priv->mon, netstr, tapfd, tapfd_name, - vhostfd, vhostfd_name) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); - qemuAuditNet(vm, NULL, net, "attach", false); - goto cleanup; - } + ret = qemuMonitorAddHostNetwork(priv->mon, netstr, tapfd, tapfd_name, + vhostfd, vhostfd_name); } - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; + + qemuAuditNet(vm, NULL, net, "attach", ret >= 0); + + if (ret < 0) + goto cleanup; VIR_FORCE_CLOSE(tapfd); VIR_FORCE_CLOSE(vhostfd); @@ -667,25 +670,23 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, qemuDomainObjEnterMonitorWithDriver(driver, vm); if (qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { - if (qemuMonitorAddDevice(priv->mon, nicstr) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); - qemuAuditNet(vm, NULL, net, "attach", false); - goto try_remove; - } + ret = qemuMonitorAddDevice(priv->mon, nicstr); } else { - if (qemuMonitorAddPCINetwork(priv->mon, nicstr, - &guestAddr) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); - qemuAuditNet(vm, NULL, net, "attach", false); - goto try_remove; + ret = qemuMonitorAddPCINetwork(priv->mon, nicstr, + &guestAddr); + if (ret == 0) { + net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; + memcpy(&net->info.addr.pci, &guestAddr, sizeof(guestAddr)); } - net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; - memcpy(&net->info.addr.pci, &guestAddr, sizeof(guestAddr)); } - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; qemuAuditNet(vm, NULL, net, "attach", true); + if (ret < 0) + goto try_remove; + ret = 0; vm->def->nets[vm->def->nnets++] = net; @@ -723,7 +724,7 @@ try_remove: if (qemuMonitorRemoveNetdev(priv->mon, netdev_name) < 0) VIR_WARN("Failed to remove network backend for netdev %s", netdev_name); - qemuDomainObjExitMonitorWithDriver(driver, vm); + ignore_value(qemuDomainObjExitMonitorWithDriver(driver, vm)); VIR_FREE(netdev_name); } else { VIR_WARN0("Unable to remove network backend"); @@ -736,7 +737,7 @@ try_remove: if (qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < 0) VIR_WARN("Failed to remove network backend for vlan %d, net %s", vlan, hostnet_name); - qemuDomainObjExitMonitorWithDriver(driver, vm); + ignore_value(qemuDomainObjExitMonitorWithDriver(driver, vm)); VIR_FREE(hostnet_name); } goto cleanup; @@ -795,7 +796,8 @@ int qemuDomainAttachHostPciDevice(struct qemud_driver *driver, qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorAddDeviceWithFd(priv->mon, devstr, configfd, configfd_name); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; } else { virDomainDevicePCIAddress guestAddr; @@ -803,7 +805,8 @@ int qemuDomainAttachHostPciDevice(struct qemud_driver *driver, ret = qemuMonitorAddPCIHostDevice(priv->mon, &hostdev->source.subsys.u.pci, &guestAddr); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; hostdev->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; memcpy(&hostdev->info.addr.pci, &guestAddr, sizeof(guestAddr)); @@ -886,7 +889,8 @@ int qemuDomainAttachHostUsbDevice(struct qemud_driver *driver, ret = qemuMonitorAddUSBDeviceExact(priv->mon, hostdev->source.subsys.u.usb.bus, hostdev->source.subsys.u.usb.device); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; qemuAuditHostdev(vm, hostdev, "attach", ret == 0); if (ret < 0) goto error; @@ -1145,25 +1149,24 @@ int qemuDomainDetachPciDiskDevice(struct qemud_driver *driver, qemuDomainObjEnterMonitorWithDriver(driver, vm); if (qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { - if (qemuMonitorDelDevice(priv->mon, detach->info.alias) < 0) { - qemuDomainObjExitMonitor(vm); - goto cleanup; - } + ret = qemuMonitorDelDevice(priv->mon, detach->info.alias); } else { - if (qemuMonitorRemovePCIDevice(priv->mon, - &detach->info.addr.pci) < 0) { - qemuDomainObjExitMonitor(vm); - goto cleanup; - } + ret = qemuMonitorRemovePCIDevice(priv->mon, + &detach->info.addr.pci); } /* disconnect guest from host device */ - qemuMonitorDriveDel(priv->mon, drivestr); + if (ret == 0) + qemuMonitorDriveDel(priv->mon, drivestr); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitor(vm) < 0) + ret = -1; qemuAuditDisk(vm, detach, NULL, "detach", ret >= 0); + if (ret < 0) + goto cleanup; + if (qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE) && qemuDomainPCIAddressReleaseAddr(priv->pciaddrs, &detach->info) < 0) VIR_WARN("Unable to release PCI address on %s", dev->data.disk->src); @@ -1235,18 +1238,20 @@ int qemuDomainDetachDiskDevice(struct qemud_driver *driver, } qemuDomainObjEnterMonitorWithDriver(driver, vm); - if (qemuMonitorDelDevice(priv->mon, detach->info.alias) < 0) { - qemuDomainObjExitMonitor(vm); - goto cleanup; - } + ret = qemuMonitorDelDevice(priv->mon, detach->info.alias); /* disconnect guest from host device */ - qemuMonitorDriveDel(priv->mon, drivestr); + if (ret == 0) + qemuMonitorDriveDel(priv->mon, drivestr); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; qemuAuditDisk(vm, detach, NULL, "detach", ret >= 0); + if (ret < 0) + goto cleanup; + virDomainDiskRemove(vm->def, i); virDomainDiskDefFree(detach); @@ -1364,18 +1369,16 @@ int qemuDomainDetachPciControllerDevice(struct qemud_driver *driver, qemuDomainObjEnterMonitorWithDriver(driver, vm); if (qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { - if (qemuMonitorDelDevice(priv->mon, detach->info.alias)) { - qemuDomainObjExitMonitor(vm); - goto cleanup; - } + ret = qemuMonitorDelDevice(priv->mon, detach->info.alias); } else { - if (qemuMonitorRemovePCIDevice(priv->mon, - &detach->info.addr.pci) < 0) { - qemuDomainObjExitMonitor(vm); - goto cleanup; - } + ret = qemuMonitorRemovePCIDevice(priv->mon, + &detach->info.addr.pci); } - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; + + if (ret < 0) + goto cleanup; if (vm->def->ncontrollers > 1) { memmove(vm->def->controllers + i, @@ -1452,37 +1455,30 @@ int qemuDomainDetachNetDevice(struct qemud_driver *driver, qemuDomainObjEnterMonitorWithDriver(driver, vm); if (qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { - if (qemuMonitorDelDevice(priv->mon, detach->info.alias) < 0) { - qemuDomainObjExitMonitor(vm); - qemuAuditNet(vm, detach, NULL, "detach", false); - goto cleanup; - } + ret = qemuMonitorDelDevice(priv->mon, detach->info.alias); } else { - if (qemuMonitorRemovePCIDevice(priv->mon, - &detach->info.addr.pci) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); - qemuAuditNet(vm, detach, NULL, "detach", false); - goto cleanup; - } + ret = qemuMonitorRemovePCIDevice(priv->mon, + &detach->info.addr.pci); } + if (ret < 0) + goto exitmonitor; + if (qemuCapsGet(qemuCaps, QEMU_CAPS_NETDEV) && qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { - if (qemuMonitorRemoveNetdev(priv->mon, hostnet_name) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); - qemuAuditNet(vm, detach, NULL, "detach", false); - goto cleanup; - } + ret = qemuMonitorRemoveNetdev(priv->mon, hostnet_name); } else { - if (qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); - qemuAuditNet(vm, detach, NULL, "detach", false); - goto cleanup; - } + ret = qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name); } - qemuDomainObjExitMonitorWithDriver(driver, vm); - qemuAuditNet(vm, detach, NULL, "detach", true); +exitmonitor: + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; + + qemuAuditNet(vm, detach, NULL, "detach", ret >= 0); + + if (ret < 0) + goto cleanup; if (qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE) && qemuDomainPCIAddressReleaseAddr(priv->pciaddrs, &detach->info) < 0) @@ -1582,7 +1578,8 @@ int qemuDomainDetachHostPciDevice(struct qemud_driver *driver, } else { ret = qemuMonitorRemovePCIDevice(priv->mon, &detach->info.addr.pci); } - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; qemuAuditHostdev(vm, detach, "detach", ret == 0); if (ret < 0) return -1; @@ -1681,7 +1678,8 @@ int qemuDomainDetachHostUsbDevice(struct qemud_driver *driver, qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorDelDevice(priv->mon, detach->info.alias); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; qemuAuditHostdev(vm, detach, "detach", ret == 0); if (ret < 0) return -1; @@ -1798,7 +1796,8 @@ qemuDomainChangeGraphicsPasswords(struct qemud_driver *driver, } cleanup: - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; return ret; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 43741e1..bdc05c0 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -125,7 +125,8 @@ qemuMigrationWaitForCompletion(struct qemud_driver *driver, virDomainObjPtr vm) VIR_DEBUG0("Cancelling job at client request"); qemuDomainObjEnterMonitorWithDriver(driver, vm); rc = qemuMonitorMigrateCancel(priv->mon); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + rc = -1; if (rc < 0) { VIR_WARN0("Unable to cancel job"); } @@ -142,7 +143,8 @@ qemuMigrationWaitForCompletion(struct qemud_driver *driver, virDomainObjPtr vm) VIR_DEBUG("Setting migration downtime to %llums", ms); qemuDomainObjEnterMonitorWithDriver(driver, vm); rc = qemuMonitorSetMigrationDowntime(priv->mon, ms); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + rc = -1; if (rc < 0) VIR_WARN0("Unable to set migration downtime"); } else if (priv->jobSignals & QEMU_JOB_SIGNAL_MIGRATE_SPEED) { @@ -153,7 +155,8 @@ qemuMigrationWaitForCompletion(struct qemud_driver *driver, virDomainObjPtr vm) VIR_DEBUG("Setting migration bandwidth to %luMbs", bandwidth); qemuDomainObjEnterMonitorWithDriver(driver, vm); rc = qemuMonitorSetMigrationSpeed(priv->mon, bandwidth); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + rc = -1; if (rc < 0) VIR_WARN0("Unable to set migration speed"); } @@ -173,7 +176,8 @@ qemuMigrationWaitForCompletion(struct qemud_driver *driver, virDomainObjPtr vm) &memProcessed, &memRemaining, &memTotal); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + rc = -1; if (rc < 0) { priv->jobInfo.type = VIR_DOMAIN_JOB_FAILED; @@ -608,11 +612,13 @@ static int doNativeMigrate(struct qemud_driver *driver, } qemuDomainObjEnterMonitorWithDriver(driver, vm); - if (resource > 0 && - qemuMonitorSetMigrationSpeed(priv->mon, resource) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); - goto cleanup; - } + if (resource > 0) + ret = qemuMonitorSetMigrationSpeed(priv->mon, resource); + else + ret = 0; + + if (ret < 0) + goto exitmonitor; if (flags & VIR_MIGRATE_NON_SHARED_DISK) background_flags |= QEMU_MONITOR_MIGRATE_NON_SHARED_DISK; @@ -620,12 +626,15 @@ static int doNativeMigrate(struct qemud_driver *driver, if (flags & VIR_MIGRATE_NON_SHARED_INC) background_flags |= QEMU_MONITOR_MIGRATE_NON_SHARED_INC; - if (qemuMonitorMigrateToHost(priv->mon, background_flags, uribits->server, - uribits->port) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); + ret = qemuMonitorMigrateToHost(priv->mon, background_flags, uribits->server, + uribits->port); + +exitmonitor: + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; + + if (ret < 0) goto cleanup; - } - qemuDomainObjExitMonitorWithDriver(driver, vm); if (qemuMigrationWaitForCompletion(driver, vm) < 0) goto cleanup; @@ -824,7 +833,8 @@ static int doTunnelMigrate(struct qemud_driver *driver, } else { internalret = -1; } - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + internalret = -1; if (internalret < 0) { qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", _("tunnelled migration monitor command failed")); @@ -844,17 +854,15 @@ static int doTunnelMigrate(struct qemud_driver *driver, * rather failed later on. Check the output of "info migrate" */ qemuDomainObjEnterMonitorWithDriver(driver, vm); - if (qemuMonitorGetMigrationStatus(priv->mon, - &status, - &transferred, - &remaining, - &total) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); - goto cancel; - } - qemuDomainObjExitMonitorWithDriver(driver, vm); + retval = qemuMonitorGetMigrationStatus(priv->mon, + &status, + &transferred, + &remaining, + &total); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + retval = -1; - if (status == QEMU_MONITOR_MIGRATION_STATUS_ERROR) { + if (retval < 0 || status == QEMU_MONITOR_MIGRATION_STATUS_ERROR) { qemuReportError(VIR_ERR_OPERATION_FAILED, "%s",_("migrate failed")); goto cancel; @@ -875,7 +883,7 @@ cancel: if (retval != 0 && virDomainObjIsActive(vm)) { qemuDomainObjEnterMonitorWithDriver(driver, vm); qemuMonitorMigrateCancel(priv->mon); - qemuDomainObjExitMonitorWithDriver(driver, vm); + ignore_value(qemuDomainObjExitMonitorWithDriver(driver, vm)); } finish: @@ -1372,12 +1380,12 @@ qemuMigrationToFile(struct qemud_driver *driver, virDomainObjPtr vm, if (virSetCloseExec(pipeFD[1]) < 0) { virReportSystemError(errno, "%s", _("Unable to set cloexec flag")); - qemuDomainObjExitMonitorWithDriver(driver, vm); - goto cleanup; + rc = -1; + goto exitmonitor; } if (virCommandRunAsync(cmd, NULL) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); - goto cleanup; + rc = -1; + goto exitmonitor; } rc = qemuMonitorMigrateToFd(priv->mon, QEMU_MONITOR_MIGRATE_BACKGROUND, @@ -1391,7 +1399,10 @@ qemuMigrationToFile(struct qemud_driver *driver, virDomainObjPtr vm, args, path, offset); } } - qemuDomainObjExitMonitorWithDriver(driver, vm); + +exitmonitor: + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + rc = -1; if (rc < 0) goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7295f9e..374de0f 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -662,7 +662,8 @@ qemuConnectMonitor(struct qemud_driver *driver, virDomainObjPtr vm) qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorSetCapabilities(priv->mon); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; error: @@ -1070,7 +1071,8 @@ qemuProcessWaitForMonitor(struct qemud_driver* driver, priv = vm->privateData; qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorGetPtyPaths(priv->mon, paths); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; VIR_DEBUG("qemuMonitorGetPtyPaths returned %i", ret); if (ret == 0) @@ -1122,11 +1124,12 @@ qemuProcessDetectVcpuPIDs(struct qemud_driver *driver, /* What follows is now all KVM specific */ qemuDomainObjEnterMonitorWithDriver(driver, vm); - if ((ncpupids = qemuMonitorGetCPUInfo(priv->mon, &cpupids)) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); + ncpupids = qemuMonitorGetCPUInfo(priv->mon, &cpupids); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ncpupids = -1; + + if (ncpupids < 0) return -1; - } - qemuDomainObjExitMonitorWithDriver(driver, vm); /* Treat failure to get VCPU<->PID mapping as non-fatal */ if (ncpupids == 0) @@ -1322,7 +1325,8 @@ qemuProcessInitPasswords(virConnectPtr conn, qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorSetDrivePassphrase(priv->mon, alias, secret); VIR_FREE(secret); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; if (ret < 0) goto cleanup; } @@ -1713,7 +1717,10 @@ qemuProcessInitPCIAddresses(struct qemud_driver *driver, qemuDomainObjEnterMonitorWithDriver(driver, vm); naddrs = qemuMonitorGetAllPCIAddresses(priv->mon, &addrs); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) { + VIR_FREE(addrs); + return -1; + } ret = qemuProcessDetectPCIAddresses(vm, addrs, naddrs); @@ -1890,7 +1897,8 @@ qemuProcessStartCPUs(struct qemud_driver *driver, virDomainObjPtr vm, qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorStartCPUs(priv->mon, conn); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; if (ret == 0) { vm->state = VIR_DOMAIN_RUNNING; } @@ -1908,7 +1916,8 @@ int qemuProcessStopCPUs(struct qemud_driver *driver, virDomainObjPtr vm) vm->state = VIR_DOMAIN_PAUSED; qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorStopCPUs(priv->mon); - qemuDomainObjExitMonitorWithDriver(driver, vm); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; if (ret < 0) { vm->state = oldState; } @@ -2389,11 +2398,12 @@ int qemuProcessStart(virConnectPtr conn, VIR_DEBUG0("Setting initial memory amount"); cur_balloon = vm->def->mem.cur_balloon; qemuDomainObjEnterMonitorWithDriver(driver, vm); - if (qemuMonitorSetBalloon(priv->mon, cur_balloon) < 0) { - qemuDomainObjExitMonitorWithDriver(driver, vm); + ret = qemuMonitorSetBalloon(priv->mon, cur_balloon); + if (qemuDomainObjExitMonitorWithDriver(driver, vm) < 0) + ret = -1; + + if (ret < 0) goto cleanup; - } - qemuDomainObjExitMonitorWithDriver(driver, vm); if (!start_paused) { VIR_DEBUG0("Starting domain CPUs"); -- 1.7.1

1 0

[libvirt] [PATCH] Allow to dynamically set the size of the debug buffer
by Daniel Veillard 14 Apr '11

14 Apr '11

This is the part allowing to dynamically resize the debug log buffer from it's default 64kB size. The buffer is now dynamically allocated. It adds a new API virLogSetBufferSize() which resizes the buffer (possibly dynamically but in that case the existing content is lost - the complexity wasn't looking like worth it). If passed a zero size, the buffer is deallocated and we do the small optimization of not formatting messages which are not output anymore. On the daemon side, it just adds a new option log_buffer_size to libvirtd.conf and call virLogSetBufferSize() if needed (minor pbm of the GET_CONF_* macros is you can't guess if the value was set or not) Seems to work fine, I tried to keep the code as simple as needed, this allowed me to find out that on a quiet daemon startup we emit half a megabyte of debug log ! The next patch missing now is the update of the documentation for the log buffer. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 7

[libvirt] [PATCH] Write error check conditionals in more compact form for dispatcher
by Daniel P. Berrange 14 Apr '11

14 Apr '11

Replace cases of type = virConnectGetType(conn); if (type == NULL) goto cleanup; With if (!(type = virConnectGetType(conn))) goto cleanup; * daemon/remote.c: Write error checks in compat form --- daemon/remote.c | 795 +++++++++++++++++++------------------------------------ 1 files changed, 278 insertions(+), 517 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 247a226..66df9f7 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -473,9 +473,7 @@ remoteDispatchSupportsFeature(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ret->supported = virDrvSupportsFeature(conn, args->feature); - - if (ret->supported < 0) + if ((ret->supported = virDrvSupportsFeature(conn, args->feature)) < 0) goto cleanup; rv = 0; @@ -502,15 +500,13 @@ remoteDispatchGetType(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - type = virConnectGetType(conn); - if (type == NULL) + if (!(type = virConnectGetType(conn))) goto cleanup; /* We have to strdup because remoteDispatchClientRequest will * free this string after it's been serialised. */ - ret->type = strdup(type); - if (!ret->type) { + if (!(ret->type = strdup(type))) { virReportOOMError(); goto cleanup; } @@ -598,8 +594,7 @@ remoteDispatchGetHostname(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - hostname = virConnectGetHostname(conn); - if (hostname == NULL) + if (!(hostname = virConnectGetHostname(conn))) goto cleanup; ret->hostname = hostname; @@ -628,8 +623,7 @@ remoteDispatchGetUri(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - uri = virConnectGetURI(conn); - if (uri == NULL) + if (!(uri = virConnectGetURI(conn))) goto cleanup; ret->uri = uri; @@ -660,8 +654,7 @@ remoteDispatchGetSysinfo(struct qemud_server *server ATTRIBUTE_UNUSED, } flags = args->flags; - sysinfo = virConnectGetSysinfo(conn, flags); - if (sysinfo == NULL) + if (!(sysinfo = virConnectGetSysinfo(conn, flags))) goto cleanup; ret->sysinfo = sysinfo; @@ -691,8 +684,7 @@ remoteDispatchGetMaxVcpus(struct qemud_server *server ATTRIBUTE_UNUSED, } type = args->type ? *args->type : NULL; - ret->max_vcpus = virConnectGetMaxVcpus(conn, type); - if (ret->max_vcpus < 0) + if ((ret->max_vcpus = virConnectGetMaxVcpus(conn, type)) < 0) goto cleanup; rv = 0; @@ -757,8 +749,7 @@ remoteDispatchGetCapabilities(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - caps = virConnectGetCapabilities(conn); - if (caps == NULL) + if (!(caps = virConnectGetCapabilities(conn))) goto cleanup; ret->capabilities = caps; @@ -779,7 +770,7 @@ remoteDispatchNodeGetCellsFreeMemory(struct qemud_server *server ATTRIBUTE_UNUSE remote_node_get_cells_free_memory_args *args, remote_node_get_cells_free_memory_ret *ret) { - int err; + int len; int rv = -1; if (!conn) { @@ -799,13 +790,13 @@ remoteDispatchNodeGetCellsFreeMemory(struct qemud_server *server ATTRIBUTE_UNUSE goto cleanup; } - err = virNodeGetCellsFreeMemory(conn, + len = virNodeGetCellsFreeMemory(conn, (unsigned long long *)ret->freeMems.freeMems_val, args->startCell, args->maxCells); - if (err <= 0) + if (len <= 0) goto cleanup; - ret->freeMems.freeMems_len = err; + ret->freeMems.freeMems_len = len; rv = 0; @@ -835,8 +826,7 @@ remoteDispatchNodeGetFreeMemory(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - freeMem = virNodeGetFreeMemory(conn); - if (freeMem == 0) + if ((freeMem = virNodeGetFreeMemory(conn)) == 0) goto cleanup; ret->freeMem = freeMem; rv = 0; @@ -867,12 +857,10 @@ remoteDispatchDomainGetSchedulerType(struct qemud_server *server ATTRIBUTE_UNUSE goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; - type = virDomainGetSchedulerType(dom, &nparams); - if (type == NULL) + if (!(type = virDomainGetSchedulerType(dom, &nparams))) goto cleanup; ret->type = type; @@ -898,7 +886,7 @@ remoteDispatchDomainGetSchedulerParameters(struct qemud_server *server ATTRIBUTE { virDomainPtr dom = NULL; virSchedParameterPtr params; - int i, r, nparams; + int i, nparams; int rv = -1; if (!conn) { @@ -917,12 +905,10 @@ remoteDispatchDomainGetSchedulerParameters(struct qemud_server *server ATTRIBUTE goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; - r = virDomainGetSchedulerParameters(dom, params, &nparams); - if (r < 0) + if (virDomainGetSchedulerParameters(dom, params, &nparams) < 0) goto cleanup; /* Serialise the scheduler parameters. */ @@ -984,7 +970,7 @@ remoteDispatchDomainSetSchedulerParameters(struct qemud_server *server ATTRIBUTE void *ret ATTRIBUTE_UNUSED) { virDomainPtr dom = NULL; - int i, r, nparams; + int i, nparams; virSchedParameterPtr params; int rv = -1; @@ -1028,12 +1014,10 @@ remoteDispatchDomainSetSchedulerParameters(struct qemud_server *server ATTRIBUTE } } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; - r = virDomainSetSchedulerParameters(dom, params, nparams); - if (r < 0) + if (virDomainSetSchedulerParameters(dom, params, nparams) < 0) goto cleanup; rv = 0; @@ -1066,8 +1050,7 @@ remoteDispatchDomainBlockStats(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; path = args->path; @@ -1109,8 +1092,7 @@ remoteDispatchDomainInterfaceStats(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; path = args->path; @@ -1161,8 +1143,7 @@ remoteDispatchDomainMemoryStats(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; /* Allocate stats array for making dispatch call */ @@ -1219,8 +1200,7 @@ remoteDispatchDomainBlockPeek(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; path = args->path; offset = args->offset; @@ -1275,8 +1255,7 @@ remoteDispatchDomainMemoryPeek(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; offset = args->offset; size = args->size; @@ -1329,8 +1308,7 @@ remoteDispatchDomainAttachDevice(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainAttachDevice(dom, args->xml) < 0) @@ -1363,8 +1341,7 @@ remoteDispatchDomainAttachDeviceFlags(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainAttachDeviceFlags(dom, args->xml, args->flags) < 0) @@ -1397,8 +1374,7 @@ remoteDispatchDomainUpdateDeviceFlags(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainUpdateDeviceFlags(dom, args->xml, args->flags) < 0) @@ -1431,8 +1407,7 @@ remoteDispatchDomainCreate(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainCreate(dom) < 0) @@ -1460,8 +1435,7 @@ remoteDispatchDomainCreateWithFlags(struct qemud_server *server ATTRIBUTE_UNUSED int rv = -1; virDomainPtr dom = NULL; - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainCreateWithFlags(dom, args->flags) < 0) @@ -1496,8 +1470,7 @@ remoteDispatchDomainCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = virDomainCreateXML(conn, args->xml_desc, args->flags); - if (dom == NULL) + if (!(dom = virDomainCreateXML(conn, args->xml_desc, args->flags))) goto cleanup; make_nonnull_domain(&ret->dom, dom); @@ -1529,8 +1502,7 @@ remoteDispatchDomainDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = virDomainDefineXML(conn, args->xml); - if (dom == NULL) + if (!(dom = virDomainDefineXML(conn, args->xml))) goto cleanup; make_nonnull_domain(&ret->dom, dom); @@ -1562,8 +1534,7 @@ remoteDispatchDomainDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainDestroy(dom) < 0) @@ -1596,8 +1567,7 @@ remoteDispatchDomainDetachDevice(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainDetachDevice(dom, args->xml) < 0) @@ -1630,8 +1600,7 @@ remoteDispatchDomainDetachDeviceFlags(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainDetachDeviceFlags(dom, args->xml, args->flags) < 0) @@ -1664,13 +1633,11 @@ remoteDispatchDomainDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; /* remoteDispatchClientRequest will free this. */ - ret->xml = virDomainGetXMLDesc(dom, args->flags); - if (!ret->xml) + if (!(ret->xml = virDomainGetXMLDesc(dom, args->flags))) goto cleanup; rv = 0; @@ -1700,12 +1667,12 @@ remoteDispatchDomainXmlFromNative(struct qemud_server *server ATTRIBUTE_UNUSED, } /* remoteDispatchClientRequest will free this. */ - ret->domainXml = virConnectDomainXMLFromNative(conn, - args->nativeFormat, - args->nativeConfig, - args->flags); - if (!ret->domainXml) + if (!(ret->domainXml = virConnectDomainXMLFromNative(conn, + args->nativeFormat, + args->nativeConfig, + args->flags))) goto cleanup; + rv = 0; cleanup: @@ -1731,12 +1698,12 @@ remoteDispatchDomainXmlToNative(struct qemud_server *server ATTRIBUTE_UNUSED, } /* remoteDispatchClientRequest will free this. */ - ret->nativeConfig = virConnectDomainXMLToNative(conn, - args->nativeFormat, - args->domainXml, - args->flags); - if (!ret->nativeConfig) + if (!(ret->nativeConfig = virConnectDomainXMLToNative(conn, + args->nativeFormat, + args->domainXml, + args->flags))) goto cleanup; + rv = 0; cleanup: @@ -1763,8 +1730,7 @@ remoteDispatchDomainGetAutostart(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainGetAutostart(dom, &ret->autostart) < 0) @@ -1798,8 +1764,7 @@ remoteDispatchDomainGetInfo(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainGetInfo(dom, &info) < 0) @@ -1838,12 +1803,10 @@ remoteDispatchDomainGetMaxMemory(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; - ret->memory = virDomainGetMaxMemory(dom); - if (ret->memory == 0) + if ((ret->memory = virDomainGetMaxMemory(dom)) == 0) goto cleanup; rv = 0; @@ -1873,12 +1836,10 @@ remoteDispatchDomainGetMaxVcpus(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; - ret->num = virDomainGetMaxVcpus(dom); - if (ret->num < 0) + if ((ret->num = virDomainGetMaxVcpus(dom)) < 0) goto cleanup; rv = 0; @@ -1909,8 +1870,7 @@ remoteDispatchDomainGetSecurityLabel(struct qemud_server *server ATTRIBUTE_UNUSE goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (VIR_ALLOC(seclabel) < 0) { @@ -2000,14 +1960,13 @@ remoteDispatchDomainGetOsType(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; /* remoteDispatchClientRequest will free this */ - ret->type = virDomainGetOSType(dom); - if (ret->type == NULL) + if (!(ret->type = virDomainGetOSType(dom))) goto cleanup; + rv = 0; cleanup: @@ -2038,8 +1997,7 @@ remoteDispatchDomainGetVcpus(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (args->maxinfo > REMOTE_VCPUINFO_MAX) { @@ -2059,10 +2017,9 @@ remoteDispatchDomainGetVcpus(struct qemud_server *server ATTRIBUTE_UNUSED, VIR_ALLOC_N(cpumaps, args->maxinfo * args->maplen) < 0) goto no_memory; - info_len = virDomainGetVcpus(dom, - info, args->maxinfo, - cpumaps, args->maplen); - if (info_len < 0) + if ((info_len = virDomainGetVcpus(dom, + info, args->maxinfo, + cpumaps, args->maplen)) < 0) goto cleanup; /* Allocate the return buffer for info. */ @@ -2120,12 +2077,10 @@ remoteDispatchDomainGetVcpusFlags(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; - ret->num = virDomainGetVcpusFlags(dom, args->flags); - if (ret->num < 0) + if ((ret->num = virDomainGetVcpusFlags(dom, args->flags)) < 0) goto cleanup; rv = 0; @@ -2147,7 +2102,6 @@ remoteDispatchDomainMigratePrepare(struct qemud_server *server ATTRIBUTE_UNUSED, remote_domain_migrate_prepare_args *args, remote_domain_migrate_prepare_ret *ret) { - int r; char *cookie = NULL; int cookielen = 0; char *uri_in; @@ -2169,10 +2123,9 @@ remoteDispatchDomainMigratePrepare(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - r = virDomainMigratePrepare(conn, &cookie, &cookielen, + if (virDomainMigratePrepare(conn, &cookie, &cookielen, uri_in, uri_out, - args->flags, dname, args->resource); - if (r < 0) + args->flags, dname, args->resource) < 0) goto cleanup; /* remoteDispatchClientRequest will free cookie, uri_out and @@ -2205,7 +2158,6 @@ remoteDispatchDomainMigratePerform(struct qemud_server *server ATTRIBUTE_UNUSED, remote_domain_migrate_perform_args *args, void *ret ATTRIBUTE_UNUSED) { - int r; virDomainPtr dom = NULL; char *dname; int rv = -1; @@ -2215,18 +2167,16 @@ remoteDispatchDomainMigratePerform(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; dname = args->dname == NULL ? NULL : *args->dname; - r = virDomainMigratePerform(dom, + if (virDomainMigratePerform(dom, args->cookie.cookie_val, args->cookie.cookie_len, args->uri, - args->flags, dname, args->resource); - if (r < 0) + args->flags, dname, args->resource) < 0) goto cleanup; rv = 0; @@ -2256,12 +2206,11 @@ remoteDispatchDomainMigrateFinish(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ddom = virDomainMigrateFinish(conn, args->dname, - args->cookie.cookie_val, - args->cookie.cookie_len, - args->uri, - args->flags); - if (ddom == NULL) + if (!(ddom = virDomainMigrateFinish(conn, args->dname, + args->cookie.cookie_val, + args->cookie.cookie_len, + args->uri, + args->flags))) goto cleanup; make_nonnull_domain(&ret->ddom, ddom); @@ -2284,7 +2233,6 @@ remoteDispatchDomainMigratePrepare2(struct qemud_server *server ATTRIBUTE_UNUSED remote_domain_migrate_prepare2_args *args, remote_domain_migrate_prepare2_ret *ret) { - int r; char *cookie = NULL; int cookielen = 0; char *uri_in; @@ -2306,11 +2254,10 @@ remoteDispatchDomainMigratePrepare2(struct qemud_server *server ATTRIBUTE_UNUSED goto cleanup; } - r = virDomainMigratePrepare2(conn, &cookie, &cookielen, + if (virDomainMigratePrepare2(conn, &cookie, &cookielen, uri_in, uri_out, args->flags, dname, args->resource, - args->dom_xml); - if (r < 0) + args->dom_xml) < 0) goto cleanup; /* remoteDispatchClientRequest will free cookie, uri_out and @@ -2345,13 +2292,12 @@ remoteDispatchDomainMigrateFinish2(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ddom = virDomainMigrateFinish2(conn, args->dname, - args->cookie.cookie_val, - args->cookie.cookie_len, - args->uri, - args->flags, - args->retcode); - if (ddom == NULL) + if (!(ddom = virDomainMigrateFinish2(conn, args->dname, + args->cookie.cookie_val, + args->cookie.cookie_len, + args->uri, + args->flags, + args->retcode))) goto cleanup; make_nonnull_domain(&ret->ddom, ddom); @@ -2375,7 +2321,6 @@ remoteDispatchDomainMigratePrepareTunnel(struct qemud_server *server ATTRIBUTE_U remote_domain_migrate_prepare_tunnel_args *args, void *ret ATTRIBUTE_UNUSED) { - int r; char *dname; struct qemud_client_stream *stream = NULL; int rv = -1; @@ -2387,16 +2332,14 @@ remoteDispatchDomainMigratePrepareTunnel(struct qemud_server *server ATTRIBUTE_U dname = args->dname == NULL ? NULL : *args->dname; - stream = remoteCreateClientStream(conn, hdr); - if (!stream) { + if (!(stream = remoteCreateClientStream(conn, hdr))) { virReportOOMError(); goto cleanup; } - r = virDomainMigratePrepareTunnel(conn, stream->st, + if (virDomainMigratePrepareTunnel(conn, stream->st, args->flags, dname, args->resource, - args->dom_xml); - if (r < 0) + args->dom_xml) < 0) goto cleanup; if (remoteAddClientStream(client, stream, 0) < 0) @@ -2477,8 +2420,7 @@ remoteDispatchDomainLookupById(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = virDomainLookupByID(conn, args->id); - if (dom == NULL) + if (!(dom = virDomainLookupByID(conn, args->id))) goto cleanup; make_nonnull_domain(&ret->dom, dom); @@ -2510,8 +2452,7 @@ remoteDispatchDomainLookupByName(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = virDomainLookupByName(conn, args->name); - if (dom == NULL) + if (!(dom = virDomainLookupByName(conn, args->name))) goto cleanup; make_nonnull_domain(&ret->dom, dom); @@ -2543,8 +2484,7 @@ remoteDispatchDomainLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = virDomainLookupByUUID(conn, (unsigned char *) args->uuid); - if (dom == NULL) + if (!(dom = virDomainLookupByUUID(conn, (unsigned char *) args->uuid))) goto cleanup; make_nonnull_domain(&ret->dom, dom); @@ -2575,8 +2515,7 @@ remoteDispatchNumOfDefinedDomains(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ret->num = virConnectNumOfDefinedDomains(conn); - if (ret->num < 0) + if ((ret->num = virConnectNumOfDefinedDomains(conn)) < 0) goto cleanup; rv = 0; @@ -2604,8 +2543,7 @@ remoteDispatchDomainPinVcpu(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (args->cpumap.cpumap_len > REMOTE_CPUMAP_MAX) { @@ -2613,10 +2551,9 @@ remoteDispatchDomainPinVcpu(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - rv = virDomainPinVcpu(dom, args->vcpu, - (unsigned char *) args->cpumap.cpumap_val, - args->cpumap.cpumap_len); - if (rv < 0) + if (virDomainPinVcpu(dom, args->vcpu, + (unsigned char *) args->cpumap.cpumap_val, + args->cpumap.cpumap_len) < 0) goto cleanup; rv = 0; @@ -2646,8 +2583,7 @@ remoteDispatchDomainReboot(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainReboot(dom, args->flags) < 0) @@ -2707,8 +2643,7 @@ remoteDispatchDomainResume(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainResume(dom) < 0) @@ -2741,8 +2676,7 @@ remoteDispatchDomainSave(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainSave(dom, args->to) < 0) @@ -2775,8 +2709,7 @@ remoteDispatchDomainCoreDump(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainCoreDump(dom, args->to, args->flags) < 0) @@ -2809,8 +2742,7 @@ remoteDispatchDomainSetAutostart(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainSetAutostart(dom, args->autostart) < 0) @@ -2843,8 +2775,7 @@ remoteDispatchDomainSetMaxMemory(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainSetMaxMemory(dom, args->memory) < 0) @@ -2877,8 +2808,7 @@ remoteDispatchDomainSetMemory(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainSetMemory(dom, args->memory) < 0) @@ -2911,8 +2841,7 @@ remoteDispatchDomainSetMemoryFlags(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainSetMemoryFlags(dom, args->memory, args->flags) < 0) @@ -2941,7 +2870,7 @@ remoteDispatchDomainSetMemoryParameters(struct qemud_server *server * args, void *ret ATTRIBUTE_UNUSED) { virDomainPtr dom = NULL; - int i, r, nparams; + int i, nparams; virMemoryParameterPtr params; unsigned int flags; int rv = -1; @@ -3007,12 +2936,10 @@ remoteDispatchDomainSetMemoryParameters(struct qemud_server *server } } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; - r = virDomainSetMemoryParameters(dom, params, nparams, flags); - if (r < 0) + if (virDomainSetMemoryParameters(dom, params, nparams, flags) < 0) goto cleanup; rv = 0; @@ -3042,7 +2969,7 @@ remoteDispatchDomainGetMemoryParameters(struct qemud_server *server { virDomainPtr dom = NULL; virMemoryParameterPtr params; - int i, r, nparams; + int i, nparams; unsigned int flags; int rv = -1; @@ -3063,13 +2990,12 @@ remoteDispatchDomainGetMemoryParameters(struct qemud_server *server goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; - r = virDomainGetMemoryParameters(dom, params, &nparams, flags); - if (r < 0) + if (virDomainGetMemoryParameters(dom, params, &nparams, flags) < 0) goto cleanup; + /* In this case, we need to send back the number of parameters * supported */ @@ -3158,7 +3084,7 @@ remoteDispatchDomainSetBlkioParameters(struct qemud_server *server * args, void *ret ATTRIBUTE_UNUSED) { virDomainPtr dom = NULL; - int i, r, nparams; + int i, nparams; virBlkioParameterPtr params; unsigned int flags; int rv = -1; @@ -3224,12 +3150,10 @@ remoteDispatchDomainSetBlkioParameters(struct qemud_server *server } } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; - r = virDomainSetBlkioParameters(dom, params, nparams, flags); - if (r < 0) + if (virDomainSetBlkioParameters(dom, params, nparams, flags) < 0) goto cleanup; rv = 0; @@ -3259,7 +3183,7 @@ remoteDispatchDomainGetBlkioParameters(struct qemud_server *server { virDomainPtr dom = NULL; virBlkioParameterPtr params; - int i, r, nparams; + int i, nparams; unsigned int flags; int rv = -1; @@ -3280,13 +3204,12 @@ remoteDispatchDomainGetBlkioParameters(struct qemud_server *server goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; - r = virDomainGetBlkioParameters(dom, params, &nparams, flags); - if (r < 0) + if (virDomainGetBlkioParameters(dom, params, &nparams, flags) < 0) goto cleanup; + /* In this case, we need to send back the number of parameters * supported */ @@ -3381,8 +3304,7 @@ remoteDispatchDomainSetVcpus(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainSetVcpus(dom, args->nvcpus) < 0) @@ -3415,8 +3337,7 @@ remoteDispatchDomainSetVcpusFlags(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainSetVcpusFlags(dom, args->nvcpus, args->flags) < 0) @@ -3449,8 +3370,7 @@ remoteDispatchDomainShutdown(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainShutdown(dom) < 0) @@ -3483,8 +3403,7 @@ remoteDispatchDomainSuspend(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainSuspend(dom) < 0) @@ -3517,8 +3436,7 @@ remoteDispatchDomainUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainUndefine(dom) < 0) @@ -3641,8 +3559,7 @@ remoteDispatchDomainManagedSave(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainManagedSave(dom, args->flags) < 0) @@ -3675,12 +3592,10 @@ remoteDispatchDomainHasManagedSaveImage(struct qemud_server *server ATTRIBUTE_UN goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; - ret->ret = virDomainHasManagedSaveImage(dom, args->flags); - if (ret->ret < 0) + if ((ret->ret = virDomainHasManagedSaveImage(dom, args->flags)) < 0) goto cleanup; rv = 0; @@ -3710,8 +3625,7 @@ remoteDispatchDomainManagedSaveRemove(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainManagedSaveRemove(dom, args->flags) < 0) @@ -3789,8 +3703,7 @@ remoteDispatchNetworkCreate(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - net = get_nonnull_network(conn, args->net); - if (net == NULL) + if (!(net = get_nonnull_network(conn, args->net))) goto cleanup; if (virNetworkCreate(net) < 0) @@ -3823,8 +3736,7 @@ remoteDispatchNetworkCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - net = virNetworkCreateXML(conn, args->xml); - if (net == NULL) + if (!(net = virNetworkCreateXML(conn, args->xml))) goto cleanup; make_nonnull_network(&ret->net, net); @@ -3856,8 +3768,7 @@ remoteDispatchNetworkDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - net = virNetworkDefineXML(conn, args->xml); - if (net == NULL) + if (!(net = virNetworkDefineXML(conn, args->xml))) goto cleanup; make_nonnull_network(&ret->net, net); @@ -3889,8 +3800,7 @@ remoteDispatchNetworkDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - net = get_nonnull_network(conn, args->net); - if (net == NULL) + if (!(net = get_nonnull_network(conn, args->net))) goto cleanup; if (virNetworkDestroy(net) < 0) @@ -3923,13 +3833,11 @@ remoteDispatchNetworkDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - net = get_nonnull_network(conn, args->net); - if (net == NULL) + if (!(net = get_nonnull_network(conn, args->net))) goto cleanup; /* remoteDispatchClientRequest will free this. */ - ret->xml = virNetworkGetXMLDesc(net, args->flags); - if (!ret->xml) + if (!(ret->xml = virNetworkGetXMLDesc(net, args->flags))) goto cleanup; rv = 0; @@ -3959,8 +3867,7 @@ remoteDispatchNetworkGetAutostart(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - net = get_nonnull_network(conn, args->net); - if (net == NULL) + if (!(net = get_nonnull_network(conn, args->net))) goto cleanup; if (virNetworkGetAutostart(net, &ret->autostart) < 0) @@ -3993,13 +3900,11 @@ remoteDispatchNetworkGetBridgeName(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - net = get_nonnull_network(conn, args->net); - if (net == NULL) + if (!(net = get_nonnull_network(conn, args->net))) goto cleanup; /* remoteDispatchClientRequest will free this. */ - ret->name = virNetworkGetBridgeName(net); - if (!ret->name) + if (!(ret->name = virNetworkGetBridgeName(net))) goto cleanup; rv = 0; @@ -4029,8 +3934,7 @@ remoteDispatchNetworkLookupByName(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - net = virNetworkLookupByName(conn, args->name); - if (net == NULL) + if (!(net = virNetworkLookupByName(conn, args->name))) goto cleanup; make_nonnull_network(&ret->net, net); @@ -4062,8 +3966,7 @@ remoteDispatchNetworkLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - net = virNetworkLookupByUUID(conn, (unsigned char *) args->uuid); - if (net == NULL) + if (!(net = virNetworkLookupByUUID(conn, (unsigned char *) args->uuid))) goto cleanup; make_nonnull_network(&ret->net, net); @@ -4095,8 +3998,7 @@ remoteDispatchNetworkSetAutostart(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - net = get_nonnull_network(conn, args->net); - if (net == NULL) + if (!(net = get_nonnull_network(conn, args->net))) goto cleanup; if (virNetworkSetAutostart(net, args->autostart) < 0) @@ -4129,8 +4031,7 @@ remoteDispatchNetworkUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - net = get_nonnull_network(conn, args->net); - if (net == NULL) + if (!(net = get_nonnull_network(conn, args->net))) goto cleanup; if (virNetworkUndefine(net) < 0) @@ -4192,8 +4093,7 @@ remoteDispatchNumOfDomains(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ret->num = virConnectNumOfDomains(conn); - if (ret->num < 0) + if ((ret->num = virConnectNumOfDomains(conn)) < 0) goto cleanup; rv = 0; @@ -4220,8 +4120,7 @@ remoteDispatchNumOfNetworks(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ret->num = virConnectNumOfNetworks(conn); - if (ret->num < 0) + if ((ret->num = virConnectNumOfNetworks(conn)) < 0) goto cleanup; rv = 0; @@ -4250,8 +4149,7 @@ remoteDispatchNumOfInterfaces(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ret->num = virConnectNumOfInterfaces(conn); - if (ret->num < 0) + if ((ret->num = virConnectNumOfInterfaces(conn)) < 0) goto cleanup; rv = 0; @@ -4399,8 +4297,7 @@ remoteDispatchInterfaceLookupByName(struct qemud_server *server ATTRIBUTE_UNUSED goto cleanup; } - iface = virInterfaceLookupByName(conn, args->name); - if (iface == NULL) + if (!(iface = virInterfaceLookupByName(conn, args->name))) goto cleanup; make_nonnull_interface(&ret->iface, iface); @@ -4432,8 +4329,7 @@ remoteDispatchInterfaceLookupByMacString(struct qemud_server *server ATTRIBUTE_U goto cleanup; } - iface = virInterfaceLookupByMACString(conn, args->mac); - if (iface == NULL) + if (!(iface = virInterfaceLookupByMACString(conn, args->mac))) goto cleanup; make_nonnull_interface(&ret->iface, iface); @@ -4465,13 +4361,11 @@ remoteDispatchInterfaceGetXmlDesc(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - iface = get_nonnull_interface(conn, args->iface); - if (iface == NULL) + if (!(iface = get_nonnull_interface(conn, args->iface))) goto cleanup; /* remoteDispatchClientRequest will free this. */ - ret->xml = virInterfaceGetXMLDesc(iface, args->flags); - if (!ret->xml) + if (!(ret->xml = virInterfaceGetXMLDesc(iface, args->flags))) goto cleanup; rv = 0; @@ -4501,8 +4395,7 @@ remoteDispatchInterfaceDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - iface = virInterfaceDefineXML(conn, args->xml, args->flags); - if (iface == NULL) + if (!(iface = virInterfaceDefineXML(conn, args->xml, args->flags))) goto cleanup; make_nonnull_interface(&ret->iface, iface); @@ -4534,8 +4427,7 @@ remoteDispatchInterfaceUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - iface = get_nonnull_interface(conn, args->iface); - if (iface == NULL) + if (!(iface = get_nonnull_interface(conn, args->iface))) goto cleanup; if (virInterfaceUndefine(iface) < 0) @@ -4568,8 +4460,7 @@ remoteDispatchInterfaceCreate(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - iface = get_nonnull_interface(conn, args->iface); - if (iface == NULL) + if (!(iface = get_nonnull_interface(conn, args->iface))) goto cleanup; if (virInterfaceCreate(iface, args->flags) < 0) @@ -4602,8 +4493,7 @@ remoteDispatchInterfaceDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - iface = get_nonnull_interface(conn, args->iface); - if (iface == NULL) + if (!(iface = get_nonnull_interface(conn, args->iface))) goto cleanup; if (virInterfaceDestroy(iface, args->flags) < 0) @@ -5528,12 +5418,11 @@ remoteDispatchFindStoragePoolSources(struct qemud_server *server ATTRIBUTE_UNUSE goto cleanup; } - ret->xml = - virConnectFindStoragePoolSources(conn, - args->type, - args->srcSpec ? *args->srcSpec : NULL, - args->flags); - if (ret->xml == NULL) + if (!(ret->xml = + virConnectFindStoragePoolSources(conn, + args->type, + args->srcSpec ? *args->srcSpec : NULL, + args->flags))) goto cleanup; rv = 0; @@ -5562,8 +5451,7 @@ remoteDispatchStoragePoolCreate(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) + if (!(pool = get_nonnull_storage_pool(conn, args->pool))) goto cleanup; if (virStoragePoolCreate(pool, args->flags) < 0) @@ -5596,8 +5484,7 @@ remoteDispatchStoragePoolCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - pool = virStoragePoolCreateXML(conn, args->xml, args->flags); - if (pool == NULL) + if (!(pool = virStoragePoolCreateXML(conn, args->xml, args->flags))) goto cleanup; make_nonnull_storage_pool(&ret->pool, pool); @@ -5629,8 +5516,7 @@ remoteDispatchStoragePoolDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - pool = virStoragePoolDefineXML(conn, args->xml, args->flags); - if (pool == NULL) + if (!(pool = virStoragePoolDefineXML(conn, args->xml, args->flags))) goto cleanup; make_nonnull_storage_pool(&ret->pool, pool); @@ -5662,8 +5548,7 @@ remoteDispatchStoragePoolBuild(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) + if (!(pool = get_nonnull_storage_pool(conn, args->pool))) goto cleanup; if (virStoragePoolBuild(pool, args->flags) < 0) @@ -5697,8 +5582,7 @@ remoteDispatchStoragePoolDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) + if (!(pool = get_nonnull_storage_pool(conn, args->pool))) goto cleanup; if (virStoragePoolDestroy(pool) < 0) @@ -5731,8 +5615,7 @@ remoteDispatchStoragePoolDelete(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) + if (!(pool = get_nonnull_storage_pool(conn, args->pool))) goto cleanup; if (virStoragePoolDelete(pool, args->flags) < 0) @@ -5765,8 +5648,7 @@ remoteDispatchStoragePoolRefresh(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) + if (!(pool = get_nonnull_storage_pool(conn, args->pool))) goto cleanup; if (virStoragePoolRefresh(pool, args->flags) < 0) @@ -5800,8 +5682,7 @@ remoteDispatchStoragePoolGetInfo(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) + if (!(pool = get_nonnull_storage_pool(conn, args->pool))) goto cleanup; if (virStoragePoolGetInfo(pool, &info) < 0) @@ -5839,13 +5720,11 @@ remoteDispatchStoragePoolDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) + if (!(pool = get_nonnull_storage_pool(conn, args->pool))) goto cleanup; /* remoteDispatchClientRequest will free this. */ - ret->xml = virStoragePoolGetXMLDesc(pool, args->flags); - if (!ret->xml) + if (!(ret->xml = virStoragePoolGetXMLDesc(pool, args->flags))) goto cleanup; rv = 0; @@ -5875,8 +5754,7 @@ remoteDispatchStoragePoolGetAutostart(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) + if (!(pool = get_nonnull_storage_pool(conn, args->pool))) goto cleanup; if (virStoragePoolGetAutostart(pool, &ret->autostart) < 0) @@ -5910,8 +5788,7 @@ remoteDispatchStoragePoolLookupByName(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - pool = virStoragePoolLookupByName(conn, args->name); - if (pool == NULL) + if (!(pool = virStoragePoolLookupByName(conn, args->name))) goto cleanup; make_nonnull_storage_pool(&ret->pool, pool); @@ -5943,8 +5820,7 @@ remoteDispatchStoragePoolLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - pool = virStoragePoolLookupByUUID(conn, (unsigned char *) args->uuid); - if (pool == NULL) + if (!(pool = virStoragePoolLookupByUUID(conn, (unsigned char *) args->uuid))) goto cleanup; make_nonnull_storage_pool(&ret->pool, pool); @@ -5977,12 +5853,10 @@ remoteDispatchStoragePoolLookupByVolume(struct qemud_server *server ATTRIBUTE_UN goto cleanup; } - vol = get_nonnull_storage_vol(conn, args->vol); - if (vol == NULL) + if (!(vol = get_nonnull_storage_vol(conn, args->vol))) goto cleanup; - pool = virStoragePoolLookupByVolume(vol); - if (pool == NULL) + if (!(pool = virStoragePoolLookupByVolume(vol))) goto cleanup; make_nonnull_storage_pool(&ret->pool, pool); @@ -6016,8 +5890,7 @@ remoteDispatchStoragePoolSetAutostart(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) + if (!(pool = get_nonnull_storage_pool(conn, args->pool))) goto cleanup; if (virStoragePoolSetAutostart(pool, args->autostart) < 0) @@ -6050,8 +5923,7 @@ remoteDispatchStoragePoolUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) + if (!(pool = get_nonnull_storage_pool(conn, args->pool))) goto cleanup; if (virStoragePoolUndefine(pool) < 0) @@ -6083,8 +5955,7 @@ remoteDispatchNumOfStoragePools(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ret->num = virConnectNumOfStoragePools(conn); - if (ret->num < 0) + if ((ret->num = virConnectNumOfStoragePools(conn)) < 0) goto cleanup; rv = 0; @@ -6111,8 +5982,7 @@ remoteDispatchNumOfDefinedStoragePools(struct qemud_server *server ATTRIBUTE_UNU goto cleanup; } - ret->num = virConnectNumOfDefinedStoragePools(conn); - if (ret->num < 0) + if ((ret->num = virConnectNumOfDefinedStoragePools(conn)) < 0) goto cleanup; rv = 0; @@ -6147,8 +6017,7 @@ remoteDispatchStoragePoolListVolumes(struct qemud_server *server ATTRIBUTE_UNUSE goto cleanup; } - pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) + if (!(pool = get_nonnull_storage_pool(conn, args->pool))) goto cleanup; /* Allocate return buffer. */ @@ -6193,12 +6062,10 @@ remoteDispatchStoragePoolNumOfVolumes(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) + if (!(pool = get_nonnull_storage_pool(conn, args->pool))) goto cleanup; - ret->num = virStoragePoolNumOfVolumes(pool); - if (ret->num < 0) + if ((ret->num = virStoragePoolNumOfVolumes(pool)) < 0) goto cleanup; rv = 0; @@ -6236,12 +6103,10 @@ remoteDispatchStorageVolCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) + if (!(pool = get_nonnull_storage_pool(conn, args->pool))) goto cleanup; - vol = virStorageVolCreateXML(pool, args->xml, args->flags); - if (vol == NULL) + if (!(vol = virStorageVolCreateXML(pool, args->xml, args->flags))) goto cleanup; make_nonnull_storage_vol(&ret->vol, vol); @@ -6276,17 +6141,14 @@ remoteDispatchStorageVolCreateXmlFrom(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) + if (!(pool = get_nonnull_storage_pool(conn, args->pool))) goto cleanup; - clonevol = get_nonnull_storage_vol(conn, args->clonevol); - if (clonevol == NULL) + if (!(clonevol = get_nonnull_storage_vol(conn, args->clonevol))) goto cleanup; - newvol = virStorageVolCreateXMLFrom(pool, args->xml, clonevol, - args->flags); - if (newvol == NULL) + if (!(newvol = virStorageVolCreateXMLFrom(pool, args->xml, clonevol, + args->flags))) goto cleanup; make_nonnull_storage_vol(&ret->vol, newvol); @@ -6321,8 +6183,7 @@ remoteDispatchStorageVolDelete(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - vol = get_nonnull_storage_vol(conn, args->vol); - if (vol == NULL) + if (!(vol = get_nonnull_storage_vol(conn, args->vol))) goto cleanup; if (virStorageVolDelete(vol, args->flags) < 0) @@ -6355,8 +6216,7 @@ remoteDispatchStorageVolWipe(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - vol = get_nonnull_storage_vol(conn, args->vol); - if (vol == NULL) + if (!(vol = get_nonnull_storage_vol(conn, args->vol))) goto cleanup; if (virStorageVolWipe(vol, args->flags) < 0) @@ -6390,8 +6250,7 @@ remoteDispatchStorageVolGetInfo(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - vol = get_nonnull_storage_vol(conn, args->vol); - if (vol == NULL) + if (!(vol = get_nonnull_storage_vol(conn, args->vol))) goto cleanup; if (virStorageVolGetInfo(vol, &info) < 0) @@ -6428,13 +6287,11 @@ remoteDispatchStorageVolDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - vol = get_nonnull_storage_vol(conn, args->vol); - if (vol == NULL) + if (!(vol = get_nonnull_storage_vol(conn, args->vol))) goto cleanup; /* remoteDispatchClientRequest will free this. */ - ret->xml = virStorageVolGetXMLDesc(vol, args->flags); - if (!ret->xml) + if (!(ret->xml = virStorageVolGetXMLDesc(vol, args->flags))) goto cleanup; rv = 0; @@ -6465,13 +6322,11 @@ remoteDispatchStorageVolGetPath(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - vol = get_nonnull_storage_vol(conn, args->vol); - if (vol == NULL) + if (!(vol = get_nonnull_storage_vol(conn, args->vol))) goto cleanup; /* remoteDispatchClientRequest will free this. */ - ret->name = virStorageVolGetPath(vol); - if (!ret->name) + if (!(ret->name = virStorageVolGetPath(vol))) goto cleanup; rv = 0; @@ -6503,12 +6358,10 @@ remoteDispatchStorageVolLookupByName(struct qemud_server *server ATTRIBUTE_UNUSE goto cleanup; } - pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) + if (!(pool = get_nonnull_storage_pool(conn, args->pool))) goto cleanup; - vol = virStorageVolLookupByName(pool, args->name); - if (vol == NULL) + if (!(vol = virStorageVolLookupByName(pool, args->name))) goto cleanup; make_nonnull_storage_vol(&ret->vol, vol); @@ -6542,8 +6395,7 @@ remoteDispatchStorageVolLookupByKey(struct qemud_server *server ATTRIBUTE_UNUSED goto cleanup; } - vol = virStorageVolLookupByKey(conn, args->key); - if (vol == NULL) + if (!(vol = virStorageVolLookupByKey(conn, args->key))) goto cleanup; make_nonnull_storage_vol(&ret->vol, vol); @@ -6576,8 +6428,7 @@ remoteDispatchStorageVolLookupByPath(struct qemud_server *server ATTRIBUTE_UNUSE goto cleanup; } - vol = virStorageVolLookupByPath(conn, args->path); - if (vol == NULL) + if (!(vol = virStorageVolLookupByPath(conn, args->path))) goto cleanup; make_nonnull_storage_vol(&ret->vol, vol); @@ -6613,10 +6464,9 @@ remoteDispatchNodeNumOfDevices(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ret->num = virNodeNumOfDevices(conn, - args->cap ? *args->cap : NULL, - args->flags); - if (ret->num < 0) + if ((ret->num = virNodeNumOfDevices(conn, + args->cap ? *args->cap : NULL, + args->flags)) < 0) goto cleanup; rv = 0; @@ -6692,8 +6542,7 @@ remoteDispatchNodeDeviceLookupByName(struct qemud_server *server ATTRIBUTE_UNUSE goto cleanup; } - dev = virNodeDeviceLookupByName(conn, args->name); - if (dev == NULL) + if (!(dev = virNodeDeviceLookupByName(conn, args->name))) goto cleanup; make_nonnull_node_device(&ret->dev, dev); @@ -6726,13 +6575,11 @@ remoteDispatchNodeDeviceDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dev = virNodeDeviceLookupByName(conn, args->name); - if (dev == NULL) + if (!(dev = virNodeDeviceLookupByName(conn, args->name))) goto cleanup; /* remoteDispatchClientRequest will free this. */ - ret->xml = virNodeDeviceGetXMLDesc(dev, args->flags); - if (!ret->xml) + if (!(ret->xml = virNodeDeviceGetXMLDesc(dev, args->flags))) goto cleanup; rv = 0; @@ -6764,8 +6611,7 @@ remoteDispatchNodeDeviceGetParent(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dev = virNodeDeviceLookupByName(conn, args->name); - if (dev == NULL) + if (!(dev = virNodeDeviceLookupByName(conn, args->name))) goto cleanup; parent = virNodeDeviceGetParent(dev); @@ -6815,12 +6661,10 @@ remoteDispatchNodeDeviceNumOfCaps(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dev = virNodeDeviceLookupByName(conn, args->name); - if (dev == NULL) + if (!(dev = virNodeDeviceLookupByName(conn, args->name))) goto cleanup; - ret->num = virNodeDeviceNumOfCaps(dev); - if (ret->num < 0) + if ((ret->num = virNodeDeviceNumOfCaps(dev)) < 0) goto cleanup; rv = 0; @@ -6852,8 +6696,7 @@ remoteDispatchNodeDeviceListCaps(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dev = virNodeDeviceLookupByName(conn, args->name); - if (dev == NULL) + if (!(dev = virNodeDeviceLookupByName(conn, args->name))) goto cleanup; if (args->maxnames > REMOTE_NODE_DEVICE_NAME_LIST_MAX) { @@ -6904,8 +6747,7 @@ remoteDispatchNodeDeviceDettach(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dev = virNodeDeviceLookupByName(conn, args->name); - if (dev == NULL) + if (!(dev = virNodeDeviceLookupByName(conn, args->name))) goto cleanup; if (virNodeDeviceDettach(dev) < 0) @@ -6939,8 +6781,7 @@ remoteDispatchNodeDeviceReAttach(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dev = virNodeDeviceLookupByName(conn, args->name); - if (dev == NULL) + if (!(dev = virNodeDeviceLookupByName(conn, args->name))) goto cleanup; if (virNodeDeviceReAttach(dev) < 0) @@ -6974,8 +6815,7 @@ remoteDispatchNodeDeviceReset(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dev = virNodeDeviceLookupByName(conn, args->name); - if (dev == NULL) + if (!(dev = virNodeDeviceLookupByName(conn, args->name))) goto cleanup; if (virNodeDeviceReset(dev) < 0) @@ -7009,8 +6849,7 @@ remoteDispatchNodeDeviceCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dev = virNodeDeviceCreateXML(conn, args->xml_desc, args->flags); - if (dev == NULL) + if (!(dev = virNodeDeviceCreateXML(conn, args->xml_desc, args->flags))) goto cleanup; make_nonnull_node_device(&ret->dev, dev); @@ -7043,8 +6882,7 @@ remoteDispatchNodeDeviceDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dev = virNodeDeviceLookupByName(conn, args->name); - if (dev == NULL) + if (!(dev = virNodeDeviceLookupByName(conn, args->name))) goto cleanup; if (virNodeDeviceDestroy(dev) < 0) @@ -7077,12 +6915,10 @@ static int remoteDispatchStorageVolUpload(struct qemud_server *server ATTRIBUTE_ goto cleanup; } - vol = get_nonnull_storage_vol(conn, args->vol); - if (vol == NULL) + if (!(vol = get_nonnull_storage_vol(conn, args->vol))) goto cleanup; - stream = remoteCreateClientStream(conn, hdr); - if (!stream) + if (!(stream = remoteCreateClientStream(conn, hdr))) goto cleanup; if (virStorageVolUpload(vol, stream->st, @@ -7124,12 +6960,10 @@ static int remoteDispatchStorageVolDownload(struct qemud_server *server ATTRIBUT goto cleanup; } - vol = get_nonnull_storage_vol(conn, args->vol); - if (vol == NULL) + if (!(vol = get_nonnull_storage_vol(conn, args->vol))) goto cleanup; - stream = remoteCreateClientStream(conn, hdr); - if (!stream) + if (!(stream = remoteCreateClientStream(conn, hdr))) goto cleanup; if (virStorageVolDownload(vol, stream->st, @@ -7311,8 +7145,7 @@ remoteDispatchNumOfSecrets(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ret->num = virConnectNumOfSecrets(conn); - if (ret->num < 0) + if ((ret->num = virConnectNumOfSecrets(conn)) < 0) goto cleanup; rv = 0; @@ -7384,8 +7217,7 @@ remoteDispatchSecretDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - secret = virSecretDefineXML(conn, args->xml, args->flags); - if (secret == NULL) + if (!(secret = virSecretDefineXML(conn, args->xml, args->flags))) goto cleanup; make_nonnull_secret(&ret->secret, secret); @@ -7418,12 +7250,10 @@ remoteDispatchSecretGetValue(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - secret = get_nonnull_secret(conn, args->secret); - if (secret == NULL) + if (!(secret = get_nonnull_secret(conn, args->secret))) goto cleanup; - value = virSecretGetValue(secret, &value_size, args->flags); - if (value == NULL) + if (!(value = virSecretGetValue(secret, &value_size, args->flags))) goto cleanup; ret->value.value_len = value_size; @@ -7456,11 +7286,9 @@ remoteDispatchSecretGetXmlDesc(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - secret = get_nonnull_secret(conn, args->secret); - if (secret == NULL) + if (!(secret = get_nonnull_secret(conn, args->secret))) goto cleanup; - ret->xml = virSecretGetXMLDesc(secret, args->flags); - if (ret->xml == NULL) + if (!(ret->xml = virSecretGetXMLDesc(secret, args->flags))) goto cleanup; rv = 0; @@ -7490,8 +7318,7 @@ remoteDispatchSecretLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - secret = virSecretLookupByUUID(conn, (unsigned char *)args->uuid); - if (secret == NULL) + if (!(secret = virSecretLookupByUUID(conn, (unsigned char *)args->uuid))) goto cleanup; make_nonnull_secret(&ret->secret, secret); @@ -7523,8 +7350,7 @@ remoteDispatchSecretSetValue(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - secret = get_nonnull_secret(conn, args->secret); - if (secret == NULL) + if (!(secret = get_nonnull_secret(conn, args->secret))) goto cleanup; if (virSecretSetValue(secret, (const unsigned char *)args->value.value_val, args->value.value_len, args->flags) < 0) @@ -7557,8 +7383,7 @@ remoteDispatchSecretUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - secret = get_nonnull_secret(conn, args->secret); - if (secret == NULL) + if (!(secret = get_nonnull_secret(conn, args->secret))) goto cleanup; if (virSecretUndefine(secret) < 0) goto cleanup; @@ -7590,8 +7415,7 @@ remoteDispatchSecretLookupByUsage(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - secret = virSecretLookupByUsage(conn, args->usageType, args->usageID); - if (secret == NULL) + if (!(secret = virSecretLookupByUsage(conn, args->usageType, args->usageID))) goto cleanup; make_nonnull_secret(&ret->secret, secret); @@ -7623,13 +7447,10 @@ static int remoteDispatchDomainIsActive(struct qemud_server *server ATTRIBUTE_UN goto cleanup; } - domain = get_nonnull_domain(conn, args->dom); - if (domain == NULL) + if (!(domain = get_nonnull_domain(conn, args->dom))) goto cleanup; - ret->active = virDomainIsActive(domain); - - if (ret->active < 0) + if ((ret->active = virDomainIsActive(domain)) < 0) goto cleanup; rv = 0; @@ -7658,13 +7479,10 @@ static int remoteDispatchDomainIsPersistent(struct qemud_server *server ATTRIBUT goto cleanup; } - domain = get_nonnull_domain(conn, args->dom); - if (domain == NULL) + if (!(domain = get_nonnull_domain(conn, args->dom))) goto cleanup; - ret->persistent = virDomainIsPersistent(domain); - - if (ret->persistent < 0) + if ((ret->persistent = virDomainIsPersistent(domain)) < 0) goto cleanup; rv = 0; @@ -7693,13 +7511,10 @@ static int remoteDispatchDomainIsUpdated(struct qemud_server *server ATTRIBUTE_U goto cleanup; } - domain = get_nonnull_domain(conn, args->dom); - if (domain == NULL) + if (!(domain = get_nonnull_domain(conn, args->dom))) goto cleanup; - ret->updated = virDomainIsUpdated(domain); - - if (ret->updated < 0) + if ((ret->updated = virDomainIsUpdated(domain)) < 0) goto cleanup; rv = 0; @@ -7728,13 +7543,10 @@ static int remoteDispatchInterfaceIsActive(struct qemud_server *server ATTRIBUTE goto cleanup; } - iface = get_nonnull_interface(conn, args->iface); - if (iface == NULL) + if (!(iface = get_nonnull_interface(conn, args->iface))) goto cleanup; - ret->active = virInterfaceIsActive(iface); - - if (ret->active < 0) + if ((ret->active = virInterfaceIsActive(iface)) < 0) goto cleanup; rv = 0; @@ -7763,13 +7575,10 @@ static int remoteDispatchNetworkIsActive(struct qemud_server *server ATTRIBUTE_U goto cleanup; } - network = get_nonnull_network(conn, args->net); - if (network == NULL) + if (!(network = get_nonnull_network(conn, args->net))) goto cleanup; - ret->active = virNetworkIsActive(network); - - if (ret->active < 0) + if ((ret->active = virNetworkIsActive(network)) < 0) goto cleanup; rv = 0; @@ -7798,13 +7607,10 @@ static int remoteDispatchNetworkIsPersistent(struct qemud_server *server ATTRIBU goto cleanup; } - network = get_nonnull_network(conn, args->net); - if (network == NULL) + if (!(network = get_nonnull_network(conn, args->net))) goto cleanup; - ret->persistent = virNetworkIsPersistent(network); - - if (ret->persistent < 0) + if ((ret->persistent = virNetworkIsPersistent(network)) < 0) goto cleanup; rv = 0; @@ -7833,13 +7639,10 @@ static int remoteDispatchStoragePoolIsActive(struct qemud_server *server ATTRIBU goto cleanup; } - pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) + if (!(pool = get_nonnull_storage_pool(conn, args->pool))) goto cleanup; - ret->active = virStoragePoolIsActive(pool); - - if (ret->active < 0) + if ((ret->active = virStoragePoolIsActive(pool)) < 0) goto cleanup; rv = 0; @@ -7868,13 +7671,10 @@ static int remoteDispatchStoragePoolIsPersistent(struct qemud_server *server ATT goto cleanup; } - pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) + if (!(pool = get_nonnull_storage_pool(conn, args->pool))) goto cleanup; - ret->persistent = virStoragePoolIsPersistent(pool); - - if (ret->persistent < 0) + if ((ret->persistent = virStoragePoolIsPersistent(pool)) < 0) goto cleanup; rv = 0; @@ -7903,9 +7703,7 @@ static int remoteDispatchIsSecure(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ret->secure = virConnectIsSecure(conn); - - if (ret->secure < 0) + if ((ret->secure = virConnectIsSecure(conn)) < 0) goto cleanup; rv = 0; @@ -7934,8 +7732,7 @@ remoteDispatchCpuCompare(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - result = virConnectCompareCPU(conn, args->xml, args->flags); - if (result == VIR_CPU_COMPARE_ERROR) + if ((result = virConnectCompareCPU(conn, args->xml, args->flags)) == VIR_CPU_COMPARE_ERROR) goto cleanup; ret->result = result; @@ -7965,11 +7762,10 @@ remoteDispatchCpuBaseline(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - cpu = virConnectBaselineCPU(conn, - (const char **) args->xmlCPUs.xmlCPUs_val, - args->xmlCPUs.xmlCPUs_len, - args->flags); - if (cpu == NULL) + if (!(cpu = virConnectBaselineCPU(conn, + (const char **) args->xmlCPUs.xmlCPUs_val, + args->xmlCPUs.xmlCPUs_len, + args->flags))) goto cleanup; ret->cpu = cpu; @@ -8001,8 +7797,7 @@ remoteDispatchDomainGetJobInfo(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainGetJobInfo(dom, &info) < 0) @@ -8049,8 +7844,7 @@ remoteDispatchDomainAbortJob(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainAbortJob(dom) < 0) @@ -8084,8 +7878,7 @@ remoteDispatchDomainMigrateSetMaxDowntime(struct qemud_server *server ATTRIBUTE_ goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainMigrateSetMaxDowntime(dom, args->downtime, args->flags) < 0) @@ -8118,8 +7911,7 @@ remoteDispatchDomainMigrateSetMaxSpeed(struct qemud_server *server ATTRIBUTE_UNU goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainMigrateSetMaxSpeed(dom, args->bandwidth, args->flags) < 0) @@ -8153,12 +7945,10 @@ remoteDispatchDomainSnapshotCreateXml(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - domain = get_nonnull_domain(conn, args->domain); - if (domain == NULL) + if (!(domain = get_nonnull_domain(conn, args->domain))) goto cleanup; - snapshot = virDomainSnapshotCreateXML(domain, args->xml_desc, args->flags); - if (snapshot == NULL) + if (!(snapshot = virDomainSnapshotCreateXML(domain, args->xml_desc, args->flags))) goto cleanup; make_nonnull_domain_snapshot(&ret->snap, snapshot); @@ -8193,17 +7983,14 @@ remoteDispatchDomainSnapshotDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED goto cleanup; } - domain = get_nonnull_domain(conn, args->snap.domain); - if (domain == NULL) + if (!(domain = get_nonnull_domain(conn, args->snap.domain))) goto cleanup; - snapshot = get_nonnull_domain_snapshot(domain, args->snap); - if (snapshot == NULL) + if (!(snapshot = get_nonnull_domain_snapshot(domain, args->snap))) goto cleanup; /* remoteDispatchClientRequest will free this. */ - ret->xml = virDomainSnapshotGetXMLDesc(snapshot, args->flags); - if (!ret->xml) + if (!(ret->xml = virDomainSnapshotGetXMLDesc(snapshot, args->flags))) goto cleanup; rv = 0; @@ -8235,12 +8022,10 @@ remoteDispatchDomainSnapshotNum(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - domain = get_nonnull_domain(conn, args->domain); - if (domain == NULL) + if (!(domain = get_nonnull_domain(conn, args->domain))) goto cleanup; - ret->num = virDomainSnapshotNum(domain, args->flags); - if (ret->num < 0) + if ((ret->num = virDomainSnapshotNum(domain, args->flags)) < 0) goto cleanup; rv = 0; @@ -8277,8 +8062,7 @@ remoteDispatchDomainSnapshotListNames(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - domain = get_nonnull_domain(conn, args->domain); - if (domain == NULL) + if (!(domain = get_nonnull_domain(conn, args->domain))) goto cleanup; /* Allocate return buffer. */ @@ -8325,12 +8109,10 @@ remoteDispatchDomainSnapshotLookupByName(struct qemud_server *server ATTRIBUTE_U goto cleanup; } - domain = get_nonnull_domain(conn, args->domain); - if (domain == NULL) + if (!(domain = get_nonnull_domain(conn, args->domain))) goto cleanup; - snapshot = virDomainSnapshotLookupByName(domain, args->name, args->flags); - if (snapshot == NULL) + if (!(snapshot = virDomainSnapshotLookupByName(domain, args->name, args->flags))) goto cleanup; make_nonnull_domain_snapshot(&ret->snap, snapshot); @@ -8365,8 +8147,7 @@ remoteDispatchDomainHasCurrentSnapshot(struct qemud_server *server ATTRIBUTE_UNU goto cleanup; } - domain = get_nonnull_domain(conn, args->domain); - if (domain == NULL) + if (!(domain = get_nonnull_domain(conn, args->domain))) goto cleanup; result = virDomainHasCurrentSnapshot(domain, args->flags); @@ -8403,12 +8184,10 @@ remoteDispatchDomainSnapshotCurrent(struct qemud_server *server ATTRIBUTE_UNUSED goto cleanup; } - domain = get_nonnull_domain(conn, args->domain); - if (domain == NULL) + if (!(domain = get_nonnull_domain(conn, args->domain))) goto cleanup; - snapshot = virDomainSnapshotCurrent(domain, args->flags); - if (snapshot == NULL) + if (!(snapshot = virDomainSnapshotCurrent(domain, args->flags))) goto cleanup; make_nonnull_domain_snapshot(&ret->snap, snapshot); @@ -8443,12 +8222,10 @@ remoteDispatchDomainRevertToSnapshot(struct qemud_server *server ATTRIBUTE_UNUSE goto cleanup; } - domain = get_nonnull_domain(conn, args->snap.domain); - if (domain == NULL) + if (!(domain = get_nonnull_domain(conn, args->snap.domain))) goto cleanup; - snapshot = get_nonnull_domain_snapshot(domain, args->snap); - if (snapshot == NULL) + if (!(snapshot = get_nonnull_domain_snapshot(domain, args->snap))) goto cleanup; if (virDomainRevertToSnapshot(snapshot, args->flags) < 0) @@ -8484,12 +8261,10 @@ remoteDispatchDomainSnapshotDelete(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - domain = get_nonnull_domain(conn, args->snap.domain); - if (domain == NULL) + if (!(domain = get_nonnull_domain(conn, args->snap.domain))) goto cleanup; - snapshot = get_nonnull_domain_snapshot(domain, args->snap); - if (snapshot == NULL) + if (!(snapshot = get_nonnull_domain_snapshot(domain, args->snap))) goto cleanup; if (virDomainSnapshotDelete(snapshot, args->flags) < 0) @@ -8577,8 +8352,7 @@ remoteDispatchDomainEventsDeregisterAny(struct qemud_server *server ATTRIBUTE_UN goto cleanup; } - callbackID = client->domainEventCallbackID[args->eventID]; - if (callbackID < 0) { + if ((callbackID = client->domainEventCallbackID[args->eventID]) < 0) { virNetError(VIR_ERR_INTERNAL_ERROR, _("domain event %d not registered"), args->eventID); goto cleanup; } @@ -8614,8 +8388,7 @@ remoteDispatchNwfilterLookupByName(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - nwfilter = virNWFilterLookupByName(conn, args->name); - if (nwfilter == NULL) + if (!(nwfilter = virNWFilterLookupByName(conn, args->name))) goto cleanup; make_nonnull_nwfilter(&ret->nwfilter, nwfilter); @@ -8647,8 +8420,7 @@ remoteDispatchNwfilterLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - nwfilter = virNWFilterLookupByUUID(conn, (unsigned char *) args->uuid); - if (nwfilter == NULL) + if (!(nwfilter = virNWFilterLookupByUUID(conn, (unsigned char *) args->uuid))) goto cleanup; make_nonnull_nwfilter(&ret->nwfilter, nwfilter); @@ -8681,8 +8453,7 @@ remoteDispatchNwfilterDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - nwfilter = virNWFilterDefineXML(conn, args->xml); - if (nwfilter == NULL) + if (!(nwfilter = virNWFilterDefineXML(conn, args->xml))) goto cleanup; make_nonnull_nwfilter(&ret->nwfilter, nwfilter); @@ -8715,8 +8486,7 @@ remoteDispatchNwfilterUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - nwfilter = get_nonnull_nwfilter(conn, args->nwfilter); - if (nwfilter == NULL) + if (!(nwfilter = get_nonnull_nwfilter(conn, args->nwfilter))) goto cleanup; if (virNWFilterUndefine(nwfilter) < 0) @@ -8795,13 +8565,11 @@ remoteDispatchNwfilterGetXmlDesc(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - nwfilter = get_nonnull_nwfilter(conn, args->nwfilter); - if (nwfilter == NULL) + if (!(nwfilter = get_nonnull_nwfilter(conn, args->nwfilter))) goto cleanup; /* remoteDispatchClientRequest will free this. */ - ret->xml = virNWFilterGetXMLDesc(nwfilter, args->flags); - if (!ret->xml) + if (!(ret->xml = virNWFilterGetXMLDesc(nwfilter, args->flags))) goto cleanup; rv = 0; @@ -8831,8 +8599,7 @@ remoteDispatchNumOfNwfilters(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - ret->num = virConnectNumOfNWFilters(conn); - if (ret->num < 0) + if ((ret->num = virConnectNumOfNWFilters(conn)) < 0) goto cleanup; rv = 0; @@ -8862,8 +8629,7 @@ remoteDispatchDomainGetBlockInfo(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; if (virDomainGetBlockInfo(dom, args->path, &info, args->flags) < 0) @@ -8900,8 +8666,7 @@ qemuDispatchMonitorCommand(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - domain = get_nonnull_domain(conn, args->domain); - if (domain == NULL) + if (!(domain = get_nonnull_domain(conn, args->domain))) goto cleanup; if (virDomainQemuMonitorCommand(domain, args->cmd, &ret->result, @@ -8928,7 +8693,6 @@ remoteDispatchDomainOpenConsole(struct qemud_server *server ATTRIBUTE_UNUSED, remote_domain_open_console_args *args, void *ret ATTRIBUTE_UNUSED) { - int r; struct qemud_client_stream *stream = NULL; virDomainPtr dom = NULL; int rv = -1; @@ -8938,21 +8702,18 @@ remoteDispatchDomainOpenConsole(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - dom = get_nonnull_domain(conn, args->domain); - if (dom == NULL) + if (!(dom = get_nonnull_domain(conn, args->domain))) goto cleanup; - stream = remoteCreateClientStream(conn, hdr); - if (!stream) { + if (!(stream = remoteCreateClientStream(conn, hdr))) { virReportOOMError(); goto cleanup; } - r = virDomainOpenConsole(dom, + if (virDomainOpenConsole(dom, args->devname ? *args->devname : NULL, stream->st, - args->flags); - if (r < 0) + args->flags) < 0) goto cleanup; if (remoteAddClientStream(client, stream, 1) < 0) -- 1.7.4.2

2 1

[libvirt] [PATCH] Remove curly braces on all single-line conditional jumps in dispatcher
by Daniel P. Berrange 14 Apr '11

14 Apr '11

Replace all occurrances of if (....) { goto cleanup; } With if (.....) goto cleanup; to save one line of code * daemon/remote.c: Remove curly braces on single line conditionals --- daemon/remote.c | 951 ++++++++++++++++++------------------------------------ 1 files changed, 317 insertions(+), 634 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 325ba90..247a226 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -427,9 +427,8 @@ remoteDispatchOpen(struct qemud_server *server, ? virConnectOpenReadOnly(name) : virConnectOpen(name); - if (client->conn == NULL) { + if (client->conn == NULL) goto cleanup; - } rv = 0; @@ -476,9 +475,8 @@ remoteDispatchSupportsFeature(struct qemud_server *server ATTRIBUTE_UNUSED, ret->supported = virDrvSupportsFeature(conn, args->feature); - if (ret->supported < 0) { + if (ret->supported < 0) goto cleanup; - } rv = 0; @@ -505,9 +503,8 @@ remoteDispatchGetType(struct qemud_server *server ATTRIBUTE_UNUSED, } type = virConnectGetType(conn); - if (type == NULL) { + if (type == NULL) goto cleanup; - } /* We have to strdup because remoteDispatchClientRequest will * free this string after it's been serialised. @@ -543,9 +540,8 @@ remoteDispatchGetVersion(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virConnectGetVersion(conn, &hvVer) < 0) { + if (virConnectGetVersion(conn, &hvVer) < 0) goto cleanup; - } ret->hv_ver = hvVer; rv = 0; @@ -573,9 +569,8 @@ remoteDispatchGetLibVersion(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virConnectGetLibVersion(conn, &libVer) < 0) { + if (virConnectGetLibVersion(conn, &libVer) < 0) goto cleanup; - } ret->lib_ver = libVer; rv = 0; @@ -604,9 +599,8 @@ remoteDispatchGetHostname(struct qemud_server *server ATTRIBUTE_UNUSED, } hostname = virConnectGetHostname(conn); - if (hostname == NULL) { + if (hostname == NULL) goto cleanup; - } ret->hostname = hostname; rv = 0; @@ -635,9 +629,8 @@ remoteDispatchGetUri(struct qemud_server *server ATTRIBUTE_UNUSED, } uri = virConnectGetURI(conn); - if (uri == NULL) { + if (uri == NULL) goto cleanup; - } ret->uri = uri; rv = 0; @@ -668,9 +661,8 @@ remoteDispatchGetSysinfo(struct qemud_server *server ATTRIBUTE_UNUSED, flags = args->flags; sysinfo = virConnectGetSysinfo(conn, flags); - if (sysinfo == NULL) { + if (sysinfo == NULL) goto cleanup; - } ret->sysinfo = sysinfo; rv = 0; @@ -700,9 +692,8 @@ remoteDispatchGetMaxVcpus(struct qemud_server *server ATTRIBUTE_UNUSED, type = args->type ? *args->type : NULL; ret->max_vcpus = virConnectGetMaxVcpus(conn, type); - if (ret->max_vcpus < 0) { + if (ret->max_vcpus < 0) goto cleanup; - } rv = 0; @@ -729,9 +720,8 @@ remoteDispatchNodeGetInfo(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virNodeGetInfo(conn, &info) < 0) { + if (virNodeGetInfo(conn, &info) < 0) goto cleanup; - } memcpy(ret->model, info.model, sizeof ret->model); ret->memory = info.memory; @@ -768,9 +758,8 @@ remoteDispatchGetCapabilities(struct qemud_server *server ATTRIBUTE_UNUSED, } caps = virConnectGetCapabilities(conn); - if (caps == NULL) { + if (caps == NULL) goto cleanup; - } ret->capabilities = caps; rv = 0; @@ -814,9 +803,8 @@ remoteDispatchNodeGetCellsFreeMemory(struct qemud_server *server ATTRIBUTE_UNUSE (unsigned long long *)ret->freeMems.freeMems_val, args->startCell, args->maxCells); - if (err <= 0) { + if (err <= 0) goto cleanup; - } ret->freeMems.freeMems_len = err; rv = 0; @@ -848,9 +836,8 @@ remoteDispatchNodeGetFreeMemory(struct qemud_server *server ATTRIBUTE_UNUSED, } freeMem = virNodeGetFreeMemory(conn); - if (freeMem == 0) { + if (freeMem == 0) goto cleanup; - } ret->freeMem = freeMem; rv = 0; @@ -881,14 +868,12 @@ remoteDispatchDomainGetSchedulerType(struct qemud_server *server ATTRIBUTE_UNUSE } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } type = virDomainGetSchedulerType(dom, &nparams); - if (type == NULL) { + if (type == NULL) goto cleanup; - } ret->type = type; ret->nparams = nparams; @@ -933,14 +918,12 @@ remoteDispatchDomainGetSchedulerParameters(struct qemud_server *server ATTRIBUTE } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } r = virDomainGetSchedulerParameters(dom, params, &nparams); - if (r < 0) { + if (r < 0) goto cleanup; - } /* Serialise the scheduler parameters. */ ret->params.params_len = nparams; @@ -1046,14 +1029,12 @@ remoteDispatchDomainSetSchedulerParameters(struct qemud_server *server ATTRIBUTE } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } r = virDomainSetSchedulerParameters(dom, params, nparams); - if (r < 0) { + if (r < 0) goto cleanup; - } rv = 0; @@ -1086,14 +1067,12 @@ remoteDispatchDomainBlockStats(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } path = args->path; - if (virDomainBlockStats(dom, path, &stats, sizeof stats) < 0) { + if (virDomainBlockStats(dom, path, &stats, sizeof stats) < 0) goto cleanup; - } ret->rd_req = stats.rd_req; ret->rd_bytes = stats.rd_bytes; @@ -1131,14 +1110,12 @@ remoteDispatchDomainInterfaceStats(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } path = args->path; - if (virDomainInterfaceStats(dom, path, &stats, sizeof stats) < 0) { + if (virDomainInterfaceStats(dom, path, &stats, sizeof stats) < 0) goto cleanup; - } ret->rx_bytes = stats.rx_bytes; ret->rx_packets = stats.rx_packets; @@ -1185,9 +1162,8 @@ remoteDispatchDomainMemoryStats(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } /* Allocate stats array for making dispatch call */ if (VIR_ALLOC_N(stats, args->maxStats) < 0) { @@ -1196,9 +1172,8 @@ remoteDispatchDomainMemoryStats(struct qemud_server *server ATTRIBUTE_UNUSED, } nr_stats = virDomainMemoryStats(dom, stats, args->maxStats, 0); - if (nr_stats < 0) { + if (nr_stats < 0) goto cleanup; - } /* Allocate return buffer */ if (VIR_ALLOC_N(ret->stats.stats_val, args->maxStats) < 0) { @@ -1245,9 +1220,8 @@ remoteDispatchDomainBlockPeek(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } path = args->path; offset = args->offset; size = args->size; @@ -1266,9 +1240,8 @@ remoteDispatchDomainBlockPeek(struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainBlockPeek(dom, path, offset, size, - ret->buffer.buffer_val, flags) < 0) { + ret->buffer.buffer_val, flags) < 0) goto cleanup; - } rv = 0; @@ -1303,9 +1276,8 @@ remoteDispatchDomainMemoryPeek(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } offset = args->offset; size = args->size; flags = args->flags; @@ -1323,9 +1295,8 @@ remoteDispatchDomainMemoryPeek(struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainMemoryPeek(dom, offset, size, - ret->buffer.buffer_val, flags) < 0) { + ret->buffer.buffer_val, flags) < 0) goto cleanup; - } if (dom) virDomainFree(dom); @@ -1359,13 +1330,11 @@ remoteDispatchDomainAttachDevice(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainAttachDevice(dom, args->xml) < 0) { + if (virDomainAttachDevice(dom, args->xml) < 0) goto cleanup; - } rv = 0; @@ -1395,13 +1364,11 @@ remoteDispatchDomainAttachDeviceFlags(struct qemud_server *server ATTRIBUTE_UNUS } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainAttachDeviceFlags(dom, args->xml, args->flags) < 0) { + if (virDomainAttachDeviceFlags(dom, args->xml, args->flags) < 0) goto cleanup; - } rv = 0; @@ -1431,13 +1398,11 @@ remoteDispatchDomainUpdateDeviceFlags(struct qemud_server *server ATTRIBUTE_UNUS } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainUpdateDeviceFlags(dom, args->xml, args->flags) < 0) { + if (virDomainUpdateDeviceFlags(dom, args->xml, args->flags) < 0) goto cleanup; - } rv = 0; @@ -1467,13 +1432,11 @@ remoteDispatchDomainCreate(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainCreate(dom) < 0) { + if (virDomainCreate(dom) < 0) goto cleanup; - } rv = 0; @@ -1498,13 +1461,11 @@ remoteDispatchDomainCreateWithFlags(struct qemud_server *server ATTRIBUTE_UNUSED virDomainPtr dom = NULL; dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainCreateWithFlags(dom, args->flags) < 0) { + if (virDomainCreateWithFlags(dom, args->flags) < 0) goto cleanup; - } make_nonnull_domain(&ret->dom, dom); @@ -1536,9 +1497,8 @@ remoteDispatchDomainCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = virDomainCreateXML(conn, args->xml_desc, args->flags); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } make_nonnull_domain(&ret->dom, dom); @@ -1570,9 +1530,8 @@ remoteDispatchDomainDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = virDomainDefineXML(conn, args->xml); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } make_nonnull_domain(&ret->dom, dom); @@ -1604,13 +1563,11 @@ remoteDispatchDomainDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainDestroy(dom) < 0) { + if (virDomainDestroy(dom) < 0) goto cleanup; - } rv = 0; @@ -1640,13 +1597,11 @@ remoteDispatchDomainDetachDevice(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainDetachDevice(dom, args->xml) < 0) { + if (virDomainDetachDevice(dom, args->xml) < 0) goto cleanup; - } rv = 0; @@ -1676,13 +1631,11 @@ remoteDispatchDomainDetachDeviceFlags(struct qemud_server *server ATTRIBUTE_UNUS } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainDetachDeviceFlags(dom, args->xml, args->flags) < 0) { + if (virDomainDetachDeviceFlags(dom, args->xml, args->flags) < 0) goto cleanup; - } rv = 0; @@ -1712,15 +1665,13 @@ remoteDispatchDomainDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } /* remoteDispatchClientRequest will free this. */ ret->xml = virDomainGetXMLDesc(dom, args->flags); - if (!ret->xml) { + if (!ret->xml) goto cleanup; - } rv = 0; @@ -1753,9 +1704,8 @@ remoteDispatchDomainXmlFromNative(struct qemud_server *server ATTRIBUTE_UNUSED, args->nativeFormat, args->nativeConfig, args->flags); - if (!ret->domainXml) { + if (!ret->domainXml) goto cleanup; - } rv = 0; cleanup: @@ -1785,9 +1735,8 @@ remoteDispatchDomainXmlToNative(struct qemud_server *server ATTRIBUTE_UNUSED, args->nativeFormat, args->domainXml, args->flags); - if (!ret->nativeConfig) { + if (!ret->nativeConfig) goto cleanup; - } rv = 0; cleanup: @@ -1815,13 +1764,11 @@ remoteDispatchDomainGetAutostart(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainGetAutostart(dom, &ret->autostart) < 0) { + if (virDomainGetAutostart(dom, &ret->autostart) < 0) goto cleanup; - } rv = 0; @@ -1852,13 +1799,11 @@ remoteDispatchDomainGetInfo(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainGetInfo(dom, &info) < 0) { + if (virDomainGetInfo(dom, &info) < 0) goto cleanup; - } ret->state = info.state; ret->max_mem = info.maxMem; @@ -1894,14 +1839,12 @@ remoteDispatchDomainGetMaxMemory(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } ret->memory = virDomainGetMaxMemory(dom); - if (ret->memory == 0) { + if (ret->memory == 0) goto cleanup; - } rv = 0; @@ -1931,14 +1874,12 @@ remoteDispatchDomainGetMaxVcpus(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } ret->num = virDomainGetMaxVcpus(dom); - if (ret->num < 0) { + if (ret->num < 0) goto cleanup; - } rv = 0; @@ -1969,18 +1910,16 @@ remoteDispatchDomainGetSecurityLabel(struct qemud_server *server ATTRIBUTE_UNUSE } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } if (VIR_ALLOC(seclabel) < 0) { virReportOOMError(); goto cleanup; } - if (virDomainGetSecurityLabel(dom, seclabel) < 0) { + if (virDomainGetSecurityLabel(dom, seclabel) < 0) goto cleanup; - } ret->label.label_len = strlen(seclabel->label) + 1; if (VIR_ALLOC_N(ret->label.label_val, ret->label.label_len) < 0) { @@ -2019,9 +1958,8 @@ remoteDispatchNodeGetSecurityModel(struct qemud_server *server ATTRIBUTE_UNUSED, } memset(&secmodel, 0, sizeof secmodel); - if (virNodeGetSecurityModel(conn, &secmodel) < 0) { + if (virNodeGetSecurityModel(conn, &secmodel) < 0) goto cleanup; - } ret->model.model_len = strlen(secmodel.model) + 1; if (VIR_ALLOC_N(ret->model.model_val, ret->model.model_len) < 0) { @@ -2063,15 +2001,13 @@ remoteDispatchDomainGetOsType(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } /* remoteDispatchClientRequest will free this */ ret->type = virDomainGetOSType(dom); - if (ret->type == NULL) { + if (ret->type == NULL) goto cleanup; - } rv = 0; cleanup: @@ -2103,9 +2039,8 @@ remoteDispatchDomainGetVcpus(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } if (args->maxinfo > REMOTE_VCPUINFO_MAX) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("maxinfo > REMOTE_VCPUINFO_MAX")); @@ -2127,9 +2062,8 @@ remoteDispatchDomainGetVcpus(struct qemud_server *server ATTRIBUTE_UNUSED, info_len = virDomainGetVcpus(dom, info, args->maxinfo, cpumaps, args->maplen); - if (info_len < 0) { + if (info_len < 0) goto cleanup; - } /* Allocate the return buffer for info. */ ret->info.info_len = info_len; @@ -2187,14 +2121,12 @@ remoteDispatchDomainGetVcpusFlags(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } ret->num = virDomainGetVcpusFlags(dom, args->flags); - if (ret->num < 0) { + if (ret->num < 0) goto cleanup; - } rv = 0; @@ -2240,9 +2172,8 @@ remoteDispatchDomainMigratePrepare(struct qemud_server *server ATTRIBUTE_UNUSED, r = virDomainMigratePrepare(conn, &cookie, &cookielen, uri_in, uri_out, args->flags, dname, args->resource); - if (r < 0) { + if (r < 0) goto cleanup; - } /* remoteDispatchClientRequest will free cookie, uri_out and * the string if there is one. @@ -2285,9 +2216,8 @@ remoteDispatchDomainMigratePerform(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } dname = args->dname == NULL ? NULL : *args->dname; @@ -2296,9 +2226,8 @@ remoteDispatchDomainMigratePerform(struct qemud_server *server ATTRIBUTE_UNUSED, args->cookie.cookie_len, args->uri, args->flags, dname, args->resource); - if (r < 0) { + if (r < 0) goto cleanup; - } rv = 0; @@ -2332,9 +2261,8 @@ remoteDispatchDomainMigrateFinish(struct qemud_server *server ATTRIBUTE_UNUSED, args->cookie.cookie_len, args->uri, args->flags); - if (ddom == NULL) { + if (ddom == NULL) goto cleanup; - } make_nonnull_domain(&ret->ddom, ddom); rv = 0; @@ -2382,9 +2310,8 @@ remoteDispatchDomainMigratePrepare2(struct qemud_server *server ATTRIBUTE_UNUSED uri_in, uri_out, args->flags, dname, args->resource, args->dom_xml); - if (r < 0) { + if (r < 0) goto cleanup; - } /* remoteDispatchClientRequest will free cookie, uri_out and * the string if there is one. @@ -2424,9 +2351,8 @@ remoteDispatchDomainMigrateFinish2(struct qemud_server *server ATTRIBUTE_UNUSED, args->uri, args->flags, args->retcode); - if (ddom == NULL) { + if (ddom == NULL) goto cleanup; - } make_nonnull_domain(&ret->ddom, ddom); @@ -2470,13 +2396,11 @@ remoteDispatchDomainMigratePrepareTunnel(struct qemud_server *server ATTRIBUTE_U r = virDomainMigratePrepareTunnel(conn, stream->st, args->flags, dname, args->resource, args->dom_xml); - if (r < 0) { + if (r < 0) goto cleanup; - } - if (remoteAddClientStream(client, stream, 0) < 0) { + if (remoteAddClientStream(client, stream, 0) < 0) goto cleanup; - } rv = 0; @@ -2522,9 +2446,8 @@ remoteDispatchListDefinedDomains(struct qemud_server *server ATTRIBUTE_UNUSED, len = virConnectListDefinedDomains(conn, ret->names.names_val, args->maxnames); - if (len < 0) { + if (len < 0) goto cleanup; - } ret->names.names_len = len; rv = 0; @@ -2555,9 +2478,8 @@ remoteDispatchDomainLookupById(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = virDomainLookupByID(conn, args->id); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } make_nonnull_domain(&ret->dom, dom); @@ -2589,9 +2511,8 @@ remoteDispatchDomainLookupByName(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = virDomainLookupByName(conn, args->name); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } make_nonnull_domain(&ret->dom, dom); @@ -2623,9 +2544,8 @@ remoteDispatchDomainLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = virDomainLookupByUUID(conn, (unsigned char *) args->uuid); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } make_nonnull_domain(&ret->dom, dom); @@ -2656,9 +2576,8 @@ remoteDispatchNumOfDefinedDomains(struct qemud_server *server ATTRIBUTE_UNUSED, } ret->num = virConnectNumOfDefinedDomains(conn); - if (ret->num < 0) { + if (ret->num < 0) goto cleanup; - } rv = 0; @@ -2686,9 +2605,8 @@ remoteDispatchDomainPinVcpu(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } if (args->cpumap.cpumap_len > REMOTE_CPUMAP_MAX) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("cpumap_len > REMOTE_CPUMAP_MAX")); @@ -2698,9 +2616,8 @@ remoteDispatchDomainPinVcpu(struct qemud_server *server ATTRIBUTE_UNUSED, rv = virDomainPinVcpu(dom, args->vcpu, (unsigned char *) args->cpumap.cpumap_val, args->cpumap.cpumap_len); - if (rv < 0) { + if (rv < 0) goto cleanup; - } rv = 0; @@ -2730,13 +2647,11 @@ remoteDispatchDomainReboot(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainReboot(dom, args->flags) < 0) { + if (virDomainReboot(dom, args->flags) < 0) goto cleanup; - } rv = 0; @@ -2764,9 +2679,8 @@ remoteDispatchDomainRestore(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (virDomainRestore(conn, args->from) < 0) { + if (virDomainRestore(conn, args->from) < 0) goto cleanup; - } rv = 0; @@ -2794,13 +2708,11 @@ remoteDispatchDomainResume(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainResume(dom) < 0) { + if (virDomainResume(dom) < 0) goto cleanup; - } rv = 0; @@ -2830,13 +2742,11 @@ remoteDispatchDomainSave(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainSave(dom, args->to) < 0) { + if (virDomainSave(dom, args->to) < 0) goto cleanup; - } rv = 0; @@ -2866,13 +2776,11 @@ remoteDispatchDomainCoreDump(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainCoreDump(dom, args->to, args->flags) < 0) { + if (virDomainCoreDump(dom, args->to, args->flags) < 0) goto cleanup; - } rv = 0; @@ -2902,13 +2810,11 @@ remoteDispatchDomainSetAutostart(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainSetAutostart(dom, args->autostart) < 0) { + if (virDomainSetAutostart(dom, args->autostart) < 0) goto cleanup; - } rv = 0; @@ -2938,13 +2844,11 @@ remoteDispatchDomainSetMaxMemory(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainSetMaxMemory(dom, args->memory) < 0) { + if (virDomainSetMaxMemory(dom, args->memory) < 0) goto cleanup; - } rv = 0; @@ -2974,13 +2878,11 @@ remoteDispatchDomainSetMemory(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainSetMemory(dom, args->memory) < 0) { + if (virDomainSetMemory(dom, args->memory) < 0) goto cleanup; - } rv = 0; @@ -3010,13 +2912,11 @@ remoteDispatchDomainSetMemoryFlags(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainSetMemoryFlags(dom, args->memory, args->flags) < 0) { + if (virDomainSetMemoryFlags(dom, args->memory, args->flags) < 0) goto cleanup; - } rv = 0; @@ -3108,14 +3008,12 @@ remoteDispatchDomainSetMemoryParameters(struct qemud_server *server } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } r = virDomainSetMemoryParameters(dom, params, nparams, flags); - if (r < 0) { + if (r < 0) goto cleanup; - } rv = 0; @@ -3166,14 +3064,12 @@ remoteDispatchDomainGetMemoryParameters(struct qemud_server *server } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } r = virDomainGetMemoryParameters(dom, params, &nparams, flags); - if (r < 0) { + if (r < 0) goto cleanup; - } /* In this case, we need to send back the number of parameters * supported */ @@ -3329,14 +3225,12 @@ remoteDispatchDomainSetBlkioParameters(struct qemud_server *server } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } r = virDomainSetBlkioParameters(dom, params, nparams, flags); - if (r < 0) { + if (r < 0) goto cleanup; - } rv = 0; @@ -3387,14 +3281,12 @@ remoteDispatchDomainGetBlkioParameters(struct qemud_server *server } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } r = virDomainGetBlkioParameters(dom, params, &nparams, flags); - if (r < 0) { + if (r < 0) goto cleanup; - } /* In this case, we need to send back the number of parameters * supported */ @@ -3490,13 +3382,11 @@ remoteDispatchDomainSetVcpus(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainSetVcpus(dom, args->nvcpus) < 0) { + if (virDomainSetVcpus(dom, args->nvcpus) < 0) goto cleanup; - } rv = 0; @@ -3526,13 +3416,11 @@ remoteDispatchDomainSetVcpusFlags(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainSetVcpusFlags(dom, args->nvcpus, args->flags) < 0) { + if (virDomainSetVcpusFlags(dom, args->nvcpus, args->flags) < 0) goto cleanup; - } rv = 0; @@ -3562,13 +3450,11 @@ remoteDispatchDomainShutdown(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainShutdown(dom) < 0) { + if (virDomainShutdown(dom) < 0) goto cleanup; - } rv = 0; @@ -3598,13 +3484,11 @@ remoteDispatchDomainSuspend(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainSuspend(dom) < 0) { + if (virDomainSuspend(dom) < 0) goto cleanup; - } rv = 0; @@ -3634,13 +3518,11 @@ remoteDispatchDomainUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainUndefine(dom) < 0) { + if (virDomainUndefine(dom) < 0) goto cleanup; - } rv = 0; @@ -3683,9 +3565,8 @@ remoteDispatchListDefinedNetworks(struct qemud_server *server ATTRIBUTE_UNUSED, len = virConnectListDefinedNetworks(conn, ret->names.names_val, args->maxnames); - if (len < 0) { + if (len < 0) goto cleanup; - } ret->names.names_len = len; rv = 0; @@ -3729,9 +3610,8 @@ remoteDispatchListDomains(struct qemud_server *server ATTRIBUTE_UNUSED, len = virConnectListDomains(conn, ret->ids.ids_val, args->maxids); - if (len < 0) { + if (len < 0) goto cleanup; - } ret->ids.ids_len = len; rv = 0; @@ -3762,13 +3642,11 @@ remoteDispatchDomainManagedSave(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainManagedSave(dom, args->flags) < 0) { + if (virDomainManagedSave(dom, args->flags) < 0) goto cleanup; - } rv = 0; @@ -3798,14 +3676,12 @@ remoteDispatchDomainHasManagedSaveImage(struct qemud_server *server ATTRIBUTE_UN } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } ret->ret = virDomainHasManagedSaveImage(dom, args->flags); - if (ret->ret < 0) { + if (ret->ret < 0) goto cleanup; - } rv = 0; @@ -3835,13 +3711,11 @@ remoteDispatchDomainManagedSaveRemove(struct qemud_server *server ATTRIBUTE_UNUS } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainManagedSaveRemove(dom, args->flags) < 0) { + if (virDomainManagedSaveRemove(dom, args->flags) < 0) goto cleanup; - } rv = 0; @@ -3884,9 +3758,8 @@ remoteDispatchListNetworks(struct qemud_server *server ATTRIBUTE_UNUSED, len = virConnectListNetworks(conn, ret->names.names_val, args->maxnames); - if (len < 0) { + if (len < 0) goto cleanup; - } ret->names.names_len = len; rv = 0; @@ -3917,13 +3790,11 @@ remoteDispatchNetworkCreate(struct qemud_server *server ATTRIBUTE_UNUSED, } net = get_nonnull_network(conn, args->net); - if (net == NULL) { + if (net == NULL) goto cleanup; - } - if (virNetworkCreate(net) < 0) { + if (virNetworkCreate(net) < 0) goto cleanup; - } rv = 0; @@ -3953,9 +3824,8 @@ remoteDispatchNetworkCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED, } net = virNetworkCreateXML(conn, args->xml); - if (net == NULL) { + if (net == NULL) goto cleanup; - } make_nonnull_network(&ret->net, net); @@ -3987,9 +3857,8 @@ remoteDispatchNetworkDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED, } net = virNetworkDefineXML(conn, args->xml); - if (net == NULL) { + if (net == NULL) goto cleanup; - } make_nonnull_network(&ret->net, net); @@ -4021,13 +3890,11 @@ remoteDispatchNetworkDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, } net = get_nonnull_network(conn, args->net); - if (net == NULL) { + if (net == NULL) goto cleanup; - } - if (virNetworkDestroy(net) < 0) { + if (virNetworkDestroy(net) < 0) goto cleanup; - } rv = 0; @@ -4057,15 +3924,13 @@ remoteDispatchNetworkDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED, } net = get_nonnull_network(conn, args->net); - if (net == NULL) { + if (net == NULL) goto cleanup; - } /* remoteDispatchClientRequest will free this. */ ret->xml = virNetworkGetXMLDesc(net, args->flags); - if (!ret->xml) { + if (!ret->xml) goto cleanup; - } rv = 0; @@ -4095,13 +3960,11 @@ remoteDispatchNetworkGetAutostart(struct qemud_server *server ATTRIBUTE_UNUSED, } net = get_nonnull_network(conn, args->net); - if (net == NULL) { + if (net == NULL) goto cleanup; - } - if (virNetworkGetAutostart(net, &ret->autostart) < 0) { + if (virNetworkGetAutostart(net, &ret->autostart) < 0) goto cleanup; - } rv = 0; @@ -4131,15 +3994,13 @@ remoteDispatchNetworkGetBridgeName(struct qemud_server *server ATTRIBUTE_UNUSED, } net = get_nonnull_network(conn, args->net); - if (net == NULL) { + if (net == NULL) goto cleanup; - } /* remoteDispatchClientRequest will free this. */ ret->name = virNetworkGetBridgeName(net); - if (!ret->name) { + if (!ret->name) goto cleanup; - } rv = 0; @@ -4169,9 +4030,8 @@ remoteDispatchNetworkLookupByName(struct qemud_server *server ATTRIBUTE_UNUSED, } net = virNetworkLookupByName(conn, args->name); - if (net == NULL) { + if (net == NULL) goto cleanup; - } make_nonnull_network(&ret->net, net); @@ -4203,9 +4063,8 @@ remoteDispatchNetworkLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUSED, } net = virNetworkLookupByUUID(conn, (unsigned char *) args->uuid); - if (net == NULL) { + if (net == NULL) goto cleanup; - } make_nonnull_network(&ret->net, net); @@ -4237,13 +4096,11 @@ remoteDispatchNetworkSetAutostart(struct qemud_server *server ATTRIBUTE_UNUSED, } net = get_nonnull_network(conn, args->net); - if (net == NULL) { + if (net == NULL) goto cleanup; - } - if (virNetworkSetAutostart(net, args->autostart) < 0) { + if (virNetworkSetAutostart(net, args->autostart) < 0) goto cleanup; - } rv = 0; @@ -4273,13 +4130,11 @@ remoteDispatchNetworkUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, } net = get_nonnull_network(conn, args->net); - if (net == NULL) { + if (net == NULL) goto cleanup; - } - if (virNetworkUndefine(net) < 0) { + if (virNetworkUndefine(net) < 0) goto cleanup; - } rv = 0; @@ -4309,9 +4164,8 @@ remoteDispatchNumOfDefinedNetworks(struct qemud_server *server ATTRIBUTE_UNUSED, } len = virConnectNumOfDefinedNetworks(conn); - if (len < 0) { + if (len < 0) goto cleanup; - } ret->num = len; rv = 0; @@ -4339,9 +4193,8 @@ remoteDispatchNumOfDomains(struct qemud_server *server ATTRIBUTE_UNUSED, } ret->num = virConnectNumOfDomains(conn); - if (ret->num < 0) { + if (ret->num < 0) goto cleanup; - } rv = 0; @@ -4368,9 +4221,8 @@ remoteDispatchNumOfNetworks(struct qemud_server *server ATTRIBUTE_UNUSED, } ret->num = virConnectNumOfNetworks(conn); - if (ret->num < 0) { + if (ret->num < 0) goto cleanup; - } rv = 0; @@ -4399,9 +4251,8 @@ remoteDispatchNumOfInterfaces(struct qemud_server *server ATTRIBUTE_UNUSED, } ret->num = virConnectNumOfInterfaces(conn); - if (ret->num < 0) { + if (ret->num < 0) goto cleanup; - } rv = 0; @@ -4442,9 +4293,8 @@ remoteDispatchListInterfaces(struct qemud_server *server ATTRIBUTE_UNUSED, len = virConnectListInterfaces(conn, ret->names.names_val, args->maxnames); - if (len < 0) { + if (len < 0) goto cleanup; - } ret->names.names_len = len; rv = 0; @@ -4475,9 +4325,8 @@ remoteDispatchNumOfDefinedInterfaces(struct qemud_server *server ATTRIBUTE_UNUSE } len = virConnectNumOfDefinedInterfaces(conn); - if (len < 0) { + if (len < 0) goto cleanup; - } ret->num = len; rv = 0; @@ -4519,9 +4368,8 @@ remoteDispatchListDefinedInterfaces(struct qemud_server *server ATTRIBUTE_UNUSED len = virConnectListDefinedInterfaces(conn, ret->names.names_val, args->maxnames); - if (len < 0) { + if (len < 0) goto cleanup; - } ret->names.names_len = len; rv = 0; @@ -4552,9 +4400,8 @@ remoteDispatchInterfaceLookupByName(struct qemud_server *server ATTRIBUTE_UNUSED } iface = virInterfaceLookupByName(conn, args->name); - if (iface == NULL) { + if (iface == NULL) goto cleanup; - } make_nonnull_interface(&ret->iface, iface); @@ -4586,9 +4433,8 @@ remoteDispatchInterfaceLookupByMacString(struct qemud_server *server ATTRIBUTE_U } iface = virInterfaceLookupByMACString(conn, args->mac); - if (iface == NULL) { + if (iface == NULL) goto cleanup; - } make_nonnull_interface(&ret->iface, iface); @@ -4620,15 +4466,13 @@ remoteDispatchInterfaceGetXmlDesc(struct qemud_server *server ATTRIBUTE_UNUSED, } iface = get_nonnull_interface(conn, args->iface); - if (iface == NULL) { + if (iface == NULL) goto cleanup; - } /* remoteDispatchClientRequest will free this. */ ret->xml = virInterfaceGetXMLDesc(iface, args->flags); - if (!ret->xml) { + if (!ret->xml) goto cleanup; - } rv = 0; @@ -4658,9 +4502,8 @@ remoteDispatchInterfaceDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED, } iface = virInterfaceDefineXML(conn, args->xml, args->flags); - if (iface == NULL) { + if (iface == NULL) goto cleanup; - } make_nonnull_interface(&ret->iface, iface); @@ -4692,13 +4535,11 @@ remoteDispatchInterfaceUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, } iface = get_nonnull_interface(conn, args->iface); - if (iface == NULL) { + if (iface == NULL) goto cleanup; - } - if (virInterfaceUndefine(iface) < 0) { + if (virInterfaceUndefine(iface) < 0) goto cleanup; - } rv = 0; @@ -4728,13 +4569,11 @@ remoteDispatchInterfaceCreate(struct qemud_server *server ATTRIBUTE_UNUSED, } iface = get_nonnull_interface(conn, args->iface); - if (iface == NULL) { + if (iface == NULL) goto cleanup; - } - if (virInterfaceCreate(iface, args->flags) < 0) { + if (virInterfaceCreate(iface, args->flags) < 0) goto cleanup; - } rv = 0; @@ -4764,13 +4603,11 @@ remoteDispatchInterfaceDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, } iface = get_nonnull_interface(conn, args->iface); - if (iface == NULL) { + if (iface == NULL) goto cleanup; - } - if (virInterfaceDestroy(iface, args->flags) < 0) { + if (virInterfaceDestroy(iface, args->flags) < 0) goto cleanup; - } rv = 0; @@ -4857,9 +4694,8 @@ remoteDispatchAuthSaslInit(struct qemud_server *server, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if ((localAddr = virSocketFormatAddrFull(&sa, true, ";")) == NULL) { + if ((localAddr = virSocketFormatAddrFull(&sa, true, ";")) == NULL) goto error; - } /* Get remote address in form IPADDR:PORT */ sa.len = sizeof(sa.data.stor); @@ -5617,9 +5453,8 @@ remoteDispatchListDefinedStoragePools(struct qemud_server *server ATTRIBUTE_UNUS len = virConnectListDefinedStoragePools(conn, ret->names.names_val, args->maxnames); - if (len < 0) { + if (len < 0) goto cleanup; - } ret->names.names_len = len; rv = 0; @@ -5663,9 +5498,8 @@ remoteDispatchListStoragePools(struct qemud_server *server ATTRIBUTE_UNUSED, len = virConnectListStoragePools(conn, ret->names.names_val, args->maxnames); - if (len < 0) { + if (len < 0) goto cleanup; - } ret->names.names_len = len; rv = 0; @@ -5699,9 +5533,8 @@ remoteDispatchFindStoragePoolSources(struct qemud_server *server ATTRIBUTE_UNUSE args->type, args->srcSpec ? *args->srcSpec : NULL, args->flags); - if (ret->xml == NULL) { + if (ret->xml == NULL) goto cleanup; - } rv = 0; @@ -5730,13 +5563,11 @@ remoteDispatchStoragePoolCreate(struct qemud_server *server ATTRIBUTE_UNUSED, } pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } - if (virStoragePoolCreate(pool, args->flags) < 0) { + if (virStoragePoolCreate(pool, args->flags) < 0) goto cleanup; - } rv = 0; @@ -5766,9 +5597,8 @@ remoteDispatchStoragePoolCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED, } pool = virStoragePoolCreateXML(conn, args->xml, args->flags); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } make_nonnull_storage_pool(&ret->pool, pool); @@ -5800,9 +5630,8 @@ remoteDispatchStoragePoolDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED, } pool = virStoragePoolDefineXML(conn, args->xml, args->flags); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } make_nonnull_storage_pool(&ret->pool, pool); @@ -5834,13 +5663,11 @@ remoteDispatchStoragePoolBuild(struct qemud_server *server ATTRIBUTE_UNUSED, } pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } - if (virStoragePoolBuild(pool, args->flags) < 0) { + if (virStoragePoolBuild(pool, args->flags) < 0) goto cleanup; - } rv = 0; @@ -5871,13 +5698,11 @@ remoteDispatchStoragePoolDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, } pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } - if (virStoragePoolDestroy(pool) < 0) { + if (virStoragePoolDestroy(pool) < 0) goto cleanup; - } rv = 0; @@ -5907,13 +5732,11 @@ remoteDispatchStoragePoolDelete(struct qemud_server *server ATTRIBUTE_UNUSED, } pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } - if (virStoragePoolDelete(pool, args->flags) < 0) { + if (virStoragePoolDelete(pool, args->flags) < 0) goto cleanup; - } rv = 0; @@ -5943,13 +5766,11 @@ remoteDispatchStoragePoolRefresh(struct qemud_server *server ATTRIBUTE_UNUSED, } pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } - if (virStoragePoolRefresh(pool, args->flags) < 0) { + if (virStoragePoolRefresh(pool, args->flags) < 0) goto cleanup; - } rv = 0; @@ -5980,13 +5801,11 @@ remoteDispatchStoragePoolGetInfo(struct qemud_server *server ATTRIBUTE_UNUSED, } pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } - if (virStoragePoolGetInfo(pool, &info) < 0) { + if (virStoragePoolGetInfo(pool, &info) < 0) goto cleanup; - } ret->state = info.state; ret->capacity = info.capacity; @@ -6021,15 +5840,13 @@ remoteDispatchStoragePoolDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED, } pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } /* remoteDispatchClientRequest will free this. */ ret->xml = virStoragePoolGetXMLDesc(pool, args->flags); - if (!ret->xml) { + if (!ret->xml) goto cleanup; - } rv = 0; @@ -6059,13 +5876,11 @@ remoteDispatchStoragePoolGetAutostart(struct qemud_server *server ATTRIBUTE_UNUS } pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } - if (virStoragePoolGetAutostart(pool, &ret->autostart) < 0) { + if (virStoragePoolGetAutostart(pool, &ret->autostart) < 0) goto cleanup; - } rv = 0; @@ -6096,9 +5911,8 @@ remoteDispatchStoragePoolLookupByName(struct qemud_server *server ATTRIBUTE_UNUS } pool = virStoragePoolLookupByName(conn, args->name); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } make_nonnull_storage_pool(&ret->pool, pool); @@ -6130,9 +5944,8 @@ remoteDispatchStoragePoolLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUS } pool = virStoragePoolLookupByUUID(conn, (unsigned char *) args->uuid); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } make_nonnull_storage_pool(&ret->pool, pool); @@ -6165,14 +5978,12 @@ remoteDispatchStoragePoolLookupByVolume(struct qemud_server *server ATTRIBUTE_UN } vol = get_nonnull_storage_vol(conn, args->vol); - if (vol == NULL) { + if (vol == NULL) goto cleanup; - } pool = virStoragePoolLookupByVolume(vol); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } make_nonnull_storage_pool(&ret->pool, pool); @@ -6206,13 +6017,11 @@ remoteDispatchStoragePoolSetAutostart(struct qemud_server *server ATTRIBUTE_UNUS } pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } - if (virStoragePoolSetAutostart(pool, args->autostart) < 0) { + if (virStoragePoolSetAutostart(pool, args->autostart) < 0) goto cleanup; - } rv = 0; @@ -6242,13 +6051,11 @@ remoteDispatchStoragePoolUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, } pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } - if (virStoragePoolUndefine(pool) < 0) { + if (virStoragePoolUndefine(pool) < 0) goto cleanup; - } rv = 0; @@ -6277,9 +6084,8 @@ remoteDispatchNumOfStoragePools(struct qemud_server *server ATTRIBUTE_UNUSED, } ret->num = virConnectNumOfStoragePools(conn); - if (ret->num < 0) { + if (ret->num < 0) goto cleanup; - } rv = 0; @@ -6306,9 +6112,8 @@ remoteDispatchNumOfDefinedStoragePools(struct qemud_server *server ATTRIBUTE_UNU } ret->num = virConnectNumOfDefinedStoragePools(conn); - if (ret->num < 0) { + if (ret->num < 0) goto cleanup; - } rv = 0; @@ -6343,9 +6148,8 @@ remoteDispatchStoragePoolListVolumes(struct qemud_server *server ATTRIBUTE_UNUSE } pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } /* Allocate return buffer. */ if (VIR_ALLOC_N(ret->names.names_val, args->maxnames) < 0) { @@ -6355,9 +6159,8 @@ remoteDispatchStoragePoolListVolumes(struct qemud_server *server ATTRIBUTE_UNUSE len = virStoragePoolListVolumes(pool, ret->names.names_val, args->maxnames); - if (len < 0) { + if (len < 0) goto cleanup; - } ret->names.names_len = len; rv = 0; @@ -6391,14 +6194,12 @@ remoteDispatchStoragePoolNumOfVolumes(struct qemud_server *server ATTRIBUTE_UNUS } pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } ret->num = virStoragePoolNumOfVolumes(pool); - if (ret->num < 0) { + if (ret->num < 0) goto cleanup; - } rv = 0; @@ -6436,14 +6237,12 @@ remoteDispatchStorageVolCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED, } pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } vol = virStorageVolCreateXML(pool, args->xml, args->flags); - if (vol == NULL) { + if (vol == NULL) goto cleanup; - } make_nonnull_storage_vol(&ret->vol, vol); rv = 0; @@ -6478,20 +6277,17 @@ remoteDispatchStorageVolCreateXmlFrom(struct qemud_server *server ATTRIBUTE_UNUS } pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } clonevol = get_nonnull_storage_vol(conn, args->clonevol); - if (clonevol == NULL) { + if (clonevol == NULL) goto cleanup; - } newvol = virStorageVolCreateXMLFrom(pool, args->xml, clonevol, args->flags); - if (newvol == NULL) { + if (newvol == NULL) goto cleanup; - } make_nonnull_storage_vol(&ret->vol, newvol); rv = 0; @@ -6526,13 +6322,11 @@ remoteDispatchStorageVolDelete(struct qemud_server *server ATTRIBUTE_UNUSED, } vol = get_nonnull_storage_vol(conn, args->vol); - if (vol == NULL) { + if (vol == NULL) goto cleanup; - } - if (virStorageVolDelete(vol, args->flags) < 0) { + if (virStorageVolDelete(vol, args->flags) < 0) goto cleanup; - } rv = 0; @@ -6562,13 +6356,11 @@ remoteDispatchStorageVolWipe(struct qemud_server *server ATTRIBUTE_UNUSED, } vol = get_nonnull_storage_vol(conn, args->vol); - if (vol == NULL) { + if (vol == NULL) goto cleanup; - } - if (virStorageVolWipe(vol, args->flags) < 0) { + if (virStorageVolWipe(vol, args->flags) < 0) goto cleanup; - } rv = 0; @@ -6599,13 +6391,11 @@ remoteDispatchStorageVolGetInfo(struct qemud_server *server ATTRIBUTE_UNUSED, } vol = get_nonnull_storage_vol(conn, args->vol); - if (vol == NULL) { + if (vol == NULL) goto cleanup; - } - if (virStorageVolGetInfo(vol, &info) < 0) { + if (virStorageVolGetInfo(vol, &info) < 0) goto cleanup; - } ret->type = info.type; ret->capacity = info.capacity; @@ -6639,15 +6429,13 @@ remoteDispatchStorageVolDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED, } vol = get_nonnull_storage_vol(conn, args->vol); - if (vol == NULL) { + if (vol == NULL) goto cleanup; - } /* remoteDispatchClientRequest will free this. */ ret->xml = virStorageVolGetXMLDesc(vol, args->flags); - if (!ret->xml) { + if (!ret->xml) goto cleanup; - } rv = 0; @@ -6678,15 +6466,13 @@ remoteDispatchStorageVolGetPath(struct qemud_server *server ATTRIBUTE_UNUSED, } vol = get_nonnull_storage_vol(conn, args->vol); - if (vol == NULL) { + if (vol == NULL) goto cleanup; - } /* remoteDispatchClientRequest will free this. */ ret->name = virStorageVolGetPath(vol); - if (!ret->name) { + if (!ret->name) goto cleanup; - } rv = 0; @@ -6718,14 +6504,12 @@ remoteDispatchStorageVolLookupByName(struct qemud_server *server ATTRIBUTE_UNUSE } pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } vol = virStorageVolLookupByName(pool, args->name); - if (vol == NULL) { + if (vol == NULL) goto cleanup; - } make_nonnull_storage_vol(&ret->vol, vol); @@ -6759,9 +6543,8 @@ remoteDispatchStorageVolLookupByKey(struct qemud_server *server ATTRIBUTE_UNUSED } vol = virStorageVolLookupByKey(conn, args->key); - if (vol == NULL) { + if (vol == NULL) goto cleanup; - } make_nonnull_storage_vol(&ret->vol, vol); @@ -6794,9 +6577,8 @@ remoteDispatchStorageVolLookupByPath(struct qemud_server *server ATTRIBUTE_UNUSE } vol = virStorageVolLookupByPath(conn, args->path); - if (vol == NULL) { + if (vol == NULL) goto cleanup; - } make_nonnull_storage_vol(&ret->vol, vol); @@ -6834,9 +6616,8 @@ remoteDispatchNodeNumOfDevices(struct qemud_server *server ATTRIBUTE_UNUSED, ret->num = virNodeNumOfDevices(conn, args->cap ? *args->cap : NULL, args->flags); - if (ret->num < 0) { + if (ret->num < 0) goto cleanup; - } rv = 0; @@ -6879,9 +6660,8 @@ remoteDispatchNodeListDevices(struct qemud_server *server ATTRIBUTE_UNUSED, len = virNodeListDevices(conn, args->cap ? *args->cap : NULL, ret->names.names_val, args->maxnames, args->flags); - if (len < 0) { + if (len < 0) goto cleanup; - } ret->names.names_len = len; rv = 0; @@ -6913,9 +6693,8 @@ remoteDispatchNodeDeviceLookupByName(struct qemud_server *server ATTRIBUTE_UNUSE } dev = virNodeDeviceLookupByName(conn, args->name); - if (dev == NULL) { + if (dev == NULL) goto cleanup; - } make_nonnull_node_device(&ret->dev, dev); @@ -6948,15 +6727,13 @@ remoteDispatchNodeDeviceDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED, } dev = virNodeDeviceLookupByName(conn, args->name); - if (dev == NULL) { + if (dev == NULL) goto cleanup; - } /* remoteDispatchClientRequest will free this. */ ret->xml = virNodeDeviceGetXMLDesc(dev, args->flags); - if (!ret->xml) { + if (!ret->xml) goto cleanup; - } rv = 0; @@ -6988,9 +6765,8 @@ remoteDispatchNodeDeviceGetParent(struct qemud_server *server ATTRIBUTE_UNUSED, } dev = virNodeDeviceLookupByName(conn, args->name); - if (dev == NULL) { + if (dev == NULL) goto cleanup; - } parent = virNodeDeviceGetParent(dev); @@ -7040,14 +6816,12 @@ remoteDispatchNodeDeviceNumOfCaps(struct qemud_server *server ATTRIBUTE_UNUSED, } dev = virNodeDeviceLookupByName(conn, args->name); - if (dev == NULL) { + if (dev == NULL) goto cleanup; - } ret->num = virNodeDeviceNumOfCaps(dev); - if (ret->num < 0) { + if (ret->num < 0) goto cleanup; - } rv = 0; @@ -7079,9 +6853,8 @@ remoteDispatchNodeDeviceListCaps(struct qemud_server *server ATTRIBUTE_UNUSED, } dev = virNodeDeviceLookupByName(conn, args->name); - if (dev == NULL) { + if (dev == NULL) goto cleanup; - } if (args->maxnames > REMOTE_NODE_DEVICE_NAME_LIST_MAX) { virNetError(VIR_ERR_INTERNAL_ERROR, @@ -7097,9 +6870,8 @@ remoteDispatchNodeDeviceListCaps(struct qemud_server *server ATTRIBUTE_UNUSED, len = virNodeDeviceListCaps(dev, ret->names.names_val, args->maxnames); - if (len < 0) { + if (len < 0) goto cleanup; - } ret->names.names_len = len; rv = 0; @@ -7133,13 +6905,11 @@ remoteDispatchNodeDeviceDettach(struct qemud_server *server ATTRIBUTE_UNUSED, } dev = virNodeDeviceLookupByName(conn, args->name); - if (dev == NULL) { + if (dev == NULL) goto cleanup; - } - if (virNodeDeviceDettach(dev) < 0) { + if (virNodeDeviceDettach(dev) < 0) goto cleanup; - } rv = 0; @@ -7170,13 +6940,11 @@ remoteDispatchNodeDeviceReAttach(struct qemud_server *server ATTRIBUTE_UNUSED, } dev = virNodeDeviceLookupByName(conn, args->name); - if (dev == NULL) { + if (dev == NULL) goto cleanup; - } - if (virNodeDeviceReAttach(dev) < 0) { + if (virNodeDeviceReAttach(dev) < 0) goto cleanup; - } rv = 0; @@ -7207,13 +6975,11 @@ remoteDispatchNodeDeviceReset(struct qemud_server *server ATTRIBUTE_UNUSED, } dev = virNodeDeviceLookupByName(conn, args->name); - if (dev == NULL) { + if (dev == NULL) goto cleanup; - } - if (virNodeDeviceReset(dev) < 0) { + if (virNodeDeviceReset(dev) < 0) goto cleanup; - } rv = 0; @@ -7244,9 +7010,8 @@ remoteDispatchNodeDeviceCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED, } dev = virNodeDeviceCreateXML(conn, args->xml_desc, args->flags); - if (dev == NULL) { + if (dev == NULL) goto cleanup; - } make_nonnull_node_device(&ret->dev, dev); @@ -7279,13 +7044,11 @@ remoteDispatchNodeDeviceDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, } dev = virNodeDeviceLookupByName(conn, args->name); - if (dev == NULL) { + if (dev == NULL) goto cleanup; - } - if (virNodeDeviceDestroy(dev) < 0) { + if (virNodeDeviceDestroy(dev) < 0) goto cleanup; - } rv = 0; @@ -7315,24 +7078,20 @@ static int remoteDispatchStorageVolUpload(struct qemud_server *server ATTRIBUTE_ } vol = get_nonnull_storage_vol(conn, args->vol); - if (vol == NULL) { + if (vol == NULL) goto cleanup; - } stream = remoteCreateClientStream(conn, hdr); - if (!stream) { + if (!stream) goto cleanup; - } if (virStorageVolUpload(vol, stream->st, args->offset, args->length, - args->flags) < 0) { + args->flags) < 0) goto cleanup; - } - if (remoteAddClientStream(client, stream, 0) < 0) { + if (remoteAddClientStream(client, stream, 0) < 0) goto cleanup; - } rv = 0; @@ -7366,24 +7125,20 @@ static int remoteDispatchStorageVolDownload(struct qemud_server *server ATTRIBUT } vol = get_nonnull_storage_vol(conn, args->vol); - if (vol == NULL) { + if (vol == NULL) goto cleanup; - } stream = remoteCreateClientStream(conn, hdr); - if (!stream) { + if (!stream) goto cleanup; - } if (virStorageVolDownload(vol, stream->st, args->offset, args->length, - args->flags) < 0) { + args->flags) < 0) goto cleanup; - } - if (remoteAddClientStream(client, stream, 1) < 0) { + if (remoteAddClientStream(client, stream, 1) < 0) goto cleanup; - } rv = 0; @@ -7429,9 +7184,8 @@ remoteDispatchDomainEventsRegister(struct qemud_server *server ATTRIBUTE_UNUSED, NULL, VIR_DOMAIN_EVENT_ID_LIFECYCLE, VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventLifecycle), - client, NULL)) < 0) { + client, NULL)) < 0) goto cleanup; - } client->domainEventCallbackID[VIR_DOMAIN_EVENT_ID_LIFECYCLE] = callbackID; @@ -7465,9 +7219,8 @@ remoteDispatchDomainEventsDeregister(struct qemud_server *server ATTRIBUTE_UNUSE } if (virConnectDomainEventDeregisterAny(conn, - client->domainEventCallbackID[VIR_DOMAIN_EVENT_ID_LIFECYCLE]) < 0) { + client->domainEventCallbackID[VIR_DOMAIN_EVENT_ID_LIFECYCLE]) < 0) goto cleanup; - } client->domainEventCallbackID[VIR_DOMAIN_EVENT_ID_LIFECYCLE] = -1; rv = 0; @@ -7559,9 +7312,8 @@ remoteDispatchNumOfSecrets(struct qemud_server *server ATTRIBUTE_UNUSED, } ret->num = virConnectNumOfSecrets(conn); - if (ret->num < 0) { + if (ret->num < 0) goto cleanup; - } rv = 0; @@ -7601,9 +7353,8 @@ remoteDispatchListSecrets(struct qemud_server *server ATTRIBUTE_UNUSED, len = virConnectListSecrets(conn, ret->uuids.uuids_val, args->maxuuids); - if (len < 0) { + if (len < 0) goto cleanup; - } ret->uuids.uuids_len = len; rv = 0; @@ -7634,9 +7385,8 @@ remoteDispatchSecretDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED, } secret = virSecretDefineXML(conn, args->xml, args->flags); - if (secret == NULL) { + if (secret == NULL) goto cleanup; - } make_nonnull_secret(&ret->secret, secret); rv = 0; @@ -7669,14 +7419,12 @@ remoteDispatchSecretGetValue(struct qemud_server *server ATTRIBUTE_UNUSED, } secret = get_nonnull_secret(conn, args->secret); - if (secret == NULL) { + if (secret == NULL) goto cleanup; - } value = virSecretGetValue(secret, &value_size, args->flags); - if (value == NULL) { + if (value == NULL) goto cleanup; - } ret->value.value_len = value_size; ret->value.value_val = (char *)value; @@ -7709,13 +7457,11 @@ remoteDispatchSecretGetXmlDesc(struct qemud_server *server ATTRIBUTE_UNUSED, } secret = get_nonnull_secret(conn, args->secret); - if (secret == NULL) { + if (secret == NULL) goto cleanup; - } ret->xml = virSecretGetXMLDesc(secret, args->flags); - if (ret->xml == NULL) { + if (ret->xml == NULL) goto cleanup; - } rv = 0; @@ -7745,9 +7491,8 @@ remoteDispatchSecretLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUSED, } secret = virSecretLookupByUUID(conn, (unsigned char *)args->uuid); - if (secret == NULL) { + if (secret == NULL) goto cleanup; - } make_nonnull_secret(&ret->secret, secret); @@ -7779,13 +7524,11 @@ remoteDispatchSecretSetValue(struct qemud_server *server ATTRIBUTE_UNUSED, } secret = get_nonnull_secret(conn, args->secret); - if (secret == NULL) { + if (secret == NULL) goto cleanup; - } if (virSecretSetValue(secret, (const unsigned char *)args->value.value_val, - args->value.value_len, args->flags) < 0) { + args->value.value_len, args->flags) < 0) goto cleanup; - } rv = 0; @@ -7815,12 +7558,10 @@ remoteDispatchSecretUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, } secret = get_nonnull_secret(conn, args->secret); - if (secret == NULL) { + if (secret == NULL) goto cleanup; - } - if (virSecretUndefine(secret) < 0) { + if (virSecretUndefine(secret) < 0) goto cleanup; - } rv = 0; @@ -7850,9 +7591,8 @@ remoteDispatchSecretLookupByUsage(struct qemud_server *server ATTRIBUTE_UNUSED, } secret = virSecretLookupByUsage(conn, args->usageType, args->usageID); - if (secret == NULL) { + if (secret == NULL) goto cleanup; - } make_nonnull_secret(&ret->secret, secret); @@ -7884,15 +7624,13 @@ static int remoteDispatchDomainIsActive(struct qemud_server *server ATTRIBUTE_UN } domain = get_nonnull_domain(conn, args->dom); - if (domain == NULL) { + if (domain == NULL) goto cleanup; - } ret->active = virDomainIsActive(domain); - if (ret->active < 0) { + if (ret->active < 0) goto cleanup; - } rv = 0; @@ -7921,15 +7659,13 @@ static int remoteDispatchDomainIsPersistent(struct qemud_server *server ATTRIBUT } domain = get_nonnull_domain(conn, args->dom); - if (domain == NULL) { + if (domain == NULL) goto cleanup; - } ret->persistent = virDomainIsPersistent(domain); - if (ret->persistent < 0) { + if (ret->persistent < 0) goto cleanup; - } rv = 0; @@ -7958,15 +7694,13 @@ static int remoteDispatchDomainIsUpdated(struct qemud_server *server ATTRIBUTE_U } domain = get_nonnull_domain(conn, args->dom); - if (domain == NULL) { + if (domain == NULL) goto cleanup; - } ret->updated = virDomainIsUpdated(domain); - if (ret->updated < 0) { + if (ret->updated < 0) goto cleanup; - } rv = 0; @@ -7995,15 +7729,13 @@ static int remoteDispatchInterfaceIsActive(struct qemud_server *server ATTRIBUTE } iface = get_nonnull_interface(conn, args->iface); - if (iface == NULL) { + if (iface == NULL) goto cleanup; - } ret->active = virInterfaceIsActive(iface); - if (ret->active < 0) { + if (ret->active < 0) goto cleanup; - } rv = 0; @@ -8032,15 +7764,13 @@ static int remoteDispatchNetworkIsActive(struct qemud_server *server ATTRIBUTE_U } network = get_nonnull_network(conn, args->net); - if (network == NULL) { + if (network == NULL) goto cleanup; - } ret->active = virNetworkIsActive(network); - if (ret->active < 0) { + if (ret->active < 0) goto cleanup; - } rv = 0; @@ -8069,15 +7799,13 @@ static int remoteDispatchNetworkIsPersistent(struct qemud_server *server ATTRIBU } network = get_nonnull_network(conn, args->net); - if (network == NULL) { + if (network == NULL) goto cleanup; - } ret->persistent = virNetworkIsPersistent(network); - if (ret->persistent < 0) { + if (ret->persistent < 0) goto cleanup; - } rv = 0; @@ -8106,15 +7834,13 @@ static int remoteDispatchStoragePoolIsActive(struct qemud_server *server ATTRIBU } pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } ret->active = virStoragePoolIsActive(pool); - if (ret->active < 0) { + if (ret->active < 0) goto cleanup; - } rv = 0; @@ -8143,15 +7869,13 @@ static int remoteDispatchStoragePoolIsPersistent(struct qemud_server *server ATT } pool = get_nonnull_storage_pool(conn, args->pool); - if (pool == NULL) { + if (pool == NULL) goto cleanup; - } ret->persistent = virStoragePoolIsPersistent(pool); - if (ret->persistent < 0) { + if (ret->persistent < 0) goto cleanup; - } rv = 0; @@ -8181,9 +7905,8 @@ static int remoteDispatchIsSecure(struct qemud_server *server ATTRIBUTE_UNUSED, ret->secure = virConnectIsSecure(conn); - if (ret->secure < 0) { + if (ret->secure < 0) goto cleanup; - } rv = 0; @@ -8212,9 +7935,8 @@ remoteDispatchCpuCompare(struct qemud_server *server ATTRIBUTE_UNUSED, } result = virConnectCompareCPU(conn, args->xml, args->flags); - if (result == VIR_CPU_COMPARE_ERROR) { + if (result == VIR_CPU_COMPARE_ERROR) goto cleanup; - } ret->result = result; rv = 0; @@ -8247,9 +7969,8 @@ remoteDispatchCpuBaseline(struct qemud_server *server ATTRIBUTE_UNUSED, (const char **) args->xmlCPUs.xmlCPUs_val, args->xmlCPUs.xmlCPUs_len, args->flags); - if (cpu == NULL) { + if (cpu == NULL) goto cleanup; - } ret->cpu = cpu; @@ -8281,13 +8002,11 @@ remoteDispatchDomainGetJobInfo(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainGetJobInfo(dom, &info) < 0) { + if (virDomainGetJobInfo(dom, &info) < 0) goto cleanup; - } ret->type = info.type; ret->timeElapsed = info.timeElapsed; @@ -8331,13 +8050,11 @@ remoteDispatchDomainAbortJob(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainAbortJob(dom) < 0) { + if (virDomainAbortJob(dom) < 0) goto cleanup; - } rv = 0; @@ -8368,13 +8085,11 @@ remoteDispatchDomainMigrateSetMaxDowntime(struct qemud_server *server ATTRIBUTE_ } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainMigrateSetMaxDowntime(dom, args->downtime, args->flags) < 0) { + if (virDomainMigrateSetMaxDowntime(dom, args->downtime, args->flags) < 0) goto cleanup; - } rv = 0; @@ -8404,13 +8119,11 @@ remoteDispatchDomainMigrateSetMaxSpeed(struct qemud_server *server ATTRIBUTE_UNU } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainMigrateSetMaxSpeed(dom, args->bandwidth, args->flags) < 0) { + if (virDomainMigrateSetMaxSpeed(dom, args->bandwidth, args->flags) < 0) goto cleanup; - } rv = 0; @@ -8441,14 +8154,12 @@ remoteDispatchDomainSnapshotCreateXml(struct qemud_server *server ATTRIBUTE_UNUS } domain = get_nonnull_domain(conn, args->domain); - if (domain == NULL) { + if (domain == NULL) goto cleanup; - } snapshot = virDomainSnapshotCreateXML(domain, args->xml_desc, args->flags); - if (snapshot == NULL) { + if (snapshot == NULL) goto cleanup; - } make_nonnull_domain_snapshot(&ret->snap, snapshot); @@ -8525,14 +8236,12 @@ remoteDispatchDomainSnapshotNum(struct qemud_server *server ATTRIBUTE_UNUSED, } domain = get_nonnull_domain(conn, args->domain); - if (domain == NULL) { + if (domain == NULL) goto cleanup; - } ret->num = virDomainSnapshotNum(domain, args->flags); - if (ret->num < 0) { + if (ret->num < 0) goto cleanup; - } rv = 0; @@ -8569,9 +8278,8 @@ remoteDispatchDomainSnapshotListNames(struct qemud_server *server ATTRIBUTE_UNUS } domain = get_nonnull_domain(conn, args->domain); - if (domain == NULL) { + if (domain == NULL) goto cleanup; - } /* Allocate return buffer. */ if (VIR_ALLOC_N(ret->names.names_val, args->nameslen) < 0) { @@ -8583,9 +8291,8 @@ remoteDispatchDomainSnapshotListNames(struct qemud_server *server ATTRIBUTE_UNUS ret->names.names_val, args->nameslen, args->flags); - if (len < 0) { + if (len < 0) goto cleanup; - } ret->names.names_len = len; rv = 0; @@ -8619,14 +8326,12 @@ remoteDispatchDomainSnapshotLookupByName(struct qemud_server *server ATTRIBUTE_U } domain = get_nonnull_domain(conn, args->domain); - if (domain == NULL) { + if (domain == NULL) goto cleanup; - } snapshot = virDomainSnapshotLookupByName(domain, args->name, args->flags); - if (snapshot == NULL) { + if (snapshot == NULL) goto cleanup; - } make_nonnull_domain_snapshot(&ret->snap, snapshot); @@ -8661,14 +8366,12 @@ remoteDispatchDomainHasCurrentSnapshot(struct qemud_server *server ATTRIBUTE_UNU } domain = get_nonnull_domain(conn, args->domain); - if (domain == NULL) { + if (domain == NULL) goto cleanup; - } result = virDomainHasCurrentSnapshot(domain, args->flags); - if (result < 0) { + if (result < 0) goto cleanup; - } ret->result = result; @@ -8701,14 +8404,12 @@ remoteDispatchDomainSnapshotCurrent(struct qemud_server *server ATTRIBUTE_UNUSED } domain = get_nonnull_domain(conn, args->domain); - if (domain == NULL) { + if (domain == NULL) goto cleanup; - } snapshot = virDomainSnapshotCurrent(domain, args->flags); - if (snapshot == NULL) { + if (snapshot == NULL) goto cleanup; - } make_nonnull_domain_snapshot(&ret->snap, snapshot); @@ -8839,9 +8540,8 @@ remoteDispatchDomainEventsRegisterAny(struct qemud_server *server ATTRIBUTE_UNUS NULL, args->eventID, domainEventCallbacks[args->eventID], - client, NULL)) < 0) { + client, NULL)) < 0) goto cleanup; - } client->domainEventCallbackID[args->eventID] = callbackID; @@ -8883,9 +8583,8 @@ remoteDispatchDomainEventsDeregisterAny(struct qemud_server *server ATTRIBUTE_UN goto cleanup; } - if (virConnectDomainEventDeregisterAny(conn, callbackID) < 0) { + if (virConnectDomainEventDeregisterAny(conn, callbackID) < 0) goto cleanup; - } client->domainEventCallbackID[args->eventID] = -1; rv = 0; @@ -8916,9 +8615,8 @@ remoteDispatchNwfilterLookupByName(struct qemud_server *server ATTRIBUTE_UNUSED, } nwfilter = virNWFilterLookupByName(conn, args->name); - if (nwfilter == NULL) { + if (nwfilter == NULL) goto cleanup; - } make_nonnull_nwfilter(&ret->nwfilter, nwfilter); @@ -8950,9 +8648,8 @@ remoteDispatchNwfilterLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUSED, } nwfilter = virNWFilterLookupByUUID(conn, (unsigned char *) args->uuid); - if (nwfilter == NULL) { + if (nwfilter == NULL) goto cleanup; - } make_nonnull_nwfilter(&ret->nwfilter, nwfilter); @@ -8985,9 +8682,8 @@ remoteDispatchNwfilterDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED, } nwfilter = virNWFilterDefineXML(conn, args->xml); - if (nwfilter == NULL) { + if (nwfilter == NULL) goto cleanup; - } make_nonnull_nwfilter(&ret->nwfilter, nwfilter); @@ -9020,13 +8716,11 @@ remoteDispatchNwfilterUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, } nwfilter = get_nonnull_nwfilter(conn, args->nwfilter); - if (nwfilter == NULL) { + if (nwfilter == NULL) goto cleanup; - } - if (virNWFilterUndefine(nwfilter) < 0) { + if (virNWFilterUndefine(nwfilter) < 0) goto cleanup; - } rv = 0; @@ -9069,9 +8763,8 @@ remoteDispatchListNwfilters(struct qemud_server *server ATTRIBUTE_UNUSED, len = virConnectListNWFilters(conn, ret->names.names_val, args->maxnames); - if (len < 0) { + if (len < 0) goto cleanup; - } ret->names.names_len = len; rv = 0; @@ -9103,15 +8796,13 @@ remoteDispatchNwfilterGetXmlDesc(struct qemud_server *server ATTRIBUTE_UNUSED, } nwfilter = get_nonnull_nwfilter(conn, args->nwfilter); - if (nwfilter == NULL) { + if (nwfilter == NULL) goto cleanup; - } /* remoteDispatchClientRequest will free this. */ ret->xml = virNWFilterGetXMLDesc(nwfilter, args->flags); - if (!ret->xml) { + if (!ret->xml) goto cleanup; - } rv = 0; @@ -9141,9 +8832,8 @@ remoteDispatchNumOfNwfilters(struct qemud_server *server ATTRIBUTE_UNUSED, } ret->num = virConnectNumOfNWFilters(conn); - if (ret->num < 0) { + if (ret->num < 0) goto cleanup; - } rv = 0; @@ -9173,13 +8863,11 @@ remoteDispatchDomainGetBlockInfo(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->dom); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } - if (virDomainGetBlockInfo(dom, args->path, &info, args->flags) < 0) { + if (virDomainGetBlockInfo(dom, args->path, &info, args->flags) < 0) goto cleanup; - } ret->capacity = info.capacity; ret->allocation = info.allocation; @@ -9213,14 +8901,12 @@ qemuDispatchMonitorCommand(struct qemud_server *server ATTRIBUTE_UNUSED, } domain = get_nonnull_domain(conn, args->domain); - if (domain == NULL) { + if (domain == NULL) goto cleanup; - } if (virDomainQemuMonitorCommand(domain, args->cmd, &ret->result, - args->flags) < 0) { + args->flags) < 0) goto cleanup; - } rv = 0; @@ -9253,9 +8939,8 @@ remoteDispatchDomainOpenConsole(struct qemud_server *server ATTRIBUTE_UNUSED, } dom = get_nonnull_domain(conn, args->domain); - if (dom == NULL) { + if (dom == NULL) goto cleanup; - } stream = remoteCreateClientStream(conn, hdr); if (!stream) { @@ -9267,13 +8952,11 @@ remoteDispatchDomainOpenConsole(struct qemud_server *server ATTRIBUTE_UNUSED, args->devname ? *args->devname : NULL, stream->st, args->flags); - if (r < 0) { + if (r < 0) goto cleanup; - } - if (remoteAddClientStream(client, stream, 1) < 0) { + if (remoteAddClientStream(client, stream, 1) < 0) goto cleanup; - } rv = 0; -- 1.7.4.2

2 1

[libvirt] [PATCH] Change some variable names to follow standard in daemon dispatcher
by Daniel P. Berrange 13 Apr '11

13 Apr '11

Replace some occurrances of virDomainPtr domain; virNetworkPtr network; With virDomainPtr dom; virNetworkPtr net; * daemon/remote.c: Fix variable naming to follow standard --- daemon/remote.c | 194 +++++++++++++++++++++++++++--------------------------- 1 files changed, 97 insertions(+), 97 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 66df9f7..eb2727d 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -75,7 +75,7 @@ static virStoragePoolPtr get_nonnull_storage_pool(virConnectPtr conn, remote_non static virStorageVolPtr get_nonnull_storage_vol(virConnectPtr conn, remote_nonnull_storage_vol vol); static virSecretPtr get_nonnull_secret(virConnectPtr conn, remote_nonnull_secret secret); static virNWFilterPtr get_nonnull_nwfilter(virConnectPtr conn, remote_nonnull_nwfilter nwfilter); -static virDomainSnapshotPtr get_nonnull_domain_snapshot(virDomainPtr domain, remote_nonnull_domain_snapshot snapshot); +static virDomainSnapshotPtr get_nonnull_domain_snapshot(virDomainPtr dom, remote_nonnull_domain_snapshot snapshot); static void make_nonnull_domain(remote_nonnull_domain *dom_dst, virDomainPtr dom_src); static void make_nonnull_network(remote_nonnull_network *net_dst, virNetworkPtr net_src); static void make_nonnull_interface(remote_nonnull_interface *interface_dst, virInterfacePtr interface_src); @@ -2198,7 +2198,7 @@ remoteDispatchDomainMigrateFinish(struct qemud_server *server ATTRIBUTE_UNUSED, remote_domain_migrate_finish_args *args, remote_domain_migrate_finish_ret *ret) { - virDomainPtr ddom = NULL; + virDomainPtr dom = NULL; int rv = -1; if (!conn) { @@ -2206,21 +2206,21 @@ remoteDispatchDomainMigrateFinish(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (!(ddom = virDomainMigrateFinish(conn, args->dname, - args->cookie.cookie_val, - args->cookie.cookie_len, - args->uri, - args->flags))) + if (!(dom = virDomainMigrateFinish(conn, args->dname, + args->cookie.cookie_val, + args->cookie.cookie_len, + args->uri, + args->flags))) goto cleanup; - make_nonnull_domain(&ret->ddom, ddom); + make_nonnull_domain(&ret->ddom, dom); rv = 0; cleanup: if (rv < 0) remoteDispatchError(rerr); - if (ddom) - virDomainFree(ddom); + if (dom) + virDomainFree(dom); return rv; } @@ -2284,7 +2284,7 @@ remoteDispatchDomainMigrateFinish2(struct qemud_server *server ATTRIBUTE_UNUSED, remote_domain_migrate_finish2_args *args, remote_domain_migrate_finish2_ret *ret) { - virDomainPtr ddom = NULL; + virDomainPtr dom = NULL; int rv = -1; if (!conn) { @@ -2292,23 +2292,23 @@ remoteDispatchDomainMigrateFinish2(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (!(ddom = virDomainMigrateFinish2(conn, args->dname, - args->cookie.cookie_val, - args->cookie.cookie_len, - args->uri, - args->flags, - args->retcode))) + if (!(dom = virDomainMigrateFinish2(conn, args->dname, + args->cookie.cookie_val, + args->cookie.cookie_len, + args->uri, + args->flags, + args->retcode))) goto cleanup; - make_nonnull_domain(&ret->ddom, ddom); + make_nonnull_domain(&ret->ddom, dom); rv = 0; cleanup: if (rv < 0) remoteDispatchError(rerr); - if (ddom) - virDomainFree(ddom); + if (dom) + virDomainFree(dom); return rv; } @@ -7439,7 +7439,7 @@ static int remoteDispatchDomainIsActive(struct qemud_server *server ATTRIBUTE_UN remote_domain_is_active_args *args, remote_domain_is_active_ret *ret) { - virDomainPtr domain = NULL; + virDomainPtr dom = NULL; int rv = -1; if (!conn) { @@ -7447,10 +7447,10 @@ static int remoteDispatchDomainIsActive(struct qemud_server *server ATTRIBUTE_UN goto cleanup; } - if (!(domain = get_nonnull_domain(conn, args->dom))) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; - if ((ret->active = virDomainIsActive(domain)) < 0) + if ((ret->active = virDomainIsActive(dom)) < 0) goto cleanup; rv = 0; @@ -7458,8 +7458,8 @@ static int remoteDispatchDomainIsActive(struct qemud_server *server ATTRIBUTE_UN cleanup: if (rv < 0) remoteDispatchError(rerr); - if (domain) - virDomainFree(domain); + if (dom) + virDomainFree(dom); return rv; } @@ -7471,7 +7471,7 @@ static int remoteDispatchDomainIsPersistent(struct qemud_server *server ATTRIBUT remote_domain_is_persistent_args *args, remote_domain_is_persistent_ret *ret) { - virDomainPtr domain = NULL; + virDomainPtr dom = NULL; int rv = -1; if (!conn) { @@ -7479,10 +7479,10 @@ static int remoteDispatchDomainIsPersistent(struct qemud_server *server ATTRIBUT goto cleanup; } - if (!(domain = get_nonnull_domain(conn, args->dom))) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; - if ((ret->persistent = virDomainIsPersistent(domain)) < 0) + if ((ret->persistent = virDomainIsPersistent(dom)) < 0) goto cleanup; rv = 0; @@ -7490,8 +7490,8 @@ static int remoteDispatchDomainIsPersistent(struct qemud_server *server ATTRIBUT cleanup: if (rv < 0) remoteDispatchError(rerr); - if (domain) - virDomainFree(domain); + if (dom) + virDomainFree(dom); return rv; } @@ -7503,7 +7503,7 @@ static int remoteDispatchDomainIsUpdated(struct qemud_server *server ATTRIBUTE_U remote_domain_is_updated_args *args, remote_domain_is_updated_ret *ret) { - virDomainPtr domain = NULL; + virDomainPtr dom = NULL; int rv = -1; if (!conn) { @@ -7511,10 +7511,10 @@ static int remoteDispatchDomainIsUpdated(struct qemud_server *server ATTRIBUTE_U goto cleanup; } - if (!(domain = get_nonnull_domain(conn, args->dom))) + if (!(dom = get_nonnull_domain(conn, args->dom))) goto cleanup; - if ((ret->updated = virDomainIsUpdated(domain)) < 0) + if ((ret->updated = virDomainIsUpdated(dom)) < 0) goto cleanup; rv = 0; @@ -7522,8 +7522,8 @@ static int remoteDispatchDomainIsUpdated(struct qemud_server *server ATTRIBUTE_U cleanup: if (rv < 0) remoteDispatchError(rerr); - if (domain) - virDomainFree(domain); + if (dom) + virDomainFree(dom); return rv; } @@ -7567,7 +7567,7 @@ static int remoteDispatchNetworkIsActive(struct qemud_server *server ATTRIBUTE_U remote_network_is_active_args *args, remote_network_is_active_ret *ret) { - virNetworkPtr network = NULL; + virNetworkPtr net = NULL; int rv = -1; if (!conn) { @@ -7575,10 +7575,10 @@ static int remoteDispatchNetworkIsActive(struct qemud_server *server ATTRIBUTE_U goto cleanup; } - if (!(network = get_nonnull_network(conn, args->net))) + if (!(net = get_nonnull_network(conn, args->net))) goto cleanup; - if ((ret->active = virNetworkIsActive(network)) < 0) + if ((ret->active = virNetworkIsActive(net)) < 0) goto cleanup; rv = 0; @@ -7586,8 +7586,8 @@ static int remoteDispatchNetworkIsActive(struct qemud_server *server ATTRIBUTE_U cleanup: if (rv < 0) remoteDispatchError(rerr); - if (network) - virNetworkFree(network); + if (net) + virNetworkFree(net); return rv; } @@ -7599,7 +7599,7 @@ static int remoteDispatchNetworkIsPersistent(struct qemud_server *server ATTRIBU remote_network_is_persistent_args *args, remote_network_is_persistent_ret *ret) { - virNetworkPtr network = NULL; + virNetworkPtr net = NULL; int rv = -1; if (!conn) { @@ -7607,10 +7607,10 @@ static int remoteDispatchNetworkIsPersistent(struct qemud_server *server ATTRIBU goto cleanup; } - if (!(network = get_nonnull_network(conn, args->net))) + if (!(net = get_nonnull_network(conn, args->net))) goto cleanup; - if ((ret->persistent = virNetworkIsPersistent(network)) < 0) + if ((ret->persistent = virNetworkIsPersistent(net)) < 0) goto cleanup; rv = 0; @@ -7618,8 +7618,8 @@ static int remoteDispatchNetworkIsPersistent(struct qemud_server *server ATTRIBU cleanup: if (rv < 0) remoteDispatchError(rerr); - if (network) - virNetworkFree(network); + if (net) + virNetworkFree(net); return rv; } @@ -7937,7 +7937,7 @@ remoteDispatchDomainSnapshotCreateXml(struct qemud_server *server ATTRIBUTE_UNUS remote_domain_snapshot_create_xml_ret *ret) { virDomainSnapshotPtr snapshot; - virDomainPtr domain = NULL; + virDomainPtr dom = NULL; int rv = -1; if (!conn) { @@ -7945,10 +7945,10 @@ remoteDispatchDomainSnapshotCreateXml(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - if (!(domain = get_nonnull_domain(conn, args->domain))) + if (!(dom = get_nonnull_domain(conn, args->domain))) goto cleanup; - if (!(snapshot = virDomainSnapshotCreateXML(domain, args->xml_desc, args->flags))) + if (!(snapshot = virDomainSnapshotCreateXML(dom, args->xml_desc, args->flags))) goto cleanup; make_nonnull_domain_snapshot(&ret->snap, snapshot); @@ -7960,8 +7960,8 @@ cleanup: remoteDispatchError(rerr); if (snapshot) virDomainSnapshotFree(snapshot); - if (domain) - virDomainFree(domain); + if (dom) + virDomainFree(dom); return rv; } @@ -7974,7 +7974,7 @@ remoteDispatchDomainSnapshotDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED remote_domain_snapshot_dump_xml_args *args, remote_domain_snapshot_dump_xml_ret *ret) { - virDomainPtr domain = NULL; + virDomainPtr dom = NULL; virDomainSnapshotPtr snapshot = NULL; int rv = -1; @@ -7983,10 +7983,10 @@ remoteDispatchDomainSnapshotDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED goto cleanup; } - if (!(domain = get_nonnull_domain(conn, args->snap.domain))) + if (!(dom = get_nonnull_domain(conn, args->snap.domain))) goto cleanup; - if (!(snapshot = get_nonnull_domain_snapshot(domain, args->snap))) + if (!(snapshot = get_nonnull_domain_snapshot(dom, args->snap))) goto cleanup; /* remoteDispatchClientRequest will free this. */ @@ -8000,8 +8000,8 @@ cleanup: remoteDispatchError(rerr); if (snapshot) virDomainSnapshotFree(snapshot); - if (domain) - virDomainFree(domain); + if (dom) + virDomainFree(dom); return rv; } @@ -8014,7 +8014,7 @@ remoteDispatchDomainSnapshotNum(struct qemud_server *server ATTRIBUTE_UNUSED, remote_domain_snapshot_num_args *args, remote_domain_snapshot_num_ret *ret) { - virDomainPtr domain = NULL; + virDomainPtr dom = NULL; int rv = -1; if (!conn) { @@ -8022,10 +8022,10 @@ remoteDispatchDomainSnapshotNum(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (!(domain = get_nonnull_domain(conn, args->domain))) + if (!(dom = get_nonnull_domain(conn, args->domain))) goto cleanup; - if ((ret->num = virDomainSnapshotNum(domain, args->flags)) < 0) + if ((ret->num = virDomainSnapshotNum(dom, args->flags)) < 0) goto cleanup; rv = 0; @@ -8033,8 +8033,8 @@ remoteDispatchDomainSnapshotNum(struct qemud_server *server ATTRIBUTE_UNUSED, cleanup: if (rv < 0) remoteDispatchError(rerr); - if (domain) - virDomainFree(domain); + if (dom) + virDomainFree(dom); return rv; } @@ -8047,7 +8047,7 @@ remoteDispatchDomainSnapshotListNames(struct qemud_server *server ATTRIBUTE_UNUS remote_domain_snapshot_list_names_args *args, remote_domain_snapshot_list_names_ret *ret) { - virDomainPtr domain = NULL; + virDomainPtr dom = NULL; int rv = -1; int len; @@ -8062,7 +8062,7 @@ remoteDispatchDomainSnapshotListNames(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - if (!(domain = get_nonnull_domain(conn, args->domain))) + if (!(dom = get_nonnull_domain(conn, args->domain))) goto cleanup; /* Allocate return buffer. */ @@ -8071,7 +8071,7 @@ remoteDispatchDomainSnapshotListNames(struct qemud_server *server ATTRIBUTE_UNUS goto cleanup; } - len = virDomainSnapshotListNames(domain, + len = virDomainSnapshotListNames(dom, ret->names.names_val, args->nameslen, args->flags); @@ -8086,8 +8086,8 @@ cleanup: remoteDispatchError(rerr); VIR_FREE(ret->names.names_val); } - if (domain) - virDomainFree(domain); + if (dom) + virDomainFree(dom); return rv; } @@ -8101,7 +8101,7 @@ remoteDispatchDomainSnapshotLookupByName(struct qemud_server *server ATTRIBUTE_U remote_domain_snapshot_lookup_by_name_ret *ret) { virDomainSnapshotPtr snapshot; - virDomainPtr domain = NULL; + virDomainPtr dom = NULL; int rv = -1; if (!conn) { @@ -8109,10 +8109,10 @@ remoteDispatchDomainSnapshotLookupByName(struct qemud_server *server ATTRIBUTE_U goto cleanup; } - if (!(domain = get_nonnull_domain(conn, args->domain))) + if (!(dom = get_nonnull_domain(conn, args->domain))) goto cleanup; - if (!(snapshot = virDomainSnapshotLookupByName(domain, args->name, args->flags))) + if (!(snapshot = virDomainSnapshotLookupByName(dom, args->name, args->flags))) goto cleanup; make_nonnull_domain_snapshot(&ret->snap, snapshot); @@ -8124,8 +8124,8 @@ cleanup: remoteDispatchError(rerr); if (snapshot) virDomainSnapshotFree(snapshot); - if (domain) - virDomainFree(domain); + if (dom) + virDomainFree(dom); return rv; } @@ -8138,7 +8138,7 @@ remoteDispatchDomainHasCurrentSnapshot(struct qemud_server *server ATTRIBUTE_UNU remote_domain_has_current_snapshot_args *args, remote_domain_has_current_snapshot_ret *ret) { - virDomainPtr domain = NULL; + virDomainPtr dom = NULL; int result; int rv = -1; @@ -8147,10 +8147,10 @@ remoteDispatchDomainHasCurrentSnapshot(struct qemud_server *server ATTRIBUTE_UNU goto cleanup; } - if (!(domain = get_nonnull_domain(conn, args->domain))) + if (!(dom = get_nonnull_domain(conn, args->domain))) goto cleanup; - result = virDomainHasCurrentSnapshot(domain, args->flags); + result = virDomainHasCurrentSnapshot(dom, args->flags); if (result < 0) goto cleanup; @@ -8161,8 +8161,8 @@ remoteDispatchDomainHasCurrentSnapshot(struct qemud_server *server ATTRIBUTE_UNU cleanup: if (rv < 0) remoteDispatchError(rerr); - if (domain) - virDomainFree(domain); + if (dom) + virDomainFree(dom); return rv; } @@ -8176,7 +8176,7 @@ remoteDispatchDomainSnapshotCurrent(struct qemud_server *server ATTRIBUTE_UNUSED remote_domain_snapshot_current_ret *ret) { virDomainSnapshotPtr snapshot; - virDomainPtr domain = NULL; + virDomainPtr dom = NULL; int rv = -1; if (!conn) { @@ -8184,10 +8184,10 @@ remoteDispatchDomainSnapshotCurrent(struct qemud_server *server ATTRIBUTE_UNUSED goto cleanup; } - if (!(domain = get_nonnull_domain(conn, args->domain))) + if (!(dom = get_nonnull_domain(conn, args->domain))) goto cleanup; - if (!(snapshot = virDomainSnapshotCurrent(domain, args->flags))) + if (!(snapshot = virDomainSnapshotCurrent(dom, args->flags))) goto cleanup; make_nonnull_domain_snapshot(&ret->snap, snapshot); @@ -8199,8 +8199,8 @@ cleanup: remoteDispatchError(rerr); if (snapshot) virDomainSnapshotFree(snapshot); - if (domain) - virDomainFree(domain); + if (dom) + virDomainFree(dom); return rv; } @@ -8213,7 +8213,7 @@ remoteDispatchDomainRevertToSnapshot(struct qemud_server *server ATTRIBUTE_UNUSE remote_domain_revert_to_snapshot_args *args, void *ret ATTRIBUTE_UNUSED) { - virDomainPtr domain = NULL; + virDomainPtr dom = NULL; virDomainSnapshotPtr snapshot = NULL; int rv = -1; @@ -8222,10 +8222,10 @@ remoteDispatchDomainRevertToSnapshot(struct qemud_server *server ATTRIBUTE_UNUSE goto cleanup; } - if (!(domain = get_nonnull_domain(conn, args->snap.domain))) + if (!(dom = get_nonnull_domain(conn, args->snap.domain))) goto cleanup; - if (!(snapshot = get_nonnull_domain_snapshot(domain, args->snap))) + if (!(snapshot = get_nonnull_domain_snapshot(dom, args->snap))) goto cleanup; if (virDomainRevertToSnapshot(snapshot, args->flags) < 0) @@ -8238,8 +8238,8 @@ cleanup: remoteDispatchError(rerr); if (snapshot) virDomainSnapshotFree(snapshot); - if (domain) - virDomainFree(domain); + if (dom) + virDomainFree(dom); return rv; } @@ -8252,7 +8252,7 @@ remoteDispatchDomainSnapshotDelete(struct qemud_server *server ATTRIBUTE_UNUSED, remote_domain_snapshot_delete_args *args, void *ret ATTRIBUTE_UNUSED) { - virDomainPtr domain = NULL; + virDomainPtr dom = NULL; virDomainSnapshotPtr snapshot = NULL; int rv = -1; @@ -8261,10 +8261,10 @@ remoteDispatchDomainSnapshotDelete(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (!(domain = get_nonnull_domain(conn, args->snap.domain))) + if (!(dom = get_nonnull_domain(conn, args->snap.domain))) goto cleanup; - if (!(snapshot = get_nonnull_domain_snapshot(domain, args->snap))) + if (!(snapshot = get_nonnull_domain_snapshot(dom, args->snap))) goto cleanup; if (virDomainSnapshotDelete(snapshot, args->flags) < 0) @@ -8277,8 +8277,8 @@ cleanup: remoteDispatchError(rerr); if (snapshot) virDomainSnapshotFree(snapshot); - if (domain) - virDomainFree(domain); + if (dom) + virDomainFree(dom); return rv; } @@ -8658,7 +8658,7 @@ qemuDispatchMonitorCommand(struct qemud_server *server ATTRIBUTE_UNUSED, qemu_monitor_command_args *args, qemu_monitor_command_ret *ret) { - virDomainPtr domain = NULL; + virDomainPtr dom = NULL; int rv = -1; if (!conn) { @@ -8666,10 +8666,10 @@ qemuDispatchMonitorCommand(struct qemud_server *server ATTRIBUTE_UNUSED, goto cleanup; } - if (!(domain = get_nonnull_domain(conn, args->domain))) + if (!(dom = get_nonnull_domain(conn, args->domain))) goto cleanup; - if (virDomainQemuMonitorCommand(domain, args->cmd, &ret->result, + if (virDomainQemuMonitorCommand(dom, args->cmd, &ret->result, args->flags) < 0) goto cleanup; @@ -8678,8 +8678,8 @@ qemuDispatchMonitorCommand(struct qemud_server *server ATTRIBUTE_UNUSED, cleanup: if (rv < 0) remoteDispatchError(rerr); - if (domain) - virDomainFree(domain); + if (dom) + virDomainFree(dom); return rv; } @@ -8793,9 +8793,9 @@ get_nonnull_nwfilter(virConnectPtr conn, remote_nonnull_nwfilter nwfilter) } static virDomainSnapshotPtr -get_nonnull_domain_snapshot(virDomainPtr domain, remote_nonnull_domain_snapshot snapshot) +get_nonnull_domain_snapshot(virDomainPtr dom, remote_nonnull_domain_snapshot snapshot) { - return virGetDomainSnapshot(domain, snapshot.name); + return virGetDomainSnapshot(dom, snapshot.name); } /* Make remote_nonnull_domain and remote_nonnull_network. */ -- 1.7.4.2

2 1

[libvirt] [PATCH] Remove C99 variable declare in PHYP network driver
by Daniel P. Berrange 13 Apr '11

13 Apr '11

Move the virInterfacePtr declaration to the top of the function to avoid jump uninitialized variable warnings * src/phyp/phyp_driver.c: Fix var declaration --- src/phyp/phyp_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Pushed to fix the broken build... diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index b5145db..a1b6819 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -3587,6 +3587,7 @@ phypInterfaceLookupByName(virConnectPtr conn, const char *name) int slot = 0; int lpar_id = 0; char mac[PHYP_MAC_SIZE]; + virInterfacePtr result = NULL; /*Getting the slot number for the interface */ virBufferAddLit(&buf, "lshwres "); @@ -3667,7 +3668,7 @@ phypInterfaceLookupByName(virConnectPtr conn, const char *name) memcpy(mac, ret, PHYP_MAC_SIZE-1); - virInterfacePtr result = virGetInterface(conn, name, ret); + result = virGetInterface(conn, name, ret); VIR_FREE(cmd); VIR_FREE(ret); -- 1.7.4.2

2 1

[libvirt] [BUG] qemu quited unexpectedly will cause libvirtd crashed
by Wen Congyang 13 Apr '11

13 Apr '11

When I edit the domain's config file like this: ===================== <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/var/lib/libvirt/images/test3.img'/> <target dev='sdb' bus='scsi'/> <address type='drive' controller='0' bus='0' unit='10'/> </disk> ===================== Note, the unit is wrong, but libvirt does not check it. When I start the vm with the wrong config file, libvirtd will be blocked because qemu quited unexpectedly. This bug does not happen every time, and it only happened once on my box. So I try to use gdb and add sleep() to trigger this bug. I have posted two patches to fix 2 bugs. But there is still another bug, and I have no good way to fix it. I add sleep() in qemuDomainObjExitMonitorWithDriver(): ============================== int qemuDomainObjExitMonitorWithDriver(struct qemud_driver *driver, virDomainObjPtr obj) { qemuDomainObjPrivatePtr priv = obj->privateData; int refs; int debug = 0; refs = qemuMonitorUnref(priv->mon); if (refs > 0) qemuMonitorUnlock(priv->mon); /* Note: qemu may quited unexpectedly here, and the monitor will be freed. * If it happened, priv->mon will be null. */ if (debug) sleep(100); qemuDriverLock(driver); virDomainObjLock(obj); if (refs == 0) { priv->mon = NULL; } } ============================== Steps to reproduce this bug: 1. use gdb to attach libvirtd, and set a breakpoint in the function qemuConnectMonitor() 2. start a vm 3. let the libvirtd to run until qemuMonitorSetCapabilities() returns. 4. kill the qemu process 5. step into qemuDomainObjExitMonitorWithDriver(), and set debug to 1 Now, qemuDomainObjExitMonitorWithDriver() will sleep 100s to make sure qemuProcessHandleMonitorEOF() is done before qemuProcessHandleMonitorEOF() returns. priv->mon will be null after qemuDomainObjExitMonitorWithDriver() returns. So we must not use it. Unfortunately we still use it, and it will cause libvirtd crashed. My first fix is that qemuDomainObjExitMonitorWithDriver() returns -1, and the caller checks the return value, then do some cleanup and return error. Unfortunately we may use priv->mon when doing some cleanup. The only way to avoid it is that add some local variable and set it when qemu quited unexpectedly. Avoid to use priv->mon in cleanup codes Is there some simply way to fix this bug.

3 6

[libvirt] [PATCH] Make error reporting in libvirtd thread safe
by Jiri Denemark 13 Apr '11

13 Apr '11

Bug https://bugzilla.redhat.com/show_bug.cgi?id=689374 reported libvirtd crash during error dispatch. The reason is that libvirtd uses remoteDispatchConnError() with non-NULL conn parameter which means that virConnGetLastError() is used instead of its thread safe replacement virGetLastError(). So when several libvirtd threads are reporting errors at the same time, the errors can get mixed or corrupted or in case of bad luck libvirtd itself crashes. Since Daniel B. is going to rewrite this code from scratch on top of his RPC infrastructure, I tried to come up with a minimal fix. Thus, remoteDispatchConnError() now just ignores its conn argument and always calls virGetLastError(). However, several callers had to be touched as well, since no libvirt API is allowed to be called before dispatching the error. Doing so would reset the error and we would have nothing to dispatch. As a result of that, the code is not very nice but that doesn't really make daemon/remote.c worse than it is now :-) And it will all die soon, which is good. The bug report also contains a reproducer in C which detects both mixed up error messages and libvirtd crash. Before this patch, I was able to crash libvirtd in about 20 seconds up to 3 minutes depending on number of CPU cores (more is better) and luck. --- daemon/dispatch.c | 8 +-- daemon/remote.c | 238 +++++++++++++++++++++++++++------------------------- 2 files changed, 126 insertions(+), 120 deletions(-) diff --git a/daemon/dispatch.c b/daemon/dispatch.c index dc3b48a..4814017 100644 --- a/daemon/dispatch.c +++ b/daemon/dispatch.c @@ -113,14 +113,10 @@ void remoteDispatchOOMError (remote_error *rerr) void remoteDispatchConnError (remote_error *rerr, - virConnectPtr conn) + virConnectPtr conn ATTRIBUTE_UNUSED) { - virErrorPtr verr; + virErrorPtr verr = virGetLastError(); - if (conn) - verr = virConnGetLastError(conn); - else - verr = virGetLastError(); if (verr) remoteDispatchCopyError(rerr, verr); else diff --git a/daemon/remote.c b/daemon/remote.c index a8fef4d..4b42ed2 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -757,8 +757,8 @@ remoteDispatchDomainGetSchedulerType (struct qemud_server *server ATTRIBUTE_UNUS type = virDomainGetSchedulerType (dom, &nparams); if (type == NULL) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } @@ -801,9 +801,9 @@ remoteDispatchDomainGetSchedulerParameters (struct qemud_server *server ATTRIBUT r = virDomainGetSchedulerParameters (dom, params, &nparams); if (r == -1) { + remoteDispatchConnError(rerr, conn); virDomainFree(dom); VIR_FREE(params); - remoteDispatchConnError(rerr, conn); return -1; } @@ -908,12 +908,13 @@ remoteDispatchDomainSetSchedulerParameters (struct qemud_server *server ATTRIBUT } r = virDomainSetSchedulerParameters (dom, params, nparams); - virDomainFree(dom); VIR_FREE(params); if (r == -1) { remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } + virDomainFree(dom); return 0; } @@ -939,8 +940,8 @@ remoteDispatchDomainBlockStats (struct qemud_server *server ATTRIBUTE_UNUSED, path = args->path; if (virDomainBlockStats (dom, path, &stats, sizeof stats) == -1) { - virDomainFree (dom); remoteDispatchConnError(rerr, conn); + virDomainFree (dom); return -1; } virDomainFree (dom); @@ -975,8 +976,8 @@ remoteDispatchDomainInterfaceStats (struct qemud_server *server ATTRIBUTE_UNUSED path = args->path; if (virDomainInterfaceStats (dom, path, &stats, sizeof stats) == -1) { - virDomainFree (dom); remoteDispatchConnError(rerr, conn); + virDomainFree (dom); return -1; } virDomainFree (dom); @@ -1026,12 +1027,13 @@ remoteDispatchDomainMemoryStats (struct qemud_server *server ATTRIBUTE_UNUSED, } nr_stats = virDomainMemoryStats (dom, stats, args->maxStats, 0); - virDomainFree (dom); if (nr_stats == -1) { VIR_FREE(stats); remoteDispatchConnError(rerr, conn); + virDomainFree (dom); return -1; } + virDomainFree (dom); /* Allocate return buffer */ if (VIR_ALLOC_N(ret->stats.stats_val, args->maxStats) < 0) { @@ -1092,8 +1094,8 @@ remoteDispatchDomainBlockPeek (struct qemud_server *server ATTRIBUTE_UNUSED, if (virDomainBlockPeek (dom, path, offset, size, ret->buffer.buffer_val, flags) == -1) { /* free (ret->buffer.buffer_val); - caller frees */ - virDomainFree (dom); remoteDispatchConnError(rerr, conn); + virDomainFree (dom); return -1; } virDomainFree (dom); @@ -1141,8 +1143,8 @@ remoteDispatchDomainMemoryPeek (struct qemud_server *server ATTRIBUTE_UNUSED, if (virDomainMemoryPeek (dom, offset, size, ret->buffer.buffer_val, flags) == -1) { /* free (ret->buffer.buffer_val); - caller frees */ - virDomainFree (dom); remoteDispatchConnError(rerr, conn); + virDomainFree (dom); return -1; } virDomainFree (dom); @@ -1168,8 +1170,8 @@ remoteDispatchDomainAttachDevice (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainAttachDevice (dom, args->xml) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -1194,8 +1196,8 @@ remoteDispatchDomainAttachDeviceFlags (struct qemud_server *server ATTRIBUTE_UNU } if (virDomainAttachDeviceFlags (dom, args->xml, args->flags) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -1220,8 +1222,8 @@ remoteDispatchDomainUpdateDeviceFlags (struct qemud_server *server ATTRIBUTE_UNU } if (virDomainUpdateDeviceFlags (dom, args->xml, args->flags) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -1246,8 +1248,8 @@ remoteDispatchDomainCreate (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainCreate (dom) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -1272,8 +1274,8 @@ remoteDispatchDomainCreateWithFlags (struct qemud_server *server ATTRIBUTE_UNUSE } if (virDomainCreateWithFlags (dom, args->flags) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } @@ -1346,8 +1348,8 @@ remoteDispatchDomainDestroy (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainDestroy (dom) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -1372,8 +1374,8 @@ remoteDispatchDomainDetachDevice (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainDetachDevice (dom, args->xml) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } @@ -1399,8 +1401,8 @@ remoteDispatchDomainDetachDeviceFlags (struct qemud_server *server ATTRIBUTE_UNU } if (virDomainDetachDeviceFlags (dom, args->xml, args->flags) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } @@ -1428,8 +1430,8 @@ remoteDispatchDomainDumpXml (struct qemud_server *server ATTRIBUTE_UNUSED, /* remoteDispatchClientRequest will free this. */ ret->xml = virDomainGetXMLDesc (dom, args->flags); if (!ret->xml) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -1497,8 +1499,8 @@ remoteDispatchDomainGetAutostart (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainGetAutostart (dom, &ret->autostart) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -1524,8 +1526,8 @@ remoteDispatchDomainGetInfo (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainGetInfo (dom, &info) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } @@ -1559,8 +1561,8 @@ remoteDispatchDomainGetMaxMemory (struct qemud_server *server ATTRIBUTE_UNUSED, ret->memory = virDomainGetMaxMemory (dom); if (ret->memory == 0) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -1586,8 +1588,8 @@ remoteDispatchDomainGetMaxVcpus (struct qemud_server *server ATTRIBUTE_UNUSED, ret->num = virDomainGetMaxVcpus (dom); if (ret->num == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -1614,8 +1616,8 @@ remoteDispatchDomainGetSecurityLabel(struct qemud_server *server ATTRIBUTE_UNUSE memset(&seclabel, 0, sizeof seclabel); if (virDomainGetSecurityLabel(dom, &seclabel) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } @@ -1686,8 +1688,8 @@ remoteDispatchDomainGetOsType (struct qemud_server *server ATTRIBUTE_UNUSED, /* remoteDispatchClientRequest will free this */ ret->type = virDomainGetOSType (dom); if (ret->type == NULL) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -1737,10 +1739,10 @@ remoteDispatchDomainGetVcpus (struct qemud_server *server ATTRIBUTE_UNUSED, info, args->maxinfo, cpumaps, args->maplen); if (info_len == -1) { + remoteDispatchConnError(rerr, conn); VIR_FREE(info); VIR_FREE(cpumaps); virDomainFree(dom); - remoteDispatchConnError(rerr, conn); return -1; } @@ -1794,8 +1796,8 @@ remoteDispatchDomainGetVcpusFlags (struct qemud_server *server ATTRIBUTE_UNUSED, ret->num = virDomainGetVcpusFlags (dom, args->flags); if (ret->num == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -1877,11 +1879,12 @@ remoteDispatchDomainMigratePerform (struct qemud_server *server ATTRIBUTE_UNUSED args->cookie.cookie_len, args->uri, args->flags, dname, args->resource); - virDomainFree (dom); if (r == -1) { remoteDispatchConnError(rerr, conn); + virDomainFree (dom); return -1; } + virDomainFree (dom); return 0; } @@ -2013,8 +2016,8 @@ remoteDispatchDomainMigratePrepareTunnel(struct qemud_server *server ATTRIBUTE_U args->flags, dname, args->resource, args->dom_xml); if (r == -1) { - remoteFreeClientStream(client, stream); remoteDispatchConnError(rerr, conn); + remoteFreeClientStream(client, stream); return -1; } @@ -2175,8 +2178,8 @@ remoteDispatchDomainPinVcpu (struct qemud_server *server ATTRIBUTE_UNUSED, (unsigned char *) args->cpumap.cpumap_val, args->cpumap.cpumap_len); if (rv == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -2201,8 +2204,8 @@ remoteDispatchDomainReboot (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainReboot (dom, args->flags) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -2245,8 +2248,8 @@ remoteDispatchDomainResume (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainResume (dom) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -2271,8 +2274,8 @@ remoteDispatchDomainSave (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainSave (dom, args->to) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -2297,8 +2300,8 @@ remoteDispatchDomainCoreDump (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainCoreDump (dom, args->to, args->flags) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -2323,8 +2326,8 @@ remoteDispatchDomainSetAutostart (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainSetAutostart (dom, args->autostart) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -2349,8 +2352,8 @@ remoteDispatchDomainSetMaxMemory (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainSetMaxMemory (dom, args->memory) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -2375,8 +2378,8 @@ remoteDispatchDomainSetMemory (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainSetMemory (dom, args->memory) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -2401,8 +2404,8 @@ remoteDispatchDomainSetMemoryFlags (struct qemud_server *server ATTRIBUTE_UNUSED } if (virDomainSetMemoryFlags (dom, args->memory, args->flags) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -2491,12 +2494,13 @@ remoteDispatchDomainSetMemoryParameters(struct qemud_server *server } r = virDomainSetMemoryParameters(dom, params, nparams, flags); - virDomainFree(dom); VIR_FREE(params); if (r == -1) { remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } + virDomainFree(dom); return 0; } @@ -2541,9 +2545,9 @@ remoteDispatchDomainGetMemoryParameters(struct qemud_server *server r = virDomainGetMemoryParameters(dom, params, &nparams, flags); if (r == -1) { + remoteDispatchConnError(rerr, conn); virDomainFree(dom); VIR_FREE(params); - remoteDispatchConnError(rerr, conn); return -1; } /* In this case, we need to send back the number of parameters @@ -2701,12 +2705,13 @@ remoteDispatchDomainSetBlkioParameters(struct qemud_server *server } r = virDomainSetBlkioParameters(dom, params, nparams, flags); - virDomainFree(dom); VIR_FREE(params); if (r == -1) { remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } + virDomainFree(dom); return 0; } @@ -2751,9 +2756,9 @@ remoteDispatchDomainGetBlkioParameters(struct qemud_server *server r = virDomainGetBlkioParameters(dom, params, &nparams, flags); if (r == -1) { + remoteDispatchConnError(rerr, conn); virDomainFree(dom); VIR_FREE(params); - remoteDispatchConnError(rerr, conn); return -1; } /* In this case, we need to send back the number of parameters @@ -2847,8 +2852,8 @@ remoteDispatchDomainSetVcpus (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainSetVcpus (dom, args->nvcpus) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -2873,8 +2878,8 @@ remoteDispatchDomainSetVcpusFlags (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainSetVcpusFlags (dom, args->nvcpus, args->flags) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -2899,8 +2904,8 @@ remoteDispatchDomainShutdown (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainShutdown (dom) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -2925,8 +2930,8 @@ remoteDispatchDomainSuspend (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainSuspend (dom) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -2951,8 +2956,8 @@ remoteDispatchDomainUndefine (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainUndefine (dom) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -3044,8 +3049,8 @@ remoteDispatchDomainManagedSave (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainManagedSave (dom, args->flags) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -3071,8 +3076,8 @@ remoteDispatchDomainHasManagedSaveImage (struct qemud_server *server ATTRIBUTE_U ret->ret = virDomainHasManagedSaveImage (dom, args->flags); if (ret->ret == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -3097,8 +3102,8 @@ remoteDispatchDomainManagedSaveRemove (struct qemud_server *server ATTRIBUTE_UNU } if (virDomainManagedSaveRemove (dom, args->flags) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } virDomainFree(dom); @@ -3157,8 +3162,8 @@ remoteDispatchNetworkCreate (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virNetworkCreate (net) == -1) { - virNetworkFree(net); remoteDispatchConnError(rerr, conn); + virNetworkFree(net); return -1; } virNetworkFree(net); @@ -3227,8 +3232,8 @@ remoteDispatchNetworkDestroy (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virNetworkDestroy (net) == -1) { - virNetworkFree(net); remoteDispatchConnError(rerr, conn); + virNetworkFree(net); return -1; } virNetworkFree(net); @@ -3255,8 +3260,8 @@ remoteDispatchNetworkDumpXml (struct qemud_server *server ATTRIBUTE_UNUSED, /* remoteDispatchClientRequest will free this. */ ret->xml = virNetworkGetXMLDesc (net, args->flags); if (!ret->xml) { - virNetworkFree(net); remoteDispatchConnError(rerr, conn); + virNetworkFree(net); return -1; } virNetworkFree(net); @@ -3281,8 +3286,8 @@ remoteDispatchNetworkGetAutostart (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virNetworkGetAutostart (net, &ret->autostart) == -1) { - virNetworkFree(net); remoteDispatchConnError(rerr, conn); + virNetworkFree(net); return -1; } virNetworkFree(net); @@ -3309,8 +3314,8 @@ remoteDispatchNetworkGetBridgeName (struct qemud_server *server ATTRIBUTE_UNUSED /* remoteDispatchClientRequest will free this. */ ret->name = virNetworkGetBridgeName (net); if (!ret->name) { - virNetworkFree(net); remoteDispatchConnError(rerr, conn); + virNetworkFree(net); return -1; } virNetworkFree(net); @@ -3379,8 +3384,8 @@ remoteDispatchNetworkSetAutostart (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virNetworkSetAutostart (net, args->autostart) == -1) { - virNetworkFree(net); remoteDispatchConnError(rerr, conn); + virNetworkFree(net); return -1; } virNetworkFree(net); @@ -3405,8 +3410,8 @@ remoteDispatchNetworkUndefine (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virNetworkUndefine (net) == -1) { - virNetworkFree(net); remoteDispatchConnError(rerr, conn); + virNetworkFree(net); return -1; } virNetworkFree(net); @@ -3642,8 +3647,8 @@ remoteDispatchInterfaceGetXmlDesc (struct qemud_server *server ATTRIBUTE_UNUSED, /* remoteDispatchClientRequest will free this. */ ret->xml = virInterfaceGetXMLDesc (iface, args->flags); if (!ret->xml) { - virInterfaceFree(iface); remoteDispatchConnError(rerr, conn); + virInterfaceFree(iface); return -1; } virInterfaceFree(iface); @@ -3690,8 +3695,8 @@ remoteDispatchInterfaceUndefine (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virInterfaceUndefine (iface) == -1) { - virInterfaceFree(iface); remoteDispatchConnError(rerr, conn); + virInterfaceFree(iface); return -1; } virInterfaceFree(iface); @@ -3716,8 +3721,8 @@ remoteDispatchInterfaceCreate (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virInterfaceCreate (iface, args->flags) == -1) { - virInterfaceFree(iface); remoteDispatchConnError(rerr, conn); + virInterfaceFree(iface); return -1; } virInterfaceFree(iface); @@ -3742,8 +3747,8 @@ remoteDispatchInterfaceDestroy (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virInterfaceDestroy (iface, args->flags) == -1) { - virInterfaceFree(iface); remoteDispatchConnError(rerr, conn); + virInterfaceFree(iface); return -1; } virInterfaceFree(iface); @@ -4656,8 +4661,8 @@ remoteDispatchStoragePoolCreate (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virStoragePoolCreate (pool, args->flags) == -1) { - virStoragePoolFree(pool); remoteDispatchConnError(rerr, conn); + virStoragePoolFree(pool); return -1; } virStoragePoolFree(pool); @@ -4726,8 +4731,8 @@ remoteDispatchStoragePoolBuild (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virStoragePoolBuild (pool, args->flags) == -1) { - virStoragePoolFree(pool); remoteDispatchConnError(rerr, conn); + virStoragePoolFree(pool); return -1; } virStoragePoolFree(pool); @@ -4753,8 +4758,8 @@ remoteDispatchStoragePoolDestroy (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virStoragePoolDestroy (pool) == -1) { - virStoragePoolFree(pool); remoteDispatchConnError(rerr, conn); + virStoragePoolFree(pool); return -1; } virStoragePoolFree(pool); @@ -4779,8 +4784,8 @@ remoteDispatchStoragePoolDelete (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virStoragePoolDelete (pool, args->flags) == -1) { - virStoragePoolFree(pool); remoteDispatchConnError(rerr, conn); + virStoragePoolFree(pool); return -1; } virStoragePoolFree(pool); @@ -4805,8 +4810,8 @@ remoteDispatchStoragePoolRefresh (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virStoragePoolRefresh (pool, args->flags) == -1) { - virStoragePoolFree(pool); remoteDispatchConnError(rerr, conn); + virStoragePoolFree(pool); return -1; } virStoragePoolFree(pool); @@ -4832,8 +4837,8 @@ remoteDispatchStoragePoolGetInfo (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virStoragePoolGetInfo (pool, &info) == -1) { - virStoragePoolFree(pool); remoteDispatchConnError(rerr, conn); + virStoragePoolFree(pool); return -1; } @@ -4867,8 +4872,8 @@ remoteDispatchStoragePoolDumpXml (struct qemud_server *server ATTRIBUTE_UNUSED, /* remoteDispatchClientRequest will free this. */ ret->xml = virStoragePoolGetXMLDesc (pool, args->flags); if (!ret->xml) { - virStoragePoolFree(pool); remoteDispatchConnError(rerr, conn); + virStoragePoolFree(pool); return -1; } virStoragePoolFree(pool); @@ -4893,8 +4898,8 @@ remoteDispatchStoragePoolGetAutostart (struct qemud_server *server ATTRIBUTE_UNU } if (virStoragePoolGetAutostart (pool, &ret->autostart) == -1) { - virStoragePoolFree(pool); remoteDispatchConnError(rerr, conn); + virStoragePoolFree(pool); return -1; } virStoragePoolFree(pool); @@ -4965,11 +4970,12 @@ remoteDispatchStoragePoolLookupByVolume (struct qemud_server *server ATTRIBUTE_U } pool = virStoragePoolLookupByVolume (vol); - virStorageVolFree(vol); if (pool == NULL) { remoteDispatchConnError(rerr, conn); + virStorageVolFree(vol); return -1; } + virStorageVolFree(vol); make_nonnull_storage_pool (&ret->pool, pool); virStoragePoolFree(pool); @@ -4994,8 +5000,8 @@ remoteDispatchStoragePoolSetAutostart (struct qemud_server *server ATTRIBUTE_UNU } if (virStoragePoolSetAutostart (pool, args->autostart) == -1) { - virStoragePoolFree(pool); remoteDispatchConnError(rerr, conn); + virStoragePoolFree(pool); return -1; } virStoragePoolFree(pool); @@ -5020,8 +5026,8 @@ remoteDispatchStoragePoolUndefine (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virStoragePoolUndefine (pool) == -1) { - virStoragePoolFree(pool); remoteDispatchConnError(rerr, conn); + virStoragePoolFree(pool); return -1; } virStoragePoolFree(pool); @@ -5163,11 +5169,12 @@ remoteDispatchStorageVolCreateXml (struct qemud_server *server ATTRIBUTE_UNUSED, } vol = virStorageVolCreateXML (pool, args->xml, args->flags); - virStoragePoolFree(pool); if (vol == NULL) { remoteDispatchConnError(rerr, conn); + virStoragePoolFree(pool); return -1; } + virStoragePoolFree(pool); make_nonnull_storage_vol (&ret->vol, vol); virStorageVolFree(vol); @@ -5194,19 +5201,21 @@ remoteDispatchStorageVolCreateXmlFrom (struct qemud_server *server ATTRIBUTE_UNU clonevol = get_nonnull_storage_vol (conn, args->clonevol); if (clonevol == NULL) { - virStoragePoolFree(pool); remoteDispatchConnError(rerr, conn); + virStoragePoolFree(pool); return -1; } newvol = virStorageVolCreateXMLFrom (pool, args->xml, clonevol, args->flags); - virStorageVolFree(clonevol); - virStoragePoolFree(pool); if (newvol == NULL) { remoteDispatchConnError(rerr, conn); + virStorageVolFree(clonevol); + virStoragePoolFree(pool); return -1; } + virStorageVolFree(clonevol); + virStoragePoolFree(pool); make_nonnull_storage_vol (&ret->vol, newvol); virStorageVolFree(newvol); @@ -5231,8 +5240,8 @@ remoteDispatchStorageVolDelete (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virStorageVolDelete (vol, args->flags) == -1) { - virStorageVolFree(vol); remoteDispatchConnError(rerr, conn); + virStorageVolFree(vol); return -1; } virStorageVolFree(vol); @@ -5290,8 +5299,8 @@ remoteDispatchStorageVolGetInfo (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virStorageVolGetInfo (vol, &info) == -1) { - virStorageVolFree(vol); remoteDispatchConnError(rerr, conn); + virStorageVolFree(vol); return -1; } @@ -5324,8 +5333,8 @@ remoteDispatchStorageVolDumpXml (struct qemud_server *server ATTRIBUTE_UNUSED, /* remoteDispatchClientRequest will free this. */ ret->xml = virStorageVolGetXMLDesc (vol, args->flags); if (!ret->xml) { - virStorageVolFree(vol); remoteDispatchConnError(rerr, conn); + virStorageVolFree(vol); return -1; } virStorageVolFree(vol); @@ -5353,8 +5362,8 @@ remoteDispatchStorageVolGetPath (struct qemud_server *server ATTRIBUTE_UNUSED, /* remoteDispatchClientRequest will free this. */ ret->name = virStorageVolGetPath (vol); if (!ret->name) { - virStorageVolFree(vol); remoteDispatchConnError(rerr, conn); + virStorageVolFree(vol); return -1; } virStorageVolFree(vol); @@ -5381,11 +5390,12 @@ remoteDispatchStorageVolLookupByName (struct qemud_server *server ATTRIBUTE_UNUS } vol = virStorageVolLookupByName (pool, args->name); - virStoragePoolFree(pool); if (vol == NULL) { remoteDispatchConnError(rerr, conn); + virStoragePoolFree(pool); return -1; } + virStoragePoolFree(pool); make_nonnull_storage_vol (&ret->vol, vol); virStorageVolFree(vol); @@ -5622,8 +5632,8 @@ remoteDispatchNodeDeviceNumOfCaps (struct qemud_server *server ATTRIBUTE_UNUSED, ret->num = virNodeDeviceNumOfCaps(dev); if (ret->num < 0) { - virNodeDeviceFree(dev); remoteDispatchConnError(rerr, conn); + virNodeDeviceFree(dev); return -1; } @@ -5668,8 +5678,8 @@ remoteDispatchNodeDeviceListCaps (struct qemud_server *server ATTRIBUTE_UNUSED, virNodeDeviceListCaps (dev, ret->names.names_val, args->maxnames); if (ret->names.names_len == -1) { - virNodeDeviceFree(dev); remoteDispatchConnError(rerr, conn); + virNodeDeviceFree(dev); VIR_FREE(ret->names.names_val); return -1; } @@ -5698,8 +5708,8 @@ remoteDispatchNodeDeviceDettach (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virNodeDeviceDettach(dev) == -1) { - virNodeDeviceFree(dev); remoteDispatchConnError(rerr, conn); + virNodeDeviceFree(dev); return -1; } @@ -5727,8 +5737,8 @@ remoteDispatchNodeDeviceReAttach (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virNodeDeviceReAttach(dev) == -1) { - virNodeDeviceFree(dev); remoteDispatchConnError(rerr, conn); + virNodeDeviceFree(dev); return -1; } @@ -5756,8 +5766,8 @@ remoteDispatchNodeDeviceReset (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virNodeDeviceReset(dev) == -1) { - virNodeDeviceFree(dev); remoteDispatchConnError(rerr, conn); + virNodeDeviceFree(dev); return -1; } @@ -5808,8 +5818,8 @@ remoteDispatchNodeDeviceDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, } if (virNodeDeviceDestroy(dev) == -1) { - virNodeDeviceFree(dev); remoteDispatchConnError(rerr, conn); + virNodeDeviceFree(dev); return -1; } @@ -6189,8 +6199,8 @@ static int remoteDispatchDomainIsActive(struct qemud_server *server ATTRIBUTE_UN ret->active = virDomainIsActive(domain); if (ret->active < 0) { - virDomainFree(domain); remoteDispatchConnError(err, conn); + virDomainFree(domain); return -1; } @@ -6217,8 +6227,8 @@ static int remoteDispatchDomainIsPersistent(struct qemud_server *server ATTRIBUT ret->persistent = virDomainIsPersistent(domain); if (ret->persistent < 0) { - virDomainFree(domain); remoteDispatchConnError(err, conn); + virDomainFree(domain); return -1; } @@ -6245,8 +6255,8 @@ static int remoteDispatchDomainIsUpdated(struct qemud_server *server ATTRIBUTE_U ret->updated = virDomainIsUpdated(domain); if (ret->updated < 0) { - virDomainFree(domain); remoteDispatchConnError(err, conn); + virDomainFree(domain); return -1; } @@ -6273,8 +6283,8 @@ static int remoteDispatchInterfaceIsActive(struct qemud_server *server ATTRIBUTE ret->active = virInterfaceIsActive(iface); if (ret->active < 0) { - virInterfaceFree(iface); remoteDispatchConnError(err, conn); + virInterfaceFree(iface); return -1; } @@ -6301,8 +6311,8 @@ static int remoteDispatchNetworkIsActive(struct qemud_server *server ATTRIBUTE_U ret->active = virNetworkIsActive(network); if (ret->active < 0) { - virNetworkFree(network); remoteDispatchConnError(err, conn); + virNetworkFree(network); return -1; } @@ -6329,8 +6339,8 @@ static int remoteDispatchNetworkIsPersistent(struct qemud_server *server ATTRIBU ret->persistent = virNetworkIsPersistent(network); if (ret->persistent < 0) { - virNetworkFree(network); remoteDispatchConnError(err, conn); + virNetworkFree(network); return -1; } @@ -6357,8 +6367,8 @@ static int remoteDispatchStoragePoolIsActive(struct qemud_server *server ATTRIBU ret->active = virStoragePoolIsActive(pool); if (ret->active < 0) { - virStoragePoolFree(pool); remoteDispatchConnError(err, conn); + virStoragePoolFree(pool); return -1; } @@ -6385,8 +6395,8 @@ static int remoteDispatchStoragePoolIsPersistent(struct qemud_server *server ATT ret->persistent = virStoragePoolIsPersistent(pool); if (ret->persistent < 0) { - virStoragePoolFree(pool); remoteDispatchConnError(err, conn); + virStoragePoolFree(pool); return -1; } @@ -6481,8 +6491,8 @@ remoteDispatchDomainGetJobInfo (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainGetJobInfo (dom, &info) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } @@ -6523,8 +6533,8 @@ remoteDispatchDomainAbortJob (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainAbortJob (dom) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } @@ -6552,8 +6562,8 @@ remoteDispatchDomainMigrateSetMaxDowntime(struct qemud_server *server ATTRIBUTE_ } if (virDomainMigrateSetMaxDowntime(dom, args->downtime, args->flags) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } @@ -6610,8 +6620,8 @@ remoteDispatchDomainSnapshotCreateXml (struct qemud_server *server ATTRIBUTE_UNU snapshot = virDomainSnapshotCreateXML(domain, args->xml_desc, args->flags); if (snapshot == NULL) { - virDomainFree(domain); remoteDispatchConnError(rerr, conn); + virDomainFree(domain); return -1; } @@ -6652,12 +6662,12 @@ remoteDispatchDomainSnapshotDumpXml (struct qemud_server *server ATTRIBUTE_UNUSE rc = 0; cleanup: + if (rc < 0) + remoteDispatchConnError(rerr, conn); if (snapshot) virDomainSnapshotFree(snapshot); if (domain) virDomainFree(domain); - if (rc < 0) - remoteDispatchConnError(rerr, conn); return rc; } @@ -6681,8 +6691,8 @@ remoteDispatchDomainSnapshotNum (struct qemud_server *server ATTRIBUTE_UNUSED, ret->num = virDomainSnapshotNum(domain, args->flags); if (ret->num == -1) { - virDomainFree(domain); remoteDispatchConnError(rerr, conn); + virDomainFree(domain); return -1; } @@ -6726,9 +6736,9 @@ remoteDispatchDomainSnapshotListNames (struct qemud_server *server ATTRIBUTE_UNU args->nameslen, args->flags); if (ret->names.names_len == -1) { + remoteDispatchConnError(rerr, conn); virDomainFree(domain); VIR_FREE(ret->names.names_val); - remoteDispatchConnError(rerr, conn); return -1; } @@ -6757,8 +6767,8 @@ remoteDispatchDomainSnapshotLookupByName (struct qemud_server *server ATTRIBUTE_ snapshot = virDomainSnapshotLookupByName(domain, args->name, args->flags); if (snapshot == NULL) { - virDomainFree(domain); remoteDispatchConnError(rerr, conn); + virDomainFree(domain); return -1; } @@ -6790,8 +6800,8 @@ remoteDispatchDomainHasCurrentSnapshot(struct qemud_server *server ATTRIBUTE_UNU result = virDomainHasCurrentSnapshot(domain, args->flags); if (result < 0) { - virDomainFree(domain); remoteDispatchConnError(rerr, conn); + virDomainFree(domain); return -1; } @@ -6822,8 +6832,8 @@ remoteDispatchDomainSnapshotCurrent(struct qemud_server *server ATTRIBUTE_UNUSED snapshot = virDomainSnapshotCurrent(domain, args->flags); if (snapshot == NULL) { - virDomainFree(domain); remoteDispatchConnError(rerr, conn); + virDomainFree(domain); return -1; } @@ -6862,12 +6872,12 @@ remoteDispatchDomainRevertToSnapshot (struct qemud_server *server ATTRIBUTE_UNUS rc = 0; cleanup: + if (rc < 0) + remoteDispatchConnError(rerr, conn); if (snapshot) virDomainSnapshotFree(snapshot); if (domain) virDomainFree(domain); - if (rc < 0) - remoteDispatchConnError(rerr, conn); return rc; } @@ -6899,12 +6909,12 @@ remoteDispatchDomainSnapshotDelete (struct qemud_server *server ATTRIBUTE_UNUSED rc = 0; cleanup: + if (rc < 0) + remoteDispatchConnError(rerr, conn); if (snapshot) virDomainSnapshotFree(snapshot); if (domain) virDomainFree(domain); - if (rc < 0) - remoteDispatchConnError(rerr, conn); return rc; } @@ -7069,8 +7079,8 @@ remoteDispatchNwfilterUndefine (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virNWFilterUndefine (nwfilter) == -1) { - virNWFilterFree(nwfilter); remoteDispatchConnError(rerr, conn); + virNWFilterFree(nwfilter); return -1; } virNWFilterFree(nwfilter); @@ -7132,8 +7142,8 @@ remoteDispatchNwfilterGetXmlDesc (struct qemud_server *server ATTRIBUTE_UNUSED, /* remoteDispatchClientRequest will free this. */ ret->xml = virNWFilterGetXMLDesc (nwfilter, args->flags); if (!ret->xml) { - virNWFilterFree(nwfilter); remoteDispatchConnError(rerr, conn); + virNWFilterFree(nwfilter); return -1; } virNWFilterFree(nwfilter); @@ -7180,8 +7190,8 @@ remoteDispatchDomainGetBlockInfo (struct qemud_server *server ATTRIBUTE_UNUSED, } if (virDomainGetBlockInfo (dom, args->path, &info, args->flags) == -1) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); return -1; } @@ -7213,8 +7223,8 @@ qemuDispatchMonitorCommand (struct qemud_server *server ATTRIBUTE_UNUSED, if (virDomainQemuMonitorCommand(domain, args->cmd, &ret->result, args->flags) == -1) { - virDomainFree(domain); remoteDispatchConnError(rerr, conn); + virDomainFree(domain); return -1; } @@ -7257,15 +7267,15 @@ remoteDispatchDomainOpenConsole(struct qemud_server *server ATTRIBUTE_UNUSED, stream->st, args->flags); if (r == -1) { + remoteDispatchConnError(rerr, conn); virDomainFree(dom); remoteFreeClientStream(client, stream); - remoteDispatchConnError(rerr, conn); return -1; } if (remoteAddClientStream(client, stream, 1) < 0) { - virDomainFree(dom); remoteDispatchConnError(rerr, conn); + virDomainFree(dom); virStreamAbort(stream->st); remoteFreeClientStream(client, stream); return -1; -- 1.7.4.1

3 3

[libvirt] [PATCH] Spice: support auid, images and stream compression
by Michal Privoznik 13 Apr '11

13 Apr '11

This extends the SPICE XML to allow variable compression settings for audio, images and streaming: <graphics type='spice' port='5901' tlsPort='-1' autoport='yes'> <image compression='auto_glz'/> <jpeg compression='auto'/> <zlib compression='auto'/> <playback compression='on'/> </graphics> All new element are optional. --- docs/formatdomain.html.in | 12 ++ docs/schemas/domain.rng | 50 ++++++++ src/conf/domain_conf.c | 130 ++++++++++++++++++++ src/conf/domain_conf.h | 42 +++++++ src/libvirt_private.syms | 8 ++ src/qemu/qemu_command.c | 16 +++ .../qemuxml2argv-graphics-spice.args | 4 +- .../qemuxml2argv-graphics-spice.xml | 4 + 8 files changed, 265 insertions(+), 1 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3c4c656..c5edf53 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1664,6 +1664,18 @@ qemu-kvm -net nic,model=? /dev/null <channel name='main' mode='secure'/> <channel name='record' mode='insecure'/> </graphics></pre> + +Spice supports variable compression settings for audio, images and streaming. +This setting are accessible via <code>compression</code> attribute in all +following elements: <code>image</code> to set image compression (accept +<code>auto_glz</code>, <code>auto_lz</code>, <code>quic</code>, +<code>glz</code>, <code>lz</code>, <code>off</code>), <code>jpeg</code> for +JPEG compression for images over wan (accept <code>auto</code>, +<code>never</code>, <code>always</code>), <code>zlib</code> for configuring +wan image compression (accept <code>auto</code>, <code>never</code>, +<code>always</code>) and <code>playback</code> for enabling audio stream +compression (accept <code>on</code> or <code>off</code>) + </dd> <dt><code>"rdp"</code></dt> <dd> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 0fbf326..f0578f8 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1283,6 +1283,56 @@ <empty/> </element> </zeroOrMore> + <optional> + <element name="image"> + <attribute name="compression"> + <choice> + <value>auto_glz</value> + <value>auto_lz</value> + <value>quic</value> + <value>glz</value> + <value>lz</value> + <value>off</value> + </choice> + </attribute> + <empty/> + </element> + </optional> + <optional> + <element name="jpeg"> + <attribute name="compression"> + <choice> + <value>auto</value> + <value>never</value> + <value>always</value> + </choice> + </attribute> + <empty/> + </element> + </optional> + <optional> + <element name="zlib"> + <attribute name="compression"> + <choice> + <value>auto</value> + <value>never</value> + <value>always</value> + </choice> + </attribute> + <empty/> + </element> + </optional> + <optional> + <element name="playback"> + <attribute name="compression"> + <choice> + <value>on</value> + <value>off</value> + </choice> + </attribute> + <empty/> + </element> + </optional> </group> <group> <attribute name="type"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 90a1317..f215e7d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -322,6 +322,32 @@ VIR_ENUM_IMPL(virDomainGraphicsSpiceChannelMode, "secure", "insecure"); +VIR_ENUM_IMPL(virDomainGraphicsSpiceImageCompression, + VIR_DOMAIN_GRAPHICS_SPICE_IMAGE_COMPRESSION_LAST, + "auto_glz", + "auto_lz", + "quic", + "glz", + "lz", + "off"); + +VIR_ENUM_IMPL(virDomainGraphicsSpiceJpegCompression, + VIR_DOMAIN_GRAPHICS_SPICE_JPEG_COMPRESSION_LAST, + "auto", + "never", + "always"); + +VIR_ENUM_IMPL(virDomainGraphicsSpiceZlibCompression, + VIR_DOMAIN_GRAPHICS_SPICE_ZLIB_COMPRESSION_LAST, + "auto", + "never", + "always"); + +VIR_ENUM_IMPL(virDomainGraphicsSpicePlaybackCompression, + VIR_DOMAIN_GRAPHICS_SPICE_PLAYBACK_COMPRESSION_LAST, + "on", + "off"); + VIR_ENUM_IMPL(virDomainHostdevMode, VIR_DOMAIN_HOSTDEV_MODE_LAST, "subsystem", "capabilities") @@ -3917,6 +3943,11 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { if (virDomainGraphicsAuthDefParseXML(node, &def->data.spice.auth) < 0) goto error; + def->data.spice.image = VIR_DOMAIN_GRAPHICS_SPICE_IMAGE_COMPRESSION_LAST; + def->data.spice.jpeg = VIR_DOMAIN_GRAPHICS_SPICE_JPEG_COMPRESSION_LAST; + def->data.spice.zlib = VIR_DOMAIN_GRAPHICS_SPICE_ZLIB_COMPRESSION_LAST; + def->data.spice.playback = VIR_DOMAIN_GRAPHICS_SPICE_PLAYBACK_COMPRESSION_LAST; + cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { @@ -3954,6 +3985,89 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { VIR_FREE(mode); def->data.spice.channels[nameval] = modeval; + } else if (xmlStrEqual(cur->name, BAD_CAST "image")) { + const char *compression = virXMLPropString(cur, "compression"); + int compressionVal; + + if (!compression) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("spice image missing compression")); + goto error; + } + + if ((compressionVal = + virDomainGraphicsSpiceImageCompressionTypeFromString(compression)) < 0) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown spice image compression %s"), + compression); + VIR_FREE(compression); + goto error; + } + VIR_FREE(compression); + + def->data.spice.image = compressionVal; + } else if (xmlStrEqual(cur->name, BAD_CAST "jpeg")) { + const char *compression = virXMLPropString(cur, "compression"); + int compressionVal; + + if (!compression) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("spice jpeg missing compression")); + goto error; + } + + if ((compressionVal = + virDomainGraphicsSpiceJpegCompressionTypeFromString(compression)) < 0) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown spice jpeg compression %s"), + compression); + VIR_FREE(compression); + goto error; + } + VIR_FREE(compression); + + def->data.spice.jpeg = compressionVal; + } else if (xmlStrEqual(cur->name, BAD_CAST "zlib")) { + const char *compression = virXMLPropString(cur, "compression"); + int compressionVal; + + if (!compression) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("spice zlib missing compression")); + goto error; + } + + if ((compressionVal = + virDomainGraphicsSpiceZlibCompressionTypeFromString(compression)) < 0) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown spice zlib compression %s"), + compression); + VIR_FREE(compression); + goto error; + } + + def->data.spice.zlib = compressionVal; + } else if (xmlStrEqual(cur->name, BAD_CAST "playback")) { + const char *compression = virXMLPropString(cur, "compression"); + int compressionVal; + + if (!compression) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("spice playback missing compression")); + goto error; + } + + if ((compressionVal = + virDomainGraphicsSpicePlaybackCompressionTypeFromString(compression)) < 0) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown spice playback compression")); + VIR_FREE(compression); + goto error; + + } + VIR_FREE(compression); + + def->data.spice.playback = compressionVal; } } cur = cur->next; @@ -7817,6 +7931,22 @@ virDomainGraphicsDefFormat(virBufferPtr buf, virDomainGraphicsSpiceChannelNameTypeToString(i), virDomainGraphicsSpiceChannelModeTypeToString(mode)); } + if (def->data.spice.image != + VIR_DOMAIN_GRAPHICS_SPICE_IMAGE_COMPRESSION_LAST) + virBufferVSprintf(buf, " <image compression='%s'/>\n", + virDomainGraphicsSpiceImageCompressionTypeToString(def->data.spice.image)); + if (def->data.spice.jpeg != + VIR_DOMAIN_GRAPHICS_SPICE_JPEG_COMPRESSION_LAST) + virBufferVSprintf(buf, " <jpeg compression='%s'/>\n", + virDomainGraphicsSpiceJpegCompressionTypeToString(def->data.spice.jpeg)); + if (def->data.spice.zlib != + VIR_DOMAIN_GRAPHICS_SPICE_ZLIB_COMPRESSION_LAST) + virBufferVSprintf(buf, " <zlib compression='%s'/>\n", + virDomainGraphicsSpiceZlibCompressionTypeToString(def->data.spice.zlib)); + if (def->data.spice.playback != + VIR_DOMAIN_GRAPHICS_SPICE_PLAYBACK_COMPRESSION_LAST) + virBufferVSprintf(buf, " <playback compression='%s'/>\n", + virDomainGraphicsSpicePlaybackCompressionTypeToString(def->data.spice.playback)); } if (children) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 95bd11e..e36f0ed 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -658,6 +658,40 @@ enum virDomainGraphicsSpiceChannelMode { VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_LAST }; +enum virDomainGraphicsSpiceImageCompression { + VIR_DOMAIN_GRAPHICS_SPICE_IMAGE_COMPRESSION_AUTO_GLZ, + VIR_DOMAIN_GRAPHICS_SPICE_IMAGE_COMPRESSION_AUTO_LZ, + VIR_DOMAIN_GRAPHICS_SPICE_IMAGE_COMPRESSION_QUIC, + VIR_DOMAIN_GRAPHICS_SPICE_IMAGE_COMPRESSION_GLZ, + VIR_DOMAIN_GRAPHICS_SPICE_IMAGE_COMPRESSION_LZ, + VIR_DOMAIN_GRAPHICS_SPICE_IMAGE_COMPRESSION_OFF, + + VIR_DOMAIN_GRAPHICS_SPICE_IMAGE_COMPRESSION_LAST +}; + +enum virDomainGraphicsSpiceJpegCompression { + VIR_DOMAIN_GRAPHICS_SPICE_JPEG_COMPRESSION_AUTO, + VIR_DOMAIN_GRAPHICS_SPICE_JPEG_COMPRESSION_NEVER, + VIR_DOMAIN_GRAPHICS_SPICE_JPEG_COMPRESSION_ALWAYS, + + VIR_DOMAIN_GRAPHICS_SPICE_JPEG_COMPRESSION_LAST +}; + +enum virDomainGraphicsSpiceZlibCompression { + VIR_DOMAIN_GRAPHICS_SPICE_ZLIB_COMPRESSION_AUTO, + VIR_DOMAIN_GRAPHICS_SPICE_ZLIB_COMPRESSION_NEVER, + VIR_DOMAIN_GRAPHICS_SPICE_ZLIB_COMPRESSION_ALWAYS, + + VIR_DOMAIN_GRAPHICS_SPICE_ZLIB_COMPRESSION_LAST +}; + +enum virDomainGraphicsSpicePlaybackCompression { + VIR_DOMAIN_GRAPHICS_SPICE_PLAYBACK_COMPRESSION_ON, + VIR_DOMAIN_GRAPHICS_SPICE_PLAYBACK_COMPRESSION_OFF, + + VIR_DOMAIN_GRAPHICS_SPICE_PLAYBACK_COMPRESSION_LAST +}; + typedef struct _virDomainGraphicsDef virDomainGraphicsDef; typedef virDomainGraphicsDef *virDomainGraphicsDefPtr; struct _virDomainGraphicsDef { @@ -695,6 +729,10 @@ struct _virDomainGraphicsDef { virDomainGraphicsAuthDef auth; unsigned int autoport :1; int channels[VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST]; + int image; + int jpeg; + int zlib; + int playback; } spice; } data; }; @@ -1423,6 +1461,10 @@ VIR_ENUM_DECL(virDomainInputBus) VIR_ENUM_DECL(virDomainGraphics) VIR_ENUM_DECL(virDomainGraphicsSpiceChannelName) VIR_ENUM_DECL(virDomainGraphicsSpiceChannelMode) +VIR_ENUM_DECL(virDomainGraphicsSpiceImageCompression) +VIR_ENUM_DECL(virDomainGraphicsSpiceJpegCompression) +VIR_ENUM_DECL(virDomainGraphicsSpiceZlibCompression) +VIR_ENUM_DECL(virDomainGraphicsSpicePlaybackCompression) /* from libvirt.h */ VIR_ENUM_DECL(virDomainState) VIR_ENUM_DECL(virDomainSeclabel) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 54e4482..d2aa077 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -262,6 +262,14 @@ virDomainGraphicsSpiceChannelModeTypeFromString; virDomainGraphicsSpiceChannelModeTypeToString; virDomainGraphicsSpiceChannelNameTypeFromString; virDomainGraphicsSpiceChannelNameTypeToString; +virDomainGraphicsSpiceImageCompressionTypeToString; +virDomainGraphicsSpiceImageCompressionTypeFromString; +virDomainGraphicsSpiceJpegCompressionTypeFromString; +virDomainGraphicsSpiceJpegCompressionTypeToString; +virDomainGraphicsSpicePlaybackCompressionTypeFromString; +virDomainGraphicsSpicePlaybackCompressionTypeToString; +virDomainGraphicsSpiceZlibCompressionTypeFromString; +virDomainGraphicsSpiceZlibCompressionTypeToString; virDomainGraphicsTypeFromString; virDomainGraphicsTypeToString; virDomainHostdevDefFree; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fea0068..6272910 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4032,6 +4032,22 @@ qemuBuildCommandLine(virConnectPtr conn, break; } } + if (def->graphics[0]->data.spice.image != + VIR_DOMAIN_GRAPHICS_SPICE_IMAGE_COMPRESSION_LAST) + virBufferVSprintf(&opt, ",image-compression=%s", + virDomainGraphicsSpiceImageCompressionTypeToString(def->graphics[0]->data.spice.image)); + if (def->graphics[0]->data.spice.jpeg != + VIR_DOMAIN_GRAPHICS_SPICE_JPEG_COMPRESSION_LAST) + virBufferVSprintf(&opt, ",jpeg-wan-compression=%s", + virDomainGraphicsSpiceJpegCompressionTypeToString(def->graphics[0]->data.spice.jpeg)); + if (def->graphics[0]->data.spice.zlib != + VIR_DOMAIN_GRAPHICS_SPICE_ZLIB_COMPRESSION_LAST) + virBufferVSprintf(&opt, ",zlib-glz-wan-compression=%s", + virDomainGraphicsSpiceZlibCompressionTypeToString(def->graphics[0]->data.spice.zlib)); + if (def->graphics[0]->data.spice.playback != + VIR_DOMAIN_GRAPHICS_SPICE_PLAYBACK_COMPRESSION_LAST) + virBufferVSprintf(&opt, ",playback-compression=%s", + virDomainGraphicsSpicePlaybackCompressionTypeToString(def->graphics[0]->data.spice.playback)); virCommandAddArg(cmd, "-spice"); virCommandAddArgBuffer(cmd, &opt); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args index c788bb6..70cd35b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args @@ -2,6 +2,8 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \ /usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefaults -monitor \ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda \ /dev/HostVG/QEMUGuest1 -usb -spice port=5903,tls-port=5904,addr=127.0.0.1,\ -x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs -vga \ +x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs,\ +image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,\ +playback-compression=on -vga \ qxl -global qxl.vram_size=18874368 -device qxl,id=video1,vram_size=33554432,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml index 5d46509..a29f50d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml @@ -24,6 +24,10 @@ <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='127.0.0.1'> <channel name='main' mode='secure'/> <channel name='inputs' mode='insecure'/> + <image compression='auto_glz'/> + <jpeg compression='auto'/> + <zlib compression='auto'/> + <playback compression='on'/> </graphics> <video> <model type='qxl' vram='18432' heads='1'/> -- 1.7.4.2

3 2

[libvirt] [PATCH 0/3] PHYP: Adding network management support
by Eduardo Otubo 13 Apr '11

13 Apr '11

This is a series of 3 patches to add network management support for pHyp driver. Eduardo Otubo (3): PHYP: Separating UUID functions in another file PHYP: Adding basic network functions PHYP: create, destroy and other network functions po/POTFILES.in | 1 + src/Makefile.am | 3 +- src/phyp/phyp_driver.c | 1066 +++++++++++++++++++++++++++--------------------- src/phyp/phyp_driver.h | 43 ++- src/phyp/phyp_uuid.c | 834 +++++++++++++++++++++++++++++++++++++ src/phyp/phyp_uuid.h | 44 ++ 6 files changed, 1520 insertions(+), 471 deletions(-) create mode 100644 src/phyp/phyp_uuid.c create mode 100644 src/phyp/phyp_uuid.h

3 25

[libvirt] [PATCH] - added mapping to Network object - added implementation of select networking functions - virsh net-list and net-info commands now work for esx
by jbarkley 13 Apr '11

13 Apr '11

From: jbarkely <jbarkley(a)willo.(none)> --- src/esx/esx_network_driver.c | 181 +++++++++++++++++++++++++++++++++++++++- src/esx/esx_vi.c | 104 ++++++++++++++++++++++- src/esx/esx_vi.h | 9 ++ src/esx/esx_vi_generator.input | 78 +++++++++++++++++ 4 files changed, 366 insertions(+), 6 deletions(-) diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index a64bb8e..c4cc7b4 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -34,6 +34,7 @@ #include "esx_vi.h" #include "esx_vi_methods.h" #include "esx_util.h" +#include "md5.h" #define VIR_FROM_THIS VIR_FROM_ESX @@ -63,18 +64,190 @@ esxNetworkClose(virConnectPtr conn) return 0; } +static virNetworkPtr +esxNetworkLookupByName(virConnectPtr conn, const char *name) { + //esxPrivate *priv = conn->networkPrivateData; + esxPrivate *priv = conn->networkPrivateData; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *network = NULL; + virNetworkPtr virNetwork = NULL; + unsigned char uuid[VIR_UUID_BUFLEN]; + unsigned char md5[MD5_DIGEST_SIZE]; /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ + + if (esxVI_EnsureSession(priv->primary) < 0) { + return NULL; + } + + if (esxVI_LookupNetworkByName(priv->primary, name, propertyNameList, + &network, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (NULL==network) { + // raise error + ESX_ERROR(VIR_ERR_NO_NETWORK, _("No network with name '%s'"), name); + goto cleanup; + + } + + char *name_candidate = NULL; + esxVI_GetStringValue(network, "name", &name_candidate, esxVI_Occurrence_OptionalItem); + + md5_buffer(name, strlen(name), md5); + virNetwork = virGetNetwork(conn, name, md5); + + cleanup: + esxVI_String_Free(&propertyNameList); + //esxVI_ObjectContent_Free(&network); +// printf("virNetwork=%s\n", virNetwork->name); + return virNetwork; +} + +static int +esxListNetworks(virConnectPtr conn, char **const names, int nnames) +{ + //setup + bool success = false; + esxPrivate *priv = conn->networkPrivateData; + esxVI_String *propertyNameList = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_ObjectContent *networkList = NULL; + esxVI_ObjectContent *network = NULL; + int count = 0; + int i; + + //check args + if (names == NULL || nnames < 0) { + ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", _("Invalid argument")); + return -1; + } + + if (nnames == 0) { + return 0; + } + + //check connection + if (esxVI_EnsureSession(priv->primary) < 0) { + return -1; + } + + //get network(s) + if (esxVI_String_AppendValueToList(&propertyNameList, + "summary.name") < 0 || + esxVI_LookupNetworkList(priv->primary, propertyNameList, + &networkList) < 0) { + goto cleanup; + } + + for (network = networkList; network != NULL; + network = network->_next) { + for (dynamicProperty = network->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "summary.name")) { + if (esxVI_AnyType_ExpectType(dynamicProperty->val, + esxVI_Type_String) < 0) { + goto cleanup; + } + + names[count] = strdup(dynamicProperty->val->string); + + if (names[count] == NULL) { + virReportOOMError(); + goto cleanup; + } + + ++count; + break; + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + } + + success = true; + + //cleanup + cleanup: + if (! success) { + for (i = 0; i < count; ++i) { + VIR_FREE(names[i]); + } + + count = -1; + } + + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&networkList); + + return count; +} + +static int +esxNumOfNetworks(virConnectPtr conn) +{ + //setup + esxPrivate *priv = conn->networkPrivateData; + esxVI_String *propertyNameList = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_ObjectContent *networkList = NULL; + esxVI_ObjectContent *network = NULL; + int count = 0; + int i; + + //check connection + if (esxVI_EnsureSession(priv->primary) < 0) { + return -1; + } + + //get network(s) + if (esxVI_String_AppendValueToList(&propertyNameList, + "summary.name") < 0 || + esxVI_LookupNetworkList(priv->primary, propertyNameList, + &networkList) < 0) { + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&networkList); + + return -1; + } + + for (network = networkList; network != NULL; + network = network->_next) { + for (dynamicProperty = network->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "summary.name")) { + ++count; + break; + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + } + + + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&networkList); + + return count; +} + +static int esxNumOfDefinedNetworks(virConnectPtr conn) +{ + printf("JB-BUG C\n"); + return 8; +} static virNetworkDriver esxNetworkDriver = { "ESX", /* name */ esxNetworkOpen, /* open */ esxNetworkClose, /* close */ - NULL, /* numOfNetworks */ - NULL, /* listNetworks */ - NULL, /* numOfDefinedNetworks */ + esxNumOfNetworks, /* numOfNetworks */ + esxListNetworks, /* listNetworks */ + esxNumOfDefinedNetworks, /* numOfDefinedNetworks */ NULL, /* listDefinedNetworks */ NULL, /* networkLookupByUUID */ - NULL, /* networkLookupByName */ + esxNetworkLookupByName, /* networkLookupByName */ NULL, /* networkCreateXML */ NULL, /* networkDefineXML */ NULL, /* networkUndefine */ diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 7446ec5..509cf07 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -109,6 +109,7 @@ ESX_VI__TEMPLATE__FREE(Context, esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToParent); esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToVm); esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToDatastore); + esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToNetwork); esxVI_SelectionSpec_Free(&item->selectSet_computeResourceToHost); esxVI_SelectionSpec_Free(&item->selectSet_computeResourceToParentToParent); }); @@ -1483,6 +1484,13 @@ esxVI_BuildSelectSetCollection(esxVI_Context *ctx) return -1; } + /* HostSystem -> network (Network) */ + if (esxVI_BuildSelectSet(&ctx->selectSet_hostSystemToNetwork, + "hostSystemToNetwork", + "HostSystem", "network", NULL) < 0) { + return -1; + } + /* Folder -> parent (Folder, Datacenter) */ if (esxVI_BuildSelectSet(&ctx->selectSet_computeResourceToParentToParent, "managedEntityToParent", @@ -1543,9 +1551,13 @@ esxVI_EnsureSession(esxVI_Context *ctx) * Query the session manager for the current session of this connection * and re-login if there is no current session for this connection. */ + if (esxVI_String_AppendValueToList(&propertyNameList, - "currentSession") < 0 || - esxVI_LookupObjectContentByType(ctx, ctx->service->sessionManager, + "currentSession") < 0) { + goto cleanup; + } + + if (esxVI_LookupObjectContentByType(ctx, ctx->service->sessionManager, "SessionManager", propertyNameList, &sessionManager, esxVI_Occurrence_RequiredItem) < 0) { @@ -1649,6 +1661,8 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, objectSpec->selectSet = ctx->selectSet_hostSystemToVm; } else if (STREQ(type, "Datastore")) { objectSpec->selectSet = ctx->selectSet_hostSystemToDatastore; + } else if (STREQ(type, "Network")) { + objectSpec->selectSet = ctx->selectSet_hostSystemToNetwork; } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Invalid lookup of '%s' from '%s'"), @@ -2474,6 +2488,92 @@ esxVI_LookupDatastoreList(esxVI_Context *ctx, esxVI_String *propertyNameList, esxVI_Occurrence_OptionalList); } +int +esxVI_LookupNetworkList(esxVI_Context *ctx, + esxVI_String *propertyNameList, + esxVI_ObjectContent **networkList) +{ + return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference, + "Network", propertyNameList, + networkList, + esxVI_Occurrence_OptionalList); +} + +int +esxVI_LookupNetworkByName(esxVI_Context *ctx, const char *name, + esxVI_String *propertyNameList, + esxVI_ObjectContent **network, + esxVI_Occurrence occurrence) +{ + int result = -1; + esxVI_String *completePropertyNameList = NULL; + esxVI_ObjectContent *networkList = NULL; + esxVI_ObjectContent *candidate = NULL; + char *name_candidate = NULL; + + if (network == NULL || *network != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + + if (esxVI_String_DeepCopyList(&completePropertyNameList, + propertyNameList) < 0 || + esxVI_String_AppendValueToList(&completePropertyNameList, "name") < 0 || + esxVI_LookupNetworkList(ctx, completePropertyNameList, + &networkList) < 0) { + goto cleanup; + } + + for (candidate = networkList; candidate != NULL; + candidate = candidate->_next) { + VIR_FREE(name_candidate); + + /* + if (esxVI_GetVirtualMachineIdentity(candidate, NULL, &name_candidate, + NULL) < 0) { + goto cleanup; + } + */ + if (esxVI_GetStringValue(candidate, "name", &name_candidate, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (STRNEQ(name, name_candidate)) { + continue; + } + + if (esxVI_ObjectContent_DeepCopy(network, candidate) < 0) { + goto cleanup; + } + + break; + } + + /* + if (*network == NULL) { + if (occurrence == esxVI_Occurrence_OptionalItem) { + result = 0; + + goto cleanup; + } else { + ESX_VI_ERROR(VIR_ERR_NO_NETWORK, + _("Could not find network with name '%s'"), name); + goto cleanup; + } + } + */ + + result = 0; + + cleanup: + esxVI_String_Free(&completePropertyNameList); + esxVI_ObjectContent_Free(&networkList); + //VIR_FREE(name_candidate); + + return result; +} int diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index e150dbf..cbd6068 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -165,6 +165,7 @@ struct _esxVI_Context { esxVI_SelectionSpec *selectSet_hostSystemToParent; esxVI_SelectionSpec *selectSet_hostSystemToVm; esxVI_SelectionSpec *selectSet_hostSystemToDatastore; + esxVI_SelectionSpec *selectSet_hostSystemToNetwork; esxVI_SelectionSpec *selectSet_computeResourceToHost; esxVI_SelectionSpec *selectSet_computeResourceToParentToParent; bool hasQueryVirtualDiskUuid; @@ -367,11 +368,19 @@ int esxVI_LookupVirtualMachineByUuidAndPrepareForTask int esxVI_LookupDatastoreList(esxVI_Context *ctx, esxVI_String *propertyNameList, esxVI_ObjectContent **datastoreList); +int esxVI_LookupNetworkList(esxVI_Context *ctx, esxVI_String *propertyNameList, + esxVI_ObjectContent **networkList); + int esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, esxVI_String *propertyNameList, esxVI_ObjectContent **datastore, esxVI_Occurrence occurrence); +int esxVI_LookupNetworkByName(esxVI_Context *ctx, const char *name, + esxVI_String *propertyNameList, + esxVI_ObjectContent **network, + esxVI_Occurrence occurrence); + int esxVI_LookupDatastoreByAbsolutePath(esxVI_Context *ctx, const char *absolutePath, esxVI_String *propertyNameList, diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index 44d1d9b..86c4b12 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -334,6 +334,84 @@ object HostNasVolume extends HostFileSystemVolume String userName o end +object HostNetCapabilities +end + +object HostIpRouteConfig +end + +object HostDnsConfig +end + +object HostIpRouteConfig +end + +object HostNetworkConfig +end + +object HostNetworkInfo +end + +object HostNetworkSystem + HostNetCapabilities capabilities rl + HostIpRouteConfig consoleIpRuteConfig r + HostDnsConfig dnsConfig r + HostIpRouteConfig ipRouteConfig r + HostNetworkConfig networkConfig r + HostNetworkInfo networkInfo r +end + + +object HostIpRouteConfig +end + +object HostVirtualNic +end + +object HostDhcpService +end + +object HostDnsConfig +end + +object HostNatService +end + +object PhysicalNic +end + +object HostPortGroup +end + +object HostProxySwitch +end + +object HostIpRouteTableInfo +end + +object HostVirtualNic +end + +object HostVirtualSwitch +end + +object HostNetworkInfo + Boolean atBootIpV6Enabled r + HostIpRouteConfig consoleIpRouteConfig r + HostVirtualNic consoleVnic rl + HostDhcpService dhcp rl + HostDnsConfig dnsConfig r + HostIpRouteConfig ipRouteConfig r + Boolean ipV6Enabled r + HostNatService nat rl + PhysicalNic pnic rl + HostPortGroup portgroup rl + HostProxySwitch proxySwitch rl + HostIpRouteTableInfo routeTableInfo r + HostVirtualNic vnic rl + HostVirtualSwitch vswitch rl +end + object HostScsiDiskPartition String diskName r -- 1.7.4.1

4 3

Re: [libvirt] How to get the IP address of a Domain? (Philipp Hahn)
by 徐滕 13 Apr '11

13 Apr '11

Thanks , Hahn! I think I get your point ,libvirt or the host machine is independent from the guest OS. but ,as I know ,on the VMware ESX server , they supply an extra tool called vmware-tools which can get more information about the Guest OS,including the network info. How did they do this? Now I had to write a tool to get more information about the active Guest OS using KVM hypervisor , have no idea how to who can help me ? Sincerely wade

2 1

[libvirt] [PATCH 0/5] RFC: configure inactive domains' memory size
by Taku Izumi 13 Apr '11

13 Apr '11

Hi all, Currently "virsh setmem" is not allowed to use against an inactive domain. This is yet another approach to configure inactive domain's memory size. The approach before was closed in "virsh" command: http://www.redhat.com/archives/libvir-list/2011-February/msg01074.html This time a new libvirt API is introduced to achieve this. *[PATCH 1/5] setmem: introduce a new libvirt API (virDomainSetMemoryFlags) *[PATCH 2/5] setmem: implement the call back member for new API on each driver *[PATCH 3/5] setmem: implement the code to address the new API in the qemu driver *[PATCH 4/5] setmem: implement the remote protocol to address the new API *[PATCH 5/5] setmem: add the new options to "virsh setmem" command Best regards, Taku Izumi

5 28

[libvirt] [PATCH 0/3] Expose the libvirtd event loop to apps as an API
by Daniel P. Berrange 13 Apr '11

13 Apr '11

We provide the virEventRegister() API to let applications provide a set of callbacks to integrate with their existing event loop. Not all apps have an existing event loop and forcing them to write one themselves is an undue burden, which they often get wrong. We have an event loop impl used by libvirtd that could be used by applications. This series exposes it via two new public APIs. Apps are free to ignore these new APIs and provide their own impl, but this should help the common case.

4 11

[libvirt] [PATCH] Replace REMOTE_DEBUG with VIR_DEBUG in daemon dispatcher
by Daniel P. Berrange 13 Apr '11

13 Apr '11

The daemon dispatcher code had an obsolete macro #define REMOTE_DEBUG(fmt, ...) VIR_DEBUG(fmt, __VA_ARGS__) This can be trivially removed * daemon/remote.c: s/REMOTE_DEBUG/VIR_DEBUG/ --- daemon/remote.c | 59 +++++++++++++++++++++++++++---------------------------- 1 files changed, 29 insertions(+), 30 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 2a56d91..3ecf85f 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -63,7 +63,6 @@ #include "command.h" #define VIR_FROM_THIS VIR_FROM_REMOTE -#define REMOTE_DEBUG(fmt, ...) VIR_DEBUG(fmt, __VA_ARGS__) static virDomainPtr get_nonnull_domain(virConnectPtr conn, remote_nonnull_domain domain); static virNetworkPtr get_nonnull_network(virConnectPtr conn, remote_nonnull_network network); @@ -134,7 +133,7 @@ static int remoteRelayDomainEventLifecycle(virConnectPtr conn ATTRIBUTE_UNUSED, if (!client) return -1; - REMOTE_DEBUG("Relaying domain lifecycle event %d %d", event, detail); + VIR_DEBUG("Relaying domain lifecycle event %d %d", event, detail); virMutexLock(&client->lock); @@ -163,7 +162,7 @@ static int remoteRelayDomainEventReboot(virConnectPtr conn ATTRIBUTE_UNUSED, if (!client) return -1; - REMOTE_DEBUG("Relaying domain reboot event %s %d", dom->name, dom->id); + VIR_DEBUG("Relaying domain reboot event %s %d", dom->name, dom->id); virMutexLock(&client->lock); @@ -192,7 +191,7 @@ static int remoteRelayDomainEventRTCChange(virConnectPtr conn ATTRIBUTE_UNUSED, if (!client) return -1; - REMOTE_DEBUG("Relaying domain rtc change event %s %d %lld", dom->name, dom->id, offset); + VIR_DEBUG("Relaying domain rtc change event %s %d %lld", dom->name, dom->id, offset); virMutexLock(&client->lock); @@ -222,7 +221,7 @@ static int remoteRelayDomainEventWatchdog(virConnectPtr conn ATTRIBUTE_UNUSED, if (!client) return -1; - REMOTE_DEBUG("Relaying domain watchdog event %s %d %d", dom->name, dom->id, action); + VIR_DEBUG("Relaying domain watchdog event %s %d %d", dom->name, dom->id, action); virMutexLock(&client->lock); @@ -254,7 +253,7 @@ static int remoteRelayDomainEventIOError(virConnectPtr conn ATTRIBUTE_UNUSED, if (!client) return -1; - REMOTE_DEBUG("Relaying domain io error %s %d %s %s %d", dom->name, dom->id, srcPath, devAlias, action); + VIR_DEBUG("Relaying domain io error %s %d %s %s %d", dom->name, dom->id, srcPath, devAlias, action); virMutexLock(&client->lock); @@ -289,8 +288,8 @@ static int remoteRelayDomainEventIOErrorReason(virConnectPtr conn ATTRIBUTE_UNUS if (!client) return -1; - REMOTE_DEBUG("Relaying domain io error %s %d %s %s %d %s", - dom->name, dom->id, srcPath, devAlias, action, reason); + VIR_DEBUG("Relaying domain io error %s %d %s %s %d %s", + dom->name, dom->id, srcPath, devAlias, action, reason); virMutexLock(&client->lock); @@ -328,14 +327,14 @@ static int remoteRelayDomainEventGraphics(virConnectPtr conn ATTRIBUTE_UNUSED, if (!client) return -1; - REMOTE_DEBUG("Relaying domain graphics event %s %d %d - %d %s %s - %d %s %s - %s", dom->name, dom->id, phase, - local->family, local->service, local->node, - remote->family, remote->service, remote->node, - authScheme); + VIR_DEBUG("Relaying domain graphics event %s %d %d - %d %s %s - %d %s %s - %s", dom->name, dom->id, phase, + local->family, local->service, local->node, + remote->family, remote->service, remote->node, + authScheme); - REMOTE_DEBUG("Subject %d", subject->nidentity); + VIR_DEBUG("Subject %d", subject->nidentity); for (i = 0 ; i < subject->nidentity ; i++) { - REMOTE_DEBUG(" %s=%s", subject->identities[i].type, subject->identities[i].name); + VIR_DEBUG(" %s=%s", subject->identities[i].type, subject->identities[i].name); } virMutexLock(&client->lock); @@ -4309,7 +4308,7 @@ remoteDispatchAuthSaslInit(struct qemud_server *server, virMutexLock(&client->lock); virMutexUnlock(&server->lock); - REMOTE_DEBUG("Initialize SASL auth %d", client->fd); + VIR_DEBUG("Initialize SASL auth %d", client->fd); if (client->auth != REMOTE_AUTH_SASL || client->saslconn != NULL) { VIR_ERROR0(_("client tried invalid SASL init request")); @@ -4428,7 +4427,7 @@ remoteDispatchAuthSaslInit(struct qemud_server *server, client->saslconn = NULL; goto authfail; } - REMOTE_DEBUG("Available mechanisms for client: '%s'", mechlist); + VIR_DEBUG("Available mechanisms for client: '%s'", mechlist); ret->mechlist = strdup(mechlist); if (!ret->mechlist) { VIR_ERROR0(_("cannot allocate mechlist")); @@ -4473,7 +4472,7 @@ remoteSASLCheckSSF(struct qemud_client *client, return -1; } ssf = *(const int *)val; - REMOTE_DEBUG("negotiated an SSF of %d", ssf); + VIR_DEBUG("negotiated an SSF of %d", ssf); if (ssf < 56) { /* 56 is good for Kerberos */ VIR_ERROR(_("negotiated SSF %d was not strong enough"), ssf); remoteDispatchAuthError(rerr); @@ -4521,7 +4520,7 @@ remoteSASLCheckAccess(struct qemud_server *server, client->saslconn = NULL; return -1; } - REMOTE_DEBUG("SASL client username %s", (const char *)val); + VIR_DEBUG("SASL client username %s", (const char *)val); client->saslUsername = strdup((const char*)val); if (client->saslUsername == NULL) { @@ -4572,15 +4571,15 @@ remoteDispatchAuthSaslStart(struct qemud_server *server, virMutexLock(&client->lock); virMutexUnlock(&server->lock); - REMOTE_DEBUG("Start SASL auth %d", client->fd); + VIR_DEBUG("Start SASL auth %d", client->fd); if (client->auth != REMOTE_AUTH_SASL || client->saslconn == NULL) { VIR_ERROR0(_("client tried invalid SASL start request")); goto authfail; } - REMOTE_DEBUG("Using SASL mechanism %s. Data %d bytes, nil: %d", - args->mech, args->data.data_len, args->nil); + VIR_DEBUG("Using SASL mechanism %s. Data %d bytes, nil: %d", + args->mech, args->data.data_len, args->nil); err = sasl_server_start(client->saslconn, args->mech, /* NB, distinction of NULL vs "" is *critical* in SASL */ @@ -4616,7 +4615,7 @@ remoteDispatchAuthSaslStart(struct qemud_server *server, ret->nil = serverout ? 0 : 1; ret->data.data_len = serveroutlen; - REMOTE_DEBUG("SASL return data %d bytes, nil; %d", ret->data.data_len, ret->nil); + VIR_DEBUG("SASL return data %d bytes, nil; %d", ret->data.data_len, ret->nil); if (err == SASL_CONTINUE) { ret->complete = 0; } else { @@ -4629,7 +4628,7 @@ remoteDispatchAuthSaslStart(struct qemud_server *server, goto authfail; } - REMOTE_DEBUG("Authentication successful %d", client->fd); + VIR_DEBUG("Authentication successful %d", client->fd); PROBE(CLIENT_AUTH_ALLOW, "fd=%d, auth=%d, username=%s", client->fd, REMOTE_AUTH_SASL, client->saslUsername); ret->complete = 1; @@ -4672,15 +4671,15 @@ remoteDispatchAuthSaslStep(struct qemud_server *server, virMutexLock(&client->lock); virMutexUnlock(&server->lock); - REMOTE_DEBUG("Step SASL auth %d", client->fd); + VIR_DEBUG("Step SASL auth %d", client->fd); if (client->auth != REMOTE_AUTH_SASL || client->saslconn == NULL) { VIR_ERROR0(_("client tried invalid SASL start request")); goto authfail; } - REMOTE_DEBUG("Using SASL Data %d bytes, nil: %d", - args->data.data_len, args->nil); + VIR_DEBUG("Using SASL Data %d bytes, nil: %d", + args->data.data_len, args->nil); err = sasl_server_step(client->saslconn, /* NB, distinction of NULL vs "" is *critical* in SASL */ args->nil ? NULL : args->data.data_val, @@ -4717,7 +4716,7 @@ remoteDispatchAuthSaslStep(struct qemud_server *server, ret->nil = serverout ? 0 : 1; ret->data.data_len = serveroutlen; - REMOTE_DEBUG("SASL return data %d bytes, nil; %d", ret->data.data_len, ret->nil); + VIR_DEBUG("SASL return data %d bytes, nil; %d", ret->data.data_len, ret->nil); if (err == SASL_CONTINUE) { ret->complete = 0; } else { @@ -4730,7 +4729,7 @@ remoteDispatchAuthSaslStep(struct qemud_server *server, goto authfail; } - REMOTE_DEBUG("Authentication successful %d", client->fd); + VIR_DEBUG("Authentication successful %d", client->fd); PROBE(CLIENT_AUTH_ALLOW, "fd=%d, auth=%d, username=%s", client->fd, REMOTE_AUTH_SASL, client->saslUsername); ret->complete = 1; @@ -4840,7 +4839,7 @@ remoteDispatchAuthPolkit(struct qemud_server *server, NULL }; - REMOTE_DEBUG("Start PolicyKit auth %d", client->fd); + VIR_DEBUG("Start PolicyKit auth %d", client->fd); if (client->auth != REMOTE_AUTH_POLKIT) { VIR_ERROR0(_("client tried invalid PolicyKit init request")); goto authfail; @@ -4932,7 +4931,7 @@ remoteDispatchAuthPolkit(struct qemud_server *server, "org.libvirt.unix.monitor" : "org.libvirt.unix.manage"; - REMOTE_DEBUG("Start PolicyKit auth %d", client->fd); + VIR_DEBUG("Start PolicyKit auth %d", client->fd); if (client->auth != REMOTE_AUTH_POLKIT) { VIR_ERROR0(_("client tried invalid PolicyKit init request")); goto authfail; -- 1.7.4.2

2 1

[libvirt] [PATCH] Add missing checks for whether the connection is open in dispatcher
by Daniel P. Berrange 13 Apr '11

13 Apr '11

Many functions did not check for whether a connection was open. Replace the macro which obscures control flow, with explicit checks, and ensure all dispatcher code has checks. * daemon/remote.c: Add connection checks --- daemon/remote.c | 986 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 959 insertions(+), 27 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 8a2a71f..2a56d91 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -432,11 +432,6 @@ remoteDispatchOpen(struct qemud_server *server, return rc; } -#define CHECK_CONN(client) \ - if (!client->conn) { \ - remoteDispatchFormatError(rerr, "%s", _("connection not open")); \ - return -1; \ - } static int remoteDispatchClose(struct qemud_server *server ATTRIBUTE_UNUSED, @@ -464,6 +459,12 @@ remoteDispatchSupportsFeature(struct qemud_server *server ATTRIBUTE_UNUSED, remote_error *rerr, remote_supports_feature_args *args, remote_supports_feature_ret *ret) { + + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + ret->supported = virDrvSupportsFeature(conn, args->feature); if (ret->supported == -1) { @@ -484,6 +485,11 @@ remoteDispatchGetType(struct qemud_server *server ATTRIBUTE_UNUSED, { const char *type; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + type = virConnectGetType(conn); if (type == NULL) { remoteDispatchConnError(rerr, conn); @@ -513,6 +519,11 @@ remoteDispatchGetVersion(struct qemud_server *server ATTRIBUTE_UNUSED, { unsigned long hvVer; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + if (virConnectGetVersion(conn, &hvVer) == -1) { remoteDispatchConnError(rerr, conn); return -1; @@ -533,6 +544,11 @@ remoteDispatchGetLibVersion(struct qemud_server *server ATTRIBUTE_UNUSED, { unsigned long libVer; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + if (virConnectGetLibVersion(conn, &libVer) == -1) { remoteDispatchConnError(rerr, conn); return -1; @@ -553,6 +569,11 @@ remoteDispatchGetHostname(struct qemud_server *server ATTRIBUTE_UNUSED, { char *hostname; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + hostname = virConnectGetHostname(conn); if (hostname == NULL) { remoteDispatchConnError(rerr, conn); @@ -573,7 +594,11 @@ remoteDispatchGetUri(struct qemud_server *server ATTRIBUTE_UNUSED, remote_get_uri_ret *ret) { char *uri; - CHECK_CONN(client); + + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } uri = virConnectGetURI(conn); if (uri == NULL) { @@ -597,6 +622,11 @@ remoteDispatchGetSysinfo(struct qemud_server *server ATTRIBUTE_UNUSED, unsigned int flags; char *sysinfo; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + flags = args->flags; sysinfo = virConnectGetSysinfo(conn, flags); if (sysinfo == NULL) { @@ -619,6 +649,11 @@ remoteDispatchGetMaxVcpus(struct qemud_server *server ATTRIBUTE_UNUSED, { char *type; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + type = args->type ? *args->type : NULL; ret->max_vcpus = virConnectGetMaxVcpus(conn, type); if (ret->max_vcpus == -1) { @@ -640,6 +675,11 @@ remoteDispatchNodeGetInfo(struct qemud_server *server ATTRIBUTE_UNUSED, { virNodeInfo info; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + if (virNodeGetInfo(conn, &info) == -1) { remoteDispatchConnError(rerr, conn); return -1; @@ -668,6 +708,11 @@ remoteDispatchGetCapabilities(struct qemud_server *server ATTRIBUTE_UNUSED, { char *caps; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + caps = virConnectGetCapabilities(conn); if (caps == NULL) { remoteDispatchConnError(rerr, conn); @@ -689,6 +734,11 @@ remoteDispatchNodeGetCellsFreeMemory(struct qemud_server *server ATTRIBUTE_UNUSE { int err; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + if (args->maxCells > REMOTE_NODE_MAX_CELLS) { remoteDispatchFormatError(rerr, "%s", _("maxCells > REMOTE_NODE_MAX_CELLS")); @@ -727,6 +777,11 @@ remoteDispatchNodeGetFreeMemory(struct qemud_server *server ATTRIBUTE_UNUSED, { unsigned long long freeMem; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + freeMem = virNodeGetFreeMemory(conn); if (freeMem == 0) { remoteDispatchConnError(rerr, conn); @@ -750,6 +805,11 @@ remoteDispatchDomainGetSchedulerType(struct qemud_server *server ATTRIBUTE_UNUSE char *type; int nparams; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -782,6 +842,11 @@ remoteDispatchDomainGetSchedulerParameters(struct qemud_server *server ATTRIBUTE virSchedParameterPtr params; int i, r, nparams; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + nparams = args->nparams; if (nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) { @@ -866,6 +931,11 @@ remoteDispatchDomainSetSchedulerParameters(struct qemud_server *server ATTRIBUTE int i, r, nparams; virSchedParameterPtr params; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + nparams = args->params.params_len; if (nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) { @@ -933,6 +1003,11 @@ remoteDispatchDomainBlockStats(struct qemud_server *server ATTRIBUTE_UNUSED, char *path; struct _virDomainBlockStats stats; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -969,6 +1044,11 @@ remoteDispatchDomainInterfaceStats(struct qemud_server *server ATTRIBUTE_UNUSED, char *path; struct _virDomainInterfaceStats stats; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1008,6 +1088,11 @@ remoteDispatchDomainMemoryStats(struct qemud_server *server ATTRIBUTE_UNUSED, struct _virDomainMemoryStat *stats; unsigned int nr_stats, i; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + if (args->maxStats > REMOTE_DOMAIN_MEMORY_STATS_MAX) { remoteDispatchFormatError(rerr, "%s", _("maxStats > REMOTE_DOMAIN_MEMORY_STATS_MAX")); @@ -1068,6 +1153,11 @@ remoteDispatchDomainBlockPeek(struct qemud_server *server ATTRIBUTE_UNUSED, size_t size; unsigned int flags; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1118,6 +1208,11 @@ remoteDispatchDomainMemoryPeek(struct qemud_server *server ATTRIBUTE_UNUSED, size_t size; unsigned int flags; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1164,6 +1259,11 @@ remoteDispatchDomainAttachDevice(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1190,6 +1290,11 @@ remoteDispatchDomainAttachDeviceFlags(struct qemud_server *server ATTRIBUTE_UNUS { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1216,6 +1321,11 @@ remoteDispatchDomainUpdateDeviceFlags(struct qemud_server *server ATTRIBUTE_UNUS { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1242,6 +1352,11 @@ remoteDispatchDomainCreate(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1296,6 +1411,11 @@ remoteDispatchDomainCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = virDomainCreateXML(conn, args->xml_desc, args->flags); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1319,6 +1439,11 @@ remoteDispatchDomainDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = virDomainDefineXML(conn, args->xml); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1342,6 +1467,11 @@ remoteDispatchDomainDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1368,6 +1498,11 @@ remoteDispatchDomainDetachDevice(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1395,6 +1530,11 @@ remoteDispatchDomainDetachDeviceFlags(struct qemud_server *server ATTRIBUTE_UNUS { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1422,6 +1562,11 @@ remoteDispatchDomainDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1448,6 +1593,11 @@ remoteDispatchDomainXmlFromNative(struct qemud_server *server ATTRIBUTE_UNUSED, remote_domain_xml_from_native_args *args, remote_domain_xml_from_native_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + /* remoteDispatchClientRequest will free this. */ ret->domainXml = virConnectDomainXMLFromNative(conn, args->nativeFormat, @@ -1469,6 +1619,11 @@ remoteDispatchDomainXmlToNative(struct qemud_server *server ATTRIBUTE_UNUSED, remote_domain_xml_to_native_args *args, remote_domain_xml_to_native_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + /* remoteDispatchClientRequest will free this. */ ret->nativeConfig = virConnectDomainXMLToNative(conn, args->nativeFormat, @@ -1493,6 +1648,11 @@ remoteDispatchDomainGetAutostart(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1520,6 +1680,11 @@ remoteDispatchDomainGetInfo(struct qemud_server *server ATTRIBUTE_UNUSED, virDomainPtr dom; virDomainInfo info; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1554,6 +1719,11 @@ remoteDispatchDomainGetMaxMemory(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1581,6 +1751,11 @@ remoteDispatchDomainGetMaxVcpus(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1609,6 +1784,11 @@ remoteDispatchDomainGetSecurityLabel(struct qemud_server *server ATTRIBUTE_UNUSE virDomainPtr dom; virSecurityLabelPtr seclabel; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1654,6 +1834,11 @@ remoteDispatchNodeGetSecurityModel(struct qemud_server *server ATTRIBUTE_UNUSED, { virSecurityModel secmodel; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + memset(&secmodel, 0, sizeof secmodel); if (virNodeGetSecurityModel(conn, &secmodel) == -1) { remoteDispatchConnError(rerr, conn); @@ -1688,6 +1873,11 @@ remoteDispatchDomainGetOsType(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1719,6 +1909,11 @@ remoteDispatchDomainGetVcpus(struct qemud_server *server ATTRIBUTE_UNUSED, unsigned char *cpumaps = NULL; int info_len, i; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1797,6 +1992,11 @@ remoteDispatchDomainGetVcpusFlags(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1829,6 +2029,11 @@ remoteDispatchDomainMigratePrepare(struct qemud_server *server ATTRIBUTE_UNUSED, char **uri_out; char *dname; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + uri_in = args->uri_in == NULL ? NULL : *args->uri_in; dname = args->dname == NULL ? NULL : *args->dname; @@ -1875,6 +2080,11 @@ remoteDispatchDomainMigratePerform(struct qemud_server *server ATTRIBUTE_UNUSED, virDomainPtr dom; char *dname; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -1908,7 +2118,11 @@ remoteDispatchDomainMigrateFinish(struct qemud_server *server ATTRIBUTE_UNUSED, remote_domain_migrate_finish_ret *ret) { virDomainPtr ddom; - CHECK_CONN(client); + + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } ddom = virDomainMigrateFinish(conn, args->dname, args->cookie.cookie_val, @@ -1940,7 +2154,11 @@ remoteDispatchDomainMigratePrepare2(struct qemud_server *server ATTRIBUTE_UNUSED char *uri_in; char **uri_out; char *dname; - CHECK_CONN(client); + + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } uri_in = args->uri_in == NULL ? NULL : *args->uri_in; dname = args->dname == NULL ? NULL : *args->dname; @@ -1980,7 +2198,11 @@ remoteDispatchDomainMigrateFinish2(struct qemud_server *server ATTRIBUTE_UNUSED, remote_domain_migrate_finish2_ret *ret) { virDomainPtr ddom; - CHECK_CONN (client); + + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } ddom = virDomainMigrateFinish2(conn, args->dname, args->cookie.cookie_val, @@ -2011,7 +2233,11 @@ remoteDispatchDomainMigratePrepareTunnel(struct qemud_server *server ATTRIBUTE_U int r; char *dname; struct qemud_client_stream *stream; - CHECK_CONN(client); + + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } dname = args->dname == NULL ? NULL : *args->dname; @@ -2049,6 +2275,10 @@ remoteDispatchListDefinedDomains(struct qemud_server *server ATTRIBUTE_UNUSED, remote_list_defined_domains_args *args, remote_list_defined_domains_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } if (args->maxnames > REMOTE_DOMAIN_NAME_LIST_MAX) { remoteDispatchFormatError(rerr, @@ -2085,6 +2315,11 @@ remoteDispatchDomainLookupById(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = virDomainLookupByID(conn, args->id); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -2107,6 +2342,11 @@ remoteDispatchDomainLookupByName(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = virDomainLookupByName(conn, args->name); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -2129,6 +2369,11 @@ remoteDispatchDomainLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = virDomainLookupByUUID(conn, (unsigned char *) args->uuid); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -2149,6 +2394,10 @@ remoteDispatchNumOfDefinedDomains(struct qemud_server *server ATTRIBUTE_UNUSED, void *args ATTRIBUTE_UNUSED, remote_num_of_defined_domains_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } ret->num = virConnectNumOfDefinedDomains(conn); if (ret->num == -1) { @@ -2171,6 +2420,11 @@ remoteDispatchDomainPinVcpu(struct qemud_server *server ATTRIBUTE_UNUSED, virDomainPtr dom; int rv; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -2206,6 +2460,11 @@ remoteDispatchDomainReboot(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -2230,6 +2489,10 @@ remoteDispatchDomainRestore(struct qemud_server *server ATTRIBUTE_UNUSED, remote_domain_restore_args *args, void *ret ATTRIBUTE_UNUSED) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } if (virDomainRestore(conn, args->from) == -1) { remoteDispatchConnError(rerr, conn); @@ -2250,6 +2513,11 @@ remoteDispatchDomainResume(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -2276,6 +2544,11 @@ remoteDispatchDomainSave(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -2302,6 +2575,11 @@ remoteDispatchDomainCoreDump(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -2328,6 +2606,11 @@ remoteDispatchDomainSetAutostart(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -2354,6 +2637,11 @@ remoteDispatchDomainSetMaxMemory(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -2380,6 +2668,11 @@ remoteDispatchDomainSetMemory(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -2406,6 +2699,11 @@ remoteDispatchDomainSetMemoryFlags(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -2438,6 +2736,11 @@ remoteDispatchDomainSetMemoryParameters(struct qemud_server *server virMemoryParameterPtr params; unsigned int flags; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + nparams = args->params.params_len; flags = args->flags; @@ -2533,6 +2836,11 @@ remoteDispatchDomainGetMemoryParameters(struct qemud_server *server int i, r, nparams; unsigned int flags; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + nparams = args->nparams; flags = args->flags; @@ -2649,6 +2957,11 @@ remoteDispatchDomainSetBlkioParameters(struct qemud_server *server virBlkioParameterPtr params; unsigned int flags; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + nparams = args->params.params_len; flags = args->flags; @@ -2744,6 +3057,11 @@ remoteDispatchDomainGetBlkioParameters(struct qemud_server *server int i, r, nparams; unsigned int flags; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + nparams = args->nparams; flags = args->flags; @@ -2854,6 +3172,11 @@ remoteDispatchDomainSetVcpus(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -2880,6 +3203,11 @@ remoteDispatchDomainSetVcpusFlags(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -2906,6 +3234,11 @@ remoteDispatchDomainShutdown(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -2932,6 +3265,11 @@ remoteDispatchDomainSuspend(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -2958,6 +3296,11 @@ remoteDispatchDomainUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -2982,6 +3325,10 @@ remoteDispatchListDefinedNetworks(struct qemud_server *server ATTRIBUTE_UNUSED, remote_list_defined_networks_args *args, remote_list_defined_networks_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } if (args->maxnames > REMOTE_NETWORK_NAME_LIST_MAX) { remoteDispatchFormatError(rerr, @@ -3016,6 +3363,10 @@ remoteDispatchListDomains(struct qemud_server *server ATTRIBUTE_UNUSED, remote_list_domains_args *args, remote_list_domains_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } if (args->maxids > REMOTE_DOMAIN_ID_LIST_MAX) { remoteDispatchFormatError(rerr, @@ -3051,6 +3402,11 @@ remoteDispatchDomainManagedSave(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -3077,6 +3433,11 @@ remoteDispatchDomainHasManagedSaveImage(struct qemud_server *server ATTRIBUTE_UN { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -3104,6 +3465,11 @@ remoteDispatchDomainManagedSaveRemove(struct qemud_server *server ATTRIBUTE_UNUS { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -3128,6 +3494,10 @@ remoteDispatchListNetworks(struct qemud_server *server ATTRIBUTE_UNUSED, remote_list_networks_args *args, remote_list_networks_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } if (args->maxnames > REMOTE_NETWORK_NAME_LIST_MAX) { remoteDispatchFormatError(rerr, @@ -3164,6 +3534,11 @@ remoteDispatchNetworkCreate(struct qemud_server *server ATTRIBUTE_UNUSED, { virNetworkPtr net; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + net = get_nonnull_network(conn, args->net); if (net == NULL) { remoteDispatchConnError(rerr, conn); @@ -3190,6 +3565,11 @@ remoteDispatchNetworkCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED, { virNetworkPtr net; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + net = virNetworkCreateXML(conn, args->xml); if (net == NULL) { remoteDispatchConnError(rerr, conn); @@ -3212,6 +3592,11 @@ remoteDispatchNetworkDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED, { virNetworkPtr net; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + net = virNetworkDefineXML(conn, args->xml); if (net == NULL) { remoteDispatchConnError(rerr, conn); @@ -3234,6 +3619,11 @@ remoteDispatchNetworkDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, { virNetworkPtr net; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + net = get_nonnull_network(conn, args->net); if (net == NULL) { remoteDispatchConnError(rerr, conn); @@ -3260,6 +3650,11 @@ remoteDispatchNetworkDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED, { virNetworkPtr net; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + net = get_nonnull_network(conn, args->net); if (net == NULL) { remoteDispatchConnError(rerr, conn); @@ -3288,6 +3683,11 @@ remoteDispatchNetworkGetAutostart(struct qemud_server *server ATTRIBUTE_UNUSED, { virNetworkPtr net; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + net = get_nonnull_network(conn, args->net); if (net == NULL) { remoteDispatchConnError(rerr, conn); @@ -3314,6 +3714,11 @@ remoteDispatchNetworkGetBridgeName(struct qemud_server *server ATTRIBUTE_UNUSED, { virNetworkPtr net; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + net = get_nonnull_network(conn, args->net); if (net == NULL) { remoteDispatchConnError(rerr, conn); @@ -3342,6 +3747,11 @@ remoteDispatchNetworkLookupByName(struct qemud_server *server ATTRIBUTE_UNUSED, { virNetworkPtr net; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + net = virNetworkLookupByName(conn, args->name); if (net == NULL) { remoteDispatchConnError(rerr, conn); @@ -3364,6 +3774,11 @@ remoteDispatchNetworkLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUSED, { virNetworkPtr net; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + net = virNetworkLookupByUUID(conn, (unsigned char *) args->uuid); if (net == NULL) { remoteDispatchConnError(rerr, conn); @@ -3386,8 +3801,13 @@ remoteDispatchNetworkSetAutostart(struct qemud_server *server ATTRIBUTE_UNUSED, { virNetworkPtr net; - net = get_nonnull_network(conn, args->net); - if (net == NULL) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + + net = get_nonnull_network(conn, args->net); + if (net == NULL) { remoteDispatchConnError(rerr, conn); return -1; } @@ -3412,6 +3832,11 @@ remoteDispatchNetworkUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, { virNetworkPtr net; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + net = get_nonnull_network(conn, args->net); if (net == NULL) { remoteDispatchConnError(rerr, conn); @@ -3436,6 +3861,10 @@ remoteDispatchNumOfDefinedNetworks(struct qemud_server *server ATTRIBUTE_UNUSED, void *args ATTRIBUTE_UNUSED, remote_num_of_defined_networks_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } ret->num = virConnectNumOfDefinedNetworks(conn); if (ret->num == -1) { @@ -3455,6 +3884,10 @@ remoteDispatchNumOfDomains(struct qemud_server *server ATTRIBUTE_UNUSED, void *args ATTRIBUTE_UNUSED, remote_num_of_domains_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } ret->num = virConnectNumOfDomains(conn); if (ret->num == -1) { @@ -3474,6 +3907,10 @@ remoteDispatchNumOfNetworks(struct qemud_server *server ATTRIBUTE_UNUSED, void *args ATTRIBUTE_UNUSED, remote_num_of_networks_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } ret->num = virConnectNumOfNetworks(conn); if (ret->num == -1) { @@ -3495,6 +3932,10 @@ remoteDispatchNumOfInterfaces(struct qemud_server *server ATTRIBUTE_UNUSED, void *args ATTRIBUTE_UNUSED, remote_num_of_interfaces_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } ret->num = virConnectNumOfInterfaces(conn); if (ret->num == -1) { @@ -3514,6 +3955,10 @@ remoteDispatchListInterfaces(struct qemud_server *server ATTRIBUTE_UNUSED, remote_list_interfaces_args *args, remote_list_interfaces_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } if (args->maxnames > REMOTE_INTERFACE_NAME_LIST_MAX) { remoteDispatchFormatError(rerr, @@ -3548,6 +3993,10 @@ remoteDispatchNumOfDefinedInterfaces(struct qemud_server *server ATTRIBUTE_UNUSE void *args ATTRIBUTE_UNUSED, remote_num_of_defined_interfaces_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } ret->num = virConnectNumOfDefinedInterfaces(conn); if (ret->num == -1) { @@ -3567,6 +4016,10 @@ remoteDispatchListDefinedInterfaces(struct qemud_server *server ATTRIBUTE_UNUSED remote_list_defined_interfaces_args *args, remote_list_defined_interfaces_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } if (args->maxnames > REMOTE_DEFINED_INTERFACE_NAME_LIST_MAX) { remoteDispatchFormatError(rerr, @@ -3603,6 +4056,11 @@ remoteDispatchInterfaceLookupByName(struct qemud_server *server ATTRIBUTE_UNUSED { virInterfacePtr iface; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + iface = virInterfaceLookupByName(conn, args->name); if (iface == NULL) { remoteDispatchConnError(rerr, conn); @@ -3625,6 +4083,11 @@ remoteDispatchInterfaceLookupByMacString(struct qemud_server *server ATTRIBUTE_U { virInterfacePtr iface; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + iface = virInterfaceLookupByMACString(conn, args->mac); if (iface == NULL) { remoteDispatchConnError(rerr, conn); @@ -3647,6 +4110,11 @@ remoteDispatchInterfaceGetXmlDesc(struct qemud_server *server ATTRIBUTE_UNUSED, { virInterfacePtr iface; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + iface = get_nonnull_interface(conn, args->iface); if (iface == NULL) { remoteDispatchConnError(rerr, conn); @@ -3675,6 +4143,11 @@ remoteDispatchInterfaceDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED, { virInterfacePtr iface; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + iface = virInterfaceDefineXML(conn, args->xml, args->flags); if (iface == NULL) { remoteDispatchConnError(rerr, conn); @@ -3697,6 +4170,11 @@ remoteDispatchInterfaceUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, { virInterfacePtr iface; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + iface = get_nonnull_interface(conn, args->iface); if (iface == NULL) { remoteDispatchConnError(rerr, conn); @@ -3723,6 +4201,11 @@ remoteDispatchInterfaceCreate(struct qemud_server *server ATTRIBUTE_UNUSED, { virInterfacePtr iface; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + iface = get_nonnull_interface(conn, args->iface); if (iface == NULL) { remoteDispatchConnError(rerr, conn); @@ -3749,6 +4232,11 @@ remoteDispatchInterfaceDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, { virInterfacePtr iface; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + iface = get_nonnull_interface(conn, args->iface); if (iface == NULL) { remoteDispatchConnError(rerr, conn); @@ -3775,6 +4263,11 @@ remoteDispatchAuthList(struct qemud_server *server, void *args ATTRIBUTE_UNUSED, remote_auth_list_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + ret->types.types_len = 1; if (VIR_ALLOC_N(ret->types.types_val, ret->types.types_len) < 0) { remoteDispatchOOMError(rerr); @@ -4572,6 +5065,10 @@ remoteDispatchListDefinedStoragePools(struct qemud_server *server ATTRIBUTE_UNUS remote_list_defined_storage_pools_args *args, remote_list_defined_storage_pools_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } if (args->maxnames > REMOTE_NETWORK_NAME_LIST_MAX) { remoteDispatchFormatError(rerr, "%s", @@ -4606,6 +5103,10 @@ remoteDispatchListStoragePools(struct qemud_server *server ATTRIBUTE_UNUSED, remote_list_storage_pools_args *args, remote_list_storage_pools_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } if (args->maxnames > REMOTE_STORAGE_POOL_NAME_LIST_MAX) { remoteDispatchFormatError(rerr, @@ -4640,6 +5141,11 @@ remoteDispatchFindStoragePoolSources(struct qemud_server *server ATTRIBUTE_UNUSE remote_find_storage_pool_sources_args *args, remote_find_storage_pool_sources_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + ret->xml = virConnectFindStoragePoolSources(conn, args->type, @@ -4665,6 +5171,11 @@ remoteDispatchStoragePoolCreate(struct qemud_server *server ATTRIBUTE_UNUSED, { virStoragePoolPtr pool; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + pool = get_nonnull_storage_pool(conn, args->pool); if (pool == NULL) { remoteDispatchConnError(rerr, conn); @@ -4691,6 +5202,11 @@ remoteDispatchStoragePoolCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED, { virStoragePoolPtr pool; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + pool = virStoragePoolCreateXML(conn, args->xml, args->flags); if (pool == NULL) { remoteDispatchConnError(rerr, conn); @@ -4713,6 +5229,11 @@ remoteDispatchStoragePoolDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED, { virStoragePoolPtr pool; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + pool = virStoragePoolDefineXML(conn, args->xml, args->flags); if (pool == NULL) { remoteDispatchConnError(rerr, conn); @@ -4735,6 +5256,11 @@ remoteDispatchStoragePoolBuild(struct qemud_server *server ATTRIBUTE_UNUSED, { virStoragePoolPtr pool; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + pool = get_nonnull_storage_pool(conn, args->pool); if (pool == NULL) { remoteDispatchConnError(rerr, conn); @@ -4762,6 +5288,11 @@ remoteDispatchStoragePoolDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, { virStoragePoolPtr pool; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + pool = get_nonnull_storage_pool(conn, args->pool); if (pool == NULL) { remoteDispatchConnError(rerr, conn); @@ -4788,6 +5319,11 @@ remoteDispatchStoragePoolDelete(struct qemud_server *server ATTRIBUTE_UNUSED, { virStoragePoolPtr pool; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + pool = get_nonnull_storage_pool(conn, args->pool); if (pool == NULL) { remoteDispatchConnError(rerr, conn); @@ -4814,6 +5350,11 @@ remoteDispatchStoragePoolRefresh(struct qemud_server *server ATTRIBUTE_UNUSED, { virStoragePoolPtr pool; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + pool = get_nonnull_storage_pool(conn, args->pool); if (pool == NULL) { remoteDispatchConnError(rerr, conn); @@ -4841,6 +5382,11 @@ remoteDispatchStoragePoolGetInfo(struct qemud_server *server ATTRIBUTE_UNUSED, virStoragePoolPtr pool; virStoragePoolInfo info; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + pool = get_nonnull_storage_pool(conn, args->pool); if (pool == NULL) { remoteDispatchConnError(rerr, conn); @@ -4874,6 +5420,11 @@ remoteDispatchStoragePoolDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED, { virStoragePoolPtr pool; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + pool = get_nonnull_storage_pool(conn, args->pool); if (pool == NULL) { remoteDispatchConnError(rerr, conn); @@ -4902,6 +5453,11 @@ remoteDispatchStoragePoolGetAutostart(struct qemud_server *server ATTRIBUTE_UNUS { virStoragePoolPtr pool; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + pool = get_nonnull_storage_pool(conn, args->pool); if (pool == NULL) { remoteDispatchConnError(rerr, conn); @@ -4929,6 +5485,11 @@ remoteDispatchStoragePoolLookupByName(struct qemud_server *server ATTRIBUTE_UNUS { virStoragePoolPtr pool; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + pool = virStoragePoolLookupByName(conn, args->name); if (pool == NULL) { remoteDispatchConnError(rerr, conn); @@ -4951,6 +5512,11 @@ remoteDispatchStoragePoolLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUS { virStoragePoolPtr pool; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + pool = virStoragePoolLookupByUUID(conn, (unsigned char *) args->uuid); if (pool == NULL) { remoteDispatchConnError(rerr, conn); @@ -4974,6 +5540,11 @@ remoteDispatchStoragePoolLookupByVolume(struct qemud_server *server ATTRIBUTE_UN virStoragePoolPtr pool; virStorageVolPtr vol; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + vol = get_nonnull_storage_vol(conn, args->vol); if (vol == NULL) { remoteDispatchConnError(rerr, conn); @@ -5004,6 +5575,11 @@ remoteDispatchStoragePoolSetAutostart(struct qemud_server *server ATTRIBUTE_UNUS { virStoragePoolPtr pool; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + pool = get_nonnull_storage_pool(conn, args->pool); if (pool == NULL) { remoteDispatchConnError(rerr, conn); @@ -5030,6 +5606,11 @@ remoteDispatchStoragePoolUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, { virStoragePoolPtr pool; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + pool = get_nonnull_storage_pool(conn, args->pool); if (pool == NULL) { remoteDispatchConnError(rerr, conn); @@ -5054,6 +5635,10 @@ remoteDispatchNumOfStoragePools(struct qemud_server *server ATTRIBUTE_UNUSED, void *args ATTRIBUTE_UNUSED, remote_num_of_storage_pools_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } ret->num = virConnectNumOfStoragePools(conn); if (ret->num == -1) { @@ -5073,6 +5658,10 @@ remoteDispatchNumOfDefinedStoragePools(struct qemud_server *server ATTRIBUTE_UNU void *args ATTRIBUTE_UNUSED, remote_num_of_defined_storage_pools_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } ret->num = virConnectNumOfDefinedStoragePools(conn); if (ret->num == -1) { @@ -5094,6 +5683,11 @@ remoteDispatchStoragePoolListVolumes(struct qemud_server *server ATTRIBUTE_UNUSE { virStoragePoolPtr pool; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + if (args->maxnames > REMOTE_STORAGE_VOL_NAME_LIST_MAX) { remoteDispatchFormatError(rerr, "%s", _("maxnames > REMOTE_STORAGE_VOL_NAME_LIST_MAX")); @@ -5139,6 +5733,11 @@ remoteDispatchStoragePoolNumOfVolumes(struct qemud_server *server ATTRIBUTE_UNUS { virStoragePoolPtr pool; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + pool = get_nonnull_storage_pool(conn, args->pool); if (pool == NULL) { remoteDispatchConnError(rerr, conn); @@ -5175,6 +5774,11 @@ remoteDispatchStorageVolCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED, virStoragePoolPtr pool; virStorageVolPtr vol; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + pool = get_nonnull_storage_pool(conn, args->pool); if (pool == NULL) { remoteDispatchConnError(rerr, conn); @@ -5206,6 +5810,11 @@ remoteDispatchStorageVolCreateXmlFrom(struct qemud_server *server ATTRIBUTE_UNUS virStoragePoolPtr pool; virStorageVolPtr clonevol, newvol; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + pool = get_nonnull_storage_pool(conn, args->pool); if (pool == NULL) { remoteDispatchConnError(rerr, conn); @@ -5246,6 +5855,11 @@ remoteDispatchStorageVolDelete(struct qemud_server *server ATTRIBUTE_UNUSED, { virStorageVolPtr vol; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + vol = get_nonnull_storage_vol(conn, args->vol); if (vol == NULL) { remoteDispatchConnError(rerr, conn); @@ -5273,6 +5887,11 @@ remoteDispatchStorageVolWipe(struct qemud_server *server ATTRIBUTE_UNUSED, int retval = -1; virStorageVolPtr vol; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + vol = get_nonnull_storage_vol(conn, args->vol); if (vol == NULL) { remoteDispatchConnError(rerr, conn); @@ -5305,6 +5924,11 @@ remoteDispatchStorageVolGetInfo(struct qemud_server *server ATTRIBUTE_UNUSED, virStorageVolPtr vol; virStorageVolInfo info; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + vol = get_nonnull_storage_vol(conn, args->vol); if (vol == NULL) { remoteDispatchConnError(rerr, conn); @@ -5337,6 +5961,11 @@ remoteDispatchStorageVolDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED, { virStorageVolPtr vol; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + vol = get_nonnull_storage_vol(conn, args->vol); if (vol == NULL) { remoteDispatchConnError(rerr, conn); @@ -5366,6 +5995,11 @@ remoteDispatchStorageVolGetPath(struct qemud_server *server ATTRIBUTE_UNUSED, { virStorageVolPtr vol; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + vol = get_nonnull_storage_vol(conn, args->vol); if (vol == NULL) { remoteDispatchConnError(rerr, conn); @@ -5396,6 +6030,11 @@ remoteDispatchStorageVolLookupByName(struct qemud_server *server ATTRIBUTE_UNUSE virStoragePoolPtr pool; virStorageVolPtr vol; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + pool = get_nonnull_storage_pool(conn, args->pool); if (pool == NULL) { remoteDispatchConnError(rerr, conn); @@ -5426,6 +6065,11 @@ remoteDispatchStorageVolLookupByKey(struct qemud_server *server ATTRIBUTE_UNUSED { virStorageVolPtr vol; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + vol = virStorageVolLookupByKey(conn, args->key); if (vol == NULL) { remoteDispatchConnError(rerr, conn); @@ -5449,6 +6093,11 @@ remoteDispatchStorageVolLookupByPath(struct qemud_server *server ATTRIBUTE_UNUSE { virStorageVolPtr vol; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + vol = virStorageVolLookupByPath(conn, args->path); if (vol == NULL) { remoteDispatchConnError(rerr, conn); @@ -5474,7 +6123,10 @@ remoteDispatchNodeNumOfDevices(struct qemud_server *server ATTRIBUTE_UNUSED, remote_node_num_of_devices_args *args, remote_node_num_of_devices_ret *ret) { - CHECK_CONN(client); + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } ret->num = virNodeNumOfDevices(conn, args->cap ? *args->cap : NULL, @@ -5497,7 +6149,10 @@ remoteDispatchNodeListDevices(struct qemud_server *server ATTRIBUTE_UNUSED, remote_node_list_devices_args *args, remote_node_list_devices_ret *ret) { - CHECK_CONN(client); + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } if (args->maxnames > REMOTE_NODE_DEVICE_NAME_LIST_MAX) { remoteDispatchFormatError(rerr, @@ -5536,7 +6191,10 @@ remoteDispatchNodeDeviceLookupByName(struct qemud_server *server ATTRIBUTE_UNUSE { virNodeDevicePtr dev; - CHECK_CONN(client); + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } dev = virNodeDeviceLookupByName(conn, args->name); if (dev == NULL) { @@ -5560,7 +6218,11 @@ remoteDispatchNodeDeviceDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED, remote_node_device_dump_xml_ret *ret) { virNodeDevicePtr dev; - CHECK_CONN(client); + + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } dev = virNodeDeviceLookupByName(conn, args->name); if (dev == NULL) { @@ -5591,7 +6253,11 @@ remoteDispatchNodeDeviceGetParent(struct qemud_server *server ATTRIBUTE_UNUSED, { virNodeDevicePtr dev; const char *parent; - CHECK_CONN(client); + + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } dev = virNodeDeviceLookupByName(conn, args->name); if (dev == NULL) { @@ -5635,7 +6301,11 @@ remoteDispatchNodeDeviceNumOfCaps(struct qemud_server *server ATTRIBUTE_UNUSED, remote_node_device_num_of_caps_ret *ret) { virNodeDevicePtr dev; - CHECK_CONN(client); + + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } dev = virNodeDeviceLookupByName(conn, args->name); if (dev == NULL) { @@ -5665,7 +6335,11 @@ remoteDispatchNodeDeviceListCaps(struct qemud_server *server ATTRIBUTE_UNUSED, remote_node_device_list_caps_ret *ret) { virNodeDevicePtr dev; - CHECK_CONN(client); + + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } dev = virNodeDeviceLookupByName(conn, args->name); if (dev == NULL) { @@ -5712,7 +6386,11 @@ remoteDispatchNodeDeviceDettach(struct qemud_server *server ATTRIBUTE_UNUSED, void *ret ATTRIBUTE_UNUSED) { virNodeDevicePtr dev; - CHECK_CONN(client); + + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } dev = virNodeDeviceLookupByName(conn, args->name); if (dev == NULL) { @@ -5741,7 +6419,11 @@ remoteDispatchNodeDeviceReAttach(struct qemud_server *server ATTRIBUTE_UNUSED, void *ret ATTRIBUTE_UNUSED) { virNodeDevicePtr dev; - CHECK_CONN(client); + + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } dev = virNodeDeviceLookupByName(conn, args->name); if (dev == NULL) { @@ -5770,7 +6452,11 @@ remoteDispatchNodeDeviceReset(struct qemud_server *server ATTRIBUTE_UNUSED, void *ret ATTRIBUTE_UNUSED) { virNodeDevicePtr dev; - CHECK_CONN(client); + + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } dev = virNodeDeviceLookupByName(conn, args->name); if (dev == NULL) { @@ -5800,6 +6486,11 @@ remoteDispatchNodeDeviceCreateXml(struct qemud_server *server ATTRIBUTE_UNUSED, { virNodeDevicePtr dev; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dev = virNodeDeviceCreateXML(conn, args->xml_desc, args->flags); if (dev == NULL) { remoteDispatchConnError(rerr, conn); @@ -5824,6 +6515,11 @@ remoteDispatchNodeDeviceDestroy(struct qemud_server *server ATTRIBUTE_UNUSED, { virNodeDevicePtr dev; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dev = virNodeDeviceLookupByName(conn, args->name); if (dev == NULL) { remoteDispatchConnError(rerr, conn); @@ -5851,6 +6547,11 @@ static int remoteDispatchStorageVolUpload(struct qemud_server *server ATTRIBUTE_ struct qemud_client_stream *stream = NULL; virStorageVolPtr vol; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + vol = get_nonnull_storage_vol(conn, args->vol); if (vol == NULL) { remoteDispatchConnError(rerr, conn); @@ -5898,6 +6599,11 @@ static int remoteDispatchStorageVolDownload(struct qemud_server *server ATTRIBUT struct qemud_client_stream *stream = NULL; virStorageVolPtr vol; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + vol = get_nonnull_storage_vol(conn, args->vol); if (vol == NULL) { remoteDispatchConnError(rerr, conn); @@ -5946,9 +6652,13 @@ remoteDispatchDomainEventsRegister(struct qemud_server *server ATTRIBUTE_UNUSED, void *args ATTRIBUTE_UNUSED, remote_domain_events_register_ret *ret ATTRIBUTE_UNUSED) { - CHECK_CONN(client); int callbackID; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + if (client->domainEventCallbackID[VIR_DOMAIN_EVENT_ID_LIFECYCLE] != -1) { remoteDispatchFormatError(rerr, _("domain event %d already registered"), VIR_DOMAIN_EVENT_ID_LIFECYCLE); return -1; @@ -5977,7 +6687,10 @@ remoteDispatchDomainEventsDeregister(struct qemud_server *server ATTRIBUTE_UNUSE void *args ATTRIBUTE_UNUSED, remote_domain_events_deregister_ret *ret ATTRIBUTE_UNUSED) { - CHECK_CONN(client); + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } if (client->domainEventCallbackID[VIR_DOMAIN_EVENT_ID_LIFECYCLE] == -1) { remoteDispatchFormatError(rerr, _("domain event %d not registered"), VIR_DOMAIN_EVENT_ID_LIFECYCLE); @@ -6067,6 +6780,11 @@ remoteDispatchNumOfSecrets(struct qemud_server *server ATTRIBUTE_UNUSED, void *args ATTRIBUTE_UNUSED, remote_num_of_secrets_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + ret->num = virConnectNumOfSecrets(conn); if (ret->num == -1) { remoteDispatchConnError(rerr, conn); @@ -6085,6 +6803,11 @@ remoteDispatchListSecrets(struct qemud_server *server ATTRIBUTE_UNUSED, remote_list_secrets_args *args, remote_list_secrets_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + if (args->maxuuids > REMOTE_SECRET_UUID_LIST_MAX) { remoteDispatchFormatError(rerr, "%s", _("maxuuids > REMOTE_SECRET_UUID_LIST_MAX")); @@ -6118,6 +6841,11 @@ remoteDispatchSecretDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED, { virSecretPtr secret; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + secret = virSecretDefineXML(conn, args->xml, args->flags); if (secret == NULL) { remoteDispatchConnError(rerr, conn); @@ -6142,6 +6870,11 @@ remoteDispatchSecretGetValue(struct qemud_server *server ATTRIBUTE_UNUSED, size_t value_size; unsigned char *value; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + secret = get_nonnull_secret(conn, args->secret); if (secret == NULL) { remoteDispatchConnError(rerr, conn); @@ -6172,6 +6905,11 @@ remoteDispatchSecretGetXmlDesc(struct qemud_server *server ATTRIBUTE_UNUSED, { virSecretPtr secret; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + secret = get_nonnull_secret(conn, args->secret); if (secret == NULL) { remoteDispatchConnError(rerr, conn); @@ -6198,6 +6936,11 @@ remoteDispatchSecretLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUSED, { virSecretPtr secret; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + secret = virSecretLookupByUUID(conn, (unsigned char *)args->uuid); if (secret == NULL) { remoteDispatchConnError(rerr, conn); @@ -6220,6 +6963,11 @@ remoteDispatchSecretSetValue(struct qemud_server *server ATTRIBUTE_UNUSED, { virSecretPtr secret; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + secret = get_nonnull_secret(conn, args->secret); if (secret == NULL) { remoteDispatchConnError(rerr, conn); @@ -6247,6 +6995,11 @@ remoteDispatchSecretUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, { virSecretPtr secret; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + secret = get_nonnull_secret(conn, args->secret); if (secret == NULL) { remoteDispatchConnError(rerr, conn); @@ -6273,6 +7026,11 @@ remoteDispatchSecretLookupByUsage(struct qemud_server *server ATTRIBUTE_UNUSED, { virSecretPtr secret; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + secret = virSecretLookupByUsage(conn, args->usageType, args->usageID); if (secret == NULL) { remoteDispatchConnError(rerr, conn); @@ -6295,6 +7053,11 @@ static int remoteDispatchDomainIsActive(struct qemud_server *server ATTRIBUTE_UN { virDomainPtr domain; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + domain = get_nonnull_domain(conn, args->dom); if (domain == NULL) { remoteDispatchConnError(rerr, conn); @@ -6323,6 +7086,11 @@ static int remoteDispatchDomainIsPersistent(struct qemud_server *server ATTRIBUT { virDomainPtr domain; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + domain = get_nonnull_domain(conn, args->dom); if (domain == NULL) { remoteDispatchConnError(rerr, conn); @@ -6351,6 +7119,11 @@ static int remoteDispatchDomainIsUpdated(struct qemud_server *server ATTRIBUTE_U { virDomainPtr domain; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + domain = get_nonnull_domain(conn, args->dom); if (domain == NULL) { remoteDispatchConnError(rerr, conn); @@ -6379,6 +7152,11 @@ static int remoteDispatchInterfaceIsActive(struct qemud_server *server ATTRIBUTE { virInterfacePtr iface; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + iface = get_nonnull_interface(conn, args->iface); if (iface == NULL) { remoteDispatchConnError(rerr, conn); @@ -6407,6 +7185,11 @@ static int remoteDispatchNetworkIsActive(struct qemud_server *server ATTRIBUTE_U { virNetworkPtr network; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + network = get_nonnull_network(conn, args->net); if (network == NULL) { remoteDispatchConnError(rerr, conn); @@ -6435,6 +7218,11 @@ static int remoteDispatchNetworkIsPersistent(struct qemud_server *server ATTRIBU { virNetworkPtr network; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + network = get_nonnull_network(conn, args->net); if (network == NULL) { remoteDispatchConnError(rerr, conn); @@ -6463,6 +7251,11 @@ static int remoteDispatchStoragePoolIsActive(struct qemud_server *server ATTRIBU { virStoragePoolPtr pool; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + pool = get_nonnull_storage_pool(conn, args->pool); if (pool == NULL) { remoteDispatchConnError(rerr, conn); @@ -6491,6 +7284,11 @@ static int remoteDispatchStoragePoolIsPersistent(struct qemud_server *server ATT { virStoragePoolPtr pool; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + pool = get_nonnull_storage_pool(conn, args->pool); if (pool == NULL) { remoteDispatchConnError(rerr, conn); @@ -6518,6 +7316,11 @@ static int remoteDispatchIsSecure(struct qemud_server *server ATTRIBUTE_UNUSED, void *args ATTRIBUTE_UNUSED, remote_is_secure_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + ret->secure = virConnectIsSecure(conn); if (ret->secure < 0) { @@ -6540,6 +7343,11 @@ remoteDispatchCpuCompare(struct qemud_server *server ATTRIBUTE_UNUSED, { int result; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + result = virConnectCompareCPU(conn, args->xml, args->flags); if (result == VIR_CPU_COMPARE_ERROR) { remoteDispatchConnError(rerr, conn); @@ -6562,6 +7370,11 @@ remoteDispatchCpuBaseline(struct qemud_server *server ATTRIBUTE_UNUSED, { char *cpu; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + cpu = virConnectBaselineCPU(conn, (const char **) args->xmlCPUs.xmlCPUs_val, args->xmlCPUs.xmlCPUs_len, @@ -6589,6 +7402,11 @@ remoteDispatchDomainGetJobInfo(struct qemud_server *server ATTRIBUTE_UNUSED, virDomainPtr dom; virDomainJobInfo info; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -6631,6 +7449,11 @@ remoteDispatchDomainAbortJob(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -6660,6 +7483,11 @@ remoteDispatchDomainMigrateSetMaxDowntime(struct qemud_server *server ATTRIBUTE_ { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -6688,6 +7516,11 @@ remoteDispatchDomainMigrateSetMaxSpeed(struct qemud_server *server ATTRIBUTE_UNU { virDomainPtr dom; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -6717,6 +7550,11 @@ remoteDispatchDomainSnapshotCreateXml(struct qemud_server *server ATTRIBUTE_UNUS virDomainSnapshotPtr snapshot; virDomainPtr domain; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + domain = get_nonnull_domain(conn, args->domain); if (domain == NULL) { remoteDispatchConnError(rerr, conn); @@ -6751,6 +7589,11 @@ remoteDispatchDomainSnapshotDumpXml(struct qemud_server *server ATTRIBUTE_UNUSED virDomainSnapshotPtr snapshot = NULL; int rc = -1; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + domain = get_nonnull_domain(conn, args->snap.domain); if (domain == NULL) goto cleanup; @@ -6788,6 +7631,11 @@ remoteDispatchDomainSnapshotNum(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr domain; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + domain = get_nonnull_domain(conn, args->domain); if (domain == NULL) { remoteDispatchConnError(rerr, conn); @@ -6817,6 +7665,11 @@ remoteDispatchDomainSnapshotListNames(struct qemud_server *server ATTRIBUTE_UNUS { virDomainPtr domain; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + if (args->nameslen > REMOTE_DOMAIN_SNAPSHOT_LIST_NAMES_MAX) { remoteDispatchFormatError(rerr, "%s", _("nameslen > REMOTE_DOMAIN_SNAPSHOT_LIST_NAMES_MAX")); @@ -6864,6 +7717,11 @@ remoteDispatchDomainSnapshotLookupByName(struct qemud_server *server ATTRIBUTE_U virDomainSnapshotPtr snapshot; virDomainPtr domain; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + domain = get_nonnull_domain(conn, args->domain); if (domain == NULL) { remoteDispatchConnError(rerr, conn); @@ -6897,6 +7755,11 @@ remoteDispatchDomainHasCurrentSnapshot(struct qemud_server *server ATTRIBUTE_UNU virDomainPtr domain; int result; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + domain = get_nonnull_domain(conn, args->domain); if (domain == NULL) { remoteDispatchConnError(rerr, conn); @@ -6929,6 +7792,11 @@ remoteDispatchDomainSnapshotCurrent(struct qemud_server *server ATTRIBUTE_UNUSED virDomainSnapshotPtr snapshot; virDomainPtr domain; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + domain = get_nonnull_domain(conn, args->domain); if (domain == NULL) { remoteDispatchConnError(rerr, conn); @@ -6963,6 +7831,11 @@ remoteDispatchDomainRevertToSnapshot(struct qemud_server *server ATTRIBUTE_UNUSE virDomainSnapshotPtr snapshot = NULL; int rc = -1; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + domain = get_nonnull_domain(conn, args->snap.domain); if (domain == NULL) goto cleanup; @@ -7000,6 +7873,11 @@ remoteDispatchDomainSnapshotDelete(struct qemud_server *server ATTRIBUTE_UNUSED, virDomainSnapshotPtr snapshot = NULL; int rc = -1; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + domain = get_nonnull_domain(conn, args->snap.domain); if (domain == NULL) goto cleanup; @@ -7034,9 +7912,13 @@ remoteDispatchDomainEventsRegisterAny(struct qemud_server *server ATTRIBUTE_UNUS remote_domain_events_register_any_args *args, void *ret ATTRIBUTE_UNUSED) { - CHECK_CONN(client); int callbackID; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + if (args->eventID >= VIR_DOMAIN_EVENT_ID_LAST || args->eventID < 0) { remoteDispatchFormatError(rerr, _("unsupported event ID %d"), args->eventID); @@ -7072,9 +7954,13 @@ remoteDispatchDomainEventsDeregisterAny(struct qemud_server *server ATTRIBUTE_UN remote_domain_events_deregister_any_args *args, void *ret ATTRIBUTE_UNUSED) { - CHECK_CONN(client); int callbackID = -1; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + if (args->eventID >= VIR_DOMAIN_EVENT_ID_LAST || args->eventID < 0) { remoteDispatchFormatError(rerr, _("unsupported event ID %d"), args->eventID); @@ -7109,6 +7995,11 @@ remoteDispatchNwfilterLookupByName(struct qemud_server *server ATTRIBUTE_UNUSED, { virNWFilterPtr nwfilter; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + nwfilter = virNWFilterLookupByName(conn, args->name); if (nwfilter == NULL) { remoteDispatchConnError(rerr, conn); @@ -7131,6 +8022,11 @@ remoteDispatchNwfilterLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUSED, { virNWFilterPtr nwfilter; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + nwfilter = virNWFilterLookupByUUID(conn, (unsigned char *) args->uuid); if (nwfilter == NULL) { remoteDispatchConnError(rerr, conn); @@ -7154,6 +8050,11 @@ remoteDispatchNwfilterDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED, { virNWFilterPtr nwfilter; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + nwfilter = virNWFilterDefineXML(conn, args->xml); if (nwfilter == NULL) { remoteDispatchConnError(rerr, conn); @@ -7177,6 +8078,11 @@ remoteDispatchNwfilterUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, { virNWFilterPtr nwfilter; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + nwfilter = get_nonnull_nwfilter(conn, args->nwfilter); if (nwfilter == NULL) { remoteDispatchConnError(rerr, conn); @@ -7201,6 +8107,10 @@ remoteDispatchListNwfilters(struct qemud_server *server ATTRIBUTE_UNUSED, remote_list_nwfilters_args *args, remote_list_nwfilters_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } if (args->maxnames > REMOTE_NWFILTER_NAME_LIST_MAX) { remoteDispatchFormatError(rerr, @@ -7238,6 +8148,11 @@ remoteDispatchNwfilterGetXmlDesc(struct qemud_server *server ATTRIBUTE_UNUSED, { virNWFilterPtr nwfilter; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + nwfilter = get_nonnull_nwfilter(conn, args->nwfilter); if (nwfilter == NULL) { remoteDispatchConnError(rerr, conn); @@ -7265,6 +8180,10 @@ remoteDispatchNumOfNwfilters(struct qemud_server *server ATTRIBUTE_UNUSED, void *args ATTRIBUTE_UNUSED, remote_num_of_nwfilters_ret *ret) { + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } ret->num = virConnectNumOfNWFilters(conn); if (ret->num == -1) { @@ -7288,6 +8207,11 @@ remoteDispatchDomainGetBlockInfo(struct qemud_server *server ATTRIBUTE_UNUSED, virDomainPtr dom; virDomainBlockInfo info; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + dom = get_nonnull_domain(conn, args->dom); if (dom == NULL) { remoteDispatchConnError(rerr, conn); @@ -7320,6 +8244,11 @@ qemuDispatchMonitorCommand(struct qemud_server *server ATTRIBUTE_UNUSED, { virDomainPtr domain; + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } + domain = get_nonnull_domain(conn, args->domain); if (domain == NULL) { remoteDispatchConnError(rerr, conn); @@ -7352,7 +8281,10 @@ remoteDispatchDomainOpenConsole(struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client_stream *stream; virDomainPtr dom; - CHECK_CONN (client); + if (!conn) { + remoteDispatchFormatError(rerr, "%s", _("connection not open")); + return -1; + } dom = get_nonnull_domain(conn, args->domain); if (dom == NULL) { -- 1.7.4.2

2 1

[libvirt] [PATCH] Standard on error variable name in libvirtd dispatcher
by Daniel P. Berrange 13 Apr '11

13 Apr '11

Some dispatcher methods have a parameter remote_error *err, Instead of the more normal remote_error *rerr, * daemon/remote.c: s/err/rerr/ --- daemon/remote.c | 108 +++++++++++++++++++++++++++--------------------------- 1 files changed, 54 insertions(+), 54 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index d43cfce..8a2a71f 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -6063,13 +6063,13 @@ remoteDispatchNumOfSecrets(struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error *err, + remote_error *rerr, void *args ATTRIBUTE_UNUSED, remote_num_of_secrets_ret *ret) { ret->num = virConnectNumOfSecrets(conn); if (ret->num == -1) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); return -1; } @@ -6081,18 +6081,18 @@ remoteDispatchListSecrets(struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error *err, + remote_error *rerr, remote_list_secrets_args *args, remote_list_secrets_ret *ret) { if (args->maxuuids > REMOTE_SECRET_UUID_LIST_MAX) { - remoteDispatchFormatError(err, "%s", + remoteDispatchFormatError(rerr, "%s", _("maxuuids > REMOTE_SECRET_UUID_LIST_MAX")); return -1; } if (VIR_ALLOC_N(ret->uuids.uuids_val, args->maxuuids) < 0) { - remoteDispatchOOMError(err); + remoteDispatchOOMError(rerr); return -1; } @@ -6100,7 +6100,7 @@ remoteDispatchListSecrets(struct qemud_server *server ATTRIBUTE_UNUSED, args->maxuuids); if (ret->uuids.uuids_len == -1) { VIR_FREE(ret->uuids.uuids_val); - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); return -1; } @@ -6112,7 +6112,7 @@ remoteDispatchSecretDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error *err, + remote_error *rerr, remote_secret_define_xml_args *args, remote_secret_define_xml_ret *ret) { @@ -6120,7 +6120,7 @@ remoteDispatchSecretDefineXml(struct qemud_server *server ATTRIBUTE_UNUSED, secret = virSecretDefineXML(conn, args->xml, args->flags); if (secret == NULL) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); return -1; } @@ -6134,7 +6134,7 @@ remoteDispatchSecretGetValue(struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error *err, + remote_error *rerr, remote_secret_get_value_args *args, remote_secret_get_value_ret *ret) { @@ -6144,13 +6144,13 @@ remoteDispatchSecretGetValue(struct qemud_server *server ATTRIBUTE_UNUSED, secret = get_nonnull_secret(conn, args->secret); if (secret == NULL) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); return -1; } value = virSecretGetValue(secret, &value_size, args->flags); if (value == NULL) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); virSecretFree(secret); return -1; } @@ -6166,7 +6166,7 @@ remoteDispatchSecretGetXmlDesc(struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error *err, + remote_error *rerr, remote_secret_get_xml_desc_args *args, remote_secret_get_xml_desc_ret *ret) { @@ -6174,12 +6174,12 @@ remoteDispatchSecretGetXmlDesc(struct qemud_server *server ATTRIBUTE_UNUSED, secret = get_nonnull_secret(conn, args->secret); if (secret == NULL) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); return -1; } ret->xml = virSecretGetXMLDesc(secret, args->flags); if (ret->xml == NULL) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); virSecretFree(secret); return -1; } @@ -6192,7 +6192,7 @@ remoteDispatchSecretLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error *err, + remote_error *rerr, remote_secret_lookup_by_uuid_args *args, remote_secret_lookup_by_uuid_ret *ret) { @@ -6200,7 +6200,7 @@ remoteDispatchSecretLookupByUuid(struct qemud_server *server ATTRIBUTE_UNUSED, secret = virSecretLookupByUUID(conn, (unsigned char *)args->uuid); if (secret == NULL) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); return -1; } @@ -6214,7 +6214,7 @@ remoteDispatchSecretSetValue(struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error *err, + remote_error *rerr, remote_secret_set_value_args *args, void *ret ATTRIBUTE_UNUSED) { @@ -6222,12 +6222,12 @@ remoteDispatchSecretSetValue(struct qemud_server *server ATTRIBUTE_UNUSED, secret = get_nonnull_secret(conn, args->secret); if (secret == NULL) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); return -1; } if (virSecretSetValue(secret, (const unsigned char *)args->value.value_val, args->value.value_len, args->flags) < 0) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); virSecretFree(secret); return -1; } @@ -6241,7 +6241,7 @@ remoteDispatchSecretUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error *err, + remote_error *rerr, remote_secret_undefine_args *args, void *ret ATTRIBUTE_UNUSED) { @@ -6249,11 +6249,11 @@ remoteDispatchSecretUndefine(struct qemud_server *server ATTRIBUTE_UNUSED, secret = get_nonnull_secret(conn, args->secret); if (secret == NULL) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); return -1; } if (virSecretUndefine(secret) < 0) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); virSecretFree(secret); return -1; } @@ -6267,7 +6267,7 @@ remoteDispatchSecretLookupByUsage(struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error *err, + remote_error *rerr, remote_secret_lookup_by_usage_args *args, remote_secret_lookup_by_usage_ret *ret) { @@ -6275,7 +6275,7 @@ remoteDispatchSecretLookupByUsage(struct qemud_server *server ATTRIBUTE_UNUSED, secret = virSecretLookupByUsage(conn, args->usageType, args->usageID); if (secret == NULL) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); return -1; } @@ -6289,7 +6289,7 @@ static int remoteDispatchDomainIsActive(struct qemud_server *server ATTRIBUTE_UN struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error *err, + remote_error *rerr, remote_domain_is_active_args *args, remote_domain_is_active_ret *ret) { @@ -6297,14 +6297,14 @@ static int remoteDispatchDomainIsActive(struct qemud_server *server ATTRIBUTE_UN domain = get_nonnull_domain(conn, args->dom); if (domain == NULL) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); return -1; } ret->active = virDomainIsActive(domain); if (ret->active < 0) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); virDomainFree(domain); return -1; } @@ -6317,7 +6317,7 @@ static int remoteDispatchDomainIsPersistent(struct qemud_server *server ATTRIBUT struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error *err, + remote_error *rerr, remote_domain_is_persistent_args *args, remote_domain_is_persistent_ret *ret) { @@ -6325,14 +6325,14 @@ static int remoteDispatchDomainIsPersistent(struct qemud_server *server ATTRIBUT domain = get_nonnull_domain(conn, args->dom); if (domain == NULL) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); return -1; } ret->persistent = virDomainIsPersistent(domain); if (ret->persistent < 0) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); virDomainFree(domain); return -1; } @@ -6345,7 +6345,7 @@ static int remoteDispatchDomainIsUpdated(struct qemud_server *server ATTRIBUTE_U struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error *err, + remote_error *rerr, remote_domain_is_updated_args *args, remote_domain_is_updated_ret *ret) { @@ -6353,14 +6353,14 @@ static int remoteDispatchDomainIsUpdated(struct qemud_server *server ATTRIBUTE_U domain = get_nonnull_domain(conn, args->dom); if (domain == NULL) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); return -1; } ret->updated = virDomainIsUpdated(domain); if (ret->updated < 0) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); virDomainFree(domain); return -1; } @@ -6373,7 +6373,7 @@ static int remoteDispatchInterfaceIsActive(struct qemud_server *server ATTRIBUTE struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error *err, + remote_error *rerr, remote_interface_is_active_args *args, remote_interface_is_active_ret *ret) { @@ -6381,14 +6381,14 @@ static int remoteDispatchInterfaceIsActive(struct qemud_server *server ATTRIBUTE iface = get_nonnull_interface(conn, args->iface); if (iface == NULL) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); return -1; } ret->active = virInterfaceIsActive(iface); if (ret->active < 0) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); virInterfaceFree(iface); return -1; } @@ -6401,7 +6401,7 @@ static int remoteDispatchNetworkIsActive(struct qemud_server *server ATTRIBUTE_U struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error *err, + remote_error *rerr, remote_network_is_active_args *args, remote_network_is_active_ret *ret) { @@ -6409,14 +6409,14 @@ static int remoteDispatchNetworkIsActive(struct qemud_server *server ATTRIBUTE_U network = get_nonnull_network(conn, args->net); if (network == NULL) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); return -1; } ret->active = virNetworkIsActive(network); if (ret->active < 0) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); virNetworkFree(network); return -1; } @@ -6429,7 +6429,7 @@ static int remoteDispatchNetworkIsPersistent(struct qemud_server *server ATTRIBU struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error *err, + remote_error *rerr, remote_network_is_persistent_args *args, remote_network_is_persistent_ret *ret) { @@ -6437,14 +6437,14 @@ static int remoteDispatchNetworkIsPersistent(struct qemud_server *server ATTRIBU network = get_nonnull_network(conn, args->net); if (network == NULL) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); return -1; } ret->persistent = virNetworkIsPersistent(network); if (ret->persistent < 0) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); virNetworkFree(network); return -1; } @@ -6457,7 +6457,7 @@ static int remoteDispatchStoragePoolIsActive(struct qemud_server *server ATTRIBU struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error *err, + remote_error *rerr, remote_storage_pool_is_active_args *args, remote_storage_pool_is_active_ret *ret) { @@ -6465,14 +6465,14 @@ static int remoteDispatchStoragePoolIsActive(struct qemud_server *server ATTRIBU pool = get_nonnull_storage_pool(conn, args->pool); if (pool == NULL) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); return -1; } ret->active = virStoragePoolIsActive(pool); if (ret->active < 0) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); virStoragePoolFree(pool); return -1; } @@ -6485,7 +6485,7 @@ static int remoteDispatchStoragePoolIsPersistent(struct qemud_server *server ATT struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error *err, + remote_error *rerr, remote_storage_pool_is_persistent_args *args, remote_storage_pool_is_persistent_ret *ret) { @@ -6493,14 +6493,14 @@ static int remoteDispatchStoragePoolIsPersistent(struct qemud_server *server ATT pool = get_nonnull_storage_pool(conn, args->pool); if (pool == NULL) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); return -1; } ret->persistent = virStoragePoolIsPersistent(pool); if (ret->persistent < 0) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); virStoragePoolFree(pool); return -1; } @@ -6514,14 +6514,14 @@ static int remoteDispatchIsSecure(struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error *err, + remote_error *rerr, void *args ATTRIBUTE_UNUSED, remote_is_secure_ret *ret) { ret->secure = virConnectIsSecure(conn); if (ret->secure < 0) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); return -1; } @@ -6534,7 +6534,7 @@ remoteDispatchCpuCompare(struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error *err, + remote_error *rerr, remote_cpu_compare_args *args, remote_cpu_compare_ret *ret) { @@ -6542,7 +6542,7 @@ remoteDispatchCpuCompare(struct qemud_server *server ATTRIBUTE_UNUSED, result = virConnectCompareCPU(conn, args->xml, args->flags); if (result == VIR_CPU_COMPARE_ERROR) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); return -1; } @@ -6556,7 +6556,7 @@ remoteDispatchCpuBaseline(struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, - remote_error *err, + remote_error *rerr, remote_cpu_baseline_args *args, remote_cpu_baseline_ret *ret) { @@ -6567,7 +6567,7 @@ remoteDispatchCpuBaseline(struct qemud_server *server ATTRIBUTE_UNUSED, args->xmlCPUs.xmlCPUs_len, args->flags); if (cpu == NULL) { - remoteDispatchConnError(err, conn); + remoteDispatchConnError(rerr, conn); return -1; } -- 1.7.4.2

2 2