- 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> + + + 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 (Since 1.0.1) IPv6. + + + <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

[libvirt] RFC: xml-snapshot-data out-of-sync to .qcow2 data
by Philipp Hahn 16 Nov '12

16 Nov '12

Hello Eric, hello List, As QEMU stores the snapshot data inside the qcow2 files, modifing them directly might bring libvirts snapshot data out-of-sync. In my case a user replaced a qcow2 with a new file re-using the old name. libvirt still thinks that the snapshots are valid, while in reality the data is missing: > # virsh snapshot-revert snap-test foo > error: internal error Child process (/usr/bin/qemu-img snapshot -a foo /var/lib/libvirt/images/snap-test.qcow2) status unexpected: exit status 1 What would fix this scenario would be a validation mechanism within libvirt, which walks all snapshots and checks, if each referenced qcow2 file actually has the required snaphot data and mark the snapshot as invalid otherwise. This would require an addition to the xml data to add such a flag. Or I could tell my users again not to re-use names still used by older snapshots, but that doesn't work as you see ;-) Comments? Sincerely Philipp -- Philipp Hahn Open Source Software Engineer hahn(a)univention.de Univention GmbH be open. fon: +49 421 22 232- 0 Mary-Somerville-Str.1 D-28359 Bremen fax: +49 421 22 232-99 http://www.univention.de/

2 1

[libvirt] [PATCH] virsh: fix uninitialized variable in cmdSnapshotEdit
by Ján Tomko 16 Nov '12

16 Nov '12

If the domain can't be looked up, name is used unitialized after the cleanup label. Found by coverity. --- tools/virsh-snapshot.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 4281109..0bd9583 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -459,7 +459,7 @@ cmdSnapshotEdit(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom = NULL; virDomainSnapshotPtr snapshot = NULL; virDomainSnapshotPtr edited = NULL; - const char *name; + const char *name = NULL; const char *edited_name; bool ret = false; unsigned int getxml_flags = VIR_DOMAIN_XML_SECURE; @@ -532,7 +532,7 @@ cmdSnapshotEdit(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - if (!ret) + if (!ret && name) vshError(ctl, _("Failed to update %s"), name); if (edited) virDomainSnapshotFree(edited); -- 1.7.8.6

3 4

[libvirt] [PATCH v3] qemu: Allow the user to specify vendor and product for disk
by Osier Yang 16 Nov '12

16 Nov '12

QEMU supports setting vendor and product strings for disk since 1.2.0 (only scsi-disk, scsi-hd, scsi-cd support it), this patch exposes it with new XML elements <vendor> and <product> of disk device. --- docs/formatdomain.html.in | 12 +++++ docs/schemas/domaincommon.rng | 14 ++++++ src/conf/domain_conf.c | 44 ++++++++++++++++++++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 29 +++++++++++++ src/util/util.c | 12 +++++ src/util/util.h | 2 + ...qemuxml2argv-disk-scsi-disk-vpd-build-error.xml | 35 ++++++++++++++++ .../qemuxml2argv-disk-scsi-disk-vpd.args | 13 ++++++ .../qemuxml2argv-disk-scsi-disk-vpd.xml | 38 +++++++++++++++++ tests/qemuxml2argvtest.c | 8 ++++ tests/qemuxml2xmltest.c | 2 + 13 files changed, 212 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index c8da33d..a5a7418 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1657,6 +1657,18 @@ of 16 hexadecimal digits. Since 0.10.1 </dd> + <dt><code>vendor</code></dt> + <dd>If present, this element specifies the vendor of a virtual hard + disk or CD-ROM device. It must not be longer than 8 alphanumeric + characters. + Since 1.0.1 + </dd> + <dt><code>product</code></dt> + <dd>If present, this element specifies the product of a virtual hard + disk or CD-ROM device. It must not be longer than 16 alphanumeric + characters. + Since 1.0.1 + </dd> <dt><code>host</code></dt> <dd>The <code>host</code> element has two attributes "name" and "port", which specify the hostname and the port number. The meaning of this diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 02ad477..fe8158b 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -905,6 +905,20 @@ <ref name="wwn"/> </element> </optional> + <optional> + <element name="vendor"> + <data type='string'> + <param name='pattern'>[a-zA-Z0-9]{0,8}</param> + </data> + </element> + </optional> + <optional> + <element name="product"> + <data type='string'> + <param name='pattern'>[a-zA-Z0-9]{0,16}</param> + </data> + </element> + </optional> </interleave> </define> <define name="snapshot"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 99f03a9..702758f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -979,6 +979,8 @@ void virDomainDiskDefFree(virDomainDiskDefPtr def) VIR_FREE(def->mirror); VIR_FREE(def->auth.username); VIR_FREE(def->wwn); + VIR_FREE(def->vendor); + VIR_FREE(def->product); if (def->auth.secretType == VIR_DOMAIN_DISK_SECRET_TYPE_USAGE) VIR_FREE(def->auth.secret.usage); virStorageEncryptionFree(def->encryption); @@ -3498,6 +3500,8 @@ cleanup: goto cleanup; } +#define VENDOR_LEN 8 +#define PRODUCT_LEN 16 /* Parse the XML definition for a disk * @param node XML nodeset to parse for disk definition @@ -3550,6 +3554,8 @@ virDomainDiskDefParseXML(virCapsPtr caps, char *logical_block_size = NULL; char *physical_block_size = NULL; char *wwn = NULL; + char *vendor = NULL; + char *product = NULL; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -3888,6 +3894,36 @@ virDomainDiskDefParseXML(virCapsPtr caps, if (!virValidateWWN(wwn)) goto error; + } else if (!vendor && + xmlStrEqual(cur->name, BAD_CAST "vendor")) { + vendor = (char *)xmlNodeGetContent(cur); + + if (strlen(vendor) > VENDOR_LEN) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("disk vendor is more than 8 characters")); + goto error; + } + + if (!virStrIsAlnum(vendor)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("disk vendor is not alphanumeric string")); + goto error; + } + } else if (!product && + xmlStrEqual(cur->name, BAD_CAST "product")) { + product = (char *)xmlNodeGetContent(cur); + + if (strlen(vendor) > PRODUCT_LEN) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("disk product is more than 16 characters")); + goto error; + } + + if (!virStrIsAlnum(product)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("disk product is not alphanumeric string")); + goto error; + } } else if (xmlStrEqual(cur->name, BAD_CAST "boot")) { /* boot is parsed as part of virDomainDeviceInfoParseXML */ } @@ -4184,6 +4220,10 @@ virDomainDiskDefParseXML(virCapsPtr caps, serial = NULL; def->wwn = wwn; wwn = NULL; + def->vendor = vendor; + vendor = NULL; + def->product = product; + product = NULL; if (driverType) { def->format = virStorageFileFormatTypeFromString(driverType); @@ -4257,6 +4297,8 @@ cleanup: VIR_FREE(logical_block_size); VIR_FREE(physical_block_size); VIR_FREE(wwn); + VIR_FREE(vendor); + VIR_FREE(product); ctxt->node = save_ctxt; return def; @@ -12094,6 +12136,8 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAddLit(buf, " <transient/>\n"); virBufferEscapeString(buf, " <serial>%s</serial>\n", def->serial); virBufferEscapeString(buf, " <wwn>%s</wwn>\n", def->wwn); + virBufferEscapeString(buf, " <vendor>%s</vendor>\n", def->vendor); + virBufferEscapeString(buf, " <product>%s</product>\n", def->product); if (def->encryption) { virBufferAdjustIndent(buf, 6); if (virStorageEncryptionFormat(buf, def->encryption) < 0) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 091879e..51609ba 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -591,6 +591,8 @@ struct _virDomainDiskDef { char *serial; char *wwn; + char *vendor; + char *product; int cachemode; int error_policy; /* enum virDomainDiskErrorPolicy */ int rerror_policy; /* enum virDomainDiskErrorPolicy */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5a07139..02e30a8 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1279,6 +1279,7 @@ virSetUIDGID; virSkipSpaces; virSkipSpacesAndBackslash; virSkipSpacesBackwards; +virStrIsAlnum; virStrToDouble; virStrToLong_i; virStrToLong_l; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 22bb209..7a249d4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2428,6 +2428,13 @@ qemuBuildDriveDevStr(virDomainDefPtr def, } } + if ((disk->vendor || disk->product) && + disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only scsi disk supports vendor and product")); + goto error; + } + if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { /* make sure that both the bus and the qemu binary support * type='lun' (SG_IO). @@ -2455,6 +2462,11 @@ qemuBuildDriveDevStr(virDomainDefPtr def, _("Setting wwn is not supported for lun device")); goto error; } + if (disk->vendor || disk->product) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting vendor or product is not supported for lun device")); + goto error; + } } switch (disk->bus) { @@ -2504,6 +2516,17 @@ qemuBuildDriveDevStr(virDomainDefPtr def, goto error; } + /* Properties wwn, vendor and product were introduced in the + * same QEMU release (1.2.0). + */ + if ((disk->vendor || disk->product) && + !qemuCapsGet(caps, QEMU_CAPS_SCSI_DISK_WWN)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting vendor or product for scsi disk is not " + "supported by this QEMU")); + goto error; + } + controllerModel = virDomainDiskFindControllerModel(def, disk, VIR_DOMAIN_CONTROLLER_TYPE_SCSI); @@ -2649,6 +2672,12 @@ qemuBuildDriveDevStr(virDomainDefPtr def, if (disk->wwn) virBufferAsprintf(&opt, ",wwn=%s", disk->wwn); + if (disk->vendor) + virBufferAsprintf(&opt, ",vendor=%s", disk->vendor); + + if (disk->product) + virBufferAsprintf(&opt, ",product=%s", disk->product); + if (virBufferError(&opt)) { virReportOOMError(); goto error; diff --git a/src/util/util.c b/src/util/util.c index 75b18c1..73f06ec 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -3114,3 +3114,15 @@ virValidateWWN(const char *wwn) { return true; } + +bool +virStrIsAlnum(const char *str) +{ + int i; + + for (i = 0; str[i]; i++) + if (!c_isalnum(str[i])) + return false; + + return true; +} diff --git a/src/util/util.h b/src/util/util.h index 4316ab1..ae1fa9e 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -280,4 +280,6 @@ bool virIsDevMapperDevice(const char *dev_name) ATTRIBUTE_NONNULL(1); bool virValidateWWN(const char *wwn); +bool virStrIsAlnum(const char *str); + #endif /* __VIR_UTIL_H__ */ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml new file mode 100644 index 0000000..ca68275 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml @@ -0,0 +1,35 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='cdrom'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sda' bus='virtio'/> + <vendor>SEAGATE</vendor> + <product>ST3146707LC</product> + </disk> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='sdb' bus='scsi'/> + <vendor>SEAGATE</vendor> + <product>ST3567807GD</product> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='scsi' index='1' model='lsilogic'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args new file mode 100644 index 0000000..f5c1999 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args @@ -0,0 +1,13 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ +-device lsi,id=scsi1,bus=pci.0,addr=0x4 \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \ +-device scsi-cd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ +id=scsi0-0-0-0,vendor=SEAGATE,product=ST3146707LC \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi1-0-0 \ +-device scsi-hd,bus=scsi1.0,scsi-id=0,drive=drive-scsi1-0-0,\ +id=scsi1-0-0,vendor=SEAGATE,product=ST3567807GD \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml new file mode 100644 index 0000000..96786e3 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml @@ -0,0 +1,38 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='cdrom'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sda' bus='scsi'/> + <readonly/> + <vendor>SEAGATE</vendor> + <product>ST3146707LC</product> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='sdb' bus='scsi'/> + <readonly/> + <vendor>SEAGATE</vendor> + <product>ST3567807GD</product> + <address type='drive' controller='1' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='scsi' index='1' model='lsilogic'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 48e09ab..8f98882 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -505,6 +505,14 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI, QEMU_CAPS_SCSI_DISK_WWN); + DO_TEST("disk-scsi-disk-vpd", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI, + QEMU_CAPS_SCSI_DISK_WWN); + DO_TEST_FAILURE("disk-scsi-disk-vpd-build-error", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI, + QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-scsi-vscsi", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-scsi-virtio-scsi", diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 1d366f1..88ef050 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -239,6 +239,8 @@ mymain(void) DO_TEST("seclabel-none"); DO_TEST("numad-static-vcpu-no-numatune"); + DO_TEST("disk-scsi-disk-vpd"); + /* These tests generate different XML */ DO_TEST_DIFFERENT("balloon-device-auto"); DO_TEST_DIFFERENT("channel-virtio-auto"); -- 1.7.7.6

2 1

[libvirt] [PATCH] beautify code indent in qemu migration
by liguang 16 Nov '12

