- Devel - libvirt List Archives

[libvirt] [PATCH V3][TCK] Add test for memory set and get
by Kyla Zhang 08 Aug '12

08 Aug '12

Add test for memory/maxmem setting and getting on domain active/inactive --- scripts/domain/110-memory-balloon.t | 113 +++++++++++++++++++++++++++++++++++ 1 files changed, 113 insertions(+), 0 deletions(-) create mode 100644 scripts/domain/110-memory-balloon.t diff --git a/scripts/domain/110-memory-balloon.t b/scripts/domain/110-memory-balloon.t new file mode 100644 index 0000000..a3e463c --- /dev/null +++ b/scripts/domain/110-memory-balloon.t @@ -0,0 +1,113 @@ +# -*- perl -*- +# +# Copyright (C) 2012-2013 Red Hat, Inc. +# Copyright (C) 2012-2013 Kyla Zhang <weizhan(a)redhat.com> +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +=pod + +=head1 NAME + +domain/110-memory-balloon.t: test setting and getting memory/max memory + +=head1 DESCRIPTION + +The testcase validates the basic function of domain memory balloon via setting +its value of current memory, max memory. + +=cut + +use strict; +use warnings; + +use Test::More tests => 15; + +use Sys::Virt::TCK; +use Sys::Virt::TCK::NetworkHelpers; +use Test::Exception; +use File::Spec::Functions qw(catfile catdir rootdir); + +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { $tck->cleanup if $tck; } + +diag "Define a new real domain, default memory is 1048576"; +my $dom_name ="tckmemballoon"; +my $default_mem = 1048576; +my $max_mem1 = 1572864; +my $max_mem2 = 1148576; +my $config_mem = 924288; +my $live_mem = 824288; +my $current_mem = 724288; + +# Install a guest with default memory size +my $dom = prepare_test_disk_and_vm($tck, $conn, $dom_name); + + +diag "Set max memory for inactive domain"; +lives_ok(sub { $dom->set_max_memory("$max_mem1") }, "Set max memory $max_mem1"); +diag "Get max memory from inactive domain"; +is($dom->get_max_memory(), $max_mem1, "Get max memory $max_mem1"); + + +diag "Start domain"; +$dom->create; +ok($dom->get_id() > 0, "running domain has an ID > 0"); +sleep(30); + +diag "Get max memory for domain when domain is active"; +is($dom->get_max_memory(), $max_mem1, "Get max memory is $max_mem1"); + + +diag "Set memory with flag MEM_CONFIG"; +lives_ok(sub { $dom->set_memory("$config_mem", Sys::Virt::Domain::MEM_CONFIG) }, + "Set persistent memory value $config_mem"); +diag "Get current memory"; +is($dom->get_info()->{memory}, $default_mem, "Get current memory is $default_mem"); + + +diag "Set memory with flag MEM_CURRENT"; +lives_ok(sub { $dom->set_memory("$current_mem", Sys::Virt::Domain::MEM_CURRENT) }, + "Set current memory value $current_mem"); +sleep(3); +diag "Get current memory"; +is($dom->get_info()->{memory}, $current_mem, "Get current memory is $current_mem"); + + +diag "Set memory with flag MEM_LIVE"; +lives_ok(sub { $dom->set_memory("$live_mem", Sys::Virt::Domain::MEM_LIVE) }, + "Set live memory value $live_mem"); +sleep(3); +diag "Get current memory"; +is($dom->get_info()->{memory}, $live_mem, "Get current memory is $live_mem"); + + +diag "Set max memory for running domain"; +ok_error(sub { $dom->set_max_memory("$default_mem") }, "Not allowed to set max memory for running domain"); + +diag "Destroy domain"; +$dom->destroy; + +diag "Get current memory"; +is($dom->get_info()->{memory}, $config_mem, "Get current memory is $config_mem"); + + +diag "Set max memory with set_memory"; +lives_ok(sub { $dom->set_memory("$max_mem2", Sys::Virt::Domain::MEM_MAXIMUM) }, + "Set max memory $max_mem2"); +diag "Get max memory"; +is($dom->get_info()->{maxMem}, $max_mem2, "Get max memory is $max_mem2"); + + +diag "Setting memory with flag MEM_LIVE for inactive domain"; +ok_error(sub { $dom->set_memory("$live_mem", Sys::Virt::Domain::MEM_LIVE) }, + "Not allowed to set memory with flag MEM_LIVE for inactive domain"); -- 1.7.1

