- Devel - libvirt List Archives

[libvirt] [PATCH] Use virNetServerRun instead of custom main loop
by Daniel P. Berrange 21 Nov '12

21 Nov '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The LXC controller code currently directly invokes the libvirt main loop code. The problem is that this misses the cleanup of virNetServerClient connections that virNetServerRun takes care of. The result is that when libvirtd is stopped, the libvirt_lxc controller process gets stuck in a I/O loop. When libvirtd is then started again, it fails to connect to the controller and thus kills of the entire domain. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_controller.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 4746897..aec2d4c 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -97,6 +97,8 @@ struct _virLXCControllerConsole { char fromHostBuf[1024]; size_t fromContLen; char fromContBuf[1024]; + + virNetServerPtr server; }; typedef struct _virLXCController virLXCController; @@ -278,6 +280,7 @@ static int virLXCControllerAddConsole(virLXCControllerPtr ctrl, virReportOOMError(); return -1; } + ctrl->consoles[ctrl->nconsoles-1].server = ctrl->server; ctrl->consoles[ctrl->nconsoles-1].hostFd = hostFd; ctrl->consoles[ctrl->nconsoles-1].hostWatch = -1; @@ -663,12 +666,11 @@ static int lxcControllerClearCapabilities(void) return 0; } -static bool quit = false; static bool wantReboot = false; static virMutex lock; -static void virLXCControllerSignalChildIO(virNetServerPtr server ATTRIBUTE_UNUSED, +static void virLXCControllerSignalChildIO(virNetServerPtr server, siginfo_t *info ATTRIBUTE_UNUSED, void *opaque) { @@ -678,8 +680,8 @@ static void virLXCControllerSignalChildIO(virNetServerPtr server ATTRIBUTE_UNUSE ret = waitpid(-1, &status, WNOHANG); if (ret == ctrl->initpid) { + virNetServerQuit(server); virMutexLock(&lock); - quit = true; if (WIFSIGNALED(status) && WTERMSIG(status) == SIGHUP) wantReboot = true; @@ -731,7 +733,7 @@ static void virLXCControllerConsoleUpdateWatch(virLXCControllerConsolePtr consol VIR_DEBUG(":fail"); virReportSystemError(errno, "%s", _("Unable to add epoll fd")); - quit = true; + virNetServerQuit(console->server); goto cleanup; } console->hostEpoll = events; @@ -742,8 +744,8 @@ static void virLXCControllerConsoleUpdateWatch(virLXCControllerConsolePtr consol if (epoll_ctl(console->epollFd, EPOLL_CTL_DEL, console->hostFd, NULL) < 0) { virReportSystemError(errno, "%s", _("Unable to remove epoll fd")); - VIR_DEBUG(":fail"); - quit = true; + VIR_DEBUG(":fail"); + virNetServerQuit(console->server); goto cleanup; } console->hostEpoll = 0; @@ -768,7 +770,7 @@ static void virLXCControllerConsoleUpdateWatch(virLXCControllerConsolePtr consol virReportSystemError(errno, "%s", _("Unable to add epoll fd")); VIR_DEBUG(":fail"); - quit = true; + virNetServerQuit(console->server); goto cleanup; } console->contEpoll = events; @@ -779,8 +781,8 @@ static void virLXCControllerConsoleUpdateWatch(virLXCControllerConsolePtr consol if (epoll_ctl(console->epollFd, EPOLL_CTL_DEL, console->contFd, NULL) < 0) { virReportSystemError(errno, "%s", _("Unable to remove epoll fd")); - VIR_DEBUG(":fail"); - quit = true; + VIR_DEBUG(":fail"); + virNetServerQuit(console->server); goto cleanup; } console->contEpoll = 0; @@ -809,7 +811,7 @@ static void virLXCControllerConsoleEPoll(int watch, int fd, int events, void *op continue; virReportSystemError(errno, "%s", _("Unable to wait on epoll")); - quit = true; + virNetServerQuit(console->server); goto cleanup; } @@ -926,7 +928,7 @@ error: virEventRemoveHandle(console->contWatch); virEventRemoveHandle(console->hostWatch); console->contWatch = console->hostWatch = -1; - quit = true; + virNetServerQuit(console->server); virMutexUnlock(&lock); } @@ -995,14 +997,7 @@ static int virLXCControllerMain(virLXCControllerPtr ctrl) } } - virMutexLock(&lock); - while (!quit) { - virMutexUnlock(&lock); - if (virEventRunDefaultImpl() < 0) - goto cleanup; - virMutexLock(&lock); - } - virMutexUnlock(&lock); + virNetServerRun(ctrl->server); err = virGetLastError(); if (!err || err->code == VIR_ERR_OK) -- 1.7.11.7