16 Nov '12

Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- src/qemu/qemu_migration.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 716365f..0e00cac 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -692,12 +692,10 @@ qemuMigrationCookieXMLFormat(struct qemud_driver *driver, qemuMigrationCookieFlagTypeToString(i)); } - if ((mig->flags & QEMU_MIGRATION_COOKIE_GRAPHICS) && - mig->graphics) + if ((mig->flags & QEMU_MIGRATION_COOKIE_GRAPHICS) && mig->graphics) qemuMigrationCookieGraphicsXMLFormat(buf, mig->graphics); - if ((mig->flags & QEMU_MIGRATION_COOKIE_LOCKSTATE) && - mig->lockState) { + if ((mig->flags & QEMU_MIGRATION_COOKIE_LOCKSTATE) && mig->lockState) { virBufferAsprintf(buf, " <lockstate driver='%s'>\n", mig->lockDriver); virBufferAsprintf(buf, " <leases>%s</leases>\n", @@ -705,8 +703,7 @@ qemuMigrationCookieXMLFormat(struct qemud_driver *driver, virBufferAddLit(buf, " </lockstate>\n"); } - if ((mig->flags & QEMU_MIGRATION_COOKIE_PERSISTENT) && - mig->persistent) { + if ((mig->flags & QEMU_MIGRATION_COOKIE_PERSISTENT) && mig->persistent) { virBufferAdjustIndent(buf, 2); if (qemuDomainDefFormatBuf(driver, mig->persistent, @@ -790,7 +787,6 @@ qemuMigrationCookieGraphicsXMLParse(xmlXPathContextPtr ctxt) /* Optional */ grap->tlsSubject = virXPathString("string(./graphics/cert[@info='subject']/@value)", ctxt); - return grap; no_memory: @@ -821,7 +817,7 @@ qemuMigrationCookieNetworkXMLParse(xmlXPathContextPtr ctxt) } optr->nnets = n; - if (VIR_ALLOC_N(optr->net, optr->nnets) <0) + if (VIR_ALLOC_N(optr->net, optr->nnets) < 0) goto no_memory; for (i = 0; i < n; i++) { @@ -1137,8 +1133,7 @@ qemuMigrationEatCookie(struct qemud_driver *driver, qemuMigrationCookiePtr mig = NULL; /* Parse & validate incoming cookie (if any) */ - if (cookiein && cookieinlen && - cookiein[cookieinlen-1] != '\0') { + if (cookiein && cookieinlen && cookiein[cookieinlen-1] != '\0') { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Migration cookie was not NULL terminated")); goto error; @@ -1204,8 +1199,7 @@ qemuMigrationIsAllowed(struct qemud_driver *driver, virDomainObjPtr vm, "%s", _("domain is marked for auto destroy")); return false; } - if ((nsnapshots = virDomainSnapshotObjListNum(vm->snapshots, NULL, - 0))) { + if ((nsnapshots = virDomainSnapshotObjListNum(vm->snapshots, NULL, 0))) { virReportError(VIR_ERR_OPERATION_INVALID, _("cannot migrate domain with %d snapshots"), nsnapshots); -- 1.7.1

4 4

[libvirt] [PATCH][thinner] beautify code indent in qemu migration
by liguang 16 Nov '12

16 Nov '12

Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- src/qemu/qemu_migration.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 9e7ee4f..7a4142c 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -790,7 +790,6 @@ qemuMigrationCookieGraphicsXMLParse(xmlXPathContextPtr ctxt) /* Optional */ grap->tlsSubject = virXPathString("string(./graphics/cert[@info='subject']/@value)", ctxt); - return grap; no_memory: @@ -821,7 +820,7 @@ qemuMigrationCookieNetworkXMLParse(xmlXPathContextPtr ctxt) } optr->nnets = n; - if (VIR_ALLOC_N(optr->net, optr->nnets) <0) + if (VIR_ALLOC_N(optr->net, optr->nnets) < 0) goto no_memory; for (i = 0; i < n; i++) { -- 1.7.1

2 1

[libvirt] [test-API][PATCH] Fix a problem in cpu_affinity
by Wayne Sun 16 Nov '12

16 Nov '12

int() with base 16 will cause problem when cpu number bigger than 10, so change it as default with base 10. Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- repos/domain/cpu_affinity.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/repos/domain/cpu_affinity.py b/repos/domain/cpu_affinity.py index ee585e6..e710968 100644 --- a/repos/domain/cpu_affinity.py +++ b/repos/domain/cpu_affinity.py @@ -151,7 +151,7 @@ def vcpu_affinity_check(domain_name, vcpu, expected_pinned_cpu, hypervisor): task_list = output.split('\n')[1:] vcpu_task = task_list[int(vcpu)] - actual_pinned_cpu = int(vcpu_task.split('\t')[1], 16) + actual_pinned_cpu = int(vcpu_task.split('\t')[1]) elif 'el5' in host_kernel_version: cmd_get_task_list = "grep Cpus_allowed /proc/%s/task/*/status" % pid status, output = commands.getstatusoutput(cmd_get_task_list) -- 1.7.1

2 3

[libvirt] [PATCH] virsh: save: report an error if XML file can't be read
by Ján Tomko 16 Nov '12

16 Nov '12

Bug: https://bugzilla.redhat.com/show_bug.cgi?id=876868 --- tools/virsh-domain.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 86ed4d3..df38618 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2945,8 +2945,10 @@ doSave(void *opaque) goto out; if (xmlfile && - virFileReadAll(xmlfile, 8192, &xml) < 0) + virFileReadAll(xmlfile, 8192, &xml) < 0) { + vshReportError(ctl); goto out; + } if (((flags || xml) ? virDomainSaveFlags(dom, to, xml, flags) -- 1.7.8.6

2 1

[libvirt] [PATCH v2] sanlock: Retry after EINPROGRESS
by Michal Privoznik 15 Nov '12

15 Nov '12

It may take some time for sanlock to add a lockspace. And if user restart libvirtd service meanwhile, the fresh daemon can fail adding the same lockspace with EINPROGRESS. Recent sanlock has sanlock_inq_lockspace() function which should block until lockspace changes state. If we are building against older sanlock we should retry a few times before claiming an error. This issue can be easily reproduced: for i in {1..1000} ; do echo $i; service libvirtd restart; sleep 2; done 20 Stopping libvirtd daemon: [FAILED] Starting libvirtd daemon: [ OK ] 21 Stopping libvirtd daemon: [ OK ] Starting libvirtd daemon: [ OK ] 22 Stopping libvirtd daemon: [ OK ] Starting libvirtd daemon: [ OK ] error : virLockManagerSanlockSetupLockspace:334 : Unable to add lockspace /var/lib/libvirt/sanlock/__LIBVIRT__DISKS__: Operation now in progress --- diff to v1: -after IRC discussion with sanlock devel I've found this API so whe ought use it whenever possible. configure.ac | 7 +++++++ src/locking/lock_driver_sanlock.c | 35 ++++++++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 9108ea8..849d787 100644 --- a/configure.ac +++ b/configure.ac @@ -1223,6 +1223,13 @@ if test "x$with_sanlock" != "xno"; then AC_DEFINE_UNQUOTED([HAVE_SANLOCK_KILLPATH], 1, [whether Sanlock supports sanlock_killpath]) fi + + AC_CHECK_LIB([sanlock_client], [sanlock_inq_lockspace], + [sanlock_inq_lockspace=yes], [sanlock_inq_lockspace=no]) + if test "x$sanlock_inq_lockspace" = "xyes" ; then + AC_DEFINE_UNQUOTED([HAVE_SANLOCK_INQ_LOCKSPACE], 1, + [whether sanlock supports sanlock_inq_lockspace]) + fi fi fi AM_CONDITIONAL([HAVE_SANLOCK], [test "x$with_sanlock" = "xyes"]) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index d24f3d6..430e11e 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -184,6 +184,11 @@ static int virLockManagerSanlockLoadConfig(const char *configFile) return 0; } +/* How much ms sleep before retrying to add a lockspace? */ +#define LOCKSPACE_SLEEP 100 +/* How many times try adding a lockspace? */ +#define LOCKSPACE_RETRIES 10 + static int virLockManagerSanlockSetupLockspace(void) { int fd = -1; @@ -192,6 +197,9 @@ static int virLockManagerSanlockSetupLockspace(void) struct sanlk_lockspace ls; char *path = NULL; char *dir = NULL; +#ifndef HAVE_SANLOCK_INQ_LOCKSPACE + int retries = LOCKSPACE_RETRIES; +#endif if (virAsprintf(&path, "%s/%s", driver->autoDiskLeasePath, @@ -318,11 +326,32 @@ static int virLockManagerSanlockSetupLockspace(void) } ls.host_id = driver->hostID; - /* Stage 2: Try to register the lockspace with the daemon. - * If the lockspace is already registered, we should get EEXIST back - * in which case we can just carry on with life + /* Stage 2: Try to register the lockspace with the daemon. If the lockspace + * is already registered, we should get EEXIST back in which case we can + * just carry on with life. If EINPROGRESS is returned, we have two options: + * either call a sanlock API that blocks us until lockspace changes state, + * or we can fallback to polling. */ +#ifndef HAVE_SANLOCK_INQ_LOCKSPACE +retry: +#endif if ((rv = sanlock_add_lockspace(&ls, 0)) < 0) { + if (-rv == EINPROGRESS) { +#ifdef HAVE_SANLOCK_INQ_LOCKSPACE + /* we have this function which blocks until lockspace change the + * state. It returns 0 if lockspace has been added, -ENOENT if it + * hasn't. XXX should we goto retry? */ + VIR_DEBUG("Inquiring lockspace"); + rv = sanlock_inq_lockspace(&ls, SANLK_INQ_WAIT); +#else + /* fall back to polling */ + if (retries--) { + usleep(LOCKSPACE_SLEEP * 1000); + VIR_DEBUG("Retrying to add lockspace (left %d)", retries); + goto retry; + } +#endif + } if (-rv != EEXIST) { if (rv <= -200) virReportError(VIR_ERR_INTERNAL_ERROR, -- 1.7.8.6

2 1

[libvirt] [libvirt-glib 1/2] Fix glib version check for g_type_init
by Christophe Fergeau 15 Nov '12

15 Nov '12

g_type_init has been deprecated in glib 2.35, not 2.34. With versions older than 2.35, we have to call it or we'll get a runtime failure. --- libvirt-gconfig/libvirt-gconfig-compat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-gconfig/libvirt-gconfig-compat.h b/libvirt-gconfig/libvirt-gconfig-compat.h index 85a420d..3719896 100644 --- a/libvirt-gconfig/libvirt-gconfig-compat.h +++ b/libvirt-gconfig/libvirt-gconfig-compat.h @@ -25,7 +25,7 @@ #include <glib-object.h> -#if GLIB_CHECK_VERSION(2, 34, 0) +#if GLIB_CHECK_VERSION(2, 35, 0) #define g_type_init() #endif -- 1.8.0

3 7

[libvirt] [PATCH] qemu conf: Use host-model for cpu mode by default
by Ichikawa, Ken 15 Nov '12

15 Nov '12

Now, qemu guest's default cpu model is qemu32/64 and it can be configured per domain. In some case, host-model mode is suitable for getting enough performance in the guest because of features from cpu spec. This patch adds a config option to qemu.conf to use 'host-model' mode as default and allow users to use host-model mode in domains on a host. This is useful because - Guest owners don't need to touch their domain's config. - An administrator can reduce an item in their checklist for VM performance and guarantee all guests should run in the best performance. Signed-off-by: Ken ICHIKAWA <ichikawa.ken(a)jp.fujitsu.com> --- src/qemu/qemu.conf | 7 +++++++ src/qemu/qemu_command.c | 6 ++++++ src/qemu/qemu_conf.c | 4 ++++ src/qemu/qemu_conf.h | 1 + 4 files changed, 18 insertions(+) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index dd853c8..5f60237 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -401,3 +401,10 @@ # Defaults to -1. # #seccomp_sandbox = 1 + + +# Use 'host-model' for cpu mode when cpu is not defined in +# domain xml file. +# 1 = on, 0 = off(default). +# +#make_default_cpu_host_model = 1 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1e96982..8fdac2d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4111,6 +4111,12 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, else default_model = "qemu64"; + if (def->cpu == NULL && driver->makeDefaultCPUHostModel){ + if (VIR_ALLOC(def->cpu) < 0) + goto no_memory; + def->cpu->mode = VIR_CPU_MODE_HOST_MODEL; + } + if (def->cpu && (def->cpu->mode != VIR_CPU_MODE_CUSTOM || def->cpu->model)) { virCPUCompareResult cmp; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index dc4d680..92b9c38 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -575,6 +575,10 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, CHECK_TYPE("seccomp_sandbox", VIR_CONF_LONG); if (p) driver->seccompSandbox = p->l; + p = virConfGetValue(conf, "make_default_cpu_host_model"); + CHECK_TYPE("make_default_cpu_host_model", VIR_CONF_LONG); + if (p) driver->makeDefaultCPUHostModel = p->l; + virConfFree(conf); return 0; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 2c7f70c..b0a76f4 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -156,6 +156,7 @@ struct qemud_driver { int keepAliveInterval; unsigned int keepAliveCount; int seccompSandbox; + unsigned int makeDefaultCPUHostModel; }; typedef struct _qemuDomainCmdlineDef qemuDomainCmdlineDef; -- 1.7.11.7

4 4

[libvirt] Release planning suggestions for next releases
by Daniel Veillard 15 Nov '12

15 Nov '12

I just checked and we have "only" 63 commits since 1.0.0 was released, so even if we were to increase the rate dramatically next week, it doesn't look like there is a high pressure for a release at the end of the month. Taking into account the extra factors that end of December is usually low traffic, and that I'm trying to take real vacations first week of December (nearly no internet access), I think we could slightly change the two next release schedules to accomodate those: - push 1.0.1 mid-December - push 1.0.2 at the end of January Did I miss a reason to not delay the push of 1.0.1 and keep it at the end of the month ? Or other problems with this plan ? Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH 0/5] Structured error logging and syslog support
by Miloslav Trmač 15 Nov '12

15 Nov '12

This is sort of a v2 of the "Structured syslog" series. Patches 1-4 allow callers virLogMessage to add arbitrary additional data, and use it in virRaiseErrorFull and its callers. This data is sent to journal (and ignored for other outputs). Because the additional fields for errors include virErrorDomain and virErrorNumber, this allows _programs_ to _automatically_ detect the event and react to it, perhaps alerting the user. Patch 5 adds the "syslog/json" log output type, in a way that is comparably async-signal-safe to the other log outputs (i.e. it's not safe by the letter of the standard, but safe in practice). I still think that having this format output is desirable, but I'll accept it if you decide that it is not wanted in libvirt. Miloslav Trmač (5): Add a metadata parameter to virLog{,V}Message Add metadata to virLogOutputFunc Use helper functions to format the journal iov array Add detailed error information to journal Add "syslog/json" log output format. docs/logging.html.in | 3 + src/util/logging.c | 445 +++++++++++++++++++++++++++++++++++++++++++-------- src/util/logging.h | 27 +++- src/util/viraudit.c | 4 +- src/util/virterror.c | 33 +++- tests/testutils.c | 1 + 6 files changed, 437 insertions(+), 76 deletions(-) -- 1.7.11.7

4 13

[libvirt] [PATCH v2] qemu: Allow the user to specify vendor and product for disk
by Osier Yang 15 Nov '12

15 Nov '12

QEMU supports to set vendor and product strings for disk since 1.2.0 (only scsi-disk, scsi-hd, scsi-cd support it), this patch exposes it with new XML elements <vendor> and <product> of disk device. --- docs/formatdomain.html.in | 12 ++++++ docs/schemas/domaincommon.rng | 10 +++++ src/conf/domain_conf.c | 42 ++++++++++++++++++++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 29 +++++++++++++ src/util/util.c | 12 ++++++ src/util/util.h | 2 + ...qemuxml2argv-disk-scsi-disk-vpd-build-error.xml | 35 ++++++++++++++++ ...qemuxml2argv-disk-scsi-disk-vpd-parse-error.xml | 36 +++++++++++++++++ .../qemuxml2argv-disk-scsi-disk-vpd.args | 13 ++++++ .../qemuxml2argv-disk-scsi-disk-vpd.xml | 36 +++++++++++++++++ tests/qemuxml2argvtest.c | 12 ++++++ 13 files changed, 242 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-parse-error.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index c8da33d..a5a7418 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1657,6 +1657,18 @@ of 16 hexadecimal digits. Since 0.10.1 </dd> + <dt><code>vendor</code></dt> + <dd>If present, this element specifies the vendor of a virtual hard + disk or CD-ROM device. It must not be longer than 8 alphanumeric + characters. + Since 1.0.1 + </dd> + <dt><code>product</code></dt> + <dd>If present, this element specifies the product of a virtual hard + disk or CD-ROM device. It must not be longer than 16 alphanumeric + characters. + Since 1.0.1 + </dd> <dt><code>host</code></dt> <dd>The <code>host</code> element has two attributes "name" and "port", which specify the hostname and the port number. The meaning of this diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 2beb035..ed7d1d0 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -905,6 +905,16 @@ <ref name="wwn"/> </element> </optional> + <optional> + <element name="vendor"> + <text/> + </element> + </optional> + <optional> + <element name="product"> + <text/> + </element> + </optional> </interleave> </define> <define name="snapshot"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 99f03a9..e2f729e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -979,6 +979,8 @@ void virDomainDiskDefFree(virDomainDiskDefPtr def) VIR_FREE(def->mirror); VIR_FREE(def->auth.username); VIR_FREE(def->wwn); + VIR_FREE(def->vendor); + VIR_FREE(def->product); if (def->auth.secretType == VIR_DOMAIN_DISK_SECRET_TYPE_USAGE) VIR_FREE(def->auth.secret.usage); virStorageEncryptionFree(def->encryption); @@ -3498,6 +3500,8 @@ cleanup: goto cleanup; } +#define VENDOR_LEN 8 +#define PRODUCT_LEN 16 /* Parse the XML definition for a disk * @param node XML nodeset to parse for disk definition @@ -3550,6 +3554,8 @@ virDomainDiskDefParseXML(virCapsPtr caps, char *logical_block_size = NULL; char *physical_block_size = NULL; char *wwn = NULL; + char *vendor = NULL; + char *product = NULL; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -3888,6 +3894,36 @@ virDomainDiskDefParseXML(virCapsPtr caps, if (!virValidateWWN(wwn)) goto error; + } else if (!vendor && + xmlStrEqual(cur->name, BAD_CAST "vendor")) { + vendor = (char *)xmlNodeGetContent(cur); + + if (strlen(vendor) > VENDOR_LEN) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("disk vendor is more than 8 characters")); + goto error; + } + + if (!virStrIsAlpha(vendor)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("disk vendor is not alphanemuric string")); + goto error; + } + } else if (!product && + xmlStrEqual(cur->name, BAD_CAST "product")) { + product = (char *)xmlNodeGetContent(cur); + + if (strlen(vendor) > PRODUCT_LEN) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("disk product is more than 16 characters")); + goto error; + } + + if (!virStrIsAlpha(product)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("disk product is not alphanemuric string")); + goto error; + } } else if (xmlStrEqual(cur->name, BAD_CAST "boot")) { /* boot is parsed as part of virDomainDeviceInfoParseXML */ } @@ -4184,6 +4220,10 @@ virDomainDiskDefParseXML(virCapsPtr caps, serial = NULL; def->wwn = wwn; wwn = NULL; + def->vendor = vendor; + vendor = NULL; + def->product = product; + product = NULL; if (driverType) { def->format = virStorageFileFormatTypeFromString(driverType); @@ -4257,6 +4297,8 @@ cleanup: VIR_FREE(logical_block_size); VIR_FREE(physical_block_size); VIR_FREE(wwn); + VIR_FREE(vendor); + VIR_FREE(product); ctxt->node = save_ctxt; return def; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 6539281..c7c1ca6 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -591,6 +591,8 @@ struct _virDomainDiskDef { char *serial; char *wwn; + char *vendor; + char *product; int cachemode; int error_policy; /* enum virDomainDiskErrorPolicy */ int rerror_policy; /* enum virDomainDiskErrorPolicy */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5a07139..3bcdf68 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1279,6 +1279,7 @@ virSetUIDGID; virSkipSpaces; virSkipSpacesAndBackslash; virSkipSpacesBackwards; +virStrIsAlpha; virStrToDouble; virStrToLong_i; virStrToLong_l; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1e96982..ec2bbd8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2428,6 +2428,13 @@ qemuBuildDriveDevStr(virDomainDefPtr def, } } + if ((disk->vendor || disk->product) && + disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only scsi disk supports vendor and product")); + goto error; + } + if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { /* make sure that both the bus and the qemu binary support * type='lun' (SG_IO). @@ -2455,6 +2462,11 @@ qemuBuildDriveDevStr(virDomainDefPtr def, _("Setting wwn is not supported for lun device")); goto error; } + if (disk->vendor || disk->product) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting vendor or product is not supported for lun device")); + goto error; + } } switch (disk->bus) { @@ -2504,6 +2516,17 @@ qemuBuildDriveDevStr(virDomainDefPtr def, goto error; } + /* Properties wwn, vendor and product were introduced in the + * same QEMU release (1.2.0). + */ + if ((disk->vendor || disk->product) && + !qemuCapsGet(caps, QEMU_CAPS_SCSI_DISK_WWN)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting vendor or product for scsi disk is not " + "supported by this QEMU")); + goto error; + } + controllerModel = virDomainDiskFindControllerModel(def, disk, VIR_DOMAIN_CONTROLLER_TYPE_SCSI); @@ -2649,6 +2672,12 @@ qemuBuildDriveDevStr(virDomainDefPtr def, if (disk->wwn) virBufferAsprintf(&opt, ",wwn=%s", disk->wwn); + if (disk->vendor) + virBufferAsprintf(&opt, ",vendor=%s", disk->vendor); + + if (disk->product) + virBufferAsprintf(&opt, ",product=%s", disk->product); + if (virBufferError(&opt)) { virReportOOMError(); goto error; diff --git a/src/util/util.c b/src/util/util.c index 75b18c1..26a22c4 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -3114,3 +3114,15 @@ virValidateWWN(const char *wwn) { return true; } + +bool +virStrIsAlpha(const char *str) +{ + int i; + + for (i = 0; str[i]; i++) + if (!c_isalnum(str[i])) + return false; + + return true; +} diff --git a/src/util/util.h b/src/util/util.h index 4316ab1..64e047c 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -280,4 +280,6 @@ bool virIsDevMapperDevice(const char *dev_name) ATTRIBUTE_NONNULL(1); bool virValidateWWN(const char *wwn); +bool virStrIsAlpha(const char *str); + #endif /* __VIR_UTIL_H__ */ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml new file mode 100644 index 0000000..6ed363b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml @@ -0,0 +1,35 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='cdrom'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sda' bus='virtio'/> + <vendor>SEAGATE</vendor> + <product>ST3146707LC</product> + </disk> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='sdb' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + <vendor>SEAGATE</vendor> + <product>ST3567807GD</product> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='scsi' index='1' model='lsilogic'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-parse-error.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-parse-error.xml new file mode 100644 index 0000000..b2b127d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-parse-error.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='cdrom'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='1' unit='0'/> + <vendor>SEAGATE1111</vendor> + <product>ST_3146707LC</product> + </disk> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='sdb' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + <vendor>SEAGATE</vendor> + <product>ST3567807GD</product> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='scsi' index='1' model='lsilogic'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args new file mode 100644 index 0000000..4aefb7f --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args @@ -0,0 +1,13 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ +-device lsi,id=scsi1,bus=pci.0,addr=0x4 \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-1-0 \ +-device scsi-cd,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,\ +id=scsi0-0-1-0,vendor=SEAGATE,product=ST3146707LC \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-0-0 \ +-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ +id=scsi0-0-0-0,vendor=SEAGATE,product=ST3567807GD \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml new file mode 100644 index 0000000..4918e37 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='cdrom'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='1' unit='0'/> + <vendor>SEAGATE</vendor> + <product>ST3146707LC</product> + </disk> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='sdb' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + <vendor>SEAGATE</vendor> + <product>ST3567807GD</product> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='scsi' index='1' model='lsilogic'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 48e09ab..651351b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -505,6 +505,18 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI, QEMU_CAPS_SCSI_DISK_WWN); + DO_TEST("disk-scsi-disk-vpd", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI, + QEMU_CAPS_SCSI_DISK_WWN); + DO_TEST_PARSE_ERROR("disk-scsi-disk-vpd-parse-error", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI, + QEMU_CAPS_SCSI_DISK_WWN); + DO_TEST_FAILURE("disk-scsi-disk-vpd-build-error", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI, + QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-scsi-vscsi", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-scsi-virtio-scsi", -- 1.7.7.6

2 2

[libvirt] [PATCH 1/2] init qemu_driver's qemuImgBinary field
by liguang 15 Nov '12

15 Nov '12

Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a5592b9..eb5a3d1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1647,7 +1647,7 @@ qemuDomainSnapshotForEachQcow2Raw(struct qemud_driver *driver, int i; bool skipped = false; - qemuimgarg[0] = qemuFindQemuImgBinary(driver); + qemuimgarg[0] = driver->qemuImgBinary; if (qemuimgarg[0] == NULL) { /* qemuFindQemuImgBinary set the error */ return -1; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5f91688..a25fb53 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -626,6 +626,9 @@ qemudStartup(int privileged) { if (!qemu_driver->domainEventState) goto error; + /* find kvm-img or qemu-img */ + qemuFindQemuImgBinary(qemu_driver); + /* read the host sysinfo */ if (privileged) qemu_driver->hostsysinfo = virSysinfoRead(); -- 1.7.1

4 9

[libvirt] [PATCH v3] Autogenerate AUTHORS
by Cole Robinson 15 Nov '12

15 Nov '12

AUTHORS.in tracks the maintainers, as well as some folks who were previously in AUTHORS but don't have a git commit with proper attribution. Generated output is sorted alphabetically and lacks pretty spacing, so tweak AUTHORS.in to follow the same format. Additionally, drop the syntax-check rule that previously validated AUTHORS against git log. --- I couldn't get the latter chunk of sed magic working... and since nothing really makes me reach my frustration limit faster than Makefiles and shell trickery, I just stuck with the basic changes. v3: Fix VPATH builds Use sort -u Sort AUTHORS.in Condense bootstrap.conf change .gitignore | 1 + .mailmap | 15 +++- AUTHORS | 279 --------------------------------------------------------- AUTHORS.in | 90 +++++++++++++++++++ Makefile.am | 12 ++- bootstrap.conf | 4 +- cfg.mk | 15 ---- 7 files changed, 118 insertions(+), 298 deletions(-) delete mode 100644 AUTHORS create mode 100644 AUTHORS.in diff --git a/.gitignore b/.gitignore index c185cbc..804eda4 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ .memdump .sc-start-sc_* /ABOUT-NLS +/AUTHORS /COPYING /ChangeLog /GNUmakefile diff --git a/.mailmap b/.mailmap index 98ff6dc..c430200 100644 --- a/.mailmap +++ b/.mailmap @@ -3,7 +3,6 @@ # Email consolidation: # <Preferred address in AUTHORS> <other alias used by same author> -<amy.griffis(a)hp.com> <aron.griffis(a)hp.com> <bozzolan(a)gmail.com> <redshift(a)gmx.com> <charles_duffy(a)messageone.com> <charles(a)dyfis.net> <dfj(a)redhat.com> <dfj(a)dfj.bne.redhat.com> @@ -35,6 +34,8 @@ <gerd(a)egidy.de> <gerd.von.egidy(a)intra2net.com> <benoar(a)dolka.fr> <benjamin.cama(a)telecom-bretagne.eu> <zhlcindy(a)linux.vnet.ibm.com> <zhlcindy(a)gmail.com> +<serge.hallyn(a)canonical.com> <serue(a)us.ibm.com> +<pritesh.kothari(a)sun.com> <Pritesh.Kothari(a)Sun.COM> # Name consolidation: # Preferred author spelling <preferred email> @@ -43,3 +44,15 @@ Royce Lv <lvroyce(a)linux.vnet.ibm.com> Daniel J Walsh <dwalsh(a)redhat.com> Ján Tomko <jtomko(a)redhat.com> Gerd von Egidy <gerd(a)egidy.de> +MATSUDA Daiki <matsudadik(a)intellilink.co.jp> +Tang Chen <tangchen(a)cn.fujitsu.com> +Peng Zhou <ailvpeng25(a)gmail.com> +Dirk Herrendoerfer <d.herrendoerfer(a)herrendoerfer.name> +Thibault VINCENT <thibault.vincent(a)smartjog.com> +Aurelien Rougemont <beorn(a)binaries.fr> +Serge E. Hallyn <serge.hallyn(a)canonical.com> +Henrik Persson E <henrik.e.persson(a)ericsson.com> +Philipp Hahn <hahn(a)univention.de> +Marco Bozzolan <bozzolan(a)gmail.com> +Marco Bozzolan <redshift(a)gmx.com> +Pritesh Kothari <pritesh.kothari(a)sun.com> diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 27c4eda..0000000 --- a/AUTHORS +++ /dev/null @@ -1,279 +0,0 @@ - libvirt Authors - =============== - -The libvirt project was initiated by: - - Daniel Veillard <veillard(a)redhat.com> or <daniel(a)veillard.com> - -The primary maintainers and people with commit access rights: - - Daniel Veillard <veillard(a)redhat.com> - Daniel Berrange <berrange(a)redhat.com> - Richard W.M. Jones <rjones(a)redhat.com> - Mark McLoughlin <markmc(a)redhat.com> - Anthony Liguori <aliguori(a)us.ibm.com> - Jim Meyering <meyering(a)redhat.com> - Jim Fehlig <jfehlig(a)suse.com> - Chris Lalancette <clalance(a)redhat.com> - Cole Robinson <crobinso(a)redhat.com> - Guido Günther <agx(a)sigxcpu.org> - John Levon <john.levon(a)sun.com> - Matthias Bolte <matthias.bolte(a)googlemail.com> - Jiří Denemark <jdenemar(a)redhat.com> - Dave Allan <dallan(a)redhat.com> - Laine Stump <laine(a)redhat.com> - Stefan Berger <stefanb(a)us.ibm.com> - Eric Blake <eblake(a)redhat.com> - Justin Clift <jclift(a)redhat.com> - Osier Yang <jyang(a)redhat.com> - Wen Congyang <wency(a)cn.fujitsu.com> - Michal Prívozník <mprivozn(a)redhat.com> - Peter Krempa <pkrempa(a)redhat.com> - Christophe Fergeau <cfergeau(a)redhat.com> - Alex Jia <ajia(a)redhat.com> - Martin Kletzander <mkletzan(a)redhat.com> - -Previous maintainers: - Karel Zak <kzak(a)redhat.com> - Atsushi SAKAI <sakaia(a)jp.fujitsu.com> - Dave Leskovec <dlesko(a)linux.vnet.ibm.com> - Dan Smith <danms(a)us.ibm.com> - -Patches have also been contributed by: - - David Lutterkort <dlutter(a)redhat.com> - Andrew Puch <apuch(a)redhat.com> - Philippe Berthault <philippe.berthault(a)Bull.net> - Hugh Brock <hbrock(a)redhat.com> - Michel Ponceau <michel.ponceau(a)bull.net> - Jeremy Katz <katzj(a)redhat.com> - Pete Vetere <pvetere(a)redhat.com> - Kazuki Mizushima <mizushima.kazuk(a)jp.fujitsu.com> - Saori Fukuta <fukuta.saori(a)jp.fujitsu.com> - Tatsuro Enokura <fj7716hz(a)aa.jp.fujitsu.com> - Takahashi Tomohiro <takatom(a)jp.fujitsu.com> - Nobuhiro Itou <fj0873gn(a)aa.jp.fujitsu.com> - Masayuki Sunou <fj1826dm(a)aa.jp.fujitsu.com> - Mark Johnson <johnson.nh(a)gmail.com> - Christian Ehrhardt <ehrhardt(a)linux.vnet.ibm.com> - Shuveb Hussain <shuveb(a)binarykarma.com> - Jim Paris <jim(a)jtan.com> - Daniel Hokka Zakrisson <daniel(a)hozac.com> - Mads Chr. Olesen <shiyee(a)shiyee.dk> - Anton Protopopov <aspsk2(a)gmail.com> - Stefan de Konink <dekonink(a)kinkrsoftware.nl> - Kaitlin Rupert <kaitlin(a)linux.vnet.ibm.com> - Evgeniy Sokolov <evg(a)openvz.org> - David Lively <dlively(a)virtualiron.com> - Charles Duffy <Charles_Duffy(a)messageone.com> - Nguyen Anh Quynh <aquynh(a)gmail.com> - James Morris <jmorris(a)namei.org> - Chris Wright <chrisw(a)redhat.com> - Ben Guthro <ben.guthro(a)gmail.com> - Shigeki Sakamoto <fj0588di(a)aa.jp.fujitsu.com> - Gerd von Egidy <gerd(a)egidy.de> - Itamar Heim <iheim(a)redhat.com> - Markus Armbruster <armbru(a)redhat.com> - Ryota Ozaki <ozaki.ryota(a)gmail.com> - Daniel J Walsh <dwalsh(a)redhat.com> - Maximilian Wilhelm <max(a)rfc2324.org> - Pritesh Kothari <Pritesh.Kothari(a)Sun.COM> - Amit Shah <amit.shah(a)redhat.com> - Florian Vichot <florian.vichot(a)diateam.net> - Serge E. Hallyn <serue(a)us.ibm.com> - Soren Hansen <soren(a)linux2go.dk> - Abel Míguez Rodríguez<amiguezr(a)pdi.ucm.es> - Doug Goldstein <cardoe(a)cardoe.com> - Javier Fontan <jfontan(a)gmail.com> - Federico Simoncelli <fsimonce(a)redhat.com> - Amy Griffis <amy.griffis(a)hp.com> - Henrik Persson E <henrik.e.persson(a)ericsson.com> - Satoru SATOH <satoru.satoh(a)gmail.com> - Paolo Bonzini <pbonzini(a)redhat.com> - Miloslav Trmač <mitr(a)redhat.com> - Jamie Strandboge <jamie(a)canonical.com> - Gerhard Stenzel <gerhard.stenzel(a)de.ibm.com> - Matthew Booth <mbooth(a)redhat.com> - Diego Elio Pettenò <flameeyes(a)gmail.com> - Adam Litke <agl(a)us.ibm.com> - Steve Yarmie <steve.yarmie(a)gmail.com> - Dan Kenigsberg <danken(a)redhat.com> - Yuji NISHIDA <nishidy(a)nict.go.jp> - Dustin Xiong <x_k_123(a)hotmail.com> - Rolf Eike Beer <eike(a)sf-mail.de> - Wolfgang Mauerer <wolfgang.mauerer(a)siemens.com> - Philipp Hahn <hahn(a)univention.de> - Ed Swierk <eswierk(a)aristanetworks.com> - Paolo Smiraglia <paolo.smiraglia(a)gmail.com> - Sharadha Prabhakar <sharadha.prabhakar(a)citrix.com> - Chris Wong <wongc-redhat(a)hoku.net> - Daniel Berteaud <daniel(a)firewall-services.com> - Dustin Kirkland <kirkland(a)canonical.com> - Luiz Capitulino <lcapitulino(a)redhat.com> - Ryan Harper <ryanh(a)us.ibm.com> - Spencer Shimko <sshimko(a)tresys.com> - Marco Bozzolan <bozzolan(a)gmail.com> - Alex Williamson <alex.williamson(a)redhat.com> - Ersek Laszlo <lacos(a)caesar.elte.hu> - Kenneth Nagin <NAGIN(a)il.ibm.com> - Klaus Ethgen <Klaus(a)Ethgen.de> - Bryan Kearney <bkearney(a)redhat.com> - Darry L. Pierce <dpierce(a)redhat.com> - David Jorm <dfj(a)redhat.com> - Eduardo Otubo <otubo(a)linux.vnet.ibm.com> - Garry Dolley <gdolley(a)arpnetworks.com> - Harshavardhana <harsha(a)gluster.com> - Jonas Eriksson <jonas.j.eriksson(a)ericsson.com> - Jun Koi <junkoi2004(a)gmail.com> - Olivier Fourdan <ofourdan(a)redhat.com> - Ron Yorston <rmy(a)tigress.co.uk> - Shahar Klein <shaharklein(a)yahoo.com> - Taizo ITO <taizo.ito(a)hde.co.jp> - Thomas Treutner <thomas(a)scripty.at> - Jean-Baptiste Rouault <jean-baptiste.rouault(a)diateam.net> - Марк Коренберг <socketpair(a)gmail.com> - Alan Pevec <apevec(a)redhat.com> - Aurelien Rougemont <beorn(a)binaries.fr> - Patrick Dignan <pat_dignan(a)dell.com> - Serge Hallyn <serge.hallyn(a)canonical.com> - Nikunj A. Dadhania <nikunj(a)linux.vnet.ibm.com> - Lai Jiangshan <laijs(a)cn.fujitsu.com> - Harsh Prateek Bora <harsh(a)linux.vnet.ibm.com> - John Morrissey <jwm(a)horde.net> - KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> - Hu Tao <hutao(a)cn.fujitsu.com> - Laurent Léonard <laurent(a)open-minds.org> - MORITA Kazutaka <morita.kazutaka(a)lab.ntt.co.jp> - Josh Durgin <josh.durgin(a)inktank.com> - Roopa Prabhu <roprabhu(a)cisco.com> - Paweł Krześniak <pawel.krzesniak(a)gmail.com> - Kay Schubert <kayegypt(a)web.de> - Marc-André Lureau <marcandre.lureau(a)redhat.com> - Juerg Haefliger <juerg.haefliger(a)hp.com> - Matthias Dahl <mdvirt(a)designassembly.de> - Niels de Vos <ndevos(a)redhat.com> - Davidlohr Bueso <dave(a)gnu.org> - Alon Levy <alevy(a)redhat.com> - Hero Phương <herophuong93(a)gmail.com> - Zdenek Styblik <stybla(a)turnovfree.net> - Gui Jianfeng <guijianfeng(a)cn.fujitsu.com> - Michal Novotny <minovotn(a)redhat.com> - Markus Groß <gross(a)univention.de> - Phil Petty <phpetty(a)cisco.com> - Taku Izumi <izumi.taku(a)jp.fujitsu.com> - Minoru Usui <usui(a)mxm.nes.nec.co.jp> - Tiziano Mueller <dev-zero(a)gentoo.org> - Thibault VINCENT <thibault.vincent(a)smartjog.com> - Naoya Horiguchi <n-horiguchi(a)ah.jp.nec.com> - Jesse Cook <code.crashenx(a)gmail.com> - Alexander Todorov <atodorov(a)otb.bg> - Richard Laager <rlaager(a)wiktel.com> - Mark Wu <dwu(a)redhat.com> - Yufang Zhang <yuzhang(a)redhat.com> - Supriya Kannery <supriyak(a)linux.vnet.ibm.com> - Dirk Herrendoerfer <d.herrendoerfer(a)herrendoerfer.name> - Taisuke Yamada <tai(a)rakugaki.org> - Heath Petersen <HeathPetersen(a)Kandre.com> - Neil Wilson <neil(a)aldur.co.uk> - Ohad Levy <ohadlevy(a)gmail.com> - Michael Chapman <mike(a)very.puzzling.org> - Daniel Gollub <gollub(a)b1-systems.de> - David S. Wang <dwang2(a)cisco.com> - Ruben Kerkhof <ruben(a)rubenkerkhof.com> - Scott Moser <smoser(a)ubuntu.com> - Guannan Ren <gren(a)redhat.com> - John Williams <john.williams(a)petalogix.com> - Michael Santos <michael.santos(a)gmail.com> - Oskari Saarenmaa <os(a)ohmu.fi> - Nan Zhang <nzhang(a)redhat.com> - Wieland Hoffmann <themineo(a)googlemail.com> - Douglas Schilling Landgraf <dougsland(a)redhat.com> - Tom Vijlbrief <tom.vijlbrief(a)xs4all.nl> - Shradha Shah <sshah(a)solarflare.com> - Steve Hodgson <shodgson(a)solarflare.com> - Xu He Jie <xuhj(a)linux.vnet.ibm.com> - Lei Li <lilei(a)linux.vnet.ibm.com> - Matthias Witte <witte(a)netzquadrat.de> - Tang Chen <tangchen(a)cn.fujitsu.com> - Dan Horák <dan(a)danny.cz> - Sage Weil <sage(a)newdream.net> - David L Stevens <dlstevens(a)us.ibm.com> - Tyler Coumbes <coumbes(a)gmail.com> - Royce Lv <lvroyce(a)linux.vnet.ibm.com> - Patrice LACHANCE <patlachance(a)gmail.com> - Eli Qiao <taget(a)linux.vnet.ibm.com> - Michael Wood <esiotrot(a)gmail.com> - Bharata B Rao <bharata(a)linux.vnet.ibm.com> - Srivatsa S. Bhat <srivatsa.bhat(a)linux.vnet.ibm.com> - Chang Liu <lingjiao.lc(a)taobao.com> - Lorin Hochstein <lorin(a)isi.edu> - Christian Franke <nobody(a)nowhere.ws> - Prerna Saxena <prerna(a)linux.vnet.ibm.com> - Michael Ellerman <michael(a)ellerman.id.au> - Rommer <rommer(a)active.by> - Yuri Chornoivan <yurchor(a)ukr.net> - Deepak C Shetty <deepakcs(a)linux.vnet.ibm.com> - Laszlo Ersek <lersek(a)redhat.com> - Zeeshan Ali (Khattak) <zeeshanak(a)gnome.org> - Marcelo Cerri <mhcerri(a)linux.vnet.ibm.com> - Hendrik Schwartke <hendrik(a)os-t.de> - Ansis Atteka <aatteka(a)nicira.com> - Dan Wendlandt <dan(a)nicira.com> - Kyle Mestery <kmestery(a)cisco.com> - Lincoln Myers <lincoln_myers(a)yahoo.com> - Peter Robinson <pbrobinson(a)gmail.com> - Benjamin Cama <benoar(a)dolka.fr> - Duncan Rance <libvirt(a)dunquino.com> - Peng Zhou <ailvpeng25(a)gmail.com> - Li Zhang <zhlcindy(a)linux.vnet.ibm.com> - Stef Walter <stefw(a)gnome.org> - Christian Benvenuti <benve(a)cisco.com> - Ilja Livenson <ilja.livenson(a)gmail.com> - Stefan Bader <stefan.bader(a)canonical.com> - MATSUDA Daiki <matsudadik(a)intellilink.co.jp> - Jan Kiszka <jan.kiszka(a)siemens.com> - Ryan Woodsmall <rwoodsmall(a)gmail.com> - Wido den Hollander <wido(a)widodh.nl> - Eugen Feller <eugen.feller(a)inria.fr> - Dmitry Guryanov <dguryanov(a)parallels.com> - William Jon McCann <william.jon.mccann(a)gmail.com> - David Weber <wb(a)munzinger.de> - Marti Raudsepp <marti(a)juffo.org> - Radu Caragea <dmns_serp(a)yahoo.com> - Beat Jörg <Beat.Joerg(a)ssatr.ch> - Gao feng <gaofeng(a)cn.fujitsu.com> - Dipankar Sarma <dipankar(a)in.ibm.com> - Gerd Hoffmann <kraxel(a)redhat.com> - Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> - Thang Pham <thang.pham(a)us.ibm.com> - Eiichi Tsukata <eiichi.tsukata.xh(a)hitachi.com> - Sascha Peilicke <saschpe(a)suse.de> - Chuck Short <chuck.short(a)canonical.com> - Sebastian Wiedenroth <wiedi(a)frubar.net> - Ata E Husain Bohra <ata.husain(a)hotmail.com> - Ján Tomko <jtomko(a)redhat.com> - Richa Marwaha <rmarwah(a)linux.vnet.ibm.com> - Peter Feiner <peter(a)gridcentric.ca> - Frido Roose <frido.roose(a)gmail.com> - Asad Saeed <asad.saeed(a)acidseed.com> - Sukadev Bhattiprolu <sukadev(a)linux.vnet.ibm.com> - Thomas Woerner <twoerner(a)redhat.com> - J.B. Joret <jb(a)linux.vnet.ibm.com> - Stefan Hajnoczi <stefanha(a)linux.vnet.ibm.com> - Gene Czarcinski <gene(a)czarc.net> - Nishank Trivedi <nistrive(a)cisco.com> - Jasper Lievisse Adriaanse <jasper(a)humppa.nl> - Paul Eggert <eggert(a)cs.ucla.edu> - Dwight Engen <dwight.engen(a)oracle.com> - liguang <lig.fnst(a)cn.fujitsu.com> - Chuck Short <zulcss(a)gmail.com> - Alexander Larsson <alexl(a)redhat.com> - - [....send patches to get your name here....] - -The libvirt Logo was designed by Diana Fong - --- End -;; Local Variables: -;; coding: utf-8 -;; End: diff --git a/AUTHORS.in b/AUTHORS.in new file mode 100644 index 0000000..01339f2 --- /dev/null +++ b/AUTHORS.in @@ -0,0 +1,90 @@ + libvirt Authors + =============== + +The libvirt project was initiated by: + +Daniel Veillard <veillard(a)redhat.com> or <daniel(a)veillard.com> + +The primary maintainers and people with commit access rights: + +Alex Jia <ajia(a)redhat.com> +Martin Kletzander <mkletzan(a)redhat.com> +Alex Jia <ajia(a)redhat.com> +Anthony Liguori <aliguori(a)us.ibm.com> +Chris Lalancette <clalance(a)redhat.com> +Christophe Fergeau <cfergeau(a)redhat.com> +Cole Robinson <crobinso(a)redhat.com> +Daniel Berrange <berrange(a)redhat.com> +Daniel Veillard <veillard(a)redhat.com> +Dave Allan <dallan(a)redhat.com> +Eric Blake <eblake(a)redhat.com> +Guido Günther <agx(a)sigxcpu.org> +Jim Fehlig <jfehlig(a)suse.com> +Jim Meyering <meyering(a)redhat.com> +Jiří Denemark <jdenemar(a)redhat.com> +John Levon <john.levon(a)sun.com> +Justin Clift <jclift(a)redhat.com> +Laine Stump <laine(a)redhat.com> +Mark McLoughlin <markmc(a)redhat.com> +Martin Kletzander <mkletzan(a)redhat.com> +Matthias Bolte <matthias.bolte(a)googlemail.com> +Michal Prívozník <mprivozn(a)redhat.com> +Osier Yang <jyang(a)redhat.com> +Peter Krempa <pkrempa(a)redhat.com> +Richard W.M. Jones <rjones(a)redhat.com> +Stefan Berger <stefanb(a)us.ibm.com> +Wen Congyang <wency(a)cn.fujitsu.com> + +Previous maintainers: + +Atsushi SAKAI <sakaia(a)jp.fujitsu.com> +Dan Smith <danms(a)us.ibm.com> +Dave Leskovec <dlesko(a)linux.vnet.ibm.com> +Karel Zak <kzak(a)redhat.com> + +Patches have also been contributed by: + +Abel Míguez Rodríguez <amiguezr(a)pdi.ucm.es> +Amit Shah <amit.shah(a)redhat.com> +Andrew Puch <apuch(a)redhat.com> +Anton Protopopov <aspsk2(a)gmail.com> +Ben Guthro <ben.guthro(a)gmail.com> +Christian Ehrhardt <ehrhardt(a)linux.vnet.ibm.com> +Daniel Hokka Zakrisson <daniel(a)hozac.com> +Dan Wendlandt <dan(a)nicira.com> +David Lively <dlively(a)virtualiron.com> +David Lutterkort <dlutter(a)redhat.com> +Evgeniy Sokolov <evg(a)openvz.org> +Hugh Brock <hbrock(a)redhat.com> +Itamar Heim <iheim(a)redhat.com> +James Morris <jmorris(a)namei.org> +Javier Fontan <jfontan(a)gmail.com> +Jeremy Katz <katzj(a)redhat.com> +Kaitlin Rupert <kaitlin(a)linux.vnet.ibm.com> +Kazuki Mizushima <mizushima.kazuk(a)jp.fujitsu.com> +Mads Chr. Olesen <shiyee(a)shiyee.dk> +Mark Johnson <johnson.nh(a)gmail.com> +Markus Armbruster <armbru(a)redhat.com> +Masayuki Sunou <fj1826dm(a)aa.jp.fujitsu.com> +Matthias Witte <witte(a)netzquadrat.de> +Michel Ponceau <michel.ponceau(a)bull.net> +Nobuhiro Itou <fj0873gn(a)aa.jp.fujitsu.com> +Pete Vetere <pvetere(a)redhat.com> +Philippe Berthault <philippe.berthault(a)Bull.net> +Saori Fukuta <fukuta.saori(a)jp.fujitsu.com> +Shigeki Sakamoto <fj0588di(a)aa.jp.fujitsu.com> +Shuveb Hussain <shuveb(a)binarykarma.com> +Stefan de Konink <dekonink(a)kinkrsoftware.nl> +Takahashi Tomohiro <takatom(a)jp.fujitsu.com> +Tatsuro Enokura <fj7716hz(a)aa.jp.fujitsu.com> + +#authorslist# + +[....send patches to get your name here....] + +The libvirt logo was designed by Diana Fong + +-- End +;; Local Variables: +;; coding: utf-8 +;; End: diff --git a/Makefile.am b/Makefile.am index 333e300..5ab75b4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,6 +28,7 @@ EXTRA_DIST = \ cfg.mk \ examples/domain-events/events-python \ run.in \ + AUTHORS.in \ $(XML_EXAMPLES) pkgconfigdir = $(libdir)/pkgconfig @@ -78,7 +79,7 @@ MAINTAINERCLEANFILES = .git-module-status # disable this check distuninstallcheck: -dist-hook: gen-ChangeLog +dist-hook: gen-ChangeLog gen-AUTHORS # Generate the ChangeLog file (with all entries since the switch to git) # and insert it into the directory we're about to use to create a tarball. @@ -91,3 +92,12 @@ gen-ChangeLog: rm -f $(distdir)/ChangeLog; \ mv $(distdir)/cl-t $(distdir)/ChangeLog; \ fi + +.PHONY: gen-AUTHORS +gen-AUTHORS: + if test -d .git; then \ + out="$$(git log --pretty=format:'%aN <%aE>' | sort -u)" && \ + cat $(srcdir)/AUTHORS.in | perl -p -e "s/#authorslist#/$$out/" > \ + $(distdir)/AUTHORS-tmp && \ + mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \ + fi diff --git a/bootstrap.conf b/bootstrap.conf index f8b7c4d..5d391fd 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -223,8 +223,8 @@ if `(${PYTHON_CONFIG-python-config} --version; PYTHON_CONFIG=true fi -# Automake requires that ChangeLog exist. -touch ChangeLog || exit 1 +# Automake requires that ChangeLog and AUTHORS exist. +touch AUTHORS ChangeLog || exit 1 # Override bootstrap's list - we don't use mdate-sh or texinfo.tex. gnulib_extra_files=" diff --git a/cfg.mk b/cfg.mk index e1fbf4f..eed7fd8 100644 --- a/cfg.mk +++ b/cfg.mk @@ -43,7 +43,6 @@ _test_script_regex = \<$init\|test-lib$\.sh\> # Tests not to run as part of "make distcheck". local-checks-to-skip = \ changelog-check \ - check-AUTHORS \ makefile-check \ makefile_path_separator_check \ patch-check \ @@ -711,20 +710,6 @@ _autogen: $(srcdir)/autogen.sh ./config.status -# Give credit where due: -# Ensure that each commit author email address (possibly mapped via -# git log's .mailmap) appears in our AUTHORS file. -sc_check_author_list: - @fail=0; \ - for i in $$(git log --pretty=format:%aE%n|sort -u|grep -v '^$$'); do \ - sanitized=$$(echo "$$i"|LC_ALL=C sed 's/$[^a-zA-Z0-9_@-]$/\\\1/g'); \ - grep -iq "<$$sanitized>" $(srcdir)/AUTHORS \ - || { printf '%s\n' "$$i" >&2; fail=1; }; \ - done; \ - test $$fail = 1 \ - && echo '$(ME): committer(s) not listed in AUTHORS' >&2; \ - test $$fail = 0 - # regenerate HACKING as part of the syntax-check syntax-check: $(top_srcdir)/HACKING -- 1.7.11.7

3 6

[libvirt] [PATCH] util: fix index when building lock owners array
by Laine Stump 15 Nov '12

15 Nov '12

The "restart" function for locks allocates a new array according to and pre-sets its length, then reads the owner pids from a JSON document in a loop. Rather than adding each owner at a different index, though, it repeatedly overwrites the last element of the array with all the owners. --- src/util/virlockspace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 7e8c0a7..99b6182 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -435,7 +435,7 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr object) goto error; } - res->owners[res->nOwners-1] = (pid_t)owner; + res->owners[j] = (pid_t)owner; } if (virHashAddEntry(lockspace->resources, res->name, res) < 0) { -- 1.7.11.7

2 2

[libvirt] [PATCH] Fix uninitialized variable in virLXCControllerSetupDevPTS
by Daniel P. Berrange 14 Nov '12

14 Nov '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The lack of initialization of 'opts' caused a SEGV in the cleanup: path if the root->src directory did not exist Pushed under trivial rule --- src/lxc/lxc_controller.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index a41c903..2f1e8a5 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1144,7 +1144,7 @@ virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl) { virDomainFSDefPtr root = virDomainGetRootFilesystem(ctrl->def); char *mount_options = NULL; - char *opts; + char *opts = NULL; char *devpts = NULL; int ret = -1; -- 1.7.11.7

1 0

[libvirt] [libvirt-glib v2] gobject: Fix GMutex leak
by Christophe Fergeau 14 Nov '12

14 Nov '12

When GLib deprecated g_mutex_new/g_mutex_free, we introduced a compatibility wrapper to implement these using non-deprecated functions. This was done by allocating 0-filled memory by the mutex, and then letting GLib initialize the structure when needed. However, we must call g_mutex_clear when destroying the mutex to free these resources, which this patch fix. --- libvirt-gobject/libvirt-gobject-compat.c | 16 ++++++++++++++++ libvirt-gobject/libvirt-gobject-compat.h | 8 ++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-compat.c b/libvirt-gobject/libvirt-gobject-compat.c index 99cd44c..14b5eb3 100644 --- a/libvirt-gobject/libvirt-gobject-compat.c +++ b/libvirt-gobject/libvirt-gobject-compat.c @@ -103,3 +103,19 @@ g_simple_async_report_take_gerror_in_idle(GObject *object, g_object_unref(simple); } #endif + +GMutex *gvir_mutex_new(void) +{ + GMutex *mutex; + + mutex = g_new(GMutex, 1); + g_mutex_init(mutex); + + return mutex; +} + +void gvir_mutex_free(GMutex *mutex) +{ + g_mutex_clear(mutex); + g_free(mutex); +} diff --git a/libvirt-gobject/libvirt-gobject-compat.h b/libvirt-gobject/libvirt-gobject-compat.h index 839dfe1..1d45018 100644 --- a/libvirt-gobject/libvirt-gobject-compat.h +++ b/libvirt-gobject/libvirt-gobject-compat.h @@ -27,8 +27,12 @@ #include <gio/gio.h> #if GLIB_CHECK_VERSION(2, 31, 0) -#define g_mutex_new() g_new0(GMutex, 1) -#define g_mutex_free(m) g_free(m) + +void gvir_mutex_free(GMutex *mutex); +GMutex *gvir_mutex_new(void); +#define g_mutex_new gvir_mutex_new +#define g_mutex_free gvir_mutex_free + #endif #if !GLIB_CHECK_VERSION(2,26,0) -- 1.8.0

2 1

[libvirt] [RFC PATCH 1/n] snapshot: add revert-and-create branching of external snapshots
by Eric Blake 14 Nov '12

14 Nov '12

Right now, libvirt refuses to revert to the state at the time of an external snapshot, because doing so would reset things so that the next time the domain boots, we are using the backing file; but modifying the backing file invalidates all qcow2 files that are based on top of it. There are three possibilities for lifting this restriction: 1. delete all snapshot metadata and qcow2 files that are invalidated by the revert (losing changes since the snapshot) 2. perform a block commit (such as with qemu-img commit) to merge the qcow2 file back into the backing file (keeping the changes since the snapshot) 3. create NEW qcow2 files that wrap the same base file as the original snapshot (keeping the changes since the original snapshot) This patch documents the API for option 3, by adding a new flag to virDomainSnapshotCreateXML (the only snapshot-related function that takes XML, which is required to pass in new file names during the branch), and wires up virsh to expose it. Later patches will enhance virDomainRevertToSnapshot to cover options 1 and 2. API wise, an application wishing to do the revert-and-create operation must add a <branch>name</branch> element to their <domainsnapshot> XML, and pass VIR_DOMAIN_SNAPSHOT_CREATE_BRANCH in the flags argument. In virsh, snapshot-create gains a new boolean flag --branch that must match the XML passed in, and snapshot-create-as gains a new --branch=name argument along with a --current boolean for creating such XML. * include/libvirt/libvirt.h.in (VIR_DOMAIN_SNAPSHOT_CREATE_BRANCH): New flag. * src/libvirt.c (virDomainSnapshotCreateXML): Document it, and enforce some mutual exclusion. (virDomainRevertToSnapshot): Mention how to revert to an external snapshot without having to delete snapshots. * docs/formatsnapshot.html.in: Document the new <branch> element. * docs/schemas/domainsnapshot.rng: Allow new element. * tools/virsh-snapshot.c (cmdSnapshotCreate): Add --branch option. (cmdSnapshotCreateAs): Likewise, also add --current. * tools/virsh.pod (snapshot-create, snapshot-create-as): Document new usage. --- Sending this patch now, to make sure I'm on the right track. I have the following plans for the next few patches: 1. Enhance virDomainSnapshotListFlags to add two new filter groups: VIR_DOMAIN_SNAPSHOT_LIST_OFFLINE VIR_DOMAIN_SNAPSHOT_LIST_ONLINE VIR_DOMAIN_SNAPSHOT_LIST_DISK_ONLY VIR_DOMAIN_SNAPSHOT_LIST_INTERNAL VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL (and possibly VIR_DOMAIN_SNAPSHOT_LIST_MIXED if we change our stance and allow mixing internal and external in one snapshot) 2. Add a flag to virDomainSnapshotParseFlags in src/conf/snapshot_conf.h; when present, the new element is parsed, and appropriate elements of the in-memory snapshot representation are copied in from the existing external snapshot. 3. Implement the new flag in qemu_driver.c for creation. Note that branching works for both disk-only (whether offline or online) and checkpoints - the new snapshot will share the same memory (none or external) as the original, and all that really changes is the creation (or reuse) of new backing files. 4. Think about ramifications on revert - right now, with no options, revert means to go back to the state where the snapshot was created; but now that we allow the creation of branches, and since the branches have external disk state which persists even when not on the branch, we need a new revert flag that says to revert to an external snapshots and its subsequent changes 5. Think about ramifications on delete - for example, if two branches of external snapshots share a common memory state file, and we delete only one of the two branches, the memory state file must not be deleted. docs/formatsnapshot.html.in | 23 +++++++++++++++++++---- docs/schemas/domainsnapshot.rng | 5 +++++ include/libvirt/libvirt.h.in | 3 +++ src/libvirt.c | 35 ++++++++++++++++++++++++++++++----- tools/virsh-snapshot.c | 31 ++++++++++++++++++++++++++----- tools/virsh.pod | 16 ++++++++++++++-- 6 files changed, 97 insertions(+), 16 deletions(-) diff --git a/docs/formatsnapshot.html.in b/docs/formatsnapshot.html.in index 8fcc04c..5018f41 100644 --- a/docs/formatsnapshot.html.in +++ b/docs/formatsnapshot.html.in @@ -87,7 +87,12 @@ sets that snapshot as current, and the prior current snapshot is the parent of the new snapshot. Branches in the hierarchy can be formed by reverting to a snapshot with a child, then creating - another snapshot. + another snapshot. In the case of external snapshots, modifying + the backing files would invalidate all external files that + depend on the backing file, so the action of reverting to a + snapshot must be accompanied by either a request to delete all + invalidated snapshots, or to create a new snapshot at the same + time as the revert. The top-level <code>domainsnapshot</code> element may contain @@ -188,9 +193,19 @@ </dd> <dt><code>parent</code></dt> <dd>The parent of this snapshot. If present, this element - contains exactly one child element, name. This specifies the - name of the parent snapshot of this snapshot, and is used to - represent trees of snapshots. Readonly. + contains exactly one child element, <code>name</code>. This + specifies the name of the parent snapshot of this snapshot, + and is used to represent trees of snapshots. Readonly. + </dd> + <dt><code>branch</code></dt> + <dd>The name of an existing external snapshot that forms the + branch point for this snapshot. Required when creating a + snapshot with + the <code>VIR_DOMAIN_SNAPSHOT_CREATE_BRANCH</code> flag, and + not present on output. When creating a branch snapshot, the + same set of <code>disks</code> must be external, + and <code>memory</code> is copied from the branch + point. since 1.0.1. </dd> <dt><code>domain</code></dt> <dd>The domain that this snapshot was taken against. Older diff --git a/docs/schemas/domainsnapshot.rng b/docs/schemas/domainsnapshot.rng index 45d55b5..6721e8f 100644 --- a/docs/schemas/domainsnapshot.rng +++ b/docs/schemas/domainsnapshot.rng @@ -85,6 +85,11 @@ </element> </element> </optional> + <optional> + <element name='parent'> + <text/> + </element> + </optional> </interleave> </element> </define> diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index bf584a0..53d21ce 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -3775,6 +3775,9 @@ typedef enum { VIR_DOMAIN_SNAPSHOT_CREATE_LIVE = (1 << 8), /* create the snapshot while the guest is running */ + VIR_DOMAIN_SNAPSHOT_CREATE_BRANCH = (1 << 9), /* specify an existing + external snapshot as + the branching point */ } virDomainSnapshotCreateFlags; /* Take a snapshot of the current VM state */ diff --git a/src/libvirt.c b/src/libvirt.c index bcb8233..e88effc 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -17747,9 +17747,7 @@ virDomainSnapshotGetConnect(virDomainSnapshotPtr snapshot) * normally fails if snapshot metadata still remains on the source * machine). When redefining snapshot metadata, the current snapshot * will not be altered unless the VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT - * flag is also present. It is an error to request the - * VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT flag without - * VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE. On some hypervisors, + * flag is also present. On some hypervisors, * redefining an existing snapshot can be used to alter host-specific * portions of the domain XML to be used during revert (such as * backing filenames associated with disk devices), but must not alter @@ -17788,6 +17786,15 @@ virDomainSnapshotGetConnect(virDomainSnapshotPtr snapshot) * is not present, an error is thrown. Moreover, this flag requires * VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY to be passed as well. * + * If @flags includes VIR_DOMAIN_SNAPSHOT_CREATE_BRANCH, then @xmlDesc + * must describe an existing external snapshot as well as actions to + * create a new snapshot from the point where the existing snapshot was + * created rather than the current state of the guest. In this mode, + * the new snapshot branch is created but not activated unless the + * VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT flag is also present. It is an + * error to request VIR_DOMAIN_SNAPSHOT_CREATE_LIVE or + * VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE in this mode. + * * By default, if the snapshot involves external files, and any of the * destination files already exist as a non-empty regular file, the * snapshot is rejected to avoid losing contents of those files. @@ -17844,9 +17851,11 @@ virDomainSnapshotCreateXML(virDomainPtr domain, } if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT) && - !(flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE)) { + !(flags & (VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE | + VIR_DOMAIN_SNAPSHOT_CREATE_BRANCH))) { virReportInvalidArg(flags, - _("use of 'current' flag in %s requires 'redefine' flag"), + _("use of 'current' flag in %s requires 'redefine' " + "or 'branch' flag"), __FUNCTION__); goto error; } @@ -17864,6 +17873,14 @@ virDomainSnapshotCreateXML(virDomainPtr domain, __FUNCTION__); goto error; } + if (!!(flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) + + !!(flags & VIR_DOMAIN_SNAPSHOT_CREATE_LIVE) + + !!(flags & VIR_DOMAIN_SNAPSHOT_CREATE_BRANCH) > 1) { + virReportInvalidArg(flags, + _("'redefine', 'live', and 'branch' flags in %s are mutually exclusive"), + __FUNCTION__); + goto error; + } if (conn->driver->domainSnapshotCreateXML) { virDomainSnapshotPtr ret; @@ -18673,6 +18690,14 @@ error: * inactive snapshots with a @flags request to start the domain after * the revert. * + * Reverting to a snapshot with external state and then running the + * domain would invalidate all external files that depend on the backing + * file. Therefore, this function will fail unless any child external + * snapshots of the revert point first been deleted or merged. It is + * also possible to effectively revert and create a new snapshot branch + * in one operation, without invalidating snapshots, by using the + * VIR_DOMAIN_SNAPSHOT_CREATE_BRANCH flag of virDomainSnapshotCreateXML(). + * * Returns 0 if the creation is successful, -1 on error. */ int diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 4281109..3de9878 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -120,7 +120,8 @@ static const vshCmdOptDef opts_snapshot_create[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"xmlfile", VSH_OT_DATA, 0, N_("domain snapshot XML")}, {"redefine", VSH_OT_BOOL, 0, N_("redefine metadata for existing snapshot")}, - {"current", VSH_OT_BOOL, 0, N_("with redefine, set current snapshot")}, + {"current", VSH_OT_BOOL, 0, + N_("with redefine or branch, set current snapshot")}, {"no-metadata", VSH_OT_BOOL, 0, N_("take snapshot but create no metadata")}, {"halt", VSH_OT_BOOL, 0, N_("halt domain after snapshot is created")}, {"disk-only", VSH_OT_BOOL, 0, N_("capture disk state but not vm state")}, @@ -128,6 +129,7 @@ static const vshCmdOptDef opts_snapshot_create[] = { {"quiesce", VSH_OT_BOOL, 0, N_("quiesce guest's file systems")}, {"atomic", VSH_OT_BOOL, 0, N_("require atomic operation")}, {"live", VSH_OT_BOOL, 0, N_("take a live snapshot")}, + {"branch", VSH_OT_BOOL, 0, N_("create a branch snapshot")}, {NULL, 0, 0, NULL} }; @@ -158,6 +160,8 @@ cmdSnapshotCreate(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC; if (vshCommandOptBool(cmd, "live")) flags |= VIR_DOMAIN_SNAPSHOT_CREATE_LIVE; + if (vshCommandOptBool(cmd, "branch")) + flags |= VIR_DOMAIN_SNAPSHOT_CREATE_BRANCH; dom = vshCommandOptDomain(ctl, cmd, NULL); if (dom == NULL) @@ -306,6 +310,10 @@ static const vshCmdOptDef opts_snapshot_create_as[] = { {"quiesce", VSH_OT_BOOL, 0, N_("quiesce guest's file systems")}, {"atomic", VSH_OT_BOOL, 0, N_("require atomic operation")}, {"live", VSH_OT_BOOL, 0, N_("take a live snapshot")}, + {"branch", VSH_OT_DATA, VSH_OFLAG_REQ_OPT, + N_("name of external snapshot to use as a branch point")}, + {"current", VSH_OT_BOOL, 0, + N_("with branch, make the new snapshot current")}, {"memspec", VSH_OT_DATA, VSH_OFLAG_REQ_OPT, N_("memory attributes: [file=]name[,snapshot=type]")}, {"diskspec", VSH_OT_ARGV, 0, @@ -322,6 +330,7 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd) const char *name = NULL; const char *desc = NULL; const char *memspec = NULL; + const char *branch = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; unsigned int flags = 0; const vshCmdOpt *opt = NULL; @@ -340,6 +349,19 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC; if (vshCommandOptBool(cmd, "live")) flags |= VIR_DOMAIN_SNAPSHOT_CREATE_LIVE; + if (vshCommandOptBool(cmd, "branch")) { + flags |= VIR_DOMAIN_SNAPSHOT_CREATE_BRANCH; + if (vshCommandOptString(cmd, "branch", &branch) < 0) { + vshError(ctl, _("argument must not be empty")); + goto cleanup; + } + if (vshCommandOptBool(cmd, "memspec")) { + vshError(ctl, _("--branch and --memspec are mutually exclusive")); + goto cleanup; + } + } + if (vshCommandOptBool(cmd, "current")) + flags |= VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT; dom = vshCommandOptDomain(ctl, cmd, NULL); if (dom == NULL) @@ -352,10 +374,9 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd) } virBufferAddLit(&buf, "<domainsnapshot>\n"); - if (name) - virBufferEscapeString(&buf, " <name>%s</name>\n", name); - if (desc) - virBufferEscapeString(&buf, " <description>%s</description>\n", desc); + virBufferEscapeString(&buf, " <name>%s</name>\n", name); + virBufferEscapeString(&buf, " <description>%s</description>\n", desc); + virBufferEscapeString(&buf, " <branch>%s</branch>\n", branch); if (vshCommandOptString(cmd, "memspec", &memspec) < 0 || vshParseSnapshotMemspec(ctl, &buf, memspec) < 0) { diff --git a/tools/virsh.pod b/tools/virsh.pod index 0808d72..a79ed50 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2606,7 +2606,7 @@ used to represent properties of snapshots. =item B<snapshot-create> I<domain> [I<xmlfile>] {[I<--redefine> [I<--current>]] | [I<--no-metadata>] [I<--halt>] [I<--disk-only>] [I<--reuse-external>] -[I<--quiesce>] [I<--atomic>] [I<--live>]} +[I<--quiesce>] [I<--atomic>] [I<--live>] [I<--branch>]} Create a snapshot for domain I<domain> with the properties specified in I<xmlfile>. Normally, the only properties settable for a domain snapshot @@ -2663,6 +2663,12 @@ If I<--live> is specified, libvirt takes the snapshot while the guest is running. This increases the size of the memory image of the external checkpoint. This is currently supported only for external checkpoints. +If I<--branch> is specified, then I<xmlfile> must contain a B<branch> +element naming an existing external snapshot which the new snapshot +will branch from. In this usage, the new snapshot must also be +external, and will not be made current unless I<--current> is also +requested. + Existence of snapshot metadata will prevent attempts to B<undefine> a persistent domain. However, for transient domains, snapshot metadata is silently lost when the domain quits running (whether @@ -2671,7 +2677,8 @@ by command such as B<destroy> or by internal guest action). =item B<snapshot-create-as> I<domain> {[I<--print-xml>] | [I<--no-metadata>] [I<--halt>] [I<--reuse-external>]} [I<name>] [I<description>] [I<--disk-only> [I<--quiesce>]] [I<--atomic>] -[[I<--live>] [I<--memspec> B<memspec>]] [I<--diskspec>] B<diskspec>]... +[[I<--live>] [I<--memspec> B<memspec>]] [I<--branch> B<branch> [I<--current>]] +[I<--diskspec>] B<diskspec>]... Create a snapshot for domain I<domain> with the given <name> and <description>; if either value is omitted, libvirt will choose a @@ -2687,6 +2694,11 @@ by a B<memspec> of the form B<[file=]name[,snapshot=type]>, where type can be B<none>, B<internal>, or B<external>. To include a literal comma in B<file=name>, escape it with a second comma. +The I<--branch> option can be used to create an external snapshot that +branches from an existing snapshot named B<branch>. In this usage, the +new snapshot is not made current unless I<--current> is also present. +Specifying a branch point is incompatible with using I<--memspec>. + The I<--diskspec> option can be used to control how I<--disk-only> and external checkpoints create external files. This option can occur multiple times, according to the number of <disk> elements in the domain -- 1.7.11.7

3 7

[libvirt] [libvirt-glib] docs: Specify correct function to free GVirDomainInfo
by Zeeshan Ali (Khattak) 14 Nov '12

14 Nov '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-domain.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 34d7519..4b82db9 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -957,8 +957,9 @@ gboolean gvir_domain_set_config(GVirDomain *domain, * gvir_domain_get_info: * @dom: the domain * - * Returns: (transfer full): the info. The returned object should be - * unreffed with g_object_unref() when no longer needed. + * Returns: (transfer full): the info. The returned structure should be + * freed using #g_boxed_free() with GVIR_TYPE_DOMAIN_INFO as the first argument + * when no longer needed. */ GVirDomainInfo *gvir_domain_get_info(GVirDomain *dom, GError **err) -- 1.8.0

1 1

[libvirt] [libvirt-glib 1/4] gobject: don't try to use pool's volumes before a successful refresh
by Christophe Fergeau 14 Nov '12

14 Nov '12

gvir_storage_pool_refresh must be called and must be successful before trying to use gvir_storage_pool_get_volume, gvir_storage_pool_get_volumes and gvir_storage_pool_create_volume. As the storage pool refresh can fail for reasons external to libvirt/libvirt-gobject, the library user should check _refresh errors. This commit outputs runtime warnings when these functions are called and GVirObjectStoragePool::priv::volumes is NULL. --- libvirt-gobject/libvirt-gobject-storage-pool.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index 7f50037..a4316e9 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -523,6 +523,8 @@ GList *gvir_storage_pool_get_volumes(GVirStoragePool *pool) if (priv->volumes != NULL) { volumes = g_hash_table_get_values(priv->volumes); g_list_foreach(volumes, gvir_storage_vol_ref, NULL); + } else { + g_warn_if_reached(); } g_mutex_unlock(priv->lock); @@ -548,9 +550,14 @@ GVirStorageVol *gvir_storage_pool_get_volume(GVirStoragePool *pool, priv = pool->priv; g_mutex_lock(priv->lock); - volume = g_hash_table_lookup(priv->volumes, name); - if (volume) - g_object_ref(volume); + if (priv->volumes != NULL) { + volume = g_hash_table_lookup(priv->volumes, name); + if (volume) + g_object_ref(volume); + } else { + g_warn_if_reached(); + volume = NULL; + } g_mutex_unlock(priv->lock); return volume; @@ -604,7 +611,14 @@ GVirStorageVol *gvir_storage_pool_create_volume } g_mutex_lock(priv->lock); - g_hash_table_insert(priv->volumes, g_strdup(name), volume); + if (priv->volumes != NULL) { + g_hash_table_insert(priv->volumes, g_strdup(name), volume); + } else { + g_warn_if_reached(); + g_object_unref(G_OBJECT(volume)); + g_mutex_unlock(priv->lock); + return NULL; + } g_mutex_unlock(priv->lock); return g_object_ref(volume); -- 1.7.12.1

2 11

[libvirt] [libvirt-glib] miscellaneous fixes
by Christophe Fergeau 14 Nov '12

14 Nov '12

This series does misc leak fixes in libvirt-glib, as well as an API doc fix, and a deprecation warning fix. Christophe

2 12

[libvirt] Is possible that cpu_maps.xml changed during different releases?
by Jiang, Yunhong 14 Nov '12

14 Nov '12

Hi, all I have two questions to the cpu_maps.xml in different releases, hope someone can give me some hints: a) Will it be possible that the features defined in cpu_maps.xml for one specific CPU model (like Nehalem) will be different? For example, one feature is not listed for Nehalem in release x.y, and added in release x.y+1? 2) Is the format of the cpu_maps.xml fine defined or will be it changed during releases? I asked this because currently the features defined in the capabilities only list features not included in the definition in cpu_maps.xml for the corresponding model. So if I want to get the full features supported by the host, I have to parse the capabilities and the cpu_maps.xml. I didn't find the definition for cpu_maps.xml format, although the capabilities format is well defined in http://libvirt.org/guide/html/Application_Development_Guide-Connections-Cap…. Thanks --jyh

2 4

[libvirt] [libvirt-glib] Introduce gvir_warning/gvir_critical
by Christophe Fergeau 14 Nov '12

14 Nov '12

They are similar to g_warning/g_critical, but also log the last libvirt error. They are meant to be called right after a libvirt call failed, in other cases g_warning/g_critical are still to be used. --- libvirt-glib/libvirt-glib-error.c | 34 +++++++++++++++++++++++ libvirt-glib/libvirt-glib-error.h | 2 ++ libvirt-glib/libvirt-glib.sym | 5 ++++ libvirt-gobject/libvirt-gobject-connection.c | 4 +-- libvirt-gobject/libvirt-gobject-domain-snapshot.c | 2 +- libvirt-gobject/libvirt-gobject-domain.c | 14 ++-------- libvirt-gobject/libvirt-gobject-interface.c | 2 +- libvirt-gobject/libvirt-gobject-network-filter.c | 17 ++++-------- libvirt-gobject/libvirt-gobject-network.c | 14 ++-------- libvirt-gobject/libvirt-gobject-node-device.c | 4 +-- libvirt-gobject/libvirt-gobject-secret.c | 11 ++------ libvirt-gobject/libvirt-gobject-storage-pool.c | 17 +++--------- libvirt-gobject/libvirt-gobject-storage-vol.c | 2 +- libvirt-gobject/libvirt-gobject-stream.c | 2 +- 14 files changed, 66 insertions(+), 64 deletions(-) diff --git a/libvirt-glib/libvirt-glib-error.c b/libvirt-glib/libvirt-glib-error.c index 7356aed..5c97da4 100644 --- a/libvirt-glib/libvirt-glib-error.c +++ b/libvirt-glib/libvirt-glib-error.c @@ -257,3 +257,37 @@ void gvir_set_error_valist(GError **error, g_free(message); } + +static void +gvir_log_valist(GLogLevelFlags level, const gchar *format, va_list args) +{ + gchar *message; + virErrorPtr verr = virGetLastError(); + + message = g_strdup_vprintf(format, args); + + if (verr) + g_log(G_LOG_DOMAIN, level, "%s: %s", message, verr->message); + else + g_log(G_LOG_DOMAIN, level, "%s", message); + + g_free(message); +} + +void gvir_warning(const gchar *format, ...) +{ + va_list args; + + va_start(args, format); + gvir_log_valist(G_LOG_LEVEL_WARNING, format, args); + va_end(args); +} + +void gvir_critical(const gchar *format, ...) +{ + va_list args; + + va_start(args, format); + gvir_log_valist(G_LOG_LEVEL_CRITICAL, format, args); + va_end(args); +} diff --git a/libvirt-glib/libvirt-glib-error.h b/libvirt-glib/libvirt-glib-error.h index 9e44383..1421047 100644 --- a/libvirt-glib/libvirt-glib-error.h +++ b/libvirt-glib/libvirt-glib-error.h @@ -59,6 +59,8 @@ void gvir_set_error_valist(GError **error, const gchar *format, va_list args); +void gvir_critical(const gchar *format, ...); +void gvir_warning(const gchar *format, ...); G_END_DECLS diff --git a/libvirt-glib/libvirt-glib.sym b/libvirt-glib/libvirt-glib.sym index 53b8907..d9ddb07 100644 --- a/libvirt-glib/libvirt-glib.sym +++ b/libvirt-glib/libvirt-glib.sym @@ -15,4 +15,9 @@ LIBVIRT_GLIB_0.0.7 { *; }; +LIBVIRT_GLIB_0.1.4 { + gvir_critical; + gvir_warning; +} LIBVIRT_GLIB_0.0.7; + # .... define new API here using predicted next version number .... diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 9628989..e6ccfd0 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -273,7 +273,7 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, GVirConnectionPrivate *priv = gconn->priv; if (virDomainGetUUIDString(dom, uuid) < 0) { - g_warning("Failed to get domain UUID on %p", dom); + gvir_warning("Failed to get domain UUID on %p", dom); return 0; } @@ -463,7 +463,7 @@ gboolean gvir_connection_open(GVirConnection *conn, } if (virConnectDomainEventRegister(priv->conn, domain_event_cb, conn, NULL) == -1) - g_warning("Failed to register domain events, ignoring"); + gvir_warning("Failed to register domain events, ignoring"); g_mutex_unlock(priv->lock); diff --git a/libvirt-gobject/libvirt-gobject-domain-snapshot.c b/libvirt-gobject/libvirt-gobject-domain-snapshot.c index 11a073c..ce60ea0 100644 --- a/libvirt-gobject/libvirt-gobject-domain-snapshot.c +++ b/libvirt-gobject/libvirt-gobject-domain-snapshot.c @@ -167,7 +167,7 @@ const gchar *gvir_domain_snapshot_get_name(GVirDomainSnapshot *snapshot) const char *name; if (!(name = virDomainSnapshotGetName(priv->handle))) { - g_warning("Failed to get domain_snapshot name on %p", priv->handle); + gvir_warning("Failed to get domain_snapshot name on %p", priv->handle); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 8ade3ea..9d4e232 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -135,16 +135,8 @@ static void gvir_domain_constructed(GObject *object) G_OBJECT_CLASS(gvir_domain_parent_class)->constructed(object); /* xxx we may want to turn this into an initable */ - if (virDomainGetUUIDString(priv->handle, priv->uuid) < 0) { - virErrorPtr verr = virGetLastError(); - if (verr) { - g_warning("Failed to get domain UUID on %p: %s", - priv->handle, verr->message); - } else { - g_warning("Failed to get domain UUID on %p", - priv->handle); - } - } + if (virDomainGetUUIDString(priv->handle, priv->uuid) < 0) + gvir_warning("Failed to get domain UUID on %p", priv->handle); } @@ -292,7 +284,7 @@ const gchar *gvir_domain_get_name(GVirDomain *dom) priv = dom->priv; if (!(name = virDomainGetName(priv->handle))) { - g_warning("Failed to get domain name on %p", priv->handle); + gvir_warning("Failed to get domain name on %p", priv->handle); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-interface.c b/libvirt-gobject/libvirt-gobject-interface.c index ecabb41..4523100 100644 --- a/libvirt-gobject/libvirt-gobject-interface.c +++ b/libvirt-gobject/libvirt-gobject-interface.c @@ -164,7 +164,7 @@ const gchar *gvir_interface_get_name(GVirInterface *iface) g_return_val_if_fail(GVIR_IS_INTERFACE(iface), NULL); if (!(name = virInterfaceGetName(iface->priv->handle))) { - g_warning("Failed to get interface name on %p", iface->priv->handle); + gvir_warning("Failed to get interface name on %p", iface->priv->handle); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-network-filter.c b/libvirt-gobject/libvirt-gobject-network-filter.c index 00b1ed2..54c1eeb 100644 --- a/libvirt-gobject/libvirt-gobject-network-filter.c +++ b/libvirt-gobject/libvirt-gobject-network-filter.c @@ -118,16 +118,9 @@ static void gvir_network_filter_constructed(GObject *object) G_OBJECT_CLASS(gvir_network_filter_parent_class)->constructed(object); /* xxx we may want to turn this into an initable */ - if (virNWFilterGetUUIDString(priv->handle, priv->uuid) < 0) { - virErrorPtr verr = virGetLastError(); - if (verr) { - g_warning("Failed to get network filter UUID on %p: %s", - priv->handle, verr->message); - } else { - g_warning("Failed to get network filter UUID on %p", - priv->handle); - } - } + if (virNWFilterGetUUIDString(priv->handle, priv->uuid) < 0) + gvir_warning("Failed to get network filter UUID on %p", + priv->handle); } @@ -187,8 +180,8 @@ const gchar *gvir_network_filter_get_name(GVirNetworkFilter *filter) g_return_val_if_fail(GVIR_IS_NETWORK_FILTER(filter), NULL); if (!(name = virNWFilterGetName(filter->priv->handle))) { - g_warning("Failed to get network_filter name on %p", - filter->priv->handle); + gvir_warning("Failed to get network_filter name on %p", + filter->priv->handle); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-network.c b/libvirt-gobject/libvirt-gobject-network.c index 9625ece..0f17ecc 100644 --- a/libvirt-gobject/libvirt-gobject-network.c +++ b/libvirt-gobject/libvirt-gobject-network.c @@ -117,16 +117,8 @@ static void gvir_network_constructed(GObject *object) G_OBJECT_CLASS(gvir_network_parent_class)->constructed(object); /* xxx we may want to turn this into an initable */ - if (virNetworkGetUUIDString(priv->handle, priv->uuid) < 0) { - virErrorPtr verr = virGetLastError(); - if (verr) { - g_warning("Failed to get network UUID on %p: %s", - priv->handle, verr->message); - } else { - g_warning("Failed to get network UUID on %p", - priv->handle); - } - } + if (virNetworkGetUUIDString(priv->handle, priv->uuid) < 0) + gvir_warning("Failed to get network UUID on %p", priv->handle); } static void gvir_network_class_init(GVirNetworkClass *klass) @@ -185,7 +177,7 @@ const gchar *gvir_network_get_name(GVirNetwork *network) g_return_val_if_fail(GVIR_IS_NETWORK(network), NULL); if (!(name = virNetworkGetName(network->priv->handle))) { - g_warning("Failed to get network name on %p", network->priv->handle); + gvir_warning("Failed to get network name on %p", network->priv->handle); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-node-device.c b/libvirt-gobject/libvirt-gobject-node-device.c index eb314ed..781fc5d 100644 --- a/libvirt-gobject/libvirt-gobject-node-device.c +++ b/libvirt-gobject/libvirt-gobject-node-device.c @@ -164,8 +164,8 @@ const gchar *gvir_node_device_get_name(GVirNodeDevice *device) g_return_val_if_fail(GVIR_IS_NODE_DEVICE(device), NULL); if (!(name = virNodeDeviceGetName(device->priv->handle))) { - g_warning("Failed to get node_device name on %p", - device->priv->handle); + gvir_warning("Failed to get node_device name on %p", + device->priv->handle); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-secret.c b/libvirt-gobject/libvirt-gobject-secret.c index 8bfee88..01b8ed1 100644 --- a/libvirt-gobject/libvirt-gobject-secret.c +++ b/libvirt-gobject/libvirt-gobject-secret.c @@ -118,15 +118,8 @@ static void gvir_secret_constructed(GObject *object) G_OBJECT_CLASS(gvir_secret_parent_class)->constructed(object); /* xxx we may want to turn this into an initable */ - if (virSecretGetUUIDString(priv->handle, priv->uuid) < 0) { - virErrorPtr verr = virGetLastError(); - if (verr) { - g_warning("Failed to get secret UUID on %p: %s", - priv->handle, verr->message); - } else { - g_warning("Failed to get secret UUID on %p", priv->handle); - } - } + if (virSecretGetUUIDString(priv->handle, priv->uuid) < 0) + gvir_warning("Failed to get secret UUID on %p", priv->handle); } diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index a09e5a7..adcdda7 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -128,15 +128,8 @@ static void gvir_storage_pool_constructed(GObject *object) G_OBJECT_CLASS(gvir_storage_pool_parent_class)->constructed(object); /* xxx we may want to turn this into an initable */ - if (virStoragePoolGetUUIDString(priv->handle, priv->uuid) < 0) { - virErrorPtr verr = virGetLastError(); - if (verr) { - g_warning("Failed to get storage pool UUID on %p: %s", - priv->handle, verr->message); - } else { - g_warning("Failed to get storage pool UUID on %p", priv->handle); - } - } + if (virStoragePoolGetUUIDString(priv->handle, priv->uuid) < 0) + gvir_warning("Failed to get storage pool UUID on %p", priv->handle); } @@ -215,10 +208,8 @@ const gchar *gvir_storage_pool_get_name(GVirStoragePool *pool) g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), NULL); - if (!(name = virStoragePoolGetName(pool->priv->handle))) { - g_warning("Failed to get storage_pool name on %p", pool->priv->handle); - return NULL; - } + if (!(name = virStoragePoolGetName(pool->priv->handle))) + gvir_warning("Failed to get storage_pool name on %p", pool->priv->handle); return name; } diff --git a/libvirt-gobject/libvirt-gobject-storage-vol.c b/libvirt-gobject/libvirt-gobject-storage-vol.c index 9256445..c7ebb45 100644 --- a/libvirt-gobject/libvirt-gobject-storage-vol.c +++ b/libvirt-gobject/libvirt-gobject-storage-vol.c @@ -200,7 +200,7 @@ const gchar *gvir_storage_vol_get_name(GVirStorageVol *vol) g_return_val_if_fail(GVIR_IS_STORAGE_VOL(vol), NULL); if (!(name = virStorageVolGetName(vol->priv->handle))) { - g_warning("Failed to get storage_vol name on %p", vol->priv->handle); + gvir_warning("Failed to get storage_vol name on %p", vol->priv->handle); return NULL; } diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index fa1a32c..f0e43d0 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -218,7 +218,7 @@ static void gvir_stream_finalize(GObject *object) gvir_stream_update_events(self); if (virStreamFinish(priv->handle) < 0) - g_critical("cannot finish stream"); + gvir_critical("cannot finish stream"); virStreamFree(priv->handle); } -- 1.7.12.1

2 3

[libvirt] [libvirt-glib] Add gvir_domain_update_device() and enums needed for it
by Alexander Larsson 14 Nov '12

14 Nov '12

This is a wrapper for virDomainUpdateDeviceFlags. --- libvirt-gobject/libvirt-gobject-domain.c | 42 ++++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 17 +++++++++++++ libvirt-gobject/libvirt-gobject.sym | 7 ++++++ 3 files changed, 66 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 8ade3ea..a00a042 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -1428,6 +1428,48 @@ GList *gvir_domain_get_devices(GVirDomain *domain, return g_list_reverse (ret); } + +/** + * gvir_domain_update_device: + * @dom: the domain + * @device: A modified device config + * @flags: bitwise-OR of #GVirDomainUpdateDeviceFlags + * @err: (allow-none):Place-holder for error or NULL + * + * Update the configuration of a device. + * + * Returns: TRUE if device was updated successfully, FALSE otherwise. + */ +gboolean +gvir_domain_update_device(GVirDomain *dom, + GVirConfigDomainDevice *device, + guint flags, + GError **err) +{ + gchar *xml; + + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_DEVICE(device), FALSE); + + xml = gvir_config_object_to_xml(GVIR_CONFIG_OBJECT(device)); + g_return_val_if_fail(xml != NULL, FALSE); + + if (virDomainUpdateDeviceFlags(dom->priv->handle, + xml, flags) < 0) { + gvir_set_error_literal(err, GVIR_DOMAIN_ERROR, + 0, + "Failed to update device"); + g_free (xml); + + return FALSE; + } + + g_free (xml); + return TRUE; +} + + /** * gvir_domain_create_snapshot: * @dom: the domain diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 6e7b10d..a622a46 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -158,6 +158,18 @@ typedef enum { GVIR_DOMAIN_SNAPSHOT_ATOMIC = VIR_DOMAIN_SNAPSHOT_CREATE_ATOMIC, } GVirDomainSnapshotCreateFlags; +/** + * GVirDomainUpdateDeviceFlags: + * @GVIR_DOMAIN_UPDATE_DEVICE_CURRENT: Update current domain state + * @GVIR_DOMAIN_UPDATE_DEVICE_LIVE: Update state for only active domains + * @GVIR_DOMAIN_UPDATE_DEVICE_CONFIG: Update state for persistent state only + */ +typedef enum { + GVIR_DOMAIN_UPDATE_DEVICE_CURRENT = VIR_DOMAIN_AFFECT_CURRENT, + GVIR_DOMAIN_UPDATE_DEVICE_LIVE = VIR_DOMAIN_AFFECT_LIVE, + GVIR_DOMAIN_UPDATE_DEVICE_CONFIG = VIR_DOMAIN_AFFECT_CONFIG, +} GVirDomainUpdateDeviceFlags; + typedef struct _GVirDomainInfo GVirDomainInfo; struct _GVirDomainInfo { @@ -294,6 +306,11 @@ gboolean gvir_domain_get_saved(GVirDomain *dom); GList *gvir_domain_get_devices(GVirDomain *domain, GError **err); +gboolean gvir_domain_update_device(GVirDomain *dom, + GVirConfigDomainDevice *device, + guint flags, + GError **err); + GVirDomainSnapshot * gvir_domain_create_snapshot(GVirDomain *dom, GVirConfigDomainSnapshot *custom_conf, diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 3a40a8a..2034e89 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -204,4 +204,11 @@ LIBVIRT_GOBJECT_0.1.3 { gvir_domain_wakeup_finish; } LIBVIRT_GOBJECT_0.1.2; +LIBVIRT_GOBJECT_0.1.4 { + global: + gvir_domain_update_device_flags_get_type; + gvir_domain_update_device; +} LIBVIRT_GOBJECT_0.1.3; + + # .... define new API here using predicted next version number .... -- 1.7.12.1

3 4