- 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 21 Nov '12

21 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

[libvirt] [PATCHv2 0/4] add more snapshot-list filters
by Eric Blake 20 Nov '12

20 Nov '12

v1 was here: https://www.redhat.com/archives/libvir-list/2012-November/msg00604.html Diff in v2: Prefer active/inactive over online/offline; use XPath rather than strstr for parsing XML, rebase to latest Eric Blake (4): snapshot: add two more filter sets to API snapshot: add virsh back-compat support for new filters snapshot: implement new filter sets snapshot: expose location through virsh snapshot-info include/libvirt/libvirt.h.in | 19 ++++ src/conf/snapshot_conf.c | 30 +++++- src/conf/snapshot_conf.h | 13 ++- src/libvirt.c | 60 ++++++++++++ tools/virsh-snapshot.c | 214 +++++++++++++++++++++++++++++++++++++------ tools/virsh.pod | 17 +++- 6 files changed, 322 insertions(+), 31 deletions(-) -- 1.7.11.7

2 10

[libvirt] Plan A or Plan B?
by Gene Czarcinski 20 Nov '12

20 Nov '12

Plan A: This consists of the set of patches I have submitted for conf-file, DHCPv6, etc. The response has been a resounding SILENCE. Thus, I am assuming that there is some reluctance to adopting these changes in their current form. This especially includes the conf-file changes. While I believe that changing dnsmasq parameters from the command-line to a configuration file makes a great deal of sense and might have been the approach if this was being done today, there is resistance to change. OK, so here is Plan B: I am removing the conf-file and related changes. They will be repackaged and resubmitted at some later time. The new multi-file patch will focus on "IPV6 Enhanced Support" which will consist of the following: 1. In a manner similar to what is done for IPV6, add ip6tables rules to permit virtual systems to communicate via a defined virtual interface which has no gateway addresses defined. This does mean that virtual systems will not be able to communicate with the host via this interface ... only with each other. Also, the following must be: net.ipv6.conf.virbr19.disable_ipv6 = 1 so that the kernel does not start anything. This implements IPv6 functionality currently available for IPv4. Documentation will be added to explain the functionality for both IPv4 and IPv6. [BTW, the only place I have found to add documentaiotn is in the "docs/formatnetwork.html.in" file. If there are other files I should be updating, please enlighten me.] 2. Add code to get the dnsmasq version and save that information. The added code described below will require a dnsmasq version greater than or equal to 2.64. Documentation will be updated to state that dnsmasq >= 2.64 is required for DHCPv6. 3. Implement support for DHCPv6. Most of this is already done with the existing patch. However, this refits the code to work with command-line parameters AND adds a check for dnsmasq >= 2.64. Naturally, tests and documentation will be updated. 4. If dnsmasq >= 2.64, do not use radvd but instead use dnsmasq to support the RA service for both state-full and state-less IPV6. OPTIONS: ======== a) If dnsmasq < 2.64, just ignore dhcp-range or dhcp-host definitions OR b) issue error message and stop dnsmasq startup if dhcp-range or dhcp-host is specified. ======== c) Currently, tests for valid dhcp specifications is only done when a network is started (all significant changes are to "network/bridge_driver.c". This situation could continue. Thus, virsh could be used to specify dhcp-range and dhcp-host but it would not work if the network was started. OR d) Move the dnsmasq version checks back into when the network is defined. This would be a bit "trickier" to implement properly since the same code is used by multiple network types and not just that supported by "network/bridge_driver.c". If this is the approach, I will need some guidance as to modifying "conf/network.c". OK folks. I need some input here. I realize that all of you are very busy working your own interests but I need a little time from someone with "commit" authority to say "go ahead" or "get lost". Gene

2 7

[libvirt] Use remote connect with credetial via Java code
by Yaniv Hadad 19 Nov '12

19 Nov '12

Hello all, Someone can explain me how can I generate connection with credential like user and pass (ex: root\passw0rd) I use Java API, and use this following rows for connection with local host : conn = new Connect("qemu:///system", false); Thanks in advance Yaniv Hadad Servers & Network Group, IBM R&D Labs in Israel Software Devloper yanivh(a)il.ibm.com, +972-4-829-65947 Fax: +972-4-829-6111, Cell: +972-50-4078908

1 0

[libvirt] [PATCH 0/4] add more snapshot-list filters
by Eric Blake 19 Nov '12

19 Nov '12

Depends on this patch being applied first: https://www.redhat.com/archives/libvir-list/2012-November/msg00598.html Adds the ability for virsh to filter on whether a snapshot was offline, online, or disk-only; and whether it was internal or external. Eric Blake (4): snapshot: add two more filter sets to API snapshot: add virsh back-compat support for new filters snapshot: expose location through virsh snapshot-info snapshot: implement new filter sets include/libvirt/libvirt.h.in | 19 +++++ src/conf/snapshot_conf.c | 30 ++++++- src/conf/snapshot_conf.h | 13 ++- src/libvirt.c | 60 ++++++++++++++ tools/virsh-snapshot.c | 187 +++++++++++++++++++++++++++++++++++++------ tools/virsh.pod | 17 +++- 6 files changed, 298 insertions(+), 28 deletions(-) -- 1.7.11.7

2 12

[libvirt] [PATCH v14] support offline migration
by liguang 19 Nov '12

19 Nov '12