3 2

[libvirt] [PATCH V3] Add proxy FS support to libvirt
by M. Mohan Kumar 08 Aug '12

08 Aug '12

From: "M. Mohan Kumar" <mohan(a)in.ibm.com> A new FS driver type 'proxy' is added to QEMU 9p server. This patch adds support for using proxy FS driver from libvirt. QEMU proxy FS driver uses socket for communicating between helper and qemu proxy FS driver. Proxy helper (a stand alone binary part of qemu) is invoked with one of the descriptors created using socketpair call and the share path. Similarly QEMU is invoked with another descriptor created using the same socketpair system call and with other required FS driver parameters. Need for proxy FS driver ======================== Pass through security model in QEMU 9p server has following issues: 1) TOCTTOU vulnerability: Following symbolic links in the server could provide access to files beyond 9p export path. 2) Running QEMU with root privilege could be a security issue (pass through security model needs root privilege). Proxy FS driver is implemented to solve these issues. Proxy FS uses chroot + socket combination for securing the vulnerability known with following symbolic links. Intention of adding a new filesystem type is to allow qemu to run in non-root mode, but doing privileged operations in a chroot environment using socket IO. Proxy helper is invoked with root privileges and chroots into 9p export path. QEMU proxy fs driver sends filesystem request to proxy helper and receives the response from it. Proxy helper is designed such a way that it needs only few capabilities related to filesystem operations (such as CAP_DAC_OVERRIDE, CAP_FOWNER, etc) and all other capabilities are dropped (CAP_SYS_CHROOT, etc) Proxy patches http://permalink.gmane.org/gmane.comp.emulators.qemu/128735 Signed-off-by: M. Mohan Kumar <mohan(a)in.ibm.com> --- Changes from V2 * Rebased on top of current libvirt git level Changes from previous version * Remove the xml node for specifying the virtfs-proxy-helper path, now it is determined from qemu binary path. docs/formatdomain.html.in | 2 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 2 +- src/qemu/qemu_capabilities.c | 5 ++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 71 ++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_command.h | 3 +- tests/qemuhelptest.c | 6 ++- 8 files changed, 83 insertions(+), 10 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f97c630..7242455 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1619,6 +1619,8 @@ while the value <code>immediate</code> means that a host writeback is immediately triggered for all pages touched during a guest file write operation <span class="since">(since 0.9.10)</span>. + or <code>type='proxy'</code> <span class="since">(since + 1.0)</span>. </dd> <dt><code>type='template'</code></dt> <dd> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 58603a3..70b145d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -273,7 +273,8 @@ VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, VIR_ENUM_IMPL(virDomainFSDriverType, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "default", "path", - "handle") + "handle", + "proxy") VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_ACCESSMODE_LAST, "passthrough", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f4c43c6..6ea62a3 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -675,6 +675,7 @@ enum virDomainFSDriverType { VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT = 0, VIR_DOMAIN_FS_DRIVER_TYPE_PATH, VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE, + VIR_DOMAIN_FS_DRIVER_TYPE_PROXY, VIR_DOMAIN_FS_DRIVER_TYPE_LAST }; @@ -713,7 +714,6 @@ struct _virDomainFSDef { unsigned long long space_soft_limit; /* in bytes */ }; - /* 5 different types of networking config */ enum virDomainNetType { VIR_DOMAIN_NET_TYPE_USER, diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 85c49a2..d582549 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -144,7 +144,6 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "ich9-ahci", "no-acpi", "fsdev-readonly", - "virtio-blk-pci.scsi", /* 80 */ "blk-sg-io", "drive-copy-on-read", @@ -168,7 +167,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "nec-usb-xhci", "virtio-s390", "balloon-event", - + "fsdev-proxy", /* 100 */ ); struct qemu_feature_flags { @@ -1129,6 +1128,8 @@ qemuCapsComputeCmdFlags(const char *help, qemuCapsSet(flags, QEMU_CAPS_FSDEV_READONLY); if (strstr(fsdev, "writeout")) qemuCapsSet(flags, QEMU_CAPS_FSDEV_WRITEOUT); + if (strstr(fsdev, "sock_fd")) + qemuCapsSet(flags, QEMU_CAPS_FSDEV_PROXY); } if (strstr(help, "-smbios type")) qemuCapsSet(flags, QEMU_CAPS_SMBIOS_TYPE); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index e8251dc..e48d623 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -135,6 +135,7 @@ enum qemuCapsFlags { QEMU_CAPS_NEC_USB_XHCI = 97, /* -device nec-usb-xhci */ QEMU_CAPS_VIRTIO_S390 = 98, /* -device virtio-*-s390 */ QEMU_CAPS_BALLOON_EVENT = 99, /* Async event for balloon changes */ + QEMU_CAPS_FSDEV_PROXY = 100, /* -fsdev proxy supported */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6ad65a6..af689f8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -44,6 +44,7 @@ #include <sys/utsname.h> #include <sys/stat.h> #include <fcntl.h> +#include <libgen.h> #define VIR_FROM_THIS VIR_FROM_QEMU @@ -114,7 +115,8 @@ VIR_ENUM_DECL(qemuDomainFSDriver) VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "local", "local", - "handle"); + "handle", + "proxy"); static void @@ -2575,9 +2577,43 @@ error: return NULL; } +/* + * Invokes the Proxy Helper with one of the socketpair as its parameter + * + */ +static int qemuInvokeProxyHelper(const char *emulator, int sock, const char *path) +{ +#define HELPER "virtfs-proxy-helper" + int ret_val, status; + virCommandPtr cmd; + char *helper, *dname; + + dname = dirname(strdup(emulator)); + if (virAsprintf(&helper, "%s/%s", dname, HELPER) < 0) { + VIR_FREE(dname); + virReportOOMError(); + return -1; + } + + cmd = virCommandNewArgList(helper, NULL); + virCommandAddArg(cmd, "-f"); + virCommandAddArgFormat(cmd, "%d", sock); + virCommandAddArg(cmd, "-p"); + virCommandAddArgFormat(cmd, "%s", path); + virCommandTransferFD(cmd, sock); + virCommandDaemonize(cmd); + ret_val = virCommandRun(cmd, &status); + if (ret_val < 0) + virReportError(VIR_ERR_INTERNAL_ERROR, + _("%s can't execute"), helper); + virCommandFree(cmd); + VIR_FREE(helper); + VIR_FREE(dname); + return ret_val; +} char *qemuBuildFSStr(virDomainFSDefPtr fs, - virBitmapPtr qemuCaps ATTRIBUTE_UNUSED) + virBitmapPtr qemuCaps ATTRIBUTE_UNUSED, int qemuSocket) { virBuffer opt = VIR_BUFFER_INITIALIZER; const char *driver = qemuDomainFSDriverTypeToString(fs->fsdriver); @@ -2626,6 +2662,10 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, } virBufferAsprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); + + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PROXY) + virBufferAsprintf(&opt, ",sock_fd=%d", qemuSocket); + virBufferAsprintf(&opt, ",path=%s", fs->src); if (fs->readonly) { @@ -5081,10 +5121,35 @@ qemuBuildCommandLine(virConnectPtr conn, if (qemuCapsGet(qemuCaps, QEMU_CAPS_FSDEV)) { for (i = 0 ; i < def->nfss ; i++) { char *optstr; + int sockets[2] = {-1, -1}; virDomainFSDefPtr fs = def->fss[i]; + /* + * If its a proxy FS, we need to create a socket pair + * and invoke proxy_helper + */ + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PROXY) { + if (qemuCapsGet(qemuCaps, QEMU_CAPS_FSDEV_PROXY) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("proxy helper not supported")); + goto error; + } + /* create a socket pair */ + if (socketpair(PF_UNIX, SOCK_STREAM, 0, sockets) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("socketpair failed")); + goto error; + } + virCommandTransferFD(cmd, sockets[1]); + if (qemuInvokeProxyHelper(def->emulator, sockets[0], + fs->src) < 0) { + VIR_FORCE_CLOSE(sockets[0]); + VIR_FORCE_CLOSE(sockets[1]); + goto error; + } + } virCommandAddArg(cmd, "-fsdev"); - if (!(optstr = qemuBuildFSStr(fs, qemuCaps))) + if (!(optstr = qemuBuildFSStr(fs, qemuCaps, sockets[1]))) goto error; virCommandAddArg(cmd, optstr); VIR_FREE(optstr); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 3ccf4d7..5de7751 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -87,7 +87,8 @@ char *qemuBuildDriveStr(virConnectPtr conn, bool bootable, virBitmapPtr qemuCaps); char *qemuBuildFSStr(virDomainFSDefPtr fs, - virBitmapPtr qemuCaps); + virBitmapPtr qemuCaps, + int qemuSocket); /* Current, best practice */ char * qemuBuildDriveDevStr(virDomainDefPtr def, diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 012ba26..6485c5f 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -677,7 +677,8 @@ mymain(void) QEMU_CAPS_FSDEV_WRITEOUT, QEMU_CAPS_SCSI_BLOCK, QEMU_CAPS_SCSI_CD, - QEMU_CAPS_IDE_CD); + QEMU_CAPS_IDE_CD, + QEMU_CAPS_FSDEV_PROXY); DO_TEST("qemu-1.1.0", 1001000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -754,7 +755,8 @@ mymain(void) QEMU_CAPS_IDE_CD, QEMU_CAPS_NO_USER_CONFIG, QEMU_CAPS_HDA_MICRO, - QEMU_CAPS_NEC_USB_XHCI); + QEMU_CAPS_NEC_USB_XHCI, + QEMU_CAPS_FSDEV_PROXY); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.7.7.6

