- Devel - libvirt List Archives

Re: [libvirt] [PATCH] qemu: Allow domain reboot after core dump
by Sheldon 23 Sep '11

23 Sep '11

yes, the patch can work, when I execute virsh dump --reboot <domain> <file> and the type of file is: QEMU's suspend to disk image but the guest does not reboot. The guest does nothing. but I try virsh shutdown <domain>, the guest Ubuntu OS pop up a dialog box with four options: Shut Down, Restart, Suspend and HIbernate. -------- ???? -------- > ??: [libvirt] [PATCH] qemu: Allow domain reboot after core dump > ??: Tue, 20 Sep 2011 13:34:27 +0200 > ???: Michal Privoznik <mprivozn(a)redhat.com> > ???: libvir-list(a)redhat.com > > > > This patch introduces possibility to reboot domain after core dump > finishes. The new flag VIR_DUMP_REBOOT was added to > virDomainCoreDumpFlags. The new functionality is accessible via virsh > too: virsh dump --reboot<domain> > --- > include/libvirt/libvirt.h.in | 1 + > src/qemu/qemu_driver.c | 8 +++++++- > tools/virsh.c | 3 +++ > 3 files changed, 11 insertions(+), 1 deletions(-) > > diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in > index 39155a6..8c41f5a 100644 > --- a/include/libvirt/libvirt.h.in > +++ b/include/libvirt/libvirt.h.in > @@ -748,6 +748,7 @@ typedef enum { > VIR_DUMP_CRASH = (1<< 0), /* crash after dump */ > VIR_DUMP_LIVE = (1<< 1), /* live dump */ > VIR_DUMP_BYPASS_CACHE = (1<< 2), /* avoid file system cache pollution */ > + VIR_DUMP_REBOOT = (1<< 3), /* reboot domain after dump finishes */ > } virDomainCoreDumpFlags; > > /* Domain migration flags. */ > diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c > index e2f428f..22576a8 100644 > --- a/src/qemu/qemu_driver.c > +++ b/src/qemu/qemu_driver.c > @@ -3104,7 +3104,8 @@ static int qemudDomainCoreDump(virDomainPtr dom, > int ret = -1; > virDomainEventPtr event = NULL; > > - virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH | VIR_DUMP_BYPASS_CACHE, -1); > + virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH | > + VIR_DUMP_BYPASS_CACHE | VIR_DUMP_REBOOT, -1); > > qemuDriverLock(driver); > vm = virDomainFindByUUID(&driver->domains, dom->uuid); > @@ -3189,6 +3190,11 @@ cleanup: > if (event) > qemuDomainEventQueue(driver, event); > qemuDriverUnlock(driver); > + > + if ((ret == 0)&& (flags& VIR_DUMP_REBOOT)) { > + qemuDomainReboot(dom, 0); > + } > + > return ret; > } > > diff --git a/tools/virsh.c b/tools/virsh.c > index d575425..74f6a79 100644 > --- a/tools/virsh.c > +++ b/tools/virsh.c > @@ -2840,6 +2840,7 @@ static const vshCmdOptDef opts_dump[] = { > {"crash", VSH_OT_BOOL, 0, N_("crash the domain after core dump")}, > {"bypass-cache", VSH_OT_BOOL, 0, > N_("avoid file system cache when saving")}, > + {"reboot", VSH_OT_BOOL, 0, N_("reboot the domain after core dump")}, > {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, > {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("where to dump the core")}, > {NULL, 0, 0, NULL} > @@ -2869,6 +2870,8 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) > flags |= VIR_DUMP_CRASH; > if (vshCommandOptBool(cmd, "bypass-cache")) > flags |= VIR_DUMP_BYPASS_CACHE; > + if (vshCommandOptBool(cmd, "reboot")) > + flags |= VIR_DUMP_REBOOT; > > if (virDomainCoreDump(dom, to, flags)< 0) { > vshError(ctl, _("Failed to core dump domain %s to %s"), name, to); > -- > 1.7.3.4 > > -- > libvir-list mailing list > libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list >

1 0

Re: [libvirt] [PATCH] qemu: Allow domain reboot after core dump
by Sheldon 23 Sep '11

23 Sep '11

yes, the patch can work, when I execute virsh dump --reboot <domian> <file> and the type of file is: QEMU's suspend to disk image > -------- ???? -------- > ??: [libvirt] [PATCH] qemu: Allow domain reboot after core dump > ??: Tue, 20 Sep 2011 13:34:27 +0200 > ???: Michal Privoznik <mprivozn(a)redhat.com> > ???: libvir-list(a)redhat.com > > > > This patch introduces possibility to reboot domain after core dump > finishes. The new flag VIR_DUMP_REBOOT was added to > virDomainCoreDumpFlags. The new functionality is accessible via virsh > too: virsh dump --reboot<domain> > --- > include/libvirt/libvirt.h.in | 1 + > src/qemu/qemu_driver.c | 8 +++++++- > tools/virsh.c | 3 +++ > 3 files changed, 11 insertions(+), 1 deletions(-) > > diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in > index 39155a6..8c41f5a 100644 > --- a/include/libvirt/libvirt.h.in > +++ b/include/libvirt/libvirt.h.in > @@ -748,6 +748,7 @@ typedef enum { > VIR_DUMP_CRASH = (1<< 0), /* crash after dump */ > VIR_DUMP_LIVE = (1<< 1), /* live dump */ > VIR_DUMP_BYPASS_CACHE = (1<< 2), /* avoid file system cache pollution */ > + VIR_DUMP_REBOOT = (1<< 3), /* reboot domain after dump finishes */ > } virDomainCoreDumpFlags; > > /* Domain migration flags. */ > diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c > index e2f428f..22576a8 100644 > --- a/src/qemu/qemu_driver.c > +++ b/src/qemu/qemu_driver.c > @@ -3104,7 +3104,8 @@ static int qemudDomainCoreDump(virDomainPtr dom, > int ret = -1; > virDomainEventPtr event = NULL; > > - virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH | VIR_DUMP_BYPASS_CACHE, -1); > + virCheckFlags(VIR_DUMP_LIVE | VIR_DUMP_CRASH | > + VIR_DUMP_BYPASS_CACHE | VIR_DUMP_REBOOT, -1); > > qemuDriverLock(driver); > vm = virDomainFindByUUID(&driver->domains, dom->uuid); > @@ -3189,6 +3190,11 @@ cleanup: > if (event) > qemuDomainEventQueue(driver, event); > qemuDriverUnlock(driver); > + > + if ((ret == 0)&& (flags& VIR_DUMP_REBOOT)) { > + qemuDomainReboot(dom, 0); > + } > + > return ret; > } > > diff --git a/tools/virsh.c b/tools/virsh.c > index d575425..74f6a79 100644 > --- a/tools/virsh.c > +++ b/tools/virsh.c > @@ -2840,6 +2840,7 @@ static const vshCmdOptDef opts_dump[] = { > {"crash", VSH_OT_BOOL, 0, N_("crash the domain after core dump")}, > {"bypass-cache", VSH_OT_BOOL, 0, > N_("avoid file system cache when saving")}, > + {"reboot", VSH_OT_BOOL, 0, N_("reboot the domain after core dump")}, > {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, > {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("where to dump the core")}, > {NULL, 0, 0, NULL} > @@ -2869,6 +2870,8 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) > flags |= VIR_DUMP_CRASH; > if (vshCommandOptBool(cmd, "bypass-cache")) > flags |= VIR_DUMP_BYPASS_CACHE; > + if (vshCommandOptBool(cmd, "reboot")) > + flags |= VIR_DUMP_REBOOT; > > if (virDomainCoreDump(dom, to, flags)< 0) { > vshError(ctl, _("Failed to core dump domain %s to %s"), name, to); > -- > 1.7.3.4 > > -- > libvir-list mailing list > libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list >

1 0

[libvirt] [PATCH] virsh: Improve virsh manual for virsh memtune command
by Peter Krempa 22 Sep '11

22 Sep '11