original migration did not aware of offline case, so, try to support offline migration quietly (did not disturb original migration) by pass VIR_MIGRATE_OFFLINE flag to migration APIs if only the domain is really inactive, and migration process will not puzzled by domain offline and exit unexpectedly. these changes did not take care of disk images the domain required, for them could be transferred by other APIs as suggested, then VIR_MIGRATE_OFFLINE must not combined with VIR_MIGRATE_NON_SHARED_*. and you must do a persistent migration at same time, do "virsh migrate --offline --persistent ...". Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- include/libvirt/libvirt.h.in | 1 + src/qemu/qemu_driver.c | 16 +++--- src/qemu/qemu_migration.c | 110 ++++++++++++++++++++++++++++-------------- src/qemu/qemu_migration.h | 9 ++- tools/virsh-domain.c | 5 ++ tools/virsh.pod | 5 +- 6 files changed, 97 insertions(+), 49 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index fe58c08..1e0500d 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1090,6 +1090,7 @@ typedef enum { * whole migration process; this will be used automatically * when supported */ VIR_MIGRATE_UNSAFE = (1 << 9), /* force migration even if it is considered unsafe */ + VIR_MIGRATE_OFFLINE = (1 << 10), /* offline migrate */ } virDomainMigrateFlags; /* Domain migration. */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 978af57..5f91688 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9594,7 +9594,7 @@ qemudDomainMigratePrepareTunnel(virConnectPtr dconn, ret = qemuMigrationPrepareTunnel(driver, dconn, NULL, 0, NULL, NULL, /* No cookies in v2 */ - st, dname, dom_xml); + st, dname, dom_xml, flags); cleanup: qemuDriverUnlock(driver); @@ -9654,7 +9654,7 @@ qemudDomainMigratePrepare2(virConnectPtr dconn, ret = qemuMigrationPrepareDirect(driver, dconn, NULL, 0, NULL, NULL, /* No cookies */ uri_in, uri_out, - dname, dom_xml); + dname, dom_xml, flags); cleanup: qemuDriverUnlock(driver); @@ -9796,7 +9796,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, asyncJob = QEMU_ASYNC_JOB_NONE; } - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -9805,9 +9805,9 @@ qemuDomainMigrateBegin3(virDomainPtr domain, /* Check if there is any ejected media. * We don't want to require them on the destination. */ - - if (qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0) - goto endjob; + if (virDomainObjIsActive(vm) && (flags & VIR_MIGRATE_OFFLINE)) + if (qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0) + goto endjob; if (!(xml = qemuMigrationBegin(driver, vm, xmlin, dname, cookieout, cookieoutlen, @@ -9891,7 +9891,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, cookiein, cookieinlen, cookieout, cookieoutlen, uri_in, uri_out, - dname, dom_xml); + dname, dom_xml, flags); cleanup: qemuDriverUnlock(driver); @@ -9936,7 +9936,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, ret = qemuMigrationPrepareTunnel(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, - st, dname, dom_xml); + st, dname, dom_xml, flags); qemuDriverUnlock(driver); cleanup: diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 5f8a9c5..2479114 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1443,6 +1443,20 @@ char *qemuMigrationBegin(struct qemud_driver *driver, QEMU_MIGRATION_COOKIE_LOCKSTATE) < 0) goto cleanup; + if (flags & VIR_MIGRATE_OFFLINE) { + if (flags & (VIR_MIGRATE_NON_SHARED_DISK| + VIR_MIGRATE_NON_SHARED_INC)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("offline migration cannot handle non-shared storage")); + goto cleanup; + } + if (!(flags & VIR_MIGRATE_PERSIST_DEST)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("offline migration must be specified with the persistent flag set")); + goto cleanup; + } + } + if (xmlin) { if (!(def = virDomainDefParseString(driver->caps, xmlin, QEMU_EXPECTED_VIRT_TYPES, @@ -1500,7 +1514,8 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, const char *dname, const char *dom_xml, const char *migrateFrom, - virStreamPtr st) + virStreamPtr st, + unsigned long flags) { virDomainDefPtr def = NULL; virDomainObjPtr vm = NULL; @@ -1610,15 +1625,17 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, /* Start the QEMU daemon, with the same command-line arguments plus * -incoming $migrateFrom */ - if (qemuProcessStart(dconn, driver, vm, migrateFrom, dataFD[0], NULL, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START, - VIR_QEMU_PROCESS_START_PAUSED | - VIR_QEMU_PROCESS_START_AUTODESROY) < 0) { - virDomainAuditStart(vm, "migrated", false); - /* Note that we don't set an error here because qemuProcessStart - * should have already done that. - */ - goto endjob; + if (!(flags & VIR_MIGRATE_OFFLINE)) { + if (qemuProcessStart(dconn, driver, vm, migrateFrom, dataFD[0], NULL, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START, + VIR_QEMU_PROCESS_START_PAUSED | + VIR_QEMU_PROCESS_START_AUTODESROY) < 0) { + virDomainAuditStart(vm, "migrated", false); + /* Note that we don't set an error here because qemuProcessStart + * should have already done that. + */ + goto endjob; + } } if (tunnel) { @@ -1626,7 +1643,8 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, virReportSystemError(errno, "%s", _("cannot pass pipe for tunnelled migration")); virDomainAuditStart(vm, "migrated", false); - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, 0); + if (!(flags & VIR_MIGRATE_OFFLINE)) + qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, 0); goto endjob; } dataFD[1] = -1; /* 'st' owns the FD now & will close it */ @@ -1709,7 +1727,8 @@ qemuMigrationPrepareTunnel(struct qemud_driver *driver, int *cookieoutlen, virStreamPtr st, const char *dname, - const char *dom_xml) + const char *dom_xml, + unsigned long flags) { int ret; @@ -1723,7 +1742,7 @@ qemuMigrationPrepareTunnel(struct qemud_driver *driver, */ ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, dname, dom_xml, - "stdio", st); + "stdio", st, flags); return ret; } @@ -1738,7 +1757,8 @@ qemuMigrationPrepareDirect(struct qemud_driver *driver, const char *uri_in, char **uri_out, const char *dname, - const char *dom_xml) + const char *dom_xml, + unsigned long flags) { static int port = 0; int this_port; @@ -1834,7 +1854,7 @@ qemuMigrationPrepareDirect(struct qemud_driver *driver, ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, dname, dom_xml, - migrateFrom, NULL); + migrateFrom, NULL, flags); cleanup: VIR_FREE(hostname); if (ret != 0) @@ -2280,7 +2300,7 @@ cleanup: orig_err = virSaveLastError(); if (spec->fwdType != MIGRATION_FWD_DIRECT) { - if (iothread && qemuMigrationStopTunnel(iothread, ret < 0) < 0) + if (iothread && qemuMigrationStopTunnel(iothread, ret < 0) < 0) ret = -1; VIR_FORCE_CLOSE(fd); } @@ -2353,6 +2373,9 @@ static int doNativeMigrate(struct qemud_driver *driver, if (!uribits) return -1; + if (flags & VIR_MIGRATE_OFFLINE) + return 0; + if (qemuCapsGet(priv->caps, QEMU_CAPS_MIGRATE_QEMU_FD)) spec.destType = MIGRATION_DEST_CONNECT_HOST; else @@ -2665,10 +2688,18 @@ static int doPeer2PeerMigrate3(struct qemud_driver *driver, uri, &uri_out, flags, dname, resource, dom_xml); qemuDomainObjExitRemoteWithDriver(driver, vm); } + VIR_FREE(dom_xml); + if (ret == -1) goto cleanup; + if (flags & VIR_MIGRATE_OFFLINE) { + cookieout = NULL; + cookieoutlen = 0; + goto finish; + } + if (!(flags & VIR_MIGRATE_TUNNELLED) && (uri_out == NULL)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2771,7 +2802,7 @@ finish: vm->def->name); cleanup: - if (ddomain) { + if (ddomain || (flags & VIR_MIGRATE_OFFLINE)) { virObjectUnref(ddomain); ret = 0; } else { @@ -2848,7 +2879,7 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, } /* domain may have been stopped while we were talking to remote daemon */ - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto cleanup; @@ -2911,7 +2942,7 @@ qemuMigrationPerformJob(struct qemud_driver *driver, if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -3235,26 +3266,27 @@ qemuMigrationFinish(struct qemud_driver *driver, * object, but if no, clean up the empty qemu process. */ if (retcode == 0) { - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto endjob; } - if (qemuMigrationVPAssociatePortProfiles(vm->def) < 0) { - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, - VIR_QEMU_PROCESS_STOP_MIGRATED); - virDomainAuditStop(vm, "failed"); - event = virDomainEventNewFromObj(vm, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_FAILED); - goto endjob; + if (!(flags & VIR_MIGRATE_OFFLINE)) { + if (qemuMigrationVPAssociatePortProfiles(vm->def) < 0) { + qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, + VIR_QEMU_PROCESS_STOP_MIGRATED); + virDomainAuditStop(vm, "failed"); + event = virDomainEventNewFromObj(vm, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_FAILED); + goto endjob; + } + if (mig->network) + if (qemuDomainMigrateOPDRelocate(driver, vm, mig) < 0) + VIR_WARN("unable to provide network data for relocation"); } - if (mig->network) - if (qemuDomainMigrateOPDRelocate(driver, vm, mig) < 0) - VIR_WARN("unable to provide network data for relocation"); - if (flags & VIR_MIGRATE_PERSIST_DEST) { virDomainDefPtr vmdef; if (vm->persistent) @@ -3302,7 +3334,7 @@ qemuMigrationFinish(struct qemud_driver *driver, event = NULL; } - if (!(flags & VIR_MIGRATE_PAUSED)) { + if (!(flags & VIR_MIGRATE_PAUSED) && !(flags & VIR_MIGRATE_OFFLINE)) { /* run 'cont' on the destination, which allows migration on qemu * >= 0.10.6 to work properly. This isn't strictly necessary on * older qemu's, but it also doesn't hurt anything there @@ -3351,9 +3383,11 @@ qemuMigrationFinish(struct qemud_driver *driver, VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); } - if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { - VIR_WARN("Failed to save status on vm %s", vm->def->name); - goto endjob; + if (virDomainObjIsActive(vm)) { + if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { + VIR_WARN("Failed to save status on vm %s", vm->def->name); + goto endjob; + } } /* Guest is successfully running, so cancel previous auto destroy */ @@ -3420,6 +3454,9 @@ int qemuMigrationConfirm(struct qemud_driver *driver, if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, 0))) return -1; + if (flags & VIR_MIGRATE_OFFLINE) + goto done; + /* Did the migration go as planned? If yes, kill off the * domain object, but if no, resume CPUs */ @@ -3455,6 +3492,7 @@ int qemuMigrationConfirm(struct qemud_driver *driver, } } +done: qemuMigrationCookieFree(mig); rv = 0; diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 7a2269a..f2dc5aa 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -36,7 +36,8 @@ VIR_MIGRATE_NON_SHARED_DISK | \ VIR_MIGRATE_NON_SHARED_INC | \ VIR_MIGRATE_CHANGE_PROTECTION | \ - VIR_MIGRATE_UNSAFE) + VIR_MIGRATE_UNSAFE | \ + VIR_MIGRATE_OFFLINE) enum qemuMigrationJobPhase { QEMU_MIGRATION_PHASE_NONE = 0, @@ -97,7 +98,8 @@ int qemuMigrationPrepareTunnel(struct qemud_driver *driver, int *cookieoutlen, virStreamPtr st, const char *dname, - const char *dom_xml); + const char *dom_xml, + unsigned long flags); int qemuMigrationPrepareDirect(struct qemud_driver *driver, virConnectPtr dconn, @@ -108,7 +110,8 @@ int qemuMigrationPrepareDirect(struct qemud_driver *driver, const char *uri_in, char **uri_out, const char *dname, - const char *dom_xml); + const char *dom_xml, + unsigned long flags); int qemuMigrationPerform(struct qemud_driver *driver, virConnectPtr conn, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 393b67b..39674ba 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6644,6 +6644,7 @@ static const vshCmdInfo info_migrate[] = { static const vshCmdOptDef opts_migrate[] = { {"live", VSH_OT_BOOL, 0, N_("live migration")}, + {"offline", VSH_OT_BOOL, 0, N_("offline (domain's inactive) migration")}, {"p2p", VSH_OT_BOOL, 0, N_("peer-2-peer migration")}, {"direct", VSH_OT_BOOL, 0, N_("direct migration")}, {"tunneled", VSH_OT_ALIAS, 0, "tunnelled"}, @@ -6729,6 +6730,10 @@ doMigrate(void *opaque) if (vshCommandOptBool(cmd, "unsafe")) flags |= VIR_MIGRATE_UNSAFE; + if (vshCommandOptBool(cmd, "offline")) { + flags |= VIR_MIGRATE_OFFLINE; + } + if (xmlfile && virFileReadAll(xmlfile, 8192, &xml) < 0) { vshError(ctl, _("file '%s' doesn't exist"), xmlfile); diff --git a/tools/virsh.pod b/tools/virsh.pod index e0c6b42..2545455 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1026,13 +1026,14 @@ I<--total> for only the total stats, I<start> for only the per-cpu stats of the CPUs from I<start>, I<count> for only I<count> CPUs' stats. -=item B<migrate> [I<--live>] [I<--direct>] [I<--p2p> [I<--tunnelled>]] +=item B<migrate> [I<--live>] [I<--offline>] [I<--direct>] [I<--p2p> [I<--tunnelled>]] [I<--persistent>] [I<--undefinesource>] [I<--suspend>] [I<--copy-storage-all>] [I<--copy-storage-inc>] [I<--change-protection>] [I<--unsafe>] [I<--verbose>] I<domain> I<desturi> [I<migrateuri>] [I<dname>] [I<--timeout> B<seconds>] [I<--xml> B<file>] -Migrate domain to another host. Add I<--live> for live migration; I<--p2p> +Migrate domain to another host. Add I<--live> for live migration; +I<--offline> for offline (domain's inactive) migration; <--p2p> for peer-2-peer migration; I<--direct> for direct migration; or I<--tunnelled> for tunnelled migration. I<--persistent> leaves the domain persistent on destination host, I<--undefinesource> undefines the domain on the source host, -- 1.7.1

4 5

Re: [libvirt] [PATCH v13] support offline migration
by li guang 19 Nov '12

19 Nov '12

在 2012-11-09五的 08:44 +0800，li guang写道： > > diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c > > index 978af57..6c2bf98 100644 > > --- a/src/qemu/qemu_driver.c > > +++ b/src/qemu/qemu_driver.c > > @@ -9796,7 +9796,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, > > asyncJob = QEMU_ASYNC_JOB_NONE; > > } > > > > - if (!virDomainObjIsActive(vm)) { > > + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) > { > > virReportError(VIR_ERR_OPERATION_INVALID, > > "%s", _("domain is not running")); > > goto endjob; > > @@ -9805,9 +9805,9 @@ qemuDomainMigrateBegin3(virDomainPtr domain, > > /* Check if there is any ejected media. > > * We don't want to require them on the destination. > > */ > > - > > - if (qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0) > > - goto endjob; > > + if (virDomainObjIsActive(vm)) > > + if (qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0) > > + goto endjob; > > > > if (!(xml = qemuMigrationBegin(driver, vm, xmlin, dname, > > cookieout, cookieoutlen, > > What if you want to offline migrate a domain that is currently running? > I think it's better to first move qemuDomainCheckEjectableMedia down to > qemuMigrationBegin in a separate patch and then just use the code from > v12 (without using the offline label). sorry, I don't like to do offline migrate for a domain that's running. > > > diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c > > index 5f8a9c5..66fbc02 100644 > > --- a/src/qemu/qemu_migration.c > > +++ b/src/qemu/qemu_migration.c > > @@ -72,6 +72,7 @@ enum qemuMigrationCookieFlags { > > QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE, > > QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT, > > QEMU_MIGRATION_COOKIE_FLAG_NETWORK, > > + QEMU_MIGRATION_COOKIE_FLAG_OFFLINE, > > > > QEMU_MIGRATION_COOKIE_FLAG_LAST > > }; > > @@ -79,13 +80,14 @@ enum qemuMigrationCookieFlags { > > VIR_ENUM_DECL(qemuMigrationCookieFlag); > > VIR_ENUM_IMPL(qemuMigrationCookieFlag, > > QEMU_MIGRATION_COOKIE_FLAG_LAST, > > - "graphics", "lockstate", "persistent", "network"); > > + "graphics", "lockstate", "persistent", "network", > "offline"); > > > > enum qemuMigrationCookieFeatures { > > QEMU_MIGRATION_COOKIE_GRAPHICS = (1 << > QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS), > > QEMU_MIGRATION_COOKIE_LOCKSTATE = (1 << > QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE), > > QEMU_MIGRATION_COOKIE_PERSISTENT = (1 << > QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT), > > QEMU_MIGRATION_COOKIE_NETWORK = (1 << > QEMU_MIGRATION_COOKIE_FLAG_NETWORK), > > + QEMU_MIGRATION_COOKIE_OFFLINE = (1 << > QEMU_MIGRATION_COOKIE_FLAG_OFFLINE), > > }; > > > > typedef struct _qemuMigrationCookieGraphics > qemuMigrationCookieGraphics; > > @@ -594,6 +596,9 @@ qemuMigrationCookieXMLFormat(struct qemud_driver > *driver, > > if ((mig->flags & QEMU_MIGRATION_COOKIE_NETWORK) && mig->network) > > qemuMigrationCookieNetworkXMLFormat(buf, mig->network); > > > > + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) > > + virBufferAsprintf(buf, " <offline/>\n"); > > + > > virBufferAddLit(buf, "</qemu-migration>\n"); > > return 0; > > } > > @@ -874,6 +879,11 @@ > qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, > > (!(mig->network = qemuMigrationCookieNetworkXMLParse(ctxt)))) > > goto error; > > > > + if ((flags & QEMU_MIGRATION_COOKIE_OFFLINE)) { > > + if (virXPathBoolean("count(./offline) > 0", ctxt)) > > + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; > > + } > > + > > return 0; > > > > error: > > @@ -938,6 +948,10 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr > mig, > > return -1; > > } > > > > + if (flags & QEMU_MIGRATION_COOKIE_OFFLINE) { > > + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; > > + } > > + > > if (!(*cookieout = qemuMigrationCookieXMLFormatStr(driver, mig))) > > return -1; > > > > Oh, I'm sorry for not noticing this earlier, but why exactly do we need > this <offline/> element in migration cookie? It doesn't look like we need to > store some additional data required for offline migration. I think just > passing the VIR_MIGRATE_OFFLINE flag will be better. Not to mention that if an older > libvirt gets a cookie with <offline/> element, it will just ignore it > while passing a flag (which the code should already been doing anyway) should > make it fail for unsupported flag. without this how do you know you a offline migration at target side? > > > @@ -1443,6 +1457,24 @@ char *qemuMigrationBegin(struct qemud_driver > *driver, > > QEMU_MIGRATION_COOKIE_LOCKSTATE) < 0) > > goto cleanup; > > > > + if (flags & VIR_MIGRATE_OFFLINE) { > > + if (flags & (VIR_MIGRATE_NON_SHARED_DISK| > > + VIR_MIGRATE_NON_SHARED_INC)) { > > + virReportError(VIR_ERR_OPERATION_INVALID, > > + "%s", _("offline migration cannot handle > non-shared storage")); > > + goto cleanup; > > + } > > + if (!(flags & VIR_MIGRATE_PERSIST_DEST)) { > > + virReportError(VIR_ERR_OPERATION_INVALID, > > + "%s", _("offline migration must be > specified with the persistent flag set")); > > + goto cleanup; > > + } > > + if (qemuMigrationBakeCookie(mig, driver, vm, > > + cookieout, cookieoutlen, > > + QEMU_MIGRATION_COOKIE_OFFLINE) < > 0) > > + goto cleanup; > > + } > > + > > if (xmlin) { > > if (!(def = virDomainDefParseString(driver->caps, xmlin, > > QEMU_EXPECTED_VIRT_TYPES, > > Good, just wrap the two long lines and create a separate patch (which > this one > will depend on) to move qemuDomainCheckEjectableMedia here as well. > > > @@ -1607,6 +1639,15 @@ qemuMigrationPrepareAny(struct qemud_driver > *driver, > > goto endjob; > > } > > > > + if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, > cookieinlen, > > + > QEMU_MIGRATION_COOKIE_OFFLINE))) > > + return ret; > > AS I wrote in my last review, this needs to call goto endjob rather than > returning directly. right, will fix. > > > + > > + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) { > > + ret = 0; > > + goto done; > > + } > > + > > /* Start the QEMU daemon, with the same command-line arguments > plus > > * -incoming $migrateFrom > > */ > ... > > @@ -2150,6 +2192,9 @@ qemuMigrationRun(struct qemud_driver *driver, > > return -1; > > } > > > > + if (flags & VIR_MIGRATE_OFFLINE) > > + return 0; > > + > > if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, > cookieinlen, > > > QEMU_MIGRATION_COOKIE_GRAPHICS))) > > goto cleanup; > > I still think we should not even get into qemuMigrationRun when doing > offline migration. No, it will get into here for I did not touch migrationPerform path, initially I don't want to change any code at libvirt.c so I must keep offline migration walk through whole path like normal, or there're maybe lots of fixes, any will break up the migration path. > > > @@ -2665,7 +2710,12 @@ static int doPeer2PeerMigrate3(struct > qemud_driver *driver, > > uri, &uri_out, flags, dname, resource, dom_xml); > > qemuDomainObjExitRemoteWithDriver(driver, vm); > > } > > + > > VIR_FREE(dom_xml); > > + > > + if (flags & VIR_MIGRATE_OFFLINE) > > + goto cleanup; > > + > > if (ret == -1) > > goto cleanup; > > > > Quoting from my previous review: > > This will skip not only Perform but also Finish phase in > peer-to-peer migration. You want to jump to finish label and do that *after* the > check for ret == 1. OK, I will jump to finish label. > > > @@ -2771,7 +2821,7 @@ finish: > > vm->def->name); > > > > cleanup: > > - if (ddomain) { > > + if (ddomain || (flags & VIR_MIGRATE_OFFLINE)) { > > virObjectUnref(ddomain); > > ret = 0; > > } else { > > I think this should not be changed at all. > or you'll get an error for ret = -1. > ... > > diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c > > index 393b67b..54ba63a 100644 > > --- a/tools/virsh-domain.c > > +++ b/tools/virsh-domain.c > > @@ -6644,6 +6644,7 @@ static const vshCmdInfo info_migrate[] = { > > > > static const vshCmdOptDef opts_migrate[] = { > > {"live", VSH_OT_BOOL, 0, N_("live migration")}, > > + {"offline", VSH_OT_BOOL, 0, N_("offline (domain's inactive) > migration")}, > > {"p2p", VSH_OT_BOOL, 0, N_("peer-2-peer migration")}, > > {"direct", VSH_OT_BOOL, 0, N_("direct migration")}, > > {"tunneled", VSH_OT_ALIAS, 0, "tunnelled"}, > > @@ -6729,6 +6730,15 @@ doMigrate(void *opaque) > > if (vshCommandOptBool(cmd, "unsafe")) > > flags |= VIR_MIGRATE_UNSAFE; > > > > + if (vshCommandOptBool(cmd, "offline")) { > > + flags |= VIR_MIGRATE_OFFLINE; > > + } > > + > > + if (virDomainIsActive(dom) && (flags & VIR_MIGRATE_OFFLINE)) { > > + vshError(ctl, "%s", _("domain is active, offline migration > for inactive domain only")); > > + goto out; > > + } > > + > > Another thing I didn't notice last time :-( Is there any reason why > offline migrating a running domain should be forbidden? But even if there was a > reason, this check doesn't belong to virsh. like I said before, running domain is active, so it's not offline, if you want offline process to do job for an active domain, I think an explicit flag is required. > And --ofline flag for virsh migrate should also be documented in virsh > man page. > got it, I'll add this to virsh man page. > Jirka > > -- li guang lig.fnst(a)cn.fujitsu.com linux kernel team at FNST, china

3 10

[libvirt] Plan A or Plan B?
by Gene Czarcinski 19 Nov '12

19 Nov '12

1 0

[libvirt] [PATCH] virsh: add aliases 'boot', 'stop', and 'restart'
by Eric Blake 19 Nov '12

19 Nov '12

https://bugzilla.redhat.com/show_bug.cgi?id=873344 suggested that the grouping 'boot', 'shutdown', 'reboot'; as well as the grouping 'start', 'stop', 'restart'; might be easier to remember than the current mix of 'start', 'shutdown', 'reboot'. * tools/virsh-domain.c (domManagementCmds): Add other command names. * tools/virsh.pod (start, shutdown, reboot): Document the aliases. --- This patch documents both spellings. An alternative would be to leave the alternate spellings as hidden aliases (virsh has support for that), but still mention them in virsh.pod (see how we did an alias for nodedev-dettach, for reference). tools/virsh-domain.c | 3 +++ tools/virsh.pod | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 393b67b..86ed4d3 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8298,6 +8298,7 @@ const vshCmdDef domManagementCmds[] = { {"blockjob", cmdBlockJob, opts_block_job, info_block_job, 0}, {"blockpull", cmdBlockPull, opts_block_pull, info_block_pull, 0}, {"blockresize", cmdBlockResize, opts_block_resize, info_block_resize, 0}, + {"boot", cmdStart, opts_start, info_start, 0}, {"change-media", cmdChangeMedia, opts_change_media, info_change_media, 0}, #ifndef WIN32 {"console", cmdConsole, opts_console, info_console, 0}, @@ -8351,6 +8352,7 @@ const vshCmdDef domManagementCmds[] = { {"numatune", cmdNumatune, opts_numatune, info_numatune, 0}, {"reboot", cmdReboot, opts_reboot, info_reboot, 0}, {"reset", cmdReset, opts_reset, info_reset, 0}, + {"restart", cmdReboot, opts_reboot, info_reboot, 0}, {"restore", cmdRestore, opts_restore, info_restore, 0}, {"resume", cmdResume, opts_resume, info_resume, 0}, {"save", cmdSave, opts_save, info_save, 0}, @@ -8367,6 +8369,7 @@ const vshCmdDef domManagementCmds[] = { {"setvcpus", cmdSetvcpus, opts_setvcpus, info_setvcpus, 0}, {"shutdown", cmdShutdown, opts_shutdown, info_shutdown, 0}, {"start", cmdStart, opts_start, info_start, 0}, + {"stop", cmdShutdown, opts_shutdown, info_shutdown, 0}, {"suspend", cmdSuspend, opts_suspend, info_suspend, 0}, {"ttyconsole", cmdTTYConsole, opts_ttyconsole, info_ttyconsole, 0}, {"undefine", cmdUndefine, opts_undefine, info_undefine, 0}, diff --git a/tools/virsh.pod b/tools/virsh.pod index e0c6b42..7a3835b 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1124,6 +1124,7 @@ If I<--config> is specified, affect the next boot of a persistent guest. If I<--current> is specified, affect the current guest state. =item B<reboot> I<domain> [I<--mode acpi|agent>] +=item B<restart> I<domain> [I<--mode acpi|agent>] Reboot a domain. This acts just as if the domain had the B<reboot> command run from the console. The command returns as soon as it has @@ -1523,6 +1524,7 @@ be hot-plugged the next time the domain is booted. As such, it must only be used with the I<--config> flag, and not with the I<--live> flag. =item B<shutdown> I<domain> [I<--mode acpi|agent>] +=item B<stop> I<domain> [I<--mode acpi|agent>] Gracefully shuts down a domain. This coordinates with the domain OS to perform graceful shutdown, so there is no guarantee that it will @@ -1543,6 +1545,8 @@ can specify C<acpi> or C<agent>. =item B<start> I<domain-name-or-uuid> [I<--console>] [I<--paused>] [I<--autodestroy>] [I<--bypass-cache>] [I<--force-boot>] +=item B<boot> I<domain-name-or-uuid> [I<--console>] [I<--paused>] +[I<--autodestroy>] [I<--bypass-cache>] [I<--force-boot>] Start a (previously defined) inactive domain, either from the last B<managedsave> state, or via a fresh boot if no managedsave state is -- 1.7.11.7

10 24

[libvirt] [PATCH] qemu: allow larger discrepency between memory & currentMemory in domain xml
by Laine Stump 17 Nov '12

17 Nov '12

This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=873134 The reported problem is that an attempt to restore a saved domain that was configured with <currentMemory> and <memory> set to some (same for both) number that's not a multiple of 4096KiB results in an error like this: error: Failed to start domain libvirt_test_api error: XML error: current memory '4001792k' exceeds maximum '4000768k' (in this case, currentMemory was set to 4000000KiB). The reason for this failure is: 1) a saved image contains the "live xml" of the domain at the time of the save. 2) the live xml of a running domain gets its currentMemory (a.k.a. cur_balloon) directly from the qemu monitor rather than from the configuration of the domain. 3) the value reported by qemu is (sometimes) not exactly what was originally given to qemu when the domain was started, but is rounded up to [some indeterminate granularity] - in some versions of qemu that granularity is apparently 1MiB, and in others it is 4MiB. 4) When the XML is parsed to setup the state of the restored domain, the XML parser for <currentMemory> compares it to <memory> (which is the maximum allowed memory size for the domain) and if <currentMemory> is greater than the next 1024KiB boundary above <memory>, it spits out an error and fails. For example (from the BZ) if you start qemu on RHEL6 with both <currentMemory> and <memory> of 4000000 (this number is in KiB), libvirt's dominfo or dumpxml will report "4001792" back (rounded up to next 4MiB) for 10-20 seconds after the start, then revert to reporting "4000000". On Fedora 16 (which uses qemu-1.0), it will instead report "4000768" (rounded up to next 1MiB). On Fedora 17 (qemu-1.2), it seems to always report "4000000". ("4000000" is of course okay, and "4000768" is also okay since that's the next 1024KiB boundary above "4000000" and the parser was already allowing for that. But "4001792 is *not* okay and produces the error message.) This patch solves the problem by changing the allowed "fudge factor" when parsing from 1024KiB to 4096KiB to match the maximum up-rounding that could be done in qemu. (I had earlier thought to fix this by up-rounding <memory> in the dumpxml that's put into the saved image, but that wouldn't have fixed the case where the save image was produced by an "unfixed" libvirtd.) --- src/conf/domain_conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9f2029b..2dd4490 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8644,10 +8644,10 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, if (def->mem.cur_balloon > def->mem.max_balloon) { /* Older libvirt could get into this situation due to - * rounding; if the discrepancy is less than 1MiB, we silently + * rounding; if the discrepancy is less than 4MiB, we silently * round down, otherwise we flag the issue. */ - if (VIR_DIV_UP(def->mem.cur_balloon, 1024) > - VIR_DIV_UP(def->mem.max_balloon, 1024)) { + if (VIR_DIV_UP(def->mem.cur_balloon, 4096) > + VIR_DIV_UP(def->mem.max_balloon, 4096)) { virReportError(VIR_ERR_XML_ERROR, _("current memory '%lluk' exceeds " "maximum '%lluk'"), -- 1.7.11.7

2 1

[libvirt] [PATCH] add ppc64 and s390x to arches where qemu-kvm exists
by Dan Horák 17 Nov '12

17 Nov '12

QEMU in Fedora >= 18 is configured with ppc64 and s390x as architectures where KVM is enabled. --- libvirt.spec.in | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 9aa2fb2..35c103b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -53,7 +53,13 @@ %define with_qemu_tcg %{with_qemu} # Change if we ever provide qemu-kvm binaries on non-x86 hosts -%ifarch %{ix86} x86_64 +%if 0%{?fedora} >= 18 +%define qemu_kvm_arches %{ix86} x86_64 ppc64 s390x +%else +%define qemu_kvm_arches %{ix86} x86_64 +%endif + +%ifarch %{qemu_kvm_arches} %define with_qemu_kvm %{with_qemu} %else %define with_qemu_kvm 0 -- 1.7.7.6

2 2

[libvirt] [ANNOUNCE] libvirt-glib 0.1.4 release
by Daniel P. Berrange 17 Nov '12

17 Nov '12

I am pleased to announce that a new release of the libvirt-glib package, version 0.1.4, is now available from ftp://libvirt.org/libvirt/glib/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) New in this release: - Add support for configuring power management config - Add API binding for updating device config - Avoid SEGV when querying storage volune with NULL name - Avoid reference count leak when constructing wrapped libvirt objects - Avoid calling g_type_init for newer glib - Add flags for domain reboot API - Fix leak with GMutex compatibility wrappers - Don't use storage volumes before the pool refresh finishes - Add binding for destroying storage pools - Add binding for defining storage pools libvirt-glib comprises three distinct libraries: - libvirt-glib - Integrate with the GLib event loop and error handling - libvirt-gconfig - Representation of libvirt XML documents as GObjects - libvirt-gobject - Mapping of libvirt APIs into the GObject type system NB: While libvirt aims to be API/ABI stable forever, with libvirt-glib we are not yet guaranteeing that libvirt-glib libraries are API/ABI permanently stable. As of the 0.0.8 release, we have tentatively frozen the API/ABI with the intent of being longterm stable hereafter, but there is still a small chance we might find flaws requiring an API/ABI change. The likelihood of this is low, however, and we will strive to avoid it. Follow up comments about libvirt-glib should be directed to the regular libvir-list(a)redhat.com development list. Thanks to all the people involved in contributing to this release. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCHv3 0/4] Use nodeGetCPUCount/virNodeGetCPUMap where appropriate
by Viktor Mihajlovski 17 Nov '12

17 Nov '12

This series concludes the introduction of the virNodeGetCPUMap API by replacing the usage of virNodeGetInfo for computing the maximum number of node CPUs with either nodeGetCPUCount or virNodeGetCPUMap. It's basically a resend of the original 3-patch series plus the nodeGetCPUCount fix. Event in the light of Peter Krempa's recent CPU topology fix this series is still relevant. 1/4 is needed to support older kernels 2/4 is not strictly required but is more efficient 3/4 and 4/4 are required for correct function of vcpu pinning calls of python and virsh clients when talking to libvirtd 1.0.0. V3 Changes: - pulled in the nodeGetCPUCount patch for older kernels - changed commit message of 2/4 V2 Changes: Rework based on Eric's feedback: - Use nodeGetCPUCount instead of nodeGetCPUMap - Avoid code bloat by computing node CPU count in a helper function Viktor Mihajlovski (4): nodeinfo: enable nodeGetCPUCount for older kernels qemu, lxc: Change host CPU number detection logic. python: Use virNodeGetCPUMap where possible virsh: Use virNodeGetCPUMap if possible python/libvirt-override.c | 87 ++++++++++++++++++++++++++++------------------- src/lxc/lxc_controller.c | 8 ++--- src/nodeinfo.c | 33 +++++++++++++++--- src/qemu/qemu_driver.c | 14 +++----- src/qemu/qemu_process.c | 8 ++--- tools/virsh-domain.c | 32 ++++++++++++----- 6 files changed, 114 insertions(+), 68 deletions(-) -- 1.7.12.4

2 15

[libvirt] Easy reproducer for multiple races and segfaults in libvirtd
by Richard W.M. Jones 17 Nov '12

17 Nov '12

You need to read the instructions at the top, and download the following appliance too: http://libguestfs.org/download/binaries/appliance/appliance-1.18.9.tar.xz So far I've filed the following bugs: https://bugzilla.redhat.com/show_bug.cgi?id=875741 https://bugzilla.redhat.com/show_bug.cgi?id=877110 https://bugzilla.redhat.com/show_bug.cgi?id=877312 https://bugzilla.redhat.com/show_bug.cgi?id=877429 https://bugzilla.redhat.com/show_bug.cgi?id=877430 Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

2 6

[libvirt] [PATCH] snapshot: require user to supply external memory file name
by Eric Blake 16 Nov '12

16 Nov '12

For disk snapshots, the user could request an external snapshot but not supply a filename; later on, we would check this condition and generate a suitable name if possible, or gracefully error out when not possible (such as when the original file was a block device). But unless we come up with a suitable way to generate external memory file names, we have no later code point that was checking for NULL, so we should forbid this up front. * src/conf/snapshot_conf.c (virDomainSnapshotDefParseString): Avoid NULL deref, since we don't generate names yet. --- src/conf/snapshot_conf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 1ee4017..72bdd30 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -293,6 +293,12 @@ virDomainSnapshotDefParseString(const char *xmlStr, memoryFile); goto cleanup; } + if (!memoryFile && + def->memory == VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("external memory snapshots require a filename")); + goto cleanup; + } } else if (memoryFile) { def->memory = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; } else if (flags & VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE) { -- 1.7.11.7

2 2

[libvirt] [PATCH] qemu: add bootindex for usb-host and usb-redir devices
by Ján Tomko 16 Nov '12

16 Nov '12

Allow bootindex to be specified for redirected USB devices and host USB devices. Bug: https://bugzilla.redhat.com/show_bug.cgi?id=805414 --- Bootindex for these devices is supported since QEMU 1.1.0 (or commit 65bb3a5c) but the actual booting from usb-host devices is broken since a844ed84 (before 1.2.0). I haven't tested it with usb-redir yet. --- docs/schemas/domaincommon.rng | 3 +++ src/conf/domain_conf.h | 4 ++-- src/qemu/qemu_capabilities.c | 10 ++++++++++ src/qemu/qemu_capabilities.h | 2 ++ src/qemu/qemu_command.c | 37 ++++++++++++++++++++++++++++++------- 5 files changed, 47 insertions(+), 9 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 2beb035..02ad477 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2779,6 +2779,9 @@ <optional> <ref name="address"/> </optional> + <optional> + <ref name="deviceBoot"/> + </optional> </element> </define> <define name="redirfilter"> diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 6539281..091879e 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -279,8 +279,8 @@ struct _virDomainDeviceInfo { * devices. */ int rombar; /* enum virDomainPciRombarMode */ char *romfile; - /* bootIndex is only user for disk, network interface, and - * hostdev devices. */ + /* bootIndex is only used for disk, network interface, hostdev + * and redirdev devices */ int bootIndex; }; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5ce93f2..6ce2638 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -191,6 +191,8 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "vnc", "drive-mirror", /* 115 */ + "usb-redir.bootindex", + "usb-host.bootindex", ); struct _qemuCaps { @@ -1325,6 +1327,11 @@ static struct qemuCapsStringFlags qemuCapsObjectPropsPixx4PM[] = { static struct qemuCapsStringFlags qemuCapsObjectPropsUsbRedir[] = { { "filter", QEMU_CAPS_USB_REDIR_FILTER }, + { "bootindex", QEMU_CAPS_USB_REDIR_BOOTINDEX }, +}; + +static struct qemuCapsStringFlags qemuCapsObjectPropsUsbHost[] = { + { "bootindex", QEMU_CAPS_USB_HOST_BOOTINDEX }, }; struct qemuCapsObjectTypeProps { @@ -1350,6 +1357,8 @@ static struct qemuCapsObjectTypeProps qemuCapsObjectProps[] = { ARRAY_CARDINALITY(qemuCapsObjectPropsPixx4PM) }, { "usb-redir", qemuCapsObjectPropsUsbRedir, ARRAY_CARDINALITY(qemuCapsObjectPropsUsbRedir) }, + { "usb-host", qemuCapsObjectPropsUsbHost, + ARRAY_CARDINALITY(qemuCapsObjectPropsUsbHost) }, }; @@ -1545,6 +1554,7 @@ qemuCapsExtractDeviceStr(const char *qemu, "-device", "PIIX4_PM,?", "-device", "usb-redir,?", "-device", "ide-drive,?", + "-device", "usb-host,?", NULL); /* qemu -help goes to stdout, but qemu -device ? goes to stderr. */ virCommandSetErrorBuffer(cmd, &output); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index fb88aa1..751b3ec 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -153,6 +153,8 @@ enum qemuCapsFlags { QEMU_CAPS_BLOCK_COMMIT = 113, /* block-commit */ QEMU_CAPS_VNC = 114, /* Is -vnc available? */ QEMU_CAPS_DRIVE_MIRROR = 115, /* drive-mirror monitor command */ + QEMU_CAPS_USB_REDIR_BOOTINDEX = 116, /* usb-redir.bootindex */ + QEMU_CAPS_USB_HOST_BOOTINDEX = 117, /* usb-host.bootindex */ 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 440fd62..93079f3 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3504,6 +3504,16 @@ qemuBuildRedirdevDevStr(virDomainDefPtr def, } } + if (dev->info.bootIndex) { + if (!qemuCapsGet(caps, QEMU_CAPS_USB_REDIR_BOOTINDEX)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("USB redirection booting is not " + "supported by this version of QEMU")); + goto error; + } + virBufferAsprintf(&buf, ",bootindex=%d", dev->info.bootIndex); + } + if (qemuBuildDeviceAddressStr(&buf, &dev->info, caps) < 0) goto error; @@ -3540,6 +3550,8 @@ qemuBuildUSBHostdevDevStr(virDomainHostdevDefPtr dev, dev->source.subsys.u.usb.device); } virBufferAsprintf(&buf, ",id=%s", dev->info->alias); + if (dev->info->bootIndex) + virBufferAsprintf(&buf, ",bootindex=%d", dev->info->bootIndex); if (qemuBuildDeviceAddressStr(&buf, dev->info, caps) < 0) goto error; @@ -6439,16 +6451,27 @@ qemuBuildCommandLine(virConnectPtr conn, if (hostdev->info->bootIndex) { if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || - hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) { + (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI && + hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("booting from assigned devices is only" - " supported for PCI devices")); - goto error; - } else if (!qemuCapsGet(caps, QEMU_CAPS_PCI_BOOTINDEX)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("booting from assigned PCI devices is not" - " supported with this version of qemu")); + " supported for PCI and USB devices")); goto error; + } else { + if (hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI && + !qemuCapsGet(caps, QEMU_CAPS_PCI_BOOTINDEX)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("booting from assigned PCI devices is not" + " supported with this version of qemu")); + goto error; + } + if (hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB && + !qemuCapsGet(caps, QEMU_CAPS_USB_HOST_BOOTINDEX)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("booting from assigned USB devices is not" + " supported with this version of qemu")); + goto error; + } } } -- 1.7.8.6

3 4