2 1

[libvirt] [PATCH] v1: allow guest to guest IPv6 without gateway definition
by Gene Czarcinski 21 Nov '12

21 Nov '12

This patch adds the capability for virtual guests to do IPv6 communication via a virtual network interface with no IPv6 (gateway) addresses specified. This capability currently exists for IPv4. This patch allows creation of a completely isolated IPv6 network. Note that virtual guests cannot communication with the virtualization host via this interface. Also note that: net.ipv6.conf.<interface_name>.disable_ipv6 = 1 --- docs/formatnetwork.html.in | 18 ++++++++++++++++++ src/network/bridge_driver.c | 22 ++++++++++++++-------- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 49206dd..7b3b25c 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -773,5 +773,23 @@ </forward> </network></pre> + <h3><a name="examplesNoGateway">Network config with no gateway addresses</a></h3> + + <p> + A valid network definition can contain no IPv4 or IPv6 addresses. Such a definition + can be used for a "very private" or "very isolated" network since it will not be + possible to communicate with the virtualization host via this network. However, + this virtual network interface can be used for communication between virtual guest + systems. This works for IPv4 and <span class="since">(Since 1.0.1)</span> IPv6. + </p> + + <pre> + <network> + <name>nogw</name> + <uuid>7a3b7497-1ec7-8aef-6d5c-38dff9109e93</uuid> + <bridge name="virbr2" stp="on" delay="0" /> + <mac address='00:16:3E:5D:C7:9E'/> + </network></pre> + </body> </html> diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c153d36..9c67348 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1568,15 +1568,16 @@ networkRemoveRoutingIptablesRules(struct network_driver *driver, } } -/* Add all once/network rules required for IPv6 (if any IPv6 addresses are defined) */ +/* Add all once/network rules required for IPv6. + * Even if no IPv6 addresses are defined, allow IPv6 commuinications + * between virtual systems. If any IPv6 addresses are defined, then + * add the rules for regular operation. + */ static int networkAddGeneralIp6tablesRules(struct network_driver *driver, virNetworkObjPtr network) { - if (!virNetworkDefGetIpByIndex(network->def, AF_INET6, 0)) - return 0; - /* Catch all rules to block forwarding to/from bridges */ if (iptablesAddForwardRejectOut(driver->iptables, AF_INET6, @@ -1604,6 +1605,10 @@ networkAddGeneralIp6tablesRules(struct network_driver *driver, goto err3; } + /* if no IPv6 addresses are defined, we are done. */ + if (!virNetworkDefGetIpByIndex(network->def, AF_INET6, 0)) + return 0; + /* allow DNS over IPv6 */ if (iptablesAddTcpInput(driver->iptables, AF_INET6, network->def->bridge, 53) < 0) { @@ -1640,11 +1645,12 @@ static void networkRemoveGeneralIp6tablesRules(struct network_driver *driver, virNetworkObjPtr network) { - if (!virNetworkDefGetIpByIndex(network->def, AF_INET6, 0)) - return; + if (virNetworkDefGetIpByIndex(network->def, AF_INET6, 0)) { + iptablesRemoveUdpInput(driver->iptables, AF_INET6, network->def->bridge, 53); + iptablesRemoveTcpInput(driver->iptables, AF_INET6, network->def->bridge, 53); + } - iptablesRemoveUdpInput(driver->iptables, AF_INET6, network->def->bridge, 53); - iptablesRemoveTcpInput(driver->iptables, AF_INET6, network->def->bridge, 53); + /* the following rules are there even if no IPv6 address has been defined */ iptablesRemoveForwardAllowCross(driver->iptables, AF_INET6, network->def->bridge); iptablesRemoveForwardRejectIn(driver->iptables, AF_INET6, network->def->bridge); iptablesRemoveForwardRejectOut(driver->iptables, AF_INET6, network->def->bridge); -- 1.7.11.7

1 0

[libvirt] libvirt-1.0 fails virdrivermoduletest
by Toralf Förster 21 Nov '12

21 Nov '12

I've a stable Gentoo Linux, the build log is attached. -- MfG/Sincerely Toralf Förster pgp finger print: 7B1A 07F4 EC82 0F90 D4C2 8936 872A E508 7DB6 9DA3

4 6

[libvirt] [RFC] Porting Qemu driver to FreeBSD
by Roman Bogorodskiy 21 Nov '12

21 Nov '12

Hi, Recently I have picked up Sean's and Hiren's activities in porting Qemu driver on FreeBSD. At this point I have the basics working. Meaning that these things work: - Basic host commands (version, nodeinfo, etc) - Can perform basic operations on the VM (start, stop, destroy, etc) - Basic bridging (bridge creation/removing, adding/removing interfaces, setting addresses etc) Currently I keep FreeBSD specific info here: https://github.com/novel/fbsd-libvirt/blob/freebsd/README-freebsd There are a number things to be done: - Firewall support. Currently I have just disabled iptables calls and add general ipfw NAT rules for all VMs. This appears to be the most tough part for me at this point for a number of reasons: * FreeBSD has two widely used firewall packages: pf and ipfw. I'm not sure if they play nice together, e.g. if I choose to use ipfw, people that have pf configuration will have problems making libvirt work with their existing setup * Need to design a general schema for injection of the rules so they don't harm existing setup ipfw seems to be more appealing for automatic control via external applications like libvirt, but I'm still not sure how to organise rulesets. - Affinity stuff needs to be implemented - Code needs a lot of clean-up, needs to be refactored to extract common cross-platfrom code, etc - NWFilter stuff needs to be implemented (this is sort of a long term goal) The code is available here: https://github.com/novel/fbsd-libvirt/tree/freebsd Current changes could be observed here: https://github.com/novel/fbsd-libvirt/compare/upstream_master...freebsd I would appreciate your thoughts and feedback on that topic. Thanks Roman Bogorodskiy

2 2

Re: [libvirt] messed up with xml-files and configuration of a VM
by Stefan Hajnoczi 21 Nov '12

21 Nov '12

On Tue, Nov 20, 2012 at 5:13 PM, Lentes, Bernd <bernd.lentes(a)helmholtz-muenchen.de> wrote: > first, i'm new to kvm. I'm running KVM on a sles 11 sp2, kernel 3.0.13-0.27-default. My guest is an Ubuntu 12.0.4 LTS 64bit. > The guest has attached a CDROM, using an iso-file from a CIFS-Share. I detached it with the virtual machine manager (0.9.0). > I don't see the cd-rom anymore in the virtual machine manager. But when i try to start the vm, it complains about the missing iso-file. > Why ? I detached it. > When i like to have a look in the xml-files of the guest, i found three ! One in /var/lib/kvm/images, one in /etc/libvirt/qemu and one in /etc/kvm/vm. > Which one should i use to configure the vm ? In the one in /etc/libvirt/qemu the cifs-share isn't mentioned any longer, in the other two it is still. > Is it possible to configure the vm editing one of the XML-files ? > Or shall i use virsh ? Using virsh, does the vm has to be stopped or can i edit the configuration for a running vm ? > Why three xml-files ? Why is detaching with the virtual machine manager not working ? Hi Bernd, This is a libvirt question, I have CCed the libvirt mailing list. Do not edit the XML files on disk. Instead, use virsh edit (to modify) and virsh dumpxml (to view). Stefan

1 0

[libvirt] [RFC PATCHv2 0/n] snapshot: add revert-and-create branching
by Eric Blake 21 Nov '12

21 Nov '12

v1 was here: https://www.redhat.com/archives/libvir-list/2012-November/msg00484.html Since then, I've folded in review comments on 1; 2-4 are new. Documentation is still pending (split out of 1 based on the v1 review). Also, I'm still writing and testing the actual qemu use of the new snapshot_conf.c code, so this series is not quite ready for committing without that being done. In my review of Peter's series, I promised to post my patch for making it easier to clone the in-memory view of a domain when creating or reverting to a snapshot; that's patch 3. Eric Blake (4): snapshot: add revert-and-create branching of external snapshots snapshot: prepare to parse new XML snapshot: make cloning of domain definition easier snapshot: actually compute branch definition from XML docs/formatsnapshot.html.in | 16 +++++-- docs/schemas/domainsnapshot.rng | 5 +++ include/libvirt/libvirt.h.in | 3 ++ src/conf/domain_conf.c | 37 ++++++++++------ src/conf/domain_conf.h | 2 + src/conf/snapshot_conf.c | 93 ++++++++++++++++++++++++++++++++++++++- src/conf/snapshot_conf.h | 2 + src/esx/esx_driver.c | 2 +- src/libvirt.c | 27 +++++++++--- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 17 ++----- src/vbox/vbox_tmpl.c | 2 +- tests/domainsnapshotxml2xmltest.c | 2 +- tools/virsh-snapshot.c | 40 +++++++++++++---- tools/virsh.pod | 16 ++++++- 15 files changed, 215 insertions(+), 50 deletions(-) -- 1.7.11.7

2 11

[libvirt] [PATCH] Log an audit message with the LXC init pid
by Daniel P. Berrange 20 Nov '12

20 Nov '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Currently the LXC driver logs audit messages when a container is started or stopped. These audit messages, however, contain the PID of the libvirt_lxc supervisor process. To enable sysadmins to correlate with audit messages generated by processes /inside/ the container, we need to include the container init process PID. We can't do this in the main 'start' audit message, since the init PID is not available at that point. Instead we output a completely new audit record, that lists both PIDs. type=VIRT_CONTROL msg=audit(1353433750.071:363): pid=20180 uid=0 auid=501 ses=3 subj=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 msg='virt=lxc op=init vm="busy" uuid=dda7b947-0846-1759-2873-0f375df7d7eb vm-pid=20371 init-pid=20372 exe="/home/berrange/src/virt/libvirt/daemon/.libs/lt-libvirtd" hostname=? addr=? terminal=pts/6 res=success' --- src/conf/domain_audit.c | 26 ++++++++++++++++++++++++++ src/conf/domain_audit.h | 3 +++ src/libvirt_private.syms | 1 + src/lxc/lxc_controller.c | 31 ++++++++++++++++++++++++++++++- src/lxc/lxc_monitor.c | 23 +++++++++++++++++++++++ src/lxc/lxc_monitor.h | 5 +++++ src/lxc/lxc_process.c | 8 ++++++++ src/lxc/lxc_protocol.x | 7 ++++++- 8 files changed, 102 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 0f3924a..34cd92e 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -605,6 +605,32 @@ virDomainAuditStart(virDomainObjPtr vm, const char *reason, bool success) virDomainAuditLifecycle(vm, "start", reason, success); } +void +virDomainAuditInit(virDomainObjPtr vm, + unsigned long long initpid) +{ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + char *vmname; + const char *virt; + + virUUIDFormat(vm->def->uuid, uuidstr); + + if (!(vmname = virAuditEncode("vm", vm->def->name))) { + VIR_WARN("OOM while encoding audit message"); + return; + } + + if (!(virt = virDomainVirtTypeToString(vm->def->virtType))) { + VIR_WARN("Unexpected virt type %d while encoding audit message", vm->def->virtType); + virt = "?"; + } + + VIR_AUDIT(VIR_AUDIT_RECORD_MACHINE_CONTROL, true, + "virt=%s op=init %s uuid=%s vm-pid=%lld init-pid=%lld", + virt, vmname, uuidstr, (long long)vm->pid, initpid); + + VIR_FREE(vmname); +} void virDomainAuditStop(virDomainObjPtr vm, const char *reason) diff --git a/src/conf/domain_audit.h b/src/conf/domain_audit.h index db35d09..94b1198 100644 --- a/src/conf/domain_audit.h +++ b/src/conf/domain_audit.h @@ -31,6 +31,9 @@ void virDomainAuditStart(virDomainObjPtr vm, const char *reason, bool success) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); +void virDomainAuditInit(virDomainObjPtr vm, + unsigned long long pid) + ATTRIBUTE_NONNULL(1); void virDomainAuditStop(virDomainObjPtr vm, const char *reason) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5a07139..23369e7 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -258,6 +258,7 @@ virDomainAuditCgroupPath; virDomainAuditDisk; virDomainAuditFS; virDomainAuditHostdev; +virDomainAuditInit; virDomainAuditMemory; virDomainAuditNet; virDomainAuditNetDevice; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 4746897..65d117a 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -123,6 +123,7 @@ struct _virLXCController { /* Server socket */ virNetServerPtr server; + bool firstClient; virNetServerClientPtr client; virNetServerProgramPtr prog; bool inShutdown; @@ -132,6 +133,8 @@ struct _virLXCController { #include "lxc_controller_dispatch.h" static void virLXCControllerFree(virLXCControllerPtr ctrl); +static int virLXCControllerEventSendInit(virLXCControllerPtr ctrl, + pid_t initpid); static void virLXCControllerQuitTimer(int timer ATTRIBUTE_UNUSED, void *opaque) { @@ -152,6 +155,7 @@ static virLXCControllerPtr virLXCControllerNew(const char *name) goto no_memory; ctrl->timerShutdown = -1; + ctrl->firstClient = true; if (!(ctrl->name = strdup(name))) goto no_memory; @@ -588,6 +592,11 @@ static void *virLXCControllerClientPrivateNew(virNetServerClientPtr client, virNetServerClientSetCloseHook(client, virLXCControllerClientCloseHook); VIR_DEBUG("Got new client %p", client); ctrl->client = client; + + if (ctrl->initpid && ctrl->firstClient) + virLXCControllerEventSendInit(ctrl, ctrl->initpid); + ctrl->firstClient = false; + return dummy; } @@ -1283,8 +1292,10 @@ virLXCControllerEventSend(virLXCControllerPtr ctrl, { virNetMessagePtr msg; - if (!ctrl->client) + if (!ctrl->client) { + VIR_WARN("Dropping event %d becuase libvirtd is not connected", procnr); return; + } VIR_DEBUG("Send event %d client=%p", procnr, ctrl->client); if (!(msg = virNetMessageNew(false))) @@ -1352,6 +1363,24 @@ virLXCControllerEventSendExit(virLXCControllerPtr ctrl, static int +virLXCControllerEventSendInit(virLXCControllerPtr ctrl, + pid_t initpid) +{ + virLXCProtocolInitEventMsg msg; + + VIR_DEBUG("Init pid %llu", (unsigned long long)initpid); + memset(&msg, 0, sizeof(msg)); + msg.initpid = initpid; + + virLXCControllerEventSend(ctrl, + VIR_LXC_PROTOCOL_PROC_INIT_EVENT, + (xdrproc_t)xdr_virLXCProtocolInitEventMsg, + (void*)&msg); + return 0; +} + + +static int virLXCControllerRun(virLXCControllerPtr ctrl) { int rc = -1; diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index 3e00751..97ff828 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -65,12 +65,20 @@ static void virLXCMonitorHandleEventExit(virNetClientProgramPtr prog, virNetClientPtr client, void *evdata, void *opaque); +static void +virLXCMonitorHandleEventInit(virNetClientProgramPtr prog, + virNetClientPtr client, + void *evdata, void *opaque); static virNetClientProgramEvent virLXCProtocolEvents[] = { { VIR_LXC_PROTOCOL_PROC_EXIT_EVENT, virLXCMonitorHandleEventExit, sizeof(virLXCProtocolExitEventMsg), (xdrproc_t)xdr_virLXCProtocolExitEventMsg }, + { VIR_LXC_PROTOCOL_PROC_INIT_EVENT, + virLXCMonitorHandleEventInit, + sizeof(virLXCProtocolInitEventMsg), + (xdrproc_t)xdr_virLXCProtocolInitEventMsg }, }; @@ -88,6 +96,21 @@ virLXCMonitorHandleEventExit(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, } +static void +virLXCMonitorHandleEventInit(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, + virNetClientPtr client ATTRIBUTE_UNUSED, + void *evdata, void *opaque) +{ + virLXCMonitorPtr mon = opaque; + virLXCProtocolInitEventMsg *msg = evdata; + + VIR_DEBUG("Event init %llu", + (unsigned long long)msg->initpid); + if (mon->cb.initNotify) + mon->cb.initNotify(mon, msg->initpid, mon->vm); +} + + static void virLXCMonitorEOFNotify(virNetClientPtr client ATTRIBUTE_UNUSED, int reason ATTRIBUTE_UNUSED, void *opaque) diff --git a/src/lxc/lxc_monitor.h b/src/lxc/lxc_monitor.h index bb8349a..fd8efd9 100644 --- a/src/lxc/lxc_monitor.h +++ b/src/lxc/lxc_monitor.h @@ -40,10 +40,15 @@ typedef void (*virLXCMonitorCallbackExitNotify)(virLXCMonitorPtr mon, virLXCProtocolExitStatus status, virDomainObjPtr vm); +typedef void (*virLXCMonitorCallbackInitNotify)(virLXCMonitorPtr mon, + unsigned long long pid, + virDomainObjPtr vm); + struct _virLXCMonitorCallbacks { virLXCMonitorCallbackDestroy destroy; virLXCMonitorCallbackEOFNotify eofNotify; virLXCMonitorCallbackExitNotify exitNotify; + virLXCMonitorCallbackInitNotify initNotify; }; virLXCMonitorPtr virLXCMonitorNew(virDomainObjPtr vm, diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 079bc3a..c1ef2bd 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -637,9 +637,17 @@ static void virLXCProcessMonitorExitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED priv->stopReason, status); } +static void virLXCProcessMonitorInitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED, + unsigned long long initpid, + virDomainObjPtr vm) +{ + virDomainAuditInit(vm, initpid); +} + static virLXCMonitorCallbacks monitorCallbacks = { .eofNotify = virLXCProcessMonitorEOFNotify, .exitNotify = virLXCProcessMonitorExitNotify, + .initNotify = virLXCProcessMonitorInitNotify, }; diff --git a/src/lxc/lxc_protocol.x b/src/lxc/lxc_protocol.x index e437217..0f041f6 100644 --- a/src/lxc/lxc_protocol.x +++ b/src/lxc/lxc_protocol.x @@ -14,9 +14,14 @@ struct virLXCProtocolExitEventMsg { enum virLXCProtocolExitStatus status; }; +struct virLXCProtocolInitEventMsg { + unsigned hyper initpid; +}; + const VIR_LXC_PROTOCOL_PROGRAM = 0x12341234; const VIR_LXC_PROTOCOL_PROGRAM_VERSION = 1; enum virLXCProtocolProcedure { - VIR_LXC_PROTOCOL_PROC_EXIT_EVENT = 1 /* skipgen skipgen */ + VIR_LXC_PROTOCOL_PROC_EXIT_EVENT = 1, /* skipgen skipgen */ + VIR_LXC_PROTOCOL_PROC_INIT_EVENT = 2 /* skipgen skipgen */ }; -- 1.7.11.7

3 2

[libvirt] [PATCH] conf: Report sensible error for invalid disk name
by Martin Kletzander 20 Nov '12

20 Nov '12

The error "... but the cause is unknown" appeared for XMLs similar to this: <disk type='file' device='cdrom'> <driver name='qemu' type='raw'/> <source file='/dev/zero'/> <target dev='sr0'/> </disk> Notice unsupported disk type (for the driver), but also no address specified. The first part is not a problem and we should not abort immediately because of that, but the combination with the address unknown was causing an unspecified error. --- src/util/util.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/util.c b/src/util/util.c index 75b18c1..d5b2c97 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2189,8 +2189,12 @@ int virDiskNameToIndex(const char *name) { } } - if (!ptr) + if (!ptr) { + virReportError(VIR_ERR_XML_ERROR, + _("Unknown disk name '%s' and no address specified"), + name); return -1; + } for (i = 0; *ptr; i++) { idx = (idx + (i < 1 ? 0 : 1)) * 26; -- 1.8.0

3 4

[libvirt] Report guest IPs as XML or struct?
by Michal Privoznik 20 Nov '12

20 Nov '12

I've proposed both approaches in the past. However, none of them was accepted as we ought to agree on $subj first. Frankly, both makes sense to me, both has advantages and disadvantages. XML - keeps things more consistent as libvirt is tied to XML, right? Pros: - can add items over the time Cons: - more complicated to parse and dump info (apps would have to query multiple XPATHs to get answer - at least with my implementation I've sent) struct - it would be a linked list or array of structs in fact Pros: - easier to dump useful data Cons: - once struct is released we cannot change it if we don't want to break ABI. What things do we want to expose for now? qemu guest agent reports: - type of IP address (v4/v6) - prefix length - actual address (string) (these can repeat multiple times, since there's 1:* relationship between interface an IP addresses) - hw address - name as seen within guest (HW address can be omitted - not all interfaces must have one). The only element that will be there for sure is name then. The whole QAPI schema can be found in qapi-schema-guest.json [1]. Suggestions are welcome. Michal 1: http://git.qemu.org/?p=qemu.git;a=blob;f=qapi-schema-guest.json;h=ed0eb698c…

3 5

[libvirt] [test-API][PATCH] Add test case of set vcpus with flags
by Wayne Sun 20 Nov '12

20 Nov '12

Use setVcpusFlags API to set domain vcpu with flags, domain could be active or not. Flags could be '0', 'live', 'config', 'maximum' and their combinations, use '|' between flags for combinations. A sample conf file also added. Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/set_vcpus_flags.conf | 56 ++++++++ repos/domain/set_vcpus_flags.py | 283 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 339 insertions(+), 0 deletions(-) create mode 100644 cases/set_vcpus_flags.conf create mode 100644 repos/domain/set_vcpus_flags.py diff --git a/cases/set_vcpus_flags.conf b/cases/set_vcpus_flags.conf new file mode 100644 index 0000000..7da13a2 --- /dev/null +++ b/cases/set_vcpus_flags.conf @@ -0,0 +1,56 @@ +domain:install_linux_cdrom + guestname + $defaultname + guestos + $defaultos + guestarch + $defaultarch + vcpu + $defaultvcpu + memory + $defaultmem + hddriver + $defaulthd + nicdriver + $defaultnic + imageformat + qcow2 + +domain:set_vcpus_flags + guestname + $defaultname + vcpu + 4 + flags + 0|config|live + username + $username + password + $password + +domain:destroy + guestname + $defaultname + +domain:set_vcpus_flags + guestname + $defaultname + vcpu + 5 + flags + 0|config + +domain:set_vcpus_flags + guestname + $defaultname + vcpu + 6 + flags + maximum + +domain:undefine + guestname + $defaultname + +options cleanup=enable + diff --git a/repos/domain/set_vcpus_flags.py b/repos/domain/set_vcpus_flags.py new file mode 100644 index 0000000..ca614cc --- /dev/null +++ b/repos/domain/set_vcpus_flags.py @@ -0,0 +1,283 @@ +#!/usr/bin/env python +# Test set domain vcpu with flags. Flags could be 0, live, config, +# maximum and their combinations, use '|' for combinations. If +# domain is active, username and password should be provided, else +# not. + +import time +import commands +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', 'vcpu', 'flags', ) +optional_params = { + 'username': 'root', + 'password': '', + } + +def check_domain_running(conn, guestname): + """ check if the domain exists, may or may not be active """ + guest_names = [] + ids = conn.listDomainsID() + for id in ids: + obj = conn.lookupByID(id) + guest_names.append(obj.name()) + + if guestname not in guest_names: + logger.info("%s is not running" % guestname) + return 1 + else: + return 0 + +def redefine_vcpu_number(domobj, guestname, vcpu): + """dump domain xml description to change the vcpu number, + then, define the domain again + """ + guestxml = domobj.XMLDesc(0) + logger.debug('''original guest %s xml :\n%s''' %(guestname, guestxml)) + + doc = minidom.parseString(guestxml) + + newvcpu = doc.createElement('vcpu') + newvcpuval = doc.createTextNode(str(vcpu)) + newvcpu.appendChild(newvcpuval) + newvcpu.setAttribute('current', '1') + + domain = doc.getElementsByTagName('domain')[0] + oldvcpu = doc.getElementsByTagName('vcpu')[0] + + domain.replaceChild(newvcpu, oldvcpu) + + return doc.toxml() + +def check_current_vcpu(domobj, state, flag, username, password): + """dump domain xml description to get current vcpu number and + check vcpu in domain if domain is active + """ + if len(flag) == 1 and flag[0] == '0': + if state: + flag.append('config') + else: + flag.append('live') + + if len(flag) == 1 and flag[0] == 'maximum': + if state: + flag.append('config') + else: + logger.error("'maximum' on live domain is not supported'") + return False + + if 'live' in flag: + if 'maximum' in flag: + logger.error("'live' with 'maximum' is not supported'") + return False + + guestxml = domobj.XMLDesc(1) + logger.debug("domain %s xml is :\n%s" %(domobj.name(), guestxml)) + + xml = minidom.parseString(guestxml) + vcpu = xml.getElementsByTagName('vcpu')[0] + if vcpu.hasAttribute('current'): + attr = vcpu.getAttributeNode('current') + current_vcpu = int(attr.nodeValue) + else: + logger.info("no 'current' attribute in vcpu element") + return False + + if not state: + if password == '' and username == 'root': + logger.error("check will fail with empty root password") + return False + + logger.info("check cpu number in domain") + ip = utils.mac_to_ip(mac, 180) + + cmd = "cat /proc/cpuinfo | grep processor | wc -l" + ret, output = utils.remote_exec_pexpect(ip, username, password, cmd) + if not ret: + logger.info("cpu number in domain is %s" % output) + if int(output) == current_vcpu: + logger.info("cpu in domain is equal to current vcpu value") + else: + logger.error("current vcpu is not equal as check in domain") + return False + else: + logger.error("check in domain fail") + return False + + if 'config' in flag: + guestxml = domobj.XMLDesc(2) + logger.debug("domain %s xml is :\n%s" %(domobj.name(), guestxml)) + + xml = minidom.parseString(guestxml) + vcpu = xml.getElementsByTagName('vcpu')[0] + if 'maximum' in flag: + current_vcpu = int(vcpu.childNodes[0].data) + else: + if vcpu.hasAttribute('current'): + attr = vcpu.getAttributeNode('current') + conf_vcpu = int(attr.nodeValue) + if 'live' in flag: + if not current_vcpu == conf_vcpu: + return False + else: + current_vcpu = conf_vcpu + else: + logger.info("no 'current' attribute in vcpu element") + return False + + return current_vcpu + +def set_vcpus_offline(domobj, guestname, vcpu): + """offline set the domain vcpu as given and current value as 1, + then boot up the domain + """ + timeout = 60 + logger.info('destroy domain') + + try: + domobj.destroy() + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + logger.error("fail to destroy domain") + return 1 + + newguestxml = redefine_vcpu_number(domobj, guestname, vcpu) + logger.debug('''new guest %s xml :\n%s''' %(guestname, newguestxml)) + + logger.info("undefine the original guest") + try: + domobj.undefine() + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + logger.error("fail to undefine guest %" % guestname) + return 1 + + logger.info("define guest with new xml") + try: + conn = domobj._conn + conn.defineXML(newguestxml) + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + logger.error("fail to define guest %s" % guestname) + return 1 + + try: + logger.info('boot guest up ...') + domobj.create() + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + logger.error("fail to start domain %s" % guestname) + return 1 + + timeout = 600 + + while timeout: + time.sleep(10) + timeout -= 10 + + logger.debug("get ip by mac address") + ip = utils.mac_to_ip(mac, 180) + logger.debug("the ip address of vm %s is %s" % (guestname, ip)) + + if not ip: + logger.info(str(timeout) + "s left") + else: + logger.info("vm %s power on successfully" % guestname) + logger.info("the ip address of vm %s is %s" % (guestname, ip)) + break + + if timeout <= 0: + logger.info("fail to power on vm %s" % guestname) + return 1 + + return 0 + +def set_vcpus_flags(params): + """set domain vcpu with flags and check + """ + global logger + logger = params['logger'] + params.pop('logger') + guestname = params['guestname'] + vcpu = int(params['vcpu']) + flags = params['flags'] + username = params.get('username', 'root') + password = params.get('password', '') + + logger.info("the name of virtual machine is %s" % guestname) + logger.info("the vcpu given is %s" % vcpu) + + logger.info("the flags is %s" % flags) + flags_string = flags.split("|") + + flags = 0 + for flag in flags_string: + if flag == '0': + flags |= 0 + elif flag == 'live': + flags |= libvirt.VIR_DOMAIN_AFFECT_LIVE + elif flag == 'config': + flags |= libvirt.VIR_DOMAIN_AFFECT_CONFIG + elif flag == 'maximum': + flags |= libvirt.VIR_DOMAIN_VCPU_MAXIMUM + else: + logger.error("unknown flag") + return 1 + + conn = sharedmod.libvirtobj['conn'] + + domobj = conn.lookupByName(guestname) + logger.debug("get the mac address of vm %s" % guestname) + global mac + mac = utils.get_dom_mac_addr(guestname) + logger.debug("the mac address of vm %s is %s" % (guestname, mac)) + + num = vcpu + 1 + try: + max_vcpus = int(conn.getMaxVcpus('kvm')) + logger.debug("hypervisor supported max vcpu is %s" % max_vcpus) + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + if num > max_vcpus: + logger.error("vcpu must smaller than max number: %s" % max_vcpus) + return 1 + + state = check_domain_running(conn, guestname) + + if state: + try: + logger.info("set domain maximum vcpu as: %s" % num) + domobj.setVcpusFlags(num, libvirt.VIR_DOMAIN_VCPU_MAXIMUM) + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + else: + logger.info("set domain vcpu to %s and restart with current cpu as 1" % + num) + ret = set_vcpus_offline(domobj, guestname, num) + if ret != 0: + return 1 + + try: + logger.info("set vcpus to %s with flag: %s" % (vcpu, flags)) + domobj.setVcpusFlags(vcpu, flags) + logger.info("set vcpu with flag succeed") + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + ret = check_current_vcpu(domobj, state, flags_string, username, password) + if ret == 'False': + logger.error("check set vcpu failed") + return 1 + elif ret == vcpu: + logger.info("check set vcpu succeed") + return 0 -- 1.7.1

1 0