2 2

[libvirt] [PATCH 0/3 v2] Add lsi and virtio-scsi qemu caps
by Guannan Ren 08 Aug '12

08 Aug '12

Add two capabilities flags for the model of scsi controller LSI and virtio-scsi. Use the lsilogic model by default, if current QEMU supports doesn't it, raise an error. When scsi model is given in XML explicitly, we try to check if the underlying QEMU supports it or not, raise an error on checking failure. Guannan Ren(3) qemu: add capabilities flags related to scsi controller qemu: add two qemu caps for lsi and virtio-scsi SCSI add lsi and virtio-scsi qemu caps in testcases. src/qemu/qemu_capabilities.c | 7 +++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 106 +++++++++++++++++++++++++++++++---------- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_process.c | 9 ++- tests/qemuhelptest.c | 10 +++- tests/qemuxml2argvtest.c | 16 ++++-- 7 files changed, 114 insertions(+), 39 deletions(-)

3 14

[libvirt] [PATCH 1/5] add timeout seconds to qemuAgentSend()
by MATSUDA, Daiki 08 Aug '12

08 Aug '12

Add @seconds valuable to qemuAgentSend(). It points timeout seconds on @timeout true. If @seconds is 0 on @timeout true, use default timeout value (QEMU_AGENT_WAIT_TIME). If @timeout is false, @seconds is meanless. qemu_agent.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 15af758..7699042 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -837,6 +837,7 @@ void qemuAgentClose(qemuAgentPtr mon) * @mon: Monitor * @msg: Message * @timeout: use timeout? + * @seconds: timeout seconds. if 0 on @timeout true, use default value * * Send @msg to agent @mon. * Wait max QEMU_AGENT_WAIT_TIME for agent @@ -848,7 +849,8 @@ void qemuAgentClose(qemuAgentPtr mon) */ static int qemuAgentSend(qemuAgentPtr mon, qemuAgentMessagePtr msg, - bool timeout) + bool timeout, + int seconds) { int ret = -1; unsigned long long now, then = 0; @@ -864,7 +866,7 @@ static int qemuAgentSend(qemuAgentPtr mon, if (timeout) { if (virTimeMillisNow(&now) < 0) return -1; - then = now + QEMU_AGENT_WAIT_TIME; + then = now + (seconds == 0 ? QEMU_AGENT_WAIT_TIME : seconds * 1000); } mon->msg = msg; @@ -937,7 +939,7 @@ qemuAgentGuestSync(qemuAgentPtr mon) VIR_DEBUG("Sending guest-sync command with ID: %llu", id); - send_ret = qemuAgentSend(mon, &sync_msg, true); + send_ret = qemuAgentSend(mon, &sync_msg, true, 0); VIR_DEBUG("qemuAgentSend returned: %d", send_ret); @@ -977,7 +979,8 @@ cleanup: static int qemuAgentCommand(qemuAgentPtr mon, virJSONValuePtr cmd, - virJSONValuePtr *reply) + virJSONValuePtr *reply, + int timeout) { int ret = -1; qemuAgentMessage msg; @@ -1005,7 +1008,7 @@ qemuAgentCommand(qemuAgentPtr mon, VIR_DEBUG("Send command '%s' for write", cmdstr); - ret = qemuAgentSend(mon, &msg, false); + ret = qemuAgentSend(mon, &msg, (timeout > 0 ? true : false), timeout); VIR_DEBUG("Receive command reply ret=%d rxObject=%p", ret, msg.rxObject); @@ -1283,7 +1286,7 @@ int qemuAgentShutdown(qemuAgentPtr mon, return -1; mon->await_event = QEMU_AGENT_EVENT_SHUTDOWN; - ret = qemuAgentCommand(mon, cmd, &reply); + ret = qemuAgentCommand(mon, cmd, &reply, 0); if (reply && ret == 0) ret = qemuAgentCheckError(cmd, reply); @@ -1315,7 +1318,7 @@ int qemuAgentFSFreeze(qemuAgentPtr mon) if (!cmd) return -1; - if (qemuAgentCommand(mon, cmd, &reply) < 0 || + if (qemuAgentCommand(mon, cmd, &reply, 0) < 0 || qemuAgentCheckError(cmd, reply) < 0) goto cleanup; @@ -1352,7 +1355,7 @@ int qemuAgentFSThaw(qemuAgentPtr mon) if (!cmd) return -1; - if (qemuAgentCommand(mon, cmd, &reply) < 0 || + if (qemuAgentCommand(mon, cmd, &reply, 0) < 0 || qemuAgentCheckError(cmd, reply) < 0) goto cleanup; @@ -1389,7 +1392,7 @@ qemuAgentSuspend(qemuAgentPtr mon, return -1; mon->await_event = QEMU_AGENT_EVENT_SUSPEND; - ret = qemuAgentCommand(mon, cmd, &reply); + ret = qemuAgentCommand(mon, cmd, &reply, 0); if (reply && ret == 0) ret = qemuAgentCheckError(cmd, reply);

2 1

[libvirt] [PATCH] rpc: fix a virObject typo error in struct _virNetServer
by Guannan Ren 08 Aug '12

08 Aug '12

This typo will crash libvirtd when it recevies signal SIGINT --- src/rpc/virnetserver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index a1ea038..15abb56 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -64,7 +64,7 @@ struct _virNetServerJob { }; struct _virNetServer { - virObjectPtr object; + virObject object; virMutex lock; -- 1.7.7.6

2 2

[libvirt] [PATCH v6 0/6] file descriptor passing using fd sets
by Corey Bryant 08 Aug '12

08 Aug '12

libvirt's sVirt security driver provides SELinux MAC isolation for Qemu guest processes and their corresponding image files. In other words, sVirt uses SELinux to prevent a QEMU process from opening files that do not belong to it. sVirt provides this support by labeling guests and resources with security labels that are stored in file system extended attributes. Some file systems, such as NFS, do not support the extended attribute security namespace, and therefore cannot support sVirt isolation. A solution to this problem is to provide fd passing support, where libvirt opens files and passes file descriptors to QEMU. This, along with SELinux policy to prevent QEMU from opening files, can provide image file isolation for NFS files stored on the same NFS mount. This patch series adds the add-fd, remove-fd, and query-fdsets QMP monitor commands, which allow file descriptors to be passed via SCM_RIGHTS, and assigned to specified fd sets. This allows fd sets to be created per file with fds having, for example, different access rights. When QEMU needs to reopen a file with different access rights, it can search for a matching fd in the fd set. Fd sets also allow for easy tracking of fds per file, helping to prevent fd leaks. Support is also added to the block layer to allow QEMU to dup an fd from an fdset when the filename is of the /dev/fdset/nnn format, where nnn is the fd set ID. No new SELinux policy is required to prevent open of NFS files (files with type nfs_t). The virt_use_nfs boolean type simply needs to be set to false, and open will be prevented (and dup will be allowed). For example: # setsebool virt_use_nfs 0 # getsebool virt_use_nfs virt_use_nfs --> off Corey Bryant (6): qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg qapi: Introduce add-fd, remove-fd, query-fdsets monitor: Clean up fd sets on monitor disconnect block: Convert open calls to qemu_open block: Convert close calls to qemu_close block: Enable qemu_open/close to work with fd sets block/raw-posix.c | 42 ++++---- block/raw-win32.c | 6 +- block/vdi.c | 5 +- block/vmdk.c | 25 ++--- block/vpc.c | 4 +- block/vvfat.c | 16 +-- cutils.c | 5 + monitor.c | 287 ++++++++++++++++++++++++++++++++++++++++++++++++++++- monitor.h | 5 + osdep.c | 117 ++++++++++++++++++++++ qapi-schema.json | 103 +++++++++++++++++++ qemu-char.c | 12 ++- qemu-common.h | 2 + qemu-tool.c | 21 ++++ qerror.c | 4 + qerror.h | 3 + qmp-commands.hx | 126 +++++++++++++++++++++++ savevm.c | 4 +- 18 files changed, 732 insertions(+), 55 deletions(-) -- 1.7.10.4

2 13

[libvirt] [PATCH] qemu: Avoid libvirtd crash in qemuDomainObjExitAgentInternal
by Alex Jia 08 Aug '12

08 Aug '12

* src/qemu/qemu_domain.c (qemuDomainObjExitAgentInternal): fix crashing libvirtd due to derefing a NULL pointer. For details, please see bug: RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=845966 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_domain.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 86f0265..8667b6c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1136,12 +1136,14 @@ qemuDomainObjExitAgentInternal(struct qemud_driver *driver, virDomainObjPtr obj) { qemuDomainObjPrivatePtr priv = obj->privateData; - int refs; + int refs = -1; - refs = qemuAgentUnref(priv->agent); + if (priv->agent) { + refs = qemuAgentUnref(priv->agent); - if (refs > 0) - qemuAgentUnlock(priv->agent); + if (refs > 0) + qemuAgentUnlock(priv->agent); + } if (driver_locked) qemuDriverLock(driver); -- 1.7.1

2 3

[libvirt] [test-API][PATCH v2] Reconnct libvirt after libvirtd restart
by Wayne Sun 08 Aug '12

08 Aug '12

In domain_nfs_start case, libvirtd will be restarted during test, which broke existing connection. User need re-init connection in test case, for this: * New get_conn function in utils for get libvirt connection * sharemod_init in env_inspect use get_conn to get libvirt connection * In case domain_nfs_start, use get_conn to get new connectin after libvirtd restarted. Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- repos/sVirt/domain_nfs_start.py | 9 +++++++-- src/env_inspect.py | 22 ++-------------------- utils/utils.py | 29 ++++++++++++++++++++++++++++- 3 files changed, 37 insertions(+), 23 deletions(-) diff --git a/repos/sVirt/domain_nfs_start.py b/repos/sVirt/domain_nfs_start.py index 88d349c..5475945 100644 --- a/repos/sVirt/domain_nfs_start.py +++ b/repos/sVirt/domain_nfs_start.py @@ -12,7 +12,6 @@ import sys import libvirt from libvirt import libvirtError - from src import sharedmod from utils import utils from shutil import copy @@ -163,6 +162,8 @@ def domain_nfs_start(params): logger.error("Error: fail to get domain %s xml" % guestname) return 1 + conn.close() + # set env logger.info("prepare the environment") ret = prepare_env(dynamic_ownership, virt_use_nfs, guestname, \ @@ -171,6 +172,10 @@ def domain_nfs_start(params): logger.error("failed to prepare the environment") return 1 + # reconnect libvirt + conn = utils.get_conn() + sharedmod.libvirtobj['conn'] = conn + domobj = conn.lookupByName(guestname) logger.info("begin to test start domain from nfs storage") @@ -283,7 +288,7 @@ def domain_nfs_start(params): logger.error("Error: fail to get domain %s state" % guestname) return 1 - if state != "shutoff": + if state != libvirt.VIR_DOMAIN_SHUTOFF: logger.info("shut down the domain %s" % guestname) try: domobj.destroy() diff --git a/src/env_inspect.py b/src/env_inspect.py index b260ff8..2c1a701 100644 --- a/src/env_inspect.py +++ b/src/env_inspect.py @@ -20,6 +20,7 @@ import commands import libvirt import sharedmod +from utils import utils def check_libvirt(logger): virsh = 'virsh -v' @@ -68,20 +69,6 @@ def hostinfo(logger): return 1 return 0 -def request_credentials(credentials, user_data): - for credential in credentials: - if credential[0] == libvirt.VIR_CRED_AUTHNAME: - credential[4] = user_data[0] - - if len(credential[4]) == 0: - credential[4] = credential[3] - elif credential[0] == libvirt.VIR_CRED_PASSPHRASE: - credential[4] = user_data[1] - else: - return -1 - - return 0 - def sharemod_init(env_parser, logger): """ get connection object from libvirt module initialize sharemod for use by testcases @@ -89,12 +76,7 @@ def sharemod_init(env_parser, logger): uri = env_parser.get_value('variables', 'defaulturi') username = env_parser.get_value('variables', 'username') password = env_parser.get_value('variables', 'password') - user_data = [username, password] - auth = [[libvirt.VIR_CRED_AUTHNAME, libvirt.VIR_CRED_PASSPHRASE], request_credentials, user_data] - conn = libvirt.openAuth(uri, auth, 0) - if not conn: - logger.error("Failed to setup libvirt connection"); - return 1 + conn = utils.get_conn(uri, username, password) # initialize conn object in sharedmod sharedmod.libvirtobj.clear() diff --git a/utils/utils.py b/utils/utils.py index be87cdc..9167c29 100644 --- a/utils/utils.py +++ b/utils/utils.py @@ -29,6 +29,7 @@ import struct import pexpect import string import subprocess +import libvirt from xml.dom import minidom from urlparse import urlparse @@ -57,6 +58,32 @@ def get_uri(ip): uri = "qemu+ssh://%s/system" % ip return uri +def request_credentials(credentials, user_data): + for credential in credentials: + if credential[0] == libvirt.VIR_CRED_AUTHNAME: + credential[4] = user_data[0] + + if len(credential[4]) == 0: + credential[4] = credential[3] + elif credential[0] == libvirt.VIR_CRED_PASSPHRASE: + credential[4] = user_data[1] + else: + return -1 + + return 0 + +def get_conn(uri=None, username='', password=''): + """ get connection object from libvirt module + """ + user_data = [username, password] + auth = [[libvirt.VIR_CRED_AUTHNAME, libvirt.VIR_CRED_PASSPHRASE], request_credentials, user_data] + conn = libvirt.openAuth(uri, auth, 0) + if not conn: + logger.error("Failed to setup libvirt connection"); + sys.exit(1) + else: + return conn + def parse_uri(uri): # This is a simple parser for uri return urlparse(uri) @@ -501,7 +528,7 @@ def remote_exec_pexpect(hostname, username, password, cmd): elif index == 1: child.sendline(password) elif index == 2: - return string.strip(child.before) + return 0, string.strip(child.before) elif index == 3: return "TIMEOUT!!!" -- 1.7.1

1 0

[libvirt] [test-API][PATCH 1/2] Reconnct libvirt after libvirtd restart
by Wayne Sun 08 Aug '12

08 Aug '12

In domain_nfs_start case, libvirtd will be restarted during test, which broke existing connection. User need re-init connection in test case, for this: * Using sharedmod data dictionary to store Envparser class in generator. * Do not clear data dictionary in env_inspect, user can update it or framework release it at last. * Using sharemod_init in env_inspect to re-init conn in domain_nfs_start. Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- repos/sVirt/domain_nfs_start.py | 11 +++++++++-- src/env_inspect.py | 1 - src/generator.py | 2 ++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/repos/sVirt/domain_nfs_start.py b/repos/sVirt/domain_nfs_start.py index 88d349c..4d48d97 100644 --- a/repos/sVirt/domain_nfs_start.py +++ b/repos/sVirt/domain_nfs_start.py @@ -12,7 +12,7 @@ import sys import libvirt from libvirt import libvirtError - +from src import env_inspect from src import sharedmod from utils import utils from shutil import copy @@ -163,6 +163,8 @@ def domain_nfs_start(params): logger.error("Error: fail to get domain %s xml" % guestname) return 1 + conn.close() + # set env logger.info("prepare the environment") ret = prepare_env(dynamic_ownership, virt_use_nfs, guestname, \ @@ -171,6 +173,11 @@ def domain_nfs_start(params): logger.error("failed to prepare the environment") return 1 + # reconnect libvirt + env = sharedmod.data['env'] + env_inspect.sharemod_init(env, logger) + conn = sharedmod.libvirtobj['conn'] + domobj = conn.lookupByName(guestname) logger.info("begin to test start domain from nfs storage") @@ -283,7 +290,7 @@ def domain_nfs_start(params): logger.error("Error: fail to get domain %s state" % guestname) return 1 - if state != "shutoff": + if state != libvirt.VIR_DOMAIN_SHUTOFF: logger.info("shut down the domain %s" % guestname) try: domobj.destroy() diff --git a/src/env_inspect.py b/src/env_inspect.py index b260ff8..a6dc4b1 100644 --- a/src/env_inspect.py +++ b/src/env_inspect.py @@ -98,7 +98,6 @@ def sharemod_init(env_parser, logger): # initialize conn object in sharedmod sharedmod.libvirtobj.clear() - sharedmod.data.clear() sharedmod.libvirtobj['conn'] = conn return 0 diff --git a/src/generator.py b/src/generator.py index 0cdc9de..f01f2fb 100644 --- a/src/generator.py +++ b/src/generator.py @@ -30,6 +30,7 @@ from testcasexml import xml_file_to_str import env_parser import env_inspect import format +import sharedmod class FuncGen(object): """ To generate a callable testcase""" @@ -56,6 +57,7 @@ class FuncGen(object): self.__case_info_save(activity, testrunid) self.env = env_parser.Envparser("global.cfg") + sharedmod.data['env'] = self.env mapper_obj = mapper.Mapper(activity) case_list = mapper_obj.module_casename_func_map() -- 1.7.1

2 4

[libvirt] [PATCH 00/17] Supports for hypervisor-pin and hypervisor-bandwidth
by Hu Tao 08 Aug '12

08 Aug '12

This series is a merge of 1) "Support hypervisor-threads-pin in vcpupin" (https://www.redhat.com/archives/libvir-list/2012-July/msg01361.html) 2) "support to set cpu bandwidth for hypervisor threads" (https://www.redhat.com/archives/libvir-list/2012-June/msg01161.html) to make life easier because of the two share some patches. Patches 1-12 are from 1), patches 13-17 are from 2). Changes: 1. rebase to the latest git tree(removal of qemuReportError, split of virsh.c) 2. some typo fixes 3. make it pass syntax-check Hu Tao (2): limit cpu bandwidth only for vcpus update doc about hypervisor_period/hypervisor_quota Tang Chen (9): Enable cpuset cgroup and synchronous vcpupin info to cgroup. Support hypervisorpin xml parse. Introduce qemuSetupCgroupHypervisorPin and synchronize hypervisorpin info to cgroup. Add qemuProcessSetHypervisorAffinites and set hypervisor threads affinities Introduce virDomainHypervisorPinAdd and virDomainHypervisorPinDel functions Introduce virDomainPinHypervisorFlags and virDomainGetHypervisorPinInfo functions. Introduce qemudDomainPinHypervisorFlags and qemudDomainGetHypervisorPinInfo in qemu driver. Introduce remoteDomainPinHypervisorFlags and remoteDomainGetHypervisorPinInfo functions in remote driver. Improve vcpupin to support hypervisorpin dynamically. Wen Congyang (6): Introduce the function virCgroupForHypervisor Introduce the function virCgroupMoveTask create a new cgroup and move all hypervisor threads to the new cgroup Update XML Schema for new entries qemu: Implement hypervisor's period and quota tunable XML configuration and parsing qemu: Implement hypervisor_period and hypervisor_quota's modification daemon/remote.c | 103 +++++ docs/schemas/domaincommon.rng | 17 + include/libvirt/libvirt.h.in | 26 ++ src/conf/domain_conf.c | 189 ++++++++- src/conf/domain_conf.h | 9 + src/driver.h | 13 +- src/libvirt.c | 147 +++++++ src/libvirt_private.syms | 7 + src/libvirt_public.syms | 2 + src/qemu/qemu_cgroup.c | 193 ++++++++-- src/qemu/qemu_cgroup.h | 5 + src/qemu/qemu_driver.c | 465 +++++++++++++++++++---- src/qemu/qemu_process.c | 60 ++- src/remote/remote_driver.c | 102 +++++ src/remote/remote_protocol.x | 23 +- src/remote_protocol-structs | 24 ++ src/util/cgroup.c | 188 ++++++++- src/util/cgroup.h | 15 + tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 1 + tests/vcpupin | 6 +- tools/virsh-domain.c | 147 ++++--- tools/virsh.pod | 23 +- 22 files changed, 1594 insertions(+), 171 deletions(-) -- 1.7.10.2

3 45