Commit 0a22f54 added --min-guarantee option for the memtune command. This option is supported only by the ESX hypervisor. This patch adds a statement about this fact, to prevent user confusion. This patch also adds explanation how to clear/set to unlimited the memory tunables. (documments the -1 value). --- tools/virsh.pod | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 88dee26..7f46ee4 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -959,6 +959,7 @@ Allows you to display or set the domain memory parameters. Without flags, the current settings are displayed; with a flag, the appropriate limit is adjusted if supported by the hypervisor. LXC and QEMU/KVM support I<--hard-limit>, I<--soft-limit>, and I<--swap-hard-limit>. +I<--min-guarantee> is supported only by ESX hypervisor yet. If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. @@ -997,6 +998,8 @@ value are kilobytes (i.e. blocks of 1024 bytes). =back +Specifying -1 as a value for these limits is interpreted as unlimited. + =item B<blkiotune> I<domain-id> [I<--weight> B<weight>] [[I<--config>] [I<--live>] | [I<--current>]] -- 1.7.3.4

2 2

[libvirt] Release of libvirt-0.9.6
by Daniel Veillard 22 Sep '11

22 Sep '11

That's what is now usually called a brown paper bag release (dixit Linus) [*] since 0.9.5 had broken shudown with the two last released versions of QEmu 0.9.6 should be available at the usual place: ftp://libvirt.org/libvirt/ and obviously only contains a few bug fixes and local improvements. People should not ship 0.9.5, and use 0.9.6 instead, thanks in advance ! Bug Fixes: - snapshot: fix logic bug in qemu undefine (Eric Blake) - sanlock: fix memory leak (Eric Blake) - virsh: fix regression in argv parsing (Eric Blake) - storage: Wait udev events are handled before removing lvm vol (Osier Yang) - qemu: avoid dereferencing a NULL pointer (Alex Jia) - qemu: Avoid loop of fake reboots (Jiri Denemark) - qemu: Fix shutdown regression with buggy qemu (Jiri Denemark) - remote: fix crash on OOM (Eric Blake) Improvements: - snapshot: also delete empty directory (Eric Blake) - snapshot: remove snapshot metadata on transient exit (Eric Blake) - snapshot: prepare to remove transient snapshot metadata (Eric Blake) - virsh: More friendly err if no pool is specified for looking up a vol (Osier Yang) - tests: improve test failure diagnosis (Oskari Saarenmaa) - API: prefer to use NULLSTR macro (Osier Yang) - xen: use typical allocations (Eric Blake) - virsh: Remove useless codes of cmdVolPath (Osier Yang) Portability: - build: silence warning on 32-bit build (Eric Blake) Thanks to all who reported and helped fix those issues quickly !!! Daniel [*] and no I won't carry one, they are non-existent where I live for context http://lwn.net/1999/0204/kernel.php3 -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH 0/9] Implement keepalive protocol for libvirt RPC
by Jiri Denemark 22 Sep '11

22 Sep '11

This allows us to detect broken connections between server and client without waiting for TCP timeout and dead deamon/client. By default a connection is considered broken after about 30 seconds of no messages received from remote party. After that period, the connection is automatically closed. The main reason for implementing this is that peer-to-peer migration can now be canceled when a connection between source and target breaks. Although this will really work only after qemu fixes migrate_cancel command so that it doesn't block when outgoing TCP buffers are full. Jiri Denemark (9): Define keepalive protocol Implement common keepalive handling Introduce two public APIs for keepalive protocol Implement keepalive protocol in libvirt daemon Add support for non-blocking calls in client RPC Add support for async close of client RPC socket Implement keepalive protocol in remote driver Add keepalive support into domain-events examples qemu: Add support for keepalive messages during p2p migration .gitignore | 1 + daemon/libvirtd.aug | 4 + daemon/libvirtd.c | 11 + daemon/libvirtd.conf | 15 + daemon/remote.c | 38 ++ examples/domain-events/events-c/event-test.c | 11 + examples/domain-events/events-python/event-test.py | 3 + include/libvirt/libvirt.h.in | 5 + po/POTFILES.in | 1 + src/Makefile.am | 13 +- src/driver.h | 9 + src/libvirt.c | 107 +++++ src/libvirt_internal.h | 10 +- src/libvirt_public.syms | 6 + src/qemu/libvirtd_qemu.aug | 2 + src/qemu/qemu.conf | 16 + src/qemu/qemu_conf.c | 11 + src/qemu/qemu_conf.h | 3 + src/qemu/qemu_migration.c | 10 + src/qemu/test_libvirtd_qemu.aug | 6 + src/remote/remote_driver.c | 30 ++ src/remote/remote_protocol.x | 2 +- src/rpc/virkeepalive.c | 464 ++++++++++++++++++++ src/rpc/virkeepalive.h | 58 +++ src/rpc/virkeepaliveprotocol.x | 8 + src/rpc/virnetclient.c | 321 ++++++++++++-- src/rpc/virnetclient.h | 5 + src/rpc/virnetserver.c | 10 + src/rpc/virnetserver.h | 2 + src/rpc/virnetserverclient.c | 126 +++++- src/rpc/virnetserverclient.h | 6 + 31 files changed, 1254 insertions(+), 60 deletions(-) create mode 100644 src/rpc/virkeepalive.c create mode 100644 src/rpc/virkeepalive.h create mode 100644 src/rpc/virkeepaliveprotocol.x -- 1.7.6.1

1 9

[libvirt] [PATCH] virsh: Do not ignore the specified flags for cmdSaveImageDefine
by Osier Yang 22 Sep '11

22 Sep '11

--- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 4b9e662..02db278 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2346,7 +2346,7 @@ cmdSaveImageDefine(vshControl *ctl, const vshCmd *cmd) if (virFileReadAll(xmlfile, 8192, &xml) < 0) goto cleanup; - if (virDomainSaveImageDefineXML(ctl->conn, file, xml, 0) < 0) { + if (virDomainSaveImageDefineXML(ctl->conn, file, xml, flags) < 0) { vshError(ctl, _("Failed to update %s"), file); goto cleanup; } -- 1.7.6

2 2

[libvirt] [PATCH] qemu: Transfer inactive XML among cookie
by Michal Privoznik 22 Sep '11

22 Sep '11

If a domain has inactive XML we want to transfer it to destination when migrating with VIR_MIGRATE_PERSIST_DEST. In order to harm the migration protocol as least as possible, a optional cookie was chosen. --- src/qemu/qemu_migration.c | 91 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 82 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index d9f8d93..bc98708 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -64,6 +64,7 @@ VIR_ENUM_IMPL(qemuMigrationJobPhase, QEMU_MIGRATION_PHASE_LAST, enum qemuMigrationCookieFlags { QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS, QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE, + QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT, QEMU_MIGRATION_COOKIE_FLAG_LAST }; @@ -71,11 +72,12 @@ enum qemuMigrationCookieFlags { VIR_ENUM_DECL(qemuMigrationCookieFlag); VIR_ENUM_IMPL(qemuMigrationCookieFlag, QEMU_MIGRATION_COOKIE_FLAG_LAST, - "graphics", "lockstate"); + "graphics", "lockstate", "persistent"); 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), }; typedef struct _qemuMigrationCookieGraphics qemuMigrationCookieGraphics; @@ -110,6 +112,9 @@ struct _qemuMigrationCookie { /* If (flags & QEMU_MIGRATION_COOKIE_GRAPHICS) */ qemuMigrationCookieGraphicsPtr graphics; + + /* If (flags & QEMU_MIGRATION_COOKIE_PERSISTENT) */ + virDomainDefPtr persistent; }; static void qemuMigrationCookieGraphicsFree(qemuMigrationCookieGraphicsPtr grap) @@ -334,6 +339,26 @@ qemuMigrationCookieAddLockstate(qemuMigrationCookiePtr mig, } +static int +qemuMigrationCookieAddPersistent(qemuMigrationCookiePtr mig, + virDomainObjPtr dom) +{ + if (mig->flags & QEMU_MIGRATION_COOKIE_PERSISTENT) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Migration persistent data already present")); + return -1; + } + + if (!dom->newDef) + return 0; + + mig->persistent = dom->newDef; + mig->flags |= QEMU_MIGRATION_COOKIE_PERSISTENT; + mig->flagsMandatory |= QEMU_MIGRATION_COOKIE_PERSISTENT; + return 0; +} + + static void qemuMigrationCookieGraphicsXMLFormat(virBufferPtr buf, qemuMigrationCookieGraphicsPtr grap) @@ -354,10 +379,12 @@ static void qemuMigrationCookieGraphicsXMLFormat(virBufferPtr buf, static void qemuMigrationCookieXMLFormat(virBufferPtr buf, - qemuMigrationCookiePtr mig) + qemuMigrationCookiePtr mig, + struct qemud_driver *driver) { char uuidstr[VIR_UUID_STRING_BUFLEN]; char hostuuidstr[VIR_UUID_STRING_BUFLEN]; + char *domXML; int i; virUUIDFormat(mig->uuid, uuidstr); @@ -388,15 +415,25 @@ static void qemuMigrationCookieXMLFormat(virBufferPtr buf, virBufferAddLit(buf, " </lockstate>\n"); } + if ((mig->flags & QEMU_MIGRATION_COOKIE_PERSISTENT) && + mig->persistent) { + domXML = qemuDomainDefFormatXML(driver, mig->persistent, + VIR_DOMAIN_XML_INACTIVE | + VIR_DOMAIN_XML_SECURE); + virBufferAdd(buf, domXML, -1); + VIR_FREE(domXML); + } + virBufferAddLit(buf, "</qemu-migration>\n"); } -static char *qemuMigrationCookieXMLFormatStr(qemuMigrationCookiePtr mig) +static char *qemuMigrationCookieXMLFormatStr(qemuMigrationCookiePtr mig, + struct qemud_driver *driver) { virBuffer buf = VIR_BUFFER_INITIALIZER; - qemuMigrationCookieXMLFormat(&buf, mig); + qemuMigrationCookieXMLFormat(&buf, mig, driver); if (virBufferError(&buf)) { virReportOOMError(); @@ -460,6 +497,8 @@ error: static int qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, + struct qemud_driver *driver, + xmlDocPtr doc, xmlXPathContextPtr ctxt, unsigned int flags) { @@ -583,6 +622,25 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, VIR_FREE(mig->lockState); } + if ((flags & QEMU_MIGRATION_COOKIE_PERSISTENT) && + virXPathBoolean("count(./domain) > 0", ctxt)) { + if ((n = virXPathNodeSet("./domain", ctxt, &nodes)) > 1) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("Too many domain elements in " + "migration cookie: %d"), + n); + goto error; + } + mig->persistent = virDomainDefParseNode(driver->caps, doc, nodes[0], + -1, VIR_DOMAIN_XML_INACTIVE); + if (!mig->persistent) { + /* virDomainDefParseNode already reported + * an error for us */ + goto error; + } + VIR_FREE(nodes); + } + return 0; error: @@ -594,6 +652,7 @@ error: static int qemuMigrationCookieXMLParseStr(qemuMigrationCookiePtr mig, + struct qemud_driver *driver, const char *xml, unsigned int flags) { @@ -606,7 +665,7 @@ qemuMigrationCookieXMLParseStr(qemuMigrationCookiePtr mig, if (!(doc = virXMLParseStringCtxt(xml, _("(qemu_migration_cookie)"), &ctxt))) goto cleanup; - ret = qemuMigrationCookieXMLParse(mig, ctxt, flags); + ret = qemuMigrationCookieXMLParse(mig, driver, doc, ctxt, flags); cleanup: xmlXPathFreeContext(ctxt); @@ -637,7 +696,11 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, qemuMigrationCookieAddLockstate(mig, driver, dom) < 0) return -1; - if (!(*cookieout = qemuMigrationCookieXMLFormatStr(mig))) + if (flags & QEMU_MIGRATION_COOKIE_PERSISTENT && + qemuMigrationCookieAddPersistent(mig, dom) < 0) + return -1; + + if (!(*cookieout = qemuMigrationCookieXMLFormatStr(mig, driver))) return -1; *cookieoutlen = strlen(*cookieout) + 1; @@ -672,6 +735,7 @@ qemuMigrationEatCookie(struct qemud_driver *driver, if (cookiein && cookieinlen && qemuMigrationCookieXMLParseStr(mig, + driver, cookiein, flags) < 0) goto error; @@ -1575,7 +1639,8 @@ cleanup: } if (ret == 0 && - qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, 0) < 0) + qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, + QEMU_MIGRATION_COOKIE_PERSISTENT ) < 0) VIR_WARN("Unable to encode migration cookie"); qemuMigrationCookieFree(mig); @@ -2477,6 +2542,7 @@ qemuMigrationFinish(struct qemud_driver *driver, int newVM = 1; qemuMigrationCookiePtr mig = NULL; virErrorPtr orig_err = NULL; + int cookie_flags = 0; VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, retcode=%d", @@ -2490,7 +2556,11 @@ qemuMigrationFinish(struct qemud_driver *driver, v3proto ? QEMU_MIGRATION_PHASE_FINISH3 : QEMU_MIGRATION_PHASE_FINISH2); - if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, 0))) + if (flags & VIR_MIGRATE_PERSIST_DEST) + cookie_flags |= QEMU_MIGRATION_COOKIE_PERSISTENT; + + if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, + cookieinlen, cookie_flags))) goto endjob; /* Did the migration go as planned? If yes, return the domain @@ -2510,7 +2580,10 @@ qemuMigrationFinish(struct qemud_driver *driver, if (vm->persistent) newVM = 0; vm->persistent = 1; - vmdef = virDomainObjGetPersistentDef(driver->caps, vm); + if (mig->persistent) + vm->newDef = vmdef = mig->persistent; + else + vmdef = virDomainObjGetPersistentDef(driver->caps, vm); if (virDomainSaveConfig(driver->configDir, vmdef) < 0) { /* Hmpf. Migration was successful, but making it persistent * was not. If we report successful, then when this domain -- 1.7.3.4

3 10

[libvirt] [PATCH 0/3] snapshot: auto-cleanup metadata of transient domains
by Eric Blake 22 Sep '11

22 Sep '11

I intended to do this ever since I changed the API of virDomainUndefine to reject undefine of persistent guests with snapshots, but am only now getting around to it. This missed 0.9.5, but I think it is worth including in 0.9.6 even if we have a short release cycle to work around the qemu shutdown issue. Eric Blake (3): snapshot: fix logic bug in qemu undefine snapshot: prepare to remove transient snapshot metadata snapshot: remove snapshot metadata on transient exit src/conf/domain_conf.c | 4 +- src/qemu/qemu_domain.c | 260 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 36 ++++++ src/qemu/qemu_driver.c | 291 +++----------------------------------------- src/qemu/qemu_migration.c | 8 +- src/qemu/qemu_process.c | 10 +- 6 files changed, 327 insertions(+), 282 deletions(-) -- 1.7.4.4

2 6

[libvirt] [PATCH] locking: avoid dereferencing a NULL pointer
by ajia＠redhat.com 22 Sep '11

22 Sep '11

From: Alex Jia <ajia(a)redhat.com> * src/locking/lock_driver_sanlock.c: in fact, virStrcpy calls virStrncpy(dest, src, strlen(src), destbytes) then return result, if 'path' is NULL, it means 'src' is also NULL, strlen(NULL) will dereference a NULL pointer, which probably causes a segmentation fault. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/locking/lock_driver_sanlock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 2d72510..8c6d873 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -158,7 +158,7 @@ static int virLockManagerSanlockSetupLockspace(void) memcpy(ls.name, VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE, SANLK_NAME_LEN); ls.host_id = 0; /* Doesn't matter for initialization */ ls.flags = 0; - if (!virStrcpy(ls.host_id_disk.path, path, SANLK_PATH_LEN)) { + if (!path || !virStrcpy(ls.host_id_disk.path, path, SANLK_PATH_LEN)) { virLockError(VIR_ERR_INTERNAL_ERROR, _("Lockspace path '%s' exceeded %d characters"), path, SANLK_PATH_LEN); -- 1.7.1

4 4

[libvirt] [PATCH] virsh: fix regression in argv parsing
by Eric Blake 22 Sep '11

22 Sep '11

Commit 85d2810 broke commands with mandatory argv (send-key, qemu-monitor-command). This fixes things, and enhances the test to cover it. * tools/virsh.c (vshCmddefGetOption, vshCmddefGetData) (vshCommandParse): Fix option parsing for required argv option. (vshCmddefOptParse): Check that argv option is last. * tests/virsh-optparse: Enhance test. --- tests/virsh-optparse | 9 +++++++++ tools/virsh.c | 24 +++++++++++++++--------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/tests/virsh-optparse b/tests/virsh-optparse index 18252d2..d0d4329 100755 --- a/tests/virsh-optparse +++ b/tests/virsh-optparse @@ -118,6 +118,7 @@ for args in \ 'test name desc vda vdb' \ 'test --diskspec vda name --diskspec vdb desc' \ '--description desc --name name --domain test vda vdb' \ + '--description desc --diskspec vda --name name --domain test vdb' \ ; do virsh -q -c $test_url snapshot-create-as --print-xml $args \ >out 2>>err || fail=1 @@ -126,4 +127,12 @@ done test -s err && fail=1 +# Test a required argv +cat <<\EOF > exp-err || framework_failure +error: this function is not supported by the connection driver: virDomainQemuMonitorCommand +EOF +virsh -q -c $test_url qemu-monitor-command test a >out 2>err && fail=1 +test -s out && fail=1 +compare err exp-err || fail=1 + (exit $fail); exit $fail diff --git a/tools/virsh.c b/tools/virsh.c index 371346a..0b187bc 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -13834,6 +13834,7 @@ vshCmddefGetInfo(const vshCmdDef * cmd, const char *name) return NULL; } +/* Validate that the options associated with cmd can be parsed. */ static int vshCmddefOptParse(const vshCmdDef *cmd, uint32_t *opts_need_arg, uint32_t *opts_required) @@ -13871,13 +13872,16 @@ vshCmddefOptParse(const vshCmdDef *cmd, uint32_t *opts_need_arg, } else { optional = true; } + + if (opt->type == VSH_OT_ARGV && cmd->opts[i + 1].name) + return -1; /* argv option must be listed last */ } return 0; } static const vshCmdOptDef * vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name, - uint32_t *opts_seen) + uint32_t *opts_seen, int *opt_index) { int i; @@ -13885,12 +13889,12 @@ vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name, const vshCmdOptDef *opt = &cmd->opts[i]; if (STREQ(opt->name, name)) { - if (*opts_seen & (1 << i)) { + if ((*opts_seen & (1 << i)) && opt->type != VSH_OT_ARGV) { vshError(ctl, _("option --%s already seen"), name); return NULL; } - if (opt->type != VSH_OT_ARGV) - *opts_seen |= 1 << i; + *opts_seen |= 1 << i; + *opt_index = i; return opt; } } @@ -13913,10 +13917,9 @@ vshCmddefGetData(const vshCmdDef *cmd, uint32_t *opts_need_arg, /* Grab least-significant set bit */ i = ffs(*opts_need_arg) - 1; opt = &cmd->opts[i]; - if (opt->type != VSH_OT_ARGV) { + if (opt->type != VSH_OT_ARGV) *opts_need_arg &= ~(1 << i); - *opts_seen |= 1 << i; - } + *opts_seen |= 1 << i; return opt; } @@ -14878,12 +14881,14 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser) } else if (tkdata[0] == '-' && tkdata[1] == '-' && c_isalnum(tkdata[2])) { char *optstr = strchr(tkdata + 2, '='); + int opt_index; + if (optstr) { *optstr = '\0'; /* convert the '=' to '\0' */ optstr = vshStrdup(ctl, optstr + 1); } if (!(opt = vshCmddefGetOption(ctl, cmd, tkdata + 2, - &opts_seen))) { + &opts_seen, &opt_index))) { VIR_FREE(optstr); goto syntaxError; } @@ -14905,7 +14910,8 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser) VSH_OT_INT ? _("number") : _("string")); goto syntaxError; } - opts_need_arg &= ~opts_seen; + if (opt->type != VSH_OT_ARGV) + opts_need_arg &= ~(1 << opt_index); } else { tkdata = NULL; if (optstr) { -- 1.7.4.4

2 2

[libvirt] [PATCH] locking: remove redundant codes
by ajia＠redhat.com 22 Sep '11

22 Sep '11

From: Alex Jia <ajia(a)redhat.com> * src/locking/lock_driver_sanlock.c: remove redundant codes in error_unlink label from virLockManagerSanlockSetupLockspace, in fact, the codes make sure 'path' is non-null before getting to error_unlink label, so 'if (path)' is redundant, removing it in here and will also silence coverity. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/locking/lock_driver_sanlock.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 2d72510..c4dce4f 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -250,8 +250,7 @@ static int virLockManagerSanlockSetupLockspace(void) return 0; error_unlink: - if (path) - unlink(path); + unlink(path); error: VIR_FORCE_CLOSE(fd); VIR_FREE(path); -- 1.7.1

3 2

[libvirt] [PATCH] qemu: avoid dereferencing a NULL pointer
by ajia＠redhat.com 22 Sep '11

22 Sep '11

From: Alex Jia <ajia(a)redhat.com> * src/qemu/qemu_process.c: Taking if (qemuDomainObjEndJob(driver, obj) == 0) true branch then 'obj' is NULL, virDomainObjIsActive(obj) and virDomainObjUnref(obj) will dereference NULL pointer. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_process.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bd49b21..9fdf846 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2661,22 +2661,24 @@ error: if (qemuDomainObjEndJob(driver, obj) == 0) obj = NULL; - if (!virDomainObjIsActive(obj)) { - if (virDomainObjUnref(obj) > 0) - virDomainObjUnlock(obj); - qemuDriverUnlock(driver); - return; - } + if (obj) { + if (!virDomainObjIsActive(obj)) { + if (virDomainObjUnref(obj) > 0) + virDomainObjUnlock(obj); + qemuDriverUnlock(driver); + return; + } - if (virDomainObjUnref(obj) > 0) { - /* We can't get the monitor back, so must kill the VM - * to remove danger of it ending up running twice if - * user tries to start it again later */ - qemuProcessStop(driver, obj, 0, VIR_DOMAIN_SHUTOFF_FAILED); - if (!obj->persistent) - virDomainRemoveInactive(&driver->domains, obj); - else - virDomainObjUnlock(obj); + if (virDomainObjUnref(obj) > 0) { + /* We can't get the monitor back, so must kill the VM + * to remove danger of it ending up running twice if + * user tries to start it again later */ + qemuProcessStop(driver, obj, 0, VIR_DOMAIN_SHUTOFF_FAILED); + if (!obj->persistent) + virDomainRemoveInactive(&driver->domains, obj); + else + virDomainObjUnlock(obj); + } } qemuDriverUnlock(driver); -- 1.7.1

3 2

[libvirt] [PATCH] virsh: More friendly err if no pool is specified for looking up a vol
by Osier Yang 22 Sep '11

22 Sep '11

There are 3 ways to lookup a volume, only virStorageVolLookupByName needs pool object. So if no --pool is specified, it will tries to get the volume via virStorageVolLookupByPath/virStorageVolLookupByKey. But if all 3 ways fails, and no --pool is specified, a friendly error might help the user get right way quickly. --- tools/virsh.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 371346a..4b9e662 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -14714,8 +14714,13 @@ vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, vol = virStorageVolLookupByPath(ctl->conn, n); } - if (!vol) - vshError(ctl, _("failed to get vol '%s'"), n); + if (!vol) { + if (pool) + vshError(ctl, _("failed to get vol '%s'"), n); + else + vshError(ctl, _("failed to get vol '%s', specifying --pool " + "might help"), n); + } if (pool) virStoragePoolFree(pool); -- 1.7.6

2 2

[libvirt] [PATCH] storage: Wait udev events are handled before removing lvm vol
by Osier Yang 22 Sep '11

22 Sep '11

Related #BZ: https://bugzilla.redhat.com/show_bug.cgi?id=702260. There are two problems described in the BZ: 1) "Can't remove open logical volume". 2) "Unable to deactivate logical volume "foo"" This patch just intends to fix 2), as 1) is expected if the vol is still used by something, and you never known if "lvchange -an" will fail or not either (sometime, it will succeed, sometimes not). We'd better not look for trouble, :-) For 2), that's caused by race between lvremove and udev event handling, the only workable way now is to wait the events handling are finished, though it might introduce latencies, as "udevadmin settle" exits after *all* events are handled, it's the only way we can fix the racing in libvirt layer. See https://bugzilla.redhat.com/show_bug.cgi?id=570359 for more details. --- src/storage/storage_backend_logical.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 4f42047..23d80cb 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -686,6 +686,8 @@ virStorageBackendLogicalDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCheckFlags(0, -1); + virFileWaitForDevices(); + if (virRun(cmdargv, NULL) < 0) return -1; -- 1.7.6

2 2

[libvirt] [PATCH] qemu: avoid dereferencing a NULL pointer
by ajia＠redhat.com 21 Sep '11

21 Sep '11

From: Alex Jia <ajia(a)redhat.com> * src/qemu/qemu_process.c: Taking if (qemuDomainObjEndJob(driver, obj) == 0) true branch then 'obj' is NULL, virDomainObjIsActive(obj) and virDomainObjUnref(obj) will dereference NULL pointer. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_process.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bd49b21..9fdf846 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2661,22 +2661,24 @@ error: if (qemuDomainObjEndJob(driver, obj) == 0) obj = NULL; - if (!virDomainObjIsActive(obj)) { - if (virDomainObjUnref(obj) > 0) - virDomainObjUnlock(obj); - qemuDriverUnlock(driver); - return; - } + if (obj) { + if (!virDomainObjIsActive(obj)) { + if (virDomainObjUnref(obj) > 0) + virDomainObjUnlock(obj); + qemuDriverUnlock(driver); + return; + } - if (virDomainObjUnref(obj) > 0) { - /* We can't get the monitor back, so must kill the VM - * to remove danger of it ending up running twice if - * user tries to start it again later */ - qemuProcessStop(driver, obj, 0, VIR_DOMAIN_SHUTOFF_FAILED); - if (!obj->persistent) - virDomainRemoveInactive(&driver->domains, obj); - else - virDomainObjUnlock(obj); + if (virDomainObjUnref(obj) > 0) { + /* We can't get the monitor back, so must kill the VM + * to remove danger of it ending up running twice if + * user tries to start it again later */ + qemuProcessStop(driver, obj, 0, VIR_DOMAIN_SHUTOFF_FAILED); + if (!obj->persistent) + virDomainRemoveInactive(&driver->domains, obj); + else + virDomainObjUnlock(obj); + } } qemuDriverUnlock(driver); -- 1.7.1

1 0

[libvirt] virsh qemu-monitor-command broken with 0.9.5
by Jason Krieg 21 Sep '11

21 Sep '11

Hi, the virsh qemu-monitor-command is not working with libvirt 0.9.5 with git commit 85d2810823a31634b12145d6c196930b40425370 *opts_seen moved into the != VSH_OT_ARGV if statement so now opts_seen is only set if not VSH_OT_ARGV see attached fix Regards Jason

4 5

[libvirt] [PATCH] qemu: Avoid loop of fake reboots
by Jiri Denemark 21 Sep '11

21 Sep '11

Once virDomainReboot is called for a domain, guest OS initiated shutdown would always result in reboot instead of shutdown. Only virDomainShutdown would actually shutd such domain down. That's because we forgot to reset fakeReboot flag once we asked the domain to reboot. --- src/qemu/qemu_process.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 3baaa19..bd49b21 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -445,6 +445,7 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, priv->gotShutdown = true; if (priv->fakeReboot) { + priv->fakeReboot = false; virDomainObjRef(vm); virThread th; if (virThreadCreate(&th, -- 1.7.6.1

2 2

[libvirt] [PATCH v2] qemu: Fix shutdown regression with buggy qemu
by Jiri Denemark 21 Sep '11

21 Sep '11

The commit that prevents disk corruption on domain shutdown (96fc4784177ecb70357518fa863442455e45ad0e) causes regression with QEMU 0.14.* and 0.15.* because of a regression bug in QEMU that was fixed only recently in QEMU git. The affected versions of QEMU do not quit on SIGTERM if started with -no-shutdown, which we use to implement fake reboot. Since -no-shutdown tells QEMU not to quit automatically on guest shutdown, domains started using the affected QEMU cannot be shutdown properly and stay in a paused state. This patch disables fake reboot feature on such QEMU by not using -no-shutdown, which makes shutdown work as expected. However, virDomainReboot will not work in this case and it will report "Requested operation is not valid: Reboot is not supported with this QEMU binary". --- src/qemu/qemu_capabilities.c | 8 ++++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 2 +- src/qemu/qemu_driver.c | 6 ++++++ 4 files changed, 16 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 36f47a9..850d46e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -136,6 +136,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "pci-ohci", "usb-redir", "usb-hub", + "no-shutdown", ); struct qemu_feature_flags { @@ -1008,6 +1009,13 @@ qemuCapsComputeCmdFlags(const char *help, qemuCapsSet(flags, QEMU_CAPS_VHOST_NET); } + /* Do not use -no-shutdown if qemu doesn't support it or SIGTERM handling + * is most likely buggy when used with -no-shutdown (which applies for qemu + * 0.14.* and 0.15.*) + */ + if (strstr(help, "-no-shutdown") && (version < 14000 || version > 15999)) + qemuCapsSet(flags, QEMU_CAPS_NO_SHUTDOWN); + /* * Handling of -incoming arg with varying features * -incoming tcp (kvm >= 79, qemu >= 0.10.0) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 96b7a3b..74d3ab2 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -110,6 +110,7 @@ enum qemuCapsFlags { QEMU_CAPS_PCI_OHCI = 71, /* -device pci-ohci */ QEMU_CAPS_USB_REDIR = 72, /* -device usb-redir */ QEMU_CAPS_USB_HUB = 73, /* -device usb-hub */ + QEMU_CAPS_NO_SHUTDOWN = 74, /* usable -no-shutdown */ 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 ee4b52b..0adc56a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3574,7 +3574,7 @@ qemuBuildCommandLine(virConnectPtr conn, * when QEMU stops. If we use no-shutdown, then we can * watch for this event and do a soft/warm reboot. */ - if (monitor_json) + if (monitor_json && qemuCapsGet(qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) virCommandAddArg(cmd, "-no-shutdown"); if (!(def->features & (1 << VIR_DOMAIN_FEATURE_ACPI))) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f4ee4c3..67c43ab 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1557,6 +1557,12 @@ static int qemuDomainReboot(virDomainPtr dom, unsigned int flags) { priv = vm->privateData; if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON)) { + if (!qemuCapsGet(priv->qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Reboot is not supported with this QEMU binary")); + goto cleanup; + } + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; -- 1.7.6.1

2 2

[libvirt] [PATCH] Fix synchronous reading of stream data
by Daniel P. Berrange 21 Sep '11

21 Sep '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> commit 984840a2c292402926ad100aeea33f8859ff31a9 removed the notification of waiting calls when VIR_NET_CONTINUE messages arrive. This was to fix the case of a virStreamAbort() call being prematurely notified of completion. The problem is that sometimes there are dummy calls from a virStreamRecv() call waiting that *do* need to be notified. These dummy calls should have a status VIR_NET_CONTINUE. So re-add the notification upon VIR_NET_CONTINUE, but only if the waiter also has a status of VIR_NET_CONTINUE. * src/rpc/virnetclient.c: Notify waiting call if stream data arrives * src/rpc/virnetclientstream.c: Mark dummy stream read packet with status VIR_NET_CONTINUE --- src/rpc/virnetclient.c | 10 ++++++++++ src/rpc/virnetclientstream.c | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 055361d..b2c528a 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -627,6 +627,15 @@ static int virNetClientCallDispatchStream(virNetClientPtr client) case VIR_NET_CONTINUE: { if (virNetClientStreamQueuePacket(st, &client->msg) < 0) return -1; + + if (thecall && thecall->expectReply) { + if (thecall->msg->header.status == VIR_NET_CONTINUE) { + VIR_DEBUG("Got a synchronous confirm"); + thecall->mode = VIR_NET_CLIENT_MODE_COMPLETE; + } else { + VIR_DEBUG("Not completing call with status %d", thecall->msg->header.status); + } + } return 0; } @@ -1189,6 +1198,7 @@ int virNetClientSend(virNetClientPtr client, int ret = -1; if (expectReply && + (msg->bufferLength != 0) && (msg->header.status == VIR_NET_CONTINUE)) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("Attempt to send an asynchronous message with a synchronous reply")); diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c index 2cc84d4..4cd0295 100644 --- a/src/rpc/virnetclientstream.c +++ b/src/rpc/virnetclientstream.c @@ -400,6 +400,7 @@ int virNetClientStreamRecvPacket(virNetClientStreamPtr st, msg->header.type = VIR_NET_STREAM; msg->header.serial = st->serial; msg->header.proc = st->proc; + msg->header.status = VIR_NET_CONTINUE; VIR_DEBUG("Dummy packet to wait for stream data"); virMutexUnlock(&st->lock); -- 1.7.6.2

3 2

[libvirt] [test-API][PATCH v2] Add test case update_devflag.py for update device flag
by Nan Zhang 21 Sep '11

21 Sep '11

--- repos/domain/update_devflag.py | 163 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 163 insertions(+), 0 deletions(-) create mode 100644 repos/domain/update_devflag.py diff --git a/repos/domain/update_devflag.py b/repos/domain/update_devflag.py new file mode 100644 index 0000000..287f2a5 --- /dev/null +++ b/repos/domain/update_devflag.py @@ -0,0 +1,163 @@ +#!/usr/bin/evn python +"""Update virtual device to guest from an XML file +""" + +__author__ = 'Nan Zhang: nzhang(a)redhat.com' +__date__ = 'Fri Sep 2, 2011' +__version__ = '0.1.0' +__credits__ = 'Copyright (C) 2011 Red Hat, Inc.' +__all__ = ['usage', 'update_devflag'] + +import os +import re +import sys +import commands +from xml.dom import minidom + +def append_path(path): + """Append root path of package""" + if path in sys.path: + pass + else: + sys.path.append(path) + +pwd = os.getcwd() +result = re.search('(.*)libvirt-test-API', pwd) +append_path(result.group(0)) + +from lib import connectAPI +from lib import domainAPI +from utils.Python import utils +from utils.Python import xmlbuilder +from exception import LibvirtAPI + +def usage(): + print '''usage: mandatory arguments: + guestname + devtype + ''' + +def check_params(params): + """Verify inputing parameter dictionary""" + logger = params['logger'] + keys = ['guestname', 'devtype'] + for key in keys: + if key not in params: + logger.error("%s is required" %key) + usage() + return 1 + return 0 + +def create_image(params, img_name, img_size): + """Create an image file""" + logger = params['logger'] + stat, ret = commands.getstatusoutput("dd if=/dev/zero of=%s bs=1 \ + count=1 seek=%s" % (img_name, img_size)) + if stat == 0: + logger.debug("create image result:\n%s" % ret) + return True + else: + return False + +def check_updated_device(params, guestname, domobj, srcfile): + """Check if the device is updated""" + logger = params['logger'] + xmlobj = domobj.get_xml_desc(guestname) + domxml = minidom.parseString(xmlobj) + + for diskTag in domxml.getElementsByTagName("source"): + if diskTag.parentNode.getAttribute("device") == 'cdrom': + upfile = diskTag.getAttribute("file") + elif diskTag.parentNode.getAttribute('device') == 'floppy': + upfile = diskTag.getAttribute("file") + + if upfile == srcfile: + return False, upfile + else: + return True, upfile + +def update_devflag(params): + """Update virtual device to a domain from xml""" + + # Initiate and check parameters + params_check_result = check_params(params) + if params_check_result: + return 1 + logger = params['logger'] + guestname = params['guestname'] + devtype = params['devtype'] + if devtype == 'cdrom': + xmlargs = {} + xmlargs['guestname'] = guestname + xmlargs['guesttype'] = 'kvm' + xmlargs['hdmodel'] = 'ide' + xmlargs['bootcd'] = '/var/lib/libvirt/boot/cdrom.img' + srcfile = xmlargs['bootcd'] + create_image(params, srcfile, '100M') + elif devtype == 'floppy': + xmlargs = {} + xmlargs['guestname'] = guestname + xmlargs['floppysource'] = '/var/lib/libvirt/boot/floppy.img' + srcfile = xmlargs['floppysource'] + create_image(params, srcfile, '2M') + else: + srcfile = None + logger.error("Wrong device type was specified.") + return 1 + + if not params.has_key('flag'): + flag = domainAPI.VIR_DOMAIN_AFFECT_CONFIG + + # Connect to local hypervisor connection URI + util = utils.Utils() + uri = util.get_uri('127.0.0.1') + conn = connectAPI.ConnectAPI() + virconn = conn.open(uri) + + caps = conn.get_caps() + logger.debug(caps) + + # Generate device XML for updating + domobj = domainAPI.DomainAPI(virconn) + newxmlobj = xmlbuilder.XmlBuilder() + + if devtype == 'cdrom': + newdevxml = newxmlobj.build_cdrom(xmlargs) + elif devtype == 'floppy': + newdevxml = newxmlobj.build_floppy(xmlargs) + + logger.debug("block device xml desc:\n%s" %newdevxml) + + try: + try: + domobj.update_device_flag(guestname, newdevxml, flag) + res, upfile = check_updated_device(params, guestname, \ + domobj, srcfile) + if res: + logger.info("success to update '%s' device: %s\n" % \ + (devtype, upfile)) + else: + logger.error("fail to update '%s' device: %s\n" % \ + (devtype, upfile)) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % + (e.response()['message'], e.response()['code'])) + conn.close() + logger.info("closed hypervisor connection") + return 1 + finally: + conn.close() + logger.info("closed hypervisor connection") + + return 0 + +def update_devflag_clean(params): + """Clean testing environment""" + logger = params['logger'] + + if params['devtype'] == 'cdrom': + os.unlink('/var/lib/libvirt/boot/cdrom.img') + elif params['devtype'] == 'floppy': + os.unlink('/var/lib/libvirt/boot/floppy.img') + else: + logger.debug("image file was not found.") -- 1.7.4.4

2 2

[libvirt] [PATCH] qemu: Fix shutdown regression
by Jiri Denemark 21 Sep '11

21 Sep '11

The commit that prevents disk corruption on domain shutdown (96fc4784177ecb70357518fa863442455e45ad0e) causes regression with QEMU 0.14.* and 0.15.* because of a regression bug in QEMU that was fixed only recently in QEMU git. With affected QEMU binaries, domains cannot be shutdown properly and stay in a paused state. This patch tries to avoid this by sending SIGKILL to 0.1[45].* QEMU processes. Though we wait a bit more between sending SIGTERM and SIGKILL to reduce the possibility of virtual disk corruption. --- src/qemu/qemu_capabilities.c | 7 +++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_process.c | 19 +++++++++++++------ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 36f47a9..823c500 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -136,6 +136,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "pci-ohci", "usb-redir", "usb-hub", + "no-shutdown-bug", ); struct qemu_feature_flags { @@ -1049,6 +1050,12 @@ qemuCapsComputeCmdFlags(const char *help, if (version >= 13000) qemuCapsSet(flags, QEMU_CAPS_PCI_MULTIFUNCTION); + + /* QEMU version 0.14.* and 0.15.* are known not to handle SIGTERM + * properly when started with -no-shutdown + */ + if (version >= 14000 && version <= 15999) + qemuCapsSet(flags, QEMU_CAPS_NO_SHUTDOWN_BUG); } /* We parse the output of 'qemu -help' to get the QEMU diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 96b7a3b..53d5ace 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -110,6 +110,7 @@ enum qemuCapsFlags { QEMU_CAPS_PCI_OHCI = 71, /* -device pci-ohci */ QEMU_CAPS_USB_REDIR = 72, /* -device usb-redir */ QEMU_CAPS_USB_HUB = 73, /* -device usb-hub */ + QEMU_CAPS_NO_SHUTDOWN_BUG = 74, /* -no-shutdown doesn't exit on SIGTERM */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 3baaa19..3311699 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -434,6 +434,7 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; + bool gracefully = true; VIR_DEBUG("vm=%p", vm); virDomainObjLock(vm); @@ -443,6 +444,12 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, goto cleanup; } + if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_NO_SHUTDOWN_BUG)) { + VIR_DEBUG("Emulator is likely affected by -no-shutdown bug;" + " we will not avoid sending SIGKILL to it"); + gracefully = false; + } + priv->gotShutdown = true; if (priv->fakeReboot) { virDomainObjRef(vm); @@ -452,12 +459,12 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, qemuProcessFakeReboot, vm) < 0) { VIR_ERROR(_("Failed to create reboot thread, killing domain")); - qemuProcessKill(vm, true); + qemuProcessKill(vm, gracefully); if (virDomainObjUnref(vm) == 0) vm = NULL; } } else { - qemuProcessKill(vm, true); + qemuProcessKill(vm, gracefully); } cleanup: @@ -3227,15 +3234,15 @@ void qemuProcessKill(virDomainObjPtr vm, bool gracefully) } /* This loop sends SIGTERM, then waits a few iterations - * (1.6 seconds) to see if it dies. If still alive then + * (3 seconds) to see if it dies. If still alive then * it does SIGKILL, and waits a few more iterations (1.6 * seconds more) to confirm that it has really gone. */ - for (i = 0 ; i < 15 ; i++) { + for (i = 0 ; i < 23 ; i++) { int signum; if (i == 0) signum = SIGTERM; - else if (i == 8) + else if (i == 15) signum = SIGKILL; else signum = 0; /* Just check for existence */ @@ -3249,7 +3256,7 @@ void qemuProcessKill(virDomainObjPtr vm, bool gracefully) break; } - if (i == 0 && gracefully) + if (gracefully) break; usleep(200 * 1000); -- 1.7.6.1

7 18

[libvirt] [PATCH] daemon: Modify init script to check for libvirtd managed with upstart
by Peter Krempa 21 Sep '11

21 Sep '11

On some systems init scripts are installed along with upstart . This may cause trouble if user tries to restart/stop a instance of libvirtd managed with upstart with init script. This patch adds check for a started libvirtd managed by upstart and fails the init script. [root@localhost ~]# initctl status libvirtd libvirtd start/running, process 3001 [root@localhost ~]# service libvirtd restart Stopping libvirtd daemon: error: libvirtd is managed by upstart and started, use initctl instead If libvirtd is not managed by upstart or is stopped, init script works normaly and allows the user to manage the service. https://bugzilla.redhat.com/show_bug.cgi?id=728153 --- daemon/libvirtd.init.in | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in index 0697a2b..823fa77 100644 --- a/daemon/libvirtd.init.in +++ b/daemon/libvirtd.init.in @@ -43,6 +43,8 @@ LIBVIRTD_CONFIG= LIBVIRTD_ARGS= KRB5_KTNAME=/etc/libvirt/krb5.tab +INITCTL_PATH=/sbin/initctl + test -f @sysconfdir@/sysconfig/libvirtd && . @sysconfdir@/sysconfig/libvirtd export QEMU_AUDIO_DRV @@ -56,8 +58,22 @@ fi RETVAL=0 +# Check if libvirt is managed by upstart and fail if it's the case +initctl_check() { + if [ -x $INITCTL_PATH ]; then + #extract status from upstart + LIBVIRTD_UPSTART_STATUS=`$INITCTL_PATH status libvirtd | tr "/" " " | cut -d " " -f 2` + if [ $LIBVIRTD_UPSTART_STATUS = "start" ]; then + echo "error: libvirtd is managed by upstart and started, use initctl instead" + exit 1 + fi + fi +} + start() { echo -n $"Starting $SERVICE daemon: " + initctl_check + mkdir -p @localstatedir@/cache/libvirt rm -rf @localstatedir@/cache/libvirt/* KRB5_KTNAME=$KRB5_KTNAME daemon --pidfile $PIDFILE --check $SERVICE $PROCESS --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS @@ -68,6 +84,7 @@ start() { stop() { echo -n $"Stopping $SERVICE daemon: " + initctl_check killproc -p $PIDFILE $PROCESS RETVAL=$? @@ -88,6 +105,7 @@ restart() { reload() { echo -n $"Reloading $SERVICE configuration: " + initctl_check killproc -p $PIDFILE $PROCESS -HUP RETVAL=$? -- 1.7.3.4

2 2

[libvirt] [PATCH] Revert "Ensure async packets never get marked for sync replies"
by Michal Privoznik 21 Sep '11

21 Sep '11

This partially reverts commit 984840a2c292402926ad100aeea33f8859ff31a9. Without this patch, client don't finish a stream which makes any API involving virStream block indefinitely. --- src/rpc/virnetclient.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 055361d..50f46ea 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -627,6 +627,11 @@ static int virNetClientCallDispatchStream(virNetClientPtr client) case VIR_NET_CONTINUE: { if (virNetClientStreamQueuePacket(st, &client->msg) < 0) return -1; + + if (thecall && thecall->expectReply) { + VIR_DEBUG("Got sync data packet completion"); + thecall->mode = VIR_NET_CLIENT_MODE_COMPLETE; + } return 0; } -- 1.7.3.4

4 4

[libvirt] [RFC v1] API to invoke S3/S4 on a KVM host and also resume from within libvirt
by Srivatsa S. Bhat 21 Sep '11

21 Sep '11

This patch adds a new API to put a KVM host to a suspended state (either Suspend-to-RAM or Suspend-to-Disk) and also resume the host back from within libvirt. This uses the RTC wakeup mechanism to set up a timer alarm before suspending the host, so that in-band resume is facilitated since the firing of the RTC alarm wakes up the host. The decision to use the RTC Wakeup mechanism to resume the host from sleep was taken in [1]. An initial API was discussed in [2]. Some design ideas for the asynchronous mechanism implementation was discussed in [3]. Todo: 1. During libvirtd init time check if S3/S4 is supported by the host. 2. Add synchronization/locking to ensure that only one suspend operation is active at a time. References: [1]. http://www.redhat.com/archives/libvir-list/2011-August/msg00327.html [2]. http://www.redhat.com/archives/libvir-list/2011-August/msg00248.html [3]. http://www.redhat.com/archives/libvir-list/2011-September/msg00438.html Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat(a)linux.vnet.ibm.com> --- include/libvirt/libvirt.h.in | 9 +++ src/driver.h | 5 ++ src/libvirt.c | 45 ++++++++++++++ src/libvirt_private.syms | 4 + src/libvirt_public.syms | 1 src/nodeinfo.c | 139 ++++++++++++++++++++++++++++++++++++++++++ src/nodeinfo.h | 10 +++ src/qemu/qemu_driver.c | 1 src/remote/remote_driver.c | 1 src/remote/remote_protocol.x | 12 +++- 10 files changed, 224 insertions(+), 3 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 39155a6..aca55e6 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -988,6 +988,10 @@ unsigned long long virNodeGetFreeMemory (virConnectPtr conn); int virNodeGetSecurityModel (virConnectPtr conn, virSecurityModelPtr secmodel); +int virNodeSuspendForDuration (virConnectPtr conn, + int state, + unsigned long long duration); + /* * Gather list of running domains */ @@ -3210,6 +3214,11 @@ typedef struct _virTypedParameter virMemoryParameter; */ typedef virMemoryParameter *virMemoryParameterPtr; +typedef enum { + VIR_S3, /* Suspend-to-RAM */ + VIR_S4 /* Suspend-to-disk */ +} virSuspendState; + #ifdef __cplusplus } #endif diff --git a/src/driver.h b/src/driver.h index 3792003..658af5f 100644 --- a/src/driver.h +++ b/src/driver.h @@ -718,6 +718,10 @@ typedef int (*virDrvDomainBlockPull)(virDomainPtr dom, const char *path, unsigned long bandwidth, unsigned int flags); +typedef int + (*virDrvNodeSuspendForDuration)(virConnectPtr conn, int state, + unsigned long long duration); + /** * _virDriver: @@ -872,6 +876,7 @@ struct _virDriver { virDrvDomainGetBlockJobInfo domainGetBlockJobInfo; virDrvDomainBlockJobSetSpeed domainBlockJobSetSpeed; virDrvDomainBlockPull domainBlockPull; + virDrvNodeSuspendForDuration nodeSuspendForDuration; }; typedef int diff --git a/src/libvirt.c b/src/libvirt.c index 05c0a87..688c982 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -6103,6 +6103,51 @@ error: } /** + * virNodeSuspendForDuration: + * @conn: pointer to the hypervisor connection + * @state: the state to which the host must be suspended to + * @duration: the time duration in seconds, for which the host + * has to be suspended + * + * Suspend the node (host machine) for the given duration of time + * in the specified state (such as S3 or S4). Resume the node + * after the time duration is complete. + * + * Returns 0 on success (i.e., the node will be suspended after a + * short delay), -1 on failure (the operation is not supported). + */ +int +virNodeSuspendForDuration(virConnectPtr conn, + int state, + unsigned long long duration) +{ + VIR_DEBUG("conn=%p, state=%d, duration=%lld", conn, state, duration); + + virResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__); + virDispatchError(NULL); + return -1; + } + + if (conn->driver->nodeSuspendForDuration) { + int ret; + ret = conn->driver->nodeSuspendForDuration(conn, state, duration); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + virDispatchError(conn); + return -1; +} + + +/** * virDomainGetSchedulerType: * @domain: pointer to domain object * @nparams: pointer to number of scheduler parameters, can be NULL diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4f33567..3d2870a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -828,7 +828,9 @@ nodeGetCellsFreeMemory; nodeGetFreeMemory; nodeGetInfo; nodeGetMemoryStats; - +nodeSuspendForDuration; +setNodeWakeup; +nodeSuspend; # nwfilter_conf.h virNWFilterCallbackDriversLock; diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 8a6d55a..14466f9 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -478,6 +478,7 @@ LIBVIRT_0.9.4 { virDomainGetBlockJobInfo; virDomainBlockJobSetSpeed; virDomainBlockPull; + virNodeSuspendForDuration; } LIBVIRT_0.9.3; LIBVIRT_0.9.5 { diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 6448b79..34e9ff8 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -46,7 +46,8 @@ #include "count-one-bits.h" #include "intprops.h" #include "virfile.h" - +#include "command.h" +#include "threads.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -897,3 +898,139 @@ unsigned long long nodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED) return 0; } #endif + + +static bool aboutToSuspend = false; + +/** + * nodeSuspendForDuration: + * @conn: pointer to the hypervisor connection + * @state: the state to which the host must be suspended to - + * VIR_HOST_PM_S3 (Suspend-to-RAM) + * or VIR_HOST_PM_S4 (Suspend-to-disk) + * @duration: the time duration in seconds, for which the host + * must be suspended + * + * Suspend the node (host machine) for the given duration of time + * in the specified state (such as S3 or S4). Resume the node + * after the time duration is complete. + * + * An RTC alarm is set appropriately to wake up the node from + * its sleep state. Then the actual node suspend is carried out + * asynchronously in another thread, after a short time delay + * so as to give enough time for this function to return status + * to its caller through the connection. + * + * Returns 0 in case the node is going to be suspended after a short + * delay, -1 if suspending the node is not supported. + */ + +int nodeSuspendForDuration(virConnectPtr conn ATTRIBUTE_UNUSED, + int state, + unsigned long long duration) +{ + virThread thread; + static char * suspendCmdString; + int ret = -1; + + /* Check if we have already started suspending + * and this is a duplicate request. + */ + if(aboutToSuspend == true) { + /* This is a duplicate request to suspend. + * So we need not do anything. + */ + return 0; + } else { + /* This is not a duplicate request to suspend. */ + aboutToSuspend = true; + } + + /* Just set the RTC alarm. Don't suspend yet. */ + if(setNodeWakeup(duration) < 0) { + nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to set up the RTC alarm for node wakeup\n")); + goto cleanup; + } + + if (state == VIR_S4) { + suspendCmdString = "pm-hibernate"; + } else { + suspendCmdString = "pm-suspend"; + } + + if(virThreadCreate(&thread, false, nodeSuspend, suspendCmdString) < 0) { + nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to create thread to suspend the host\n")); + goto cleanup; + } + + ret = 0; + +cleanup: + return ret; +} + +/** + * setNodeWakeup: + * @alarmTime : time in seconds from now, at which the RTC alarm has to be set. + * + * Set up the RTC alarm to the specified time. + * Return 0 on success, -1 on failure. + */ + +int setNodeWakeup(unsigned long long alarmTime) +{ + virCommandPtr setAlarmCmd; + int ret = -1; + + setAlarmCmd = virCommandNewArgList("rtcwake", "-m", "no", "-s", NULL); + virCommandAddArgFormat(setAlarmCmd, "%lld", alarmTime); + + if (virCommandRun(setAlarmCmd, NULL) < 0) { + nodeReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Failed to set up the RTC alarm\n")); + goto cleanup; + } + + ret = 0; + +cleanup: + virCommandFree(setAlarmCmd); + return ret; +} + +/** + * nodeSuspend: + * @cmdString: string containing the command to invoke + * + * Actually perform the suspend operation by invoking the + * command. Give a short delay before executing the command + * so as to give a chance to virNodeSuspendForDuration() to + * return the status to the caller. If we don't give this delay, + * that function will not be able to return the status since the + * suspend operation would have begun and hence no data can be + * sent through the connection to the caller. + */ + +void nodeSuspend(void *cmdString) +{ + virCommandPtr suspendCmd = virCommandNew((char *)cmdString); + + /* Delay for sometime so that the function nodeSuspendForDuration + * can return the status to the caller. + */ + sleep(SUSPEND_DELAY); + if (virCommandRun(suspendCmd, NULL) < 0) { + nodeReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Failed to suspend the node\n")); + } + + virCommandFree(suspendCmd); + + /* Now that we have resumed from our sleep state, reset the flag + * that formerly indicated that we were about to suspend the node. + */ + aboutToSuspend = false; +} + diff --git a/src/nodeinfo.h b/src/nodeinfo.h index 4766152..f0c2271 100644 --- a/src/nodeinfo.h +++ b/src/nodeinfo.h @@ -46,4 +46,14 @@ int nodeGetCellsFreeMemory(virConnectPtr conn, int maxCells); unsigned long long nodeGetFreeMemory(virConnectPtr conn); +int nodeSuspendForDuration(virConnectPtr conn, + int state, + unsigned long long duration); + +int setNodeWakeup(unsigned long long alarmTime); + +# define SUSPEND_DELAY 10 /* in seconds */ + +void nodeSuspend(void *cmdString); + #endif /* __VIR_NODEINFO_H__*/ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e2f428f..c2c72d2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10695,6 +10695,7 @@ static virDriver qemuDriver = { .domainGetBlockJobInfo = qemuDomainGetBlockJobInfo, /* 0.9.4 */ .domainBlockJobSetSpeed = qemuDomainBlockJobSetSpeed, /* 0.9.4 */ .domainBlockPull = qemuDomainBlockPull, /* 0.9.4 */ + .nodeSuspendForDuration = nodeSuspendForDuration, /* 0.9.4 */ }; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 9d34b7e..02cd122 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4429,6 +4429,7 @@ static virDriver remote_driver = { .domainGetBlockJobInfo = remoteDomainGetBlockJobInfo, /* 0.9.4 */ .domainBlockJobSetSpeed = remoteDomainBlockJobSetSpeed, /* 0.9.4 */ .domainBlockPull = remoteDomainBlockPull, /* 0.9.4 */ + .nodeSuspendForDuration = remoteNodeSuspendForDuration, /* 0.9.4 */ }; static virNetworkDriver network_driver = { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 4ec1c57..c1b1d94 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2220,6 +2220,15 @@ struct remote_domain_get_control_info_ret { /* insert@1 */ unsigned hyper stateTime; }; +struct remote_node_suspend_for_duration_args { + int state; + unsigned hyper duration; +}; + +struct remote_node_suspend_for_duration_ret { + int status; +}; + /*----- Protocol. -----*/ /* Define the program number, protocol version and procedure numbers here. */ @@ -2509,7 +2518,8 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_EVENT_BLOCK_JOB = 241, /* skipgen skipgen */ REMOTE_PROC_DOMAIN_MIGRATE_GET_MAX_SPEED = 242, /* autogen autogen */ - REMOTE_PROC_DOMAIN_BLOCK_STATS_FLAGS = 243 /* skipgen skipgen */ + REMOTE_PROC_DOMAIN_BLOCK_STATS_FLAGS = 243, /* skipgen skipgen */ + REMOTE_PROC_NODE_SUSPEND_FOR_DURATION = 244 /* autogen autogen priority:high */ /* * Notice how the entries are grouped in sets of 10 ?

1 0

[libvirt] [PATCH 1/2] qemu: using correct function to reboot guest.
by xuhj＠linux.vnet.ibm.com 21 Sep '11

21 Sep '11

From: Xu He Jie <xuhj(a)linux.vnet.ibm.com> Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f4ee4c3..b0c9c02 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1567,7 +1567,7 @@ static int qemuDomainReboot(virDomainPtr dom, unsigned int flags) { } qemuDomainObjEnterMonitor(driver, vm); - ret = qemuMonitorSystemPowerdown(priv->mon); + ret = qemuMonitorSystemReset(priv->mon); qemuDomainObjExitMonitor(driver, vm); priv->fakeReboot = true; -- 1.7.4.1

3 3