- Devel - libvirt List Archives

[libvirt] [libvirt-perl][PATCH 0/2] Add VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED
by Ján Tomko 14 Apr '16

14 Apr '16

Ján Tomko (2): Reuse VIR_DOMAIN_EVENT_ID_DEVICE callbacks Add VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED constant Changes | 3 ++- Virt.xs | 48 +++++++----------------------------------------- lib/Sys/Virt/Domain.pm | 4 ++++ t/030-api-coverage.t | 1 + 4 files changed, 14 insertions(+), 42 deletions(-) -- 2.7.3

2 3

[libvirt] [PATCH] virsh: support up to 64 migration options for command
by Nikolay Shirokovskiy 14 Apr '16

14 Apr '16

Upcoming compression options for migration command patch series hits current limit of 32 possible options for a command. Lets take one step further and support 64 possible options. And all it takes is moving from 32 bit integers to 64 bit ones. The only less then trivial change i found is moving from 'ffs' to 'ffsl'. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- tools/vsh.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 6bdc082..5659110 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -40,7 +40,6 @@ #include <limits.h> #include <sys/stat.h> #include <inttypes.h> -#include <strings.h> #include <signal.h> #if WITH_READLINE @@ -329,8 +328,8 @@ vshCmddefGetInfo(const vshCmdDef * cmd, const char *name) /* Validate that the options associated with cmd can be parsed. */ static int -vshCmddefOptParse(const vshCmdDef *cmd, uint32_t *opts_need_arg, - uint32_t *opts_required) +vshCmddefOptParse(const vshCmdDef *cmd, uint64_t *opts_need_arg, + uint64_t *opts_required) { size_t i; bool optional = false; @@ -344,7 +343,7 @@ vshCmddefOptParse(const vshCmdDef *cmd, uint32_t *opts_need_arg, for (i = 0; cmd->opts[i].name; i++) { const vshCmdOptDef *opt = &cmd->opts[i]; - if (i > 31) + if (i > 63) return -1; /* too many options */ if (opt->type == VSH_OT_BOOL) { optional = true; @@ -407,7 +406,7 @@ static vshCmdOptDef helpopt = { }; static const vshCmdOptDef * vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name, - uint32_t *opts_seen, int *opt_index, char **optstr) + uint64_t *opts_seen, int *opt_index, char **optstr) { size_t i; const vshCmdOptDef *ret = NULL; @@ -464,8 +463,8 @@ vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name, } static const vshCmdOptDef * -vshCmddefGetData(const vshCmdDef *cmd, uint32_t *opts_need_arg, - uint32_t *opts_seen) +vshCmddefGetData(const vshCmdDef *cmd, uint64_t *opts_need_arg, + uint64_t *opts_seen) { size_t i; const vshCmdOptDef *opt; @@ -474,7 +473,7 @@ vshCmddefGetData(const vshCmdDef *cmd, uint32_t *opts_need_arg, return NULL; /* Grab least-significant set bit */ - i = ffs(*opts_need_arg) - 1; + i = ffsl(*opts_need_arg) - 1; opt = &cmd->opts[i]; if (opt->type != VSH_OT_ARGV) *opts_need_arg &= ~(1 << i); @@ -486,8 +485,8 @@ vshCmddefGetData(const vshCmdDef *cmd, uint32_t *opts_need_arg, * Checks for required options */ static int -vshCommandCheckOpts(vshControl *ctl, const vshCmd *cmd, uint32_t opts_required, - uint32_t opts_seen) +vshCommandCheckOpts(vshControl *ctl, const vshCmd *cmd, uint64_t opts_required, + uint64_t opts_seen) { const vshCmdDef *def = cmd->def; size_t i; @@ -598,8 +597,8 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname) const char *desc = vshCmddefGetInfo(def, "desc"); const char *help = _(vshCmddefGetInfo(def, "help")); char buf[256]; - uint32_t opts_need_arg; - uint32_t opts_required; + uint64_t opts_need_arg; + uint64_t opts_required; bool shortopt = false; /* true if 'arg' works instead of '--opt arg' */ if (vshCmddefOptParse(def, &opts_need_arg, &opts_required)) { @@ -1350,9 +1349,9 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser) const vshCmdDef *cmd = NULL; vshCommandToken tk; bool data_only = false; - uint32_t opts_need_arg = 0; - uint32_t opts_required = 0; - uint32_t opts_seen = 0; + uint64_t opts_need_arg = 0; + uint64_t opts_required = 0; + uint64_t opts_seen = 0; first = NULL; -- 1.8.3.1

2 1

[libvirt] [PATCH] virsh: use the same connection URI for reconnect
by Roman Bogorodskiy 14 Apr '16

14 Apr '16

