- Devel - libvirt List Archives

[libvirt] [PATCH 0/3] qemu: Don't call qemuMonitorGetCPUInfo to update vCPU halted state
by Peter Krempa 22 Nov '16

22 Nov '16

The original implementation reused qemuMonitorGetCPUInfo to update the halted state. The function is very complex and should not be called all the time just to update a trivial parameter. Add infrastructure to properly update the state without the need to match in hotplug parameters. Peter Krempa (3): qemu: monitor: Extract qemu cpu id along with other data qemu: monitor: Extract halted state to a bitmap indexed by cpu id qemu: domain: Refresh vcpu halted state using qemuMonitorGetCpuHalted src/qemu/qemu_domain.c | 20 ++++++++------------ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_monitor.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.h | 3 +++ src/qemu/qemu_monitor_json.c | 3 +++ src/qemu/qemu_monitor_text.c | 11 +++++++++++ tests/qemumonitorjsontest.c | 8 ++++---- 7 files changed, 70 insertions(+), 16 deletions(-) -- 2.10.2

3 8

[libvirt] [PATCH] libxl: add tunnelled migration support
by Bob Liu 22 Nov '16

22 Nov '16

Tunnelled migration doesn't require any extra network connections beside the libvirt daemon. It's capable of strong encryption and the default option of openstack-nova. This patch adds the tunnelled migration(Tunnel3params) support to libxl. On the src side, the data flow is: * libxlDoMigrateSend() -> pipe * libxlTunnel3MigrationFunc() polls pipe out and then write to dest stream. While on the dest side: Stream -> pipe -> 'recvfd of libxlDomainStartRestore' The usage is the same as p2p migration, execpt adding one extra '--tunnelled' to the libvirt p2p migration command. Signed-off-by: Bob Liu <bob.liu(a)oracle.com> --- src/libxl/libxl_driver.c | 58 ++++++++- src/libxl/libxl_migration.c | 281 +++++++++++++++++++++++++++++++++++++++++--- src/libxl/libxl_migration.h | 9 ++ 3 files changed, 331 insertions(+), 17 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index b66cb1f..bc2633b 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5918,6 +5918,61 @@ libxlDomainMigrateBegin3Params(virDomainPtr domain, } static int +libxlDomainMigratePrepareTunnel3Params(virConnectPtr dconn, + virStreamPtr st, + virTypedParameterPtr params, + int nparams, + const char *cookiein, + int cookieinlen, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + unsigned int flags) +{ + libxlDriverPrivatePtr driver = dconn->privateData; + virDomainDefPtr def = NULL; + const char *dom_xml = NULL; + const char *dname = NULL; + const char *uri_in = NULL; + +#ifdef LIBXL_HAVE_NO_SUSPEND_RESUME + virReportUnsupportedError(); + return -1; +#endif + + virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); + if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0) + goto error; + + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_XML, + &dom_xml) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, + &dname) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_URI, + &uri_in) < 0) + + goto error; + + if (!(def = libxlDomainMigrationPrepareDef(driver, dom_xml, dname))) + goto error; + + if (virDomainMigratePrepareTunnel3ParamsEnsureACL(dconn, def) < 0) + goto error; + + if (libxlDomainMigrationPrepareTunnel3(dconn, st, &def, cookiein, + cookieinlen, flags) < 0) + goto error; + + return 0; + + error: + virDomainDefFree(def); + return -1; +} + +static int libxlDomainMigratePrepare3Params(virConnectPtr dconn, virTypedParameterPtr params, int nparams, @@ -6017,7 +6072,7 @@ libxlDomainMigratePerform3Params(virDomainPtr dom, if (virDomainMigratePerform3ParamsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (flags & VIR_MIGRATE_PEER2PEER) { + if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { if (libxlDomainMigrationPerformP2P(driver, vm, dom->conn, dom_xml, dconnuri, uri, dname, flags) < 0) goto cleanup; @@ -6501,6 +6556,7 @@ static virHypervisorDriver libxlHypervisorDriver = { .nodeDeviceReset = libxlNodeDeviceReset, /* 1.2.3 */ .domainMigrateBegin3Params = libxlDomainMigrateBegin3Params, /* 1.2.6 */ .domainMigratePrepare3Params = libxlDomainMigratePrepare3Params, /* 1.2.6 */ + .domainMigratePrepareTunnel3Params = libxlDomainMigratePrepareTunnel3Params, /* 2.5.0 */ .domainMigratePerform3Params = libxlDomainMigratePerform3Params, /* 1.2.6 */ .domainMigrateFinish3Params = libxlDomainMigrateFinish3Params, /* 1.2.6 */ .domainMigrateConfirm3Params = libxlDomainMigrateConfirm3Params, /* 1.2.6 */ diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 534abb8..f3152dc 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -44,6 +44,7 @@ #include "libxl_migration.h" #include "locking/domain_lock.h" #include "virtypedparam.h" +#include "fdstream.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -484,6 +485,90 @@ libxlDomainMigrationPrepareDef(libxlDriverPrivatePtr driver, } int +libxlDomainMigrationPrepareTunnel3(virConnectPtr dconn, + virStreamPtr st, + virDomainDefPtr *def, + const char *cookiein, + int cookieinlen, + unsigned int flags) +{ + libxlMigrationCookiePtr mig = NULL; + libxlDriverPrivatePtr driver = dconn->privateData; + virDomainObjPtr vm = NULL; + libxlMigrationDstArgs *args = NULL; + virThread thread; + int dataFD[2] = { -1, -1 }; + int ret = -1; + + if (libxlMigrationEatCookie(cookiein, cookieinlen, &mig) < 0) + goto error; + + if (mig->xenMigStreamVer > LIBXL_SAVE_VERSION) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("Xen migration stream version '%d' is not supported on this host"), + mig->xenMigStreamVer); + goto error; + } + + if (!(vm = virDomainObjListAdd(driver->domains, *def, + driver->xmlopt, + VIR_DOMAIN_OBJ_LIST_ADD_LIVE | + VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, + NULL))) + goto error; + + /* + * The data flow of tunnel3 migration in the dest side: + * stream -> pipe -> recvfd of libxlDomainStartRestore + */ + if (pipe(dataFD) < 0) + goto error; + + /* Stream data will be written to pipeIn */ + if (virFDStreamOpen(st, dataFD[1]) < 0) + goto error; + dataFD[1] = -1; /* 'st' owns the FD now & will close it */ + + if (libxlMigrationDstArgsInitialize() < 0) + goto error; + + if (!(args = virObjectNew(libxlMigrationDstArgsClass))) + goto error; + + args->conn = dconn; + args->vm = vm; + args->flags = flags; + args->migcookie = mig; + /* Receive from pipeOut */ + args->recvfd = dataFD[0]; + args->nsocks = 0; + if (virThreadCreate(&thread, false, libxlDoMigrateReceive, args) < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Failed to create thread for receiving migration data")); + goto error; + } + + ret = 0; + goto done; + + error: + VIR_FORCE_CLOSE(dataFD[1]); + VIR_FORCE_CLOSE(dataFD[0]); + virObjectUnref(args); + /* Remove virDomainObj from domain list */ + if (vm) { + virDomainObjListRemove(driver->domains, vm); + vm = NULL; + } + + done: + if (vm) + virObjectUnlock(vm); + + return ret; +} + +int libxlDomainMigrationPrepare(virConnectPtr dconn, virDomainDefPtr *def, const char *uri_in, @@ -710,9 +795,154 @@ libxlDomainMigrationPrepare(virConnectPtr dconn, return ret; } -/* This function is a simplification of virDomainMigrateVersion3Full - * excluding tunnel support and restricting it to migration v3 - * with params since it was the first to be introduced in libxl. +typedef struct _libxlTunnelMigrationThread libxlTunnelMigrationThread; +struct _libxlTunnelMigrationThread { + virThread thread; + virStreamPtr st; + int srcFD; +}; +#define TUNNEL_SEND_BUF_SIZE 65536 + +/* + * The data flow of tunnel3 migration in the src side: + * libxlDoMigrateSend() -> pipe + * libxlTunnel3MigrationFunc() polls pipe out and then write to dest stream. + */ +static void libxlTunnel3MigrationFunc(void *arg) +{ + libxlTunnelMigrationThread *data = (libxlTunnelMigrationThread *)arg; + char *buffer = NULL; + struct pollfd fds[1]; + int timeout = -1; + + if (VIR_ALLOC_N(buffer, TUNNEL_SEND_BUF_SIZE) < 0) { + virReportError(errno, "%s", _("poll failed in migration tunnel")); + return; + } + + fds[0].fd = data->srcFD; + for (;;) { + int ret; + + fds[0].events = POLLIN; + fds[0].revents = 0; + ret = poll(fds, ARRAY_CARDINALITY(fds), timeout); + if (ret < 0) { + if (errno == EAGAIN || errno == EINTR) + continue; + virReportError(errno, "%s", + _("poll failed in libxlTunnel3MigrationFunc")); + goto cleanup; + } + + if (ret == 0) { + VIR_DEBUG("poll got timeout"); + break; + } + + if (fds[0].revents & (POLLIN | POLLERR | POLLHUP)) { + int nbytes; + + nbytes = read(data->srcFD, buffer, TUNNEL_SEND_BUF_SIZE); + if (nbytes > 0) { + /* Write to dest stream */ + if (virStreamSend(data->st, buffer, nbytes) < 0) { + virReportError(errno, "%s", + _("tunnelled migration failed to send to virStream")); + virStreamAbort(data->st); + goto cleanup; + } + } else if (nbytes < 0) { + virReportError(errno, "%s", + _("tunnelled migration failed to read from xen side")); + virStreamAbort(data->st); + goto cleanup; + } else { + /* EOF; transferred all data */ + break; + } + } + } + + if (virStreamFinish(data->st) < 0) + virReportError(errno, "%s", + _("tunnelled migration failed to finish stream")); + cleanup: + VIR_FREE(buffer); + + return; +} + +struct libxlTunnelControl { + libxlTunnelMigrationThread tmThread; + int dataFD[2]; +}; + +static int +libxlMigrationStartTunnel(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned long flags, + virStreamPtr st, + struct libxlTunnelControl *tc) +{ + libxlTunnelMigrationThread *tmThreadPtr = NULL; + int ret = -1; + + if (VIR_ALLOC(tc) < 0) + goto out; + + tc->dataFD[0] = -1; + tc->dataFD[1] = -1; + if (pipe(tc->dataFD) < 0) { + virReportError(errno, "%s", _("Unable to make pipes")); + goto out; + } + + tmThreadPtr = &tc->tmThread; + /* Read from pipe */ + tmThreadPtr->srcFD = tc->dataFD[0]; + /* Write to dest stream */ + tmThreadPtr->st = st; + if (virThreadCreate(&tmThreadPtr->thread, true, + libxlTunnel3MigrationFunc, + tmThreadPtr) < 0) { + virReportError(errno, "%s", + _("Unable to create tunnel migration thread")); + goto out; + } + + virObjectUnlock(vm); + /* Send data to pipe */ + ret = libxlDoMigrateSend(driver, vm, flags, tc->dataFD[1]); + virObjectLock(vm); + + out: + /* libxlMigrationStopTunnel will be called in libxlDoMigrateP2P to free + * all resources for us. */ + return ret; +} + +static void libxlMigrationStopTunnel(struct libxlTunnelControl *tc) +{ + libxlTunnelMigrationThread *tmThreadPtr = NULL; + + if (!tc) + return; + + tmThreadPtr = &tc->tmThread; + if (tmThreadPtr) { + virThreadCancel(&tmThreadPtr->thread); + virThreadJoin(&tmThreadPtr->thread); + } + + VIR_FORCE_CLOSE(tc->dataFD[0]); + VIR_FORCE_CLOSE(tc->dataFD[1]); + VIR_FREE(tc); +} + +/* This function is a simplification of virDomainMigrateVersion3Full and + * restricting it to migration v3 with params since it was the first to be + * introduced in libxl. */ static int libxlDoMigrateP2P(libxlDriverPrivatePtr driver, @@ -737,6 +967,9 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr driver, bool cancelled = true; virErrorPtr orig_err = NULL; int ret = -1; + /* For tunnel migration */ + virStreamPtr st = NULL; + struct libxlTunnelControl *tc = NULL; dom_xml = libxlDomainMigrationBegin(sconn, vm, xmlin, &cookieout, &cookieoutlen); @@ -764,29 +997,40 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr driver, VIR_DEBUG("Prepare3"); virObjectUnlock(vm); - ret = dconn->driver->domainMigratePrepare3Params - (dconn, params, nparams, cookieout, cookieoutlen, NULL, NULL, &uri_out, destflags); + if (flags & VIR_MIGRATE_TUNNELLED) { + if (!(st = virStreamNew(dconn, 0))) + goto cleanup; + ret = dconn->driver->domainMigratePrepareTunnel3Params + (dconn, st, params, nparams, cookieout, cookieoutlen, NULL, NULL, destflags); + } else { + ret = dconn->driver->domainMigratePrepare3Params + (dconn, params, nparams, cookieout, cookieoutlen, NULL, NULL, &uri_out, destflags); + } virObjectLock(vm); if (ret == -1) goto cleanup; - if (uri_out) { - if (virTypedParamsReplaceString(&params, &nparams, - VIR_MIGRATE_PARAM_URI, uri_out) < 0) { - orig_err = virSaveLastError(); + if (!(flags & VIR_MIGRATE_TUNNELLED)) { + if (uri_out) { + if (virTypedParamsReplaceString(&params, &nparams, + VIR_MIGRATE_PARAM_URI, uri_out) < 0) { + orig_err = virSaveLastError(); + goto finish; + } + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("domainMigratePrepare3 did not set uri")); goto finish; } - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("domainMigratePrepare3 did not set uri")); - goto finish; } VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out)); - ret = libxlDomainMigrationPerform(driver, vm, NULL, NULL, - uri_out, NULL, flags); - + if (flags & VIR_MIGRATE_TUNNELLED) + ret = libxlMigrationStartTunnel(driver, vm, flags, st, tc); + else + ret = libxlDomainMigrationPerform(driver, vm, NULL, NULL, + uri_out, NULL, flags); if (ret < 0) orig_err = virSaveLastError(); @@ -824,6 +1068,11 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr driver, vm->def->name); cleanup: + if (flags & VIR_MIGRATE_TUNNELLED) { + libxlMigrationStopTunnel(tc); + virObjectUnref(st); + } + if (ddomain) { virObjectUnref(ddomain); ret = 0; diff --git a/src/libxl/libxl_migration.h b/src/libxl/libxl_migration.h index 8a074a0..fcea558 100644 --- a/src/libxl/libxl_migration.h +++ b/src/libxl/libxl_migration.h @@ -29,6 +29,7 @@ # define LIBXL_MIGRATION_FLAGS \ (VIR_MIGRATE_LIVE | \ VIR_MIGRATE_PEER2PEER | \ + VIR_MIGRATE_TUNNELLED | \ VIR_MIGRATE_PERSIST_DEST | \ VIR_MIGRATE_UNDEFINE_SOURCE | \ VIR_MIGRATE_PAUSED) @@ -53,6 +54,14 @@ libxlDomainMigrationPrepareDef(libxlDriverPrivatePtr driver, const char *dname); int +libxlDomainMigrationPrepareTunnel3(virConnectPtr dconn, + virStreamPtr st, + virDomainDefPtr *def, + const char *cookiein, + int cookieinlen, + unsigned int flags); + +int libxlDomainMigrationPrepare(virConnectPtr dconn, virDomainDefPtr *def, const char *uri_in, -- 2.6.5

2 3

[libvirt] [PATCH] bhyve: cleanup bhyveBuildNetArgStr error handling
by Roman Bogorodskiy 21 Nov '16

21 Nov '16

Use 'goto cleanup'-style error handling instead of explicitly freeing variables in every error path. --- src/bhyve/bhyve_command.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 022b03b..4914d98 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -52,26 +52,25 @@ bhyveBuildNetArgStr(const virDomainDef *def, char macaddr[VIR_MAC_STRING_BUFLEN]; char *realifname = NULL; char *brname = NULL; + int ret = -1; virDomainNetType actualType = virDomainNetGetActualType(net); if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { if (VIR_STRDUP(brname, virDomainNetGetActualBridgeName(net)) < 0) - return -1; + goto cleanup; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Network type %d is not supported"), virDomainNetGetActualType(net)); - return -1; + goto cleanup; } if (!net->ifname || STRPREFIX(net->ifname, VIR_NET_GENERATED_PREFIX) || strchr(net->ifname, '%')) { VIR_FREE(net->ifname); - if (VIR_STRDUP(net->ifname, VIR_NET_GENERATED_PREFIX "%d") < 0) { - VIR_FREE(brname); - return -1; - } + if (VIR_STRDUP(net->ifname, VIR_NET_GENERATED_PREFIX "%d") < 0) + goto cleanup; } if (!dryRun) { @@ -80,33 +79,24 @@ bhyveBuildNetArgStr(const virDomainDef *def, virDomainNetGetActualVirtPortProfile(net), virDomainNetGetActualVlan(net), VIR_NETDEV_TAP_CREATE_IFUP | VIR_NETDEV_TAP_CREATE_PERSIST) < 0) { - VIR_FREE(net->ifname); - VIR_FREE(brname); - return -1; + goto cleanup; } realifname = virNetDevTapGetRealDeviceName(net->ifname); - if (realifname == NULL) { - VIR_FREE(net->ifname); - VIR_FREE(brname); - return -1; - } + if (realifname == NULL) + goto cleanup; VIR_DEBUG("%s -> %s", net->ifname, realifname); /* hack on top of other hack: we need to set * interface to 'UP' again after re-opening to find its * name */ - if (virNetDevSetOnline(net->ifname, true) != 0) { - VIR_FREE(realifname); - VIR_FREE(net->ifname); - VIR_FREE(brname); - return -1; - } + if (virNetDevSetOnline(net->ifname, true) != 0) + goto cleanup; } else { if (VIR_STRDUP(realifname, "tap0") < 0) - return -1; + goto cleanup; } @@ -114,9 +104,14 @@ bhyveBuildNetArgStr(const virDomainDef *def, virCommandAddArgFormat(cmd, "%d:0,virtio-net,%s,mac=%s", net->info.addr.pci.slot, realifname, virMacAddrFormat(&net->mac, macaddr)); + + ret = 0; + cleanup: + VIR_FREE(brname); + VIR_FREE(net->ifname); VIR_FREE(realifname); - return 0; + return ret; } static int -- 2.10.1

2 2

[libvirt] Opinions on removing the old, legacy libvirt Xen driver
by Jim Fehlig 21 Nov '16

21 Nov '16

Hi All, I briefly mentioned this at an evening event during the KVM Forum / Xen Dev Summit, but the list is certainly a better place to discuss such a topic. What do folks think about finally removing the old, legacy, xend-based driver from the libvirt sources? The Xen community made xl/libxl the primary toolstack in Xen 4.1. In Xen 4.2, it was made the default toolstack. In Xen 4.5, xm/xend was completely removed from the Xen source tree. According to the Xen release support matrix [0], upstream maintenance of Xen 4.1-4.3 has been dropped for some time, including "long term" security support. Xen 4.4-4.5 no longer receive regular maintenance support, with security support ending in March for 4.4 and January 2018 for 4.5. In short, the fully maintained upstream Xen releases don't even contain xm/xend :-). As for downstreams, I doubt anyone is interested in running the last several libvirt releases on an old Xen installition with xm/xend, let alone libvirt.git master. SUSE, which still supports Xen, has no interest in using a new libvirt on older (but still supported) SLES that uses the xm/xend toolstack. I struggle to find a good reason to keep any of the old cruft under src/xen/. I do think we should keep the xm/sexpr config parsing/formatting code src/xenconfig/ since it is useful for converting old xm and sexpr config to libvirt domXML. Thanks for opinions and comments! Regards, Jim [0] https://wiki.xenproject.org/wiki/Xen_Project_Release_Features

7 7

[libvirt] Resolve listen IP for graphics attached to Open vSwitch network
by Petr Horacek 21 Nov '16

21 Nov '16

Hello, libvirt allows us to attach graphics device to a network, then it resolves IP on its own. However, when OVS network is used and not attached to a fake-bridge, but rather to OVS bridge and given VLAN tag, libvirt is not able to resolve IP (it tries to use IP of bridge, whereas it should check another port). Network definition: <network> <name>net1</name> <forward mode='bridge'/> <bridge name='ovsbr0'/> <virtualport type='openvswitch'/> <vlan> <tag id='20'/> </vlan> </network> Graphics definition: <graphics type='spice'> <listen type='network' network='net1'/> </graphics> Network setup: ovs-vsctl add-br ovsbr0 ovs-vsctl add-port ovsbr0 net1 tag=20 -- set Interface net1 type=internal ip address add 192.168.10.1/24 dev net1 We need graphics to listen on IP 192.168.10.1. In order to do that, libvirt should use first IP found on given bridge's (ovsbr0) ports with given vlan tag (20). When no vlan tag is given, it should also check the bridge itself (as it does now). It should also work with portgroups (as interface does). Note: Interface attached to this type of networks works OK. Do you think it would be possible to implement/fix this scenario? Thanks a lot, Petr

1 1

[libvirt] [PATCH] NEWS: Start using the improved format
by Andrea Bolognani 21 Nov '16

21 Nov '16

This entry is meant to both get the ball rolling on the switch and to provide a blueprint of what NEWS file entries are supposed to look like. --- We need to start somewhere, and what better way than talking about the change itself? ;) docs/news.html.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/news.html.in b/docs/news.html.in index deeee4d..fca1e29 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -16,6 +16,15 @@ to gauge progress. </p> + <h3>v2.5.0: <i>unreleased</i></h3> + <ul> + <li>Switch to an improved NEWS file format<br/> + List user-visible changes instead of single commits for a better + high-level overview of differences between libvirt releases + </li> + <li>Various bug fixes and improvements</li> + </ul> + <h3>v2.4.0: Nov 1 2016</h3> <ul> <li>Documentation:<br/> -- 2.7.4

2 2

[libvirt] [PATCH] qemu_monitor_json: Don't check existence of "return" object
by Jiri Denemark 21 Nov '16

21 Nov '16

Whenever qemuMonitorJSONCheckError returns 0, the "return" object is guaranteed to exist. Thus virJSONValueObjectGetObject will never fail to get it. On the other hand, virJSONValueObjectGetArray may fail since the "return" object may not be an array. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 160 ++++++++----------------------------------- 1 file changed, 30 insertions(+), 130 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 9e06a4d27..ef8672cad 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1219,11 +1219,7 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-status reply was missing return data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (virJSONValueObjectGetBoolean(data, "running", running) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1443,12 +1439,7 @@ int qemuMonitorJSONGetVirtType(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("info kvm reply was missing return data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (virJSONValueObjectGetBoolean(data, "enabled", &val) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1609,12 +1600,7 @@ qemuMonitorJSONGetBalloonInfo(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - /* Success */ - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("info balloon reply was missing return data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (virJSONValueObjectGetNumberUlong(data, "actual", &mem) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1715,11 +1701,7 @@ int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("qom-get reply was missing return data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (!(statsdata = virJSONValueObjectGet(data, "stats"))) { VIR_DEBUG("data does not include 'stats'"); @@ -2679,11 +2661,7 @@ qemuMonitorJSONGetMigrationStatsReply(virJSONValuePtr reply, int rc; double mbps; - if (!(ret = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("info migration reply was missing return data")); - return -1; - } + ret = virJSONValueObjectGetObject(reply, "return"); if (!(statusstr = virJSONValueObjectGetString(ret, "status"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2976,11 +2954,7 @@ qemuMonitorJSONGetDumpGuestMemoryCapability(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(caps = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("missing dump guest memory capabilities")); - goto cleanup; - } + caps = virJSONValueObjectGetObject(reply, "return"); if (!(formats = virJSONValueObjectGetArray(caps, "formats"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -3160,11 +3134,6 @@ qemuMonitorJSONAddFd(qemuMonitorPtr mon, int fdset, int fd, const char *name) if (ret == 0) { virJSONValuePtr data = virJSONValueObjectGetObject(reply, "return"); - if (!data) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("missing return information")); - goto error; - } if (virJSONValueObjectGetNumberInt(data, "fd", &ret) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("incomplete return information")); @@ -4745,11 +4714,7 @@ int qemuMonitorJSONGetVersion(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-version reply was missing 'return' data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (!(qemu = virJSONValueObjectGetObject(data, "qemu"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -4815,13 +4780,8 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-machines reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("query-machines reply data was not an array")); goto cleanup; @@ -4925,13 +4885,8 @@ qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-cpu-definitions reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("query-cpu-definitions reply data was not an array")); goto cleanup; @@ -4998,13 +4953,8 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-commands reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("query-commands reply data was not an array")); goto cleanup; @@ -5068,13 +5018,8 @@ int qemuMonitorJSONGetEvents(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-events reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("query-events reply data was not an array")); goto cleanup; @@ -5258,11 +5203,7 @@ int qemuMonitorJSONGetKVMState(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-kvm reply was missing return data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (virJSONValueObjectGetBoolean(data, "enabled", enabled) < 0 || virJSONValueObjectGetBoolean(data, "present", present) < 0) { @@ -5302,13 +5243,8 @@ int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("qom-list-types reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("qom-list-types reply data was not an array")); goto cleanup; @@ -5369,13 +5305,8 @@ int qemuMonitorJSONGetObjectListPaths(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("qom-list reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("qom-list reply data was not an array")); goto cleanup; @@ -5613,13 +5544,8 @@ int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("device-list-properties reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("device-list-properties reply data was not an array")); goto cleanup; @@ -5673,11 +5599,7 @@ qemuMonitorJSONGetTargetArch(qemuMonitorPtr mon) if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-target reply was missing return data")); - goto cleanup; - } + data = virJSONValueObjectGetObject(reply, "return"); if (!(arch = virJSONValueObjectGetString(data, "arch"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -6110,14 +6032,8 @@ qemuMonitorJSONGetStringArray(qemuMonitorPtr mon, const char *qmpCmd, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s reply was missing return data"), - qmpCmd); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("%s reply data was not an array"), qmpCmd); @@ -6329,15 +6245,9 @@ qemuMonitorJSONAttachCharDev(qemuMonitorPtr mon, goto cleanup; if (chr->type == VIR_DOMAIN_CHR_TYPE_PTY) { - virJSONValuePtr data; + virJSONValuePtr data = virJSONValueObjectGetObject(reply, "return"); const char *path; - if (!(data = virJSONValueObjectGetObject(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("chardev-add reply was missing return data")); - goto cleanup; - } - if (!(path = virJSONValueObjectGetString(data, "pty"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("chardev-add reply was missing pty path")); @@ -6686,13 +6596,8 @@ qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-iothreads reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("query-iothreads reply data was not an array")); goto cleanup; @@ -6780,13 +6685,8 @@ qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitorPtr mon, if (qemuMonitorJSONCheckError(cmd, reply) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-memory-devices reply was missing return data")); - goto cleanup; - } - - if ((n = virJSONValueArraySize(data)) < 0) { + if (!(data = virJSONValueObjectGetArray(reply, "return")) || + (n = virJSONValueArraySize(data)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("query-memory-devices reply data was not an array")); goto cleanup; -- 2.11.0.rc2

2 1

[libvirt] [PATCH 0/5] qemu: parse: Fix parsing of weird cpu topology specifications
by Peter Krempa 21 Nov '16

21 Nov '16

Peter Krempa (5): qemu: parse: Validate that the VM has at least one cpu qemu: parse: Allow the 'cpus=' prefix for current cpu number qemu: parse: Assign topology info earlier qemu: parse: Assign maximum cpu count from topology if not provided qemu: process: Set current vcpu count to maximum if it was not specified src/qemu/qemu_parse_command.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) -- 2.10.2

3 7

[libvirt] [PATCH] docs: Use Overpass Mono as the monospace font
by Martin Kletzander 21 Nov '16

21 Nov '16

Because this makes the font the same size as the non-monospaced one, let's change those properties a little bit as well. <pre/> will be shrunk a bit and <code/> inside <p/> or <dd/> will have slightly greyer background. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Now it looks like this: http://people.redhat.com/~mkletzan/libvirt-monofont.png docs/generic.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/generic.css b/docs/generic.css index 02383017a91b..a6b2354df07b 100644 --- a/docs/generic.css +++ b/docs/generic.css @@ -71,3 +71,15 @@ h6 { margin-top: 0.75em; font-size: 0.8em; } + +code, pre { + font-family: LibvirtOverpassMono; +} + +dd code, p code { + background-color: #eeeeee; +} + +pre { + font-size: 90%; +} -- 2.10.2

2 1

[libvirt] [PATCH 0/4] docs: User Overpass 3.0 as a font
by Martin Kletzander 21 Nov '16

21 Nov '16

I heard Overpass 3.0 was released, so let's update to that. There are some changes that I noticed. There are more font weights than we had before. The one we decided to use is now probably the 'semibold' one. So the regular font is a little thinner, but not as much as the 'light' one. I think this time it is the perfect middle ground between the discussed variants in the previous thread. Also it makes the mono font the same size as the other font. I kinda like that, but if others don't, we can add font-size: 12px; to the style. Here is side-by-side comparison on my screen: http://people.redhat.com/~mkletzan/libvirt-newfonts.png Martin Kletzander (4): docs: Clean-up font definitions docs: Upgrade Overpass fonts to 3.0 docs: Add monospaced Overpass fonts docs: Use Overpass Mono as the monospace font docs/fonts/hinted-Overpass-Bold.woff | Bin 48136 -> 0 bytes docs/fonts/hinted-Overpass-BoldItalic.woff | Bin 51008 -> 0 bytes docs/fonts/hinted-Overpass-Italic.woff | Bin 51908 -> 0 bytes docs/fonts/hinted-Overpass-Light.woff | Bin 49452 -> 0 bytes docs/fonts/hinted-Overpass-LightItalic.woff | Bin 51752 -> 0 bytes docs/fonts/hinted-Overpass-Reg.woff | Bin 48144 -> 0 bytes docs/fonts/overpass-bold-italic.woff | Bin 0 -> 46524 bytes docs/fonts/overpass-bold.woff | Bin 0 -> 43612 bytes docs/fonts/overpass-italic.woff | Bin 0 -> 46744 bytes docs/fonts/overpass-light-italic.woff | Bin 0 -> 45844 bytes docs/fonts/overpass-light.woff | Bin 0 -> 43576 bytes docs/fonts/overpass-regular.woff | Bin 0 -> 44272 bytes docs/fonts/stylesheet.css | 49 ++++++++++++++++------------ docs/generic.css | 4 +++ 14 files changed, 32 insertions(+), 21 deletions(-) delete mode 100644 docs/fonts/hinted-Overpass-Bold.woff delete mode 100644 docs/fonts/hinted-Overpass-BoldItalic.woff delete mode 100644 docs/fonts/hinted-Overpass-Italic.woff delete mode 100644 docs/fonts/hinted-Overpass-Light.woff delete mode 100644 docs/fonts/hinted-Overpass-LightItalic.woff delete mode 100644 docs/fonts/hinted-Overpass-Reg.woff create mode 100644 docs/fonts/overpass-bold-italic.woff create mode 100644 docs/fonts/overpass-bold.woff create mode 100644 docs/fonts/overpass-italic.woff create mode 100644 docs/fonts/overpass-light-italic.woff create mode 100644 docs/fonts/overpass-light.woff create mode 100644 docs/fonts/overpass-regular.woff -- 2.10.2

3 11