When for some reason virsh looses connection and then tries to reconnection, it uses the default URI instead of the one that was used for the previous connection it got disconnected from. In order to make it reconnect using the same URI, copy URI of the current (disconnected) connection to vshControl 'connname' attribute. --- tools/virsh.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/virsh.c b/tools/virsh.c index 5a61189..07097aa 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -359,6 +359,14 @@ virshConnectionHandler(vshControl *ctl) { virshControlPtr priv = ctl->privData; + if (disconnected && priv->conn) { + if (!ctl->connname) { + char *uri = virConnectGetURI(priv->conn); + ctl->connname = vshStrdup(ctl, uri); + VIR_FREE(uri); + } + } + if (!priv->conn || disconnected) virshReconnect(ctl); -- 2.7.4

2 3

[libvirt] [PATCH REBASE 0/4] vz: use disk bus and target name as disk id
by Nikolay Shirokovskiy 14 Apr '16

14 Apr '16

This series is a preparation to implement device update functionality. In case of disk updates disk bus and disk target name pair is considered disk id. We already have places in vz driver code where we use disk source as id. These places are either not critical (see boot patch) or correct (see detach patch) so we need not to fix them immediately to use more rubust id. But as this id will be introduced anyway for disk updates let's move to new id in existing code. This way we have single id for disks. Nikolay Shirokovskiy (4): vz: introduce vzsdk disk id function vz: fix detach disk to use new disk id vz: fix boot check to use new disk id vz: cleanup: remove trivial function src/vz/vz_sdk.c | 251 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 126 insertions(+), 125 deletions(-) -- 1.8.3.1

1 4

[libvirt] [PATCH] storage: mpath: Don't error on target_type=NULL
by Cole Robinson 14 Apr '16

14 Apr '16

We use device-mapper to enumerate all dm devices, and filter out the list of multipath devices by checking the target_type string name. The code however cancels all scanning if we encounter target_type=NULL I don't know how to reproduce that situation, but a user was hitting it in their setup, and inspecting the lvm2/device-mapper code shows many places where !target_type is explicitly ignored and processing continues on to the next device. So I think we should do the same https://bugzilla.redhat.com/show_bug.cgi?id=1069317 --- src/storage/storage_backend_mpath.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index b5b4bb6..bf1b1ab 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -114,12 +114,7 @@ virStorageBackendIsMultipath(const char *dev_name) dm_get_next_target(dmt, next, &start, &length, &target_type, &params); - if (target_type == NULL) { - ret = -1; - goto out; - } - - if (STREQ(target_type, "multipath")) + if (STREQ_NULLABLE(target_type, "multipath")) ret = 1; out: -- 2.7.3

2 1

[libvirt] may be bug in my own commit?
by Vasiliy Tolstov 14 Apr '16

14 Apr '16

Hi. I'm try to backport some my changes to centos libvirt (1.2.17), and see that may be i miss IFA_ADDRESS when peerData is null, can somebody recheck me? https://libvirt.org/git/?p=libvirt.git;a=blobdiff;f=src/util/virnetdev.c;h=… - if (nla_put(nlmsg, IFA_ADDRESS, addrDataLen, addrData) < 0) - goto buffer_too_small; + if (peerData) { + if (nla_put(nlmsg, IFA_ADDRESS, addrDataLen, peerData) < 0) + goto buffer_too_small; + } This misses else i think.. -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

1 0

[libvirt] [PATCH] fix build by correcting functions order and src/Makefile.am
by Maxim Nestratov 14 Apr '16

14 Apr '16

commit 30c61901 added new functions to libvirt_private.syms not alpabetically sorted and erroneously added vz sources to STATEFUL_DRIVER_SOURCE_FILES, which triggered check-aclrules running while vz driver isn't ready for it yet. Pushing under build-breaker rule. --- src/Makefile.am | 1 - src/libvirt_private.syms | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 08ff301..f5e57c0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -630,7 +630,6 @@ DRIVER_SOURCE_FILES = \ $(NULL) STATEFUL_DRIVER_SOURCE_FILES = \ - $(VZ_DRIVER_SOURCES) \ $(BHYVE_DRIVER_SOURCES) \ $(INTERFACE_DRIVER_SOURCES) \ $(LIBXL_DRIVER_SOURCES) \ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1bcb3af..a9025f5 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -916,6 +916,11 @@ virCPUx86MakeData; # datatypes.h virConnectClass; +virConnectCloseCallbackDataCall; +virConnectCloseCallbackDataClass; +virConnectCloseCallbackDataGetCallback; +virConnectCloseCallbackDataRegister; +virConnectCloseCallbackDataUnregister; virDomainClass; virDomainSnapshotClass; virGetConnect; @@ -929,20 +934,15 @@ virGetSecret; virGetStoragePool; virGetStorageVol; virGetStream; -virConnectCloseCallbackDataGetCallback; -virNewConnectCloseCallbackData; -virConnectCloseCallbackDataUnregister; -virConnectCloseCallbackDataRegister; -virConnectCloseCallbackDataCall; virInterfaceClass; virNetworkClass; +virNewConnectCloseCallbackData; virNodeDeviceClass; virNWFilterClass; virSecretClass; virStoragePoolClass; virStorageVolClass; virStreamClass; -virConnectCloseCallbackDataClass; # fdstream.h -- 2.4.3

2 2

Re: [libvirt] [libvirt-users] Libvirtd running as root tries to access oneadmin (OpenNebula) NFS mount but throws: error: can’t canonicalize path
by TomK 14 Apr '16

14 Apr '16

Adding in libvir-list. Cheers, Tom K. ------------------------------------------------------------------------------------- Mobile: 416 618 8456 Home: 905 857 9652 Living on earth is expensive, but it includes a free trip around the sun. On 4/7/2016 7:32 PM, TomK wrote: > Hey All, > > I've an issue where libvirtd tries to access an NFS mount but errors > out with: can't canonicalize path '/var/lib/one//datastores/0 . The > unprevilidged user is able to read/write fine to the share. > root_squash is used and for security reasons no_root_squash cannot be > used. > > On the controller and node SELinux is disabled. > > [oneadmin@mdskvm-p01 ~]$ virsh -d 1 --connect qemu:///system create > /var/lib/one//datastores/0/38/deployment.0 > create: file(optdata): /var/lib/one//datastores/0/38/deployment.0 > error: Failed to create domain from > /var/lib/one//datastores/0/38/deployment.0 > error: can't canonicalize path '/var/lib/one//datastores/0/38/disk.1': > Permission denied > > I added some debug flags to get more info and added -x to the deploy > script. Closest I get to more details is this: > > 2016-04-06 04:15:35.945+0000: 14072: debug : > virStorageFileBackendFileInit:1441 : initializing FS storage file > 0x7f6aa4009000 (file:/var/lib/one//datastores/0/38/disk.1)[9869:9869] > 2016-04-06 04:15:35.954+0000: 14072: error : > virStorageFileBackendFileGetUniqueIdentifier:1523 : can't canonicalize > path '/var/lib/one//datastores/0/38/disk.1': > > https://www.redhat.com/archives/libvir-list/2014-May/msg00194.html > > Comment is: "The current implementation works for local > storage only and returns the canonical path of the volume." > > But it seems the logic is applied to NFS mounts. Perhaps it shouldn't > be? Anyway to get around this problem? This is CentOS 7 . > > Cheers, > Tom K. > ------------------------------------------------------------------------------------- > > Living on earth is expensive, but it includes a free trip around the sun. > > _______________________________________________ > libvirt-users mailing list > libvirt-users(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvirt-users

3 18

[libvirt] [PATCH V5] libxl: support creating domain with VF assignment from a pool
by Chunyan Liu 14 Apr '16

14 Apr '16

Add codes to support creating domain with network defition of assigning SRIOV VF from a pool. Signed-off-by: Chunyan Liu <cyliu(a)suse.com> Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Rebase and send a new version. src/libxl/libxl_domain.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/Makefile.am | 3 +++ 2 files changed, 51 insertions(+) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 04962a0..bd5deaa 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -36,6 +36,7 @@ #include "virtime.h" #include "locking/domain_lock.h" #include "xen_common.h" +#include "network/bridge_driver.h" #define VIR_FROM_THIS VIR_FROM_LIBXL @@ -764,6 +765,10 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, if (net->ifname && STRPREFIX(net->ifname, LIBXL_GENERATED_PREFIX_XEN)) VIR_FREE(net->ifname); + + /* cleanup actual device */ + virDomainNetRemoveHostdev(vm->def, net); + networkReleaseActualDevice(vm->def, net); } } @@ -900,6 +905,46 @@ libxlDomainFreeMem(libxl_ctx *ctx, libxl_domain_config *d_config) return -1; } +static int +libxlNetworkPrepareDevices(virDomainDefPtr def) +{ + size_t i; + + for (i = 0; i < def->nnets; i++) { + virDomainNetDefPtr net = def->nets[i]; + int actualType; + + /* If appropriate, grab a physical device from the configured + * network's pool of devices, or resolve bridge device name + * to the one defined in the network definition. + */ + if (networkAllocateActualDevice(def, net) < 0) + return -1; + + actualType = virDomainNetGetActualType(net); + if (actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV && + net->type == VIR_DOMAIN_NET_TYPE_NETWORK) { + /* Each type='hostdev' network device must also have a + * corresponding entry in the hostdevs array. For netdevs + * that are hardcoded as type='hostdev', this is already + * done by the parser, but for those allocated from a + * network / determined at runtime, we need to do it + * separately. + */ + virDomainHostdevDefPtr hostdev = virDomainNetGetActualHostdev(net); + virDomainHostdevSubsysPCIPtr pcisrc = &hostdev->source.subsys.u.pci; + + if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) + pcisrc->backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN; + + if (virDomainHostdevInsert(def, hostdev) < 0) + return -1; + } + } + return 0; +} + static void libxlConsoleCallback(libxl_ctx *ctx, libxl_event *ev, void *for_callback) { @@ -1050,6 +1095,9 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, goto cleanup; VIR_FREE(priv->lockState); + if (libxlNetworkPrepareDevices(vm->def) < 0) + goto cleanup_dom; + if (libxlBuildDomainConfig(driver->reservedGraphicsPorts, vm->def, cfg->ctx, &d_config) < 0) goto cleanup_dom; diff --git a/tests/Makefile.am b/tests/Makefile.am index b3f1144..db4f88b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -534,6 +534,9 @@ endif ! WITH_XEN if WITH_LIBXL libxl_LDADDS = ../src/libvirt_driver_libxl_impl.la +if WITH_NETWORK +libxl_LDADDS += ../src/libvirt_driver_network_impl.la +endif WITH_NETWORK libxl_LDADDS += $(LDADDS) xlconfigtest_SOURCES = \ -- 1.8.5.6

2 1

[libvirt] [PATCH v4 0/6] vz: change vz driver to be stateful driver and other enhancements
by Maxim Nestratov 13 Apr '16

13 Apr '16

There is no benefit in providing two ways of connecting to vz driver: by connecting via daemon and directly from client. Both ways finally come to a host where vz daemon sits. Always connecting via daemon allows us to have a single list of domains and share it among all connections. Since v1: removed patch "z: remove close callback implementations" building fixed close callback functions are added to libvirt_private.syms reworked not to lose event subscribers when connections drop Since v2: removed "vz: change vzConnectIsAlive behavior" addressed mostly all comments on previous series changed "vz: build driver as module and don't register it on client's side" Since v3: removed privileged check in vzStateInitialize, we will not work in non- privileged mode anyway, while skipping initialization is not correct because cleanup function will be called anyway prlsdkNewDomainByHandle changed to check for domain presense in the list under lock Maxim Nestratov (6): vz: build driver as module and don't register it on client's side vz: introduce new vzDriver lockable structure and use it vz: fix possible vzDomainDefineXMLFlags and prlsdkNewDomainByHandle race vz: implement connectGetSysinfo hypervisor callback vz: remove vzDriverLock/Unlock function vz: minor cleanup daemon/Makefile.am | 4 + daemon/libvirtd.c | 9 ++ src/Makefile.am | 19 ++- src/libvirt.c | 7 - src/libvirt_private.syms | 7 + src/vz/vz_driver.c | 384 +++++++++++++++++++++++++++++------------------ src/vz/vz_sdk.c | 211 +++++++++++++------------- src/vz/vz_sdk.h | 30 ++-- src/vz/vz_utils.c | 27 ++-- src/vz/vz_utils.h | 34 +++-- 10 files changed, 431 insertions(+), 301 deletions(-) -- 2.4.3

3 13

[libvirt] [PATCH v2] vz: simplify getting strings from vz sdk
by Nikolay Shirokovskiy 13 Apr '16

13 Apr '16

changes from v1: ================ 1. move from macros to helper function as former is too heavy weigth for the task 2. squash fixed and variable length patches into one 3. rebase on master, so latest boot order patches can get benefits too Nikolay Shirokovskiy (1): vz: simplify getting strings from vzsdk src/vz/vz_sdk.c | 208 ++++++++++++++++++-------------------------------------- 1 file changed, 68 insertions(+), 140 deletions(-) -- 1.8.3.1

2 2

[libvirt] [PATCH] Fix various shadowed declarations
by Martin Kletzander 13 Apr '16

13 Apr '16

I tried compiling libvirt with older gcc and probably because I used different configure options I got some shadowed declarations. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_migration.c | 6 +++--- src/storage/storage_backend_zfs.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index d0055a27e24c..68a8fa892e17 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5943,7 +5943,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver, int rc; qemuDomainJobInfoPtr jobInfo = NULL; bool inPostCopy = false; - bool kill = true; + bool doKill = true; VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, retcode=%d", @@ -6091,7 +6091,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver, } if (inPostCopy) { - kill = false; + doKill = false; event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED_POSTCOPY); @@ -6151,7 +6151,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver, if (!dom && !(flags & VIR_MIGRATE_OFFLINE) && virDomainObjIsActive(vm)) { - if (kill) { + if (doKill) { qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, QEMU_ASYNC_JOB_MIGRATION_IN, VIR_QEMU_PROCESS_STOP_MIGRATED); diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c index c66a808ab7b4..5c0c1fce5d4b 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -51,7 +51,7 @@ static int virStorageBackendZFSVolModeNeeded(void) { virCommandPtr cmd = NULL; - int ret = -1, exit = -1; + int ret = -1, exit_code = -1; char *error = NULL; /* 'zfs get' without arguments prints out @@ -63,8 +63,8 @@ virStorageBackendZFSVolModeNeeded(void) virCommandAddEnvString(cmd, "LC_ALL=C"); virCommandSetErrorBuffer(cmd, &error); - ret = virCommandRun(cmd, &exit); - if ((ret < 0) || (exit != 2)) { + ret = virCommandRun(cmd, &exit_code); + if ((ret < 0) || (exit_code != 2)) { VIR_WARN("Command 'zfs get' either failed " "to run or exited with unexpected status"); goto cleanup; -- 2.8.1

2 1

[libvirt] [PATCH] build: fix build on RHEL-6
by Pavel Hrdina 13 Apr '16

13 Apr '16

GCC in RHEL-6 complains about listen: ../../src/conf/domain_conf.c:23718: error: declaration of 'listen' shadows a global declaration [-Wshadow] /usr/include/sys/socket.h:204: error: shadowed declaration is here [-Wshadow] This renames all the listen to gListen. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under build breaker rule. src/conf/domain_conf.c | 12 ++++++------ src/libxl/libxl_conf.c | 16 ++++++++-------- src/qemu/qemu_command.c | 28 ++++++++++++++-------------- src/qemu/qemu_migration.c | 6 +++--- src/vbox/vbox_common.c | 10 +++++----- src/vmx/vmx.c | 8 ++++---- src/vz/vz_sdk.c | 8 ++++---- src/xenconfig/xen_common.c | 14 +++++++------- src/xenconfig/xen_sxpr.c | 16 ++++++++-------- src/xenconfig/xen_xl.c | 8 ++++---- 10 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 446fbc5..12a3a50 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -23715,21 +23715,21 @@ int virDomainGraphicsListenAppendAddress(virDomainGraphicsDefPtr def, const char *address) { - virDomainGraphicsListenDef listen; + virDomainGraphicsListenDef gListen; - memset(&listen, 0, sizeof(listen)); + memset(&gListen, 0, sizeof(gListen)); - listen.type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS; + gListen.type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS; - if (VIR_STRDUP(listen.address, address) < 0) + if (VIR_STRDUP(gListen.address, address) < 0) goto error; - if (VIR_APPEND_ELEMENT_COPY(def->listens, def->nListens, listen) < 0) + if (VIR_APPEND_ELEMENT_COPY(def->listens, def->nListens, gListen) < 0) goto error; return 0; error: - VIR_FREE(listen.address); + VIR_FREE(gListen.address); return -1; } diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index a2ef1bd..30f2ce9 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1424,7 +1424,7 @@ libxlMakeVfb(virPortAllocatorPtr graphicsports, libxl_device_vfb *x_vfb) { unsigned short port; - virDomainGraphicsListenDefPtr listen = NULL; + virDomainGraphicsListenDefPtr gListen = NULL; libxl_device_vfb_init(x_vfb); @@ -1451,11 +1451,11 @@ libxlMakeVfb(virPortAllocatorPtr graphicsports, } x_vfb->vnc.display = l_vfb->data.vnc.port - LIBXL_VNC_PORT_MIN; - if ((listen = virDomainGraphicsGetListen(l_vfb, 0)) && - listen->address) { + if ((gListen = virDomainGraphicsGetListen(l_vfb, 0)) && + gListen->address) { /* libxl_device_vfb_init() does VIR_STRDUP("127.0.0.1") */ VIR_FREE(x_vfb->vnc.listen); - if (VIR_STRDUP(x_vfb->vnc.listen, listen->address) < 0) + if (VIR_STRDUP(x_vfb->vnc.listen, gListen->address) < 0) return -1; } if (VIR_STRDUP(x_vfb->vnc.passwd, l_vfb->data.vnc.auth.passwd) < 0) @@ -1539,7 +1539,7 @@ libxlMakeBuildInfoVfb(virPortAllocatorPtr graphicsports, for (i = 0; i < def->ngraphics; i++) { virDomainGraphicsDefPtr l_vfb = def->graphics[i]; unsigned short port; - virDomainGraphicsListenDefPtr listen = NULL; + virDomainGraphicsListenDefPtr gListen = NULL; if (l_vfb->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE) continue; @@ -1553,9 +1553,9 @@ libxlMakeBuildInfoVfb(virPortAllocatorPtr graphicsports, } b_info->u.hvm.spice.port = l_vfb->data.spice.port; - if ((listen = virDomainGraphicsGetListen(l_vfb, 0)) && - listen->address && - VIR_STRDUP(b_info->u.hvm.spice.host, listen->address) < 0) + if ((gListen = virDomainGraphicsGetListen(l_vfb, 0)) && + gListen->address && + VIR_STRDUP(b_info->u.hvm.spice.host, gListen->address) < 0) return -1; if (VIR_STRDUP(b_info->u.hvm.keymap, l_vfb->data.spice.keymap) < 0) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index da99e5c..31e5408 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7212,7 +7212,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg, const char *domainLibDir) { virBuffer opt = VIR_BUFFER_INITIALIZER; - virDomainGraphicsListenDefPtr listen = NULL; + virDomainGraphicsListenDefPtr gListen = NULL; const char *listenAddr = NULL; char *netAddr = NULL; bool escapeAddr; @@ -7241,18 +7241,18 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg, goto error; } - if ((listen = virDomainGraphicsGetListen(graphics, 0))) { + if ((gListen = virDomainGraphicsGetListen(graphics, 0))) { - switch (listen->type) { + switch (gListen->type) { case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: - listenAddr = listen->address; + listenAddr = gListen->address; break; case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: - if (!listen->network) + if (!gListen->network) break; - ret = networkGetNetworkAddress(listen->network, &netAddr); + ret = networkGetNetworkAddress(gListen->network, &netAddr); if (ret <= -2) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("network-based listen not possible, " @@ -7265,7 +7265,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg, listenAddr = netAddr; /* store the address we found in the <graphics> element so it * will show up in status. */ - if (VIR_STRDUP(listen->address, netAddr) < 0) + if (VIR_STRDUP(gListen->address, netAddr) < 0) goto error; break; } @@ -7359,7 +7359,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, virDomainGraphicsDefPtr graphics) { virBuffer opt = VIR_BUFFER_INITIALIZER; - virDomainGraphicsListenDefPtr listen = NULL; + virDomainGraphicsListenDefPtr gListen = NULL; const char *listenAddr = NULL; char *netAddr = NULL; int ret; @@ -7398,18 +7398,18 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, } if (port > 0 || tlsPort > 0) { - if ((listen = virDomainGraphicsGetListen(graphics, 0))) { + if ((gListen = virDomainGraphicsGetListen(graphics, 0))) { - switch (listen->type) { + switch (gListen->type) { case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: - listenAddr = listen->address; + listenAddr = gListen->address; break; case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: - if (!listen->network) + if (!gListen->network) break; - ret = networkGetNetworkAddress(listen->network, &netAddr); + ret = networkGetNetworkAddress(gListen->network, &netAddr); if (ret <= -2) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("network-based listen not possible, " @@ -7422,7 +7422,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, listenAddr = netAddr; /* store the address we found in the <graphics> element so it will * show up in status. */ - if (VIR_STRDUP(listen->address, listenAddr) < 0) + if (VIR_STRDUP(gListen->address, listenAddr) < 0) goto error; break; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index d0055a2..e72c874 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -314,7 +314,7 @@ qemuMigrationCookieGraphicsAlloc(virQEMUDriverPtr driver, { qemuMigrationCookieGraphicsPtr mig = NULL; const char *listenAddr; - virDomainGraphicsListenDefPtr listen = virDomainGraphicsGetListen(def, 0); + virDomainGraphicsListenDefPtr gListen = virDomainGraphicsGetListen(def, 0); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); if (VIR_ALLOC(mig) < 0) @@ -324,7 +324,7 @@ qemuMigrationCookieGraphicsAlloc(virQEMUDriverPtr driver, if (mig->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { mig->port = def->data.vnc.port; - if (!listen || !(listenAddr = listen->address)) + if (!gListen || !(listenAddr = gListen->address)) listenAddr = cfg->vncListen; #ifdef WITH_GNUTLS @@ -339,7 +339,7 @@ qemuMigrationCookieGraphicsAlloc(virQEMUDriverPtr driver, else mig->tlsPort = -1; - if (!listen || !(listenAddr = listen->address)) + if (!gListen || !(listenAddr = gListen->address)) listenAddr = cfg->spiceListen; #ifdef WITH_GNUTLS diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 5ffb493..0cead10 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -1578,7 +1578,7 @@ vboxAttachDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) char *guiDisplay = NULL; char *sdlDisplay = NULL; size_t i = 0; - virDomainGraphicsListenDefPtr listen; + virDomainGraphicsListenDefPtr gListen; for (i = 0; i < def->ngraphics; i++) { IVRDxServer *VRDxServer = NULL; @@ -1606,15 +1606,15 @@ vboxAttachDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) VIR_DEBUG("VRDP set to allow multiple connection"); } - if ((listen = virDomainGraphicsGetListen(def->graphics[i], 0)) && - listen->address) { + if ((gListen = virDomainGraphicsGetListen(def->graphics[i], 0)) && + gListen->address) { PRUnichar *netAddressUtf16 = NULL; - VBOX_UTF8_TO_UTF16(listen->address, &netAddressUtf16); + VBOX_UTF8_TO_UTF16(gListen->address, &netAddressUtf16); gVBoxAPI.UIVRDxServer.SetNetAddress(data, VRDxServer, netAddressUtf16); VIR_DEBUG("VRDP listen address is set to: %s", - listen->address); + gListen->address); VBOX_UTF16_FREE(netAddressUtf16); } diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 65b31c8..8c4b4bb 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -3403,7 +3403,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe int virVMXFormatVNC(virDomainGraphicsDefPtr def, virBufferPtr buffer) { - virDomainGraphicsListenDefPtr listen; + virDomainGraphicsListenDefPtr gListen; if (def->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); @@ -3425,10 +3425,10 @@ virVMXFormatVNC(virDomainGraphicsDefPtr def, virBufferPtr buffer) def->data.vnc.port); } - if ((listen = virDomainGraphicsGetListen(def, 0)) && - listen->address) { + if ((gListen = virDomainGraphicsGetListen(def, 0)) && + gListen->address) { virBufferAsprintf(buffer, "RemoteDisplay.vnc.ip = \"%s\"\n", - listen->address); + gListen->address); } if (def->data.vnc.keymap != NULL) { diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 5d27afd..f0c7f3f 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2712,7 +2712,7 @@ static int prlsdkCheckFSUnsupportedParams(virDomainFSDefPtr fs) static int prlsdkApplyGraphicsParams(PRL_HANDLE sdkdom, virDomainDefPtr def) { virDomainGraphicsDefPtr gr; - virDomainGraphicsListenDefPtr listen; + virDomainGraphicsListenDefPtr gListen; PRL_RESULT pret; int ret = -1; @@ -2735,10 +2735,10 @@ static int prlsdkApplyGraphicsParams(PRL_HANDLE sdkdom, virDomainDefPtr def) prlsdkCheckRetGoto(pret, cleanup); } - if ((listen = virDomainGraphicsGetListen(gr, 0))) { - if (!listen->address) + if ((gListen = virDomainGraphicsGetListen(gr, 0))) { + if (!gListen->address) goto cleanup; - pret = PrlVmCfg_SetVNCHostName(sdkdom, listen->address); + pret = PrlVmCfg_SetVNCHostName(sdkdom, gListen->address); prlsdkCheckRetGoto(pret, cleanup); } diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index 340e488..e1d9cf6 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -1628,7 +1628,7 @@ xenFormatVfb(virConfPtr conf, virDomainDefPtr def) def->graphics[0]->data.sdl.xauth) < 0) return -1; } else { - virDomainGraphicsListenDefPtr listen; + virDomainGraphicsListenDefPtr gListen; if (xenConfigSetInt(conf, "sdl", 0) < 0) return -1; @@ -1645,9 +1645,9 @@ xenFormatVfb(virConfPtr conf, virDomainDefPtr def) def->graphics[0]->data.vnc.port - 5900) < 0) return -1; - if ((listen = virDomainGraphicsGetListen(def->graphics[0], 0)) && - listen->address && - xenConfigSetString(conf, "vnclisten", listen->address) < 0) + if ((gListen = virDomainGraphicsGetListen(def->graphics[0], 0)) && + gListen->address && + xenConfigSetString(conf, "vnclisten", gListen->address) < 0) return -1; if (def->graphics[0]->data.vnc.auth.passwd && @@ -1674,7 +1674,7 @@ xenFormatVfb(virConfPtr conf, virDomainDefPtr def) virBufferAsprintf(&buf, ",xauthority=%s", def->graphics[0]->data.sdl.xauth); } else { - virDomainGraphicsListenDefPtr listen + virDomainGraphicsListenDefPtr gListen = virDomainGraphicsGetListen(def->graphics[0], 0); virBufferAddLit(&buf, "type=vnc"); @@ -1683,8 +1683,8 @@ xenFormatVfb(virConfPtr conf, virDomainDefPtr def) if (!def->graphics[0]->data.vnc.autoport) virBufferAsprintf(&buf, ",vncdisplay=%d", def->graphics[0]->data.vnc.port - 5900); - if (listen && listen->address) - virBufferAsprintf(&buf, ",vnclisten=%s", listen->address); + if (gListen && gListen->address) + virBufferAsprintf(&buf, ",vnclisten=%s", gListen->address); if (def->graphics[0]->data.vnc.auth.passwd) virBufferAsprintf(&buf, ",vncpasswd=%s", def->graphics[0]->data.vnc.auth.passwd); diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index 7211314..2677510 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -1523,7 +1523,7 @@ static int xenFormatSxprGraphicsNew(virDomainGraphicsDefPtr def, virBufferPtr buf) { - virDomainGraphicsListenDefPtr listen; + virDomainGraphicsListenDefPtr gListen; if (def->type != VIR_DOMAIN_GRAPHICS_TYPE_SDL && def->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { @@ -1551,9 +1551,9 @@ xenFormatSxprGraphicsNew(virDomainGraphicsDefPtr def, virBufferAsprintf(buf, "(vncdisplay %d)", def->data.vnc.port-5900); } - if ((listen = virDomainGraphicsGetListen(def, 0)) && - listen->address) - virBufferAsprintf(buf, "(vnclisten '%s')", listen->address); + if ((gListen = virDomainGraphicsGetListen(def, 0)) && + gListen->address) + virBufferAsprintf(buf, "(vnclisten '%s')", gListen->address); if (def->data.vnc.auth.passwd) virBufferAsprintf(buf, "(vncpasswd '%s')", def->data.vnc.auth.passwd); if (def->data.vnc.keymap) @@ -1579,7 +1579,7 @@ xenFormatSxprGraphicsNew(virDomainGraphicsDefPtr def, static int xenFormatSxprGraphicsOld(virDomainGraphicsDefPtr def, virBufferPtr buf) { - virDomainGraphicsListenDefPtr listen; + virDomainGraphicsListenDefPtr gListen; if (def->type != VIR_DOMAIN_GRAPHICS_TYPE_SDL && def->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { @@ -1604,9 +1604,9 @@ xenFormatSxprGraphicsOld(virDomainGraphicsDefPtr def, virBufferPtr buf) virBufferAsprintf(buf, "(vncdisplay %d)", def->data.vnc.port-5900); } - if ((listen = virDomainGraphicsGetListen(def, 0)) && - listen->address) - virBufferAsprintf(buf, "(vnclisten '%s')", listen->address); + if ((gListen = virDomainGraphicsGetListen(def, 0)) && + gListen->address) + virBufferAsprintf(buf, "(vnclisten '%s')", gListen->address); if (def->data.vnc.auth.passwd) virBufferAsprintf(buf, "(vncpasswd '%s')", def->data.vnc.auth.passwd); if (def->data.vnc.keymap) diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index b72e255..b5d4da1 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -837,7 +837,7 @@ xenFormatXLDomainDisks(virConfPtr conf, virDomainDefPtr def) static int xenFormatXLSpice(virConfPtr conf, virDomainDefPtr def) { - virDomainGraphicsListenDefPtr listen; + virDomainGraphicsListenDefPtr gListen; virDomainGraphicsDefPtr graphics; if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { @@ -854,9 +854,9 @@ xenFormatXLSpice(virConfPtr conf, virDomainDefPtr def) if (xenConfigSetInt(conf, "spice", 1) < 0) return -1; - if ((listen = virDomainGraphicsGetListen(graphics, 0)) && - listen->address && - xenConfigSetString(conf, "spicehost", listen->address) < 0) + if ((gListen = virDomainGraphicsGetListen(graphics, 0)) && + gListen->address && + xenConfigSetString(conf, "spicehost", gListen->address) < 0) return -1; if (xenConfigSetInt(conf, "spiceport", -- 2.8.1

1 0

[libvirt] [PATCH] vz: correct iomode check
by Mikhail Feoktistov 13 Apr '16

13 Apr '16

Virtuozzo hypervisor supports native iomode. So we should allow to add disk with iomode "native" or "default". --- src/vz/vz_utils.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index fed48a5..a89cf73 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -332,9 +332,10 @@ vzCheckDiskUnsupportedParams(virDomainDiskDefPtr disk) return -1; } - if (disk->iomode) { + if (disk->iomode != VIR_DOMAIN_DISK_IO_DEFAULT && + disk->iomode != VIR_DOMAIN_DISK_IO_NATIVE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Setting disk io mode is not " + _("Only native iomode is " "supported by vz driver.")); return -1; } -- 1.8.3.1

2 1

[libvirt] [PATCH] rpc: daemon: Fix virtlog/virtlock daemon reload
by Cole Robinson 13 Apr '16

13 Apr '16

Trying to reload/SIGUSR1 virtlogd or virtlockd fails with: error : virNetDaemonRun:747 : internal error: Not all servers restored, cannot run server Commit 252610f7 changed the daemon state json to allow tracking multiple servers. However it missed clearing dmn->srvObject after the json is empty, like the previous code paths handled. Later on in virNewDaemonRun, dmn->srvObject is expected to be empty otherwise we throw the above error. https://bugzilla.redhat.com/show_bug.cgi?id=1311013 --- src/rpc/virnetdaemon.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index c99914d..dcc89fa 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -293,6 +293,10 @@ virNetDaemonAddServerPostExec(virNetDaemonPtr dmn, goto error; } + if (virJSONValueObjectKeysNumber(dmn->srvObject) == 0) { + virJSONValueFree(dmn->srvObject); + dmn->srvObject = NULL; + } } srv = virNetServerNewPostExecRestart(object, -- 2.7.3

2 1

[libvirt] [PATCH 0/2] workaround bogus GCC
by Pavel Hrdina 13 Apr '16

13 Apr '16

This combines Eric's and Cole's ideas together with configure check for GCC that is affected by https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602. Pavel Hrdina (2): build: cleanup GCC < 4.6 -Wlogical-op workaround build: add GCC 6.0 -Wlogical-op workaround m4/virt-compile-warnings.m4 | 22 +++++++++++++++++++++- src/fdstream.c | 4 ++++ src/internal.h | 22 ++++++++++++++++++++++ src/rpc/virnetsshsession.c | 6 ++++++ src/security/security_selinux.c | 2 ++ src/util/virbuffer.c | 11 +++-------- src/util/virstring.c | 9 +-------- src/util/virsysinfo.c | 13 ++----------- 8 files changed, 61 insertions(+), 28 deletions(-) -- 2.8.1

2 6

[libvirt] [PATCH 0/3] qemu: Fix hotplug of guest agent
by Martin Kletzander 13 Apr '16

13 Apr '16

Martin Kletzander (3): qemuhotplugtest: Allow testing of live data qemu: Move channel path generation out of command creation qemu: Generate channel target paths on hotplug as well src/qemu/qemu_command.c | 25 ++-------- src/qemu/qemu_command.h | 5 +- src/qemu/qemu_domain.c | 19 +++++++ src/qemu/qemu_domain.h | 4 ++ src/qemu/qemu_hotplug.c | 3 ++ src/qemu/qemu_process.c | 12 +++-- tests/qemuhotplugtest.c | 42 ++++++++++++---- .../qemuhotplug-hotplug-base+qemu-agent-detach.xml | 58 ++++++++++++++++++++++ .../qemuhotplug-hotplug-base+qemu-agent.xml | 58 ++++++++++++++++++++++ .../qemuhotplug-qemu-agent-detach.xml | 5 ++ .../qemuhotplugtestdata/qemuhotplug-qemu-agent.xml | 5 ++ 11 files changed, 197 insertions(+), 39 deletions(-) create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+qemu-agent-detach.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-hotplug-base+qemu-agent.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-qemu-agent-detach.xml create mode 100644 tests/qemuhotplugtestdata/qemuhotplug-qemu-agent.xml -- 2.8.0

2 10

[libvirt] [PATCH] QXL: fix reloading of vram64 attribute
by Pavel Hrdina 13 Apr '16

13 Apr '16

Commit b4a5fd95 introduced vram64 attribute for QXL video device but there were two issues. Only function qemuMonitorJSONUpdateVideoVram64Size should update the vram64 attribute and also the value is in MiB, not in B. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e140d0e..d068c3d 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1437,17 +1437,6 @@ qemuMonitorJSONUpdateVideoMemorySize(qemuMonitorPtr mon, } video->vram = prop.val.ul / 1024; - if (video->vram64 != 0) { - if (qemuMonitorJSONGetObjectProperty(mon, path, - "vram64_size_mb", &prop) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("QOM Object '%s' has no property 'vram64_size_mb'"), - path); - return -1; - } - video->vram64 = prop.val.ul / 1024; - } - if (qemuMonitorJSONGetObjectProperty(mon, path, "ram_size", &prop) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("QOM Object '%s' has no property 'ram_size'"), @@ -1509,7 +1498,7 @@ qemuMonitorJSONUpdateVideoVram64Size(qemuMonitorPtr mon, path); return -1; } - video->vram64 = prop.val.ul / 1024; + video->vram64 = prop.val.ul * 1024; } break; case VIR_DOMAIN_VIDEO_TYPE_VGA: -- 2.8.1

2 1

[libvirt] [PATCH 0/2] Fix VIR_TEST_REGENERATE_OUTPUT in tests
by Ján Tomko 13 Apr '16

13 Apr '16

Instead of the proper solution of moving all the host-changing stuff out of qemuBuildCommandLine, separate one helper for easier mocking. Ján Tomko (2): qemuExecuteEthernetScript: move to util qemuxml2argvtest: do not mock virCommand src/libvirt_private.syms | 1 + src/qemu/qemu_interface.c | 29 +---------------------------- src/util/virnetdev.c | 29 +++++++++++++++++++++++++++++ src/util/virnetdev.h | 2 ++ tests/qemuxml2argvmock.c | 7 ++----- 5 files changed, 35 insertions(+), 33 deletions(-) -- 2.7.3

3 4

[libvirt] [PATCH] tests: Fix VIR_TEST_REGENERATE_OUTPUT
by Cole Robinson 13 Apr '16

13 Apr '16

commit 950a90d489 mocked some virCommand handling for the qemu tests, but we were using that in the test suite to call test-wrap-argv.pl for regenerating test output. Switch the generator code to just use system() instead --- tests/testutils.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index a0ce4b6..4f3e67b 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -434,24 +434,15 @@ virTestRewrapFile(const char *filename) { int ret = -1; char *outbuf = NULL; - char *script = NULL; - virCommandPtr cmd = NULL; + char *cmd = NULL; - if (virAsprintf(&script, "%s/test-wrap-argv.pl", abs_srcdir) < 0) + if (virAsprintf(&cmd, "echo \"$(%s/test-wrap-argv.pl %s)\" > %s", + abs_srcdir, filename, filename) < 0) goto cleanup; - cmd = virCommandNewArgList(script, filename, NULL); - virCommandSetOutputBuffer(cmd, &outbuf); - if (virCommandRun(cmd, NULL) < 0) - goto cleanup; - - if (virFileWriteStr(filename, outbuf, 0666) < 0) - goto cleanup; - - ret = 0; + ret = system(cmd); cleanup: - VIR_FREE(script); - virCommandFree(cmd); + VIR_FREE(cmd); VIR_FREE(outbuf); return ret; } -- 2.7.3

3 3

[libvirt] [PATCH 0/7] Add notification for memory hot-unplug failure
by Peter Krempa 13 Apr '16

13 Apr '16

Add a new libvirt event VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED that will handle failure to unplug a device if we are certain that it will not be unplugged and wire up the ACPI_DEVICE_OST qemu event that is emitted on memory hotunplug failure so that the event is propagated and the API fails in such case. Along with that a few refactors were necessary. Peter Krempa (7): qemu: hotplug: Properly handle errors in qemuDomainWaitForDeviceRemoval qemu: hotplug: Refactor semantics of qemuDomainWaitForDeviceRemoval qemu: Use domain condition for device removal singalling qemu: hotplug: Add support for signalling device unplug failure Add VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED event qemu: monitor: Add support for ACPI_DEVICE_OST event handling qemu: process: Wire up ACPI OST events to notify users of failed memory unplug daemon/remote.c | 36 +++++++++++++ include/libvirt/libvirt-domain.h | 21 ++++++++ src/conf/domain_event.c | 84 ++++++++++++++++++++++++++++++ src/conf/domain_event.h | 7 +++ src/libvirt_private.syms | 2 + src/qemu/qemu_domain.c | 4 -- src/qemu/qemu_domain.h | 18 ++++++- src/qemu/qemu_hotplug.c | 110 +++++++++++++++++---------------------- src/qemu/qemu_hotplug.h | 3 +- src/qemu/qemu_monitor.c | 19 +++++++ src/qemu/qemu_monitor.h | 18 +++++++ src/qemu/qemu_monitor_json.c | 39 ++++++++++++++ src/qemu/qemu_process.c | 71 ++++++++++++++++++++++++- src/remote/remote_driver.c | 30 +++++++++++ src/remote/remote_protocol.x | 14 ++++- src/remote_protocol-structs | 6 +++ tools/virsh-domain.c | 18 +++++++ 17 files changed, 428 insertions(+), 72 deletions(-) -- 2.8.0

2 18

[libvirt] [PATCH 0/4] Test cleanups
by Ján Tomko 13 Apr '16

13 Apr '16

Noticed these while I was trying to look for an easy solution to the VIR_TEST_REGENERATE_OUTPUT problem. Ján Tomko (4): drop qemuBuildCommandLineCallbacks tests: clean up includes qemuxml2argvtest: drop FLAG_EXPECT_ERROR qemu: assign addresses before aliases src/qemu/qemu_command.c | 35 +++++++++++------------------------ src/qemu/qemu_command.h | 18 ++---------------- src/qemu/qemu_hotplug.c | 3 +-- src/qemu/qemu_process.c | 29 ++++++++++++++--------------- tests/qemuxml2argvtest.c | 35 ++++++++++------------------------- tests/qemuxml2xmltest.c | 2 +- tests/testutilsqemu.c | 19 ------------------- tests/testutilsqemu.h | 3 +-- 8 files changed, 40 insertions(+), 104 deletions(-) -- 2.7.3

2 8

[libvirt] backport politics to redhat/centos
by Vasiliy Tolstov 13 Apr '16

13 Apr '16

Hi! I'm need to use CentOS for some project and i want to not modify all my stuff (i'm use plain ethernet devices with bird routing daemon). CentOS have libvirt 1.2.17, does redhat in near feature want to backport my ethernet changes to main branches or not? Sorry for my questions. -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

3 4

[libvirt] [PATCH 00/18] cleanup of graphics code
by Pavel Hrdina 13 Apr '16

13 Apr '16

Pavel Hrdina (18): tests: remove unwanted VIR_FREE of spice and vnc default listen docs: rewrite graphics XML documentation domain_conf: introduce virDomainGraphicsListensParseXML domain_conf: cleanup virDomainGraphicsListensParseXML domain_conf: split graphics xml parser into multiple functions domain_conf: cleanup error paths for graphics parser domain_conf: introduce virDomainGraphicsListenAddAddress domain_conf: introduce virDomainGraphicsListenAddNetwork domain_conf: remove unused virDomainGraphicsListenSetType domain_conf: cleanup virDomainGraphicsGetListen use virDomainGraphicsGetListen instead of the other getters domain_conf: cleanup virDomainGraphicsListenDefParseXML domain_conf: remove unused virDomainGraphicsListenGet* domain_conf: call ...ListensParseXML only for appropriate graphics qemu_process: generate vnc unix socket in qemuProcessPrepareDomain qemu_process: move listen code out of qemuProcessSetupGraphics domain_conf: introduce virDomainGraphicsListenClear qemu_domain: remove all listens if vncAutoUnixSocket is enabled docs/formatdomain.html.in | 351 +++--- src/conf/domain_conf.c | 1163 ++++++++++---------- src/conf/domain_conf.h | 24 +- src/libvirt_private.syms | 10 +- src/libxl/libxl_conf.c | 15 +- src/qemu/qemu_command.c | 120 +- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_domain.c | 10 + src/qemu/qemu_migration.c | 9 +- src/qemu/qemu_parse_command.c | 4 +- src/qemu/qemu_process.c | 69 +- src/vbox/vbox_common.c | 14 +- src/vmx/vmx.c | 9 +- src/vz/vz_sdk.c | 11 +- src/xenconfig/xen_common.c | 28 +- src/xenconfig/xen_sxpr.c | 20 +- src/xenconfig/xen_xl.c | 12 +- .../qemuxml2argv-graphics-spice-timeout.args | 2 +- ...-graphics-vnc-auto-unix-socket-with-listen.args | 22 + ...v-graphics-vnc-auto-unix-socket-with-listen.xml | 36 + ...qemuxml2argv-graphics-vnc-auto-unix-socket.args | 22 + .../qemuxml2argv-graphics-vnc-auto-unix-socket.xml | 34 + tests/qemuxml2argvtest.c | 8 +- 23 files changed, 1051 insertions(+), 945 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-unix-socket-with-listen.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-unix-socket-with-listen.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-unix-socket.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-unix-socket.xml -- 2.7.4

3 42

[libvirt] [PATCH 0/2] host-validate: Don't build on Windows
by Andrea Bolognani 13 Apr '16

13 Apr '16

The recent fixes to virt-host-validate have caused the mingw build to fail[1]. Instead of working around Windows' quirks in the tool, just stop building it altogether - it's not like it made any sense to have it available on that OS anyway. Cheers. [1] https://ci.centos.org/view/libvirt-project/job/libvirt-mingw/1496/ Andrea Bolognani (2): tools: Reorganize conditional bits configure: Make virt-host-validate optional configure.ac | 29 ++++++++++++++++++----------- m4/virt-host-validate.m4 | 40 ++++++++++++++++++++++++++++++++++++++++ tools/Makefile.am | 35 ++++++++++++++++++----------------- 3 files changed, 76 insertions(+), 28 deletions(-) create mode 100644 m4/virt-host-validate.m4 -- 2.5.5

3 9