- Devel - libvirt List Archives

[libvirt] [PATCH] Fix logging in libvirt_lxc controller
by Amy Griffis 19 Jun '09

19 Jun '09

The lxc controller can't see libvirtd's log level setting so it needs to re-query it from the environment. The parsing code has a few users now, so I added a new function to the internal API, virLogParseDefaultPriority() along the lines of the other parse functions. Signed-off-by: Amy Griffis <amy.griffis(a)hp.com> diff --git a/qemud/qemud.c b/qemud/qemud.c index a58a767..bd17ccb 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -2465,16 +2465,8 @@ qemudSetLogging(virConfPtr conf, const char *filename) { */ GET_CONF_INT (conf, filename, log_level); debugEnv = getenv("LIBVIRT_DEBUG"); - if (debugEnv && *debugEnv && *debugEnv != '0') { - if (STREQ(debugEnv, "2") || STREQ(debugEnv, "info")) - log_level = VIR_LOG_INFO; - else if (STREQ(debugEnv, "3") || STREQ(debugEnv, "warning")) - log_level = VIR_LOG_WARN; - else if (STREQ(debugEnv, "4") || STREQ(debugEnv, "error")) - log_level = VIR_LOG_ERROR; - else - log_level = VIR_LOG_DEBUG; - } + if (debugEnv && *debugEnv && *debugEnv != '0') + log_level = virLogParseDefaultPriority(debugEnv); if ((verbose) && (log_level >= VIR_LOG_WARN)) log_level = VIR_LOG_INFO; virLogSetDefaultPriority(log_level); diff --git a/src/libvirt.c b/src/libvirt.c index bf49018..a3f36da 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -258,6 +258,7 @@ virInitialize(void) { #ifdef ENABLE_DEBUG char *debugEnv; + int logPrio; #endif if (initialized) return(0); @@ -272,14 +273,8 @@ virInitialize(void) #ifdef ENABLE_DEBUG debugEnv = getenv("LIBVIRT_DEBUG"); if (debugEnv && *debugEnv && *debugEnv != '0') { - if (STREQ(debugEnv, "2") || STREQ(debugEnv, "info")) - virLogSetDefaultPriority(VIR_LOG_INFO); - else if (STREQ(debugEnv, "3") || STREQ(debugEnv, "warning")) - virLogSetDefaultPriority(VIR_LOG_WARN); - else if (STREQ(debugEnv, "4") || STREQ(debugEnv, "error")) - virLogSetDefaultPriority(VIR_LOG_ERROR); - else - virLogSetDefaultPriority(VIR_LOG_DEBUG); + logPrio = virLogParseDefaultPriority(debugEnv); + virLogSetDefaultPriority(logPrio); } debugEnv = getenv("LIBVIRT_LOG_FILTERS"); if (debugEnv) diff --git a/src/libvirt_debug.syms b/src/libvirt_debug.syms index 1742a0b..539d879 100644 --- a/src/libvirt_debug.syms +++ b/src/libvirt_debug.syms @@ -12,6 +12,7 @@ virLogMessage; virLogSetDefaultPriority; virLogDefineFilter; virLogDefineOutput; +virLogParseDefaultPriority; virLogParseFilters; virLogParseOutputs; virLogStartup; diff --git a/src/logging.c b/src/logging.c index 83e07cc..c72d52e 100644 --- a/src/logging.c +++ b/src/logging.c @@ -793,5 +793,30 @@ int virLogParseFilters(const char *filters) { } return(ret); } + +/** + * virLogParseDefaultPriority: + * @priority: string defining the desired logging behavior + * + * It can take a string or number corresponding to the following log + * levels: + * 1: DEBUG + * 2: INFO + * 3: WARNING + * 4: ERROR + * + * DEBUG is returned if @priority doesn't match any of the other values. + */ +int virLogParseDefaultPriority(const char *priority) { + + if (STREQ(priority, "2") || STREQ(priority, "info")) + return VIR_LOG_INFO; + else if (STREQ(priority, "3") || STREQ(priority, "warning")) + return VIR_LOG_WARN; + else if (STREQ(priority, "4") || STREQ(priority, "error")) + return VIR_LOG_ERROR; + else + return VIR_LOG_DEBUG; +} #endif /* ENABLE_DEBUG */ diff --git a/src/logging.h b/src/logging.h index 7ea8935..72b3119 100644 --- a/src/logging.h +++ b/src/logging.h @@ -110,6 +110,7 @@ typedef void (*virLogCloseFunc) (void *data); #ifdef ENABLE_DEBUG +extern int virLogParseDefaultPriority(const char *priority); extern int virLogSetDefaultPriority(int priority); extern int virLogDefineFilter(const char *match, int priority, int flags); extern int virLogDefineOutput(virLogOutputFunc f, virLogCloseFunc c, @@ -130,6 +131,7 @@ extern void virLogMessage(const char *category, int priority, #else /* ENABLE_DEBUG */ +#define virLogParseDefaultPriority(p) #define virLogSetDefaultPriority(p) #define virLogDefineFilter(m, p, f) #define virLogDefineOutput(func, c, d, p, f) diff --git a/src/lxc_controller.c b/src/lxc_controller.c index 356ecb8..9355d39 100644 --- a/src/lxc_controller.c +++ b/src/lxc_controller.c @@ -594,6 +594,8 @@ int main(int argc, char *argv[]) int monitor = -1; int appPty = -1; int bg = 0; + char *debugEnv; + int logPrio; virCapsPtr caps = NULL; virDomainDefPtr def = NULL; char *configFile = NULL; @@ -735,6 +737,13 @@ int main(int argc, char *argv[]) } } + /* New programs need to re-query and set the libvirt log level. */ + debugEnv = getenv("LIBVIRT_DEBUG"); + if (debugEnv && *debugEnv && *debugEnv != '0') { + logPrio = virLogParseDefaultPriority(debugEnv); + virLogSetDefaultPriority(logPrio); + } + /* Accept initial client which is the libvirtd daemon */ if ((client = accept(monitor, NULL, 0)) < 0) { virReportSystemError(NULL, errno, "%s",

4 7

[libvirt] [PATCH 0/1] Make NPIV support work with older kernels
by David Allan 19 Jun '09

19 Jun '09

Here is a patch that makes NPIV support work with older kernels that have vport_create and delete in /sys/class/scsi_host/hostN instead of /sys/class/fc_host/hostN It doesn't look to me like there is a single place to find those files that works with both old and new kernels, so the new code checks both places at runtime. Dave

4 4

[libvirt] KVM root mac address
by Paul Reeves 19 Jun '09

19 Jun '09

A quick question - What is the correct root for dynamically generated KVM mac addresses? The docs (man virt-install) say 54:52:00 and I've seen Ubuntu docs on-line that say 52:54:00. Has someone got these mixed up? Thanks Paul -- Paul Reeves

4 4

[libvirt] domain.info() sometimes returns state zero for running machines
by Andreas Sommer 19 Jun '09

19 Jun '09

I'm using Xen-3.2-1 on Debian 5.0.1-lenny and retrieve information about running domains using domain.info()[0] The domain object is retrieved via connection.lookupByUUIDString(...) and stored as a variable called "domain". Usually the running domains have the state 1 (VIR_DOMAIN_RUNNING) or 2 (VIR_DOMAIN_BLOCKED), but sometimes it happens that 0 (VIR_DOMAIN_NOSTATE) is returned. Why does that happen? I don't think it is an error because then it would've raised an exception... Regards Andreas

2 4

[libvirt] [PATCH] test driver: Fix domain ID after redefining a running VM
by Cole Robinson 19 Jun '09

19 Jun '09

The ID of the existing VM was being unconditionally set to -1, which was upsetting virt-manager. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/test.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test.c b/src/test.c index 7dc0840..2a672a3 100644 --- a/src/test.c +++ b/src/test.c @@ -1623,16 +1623,16 @@ static virDomainPtr testDomainDefineXML(virConnectPtr conn, def)) == NULL) { goto cleanup; } + def = NULL; dom->persistent = 1; - dom->def->id = -1; + event = virDomainEventNewFromObj(dom, VIR_DOMAIN_EVENT_DEFINED, VIR_DOMAIN_EVENT_DEFINED_ADDED); - ret = virGetDomain(conn, def->name, def->uuid); - def = NULL; + ret = virGetDomain(conn, dom->def->name, dom->def->uuid); if (ret) - ret->id = -1; + ret->id = dom->def->id; cleanup: virDomainDefFree(def); -- 1.6.0.6

3 2

[libvirt] [PATCH] Fix memory reporting for inactive domains in the qemu driver.
by Cole Robinson 19 Jun '09

19 Jun '09

Currently, 'info' will always report that mem = max mem. Make sure we actually return the correct mem value. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu_driver.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index d3eb3ad..4e3e531 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -2553,16 +2553,22 @@ static int qemudDomainGetInfo(virDomainPtr dom, } } - err = qemudDomainGetMemoryBalloon(dom->conn, vm, &balloon); - if (err < 0) - goto cleanup; - info->maxMem = vm->def->maxmem; - if (err == 0) - /* Balloon not supported, so maxmem is always the allocation */ - info->memory = vm->def->maxmem; - else - info->memory = balloon; + + if (virDomainIsActive(vm)) { + err = qemudDomainGetMemoryBalloon(dom->conn, vm, &balloon); + if (err < 0) + goto cleanup; + + if (err == 0) + /* Balloon not supported, so maxmem is always the allocation */ + info->memory = vm->def->maxmem; + else + info->memory = balloon; + } else { + info->memory = vm->def->memory; + } + info->nrVirtCpu = vm->def->vcpus; ret = 0; -- 1.6.0.6

3 2

[libvirt] Patch for Ruby Bindings to include attach & detach device
by Martin Gajdos 19 Jun '09

19 Jun '09

Hi David Lutterkort asked me to send this patch to the list so it could be reviewed. What this small patch does is, it adds two functions to call "virDomainAttachDevice" & "virDomainDetachDevice" which allow devices to be attached & detached at run-time. The Ruby methods are called "attach_device" & "detach_device" and belong to the Domain class. Martin --- orig_libvirt.c 2009-06-18 12:17:47.000000000 +0200 +++ mine_libvirt.c 2009-06-18 12:22:25.000000000 +0200 @@ -970,6 +970,22 @@ } /* + * Call +virDomainAttachDevice+[ http://www.libvirt.org/html/libvirt-libvirt.html#virDomainAttachDevice] + */ +VALUE libvirt_dom_attach_device(VALUE s, VALUE xml) { + gen_call_void(virDomainAttachDevice, conn(s), + domain_get(s), StringValueCStr(xml)); +} + +/* + * Call +virDomainDetachDevice+[ http://www.libvirt.org/html/libvirt-libvirt.html#virDomainDetachDevice] + */ +VALUE libvirt_dom_detach_device(VALUE s, VALUE xml) { + gen_call_void(virDomainDetachDevice, conn(s), + domain_get(s), StringValueCStr(xml)); +} + +/* * Call +virDomainCreateLinux+[ http://www.libvirt.org/html/libvirt-libvirt.html#virDomainCreateLinux] */ VALUE libvirt_conn_create_linux(int argc, VALUE *argv, VALUE c) { @@ -1921,6 +1937,8 @@ rb_define_method(c_domain, "autostart", libvirt_dom_autostart, 0); rb_define_method(c_domain, "autostart=", libvirt_dom_autostart_set, 1); rb_define_method(c_domain, "free", libvirt_dom_free, 0); + rb_define_method(c_domain, "attach_device", libvirt_dom_attach_device, 1); + rb_define_method(c_domain, "detach_device", libvirt_dom_detach_device, 1); /* * Class Libvirt::Domain::Info

3 2

[libvirt] PATCH: Fix QEMU security model info after capabilities refresh
by Daniel P. Berrange 18 Jun '09

18 Jun '09

A recent patch made the qemudGetCapabilities() method blow away and re-create the QEMU driver's capabilities object. Unfortunately it did not re-initialize the security model capabilities data. It also left open the possibility that the QEMU driver could be left with no active capabilities object at all in the case of OOM. Thus, this patch . - Splits the security capabilities init code out to be callable independantly of init of the security driver itself - Makes qemudGetCapabilities repopopulate security driver info - Don't free the existing capabilities object until we have successfully created a new one Daniel Index: src/qemu_driver.c =================================================================== RCS file: /data/cvs/libvirt/src/qemu_driver.c,v retrieving revision 1.255 diff -u -p -r1.255 qemu_driver.c --- src/qemu_driver.c 16 Jun 2009 15:42:46 -0000 1.255 +++ src/qemu_driver.c 18 Jun 2009 11:38:10 -0000 @@ -347,12 +347,43 @@ qemuReconnectDomains(struct qemud_driver } } + +static int +qemudSecurityCapsInit(virSecurityDriverPtr secdrv, + virCapsPtr caps) +{ + const char *doi, *model; + + doi = virSecurityDriverGetDOI(secdrv); + model = virSecurityDriverGetModel(secdrv); + + caps->host.secModel.model = strdup(model); + if (!caps->host.secModel.model) { + char ebuf[1024]; + VIR_ERROR(_("Failed to copy secModel model: %s"), + virStrerror(errno, ebuf, sizeof ebuf)); + return -1; + } + + caps->host.secModel.doi = strdup(doi); + if (!caps->host.secModel.doi) { + char ebuf[1024]; + VIR_ERROR(_("Failed to copy secModel DOI: %s"), + virStrerror(errno, ebuf, sizeof ebuf)); + return -1; + } + + VIR_DEBUG("Initialized caps for security driver \"%s\" with " + "DOI \"%s\"", model, doi); + + return 0; +} + + static int qemudSecurityInit(struct qemud_driver *qemud_drv) { int ret; - const char *doi, *model; - virCapsPtr caps; virSecurityDriverPtr security_drv; ret = virSecurityDriverStartup(&security_drv, @@ -368,36 +399,17 @@ qemudSecurityInit(struct qemud_driver *q } qemud_drv->securityDriver = security_drv; - doi = virSecurityDriverGetDOI(security_drv); - model = virSecurityDriverGetModel(security_drv); - VIR_DEBUG("Initialized security driver \"%s\" with " - "DOI \"%s\"", model, doi); + VIR_INFO("Initialized security driver %s", security_drv->name); /* * Add security policy host caps now that the security driver is * initialized. */ - caps = qemud_drv->caps; - - caps->host.secModel.model = strdup(model); - if (!caps->host.secModel.model) { - char ebuf[1024]; - VIR_ERROR(_("Failed to copy secModel model: %s"), - virStrerror(errno, ebuf, sizeof ebuf)); - return -1; - } + return qemudSecurityCapsInit(security_drv, qemud_drv->caps); +} - caps->host.secModel.doi = strdup(doi); - if (!caps->host.secModel.doi) { - char ebuf[1024]; - VIR_ERROR(_("Failed to copy secModel DOI: %s"), - virStrerror(errno, ebuf, sizeof ebuf)); - return -1; - } - return 0; -} /** * qemudStartup: @@ -1866,13 +1878,29 @@ static int qemudGetMaxVCPUs(virConnectPt static char *qemudGetCapabilities(virConnectPtr conn) { struct qemud_driver *driver = conn->privateData; + virCapsPtr caps; char *xml = NULL; qemuDriverLock(driver); + if ((caps = qemudCapsInit()) == NULL) { + virReportOOMError(conn); + goto cleanup; + } + + if (qemu_driver->securityDriver && + qemudSecurityCapsInit(qemu_driver->securityDriver, caps) < 0) { + virCapabilitiesFree(caps); + virReportOOMError(conn); + goto cleanup; + } + virCapabilitiesFree(qemu_driver->caps); - if ((qemu_driver->caps = qemudCapsInit()) == NULL || - (xml = virCapabilitiesFormatXML(driver->caps)) == NULL) + qemu_driver->caps = caps; + + if ((xml = virCapabilitiesFormatXML(driver->caps)) == NULL) virReportOOMError(conn); + +cleanup: qemuDriverUnlock(driver); return xml; -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1

[libvirt] Future release schedule
by Daniel Veillard 17 Jun '09

17 Jun '09

I realize I forgot to post any plan on the topic, oops ! I guess we should shoot for another release around the end of the month, Friday is a good day for release and freezes, and since I didn't gave any heads-up, the best is to shoot for a July 3rd release, which mean we would enter the freeze around the end of next week. Content wise so far we have mostly bug fixes and update/completion on existing drivers or APIs so I guess a libvirt-0.6.5 will be fine. One thing I wonder is about progresses on the ESX driver front, it was looking fairly close to be commiteable, basically only XML import/export was needed but I didnt see any news recently, Matthias do you have a schedule for that missing part ? Any help is needed ? Daniel -- 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/

3 3

[libvirt] Undefined symbol: virNodeDeviceWaitForDevices
by Matthias Bolte 17 Jun '09

17 Jun '09

Hi, GIT commit f7b12afc7b67b6727151f74683e7cb9d6fc2b36f adds a new function: virNodeDeviceWaitForDevices In storage_backend.c virStorageBackendWaitForDevices was changed to call virNodeDeviceWaitForDevices, but the code for virNodeDeviceWaitForDevices is only compiled and linked into libvirtd if the nodedev driver is build, but the nodedev driver is only build if the hal or devkit development packages are installed. If neither hal nor devkit is installed, compiling libvirt yields an undefined symbol error for virNodeDeviceWaitForDevices Regards, Matthias

3 3

[libvirt] Problem compiling latest code from libvirt CVS
by Fischer, Anna 17 Jun '09

17 Jun '09

I am trying to build the latest libvirt checked out from CVS this morning, but I get an error message. I ran ./autostart, ./configure and then make. Any idea what the problem here could be? gcc -DHAVE_CONFIG_H -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I../src -I/usr/include/libxml2 -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DLOCAL_STATE_DIR="\"/usr/local/var\"" -DSYSCONF_DIR="\"/usr/local/etc\"" -DQEMUD_PID_FILE="\"\"" -DREMOTE_PID_FILE="\"/usr/local/var/run/libvirtd.pid\"" -DGETTEXT_PACKAGE=\"libvirt\" -g -O2 -MT libvirtd-remote_protocol.o -MD -MP -MF .deps/libvirtd-remote_protocol.Tpo -c -o libvirtd-remote_protocol.o `test -f 'remote_protocol.c' || echo './'`remote_protocol.c mv -f .deps/libvirtd-remote_protocol.Tpo .deps/libvirtd-remote_protocol.Po /bin/sh ../mylibtool --tag=CC --mode=link gcc -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I../src -I/usr/include/libxml2 -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DLOCAL_STATE_DIR="\"/usr/local/var\"" -DSYSCONF_DIR="\"/usr/local/etc\"" -DQEMUD_PID_FILE="\"\"" -DREMOTE_PID_FILE="\"/usr/local/var/run/libvirtd.pid\"" -DGETTEXT_PACKAGE=\"libvirt\" -g -O2 -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -o libvirtd libvirtd-event.o libvirtd-qemud.o libvirtd-remote.o libvirtd-remote_protocol.o -lxml2 -lgnutls -lpthread -lsasl2 ../src/libvirt_driver_qemu.la ../src/libvirt_driver_lxc.la ../src/libvirt_driver_uml.la ../src/libvirt_driver_storage.la ../src/libvirt_driver_network.la ../src/libvirt.la ../gnulib/lib/libgnu.la -lpthread (LD) -o libvirtd libvirtd-event.o libvirtd-qemud.o libvirtd-remote.o libvirtd-remote_protocol.o ../src/.libs/libvirt_driver_storage.a(storage_backend.o): In function `virStorageBackendWaitForDevices': /home/af/vepa/libvirt/libvirt/src/storage_backend.c:262: undefined reference to `virNodeDeviceWaitForDevices' collect2: ld returned 1 exit status make[3]: *** [libvirtd] Error 1

4 12

[libvirt] [PATCH] Fix qemu command flags fetching
by Cole Robinson 16 Jun '09

16 Jun '09

New function qemudParseHelpStr was being called with arguments in the wrong order, so command flags == kvm_version :/ Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 22f315c..a669c11 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -597,7 +597,7 @@ int qemudExtractVersionInfo(const char *qemu, goto cleanup2; } - if (qemudParseHelpStr(help, &version, &kvm_version, &is_kvm, &flags) == -1) + if (qemudParseHelpStr(help, &flags, &version, &is_kvm, &kvm_version) == -1) goto cleanup2; if (retversion) -- 1.6.0.6

3 21

[libvirt] Xen: How to describe bridged network adapter in libvirt-XML?
by Andreas Sommer 16 Jun '09

16 Jun '09

Hi, I'm looking for a solution to convert the Xen configuration line vif = ["bridge=eth0"] to the libvirt XML description format which can be used by the createLinux() function (using Python). I tried several things like <interface type="bridge"> <source bridge="eth0" /> <target dev="eth0" /> <mac address="aa:00:00:00:00:12" /> <script path="/etc/xen/scripts/vif-bridge" /> </interface> but they didn't work. Everytime I start up the guest using libvirt, no virtual network device is created (= there's no "vifXX.0" when running "brctl show"). It works perfectly with the Xen configuration line mentioned above. Hope you can help me with that. Best regards, Andreas

2 2

[libvirt] virDomainDefineXML forbidden for read only access
by Kenneth Nagin 16 Jun '09

16 Jun '09

I am running an application that invokes the java method virDomainDefineXML. But virDomainDefineXML is throwing the exception "forbidden for read only access". I'm running as root. I can successfully define domain xml and create VMs with virsh. Any suggestion of what I am do wrong? Exception details: exception caught:org.libvirt.LibvirtException: operation virDomainDefineXML forbidden for read only access level:VIR_ERR_ERROR code:VIR_ERR_OPERATION_DENIED domain:VIR_FROM_NONE hasConn:false hasDom:false hasNet:false message:operation virDomainDefineXML forbidden for read only access str1:operation %s forbidden for read only access str2:virDomainDefineXML str3:null int1:0 int2:0 Kenneth Nagin

3 3

[libvirt] [PATCH] Add virsh commands for virInterface* functions.
by Laine Stump 16 Jun '09

16 Jun '09

I think this is complete (can't really try it out until the test driver is running), but have a few questions about it: 1) Does the command set look complete? 2) Do you agree with the naming (using "if-", and following the libvirt convention for if-create/if-destroy, rather than the fedora convention (if-up/if-down)? 3) I'm all for eliminating unnecessary copy/paste in code, but the way that cmdNetworkEdit() and cmdPoolEdit() are created (by awking/seding virsh.c to create a modified version of the cmdEdit function that lives in a separate .c which is #included by virsh.c) seems just a bit convoluted to me. I've made it one step worse for cmdInterfaceEdit because virInterfaceDefineXML has an extra argument (flags) that virDomainDefineXML doesn't. What are your opinions? Should I continue on in the tradition for consistency's sake (as I've done in this patch), or manually put cmdInterfaceEdit() directly into virsh.c? --- src/Makefile.am | 18 +++- src/virsh.c | 398 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 414 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index d4f7ea1..7601611 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -585,7 +585,7 @@ virsh_LDADD = \ ../gnulib/lib/libgnu.la \ $(VIRSH_LIBS) virsh_CFLAGS = $(COVERAGE_CFLAGS) $(READLINE_CFLAGS) $(NUMACTL_CFLAGS) -BUILT_SOURCES = virsh-net-edit.c virsh-pool-edit.c libvirt.syms +BUILT_SOURCES = virsh-net-edit.c virsh-if-edit.c virsh-pool-edit.c libvirt.syms virsh-net-edit.c: virsh.c Makefile.am rm -f $@-tmp @@ -602,6 +602,22 @@ virsh-net-edit.c: virsh.c Makefile.am rm -f $@ mv $@-tmp $@ +virsh-if-edit.c: virsh.c Makefile.am + rm -f $@-tmp + echo '/* Automatically generated from: $^ */' > $@-tmp + echo 'static int' >> $@-tmp + awk '/^cmdEdit/, /^}/' $< \ + | sed -e 's/domain/interface/g' \ + -e 's/Domain/Interface/g' \ + -e 's/cmdEdit/cmdInterfaceEdit/g' \ + -e 's/dom/iface/g' \ + -e 's/int flags.*/int flags = 0;/g' \ + -e 's/DefineXML$.*$)/DefineXML\1, 0)/' \ + >> $@-tmp + chmod a-w $@-tmp + rm -f $@ + mv $@-tmp $@ + virsh-pool-edit.c: virsh.c Makefile.am rm -f $@-tmp echo '/* Automatically generated from: $^ */' > $@-tmp diff --git a/src/virsh.c b/src/virsh.c index f5248d9..6fd090c 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -228,6 +228,7 @@ static int vshCommandOptBool(const vshCmd *cmd, const char *name); #define VSH_BYID (1 << 1) #define VSH_BYUUID (1 << 2) #define VSH_BYNAME (1 << 3) +#define VSH_BYMAC (1 << 4) static virDomainPtr vshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd, char **name, int flag); @@ -244,6 +245,14 @@ static virNetworkPtr vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, vshCommandOptNetworkBy(_ctl, _cmd, _name, \ VSH_BYUUID|VSH_BYNAME) +static virInterfacePtr vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, + char **name, int flag); + +/* default is lookup by Name and MAC */ +#define vshCommandOptInterface(_ctl, _cmd, _name) \ + vshCommandOptInterfaceBy(_ctl, _cmd, _name, \ + VSH_BYMAC|VSH_BYNAME) + static virStoragePoolPtr vshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, char **name, int flag); @@ -2955,6 +2964,325 @@ cmdNetworkUuid(vshControl *ctl, const vshCmd *cmd) } +/**************************************************************************/ +/* + * "if-list" command + */ +static const vshCmdInfo info_interface_list[] = { + {"help", gettext_noop("list physical host interfaces")}, + {"desc", gettext_noop("Returns list of physical host interfaces.")}, + {NULL, NULL} +}; + +static int +cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +{ + int ifCount = 0, i; + char **ifNames = NULL; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + ifCount = virConnectNumOfInterfaces(ctl->conn); + if (ifCount < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list interfaces")); + return FALSE; + } + if (ifCount) { + ifNames = vshMalloc(ctl, sizeof(char *) * ifCount); + + if ((ifCount = virConnectListInterfaces(ctl->conn, + ifNames, ifCount)) < 0) { + vshError(ctl, FALSE, "%s", _("Failed to list interfaces")); + free(ifNames); + return FALSE; + } + + qsort(&ifNames[0], ifCount, sizeof(char *), namesorter); + } + + vshPrintExtra(ctl, "%-20s %-30s\n", _("Name"), _("MAC Address")); + vshPrintExtra(ctl, "--------------------------------------------------\n"); + + for (i = 0; i < ifCount; i++) { + virInterfacePtr iface = virInterfaceLookupByName(ctl->conn, ifNames[i]); + + /* this kind of work with interfaces is not atomic operation */ + if (!iface) { + free(ifNames[i]); + continue; + } + + vshPrint(ctl, "%-20s %-30s\n", + virInterfaceGetName(iface), + virInterfaceGetMACString(iface)); + virInterfaceFree(iface); + free(ifNames[i]); + } + free(ifNames); + return TRUE; +} + +/* + * "if-name" command + */ +static const vshCmdInfo info_interface_name[] = { + {"help", gettext_noop("convert an interface MAC address to interface name")}, + {"desc", ""}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_name[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface mac")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceName(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + if (!(iface = vshCommandOptInterfaceBy(ctl, cmd, NULL, + VSH_BYMAC))) + return FALSE; + + vshPrint(ctl, "%s\n", virInterfaceGetName(iface)); + virInterfaceFree(iface); + return TRUE; +} + +/* + * "if-mac" command + */ +static const vshCmdInfo info_interface_mac[] = { + {"help", gettext_noop("convert an interface name to interface MAC address")}, + {"desc", ""}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_mac[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceMAC(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + if (!(iface = vshCommandOptInterfaceBy(ctl, cmd, NULL, + VSH_BYNAME))) + return FALSE; + + vshPrint(ctl, "%s\n", virInterfaceGetMACString(iface)); + virInterfaceFree(iface); + return TRUE; +} + +/* + * "if-dumpxml" command + */ +static const vshCmdInfo info_interface_dumpxml[] = { + {"help", gettext_noop("interface information in XML")}, + {"desc", gettext_noop("Output the physical host interface information as an XML dump to stdout.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_dumpxml[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + int ret = TRUE; + char *dump; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(iface = vshCommandOptInterface(ctl, cmd, NULL))) + return FALSE; + + dump = virInterfaceGetXMLDesc(iface, 0); + if (dump != NULL) { + printf("%s", dump); + free(dump); + } else { + ret = FALSE; + } + + virInterfaceFree(iface); + return ret; +} + +/* + * "if-define" command + */ +static const vshCmdInfo info_interface_define[] = { + {"help", gettext_noop("define (but don't start) a physical host interface from an XML file")}, + {"desc", gettext_noop("Define a physical host interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_define[] = { + {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file containing an XML interface description")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceDefine(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr interface; + char *from; + int found; + int ret = TRUE; + char *buffer; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + from = vshCommandOptString(cmd, "file", &found); + if (!found) + return FALSE; + + if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) + return FALSE; + + interface = virInterfaceDefineXML(ctl->conn, buffer, 0); + free (buffer); + + if (interface != NULL) { + vshPrint(ctl, _("Interface %s defined from %s\n"), + virInterfaceGetName(interface), from); + } else { + vshError(ctl, FALSE, _("Failed to define interface from %s"), from); + ret = FALSE; + } + return ret; +} + +/* + * "if-undefine" command + */ +static const vshCmdInfo info_interface_undefine[] = { + {"help", gettext_noop("undefine a physical host interface (remove it from configuration)")}, + {"desc", gettext_noop("undefine an interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_undefine[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceUndefine(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + int ret = TRUE; + char *name; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(iface = vshCommandOptInterface(ctl, cmd, &name))) + return FALSE; + + if (virInterfaceUndefine(iface) == 0) { + vshPrint(ctl, _("Interface %s undefined\n"), name); + } else { + vshError(ctl, FALSE, _("Failed to undefine interface %s"), name); + ret = FALSE; + } + + virInterfaceFree(iface); + return ret; +} + +/* + * "if-create" command + */ +static const vshCmdInfo info_interface_create[] = { + {"help", gettext_noop("create a physical host interface (enable it / \"if-up\")")}, + {"desc", gettext_noop("create a physical host interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_create[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceCreate(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + int ret = TRUE; + char *name; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(iface = vshCommandOptInterface(ctl, cmd, &name))) + return FALSE; + + if (virInterfaceCreate(iface, 0) == 0) { + vshPrint(ctl, _("Interface %s created\n"), name); + } else { + vshError(ctl, FALSE, _("Failed to create interface %s"), name); + ret = FALSE; + } + + virInterfaceFree(iface); + return ret; +} + +/* + * "if-destroy" command + */ +static const vshCmdInfo info_interface_destroy[] = { + {"help", gettext_noop("destroy a physical host interface (disable it / \"if-down\")")}, + {"desc", gettext_noop("destroy a physical host interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_destroy[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdInterfaceDestroy(vshControl *ctl, const vshCmd *cmd) +{ + virInterfacePtr iface; + int ret = TRUE; + char *name; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(iface = vshCommandOptInterface(ctl, cmd, &name))) + return FALSE; + + if (virInterfaceDestroy(iface, 0) == 0) { + vshPrint(ctl, _("Interface %s destroyed\n"), name); + } else { + vshError(ctl, FALSE, _("Failed to destroy interface %s"), name); + ret = FALSE; + } + + virInterfaceFree(iface); + return ret; +} + +/**************************************************************************/ /* * "pool-autostart" command */ @@ -6059,7 +6387,7 @@ static const vshCmdOptDef opts_edit[] = { }; /* This function also acts as a template to generate cmdNetworkEdit - * and cmdPoolEdit functions (below) using a sed script in the Makefile. + * cmdInterfaceEdit and cmdPoolEdit functions (below) using a sed script in the Makefile. */ static int cmdEdit (vshControl *ctl, const vshCmd *cmd) @@ -6165,6 +6493,23 @@ static const vshCmdOptDef opts_network_edit[] = { #include "virsh-net-edit.c" /* + * "if-edit" command + */ +static const vshCmdInfo info_interface_edit[] = { + {"help", gettext_noop("edit XML configuration for a physical host interface")}, + {"desc", gettext_noop("Edit the XML configuration for a physical host interface.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_interface_edit[] = { + {"interface", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("interface name or MAC address")}, + {NULL, 0, 0, NULL} +}; + +/* This is generated from this file by a sed script in the Makefile. */ +#include "virsh-if-edit.c" + +/* * "pool-edit" command */ static const vshCmdInfo info_pool_edit[] = { @@ -6247,6 +6592,17 @@ static const vshCmdDef commands[] = { {"net-start", cmdNetworkStart, opts_network_start, info_network_start}, {"net-undefine", cmdNetworkUndefine, opts_network_undefine, info_network_undefine}, {"net-uuid", cmdNetworkUuid, opts_network_uuid, info_network_uuid}, + + {"if-list", cmdInterfaceList, NULL, info_interface_list}, + {"if-name", cmdInterfaceName, opts_interface_name, info_interface_name}, + {"if-mac", cmdInterfaceMAC, opts_interface_mac, info_interface_mac}, + {"if-dumpxml", cmdInterfaceDumpXML, opts_interface_dumpxml, info_interface_dumpxml}, + {"if-define", cmdInterfaceDefine, opts_interface_define, info_interface_define}, + {"if-undefine", cmdInterfaceUndefine, opts_interface_undefine, info_interface_undefine}, + {"if-edit", cmdInterfaceEdit, opts_interface_edit, info_interface_edit}, + {"if-create", cmdInterfaceCreate, opts_interface_create, info_interface_create}, + {"if-destroy", cmdInterfaceDestroy, opts_interface_destroy, info_interface_destroy}, + {"nodeinfo", cmdNodeinfo, NULL, info_nodeinfo}, {"nodedev-list", cmdNodeListDevices, opts_node_list_devices, info_node_list_devices}, @@ -6698,6 +7054,46 @@ vshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, return network; } +static virInterfacePtr +vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, + char **name, int flag) +{ + virInterfacePtr iface = NULL; + char *n; + const char *optname = "interface"; + if (!cmd_has_option (ctl, cmd, optname)) + return NULL; + + if (!(n = vshCommandOptString(cmd, optname, NULL))) { + vshError(ctl, FALSE, "%s", _("undefined interface identifier")); + return NULL; + } + + vshDebug(ctl, 5, "%s: found option <%s>: %s\n", + cmd->def->name, optname, n); + + if (name) + *name = n; + + /* try it by MAC */ + if ((iface == NULL) && (flag & VSH_BYMAC)) { + vshDebug(ctl, 5, "%s: <%s> trying as interface MAC\n", + cmd->def->name, optname); + iface = virInterfaceLookupByMACString(ctl->conn, n); + } + /* try it by NAME */ + if ((iface == NULL) && (flag & VSH_BYNAME)) { + vshDebug(ctl, 5, "%s: <%s> trying as interface NAME\n", + cmd->def->name, optname); + iface = virInterfaceLookupByName(ctl->conn, n); + } + + if (!iface) + vshError(ctl, FALSE, _("failed to get interface '%s'"), n); + + return iface; +} + static virStoragePoolPtr vshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, char **name, int flag) -- 1.6.0.6

2 3

[libvirt] getFreeMemory reporting incorrectly?
by Hany Fahim 15 Jun '09

15 Jun '09

Hi, I'm currently running 2 CentOS 5.3 systems, one running Xen 3.3 and libvirt 0.6.4 (called node1) and the other running Xen 3.0.3 (stock CentOS) and libvirt 0.6.4 (called node2). The machines are practically identical except for the upgraded Xen installation. When using the libvirt-python module, I'm getting strange values from getFreeMemory() on the Xen 3.3 machine. See below: Xen 3.0.3: [root@node2 ~]# python Python 2.4.3 (#1, Jan 21 2009, 01:10:13) [GCC 4.1.2 20071124 (Red Hat 4.1.2-42)] on linux2 Type "help", "copyright", "credits" or "license" for more information. >>> import libvirt >>> conn = libvirt.open('xen:///') >>> print(conn.getFreeMemory()) 268959744 >>> Which is correct since there's approximately 256MB free. Now in the Xen 3.3 box: Xen 3.3: [root@node1 ~]# python Python 2.4.3 (#1, Jan 21 2009, 01:10:13) [GCC 4.1.2 20071124 (Red Hat 4.1.2-42)] on linux2 Type "help", "copyright", "credits" or "license" for more information. >>> import libvirt >>> conn = libvirt.open('xen:///') >>> print(conn.getFreeMemory()) 576460752303423488 >>> node1 should actually be reporting 0MB free, but instead I'm getting this huge number. It would be nice if I had this much memory though... Anybody else run into this? Hany

3 10

[libvirt] attach-disk (cdrom) requirements
by Francesco Latino 15 Jun '09

15 Jun '09

Hello, if the guest is powered off and I run the following command to attach a CD-ROM virsh attach-disk QEmu-fedora-i686-3 myCDROM.iso hdc --driver file --type cdrom --mode readonly I got error: libvir: QEMU error : internal error cannot attach device on inactive domain Is it a requirement to have the guest running to attach a CDROM ? Is there a way to attache a CDROM to a guest powered off with VIRSH I have Compiled against library: libvir 0.6.0 Using library: libvir 0.6.0 Using API: QEMU 0.6.0 Running hypervisor: QEMU 0.10.0 Consider that the above command works if the guest is running. Thanks in advance, Francesco

2 1

[libvirt] [PATCH] [v2] Support kvm-img or qemu-img dynamically
by Doug Goldstein 15 Jun '09

15 Jun '09

This patch adds a new function virFindFileInPath() and uses it to find where a binary lives in the PATH environment variable. Using this, we can dynamically find where utility functions exist (and if they even exists). So such we remove the build-time check for qemu-img and make it dynamic for kvm-img and qemu-img. Several distros uses kvm-img over qemu-img when installing KVM. kvm-img also includes several patches which Red Hat is trying to upstream with QEMU so this patch supports those features which are commented out in libvirt when using kvm-img Signed-off-by: Doug Goldstein <cardoe(a)gentoo.org> --- configure.in | 15 --------- src/libvirt_private.syms | 1 + src/storage_backend_fs.c | 76 ++++++++++++++++++++++++++++++++------------- src/util.c | 28 +++++++++++++++++ src/util.h | 2 + 5 files changed, 85 insertions(+), 37 deletions(-)

5 6

[libvirt] Vserver driver patch for libvirt
by Ajay EP 15 Jun '09

15 Jun '09

Hi, I was looking at Daniels patch for integrating Vserver driver in libvirt long back in 2007 . Checking libvirt-0.6.4 I find that its not yet integrated. Is there any issues if I apply the patch to libvirt-0.6.4 & try using the Vserver driver ? Also will the below commands work straightforward ? As I new to libvirt , any pointers in understanding the support of Vserver on Libvirt is appreciated virsh --create ( i dont know if this command is supported) virsh --connect vserver:/// define v1.xml Thanks, Ajay ______________________________________________________________________

2 1

[libvirt] python-libvirt get vnc port
by lizardkings 14 Jun '09

14 Jun '09

Hwdy, Is it possible to get the VNC port number of a virtual machine via the python libvirt? Thanx, DG

2 1

[Libvirt] SSH with certificates
by Christian Weyermann 14 Jun '09

14 Jun '09

Hello everybody, We are trying to use libvirt with qemu over ssh and our goal is to have authentication done by certificates. Therefore I created a keypair on the client and send the public key to the server. Std. SSH connections work without an password prompt as expected (ssh <ip> -l user), but if I try "sudo virsh -c qemu+ssh://user@<ip>/system" it prompts for a password (Beside that password prompt it works as expected). Is there anything else I have to do beside registering the public key at the server? Thanks for your help and best regards, Christian

5 18

[libvirt] qemu-kvm-0.10.5, kvm-kmod-2.6.30, libvirt-0.6.4 - save/restore still unreliable
by Nikola Ciprich 12 Jun '09

12 Jun '09

Hi, I'm very sorry for crossposting, but I'm not sure whether my problem is related to libvirt or kvm itself. I've spent some time testing save/restore and it seems it's still not really reliable. Starting guest, loading it with some applications (ie kernel compilation) and saving/restoring it for few times usually leads to error: [root@vbox4 hibernated]# virsh save vmroo55 /home/LVS/hibernated/vmroo55.vm Domain vmroo55 saved to /home/LVS/hibernated/vmroo55.vm [root@vbox4 hibernated]# virsh restore /home/LVS/hibernated/vmroo55.vm Domain restored from /home/LVS/hibernated/vmroo55.vm [root@vbox4 hibernated]# virsh save vmroo55 /home/LVS/hibernated/vmroo55.vm Domain vmroo55 saved to /home/LVS/hibernated/vmroo55.vm [root@vbox4 hibernated]# virsh restore /home/LVS/hibernated/vmroo55.vm error: Failed to restore domain from /home/LVS/hibernated/vmroo55.vm error: internal error unable to start guest: char device redirected to /dev/pts/2 in /var/log/messages, i see: Jun 12 15:18:30 vbox4 libvirtd: 15:18:30.793: error : qemudReadMonitorOutput:696 : internal error Timed out while reading monitor startup output Jun 12 15:18:30 vbox4 libvirtd: 15:18:30.820: error : qemudWaitForMonitor:994 : internal error unable to start guest: char device redirected to /dev/pts/2 /var/log/libvirt/vmroo55.log: LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin HOME=/ /usr/bin/qemu-kvm -S -M pc -m 768 -smp 2 -name vmroo55 -uuid 987e7a85-0e15-11de-a522-00304892f672 -monitor pty -boot c -kernel /home/LVS/boot/vmlinuz-2.6.29lb.00_01_PRE14-x86_64 -initrd /home/LVS/boot/kvm-initrd-2.6.29lb.00_01_PRE14-x86_64.cpio.gz -append root=/dev/sda ro vmhostname=vmroo55 -drive file=/dev/vgshared/vmroo55-1,if=ide,index=0,boot=on -drive file=/dev/vgshared/vmroo55-2,if=ide,index=1 -drive file=/dev/vgshared/vmroo55-3,if=virtio,index=0 -net nic,macaddr=00:16:3e:18:37:00,vlan=0,model=virtio -net tap,fd=15,vlan=0 -serial none -parallel none -usb -vnc 0.0.0.0:24155 -incoming exec:cat char device redirected to /dev/pts/2 qemu_popen: returning result of qemu_fopen_ops qemu_popen: returning result of qemu_fopen_ops I wanted to try it using just kvm, but for some reason, I can't figure the proper way to execute it, is the -incoming exec:cat somewhere properly documented? I tried doing cat .../img.vm | qemu-kvm ... -incoming exec:cat but this doesn't seem to be the proper way. Could somebody give me a hint on how to debug this? thanks a lot in advance! nik -- ------------------------------------- Nikola CIPRICH LinuxBox.cz, s.r.o. 28. rijna 168, 709 01 Ostrava tel.: +420 596 603 142 fax: +420 596 621 273 mobil: +420 777 093 799 www.linuxbox.cz mobil servis: +420 737 238 656 email servis: servis(a)linuxbox.cz -------------------------------------

2 2

[libvirt] [PATCH] Fix a compilation problem with LXC drop capabilities
by Daniel Veillard 12 Jun '09

12 Jun '09

The lxcContainerDropCapabilities() function requires PR_CAPBSET_DROP to be defined in order to compile, but it may not be defined in older kernels. So I made the compilation of the core of the function conditional, raise an error but still return 0 to not make the container initialization fail. But I'm unsure, should we just fail and return -1 if we can't drop capabilities instead ? Daniel -- 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/

4 10

[libvirt] PATCH: Improve URI error reporting
by Daniel P. Berrange 12 Jun '09

12 Jun '09

There are currently far too many cases where a correct URI returns an generic 'failed to connect to hypervisor' error message. This gives the user no idea why they could not connect. Of particular importance is that they cannot distinguish a correct URI + plus a driver problem, vs incorrect URI. Consider the following examples virsh -c qemu:///bogus error: could not connect to qemu:///bogus error: failed to connect to the hypervisor virsh -c qemu:// error: could not connect to qemu:// error: failed to connect to the hypervisor virsh -c /var/lib/xen/xend-socket error: could not connect to /var/lib/xen/xend-socket error: failed to connect to the hypervisor virsh -c /bogus error: could not connect to /bogus error: failed to connect to the hypervisor virsh -c bogus error: could not connect to bogus error: failed to connect to the hypervisor virsh -c uml:///bogus error: could not connect to uml:///bogus error: failed to connect to the hypervisor virsh -c uml:// error: could not connect to uml:// error: failed to connect to the hypervisor virsh -c openvz:///system error: could not connect to openvz:///system error: failed to connect to the hypervisor virsh -c openvz:///bogus error: could not connect to openvz:///bogus error: failed to connect to the hypervisor virsh -c openvz:/// error: could not connect to openvz:/// error: failed to connect to the hypervisor virsh -c bogus:/// error: could not connect to bogus:/// error: failed to connect to the hypervisor virsh -c qemu+tls:///system error: unable to connect to 'localhost': Connection refused error: failed to connect to the hypervisor virsh -c qemu://localhost/system error: could not connect to qemu://localhost/system error: failed to connect to the hypervisor virsh -c bogus+unix:/// error: could not connect to bogus:/// error: failed to connect to the hypervisor The core problem here is that far too many places are using the return code VIR_DRV_OPEN_DECLINED instead of VIR_DRV_OPEN_ERROR. The former provides no way to give any error info to the user. With this patch I have taken the view that a driver must *only* ever use the return code VIR_DRV_OPEN_DECLINED when: - Auto-probe of a driver URI, and this driver is not active - Explicit URI with 'server' specified - URI scheme does not match the driver The remote driver is special in that it *must* accept all URIs given to it, no matter what, unless of course it is running inside the daemon already. The result is that if you give a correct URI, but there is a real problem opening the driver you are now guarenteed to get a useful error message back. Consider the same examples again virsh -c qemu:///bogus error: internal error unexpected QEMU URI path '/bogus', try qemu:///system error: failed to connect to the hypervisor virsh -c qemu:// error: internal error unexpected QEMU URI path '', try qemu:///system error: failed to connect to the hypervisor virsh -c xen:/// error: unable to connect to 'localhost:8000': Connection refused error: failed to connect to the hypervisor virsh -c xen:///bogus error: internal error unexpected Xen URI path '/bogus', try xen:/// error: failed to connect to the hypervisor virsh -c /var/lib/xen/xend-socket error: internal error failed to connect to xend error: failed to connect to the hypervisor virsh -c /bogus error: internal error failed to connect to xend error: failed to connect to the hypervisor virsh -c bogus error: internal error unexpected Xen URI path 'bogus', try ///var/lib/xen/xend-socket error: failed to connect to the hypervisor virsh -c uml:///bogus error: internal error unexpected UML URI path '/bogus', try uml:///system error: failed to connect to the hypervisor virsh -c uml:// error: internal error unexpected UML URI path '', try uml:///system error: failed to connect to the hypervisor virsh -c lxc:// error: internal error unexpected LXC URI path '', try lxc:/// error: failed to connect to the hypervisor virsh -c lxc:///bogus error: internal error unexpected LXC URI path '/bogus', try lxc:/// error: failed to connect to the hypervisor virsh -c openvz:///system error: internal error OpenVZ control file /proc/vz does not exist error: failed to connect to the hypervisor virsh -c openvz:///bogus error: internal error unexpected OpenVZ URI path '/bogus', try openvz:///system error: failed to connect to the hypervisor virsh -c openvz:/// error: internal error unexpected OpenVZ URI path '/', try openvz:///system error: failed to connect to the hypervisor virsh -c vbox:///system error: internal error unknown driver path '/system' specified (try vbox:///session) error: failed to connect to the hypervisor virsh -c vbox:///bogus error: internal error unknown driver path '/bogus' specified (try vbox:///session) error: failed to connect to the hypervisor virsh -c vbox:// error: internal error no VirtualBox driver path specified (try vbox:///session) error: failed to connect to the hypervisor virsh -c bogus:/// error: no hypervisor driver available for bogus:/// error: failed to connect to the hypervisor virsh -c qemu+tls:///system error: unable to connect to libvirtd at 'localhost': Connection refused error: failed to connect to the hypervisor virsh -c qemu://localhost/system error: unable to connect to libvirtd at 'localhost': Connection refused error: failed to connect to the hypervisor virsh -c bogus+unix:/// error: no hypervisor driver available for bogus:/// error: failed to connect to the hypervisor In every case there is now a useful error message. lxc_driver.c | 48 ++++++++++---------- openvz_driver.c | 57 ++++++++++++++++------- qemu_driver.c | 83 +++++++++++++++++----------------- remote_internal.c | 129 ++++++++++++++++++++++++++++-------------------------- test.c | 3 - uml_driver.c | 62 ++++++++++++++++--------- virterror.c | 4 - xen_unified.c | 55 +++++++++++++++-------- xend_internal.c | 7 ++ 9 files changed, 259 insertions(+), 189 deletions(-) Daniel diff -r 3c35f3b77286 src/lxc_driver.c --- a/src/lxc_driver.c Wed Jun 03 15:37:52 2009 +0100 +++ b/src/lxc_driver.c Wed Jun 03 17:31:17 2009 +0100 @@ -68,46 +68,48 @@ static void lxcDriverUnlock(lxc_driver_t } -static int lxcProbe(void) -{ - if (getuid() != 0 || - lxcContainerAvailable(0) < 0) - return 0; - - return 1; -} - static virDrvOpenStatus lxcOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { - if (lxc_driver == NULL) - goto declineConnection; - /* Verify uri was specified */ if (conn->uri == NULL) { - if (!lxcProbe()) - goto declineConnection; + if (lxc_driver == NULL) + return VIR_DRV_OPEN_DECLINED; conn->uri = xmlParseURI("lxc:///"); if (!conn->uri) { virReportOOMError(conn); return VIR_DRV_OPEN_ERROR; } - } else if (conn->uri->scheme == NULL || - STRNEQ(conn->uri->scheme, "lxc")) { - goto declineConnection; - } else if (!lxcProbe()) { - goto declineConnection; + } else { + if (conn->uri->scheme == NULL || + STRNEQ(conn->uri->scheme, "lxc")) + return VIR_DRV_OPEN_DECLINED; + + /* Leave for remote driver */ + if (conn->uri->server != NULL) + return VIR_DRV_OPEN_DECLINED; + + /* If path isn't '/' then they typoed, tell them correct path */ + if (STRNEQ(conn->uri->path, "/")) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + _("unexpected LXC URI path '%s', try lxc:///"), + conn->uri->path); + return VIR_DRV_OPEN_ERROR; + } + + /* URI was good, but driver isn't active */ + if (lxc_driver == NULL) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + _("lxc state driver is not active")); + return VIR_DRV_OPEN_ERROR; + } } - conn->privateData = lxc_driver; return VIR_DRV_OPEN_SUCCESS; - -declineConnection: - return VIR_DRV_OPEN_DECLINED; } static int lxcClose(virConnectPtr conn) diff -r 3c35f3b77286 src/openvz_driver.c --- a/src/openvz_driver.c Wed Jun 03 15:37:52 2009 +0100 +++ b/src/openvz_driver.c Wed Jun 03 17:31:17 2009 +0100 @@ -1070,36 +1070,59 @@ cleanup: return ret; } -static int openvzProbe(void) -{ - if (geteuid() == 0 && - virFileExists("/proc/vz")) - return 1; - - return 0; -} - static virDrvOpenStatus openvzOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { struct openvz_driver *driver; - if (!openvzProbe()) - return VIR_DRV_OPEN_DECLINED; if (conn->uri == NULL) { + if (!virFileExists("/proc/vz")) + return VIR_DRV_OPEN_DECLINED; + + if (access("/proc/vz", W_OK) < 0) + return VIR_DRV_OPEN_DECLINED; + conn->uri = xmlParseURI("openvz:///system"); if (conn->uri == NULL) { - openvzError(conn, VIR_ERR_NO_DOMAIN, NULL); + virReportOOMError(conn); return VIR_DRV_OPEN_ERROR; } - } else if (conn->uri->scheme == NULL || - conn->uri->path == NULL || - STRNEQ (conn->uri->scheme, "openvz") || - STRNEQ (conn->uri->path, "/system")) { - return VIR_DRV_OPEN_DECLINED; + } else { + /* If scheme isn't 'openvz', then its for another driver */ + if (conn->uri->scheme == NULL || + STRNEQ (conn->uri->scheme, "openvz")) + return VIR_DRV_OPEN_DECLINED; + + /* If server name is given, its for remote driver */ + if (conn->uri->server != NULL) + return VIR_DRV_OPEN_DECLINED; + + /* If path isn't /system, then they typoed, so tell them correct path */ + if (conn->uri->path == NULL || + STRNEQ (conn->uri->path, "/system")) { + openvzError(conn, VIR_ERR_INTERNAL_ERROR, + _("unexpected OpenVZ URI path '%s', try openvz:///system"), + conn->uri->path); + return VIR_DRV_OPEN_ERROR; + } + + if (!virFileExists("/proc/vz")) { + openvzError(conn, VIR_ERR_INTERNAL_ERROR, "%s", + _("OpenVZ control file /proc/vz does not exist")); + return VIR_DRV_OPEN_ERROR; + } + + if (access("/proc/vz", W_OK) < 0) { + openvzError(conn, VIR_ERR_INTERNAL_ERROR, "%s", + _("OpenVZ control file /proc/vz is not accessible")); + return VIR_DRV_OPEN_ERROR; + } } + /* We now know the URI is definitely for this driver, so beyond + * here, don't return DECLINED, always use ERROR */ + if (VIR_ALLOC(driver) < 0) { virReportOOMError(conn); return VIR_DRV_OPEN_ERROR; diff -r 3c35f3b77286 src/qemu_driver.c --- a/src/qemu_driver.c Wed Jun 03 15:37:52 2009 +0100 +++ b/src/qemu_driver.c Wed Jun 03 17:31:17 2009 +0100 @@ -1743,62 +1743,61 @@ qemudMonitorCommand(const virDomainObjPt } -/** - * qemudProbe: - * - * Probe for the availability of the qemu driver, assume the - * presence of QEmu emulation if the binaries are installed - */ -static int qemudProbe(void) -{ - if ((virFileExists("/usr/bin/qemu")) || - (virFileExists("/usr/bin/qemu-kvm")) || - (virFileExists("/usr/bin/kvm")) || - (virFileExists("/usr/bin/xenner"))) - return 1; - - return 0; -} static virDrvOpenStatus qemudOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { uid_t uid = getuid(); - if (qemu_driver == NULL) - goto decline; - - if (!qemudProbe()) - goto decline; - if (conn->uri == NULL) { - conn->uri = xmlParseURI(uid ? "qemu:///session" : "qemu:///system"); + if (qemu_driver == NULL) + return VIR_DRV_OPEN_DECLINED; + + conn->uri = xmlParseURI(uid == 0 ? + "qemu:///system" : + "qemu:///session"); if (!conn->uri) { virReportOOMError(conn); return VIR_DRV_OPEN_ERROR; } - } else if (conn->uri->scheme == NULL || - conn->uri->path == NULL) - goto decline; - - if (STRNEQ (conn->uri->scheme, "qemu")) - goto decline; - - if (uid != 0) { - if (STRNEQ (conn->uri->path, "/session")) - goto decline; - } else { /* root */ - if (STRNEQ (conn->uri->path, "/system") && - STRNEQ (conn->uri->path, "/session")) - goto decline; - } - + } else { + /* If URI isn't 'qemu' its definitely not for us */ + if (conn->uri->scheme == NULL || + STRNEQ(conn->uri->scheme, "qemu")) + return VIR_DRV_OPEN_DECLINED; + + /* Allow remote driver to deal with URIs with hostname server */ + if (conn->uri->server != NULL) + return VIR_DRV_OPEN_DECLINED; + + if (!uid) { + if (STRNEQ (conn->uri->path, "/system") && + STRNEQ (conn->uri->path, "/session")) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("unexpected QEMU URI path '%s', try qemu:///system"), + conn->uri->path); + return VIR_DRV_OPEN_ERROR; + } + } else { + if (STRNEQ (conn->uri->path, "/session")) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("unexpected QEMU URI path '%s', try qemu:///session"), + conn->uri->path); + return VIR_DRV_OPEN_ERROR; + } + } + + /* URI was good, but driver isn't active */ + if (qemu_driver == NULL) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", + _("qemu state driver is not active")); + return VIR_DRV_OPEN_ERROR; + } + + } conn->privateData = qemu_driver; return VIR_DRV_OPEN_SUCCESS; - - decline: - return VIR_DRV_OPEN_DECLINED; } static int qemudClose(virConnectPtr conn) { diff -r 3c35f3b77286 src/remote_internal.c --- a/src/remote_internal.c Wed Jun 03 15:37:52 2009 +0100 +++ b/src/remote_internal.c Wed Jun 03 17:31:17 2009 +0100 @@ -305,21 +305,28 @@ remoteForkDaemon(virConnectPtr conn) enum virDrvOpenRemoteFlags { VIR_DRV_OPEN_REMOTE_RO = (1 << 0), - VIR_DRV_OPEN_REMOTE_UNIX = (1 << 1), - VIR_DRV_OPEN_REMOTE_USER = (1 << 2), - VIR_DRV_OPEN_REMOTE_AUTOSTART = (1 << 3), -}; - -/* What transport? */ -enum { - trans_tls, - trans_unix, - trans_ssh, - trans_ext, - trans_tcp, -} transport; - - + VIR_DRV_OPEN_REMOTE_USER = (1 << 1), /* Use the per-user socket path */ + VIR_DRV_OPEN_REMOTE_AUTOSTART = (1 << 2), /* Autostart a per-user daemon */ +}; + + +/* + * URIs that this driver needs to handle: + * + * The easy answer: + * - Everything that no one else has yet claimed, but nothing if + * we're inside the libvirtd daemon + * + * The hard answer: + * - Plain paths (///var/lib/xen/xend-socket) -> UNIX domain socket + * - xxx://servername/ -> TLS connection + * - xxx+tls://servername/ -> TLS connection + * - xxx+tls:/// -> TLS connection to localhost + * - xxx+tcp://servername/ -> TCP connection + * - xxx+tcp:/// -> TCP connection to localhost + * - xxx+unix:/// -> UNIX domain socket + * - xxx:/// -> UNIX domain socket + */ static int doRemoteOpen (virConnectPtr conn, struct private_data *priv, @@ -328,37 +335,51 @@ doRemoteOpen (virConnectPtr conn, { int wakeupFD[2] = { -1, -1 }; char *transport_str = NULL; + enum { + trans_tls, + trans_unix, + trans_ssh, + trans_ext, + trans_tcp, + } transport; + + /* We handle *ALL* URIs here. The caller has rejected any + * URIs we don't care about */ if (conn->uri) { - if (!conn->uri->scheme) - return VIR_DRV_OPEN_DECLINED; - - transport_str = get_transport_from_scheme (conn->uri->scheme); - - if (!transport_str || STRCASEEQ (transport_str, "tls")) - transport = trans_tls; - else if (STRCASEEQ (transport_str, "unix")) + if (!conn->uri->scheme) { + /* This is the ///var/lib/xen/xend-socket local path style */ transport = trans_unix; - else if (STRCASEEQ (transport_str, "ssh")) - transport = trans_ssh; - else if (STRCASEEQ (transport_str, "ext")) - transport = trans_ext; - else if (STRCASEEQ (transport_str, "tcp")) - transport = trans_tcp; - else { - error (conn, VIR_ERR_INVALID_ARG, - _("remote_open: transport in URL not recognised " - "(should be tls|unix|ssh|ext|tcp)")); - return VIR_DRV_OPEN_ERROR; - } - } - - if (!transport_str) { - if ((!conn->uri || !conn->uri->server) && - (flags & VIR_DRV_OPEN_REMOTE_UNIX)) - transport = trans_unix; - else - return VIR_DRV_OPEN_DECLINED; /* Decline - not a remote URL. */ + } else { + transport_str = get_transport_from_scheme (conn->uri->scheme); + + if (!transport_str) { + if (conn->uri->server) + transport = trans_tls; + else + transport = trans_unix; + } else { + if (STRCASEEQ (transport_str, "tls")) + transport = trans_tls; + else if (STRCASEEQ (transport_str, "unix")) + transport = trans_unix; + else if (STRCASEEQ (transport_str, "ssh")) + transport = trans_ssh; + else if (STRCASEEQ (transport_str, "ext")) + transport = trans_ext; + else if (STRCASEEQ (transport_str, "tcp")) + transport = trans_tcp; + else { + error (conn, VIR_ERR_INVALID_ARG, + _("remote_open: transport in URL not recognised " + "(should be tls|unix|ssh|ext|tcp)")); + return VIR_DRV_OPEN_ERROR; + } + } + } + } else { + /* No URI, then must be probing so use UNIX socket */ + transport = trans_unix; } /* Local variables which we will initialise. These can @@ -455,8 +476,9 @@ doRemoteOpen (virConnectPtr conn, /* Construct the original name. */ if (!name) { - if (STREQ(conn->uri->scheme, "remote") || - STRPREFIX(conn->uri->scheme, "remote+")) { + if (conn->uri->scheme && + (STREQ(conn->uri->scheme, "remote") || + STRPREFIX(conn->uri->scheme, "remote+"))) { /* Allow remote serve to probe */ name = strdup(""); } else { @@ -580,7 +602,7 @@ doRemoteOpen (virConnectPtr conn, freeaddrinfo (res); virReportSystemError(conn, saved_errno, - _("unable to connect to '%s'"), + _("unable to connect to libvirtd at '%s'"), priv->hostname); goto failed; @@ -925,7 +947,6 @@ remoteOpenSecondaryDriver(virConnectPtr if (flags & VIR_CONNECT_RO) rflags |= VIR_DRV_OPEN_REMOTE_RO; - rflags |= VIR_DRV_OPEN_REMOTE_UNIX; ret = doRemoteOpen(conn, *priv, auth, rflags); if (ret != VIR_DRV_OPEN_SUCCESS) { @@ -958,19 +979,6 @@ remoteOpen (virConnectPtr conn, /* * If no servername is given, and no +XXX - * transport is listed, then force to a - * local UNIX socket connection - */ - if (conn->uri && - !conn->uri->server && - conn->uri->scheme && - !strchr(conn->uri->scheme, '+')) { - DEBUG0("Auto-remote UNIX socket"); - rflags |= VIR_DRV_OPEN_REMOTE_UNIX; - } - - /* - * If no servername is given, and no +XXX * transport is listed, or transport is unix, * and path is /session, and uid is unprivileged * then auto-spawn a daemon. @@ -996,7 +1004,6 @@ remoteOpen (virConnectPtr conn, */ if (!conn->uri) { DEBUG0("Auto-probe remote URI"); - rflags |= VIR_DRV_OPEN_REMOTE_UNIX; #ifndef __sun if (getuid() > 0) { DEBUG0("Auto-spawn user daemon instance"); diff -r 3c35f3b77286 src/test.c --- a/src/test.c Wed Jun 03 15:37:52 2009 +0100 +++ b/src/test.c Wed Jun 03 17:31:17 2009 +0100 @@ -639,9 +639,6 @@ static virDrvOpenStatus testOpen(virConn if (conn->uri->server) return VIR_DRV_OPEN_DECLINED; - if (conn->uri->server) - return VIR_DRV_OPEN_DECLINED; - /* From this point on, the connection is for us. */ if (!conn->uri->path || conn->uri->path[0] == '\0' diff -r 3c35f3b77286 src/uml_driver.c --- a/src/uml_driver.c Wed Jun 03 15:37:52 2009 +0100 +++ b/src/uml_driver.c Wed Jun 03 17:31:17 2009 +0100 @@ -913,28 +913,49 @@ static virDrvOpenStatus umlOpen(virConne int flags ATTRIBUTE_UNUSED) { uid_t uid = getuid(); - if (uml_driver == NULL) - goto decline; + if (conn->uri == NULL) { + if (uml_driver == NULL) + return VIR_DRV_OPEN_DECLINED; - if (conn->uri != NULL) { - if (conn->uri->scheme == NULL || conn->uri->path == NULL) - goto decline; - - if (STRNEQ (conn->uri->scheme, "uml")) - goto decline; - - if (uid != 0) { - if (STRNEQ (conn->uri->path, "/session")) - goto decline; - } else { /* root */ - if (STRNEQ (conn->uri->path, "/system") && - STRNEQ (conn->uri->path, "/session")) - goto decline; + conn->uri = xmlParseURI(uid == 0 ? + "uml:///system" : + "uml:///session"); + if (!conn->uri) { + virReportOOMError(conn); + return VIR_DRV_OPEN_ERROR; } } else { - conn->uri = xmlParseURI(uid ? "uml:///session" : "uml:///system"); - if (!conn->uri) { - virReportOOMError(conn); + if (conn->uri->scheme == NULL || + STRNEQ (conn->uri->scheme, "uml")) + return VIR_DRV_OPEN_DECLINED; + + /* Allow remote driver to deal with URIs with hostname server */ + if (conn->uri->server != NULL) + return VIR_DRV_OPEN_DECLINED; + + + /* Check path and tell them correct path if they made a mistake */ + if (uid == 0) { + if (STRNEQ (conn->uri->path, "/system") && + STRNEQ (conn->uri->path, "/session")) { + umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("unexpected UML URI path '%s', try uml:///system"), + conn->uri->path); + return VIR_DRV_OPEN_ERROR; + } + } else { + if (STRNEQ (conn->uri->path, "/session")) { + umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("unexpected UML URI path '%s', try uml:///session"), + conn->uri->path); + return VIR_DRV_OPEN_ERROR; + } + } + + /* URI was good, but driver isn't active */ + if (uml_driver == NULL) { + umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", + _("uml state driver is not active")); return VIR_DRV_OPEN_ERROR; } } @@ -942,9 +963,6 @@ static virDrvOpenStatus umlOpen(virConne conn->privateData = uml_driver; return VIR_DRV_OPEN_SUCCESS; - - decline: - return VIR_DRV_OPEN_DECLINED; } static int umlClose(virConnectPtr conn) { diff -r 3c35f3b77286 src/virterror.c --- a/src/virterror.c Wed Jun 03 15:37:52 2009 +0100 +++ b/src/virterror.c Wed Jun 03 17:31:17 2009 +0100 @@ -737,9 +737,9 @@ virErrorMsg(virErrorNumber error, const break; case VIR_ERR_NO_CONNECT: if (info == NULL) - errmsg = _("could not connect to hypervisor"); + errmsg = _("no hypervisor driver available"); else - errmsg = _("could not connect to %s"); + errmsg = _("no hypervisor driver available for %s"); break; case VIR_ERR_INVALID_CONN: if (info == NULL) diff -r 3c35f3b77286 src/xen_unified.c --- a/src/xen_unified.c Wed Jun 03 15:37:52 2009 +0100 +++ b/src/xen_unified.c Wed Jun 03 17:31:17 2009 +0100 @@ -241,25 +241,46 @@ xenUnifiedOpen (virConnectPtr conn, virC virReportOOMError (NULL); return VIR_DRV_OPEN_ERROR; } + } else { + if (conn->uri->scheme) { + /* Decline any scheme which isn't "xen://" or "http://". */ + if (STRCASENEQ(conn->uri->scheme, "xen") && + STRCASENEQ(conn->uri->scheme, "http")) + return VIR_DRV_OPEN_DECLINED; + + + /* Return an error if the path isn't '' or '/' */ + if (conn->uri->path && + STRNEQ(conn->uri->path, "") && + STRNEQ(conn->uri->path, "/")) { + xenUnifiedError(NULL, VIR_ERR_INTERNAL_ERROR, + _("unexpected Xen URI path '%s', try xen:///"), + conn->uri->path); + return VIR_DRV_OPEN_ERROR; + } + + /* Decline any xen:// URI with a server specified, allowing remote + * driver to handle, but keep any http:/// URIs */ + if (STRCASEEQ(conn->uri->scheme, "xen") && + conn->uri->server) + return VIR_DRV_OPEN_DECLINED; + } else { + /* Special case URI for Xen driver only: + * + * Treat a plain path as a Xen UNIX socket path, and give + * error unless path is absolute + */ + if (!conn->uri->path || conn->uri->path[0] != '/') { + xenUnifiedError(NULL, VIR_ERR_INTERNAL_ERROR, + _("unexpected Xen URI path '%s', try ///var/lib/xen/xend-socket"), + NULLSTR(conn->uri->path)); + return VIR_DRV_OPEN_ERROR; + } + } } - /* Refuse any scheme which isn't "xen://" or "http://". */ - if (conn->uri->scheme && - STRCASENEQ(conn->uri->scheme, "xen") && - STRCASENEQ(conn->uri->scheme, "http")) - return VIR_DRV_OPEN_DECLINED; - - /* xmlParseURI will parse a naked string like "foo" as a URI with - * a NULL scheme. That's not useful for us because we want to only - * allow full pathnames (eg. ///var/lib/xen/xend-socket). Decline - * anything else. - */ - if (!conn->uri->scheme && (!conn->uri->path || conn->uri->path[0] != '/')) - return VIR_DRV_OPEN_DECLINED; - - /* Refuse any xen:// URI with a server specified - allow remote to do it */ - if (conn->uri->scheme && STRCASEEQ(conn->uri->scheme, "xen") && conn->uri->server) - return VIR_DRV_OPEN_DECLINED; + /* We now know the URI is definitely for this driver, so beyond + * here, don't return DECLINED, always use ERROR */ /* Allocate per-connection private data. */ if (VIR_ALLOC(priv) < 0) { diff -r 3c35f3b77286 src/xend_internal.c --- a/src/xend_internal.c Wed Jun 03 15:37:52 2009 +0100 +++ b/src/xend_internal.c Wed Jun 03 17:31:17 2009 +0100 @@ -2927,10 +2927,13 @@ xenDaemonOpen(virConnectPtr conn, xend_detect_config_version(conn) == -1) goto failed; } else if (STRCASEEQ (conn->uri->scheme, "http")) { - if (virAsprintf(&port, "%d", conn->uri->port) == -1) + if (conn->uri->port && + virAsprintf(&port, "%d", conn->uri->port) == -1) goto failed; - if (xenDaemonOpen_tcp(conn, conn->uri->server, port) < 0 || + if (xenDaemonOpen_tcp(conn, + conn->uri->server ? conn->uri->server : "localhost", + port ? port : "8000") < 0 || xend_detect_config_version(conn) == -1) goto failed; } else { -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 2

[libvirt] Latest kvm packages for CentOS 5.3
by Federico Simoncelli 11 Jun '09

11 Jun '09

Hi all, I've been working quite extensively with kvm on CentOS 5.3 lately. If you are interested in the latest rpm of kvm-kmod-2.6.30-rc8, qemu-kvm-0.10.5 and libvirt-0.6.4 you can temporary find them here: http://update.nethesis.it/kvm/ I've had no problem so far using these packages. Feedback is welcome. -- Federico.

4 4

[libvirt] [PATCH 0/1] Add support for disk serial number in node device code
by David Allan 11 Jun '09

11 Jun '09

This small patch extends the information for storage devices to include their serial number. This information is useful in figuring out which devices are actually multiple paths to the same backend device, as well as identifying devices uniquely across nodes. This code will be used by the multipath support that I'm working on, but since it's capable of standing alone, and might be useful for other reasons, I'm submitting it separately. Dave

4 7

[libvirt] [PATCH 1/3] Re-factor qemu version parsing
by Mark McLoughlin 11 Jun '09

11 Jun '09

This patch is purely re-factoring without any functional changes to make way for the next patch. The main thing achieved by the refactoring is that we now have easier access to the parenthesised string that KVM folks seem to delight in changing. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> --- src/qemu_conf.c | 92 +++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 72 insertions(+), 20 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 2c1eefc..f6a8390 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -412,6 +412,73 @@ virCapsPtr qemudCapsInit(void) { return NULL; } +/* We parse the output of 'qemu -help' to get the QEMU + * version number. The first bit is easy, just parse + * 'QEMU PC emulator version x.y.z'. + * + * With qemu-kvm, however, that is followed by a kvm-XX + * string in parenthesis. + */ +#define QEMU_VERSION_STR "QEMU PC emulator version " +#define KVM_VER_PREFIX " (kvm-" + +static int qemudParseVersionStr(const char *str, + unsigned int *version, + unsigned int *kvm_version) +{ + unsigned major, minor, micro; + const char *p = str; + + *version = *kvm_version = 0; + + if (!STRPREFIX(p, QEMU_VERSION_STR)) + goto fail; + + p += strlen(QEMU_VERSION_STR); + + major = virParseNumber(&p); + if (major == -1 || *p != '.') + goto fail; + + ++p; + + minor = virParseNumber(&p); + if (major == -1 || *p != '.') + goto fail; + + ++p; + + micro = virParseNumber(&p); + if (major == -1) + goto fail; + + if (STRPREFIX(p, KVM_VER_PREFIX)) { + int ret; + + p += strlen(KVM_VER_PREFIX); + + ret = virParseNumber(&p); + if (ret == -1) + goto fail; + + *kvm_version = ret; + } + + *version = (major * 1000 * 1000) + (minor * 1000) + micro; + + qemudDebug("Version %d.%d.%d - cooked version: %d", + major, minor, micro, *version); + if (*kvm_version) + qemudDebug("KVM version %d detected", *kvm_version); + + return 0; + +fail: + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("cannot parse QEMU version number in '%s'"), + str); + return -1; +} int qemudExtractVersionInfo(const char *qemu, unsigned int *retversion, @@ -421,7 +488,6 @@ int qemudExtractVersionInfo(const char *qemu, pid_t child; int newstdout = -1; int ret = -1, status; - unsigned int major, minor, micro; unsigned int version, kvm_version; unsigned int flags = 0; @@ -443,22 +509,11 @@ int qemudExtractVersionInfo(const char *qemu, goto cleanup2; } - if (sscanf(help, "QEMU PC emulator version %u.%u.%u (kvm-%u)", - &major, &minor, &micro, &kvm_version) != 4) - kvm_version = 0; + char *eol = strchr(help, '\n'); + if (eol) *eol = '\0'; - if (!kvm_version && - sscanf(help, "QEMU PC emulator version %u.%u.%u", - &major, &minor, &micro) != 3) { - char *eol = strchr(help, '\n'); - if (eol) *eol = '\0'; - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("cannot parse QEMU version number in '%s'"), - help); + if (qemudParseVersionStr(help, &version, &kvm_version) == -1) goto cleanup2; - } - - version = (major * 1000 * 1000) + (minor * 1000) + micro; if (strstr(help, "-no-kqemu")) flags |= QEMUD_CMD_FLAG_KQEMU; @@ -512,10 +567,7 @@ int qemudExtractVersionInfo(const char *qemu, ret = 0; - qemudDebug("Version %d %d %d Cooked version: %d, with flags ? %d", - major, minor, micro, version, flags); - if (kvm_version) - qemudDebug("KVM version %d detected", kvm_version); + qemudDebug("QEMU supported cmdline flags = %d", flags); cleanup2: VIR_FREE(help); -- 1.6.0.6

3 19

[libvirt][qemu] Ho to get a 'boot=on' parameter to appear on kvm command line
by Anton Protopopov 10 Jun '09

10 Jun '09

Hi, all. Can someone tell me how to get boot=on parameter to appear on my kvm cmdline? I define domain with the following xml <domain type="kvm"> <name>kvm-1</name> <memory>524288</memory> <vcpu>1</vcpu> <os> <type arch="x86_64" machine="pc">hvm</type> <boot dev="hd"/> </os> <devices> <emulator>/usr/bin/kvm</emulator> <graphics type="vnc" port="-1"/> <disk device="disk" type="file"> <source file="test.img"/> <target dev="sda"/> </disk> <interface type="bridge"> <source bridge="breth0"/> </interface> </devices> </domain> and get /usr/bin/kvm -S -M pc -m 512 -smp 1 -name kvm-1 -uuid b462e575-4044-146c-193a-9a70523b4258 -monitor pty -no-acpi -boot c -drive file=test.img,if=scsi,index=0 -net nic,macaddr=52:54:00:09:9b:19,vlan=0 -net tap,fd=15,vlan=0 -serial none -parallel none -usb But I want to get -drive file=test.img,if=scsi,index=0,boot=on instead.

4 6

[libvirt] [PATCH] Support kvm-img or qemu-img dynamically
by Doug Goldstein 10 Jun '09

10 Jun '09

This patch adds a new function virFindFileInPath() and uses it to find where a binary lives in the PATH environment variable. Using this, we can dynamically find where utility functions exist (and if they even exists). So such we remove the build-time check for qemu-img and make it dynamic for kvm-img and qemu-img. Several distros uses kvm-img over qemu-img when installing KVM. kvm-img also includes several patches which Red Hat is trying to upstream with QEMU so this patch supports those features which are commented out in libvirt when using kvm-img Signed-off-by: Doug Goldstein <cardoe(a)gentoo.org> --- configure.in | 15 --------- src/libvirt_private.syms | 1 + src/storage_backend_fs.c | 74 ++++++++++++++++++++++++++++++++------------- src/util.c | 28 +++++++++++++++++ src/util.h | 2 + 5 files changed, 83 insertions(+), 37 deletions(-)

2 1

[libvirt] PATCH: Fix typo in XML documentation regarding VNC password
by Garry Dolley 10 Jun '09

10 Jun '09

Excuse my previous post, I didn't know the website was in docs/ and I could submit a real patch ;) So here it is: diff --git a/docs/formatdomain.html b/docs/formatdomain.html index 27e42ac..817fd7e 100644 --- a/docs/formatdomain.html +++ b/docs/formatdomain.html @@ -746,7 +746,7 @@ qemu-kvm -net nic,model=? /dev/null auto-allocated). The <code>autoport</code> attribute is the new preferred syntax for indicating autoallocation of the TCP port to use. The <code>listen</code> attribute is an IP address for the server to - listen on. The <code>password</code> attribute provides a VNC password + listen on. The <code>passwd</code> attribute provides a VNC password in clear text. The <code>keymap</code> attribute specifies the keymap to use.</dd></dl> <h4> -- Garry Dolley ARP Networks, Inc. | http://www.arpnetworks.com | (818) 206-0181 Data center, VPS, and IP Transit solutions Member Los Angeles County REACT, Unit 336 | WQGK336 Blog http://scie.nti.st

2 3

[libvirt] [PATCH] (not for inclusion) add virDomainRename API
by Doug Goldstein 09 Jun '09

09 Jun '09

The following patch stubs out virDomainRename() as an available API function. I'm just making sure I'm doing this right. I know there were some plans to include documentation about adding API to the website but I don't see it. The included patch does not include my example driver for qemu and test. Just looking for a thumbs up/down whether I should continue or not and whether I'm adding it right. -- Doug Goldstein

4 4

[libvirt] Typo in XML documentation regarding VNC password
by Garry Dolley 09 Jun '09

09 Jun '09

On this page: http://libvirt.org/formatdomain.html#elementsGraphics There is a typo stating how to set VNC passwords per domain. Patch: -The password attribute provides a VNC password in clear text. +The passwd attribute provides a VNC password in clear text. -- Garry Dolley ARP Networks, Inc. | http://www.arpnetworks.com | (818) 206-0181 Data center, VPS, and IP Transit solutions Member Los Angeles County REACT, Unit 336 | WQGK336 Blog http://scie.nti.st

2 1

[libvirt] Remote Xen and libvirt >= 0.5.0 Issues
by Hany Fahim 08 Jun '09

08 Jun '09

Hi, I'm currently running a few servers with CentOS 5.3 (i386) with the stock Xen version: # rpm -q kernel-xen xen libvirt kernel-xen-2.6.18-92.1.22.el5 kernel-xen-2.6.18-128.1.6.el5 xen-3.0.3-80.el5_3.2 libvirt-0.6.3-1 libvirt was compiled from the src RPM from libvirt.org to run on i386 architecture without issue. I'm having a problem when trying to connect to remote Xen installations using versions of libvirt starting from 0.5.0 and above. When issuing virsh commands to query the local instance, it works without issue, but any remote sources gives 'error: failed to connect to the hypervisor'. Here's what LIBVIRT_DEBUG reveals: # LIBVIRT_DEBUG=6 virsh -d 5 -c xen://node3/ list command: "list " 13:53:17.132: debug : virInitialize:290 : register drivers 13:53:17.132: debug : virRegisterDriver:667 : registering Test as driver 0 13:53:17.132: debug : virRegisterNetworkDriver:567 : registering Test as network driver 0 13:53:17.132: debug : virRegisterStorageDriver:598 : registering Test as storage driver 0 13:53:17.132: debug : virRegisterDeviceMonitor:629 : registering Test as device driver 0 13:53:17.132: debug : xenHypervisorInit:1922 : Using new hypervisor call: 30001 13:53:17.132: debug : xenHypervisorInit:1991 : Using hypervisor call v2, sys ver3 dom ver5 13:53:17.132: debug : virRegisterDriver:667 : registering Xen as driver 1 13:53:17.132: debug : virRegisterDriver:667 : registering OPENVZ as driver 2 13:53:17.133: debug : vboxRegister:68 : VBoxCGlueInit failed: 0.0.0, errorval=-1 13:53:17.133: debug : virRegisterDriver:667 : registering VBOX as driver 3 13:53:17.133: debug : virRegisterDriver:667 : registering remote as driver 4 13:53:17.133: debug : virRegisterNetworkDriver:567 : registering remote as network driver 1 13:53:17.133: debug : virRegisterStorageDriver:598 : registering remote as storage driver 1 13:53:17.133: debug : virRegisterDeviceMonitor:629 : registering remote as device driver 1 13:53:17.133: debug : virConnectOpenAuth:1100 : name=xen://node3/, auth=0x67d0080, flags=0 13:53:17.133: debug : do_open:920 : name "xen://node3/" to URI components: scheme xen opaque (null) authority (null) server node3 user (null) port 0 path / 13:53:17.133: debug : do_open:930 : trying driver 0 (Test) ... 13:53:17.133: debug : do_open:936 : driver 0 Test returned DECLINED 13:53:17.133: debug : do_open:930 : trying driver 1 (Xen) ... 13:53:17.133: debug : do_open:936 : driver 1 Xen returned DECLINED 13:53:17.133: debug : do_open:930 : trying driver 2 (OPENVZ) ... 13:53:17.133: debug : do_open:936 : driver 2 OPENVZ returned DECLINED 13:53:17.133: debug : do_open:930 : trying driver 3 (VBOX) ... 13:53:17.133: debug : do_open:936 : driver 3 VBOX returned DECLINED 13:53:17.133: debug : do_open:930 : trying driver 4 (remote) ... 13:53:17.133: debug : do_open:936 : driver 4 remote returned DECLINED 13:53:17.133: debug : virUnrefConnect:210 : unref connection 0x93275d0 1 13:53:17.134: debug : virReleaseConnect:171 : release connection 0x93275d0 error: failed to connect to the hypervisor But when connecting to localhost, it works just fine: # LIBVIRT_DEBUG=6 virsh -d 5 -c xen:/// list command: "list " 13:53:23.558: debug : virInitialize:290 : register drivers 13:53:23.558: debug : virRegisterDriver:667 : registering Test as driver 0 13:53:23.558: debug : virRegisterNetworkDriver:567 : registering Test as network driver 0 13:53:23.558: debug : virRegisterStorageDriver:598 : registering Test as storage driver 0 13:53:23.558: debug : virRegisterDeviceMonitor:629 : registering Test as device driver 0 13:53:23.559: debug : xenHypervisorInit:1922 : Using new hypervisor call: 30001 13:53:23.559: debug : xenHypervisorInit:1991 : Using hypervisor call v2, sys ver3 dom ver5 13:53:23.559: debug : virRegisterDriver:667 : registering Xen as driver 1 13:53:23.559: debug : virRegisterDriver:667 : registering OPENVZ as driver 2 13:53:23.559: debug : vboxRegister:68 : VBoxCGlueInit failed: 0.0.0, errorval=-1 13:53:23.559: debug : virRegisterDriver:667 : registering VBOX as driver 3 13:53:23.559: debug : virRegisterDriver:667 : registering remote as driver 4 13:53:23.559: debug : virRegisterNetworkDriver:567 : registering remote as network driver 1 13:53:23.560: debug : virRegisterStorageDriver:598 : registering remote as storage driver 1 13:53:23.560: debug : virRegisterDeviceMonitor:629 : registering remote as device driver 1 13:53:23.560: debug : virConnectOpenAuth:1100 : name=xen:///, auth=0x67d0080, flags=0 13:53:23.560: debug : do_open:920 : name "xen:///" to URI components: scheme xen opaque (null) authority (null) server (null) user (null) port 0 path / 13:53:23.560: debug : do_open:930 : trying driver 0 (Test) ... 13:53:23.560: debug : do_open:936 : driver 0 Test returned DECLINED 13:53:23.560: debug : do_open:930 : trying driver 1 (Xen) ... 13:53:23.560: debug : xenUnifiedOpen:295 : Trying hypervisor sub-driver 13:53:23.560: debug : xenUnifiedOpen:298 : Activated hypervisor sub-driver 13:53:23.560: debug : xenUnifiedOpen:306 : Trying XenD sub-driver 13:53:23.563: debug : xenUnifiedOpen:309 : Activated XenD sub-driver 13:53:23.563: debug : xenUnifiedOpen:315 : Trying XM sub-driver 13:53:23.563: debug : xenUnifiedOpen:318 : Activated XM sub-driver 13:53:23.563: debug : xenUnifiedOpen:322 : Trying XS sub-driver 13:53:23.564: debug : xenStoreOpen:346 : Failed to add event handle, disabling events 13:53:23.564: debug : xenUnifiedOpen:325 : Activated XS sub-driver 13:53:23.570: debug : xenUnifiedOpen:361 : Trying Xen inotify sub-driver 13:53:23.571: debug : xenInotifyOpen:439 : Adding a watch on /etc/xen 13:53:23.571: debug : xenInotifyOpen:451 : Building initial config cache 13:53:23.571: debug : xenXMConfigCacheAddFile:387 : Adding file /etc/xen/centos 13:53:23.571: debug : xenXMConfigCacheAddFile:436 : Failed to read /etc/xen/centos 13:53:23.571: debug : xenXMConfigCacheAddFile:387 : Adding file /etc/xen/test3 13:53:23.571: debug : xenXMConfigCacheAddFile:465 : Added config test3 /etc/xen/test3 13:53:23.571: debug : xenXMConfigCacheAddFile:387 : Adding file /etc/xen/hany 13:53:23.571: debug : xenXMConfigCacheAddFile:465 : Added config hany /etc/xen/hany 13:53:23.572: debug : xenXMConfigCacheAddFile:387 : Adding file /etc/xen/hany2 13:53:23.572: debug : xenXMConfigCacheAddFile:465 : Added config hany4 /etc/xen/hany2 13:53:23.572: debug : xenInotifyOpen:458 : Registering with event loop 13:53:23.572: debug : xenInotifyOpen:462 : Failed to add inotify handle, disabling events 13:53:23.572: debug : virConnectRef:1165 : conn=0x996b5c8 refs=3 13:53:23.572: debug : xenUnifiedOpen:364 : Activated Xen inotify sub-driver 13:53:23.572: debug : do_open:936 : driver 1 Xen returned SUCCESS 13:53:23.572: debug : do_open:956 : network driver 0 Test returned DECLINED 13:53:23.572: debug : doRemoteOpen:511 : proceeding with name = xen:/// 13:53:23.572: debug : call:6543 : Doing call 66 (nil) 13:53:23.573: debug : call:6613 : We have the buck 66 0xb736c008 0xb736c008 13:53:23.573: debug : processCallRecvLen:6201 : Got length, now need 36 total (32 more) 13:53:23.573: debug : processCalls:6469 : Giving up the buck 66 0xb736c008 (nil) 13:53:23.573: debug : call:6644 : All done with our call 66 (nil) 0xb736c008 13:53:23.573: debug : call:6543 : Doing call 1 (nil) 13:53:23.573: debug : call:6613 : We have the buck 1 0x997f3b0 0x997f3b0 13:53:23.584: debug : processCallRecvLen:6201 : Got length, now need 28 total (24 more) 13:53:23.585: debug : processCalls:6469 : Giving up the buck 1 0x997f3b0 (nil) 13:53:23.585: debug : call:6644 : All done with our call 1 (nil) 0x997f3b0 13:53:23.585: debug : doRemoteOpen:822 : Adding Handler for remote events 13:53:23.585: debug : doRemoteOpen:829 : virEventAddHandle failed: No addHandleImpl defined. continuing without events. 13:53:23.585: debug : do_open:956 : network driver 1 remote returned SUCCESS 13:53:23.585: debug : do_open:978 : storage driver 0 Test returned DECLINED 13:53:23.585: debug : do_open:978 : storage driver 1 remote returned SUCCESS 13:53:23.585: debug : do_open:999 : node driver 0 Test returned DECLINED 13:53:23.585: debug : do_open:999 : node driver 1 remote returned SUCCESS 13:53:23.585: debug : virConnectNumOfDomains:1440 : conn=0x996b5c8 13:53:23.585: debug : virConnectListDomains:1401 : conn=0x996b5c8, ids=0x997a6d0, maxids=1 Id Name State ---------------------------------- 13:53:23.586: debug : virDomainLookupByID:1576 : conn=0x996b5c8, id=0 13:53:23.586: debug : virGetDomain:271 : New hash entry 0x997b300 13:53:23.586: debug : virDomainGetInfo:2569 : domain=0x997b300, info=0xbfc34c64 13:53:23.586: debug : virDomainGetName:2268 : domain=0x997b300 13:53:23.586: debug : virDomainGetID:2361 : domain=0x997b300 0 Domain-0 running 13:53:23.586: debug : virDomainFree:1806 : domain=0x997b300 13:53:23.586: debug : virUnrefDomain:345 : unref domain 0x997b300 Domain-0 1 13:53:23.586: debug : virReleaseDomain:303 : release domain 0x997b300 Domain-0 13:53:23.587: debug : virReleaseDomain:315 : unref connection 0x996b5c8 5 13:53:23.587: debug : virConnectClose:1118 : conn=0x996b5c8 13:53:23.587: debug : call:6543 : Doing call 2 (nil) 13:53:23.587: debug : call:6613 : We have the buck 2 0x997f3b0 0x997f3b0 13:53:23.588: debug : processCallRecvLen:6201 : Got length, now need 28 total (24 more) 13:53:23.588: debug : processCalls:6469 : Giving up the buck 2 0x997f3b0 (nil) 13:53:23.588: debug : call:6644 : All done with our call 2 (nil) 0x997f3b0 13:53:23.588: debug : virUnrefConnect:210 : unref connection 0x996b5c8 4 13:53:23.588: debug : virUnrefConnect:210 : unref connection 0x996b5c8 3 13:53:23.589: debug : virUnrefConnect:210 : unref connection 0x996b5c8 2 13:53:23.589: debug : virUnrefConnect:210 : unref connection 0x996b5c8 1 13:53:23.589: debug : virReleaseConnect:171 : release connection 0x996b5c8 Anybody else run into this? Any help would be greatly appreciated. Thanks, Hany

2 6

[libvirt] Checkpoint VMs
by Maximilian Wilhelm 08 Jun '09

08 Jun '09

Hi! Some months ago there were some mails about ideas of adding new API functions for checkpointing of domains. For the project group Virtualized SuperComputer (the crazy guys with the ESX driver) we would like to have such a feature and would be willing to propose API patches and anything the like. As we have to deal with many VMs at the same time which belong to one computation job (think: virtualized HPC cluster) we are facing the problem to checkpoint a set of VMs at the same time. So besides a usual checkpoint we would be interested in something like checkpointAt (host, vm, timestamp) restoreFromCheckpointAt (host, vm, timestamp) an let the hypervisor / libvirtd / whatever piece of software on the host face the problem to execute the checkpoint/restore command at <timestamp>. The main idea behind this is to checkpoint or restore the set of VMs as simultaniously as possible. As far as I got it ESX for examples is able to execute tasks at a given point of time once or recurring as far as you have a Virtual Center with all your hosts belong^Wconnected to it. Any opinions on such new functions? I guess more people could be interested in this functionality. Comments welcome. Ciao Max -- Follow the white penguin.

2 1

[libvirt] Can't Pass Through USB Device To Ubuntu 9.05 Guest OS
by Robert L Cochran 08 Jun '09

08 Jun '09

Greetings! I created Bug 504444 <https://bugzilla.redhat.com/show_bug.cgi?id=504444> which is partially quoted in this post: ---------------------------------------------------------------- Coding this xml: <hostdev mode='subsystem' type='usb'> <source> <vendor id='0x0403'/> <product id='0x6001'/> </source> </hostdev> should let my Ubuntu 9.04 guest have access to the device, which in this case is a USB-to-Serial UART (based on an FTDI FT232RL chip.) However the guest does not "see" the device or recognize it in any way. It does not show up in the guest's /var/log/messages or in the output of lsusb. I would like the guest to have access to this device. This is what virsh seems to be seeing: # virsh dumpxml Ubuntu9 <domain type='kvm'> <name>Ubuntu9</name> <uuid>cb8c3d15-fe92-1bf2-5676-03370743e815</uuid> <memory>1572864</memory> <currentMemory>1572864</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> <pae/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/qemu-kvm</emulator> <disk type='file' device='cdrom'> <target dev='hdc' bus='ide'/> <readonly/> </disk> <disk type='file' device='disk'> <source file='/var/lib/libvirt/images/Ubuntu9.img'/> <target dev='vda' bus='virtio'/> </disk> <interface type='network'> <mac address='54:52:00:74:32:2f'/> <source network='default'/> <model type='virtio'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target port='0'/> </console> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> <sound model='es1370'/> <hostdev mode='subsystem' type='usb' managed='no'> <source> <vendor id='0x0403'/> <product id='0x6001'/> </source> </hostdev> </devices> </domain> Version-Release number of selected component (if applicable): libvirt-0.6.2-11.fc11.x86_64 ---------------------------------- Any suggestions for fixing this problem? Is there a clear procedure for getting a Fedora virtualization guest to recognize a USB device? Thanks for your help! Bob Cochran

2 1

[libvirt] Release of libvirt-0.6.4
by Daniel Veillard 06 Jun '09

06 Jun '09

The monthly release is out ! There is a number of new things in that release, but as happens in time-based releases some are not fully complete, for example the OpenNebula driver was added but it still need a bit of work on the detection code and a bit of cleanup to avoid a GPL/AFS licencing issue, so please don't enable it except for test builds. We also have a new set of Interface config APIs but they are not yet implemented by a driver and the XML import/export routines are not there yet. Still there is a lot of things to use and discover in this release as you can see below: * New features: - new API virStorageVolCreateXMLFrom (Cole Robinson) - full VBox graphic capabilities (Pritesh Kothari) - Interface config APIs (Laine Stump) - APIs for domain XML conversions (Daniel Berrange) - initial version of OpenNebula driver (Abel Miguez Rodriguez) * Portability: - better compiler warning selection (Daniel Berrange) - Win32 portability fixes (Daniel Berrange) * Documentation: - documentation for <sound> device XML format (Cole Robinson) - storage format documentation fixes (Ryota Ozaki) - docs for XML conversion APIs (Daniel Berrange) - inconsistencies in storage volume docs and schemas (Ryota Ozaki) * Bug fixes: - fix hostdev managed handling (Mark McLoughlin) - lxc_controller should not cash without args (Guido Gunther) - bug fixes in I/O routines (Guido Gunther) - fix migrationsave/restore for QEmu 0.10.0 (Daniel Berrange) - avoid crash on VBox init (Guido Gunther) - fix dev and cgroup init in LXC (Ryota Ozaki) - QEmu startup fix (Cole Robinson) - block node reboots from LXCs (Ryota Ozaki) - QEmu argv detection fix for recent kvm (Daniel Berrange) - fix watch/timer event deletion (Daniel Berrange) - fix XML escaping bug - various locking bugs (Daniel Berrange) - avoid a deadlock in HAL nodedev driver (Cole Robinson) - detection of node device media insert/eject (Cole Robinson) - broken networking with new QEMU/KVM >= 86 (Daniel Berrange) - various fixes in domain and network startup error report (Cole Robinson) - double free on unexpected client disconnect (Daniel Berrange) * Improvements: - cleanups and doc on virExec (Cole Robinson) - error reporting in QEmu migrations (Cole Robinson) - better path and driver detection in VBox (Pritesh Kothari) - avoid caching QEMU driver capabilities(Cole Robinson) - multiple graphics elements definitions (Pritesh Kothari) - LSB init header init.d improvements (Frederik Himpe) - special erro code for invalid operations (Daniel Berrange) - dlopen error logging (Daniel Berrange) - fix UUID and name uniqueness (Daniel Berrange) - improvement on VBox initialization (Pritesh Kothari and Dan Berrange) - "Host only" and "Internal" network in VBox (Pritesh Kothari) - add utility virExecDaemonize (Cole Robinson) - enable bridges without IP (Ludwig Nussel) - 'make -s' silencing (Daniel Berrange) - test case for exercising the event loop (Daniel Berrange) - virsh commands vol-clone and vol-create-from (Cole Robinson) - new xend don't use [] around cpumaps (Tatsuro Enokura) - add the CIL mutex lock checker (Daniel Berrange) - fix some LXC error code (Amy Griffis) - virInterface python bindings (Daniel Berrange) - fix to the example code for event handling (Pritesh Kothari) - always add location informations to logging (Daniel Berrange) - python domain events example and binding (Daniel Berrange) - PPC Qemu Machine Type update (Thomas Baker) * Cleanups: - strings bug in virsh (Daniel Berrange) - various cleanups in storage code (Cole Robinson) - rpm spec cleanups - destructors data cleanups (Laine Stump) - some QEmu code refactoring (Daniel Berrange) - avoid dependancy on libcap (Daniel Berrange) - python import cleanup (Cole Robinson) - virAsprintf based cleanups in storage code (Cole Robinson) - fix some direct stderr logging - OpenNebula driver cleanups (Daniel Berrange) Thanks everybody for the contributions for this new release ! Daniel -- 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/

3 8

[libvirt] Regression in createQemuImg()@storage_backend_fs.c of 0.6.4
by Ryota Ozaki 05 Jun '09

05 Jun '09

Hi, I've found a regression in using a backing store of a volume (qcow2) in a pool (dir). The following code of 0.6.4 hits my system that works with 0.6.3. static int createQemuImg(virConnectPtr conn, virStorageVolDefPtr vol, virStorageVolDefPtr inputvol) { (snip) const char *inputBackingPath = (inputvol ? inputvol->backingStore.path : NULL); (snip) /* XXX: Not strictly required: qemu-img has an option a different * backing store, not really sure what use it serves though, and it * may cause issues with lvm. Untested essentially. */ if (!inputBackingPath || !STREQ(inputBackingPath, vol->backingStore.path)) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("a different backing store can not " "be specified.")); return -1; } The inputBackingPath will be always NULL when it is called via virStorageBackendFileSystemVolBuild(). (The third argument is passed to that of createQemuImg as it is.) static int virStorageBackendFileSystemVolBuild(virConnectPtr conn, virStorageVolDefPtr vol) { return _virStorageBackendFileSystemVolBuild(conn, vol, NULL); } I've addressed the regression with the patch - if (!inputBackingPath || + if (inputBackingPath && However, I'm not sure whether this fix satisfies the aim of the original code. Any idea? Thanks in advance, ozaki-r

2 2

[libvirt] IPv6 subnet on virbr0
by Bernie Innocenti 05 Jun '09

05 Jun '09

Hello, in a common scenario where there aren't enough public IPv4 addresses for all domains, I have elaborated this workaround: - the host operates a sixxs.net IPv6 tunnel with aiccu. - the virbr0 interface is manually configured an IPv6 address within a /64 subnet delegated by sixxs.net. (I do this from /etc/rc.local for lack of a better place) - radvd runs on the host to autoconfigure IPv6 for the guests on virbr0 and advertise the host as a gateway With this setup, all machines are globally addressable from the IPv6 internet, which is still quite useful for backstage services such as a build farm. In order to automate this setup, libvirt should support configuring an IPv6 address on bridged interfaces, and possibly multiple addresses for dual stack setups. Automatically running radvd would make a nice goodie. -- // Bernie Innocenti - http://codewiz.org/ \X/ Sugar Labs - http://sugarlabs.org/

2 3

[libvirt] virsh edit error
by Doug Goldstein 05 Jun '09

05 Jun '09

In an attempt to rename a kvm vm (which was powered off) I performed the following: $ virsh edit old-name Then changed <name>old-name</name> to <name>new-name</name> and saved and quit from the editor. $ virsh list --all Id Name State ---------------------------------- - old-name shut off - new-name shut off Performing an edit on each of these shows they're completely identical. Even the <name> section shows the old-name on both of them. I've performed restarts of libvirtd as well. If the action I did is truly invalid, we should catch that an error out on it. However I think VM renaming can be a valid use case and we have the UUID to match off of for the rename. Basically, I'm contacting the list to see if my use case was invalid and I should write my patch to spit an error, or if I should write my patch to correct the improper handling. Patch to follow based on responses. Thanks all. -- Doug Goldstein

3 3

[libvirt] [PATCH] fix a realloc problem
by Daniel Veillard 04 Jun '09

04 Jun '09

The xen code for detaching devices had a mistake in the resize compaction code, the size of the data copied was improper, moving N bytes, instead of sizeof(device) * N bytes. The attached patch by Dan Berrange fixes it, it's trivial so I commited it, Daniel -- 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/

1 0

[libvirt] PATCH: Fix redetection of transient QEMU VMs on daemon restarts
by Daniel P. Berrange 04 Jun '09

04 Jun '09

When the libvirtd daemon starts up, it reads all config files from /etc/libvirt/qemu. For each config file loaded, it then probes for a pidfile / live status XML config in /var/run/libvirt/qemu. In retrospect there is an obvious problem with this approach: it misses all transient VMs which don't ever have config files in /etc/libvirt/qemu. The core goal of this patch, is thus to change the way we deal with startup to apply the following logic. - Scan & load all status files in /var/run/libvirt/qemu for running VMs - Reconnect to the monitor for all VMs, and re-detect VCPU threads. - Scan & load all inactive configs in /etc/libvirt/qemu This ensures we always re-detect all inactive and running VMs, whether transient or persistent. It also fixes two other bugs, first we forgot to detect VCPU threads, so vCPU affinity functions were broken, and it also re-reserves the MCS category with selinux so it is not re-used later. Finally, if the attempt to reconnect to the QEMU monitor for a running VM fails, then we explicitly kill off that VM, rather than just ignoring it. This avoids leaving orphaned QEMU processes. The patch is larger than anticipated, because I moved all the status file code out of QEMU driver into the generic domain_conf.c file. This enables both scanning loops to be done via the single method virDomainLoadAllConfigs, just by pasing different directories. I also want to re-use this code in the LXC and UML drivers to improve bugs in their logic domain_conf.c | 314 ++++++++++++++++++++++++++++++++++++++++++++++----- domain_conf.h | 17 ++ libvirt_private.syms | 1 lxc_driver.c | 2 qemu_conf.c | 190 ------------------------------ qemu_conf.h | 18 -- qemu_driver.c | 178 +++++++++++++--------------- security.h | 3 security_selinux.c | 39 ++++++ uml_driver.c | 4 10 files changed, 431 insertions(+), 335 deletions(-) Daniel diff --git a/src/domain_conf.c b/src/domain_conf.c --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -39,6 +39,7 @@ #include "util.h" #include "buf.h" #include "c-ctype.h" +#include "logging.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN @@ -511,6 +512,31 @@ void virDomainObjListFree(virDomainObjLi vms->count = 0; } + +static virDomainObjPtr virDomainObjNew(virConnectPtr conn) +{ + virDomainObjPtr domain; + + if (VIR_ALLOC(domain) < 0) { + virReportOOMError(conn); + return NULL; + } + + if (virMutexInit(&domain->lock) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("cannot initialize mutex")); + VIR_FREE(domain); + return NULL; + } + + virDomainObjLock(domain); + domain->state = VIR_DOMAIN_SHUTOFF; + domain->monitorWatch = -1; + domain->monitor = -1; + + return domain; +} + virDomainObjPtr virDomainAssignDef(virConnectPtr conn, virDomainObjListPtr doms, const virDomainDefPtr def) @@ -530,29 +556,15 @@ virDomainObjPtr virDomainAssignDef(virCo return domain; } - if (VIR_ALLOC(domain) < 0) { - virReportOOMError(conn); - return NULL; - } - - if (virMutexInit(&domain->lock) < 0) { - virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot initialize mutex")); - VIR_FREE(domain); - return NULL; - } - - virDomainObjLock(domain); - domain->state = VIR_DOMAIN_SHUTOFF; + if (VIR_REALLOC_N(doms->objs, doms->count + 1) < 0) { + virReportOOMError(conn); + return NULL; + } + + if (!(domain = virDomainObjNew(conn))) + return NULL; + domain->def = def; - domain->monitorWatch = -1; - domain->monitor = -1; - - if (VIR_REALLOC_N(doms->objs, doms->count + 1) < 0) { - virReportOOMError(conn); - VIR_FREE(domain); - return NULL; - } doms->objs[doms->count] = domain; doms->count++; @@ -2621,6 +2633,68 @@ no_memory: return NULL; } + +static virDomainObjPtr virDomainObjParseXML(virConnectPtr conn, + virCapsPtr caps, + xmlXPathContextPtr ctxt) +{ + char *tmp = NULL; + long val; + xmlNodePtr config; + xmlNodePtr oldctxt; + virDomainObjPtr obj; + + if (!(obj = virDomainObjNew(conn))) + return NULL; + + if (!(config = virXPathNode(conn, "./domain", ctxt))) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("no domain config")); + goto error; + } + + oldctxt = ctxt->node; + ctxt->node = config; + obj->def = virDomainDefParseXML(conn, caps, ctxt, 0); + ctxt->node = oldctxt; + if (!obj->def) + goto error; + + if (!(tmp = virXPathString(conn, "string(./@state)", ctxt))) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("missing domain state")); + goto error; + } + if ((obj->state = virDomainStateTypeFromString(tmp)) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("invalid domain state '%s'"), tmp); + VIR_FREE(tmp); + goto error; + } + VIR_FREE(tmp); + + if ((virXPathLong(conn, "string(./@pid)", ctxt, &val)) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("invalid pid")); + goto error; + } + obj->pid = (pid_t)val; + + if(!(obj->monitorpath = + virXPathString(conn, "string(./monitor[1]/@path)", ctxt))) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("no monitor path")); + goto error; + } + + return obj; + +error: + virDomainObjFree(obj); + return NULL; +} + + /* Called from SAX on parsing errors in the XML. */ static void catchXMLError (void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) @@ -2753,6 +2827,78 @@ cleanup: xmlXPathFreeContext(ctxt); return def; } + + +virDomainObjPtr virDomainObjParseFile(virConnectPtr conn, + virCapsPtr caps, + const char *filename) +{ + xmlParserCtxtPtr pctxt; + xmlDocPtr xml = NULL; + xmlNodePtr root; + virDomainObjPtr obj = NULL; + + /* Set up a parser context so we can catch the details of XML errors. */ + pctxt = xmlNewParserCtxt (); + if (!pctxt || !pctxt->sax) + goto cleanup; + pctxt->sax->error = catchXMLError; + pctxt->_private = conn; + + if (conn) virResetError (&conn->err); + xml = xmlCtxtReadFile (pctxt, filename, NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOWARNING); + if (!xml) { + if (virGetLastError() == NULL) + virDomainReportError(conn, VIR_ERR_XML_ERROR, + "%s", _("failed to parse xml document")); + goto cleanup; + } + + if ((root = xmlDocGetRootElement(xml)) == NULL) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("missing root element")); + goto cleanup; + } + + obj = virDomainObjParseNode(conn, caps, xml, root); + +cleanup: + xmlFreeParserCtxt (pctxt); + xmlFreeDoc (xml); + return obj; +} + + +virDomainObjPtr virDomainObjParseNode(virConnectPtr conn, + virCapsPtr caps, + xmlDocPtr xml, + xmlNodePtr root) +{ + xmlXPathContextPtr ctxt = NULL; + virDomainObjPtr obj = NULL; + + if (!xmlStrEqual(root->name, BAD_CAST "domstatus")) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("incorrect root element")); + goto cleanup; + } + + ctxt = xmlXPathNewContext(xml); + if (ctxt == NULL) { + virReportOOMError(conn); + goto cleanup; + } + + ctxt->node = root; + obj = virDomainObjParseXML(conn, caps, ctxt); + +cleanup: + xmlXPathFreeContext(ctxt); + return obj; +} + #endif /* ! PROXY */ /************************************************************************ @@ -3704,6 +3850,33 @@ char *virDomainDefFormat(virConnectPtr c return NULL; } +char *virDomainObjFormat(virConnectPtr conn, + virDomainObjPtr obj, + int flags) +{ + char *config_xml = NULL, *xml = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + + virBufferVSprintf(&buf, "<domstatus state='%s' pid='%d'>\n", + virDomainStateTypeToString(obj->state), + obj->pid); + virBufferEscapeString(&buf, " <monitor path='%s'/>\n", obj->monitorpath); + + if (!(config_xml = virDomainDefFormat(conn, + obj->def, + flags))) + goto cleanup; + + virBufferAdd(&buf, config_xml, strlen(config_xml)); + virBufferAddLit(&buf, "</domstatus>\n"); + + xml = virBufferContentAndReset(&buf); +cleanup: + VIR_FREE(config_xml); + return xml; + +} + #ifndef PROXY @@ -3779,6 +3952,27 @@ cleanup: return ret; } +int virDomainSaveStatus(virConnectPtr conn, + const char *statusDir, + virDomainObjPtr obj) +{ + int ret = -1; + char *xml; + + if (!(xml = virDomainObjFormat(conn, + obj, + VIR_DOMAIN_XML_SECURE))) + goto cleanup; + + if (virDomainSaveXML(conn, statusDir, obj->def, xml)) + goto cleanup; + + ret = 0; +cleanup: + VIR_FREE(xml); + return ret; +} + virDomainObjPtr virDomainLoadConfig(virConnectPtr conn, virCapsPtr caps, @@ -3832,17 +4026,67 @@ error: return NULL; } +static virDomainObjPtr virDomainLoadStatus(virConnectPtr conn, + virCapsPtr caps, + virDomainObjListPtr doms, + const char *statusDir, + const char *name, + virDomainLoadConfigNotify notify, + void *opaque) +{ + char *statusFile = NULL; + virDomainObjPtr obj = NULL; + virDomainObjPtr tmp = NULL; + + if ((statusFile = virDomainConfigFile(conn, statusDir, name)) == NULL) + goto error; + + if (!(obj = virDomainObjParseFile(conn, caps, statusFile))) + goto error; + + tmp = virDomainFindByName(doms, obj->def->name); + if (tmp) { + virDomainObjUnlock(obj); + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("unexpected domain %s already exists"), obj->def->name); + goto error; + } + + if (VIR_REALLOC_N(doms->objs, doms->count + 1) < 0) { + virReportOOMError(conn); + goto error; + } + + doms->objs[doms->count] = obj; + doms->count++; + + if (notify) + (*notify)(obj, 1, opaque); + + VIR_FREE(statusFile); + return obj; + +error: + virDomainObjFree(obj); + VIR_FREE(statusFile); + return NULL; +} + int virDomainLoadAllConfigs(virConnectPtr conn, virCapsPtr caps, virDomainObjListPtr doms, const char *configDir, const char *autostartDir, + int liveStatus, virDomainLoadConfigNotify notify, void *opaque) { DIR *dir; struct dirent *entry; + VIR_INFO("Scanning for %s configs in %s", + liveStatus ? "live" : "persistent", configDir); + if (!(dir = opendir(configDir))) { if (errno == ENOENT) return 0; @@ -3863,14 +4107,24 @@ int virDomainLoadAllConfigs(virConnectPt /* NB: ignoring errors, so one malformed config doesn't kill the whole process */ - dom = virDomainLoadConfig(conn, - caps, - doms, - configDir, - autostartDir, - entry->d_name, - notify, - opaque); + VIR_INFO("Loading config file '%s.xml'", entry->d_name); + if (liveStatus) + dom = virDomainLoadStatus(conn, + caps, + doms, + configDir, + entry->d_name, + notify, + opaque); + else + dom = virDomainLoadConfig(conn, + caps, + doms, + configDir, + autostartDir, + entry->d_name, + notify, + opaque); if (dom) { virDomainObjUnlock(dom); dom->persistent = 1; diff --git a/src/domain_conf.h b/src/domain_conf.h --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -515,7 +515,6 @@ struct _virDomainObj { int monitor; char *monitorpath; int monitorWatch; - int logfile; int pid; int state; @@ -589,10 +588,22 @@ virDomainDefPtr virDomainDefParseNode(vi xmlDocPtr doc, xmlNodePtr root, int flags); + +virDomainObjPtr virDomainObjParseFile(virConnectPtr conn, + virCapsPtr caps, + const char *filename); +virDomainObjPtr virDomainObjParseNode(virConnectPtr conn, + virCapsPtr caps, + xmlDocPtr xml, + xmlNodePtr root); + #endif char *virDomainDefFormat(virConnectPtr conn, virDomainDefPtr def, int flags); +char *virDomainObjFormat(virConnectPtr conn, + virDomainObjPtr obj, + int flags); int virDomainCpuSetParse(virConnectPtr conn, const char **str, @@ -615,6 +626,9 @@ int virDomainSaveXML(virConnectPtr conn, int virDomainSaveConfig(virConnectPtr conn, const char *configDir, virDomainDefPtr def); +int virDomainSaveStatus(virConnectPtr conn, + const char *statusDir, + virDomainObjPtr obj); typedef void (*virDomainLoadConfigNotify)(virDomainObjPtr dom, int newDomain, @@ -634,6 +648,7 @@ int virDomainLoadAllConfigs(virConnectPt virDomainObjListPtr doms, const char *configDir, const char *autostartDir, + int liveStatus, virDomainLoadConfigNotify notify, void *opaque); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -94,6 +94,7 @@ virDomainObjListFree; virDomainRemoveInactive; virDomainSaveXML; virDomainSaveConfig; +virDomainSaveStatus; virDomainSoundDefFree; virDomainSoundModelTypeFromString; virDomainSoundModelTypeToString; diff --git a/src/lxc_driver.c b/src/lxc_driver.c --- a/src/lxc_driver.c +++ b/src/lxc_driver.c @@ -1176,7 +1176,7 @@ static int lxcStartup(void) &lxc_driver->domains, lxc_driver->configDir, lxc_driver->autostartDir, - NULL, NULL) < 0) + 0, NULL, NULL) < 0) goto cleanup; for (i = 0 ; i < lxc_driver->domains.count ; i++) { diff --git a/src/qemu_conf.c b/src/qemu_conf.c --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -2765,193 +2765,3 @@ cleanup: return def; } - -/* Called from SAX on parsing errors in the XML. */ -static void -catchXMLError (void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) -{ - xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; - - if (ctxt) { - virConnectPtr conn = ctxt->_private; - - if (ctxt->lastError.level == XML_ERR_FATAL && - ctxt->lastError.message != NULL) { - qemudReportError (conn, NULL, NULL, VIR_ERR_XML_DETAIL, - _("at line %d: %s"), - ctxt->lastError.line, - ctxt->lastError.message); - } - } -} - - -/** - * qemudDomainStatusParseFile - * - * read the last known status of a domain - * - * Returns 0 on success - */ -qemudDomainStatusPtr -qemudDomainStatusParseFile(virConnectPtr conn, - virCapsPtr caps, - const char *filename, int flags) -{ - xmlParserCtxtPtr pctxt = NULL; - xmlXPathContextPtr ctxt = NULL; - xmlDocPtr xml = NULL; - xmlNodePtr root, config_root; - virDomainDefPtr def = NULL; - char *tmp = NULL; - long val; - qemudDomainStatusPtr status = NULL; - - if (VIR_ALLOC(status) < 0) { - virReportOOMError(conn); - goto error; - } - - /* Set up a parser context so we can catch the details of XML errors. */ - pctxt = xmlNewParserCtxt (); - if (!pctxt || !pctxt->sax) - goto error; - pctxt->sax->error = catchXMLError; - pctxt->_private = conn; - - if (conn) virResetError (&conn->err); - xml = xmlCtxtReadFile (pctxt, filename, NULL, - XML_PARSE_NOENT | XML_PARSE_NONET | - XML_PARSE_NOWARNING); - if (!xml) { - if (conn && conn->err.code == VIR_ERR_NONE) - qemudReportError(conn, NULL, NULL, VIR_ERR_XML_ERROR, - "%s", _("failed to parse xml document")); - goto error; - } - - if ((root = xmlDocGetRootElement(xml)) == NULL) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("missing root element")); - goto error; - } - - ctxt = xmlXPathNewContext(xml); - if (ctxt == NULL) { - virReportOOMError(conn); - goto error; - } - - if (!xmlStrEqual(root->name, BAD_CAST "domstatus")) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("incorrect root element")); - goto error; - } - - ctxt->node = root; - if(!(tmp = virXPathString(conn, "string(./@state)", ctxt))) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("invalid domain state")); - goto error; - } else { - status->state = virDomainStateTypeFromString(tmp); - VIR_FREE(tmp); - } - - if((virXPathLong(conn, "string(./@pid)", ctxt, &val)) < 0) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("invalid pid")); - goto error; - } else - status->pid = (pid_t)val; - - if(!(tmp = virXPathString(conn, "string(./monitor[1]/@path)", ctxt))) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("no monitor path")); - goto error; - } else - status->monitorpath = tmp; - - if(!(config_root = virXPathNode(conn, "./domain", ctxt))) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("no domain config")); - goto error; - } - if(!(def = virDomainDefParseNode(conn, caps, xml, config_root, flags))) - goto error; - else - status->def = def; - -cleanup: - xmlFreeParserCtxt (pctxt); - xmlXPathFreeContext(ctxt); - xmlFreeDoc (xml); - return status; - -error: - VIR_FREE(tmp); - VIR_FREE(status); - goto cleanup; -} - - -/** - * qemudDomainStatusFormat - * - * Get the state of a running domain as XML - * - * Returns xml on success - */ -static char* -qemudDomainStatusFormat(virConnectPtr conn, - virDomainObjPtr vm) -{ - char *config_xml = NULL, *xml = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - - virBufferVSprintf(&buf, "<domstatus state='%s' pid='%d'>\n", - virDomainStateTypeToString(vm->state), - vm->pid); - virBufferEscapeString(&buf, " <monitor path='%s'/>\n", vm->monitorpath); - - if (!(config_xml = virDomainDefFormat(conn, - vm->def, - VIR_DOMAIN_XML_SECURE))) - goto cleanup; - - virBufferAdd(&buf, config_xml, strlen(config_xml)); - virBufferAddLit(&buf, "</domstatus>\n"); - - xml = virBufferContentAndReset(&buf); -cleanup: - VIR_FREE(config_xml); - return xml; -} - - -/** - * qemudSaveDomainStatus - * - * Save the current status of a running domain - * - * Returns 0 on success - */ -int -qemudSaveDomainStatus(virConnectPtr conn, - struct qemud_driver *driver, - virDomainObjPtr vm) -{ - int ret = -1; - char *xml = NULL; - - if (!(xml = qemudDomainStatusFormat(conn, vm))) - goto cleanup; - - if ((ret = virDomainSaveXML(conn, driver->stateDir, vm->def, xml))) - goto cleanup; - - ret = 0; -cleanup: - VIR_FREE(xml); - return ret; -} diff --git a/src/qemu_conf.h b/src/qemu_conf.h --- a/src/qemu_conf.h +++ b/src/qemu_conf.h @@ -92,15 +92,6 @@ struct qemud_driver { virSecurityDriverPtr securityDriver; }; -/* Status needed to reconenct to running VMs */ -typedef struct _qemudDomainStatus qemudDomainStatus; -typedef qemudDomainStatus *qemudDomainStatusPtr; -struct _qemudDomainStatus { - char *monitorpath; - pid_t pid; - int state; - virDomainDefPtr def; -}; /* Port numbers used for KVM migration. */ #define QEMUD_MIGRATION_FIRST_PORT 49152 @@ -141,13 +132,4 @@ virDomainDefPtr qemuParseCommandLine(vir virDomainDefPtr qemuParseCommandLineString(virConnectPtr conn, const char *args); -const char *qemudVirtTypeToString (int type); -qemudDomainStatusPtr qemudDomainStatusParseFile(virConnectPtr conn, - virCapsPtr caps, - const char *filename, - int flags); -int qemudSaveDomainStatus(virConnectPtr conn, - struct qemud_driver *driver, - virDomainObjPtr vm); - #endif /* __QEMUD_CONF_H */ diff --git a/src/qemu_driver.c b/src/qemu_driver.c --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -125,6 +125,8 @@ static int qemudMonitorCommandExtra(cons static int qemudDomainSetMemoryBalloon(virConnectPtr conn, virDomainObjPtr vm, unsigned long newmem); +static int qemudDetectVcpuPIDs(virConnectPtr conn, + virDomainObjPtr vm); static struct qemud_driver *qemu_driver = NULL; @@ -287,79 +289,65 @@ static int qemudOpenMonitor(virConnectPt const char *monitor, int reconnect); + +/* + * Open an existing VM's monitor, and re-detect VCPUs + * threads + */ +static int +qemuReconnectDomain(struct qemud_driver *driver, + virDomainObjPtr obj) +{ + int rc; + + if ((rc = qemudOpenMonitor(NULL, driver, obj, obj->monitorpath, 1)) != 0) { + VIR_ERROR(_("Failed to reconnect monitor for %s: %d\n"), + obj->def->name, rc); + goto error; + } + + if (qemudDetectVcpuPIDs(NULL, obj) < 0) { + goto error; + } + + if (obj->def->seclabel.type == VIR_DOMAIN_SECLABEL_DYNAMIC && + driver->securityDriver && + driver->securityDriver->domainReserveSecurityLabel && + driver->securityDriver->domainReserveSecurityLabel(NULL, obj) < 0) + return -1; + + if (obj->def->id >= driver->nextvmid) + driver->nextvmid = obj->def->id + 1; + + return 0; + +error: + return -1; +} + /** * qemudReconnectVMs * - * Reconnect running vms to the daemon process - */ -static int -qemudReconnectVMs(struct qemud_driver *driver) + * Try to re-open the resources for live VMs that we care + * about. + */ +static void +qemuReconnectDomains(struct qemud_driver *driver) { int i; for (i = 0 ; i < driver->domains.count ; i++) { - virDomainObjPtr vm = driver->domains.objs[i]; - qemudDomainStatusPtr status = NULL; - char *config = NULL; - int rc; - - virDomainObjLock(vm); - if ((rc = virFileReadPid(driver->stateDir, vm->def->name, &vm->pid)) == 0) - DEBUG("Found pid %d for '%s'", vm->pid, vm->def->name); - else - goto next; - - if ((config = virDomainConfigFile(NULL, - driver->stateDir, - vm->def->name)) == NULL) { - VIR_ERROR(_("Failed to read domain status for %s\n"), - vm->def->name); - goto next_error; - } - - status = qemudDomainStatusParseFile(NULL, driver->caps, config, 0); - if (status) { - vm->newDef = vm->def; - vm->def = status->def; - } else { - VIR_ERROR(_("Failed to parse domain status for %s\n"), - vm->def->name); - goto next_error; - } - - if ((rc = qemudOpenMonitor(NULL, driver, vm, status->monitorpath, 1)) != 0) { - VIR_ERROR(_("Failed to reconnect monitor for %s: %d\n"), - vm->def->name, rc); - goto next_error; - } - - if ((vm->logfile = qemudLogFD(NULL, driver->logDir, vm->def->name)) < 0) - goto next_error; - - if (vm->def->id >= driver->nextvmid) - driver->nextvmid = vm->def->id + 1; - - vm->state = status->state; - goto next; - -next_error: - /* we failed to reconnect the vm so remove it's traces */ - vm->def->id = -1; - qemudRemoveDomainStatus(NULL, driver, vm); - /* Restore orignal def, if we'd loaded a live one */ - if (vm->newDef) { - virDomainDefFree(vm->def); - vm->def = vm->newDef; - vm->newDef = NULL; - } -next: - virDomainObjUnlock(vm); - if (status) - VIR_FREE(status->monitorpath); - VIR_FREE(status); - VIR_FREE(config); - } - return 0; + virDomainObjPtr obj = driver->domains.objs[i]; + + virDomainObjLock(obj); + if (qemuReconnectDomain(driver, obj) < 0) { + /* If we can't get the monitor back, then kill the VM + * so user has ability to start it again later without + * danger of ending up running twice */ + qemudShutdownVMDaemon(NULL, driver, obj); + } + virDomainObjUnlock(obj); + } } static int @@ -513,14 +501,25 @@ qemudStartup(void) { goto error; } + /* Get all the running persistent or transient configs first */ + if (virDomainLoadAllConfigs(NULL, + qemu_driver->caps, + &qemu_driver->domains, + qemu_driver->stateDir, + NULL, + 1, NULL, NULL) < 0) + goto error; + + qemuReconnectDomains(qemu_driver); + + /* Then inactive persistent configs */ if (virDomainLoadAllConfigs(NULL, qemu_driver->caps, &qemu_driver->domains, qemu_driver->configDir, qemu_driver->autostartDir, - NULL, NULL) < 0) - goto error; - qemudReconnectVMs(qemu_driver); + 0, NULL, NULL) < 0) + goto error; qemuDriverUnlock(qemu_driver); qemudAutostartConfigs(qemu_driver); @@ -569,7 +568,7 @@ qemudReload(void) { &qemu_driver->domains, qemu_driver->configDir, qemu_driver->autostartDir, - qemudNotifyLoadDomain, qemu_driver); + 0, qemudNotifyLoadDomain, qemu_driver); qemuDriverUnlock(qemu_driver); qemudAutostartConfigs(qemu_driver); @@ -1331,6 +1330,7 @@ static int qemudStartVMDaemon(virConnect int pos = -1; char ebuf[1024]; char *pidfile = NULL; + int logfile; struct gemudHookData hookData; hookData.conn = conn; @@ -1372,7 +1372,7 @@ static int qemudStartVMDaemon(virConnect goto cleanup; } - if((vm->logfile = qemudLogFD(conn, driver->logDir, vm->def->name)) < 0) + if ((logfile = qemudLogFD(conn, driver->logDir, vm->def->name)) < 0) goto cleanup; emulator = vm->def->emulator; @@ -1421,29 +1421,29 @@ static int qemudStartVMDaemon(virConnect tmp = progenv; while (*tmp) { - if (safewrite(vm->logfile, *tmp, strlen(*tmp)) < 0) + if (safewrite(logfile, *tmp, strlen(*tmp)) < 0) VIR_WARN(_("Unable to write envv to logfile: %s\n"), virStrerror(errno, ebuf, sizeof ebuf)); - if (safewrite(vm->logfile, " ", 1) < 0) + if (safewrite(logfile, " ", 1) < 0) VIR_WARN(_("Unable to write envv to logfile: %s\n"), virStrerror(errno, ebuf, sizeof ebuf)); tmp++; } tmp = argv; while (*tmp) { - if (safewrite(vm->logfile, *tmp, strlen(*tmp)) < 0) + if (safewrite(logfile, *tmp, strlen(*tmp)) < 0) VIR_WARN(_("Unable to write argv to logfile: %s\n"), virStrerror(errno, ebuf, sizeof ebuf)); - if (safewrite(vm->logfile, " ", 1) < 0) + if (safewrite(logfile, " ", 1) < 0) VIR_WARN(_("Unable to write argv to logfile: %s\n"), virStrerror(errno, ebuf, sizeof ebuf)); tmp++; } - if (safewrite(vm->logfile, "\n", 1) < 0) + if (safewrite(logfile, "\n", 1) < 0) VIR_WARN(_("Unable to write argv to logfile: %s\n"), virStrerror(errno, ebuf, sizeof ebuf)); - if ((pos = lseek(vm->logfile, 0, SEEK_END)) < 0) + if ((pos = lseek(logfile, 0, SEEK_END)) < 0) VIR_WARN(_("Unable to seek to end of logfile: %s\n"), virStrerror(errno, ebuf, sizeof ebuf)); @@ -1451,7 +1451,7 @@ static int qemudStartVMDaemon(virConnect FD_SET(tapfds[i], &keepfd); ret = virExecDaemonize(conn, argv, progenv, &keepfd, &child, - stdin_fd, &vm->logfile, &vm->logfile, + stdin_fd, &logfile, &logfile, VIR_EXEC_NONBLOCK, qemudSecurityHook, &hookData, pidfile); @@ -1501,7 +1501,7 @@ static int qemudStartVMDaemon(virConnect (qemudInitCpus(conn, vm, migrateFrom) < 0) || (qemudInitPasswords(conn, driver, vm) < 0) || (qemudDomainSetMemoryBalloon(conn, vm, vm->def->memory) < 0) || - (qemudSaveDomainStatus(conn, qemu_driver, vm) < 0)) { + (virDomainSaveStatus(conn, driver->stateDir, vm) < 0)) { qemudShutdownVMDaemon(conn, driver, vm); ret = -1; /* No need for 'goto cleanup' now since qemudShutdownVMDaemon does enough */ @@ -1519,10 +1519,8 @@ cleanup: vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && vm->def->graphics[0]->data.vnc.autoport) vm->def->graphics[0]->data.vnc.port = -1; - if (vm->logfile != -1) { - close(vm->logfile); - vm->logfile = -1; - } + if (logfile != -1) + close(logfile); vm->def->id = -1; return -1; } @@ -1549,14 +1547,8 @@ static void qemudShutdownVMDaemon(virCon vm->monitorWatch = -1; } - if (close(vm->logfile) < 0) { - char ebuf[1024]; - VIR_WARN(_("Unable to close logfile: %s\n"), - virStrerror(errno, ebuf, sizeof ebuf)); - } if (vm->monitor != -1) close(vm->monitor); - vm->logfile = -1; vm->monitor = -1; /* shut it off for sure */ @@ -2260,7 +2252,7 @@ static int qemudDomainSuspend(virDomainP VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); VIR_FREE(info); } - if (qemudSaveDomainStatus(dom->conn, driver, vm) < 0) + if (virDomainSaveStatus(dom->conn, driver->stateDir, vm) < 0) goto cleanup; ret = 0; @@ -2310,7 +2302,7 @@ static int qemudDomainResume(virDomainPt VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); VIR_FREE(info); } - if (qemudSaveDomainStatus(dom->conn, driver, vm) < 0) + if (virDomainSaveStatus(dom->conn, driver->stateDir, vm) < 0) goto cleanup; ret = 0; @@ -4192,7 +4184,7 @@ static int qemudDomainAttachDevice(virDo goto cleanup; } - if (!ret && qemudSaveDomainStatus(dom->conn, driver, vm) < 0) + if (!ret && virDomainSaveStatus(dom->conn, driver->stateDir, vm) < 0) ret = -1; cleanup: @@ -4314,7 +4306,7 @@ static int qemudDomainDetachDevice(virDo qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT, "%s", _("only SCSI or virtio disk device can be detached dynamically")); - if (!ret && qemudSaveDomainStatus(dom->conn, driver, vm) < 0) + if (!ret && virDomainSaveStatus(dom->conn, driver->stateDir, vm) < 0) ret = -1; cleanup: diff --git a/src/security.h b/src/security.h --- a/src/security.h +++ b/src/security.h @@ -38,6 +38,8 @@ typedef int (*virSecurityDomainSetImageL virDomainDiskDefPtr disk); typedef int (*virSecurityDomainGenLabel) (virConnectPtr conn, virDomainObjPtr sec); +typedef int (*virSecurityDomainReserveLabel) (virConnectPtr conn, + virDomainObjPtr sec); typedef int (*virSecurityDomainGetLabel) (virConnectPtr conn, virDomainObjPtr vm, virSecurityLabelPtr sec); @@ -57,6 +59,7 @@ struct _virSecurityDriver { virSecurityDomainRestoreImageLabel domainRestoreSecurityImageLabel; virSecurityDomainSetImageLabel domainSetSecurityImageLabel; virSecurityDomainGenLabel domainGenSecurityLabel; + virSecurityDomainReserveLabel domainReserveSecurityLabel; virSecurityDomainGetLabel domainGetSecurityLabel; virSecurityDomainSetLabel domainSetSecurityLabel; virSecurityDomainRestoreLabel domainRestoreSecurityLabel; diff --git a/src/security_selinux.c b/src/security_selinux.c --- a/src/security_selinux.c +++ b/src/security_selinux.c @@ -216,6 +216,44 @@ done: } static int +SELinuxReserveSecurityLabel(virConnectPtr conn, + virDomainObjPtr vm) +{ + security_context_t pctx; + context_t ctx = NULL; + const char *mcs; + + if (getpidcon(vm->pid, &pctx) == -1) { + char ebuf[1024]; + virSecurityReportError(conn, VIR_ERR_ERROR, _("%s: error calling " + "getpidcon(): %s"), __func__, + virStrerror(errno, ebuf, sizeof ebuf)); + return -1; + } + + ctx = context_new(pctx); + VIR_FREE(pctx); + if (!ctx) + goto err; + + mcs = context_range_get(ctx); + if (!mcs) + goto err; + + mcsAdd(mcs); + + context_free(ctx); + + return 0; + +err: + context_free(ctx); + return -1; +} + + + +static int SELinuxSecurityDriverProbe(void) { return is_selinux_enabled() ? SECURITY_DRIVER_ENABLE : SECURITY_DRIVER_DISABLE; @@ -422,6 +460,7 @@ virSecurityDriver virSELinuxSecurityDriv .domainSetSecurityImageLabel = SELinuxSetSecurityImageLabel, .domainRestoreSecurityImageLabel = SELinuxRestoreSecurityImageLabel, .domainGenSecurityLabel = SELinuxGenSecurityLabel, + .domainReserveSecurityLabel = SELinuxReserveSecurityLabel, .domainGetSecurityLabel = SELinuxGetSecurityLabel, .domainRestoreSecurityLabel = SELinuxRestoreSecurityLabel, .domainSetSecurityLabel = SELinuxSetSecurityLabel, diff --git a/src/uml_driver.c b/src/uml_driver.c --- a/src/uml_driver.c +++ b/src/uml_driver.c @@ -399,7 +399,7 @@ umlStartup(void) { &uml_driver->domains, uml_driver->configDir, uml_driver->autostartDir, - NULL, NULL) < 0) + 0, NULL, NULL) < 0) goto error; umlAutostartConfigs(uml_driver); @@ -438,7 +438,7 @@ umlReload(void) { &uml_driver->domains, uml_driver->configDir, uml_driver->autostartDir, - NULL, NULL); + 0, NULL, NULL); umlAutostartConfigs(uml_driver); umlDriverUnlock(uml_driver); -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 3

[libvirt] libvirt one driver problem
by Thirupalu Annam 04 Jun '09

04 Jun '09

HI I have downloaded and tried with both libvirt-0-6-2 %libvirt-0-6-4 versions to build the One Driver from the source directory I executed the following commands to install libvirt >./autogen.sh -with-one=yes ------------>success >make -----------------------> also succeeded >make install -----------------------> also succeeded >virsh -c one:/// execution is giving me the following error hexagrid@hexagrid-desktop:~$ virsh -c one:/// error: failed to connect to the hypervisor hexagrid@hexagrid-desktop:~$ let me know whether I have performed the right steps to install or anything is missing. but I am able to connect to QEMU driver and the out of the execution is as follows hexagrid@hexagrid-desktop:~$ virsh -c qemu:///session Welcome to virsh, the virtualization interactive terminal. Type: 'help' for help with commands 'quit' to quit -- Thanks and Regards Thirupalu Annam ---------------------------------------- Hexagrid Networks Office :23350089, 40144654 Mob:9908377725

2 1

[libvirt] Libtool problem
by Eduardo Otubo 04 Jun '09

04 Jun '09

Hello all, I found this when compiling the last git commit (0a29f59e3b8e2c1fb797d2fa93831f21a3e1711e). This is the first compilation from my new Ubuntu instalation (9.04) so I cannot figure out if it is a libvirt problem or if it is any configuration problem. I configured the compilation with './configure --with-phyp=yes --with-xen=no' and the make exit is the following: otubo@lisa ~/develop/libvirt/src $ make make all-recursive make[1]: Entering directory `/home/otubo/develop/libvirt/src' Making all in gnulib/lib make[2]: Entering directory `/home/otubo/develop/libvirt/src/gnulib/lib' make all-recursive make[3]: Entering directory `/home/otubo/develop/libvirt/src/gnulib/lib' make[4]: Entering directory `/home/otubo/develop/libvirt/src/gnulib/lib' /bin/bash ../../mylibtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../intl -g -O2 -MT c-ctype.lo -MD -MP -MF .deps/c-ctype.Tpo -c -o c-ctype.lo c-ctype.c (CC) -o c-ctype.lo c-ctype.c /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 847: X--tag=CC: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 880: libtool: ignoring unknown tag : command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 847: X--mode=compile: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1014: *** Warning: inferring the mode of operation is deprecated.: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1015: *** Future versions of Libtool will require --mode=MODE be specified.: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: Xgcc: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-DHAVE_CONFIG_H: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-I.: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-I../..: No such file or directory /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-I../../intl: No such file or directory /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-g: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-O2: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-MT: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: Xc-ctype.lo: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-MD: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-MP: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-MF: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X.deps/c-ctype.Tpo: No such file or directory /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1158: X-c: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1211: Xc-ctype.lo: command not found /home/otubo/develop/libvirt/src/gnulib/lib/../../libtool: line 1216: libtool: compile: cannot determine name of library object from `': command not found make[4]: *** [c-ctype.lo] Error 1 make[4]: Leaving directory `/home/otubo/develop/libvirt/src/gnulib/lib' make[3]: *** [all-recursive] Error 1 make[3]: Leaving directory `/home/otubo/develop/libvirt/src/gnulib/lib' make[2]: *** [all] Error 2 make[2]: Leaving directory `/home/otubo/develop/libvirt/src/gnulib/lib' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/otubo/develop/libvirt/src' make: *** [all] Error 2 It seems there is a strange error form libtool, it's not recognizing some options, or some malformed options there is being passed to libtool. I am not acquainted to libtool so, if you guys could help me understanding this issue I would be very glad. Thanks, []'s -- Eduardo Otubo Software Engineer Linux Technology Center IBM Systems & Technology Group Mobile: +55 19 8135 0885 otubo(a)linux.vnet.ibm.com

2 1

[libvirt] [PATCH] forbid autostart on transcient networks
by Daniel Veillard 03 Jun '09

03 Jun '09

As the operation doesn't make sense, really, Daniel -- 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] Problem compiling libvirt-0.6.3
by Rohit Bhoj 03 Jun '09

03 Jun '09

Hello, I am facing problems getting the libvirt dependancies resolved. I am trying to compile libvirt-0.6.3 on a 64-bit SLES 11 machine. I have manually tried to resolve many dependancies, but am stuck at the GnuTLS library dependancy. The machine contains gnutls-2.4.1-24.15 installed, but still the configure script of libvirt gives an error saying : 'checking for gnutls_handshake in -lgnutls... no configure: error: You must install the GnuTLS library in order to compile and run libvirt' Can you please help me resolve this dependancy. Is there any place where I can get all the dependancy rpms needed for libvirt? Regards, Rohit Bhoj Bollywood news, movie reviews, film trailers and more! Go to http://in.movies.yahoo.com/

2 1

[libvirt] PATCH: Centralize some duplicated NUMA code
by Daniel P. Berrange 03 Jun '09

03 Jun '09

The QEMU and UML drivers currently duplicate a non-trivial chunk of NUMA code. This patch moves it all into src/nodeinfo.c which already has some other common NUMA code for capabilities initialization. In doing so it changes the functions to have a common 'nodeXXXX' naming scheme, to avoid clash with the public APIs using 'virXXXX'. Finally, these central functions can be directly used in the driver function tables, so we kill off some pointless wrappers and just add these funtions directly to drivers. libvirt_private.syms | 6 +- lxc_conf.c | 2 nodeinfo.c | 127 +++++++++++++++++++++++++++++++++++++++++++-------- nodeinfo.h | 11 +++- openvz_conf.c | 7 -- openvz_driver.c | 7 -- qemu_conf.c | 2 qemu_driver.c | 97 ++------------------------------------ uml_conf.c | 2 uml_driver.c | 84 +-------------------------------- vbox/vbox_tmpl.c | 7 -- 11 files changed, 138 insertions(+), 214 deletions(-) Daniel diff -r 91d1b6ebc112 src/libvirt_private.syms --- a/src/libvirt_private.syms Wed May 27 22:57:21 2009 +0100 +++ b/src/libvirt_private.syms Thu May 28 11:33:16 2009 +0100 @@ -220,8 +220,10 @@ virNetworkObjUnlock; # nodeinfo.h -virNodeInfoPopulate; -virCapsInitNUMA; +nodeGetInfo; +nodeCapsInitNUMA; +nodeGetCellsFreeMemory; +nodeGetFreeMemory; # node_device_conf.h diff -r 91d1b6ebc112 src/lxc_conf.c --- a/src/lxc_conf.c Wed May 27 22:57:21 2009 +0100 +++ b/src/lxc_conf.c Thu May 28 11:33:16 2009 +0100 @@ -46,7 +46,7 @@ virCapsPtr lxcCapsInit(void) 0, 0)) == NULL) goto no_memory; - if (virCapsInitNUMA(caps) < 0) + if (nodeCapsInitNUMA(caps) < 0) goto no_memory; /* XXX shouldn't 'borrow' KVM's prefix */ diff -r 91d1b6ebc112 src/nodeinfo.c --- a/src/nodeinfo.c Wed May 27 22:57:21 2009 +0100 +++ b/src/nodeinfo.c Thu May 28 11:33:16 2009 +0100 @@ -48,6 +48,10 @@ #define VIR_FROM_THIS VIR_FROM_NONE +#define nodeReportError(conn, code, fmt...) \ + virReportErrorHelper(conn, VIR_FROM_NONE, code, __FILE__, \ + __FUNCTION__, __LINE__, fmt) + #ifdef __linux__ #define CPUINFO_PATH "/proc/cpuinfo" @@ -73,9 +77,8 @@ int linuxNodeInfoCPUPopulate(virConnectP while (*buf && c_isspace(*buf)) buf++; if (*buf != ':') { - virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, - VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - "%s", _("parsing cpuinfo processor")); + nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("parsing cpuinfo processor")); return -1; } nodeinfo->cpus++; @@ -86,9 +89,8 @@ int linuxNodeInfoCPUPopulate(virConnectP while (*buf && c_isspace(*buf)) buf++; if (*buf != ':' || !buf[1]) { - virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, - VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - "%s", _("parsing cpuinfo cpu MHz")); + nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("parsing cpuinfo cpu MHz")); return -1; } if (virStrToLong_ui(buf+1, &p, 10, &ui) == 0 @@ -102,9 +104,8 @@ int linuxNodeInfoCPUPopulate(virConnectP while (*buf && c_isspace(*buf)) buf++; if (*buf != ':' || !buf[1]) { - virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, - VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - "parsing cpuinfo cpu cores %c", *buf); + nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + "parsing cpuinfo cpu cores %c", *buf); return -1; } if (virStrToLong_ui(buf+1, &p, 10, &id) == 0 @@ -115,9 +116,8 @@ int linuxNodeInfoCPUPopulate(virConnectP } if (!nodeinfo->cpus) { - virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, - VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - "%s", _("no cpus found")); + nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("no cpus found")); return -1; } @@ -133,8 +133,8 @@ int linuxNodeInfoCPUPopulate(virConnectP #endif -int virNodeInfoPopulate(virConnectPtr conn, - virNodeInfoPtr nodeinfo) { +int nodeGetInfo(virConnectPtr conn, + virNodeInfoPtr nodeinfo) { #ifdef HAVE_UNAME struct utsname info; @@ -170,9 +170,8 @@ int virNodeInfoPopulate(virConnectPtr co } #else /* XXX Solaris will need an impl later if they port QEMU driver */ - virRaiseError(conn, NULL, NULL, 0, VIR_ERR_INTERNAL_ERROR, - VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - "%s:%s not implemented on this platform\n", __FILE__, __FUNCTION__); + nodeError(conn, VIR_ERR_NO_SUPPORT, "%s" + _("node info not implemented on this platform")); return -1; #endif } @@ -189,7 +188,7 @@ int virNodeInfoPopulate(virConnectPtr co (((mask)[((cpu) / n_bits(*(mask)))] >> ((cpu) % n_bits(*(mask)))) & 1) int -virCapsInitNUMA(virCapsPtr caps) +nodeCapsInitNUMA(virCapsPtr caps) { int n; unsigned long *mask = NULL; @@ -237,6 +236,96 @@ cleanup: VIR_FREE(mask); return ret; } + + +int +nodeGetCellsFreeMemory(virConnectPtr conn, + unsigned long long *freeMems, + int startCell, + int maxCells) +{ + int n, lastCell, numCells; + int ret = -1; + int maxCell; + + if (numa_available() < 0) { + nodeReportError(conn, VIR_ERR_NO_SUPPORT, + "%s", _("NUMA not supported on this host")); + goto cleanup; + } + maxCell = numa_max_node(); + if (startCell > maxCell) { + nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("start cell %d out of range (0-%d)"), + startCell, maxCell); + goto cleanup; + } + lastCell = startCell + maxCells - 1; + if (lastCell > maxCell) + lastCell = maxCell; + + for (numCells = 0, n = startCell ; n <= lastCell ; n++) { + long long mem; + if (numa_node_size64(n, &mem) < 0) { + nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("Failed to query NUMA free memory")); + goto cleanup; + } + freeMems[numCells++] = mem; + } + ret = numCells; + +cleanup: + return ret; +} + +unsigned long long +nodeGetFreeMemory(virConnectPtr conn) +{ + unsigned long long freeMem = 0; + int n; + + if (numa_available() < 0) { + nodeReportError(conn, VIR_ERR_NO_SUPPORT, + "%s", _("NUMA not supported on this host")); + goto cleanup; + } + + for (n = 0 ; n <= numa_max_node() ; n++) { + long long mem; + if (numa_node_size64(n, &mem) < 0) { + nodeReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("Failed to query NUMA free memory")); + goto cleanup; + } + freeMem += mem; + } + +cleanup: + return freeMem; +} + #else -int virCapsInitNUMA(virCapsPtr caps ATTRIBUTE_UNUSED) { return 0; } +int nodeCapsInitNUMA(virCapsPtr caps ATTRIBUTE_UNUSED) { + return 0; +} + +int nodeGetCellsFreeMemory(virConnectPtr conn, + unsigned long long *freeMems ATTRIBUTE_UNUSED, + int startCell ATTRIBUTE_UNUSED, + int maxCells ATTRIBUTE_UNUSED) +{ + nodeReportError(conn, VIR_ERR_NO_SUPPORT, "%s", + _("NUMA memory information not available on this platform")); + return -1; +} + +unsigned long long nodeGetFreeMemory(virConnectPtr conn) +{ + nodeReportError(conn, VIR_ERR_NO_SUPPORT, "%s", + _("NUMA memory information not available on this platform")); + return 0; +} #endif + + diff -r 91d1b6ebc112 src/nodeinfo.h --- a/src/nodeinfo.h Wed May 27 22:57:21 2009 +0100 +++ b/src/nodeinfo.h Thu May 28 11:33:16 2009 +0100 @@ -27,7 +27,14 @@ #include "libvirt/libvirt.h" #include "capabilities.h" -int virNodeInfoPopulate(virConnectPtr conn, virNodeInfoPtr nodeinfo); -int virCapsInitNUMA(virCapsPtr caps); +int nodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo); +int nodeCapsInitNUMA(virCapsPtr caps); + + +int nodeGetCellsFreeMemory(virConnectPtr conn, + unsigned long long *freeMems, + int startCell, + int maxCells); +unsigned long long nodeGetFreeMemory(virConnectPtr conn); #endif /* __VIR_NODEINFO_H__*/ diff -r 91d1b6ebc112 src/openvz_conf.c --- a/src/openvz_conf.c Wed May 27 22:57:21 2009 +0100 +++ b/src/openvz_conf.c Thu May 28 11:33:16 2009 +0100 @@ -148,7 +148,7 @@ virCapsPtr openvzCapsInit(void) 0, 0)) == NULL) goto no_memory; - if (virCapsInitNUMA(caps) < 0) + if (nodeCapsInitNUMA(caps) < 0) goto no_memory; virCapabilitiesSetMacPrefix(caps, (unsigned char[]){ 0x52, 0x54, 0x00 }); @@ -527,11 +527,8 @@ openvzGetNodeCPUs(void) { virNodeInfo nodeinfo; - if (virNodeInfoPopulate(NULL, &nodeinfo) < 0) { - openvzError(NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("Cound not read nodeinfo")); + if (nodeGetInfo(NULL, &nodeinfo) < 0) return 0; - } return nodeinfo.cpus; } diff -r 91d1b6ebc112 src/openvz_driver.c --- a/src/openvz_driver.c Wed May 27 22:57:21 2009 +0100 +++ b/src/openvz_driver.c Thu May 28 11:33:16 2009 +0100 @@ -1136,11 +1136,6 @@ static const char *openvzGetType(virConn return strdup("OpenVZ"); } -static int openvzGetNodeInfo(virConnectPtr conn, - virNodeInfoPtr nodeinfo) { - return virNodeInfoPopulate(conn, nodeinfo); -} - static char *openvzGetCapabilities(virConnectPtr conn) { struct openvz_driver *driver = conn->privateData; char *ret; @@ -1316,7 +1311,7 @@ static virDriver openvzDriver = { openvzGetVersion, /* version */ NULL, /* getHostname */ openvzGetMaxVCPUs, /* getMaxVcpus */ - openvzGetNodeInfo, /* nodeGetInfo */ + nodeGetInfo, /* nodeGetInfo */ openvzGetCapabilities, /* getCapabilities */ openvzListDomains, /* listDomains */ openvzNumDomains, /* numOfDomains */ diff -r 91d1b6ebc112 src/qemu_conf.c --- a/src/qemu_conf.c Wed May 27 22:57:21 2009 +0100 +++ b/src/qemu_conf.c Thu May 28 11:33:16 2009 +0100 @@ -377,7 +377,7 @@ virCapsPtr qemudCapsInit(void) { /* Using KVM's mac prefix for QEMU too */ virCapabilitiesSetMacPrefix(caps, (unsigned char[]){ 0x52, 0x54, 0x00 }); - if (virCapsInitNUMA(caps) < 0) + if (nodeCapsInitNUMA(caps) < 0) goto no_memory; virCapabilitiesAddHostMigrateTransport(caps, diff -r 91d1b6ebc112 src/qemu_driver.c --- a/src/qemu_driver.c Wed May 27 22:57:21 2009 +0100 +++ b/src/qemu_driver.c Thu May 28 11:33:16 2009 +0100 @@ -44,11 +44,6 @@ #include <sys/wait.h> #include <sys/ioctl.h> -#if HAVE_NUMACTL -#define NUMA_VERSION1_COMPATIBILITY 1 -#include <numa.h> -#endif - #if HAVE_SCHED_H #include <sched.h> #endif @@ -1099,7 +1094,7 @@ qemudInitCpus(virConnectPtr conn, int i, maxcpu = QEMUD_CPUMASK_LEN; virNodeInfo nodeinfo; - if (virNodeInfoPopulate(conn, &nodeinfo) < 0) + if (nodeGetInfo(conn, &nodeinfo) < 0) return -1; /* setaffinity fails if you set bits for CPUs which @@ -1869,11 +1864,6 @@ static int qemudGetMaxVCPUs(virConnectPt return -1; } -static int qemudGetNodeInfo(virConnectPtr conn, - virNodeInfoPtr nodeinfo) { - return virNodeInfoPopulate(conn, nodeinfo); -} - static char *qemudGetCapabilities(virConnectPtr conn) { struct qemud_driver *driver = conn->privateData; @@ -1890,76 +1880,6 @@ static char *qemudGetCapabilities(virCon } -#if HAVE_NUMACTL -static int -qemudNodeGetCellsFreeMemory(virConnectPtr conn, - unsigned long long *freeMems, - int startCell, - int maxCells) -{ - int n, lastCell, numCells; - int ret = -1; - int maxCell; - - if (numa_available() < 0) { - qemudReportError(conn, NULL, NULL, VIR_ERR_NO_SUPPORT, - "%s", _("NUMA not supported on this host")); - goto cleanup; - } - maxCell = numa_max_node(); - if (startCell > maxCell) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("start cell %d out of range (0-%d)"), - startCell, maxCell); - goto cleanup; - } - lastCell = startCell + maxCells - 1; - if (lastCell > maxCell) - lastCell = maxCell; - - for (numCells = 0, n = startCell ; n <= lastCell ; n++) { - long long mem; - if (numa_node_size64(n, &mem) < 0) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("Failed to query NUMA free memory")); - goto cleanup; - } - freeMems[numCells++] = mem; - } - ret = numCells; - -cleanup: - return ret; -} - -static unsigned long long -qemudNodeGetFreeMemory (virConnectPtr conn) -{ - unsigned long long freeMem = 0; - int n; - - if (numa_available() < 0) { - qemudReportError(conn, NULL, NULL, VIR_ERR_NO_SUPPORT, - "%s", _("NUMA not supported on this host")); - goto cleanup; - } - - for (n = 0 ; n <= numa_max_node() ; n++) { - long long mem; - if (numa_node_size64(n, &mem) < 0) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("Failed to query NUMA free memory")); - goto cleanup; - } - freeMem += mem; - } - -cleanup: - return freeMem; -} - -#endif - static int qemudGetProcessInfo(unsigned long long *cpuTime, int pid) { char proc[PATH_MAX]; FILE *pidinfo; @@ -2984,7 +2904,7 @@ qemudDomainPinVcpu(virDomainPtr dom, goto cleanup; } - if (virNodeInfoPopulate(dom->conn, &nodeinfo) < 0) + if (nodeGetInfo(dom->conn, &nodeinfo) < 0) goto cleanup; maxcpu = maplen * 8; @@ -3046,7 +2966,7 @@ qemudDomainGetVcpus(virDomainPtr dom, goto cleanup; } - if (virNodeInfoPopulate(dom->conn, &nodeinfo) < 0) + if (nodeGetInfo(dom->conn, &nodeinfo) < 0) goto cleanup; maxcpu = maplen * 8; @@ -5338,7 +5258,7 @@ static virDriver qemuDriver = { qemudGetVersion, /* version */ qemudGetHostname, /* getHostname */ qemudGetMaxVCPUs, /* getMaxVcpus */ - qemudGetNodeInfo, /* nodeGetInfo */ + nodeGetInfo, /* nodeGetInfo */ qemudGetCapabilities, /* getCapabilities */ qemudListDomains, /* listDomains */ qemudNumDomains, /* numOfDomains */ @@ -5392,13 +5312,8 @@ static virDriver qemuDriver = { qemudDomainInterfaceStats, /* domainInterfaceStats */ qemudDomainBlockPeek, /* domainBlockPeek */ qemudDomainMemoryPeek, /* domainMemoryPeek */ -#if HAVE_NUMACTL - qemudNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - qemudNodeGetFreeMemory, /* getFreeMemory */ -#else - NULL, /* nodeGetCellsFreeMemory */ - NULL, /* getFreeMemory */ -#endif + nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ + nodeGetFreeMemory, /* getFreeMemory */ qemudDomainEventRegister, /* domainEventRegister */ qemudDomainEventDeregister, /* domainEventDeregister */ qemudDomainMigratePrepare2, /* domainMigratePrepare2 */ diff -r 91d1b6ebc112 src/uml_conf.c --- a/src/uml_conf.c Wed May 27 22:57:21 2009 +0100 +++ b/src/uml_conf.c Thu May 28 11:33:16 2009 +0100 @@ -62,7 +62,7 @@ virCapsPtr umlCapsInit(void) { 0, 0)) == NULL) goto no_memory; - if (virCapsInitNUMA(caps) < 0) + if (nodeCapsInitNUMA(caps) < 0) goto no_memory; if ((guest = virCapabilitiesAddGuest(caps, diff -r 91d1b6ebc112 src/uml_driver.c --- a/src/uml_driver.c Wed May 27 22:57:21 2009 +0100 +++ b/src/uml_driver.c Thu May 28 11:33:16 2009 +0100 @@ -45,11 +45,6 @@ #include <sys/ioctl.h> #include <sys/inotify.h> -#if HAVE_NUMACTL -#define NUMA_VERSION1_COMPATIBILITY 1 -#include <numa.h> -#endif - #include "uml_driver.h" #include "uml_conf.h" #include "event.h" @@ -935,11 +930,6 @@ static const char *umlGetType(virConnect return "UML"; } -static int umlGetNodeInfo(virConnectPtr conn, - virNodeInfoPtr nodeinfo) { - return virNodeInfoPopulate(conn, nodeinfo); -} - static char *umlGetCapabilities(virConnectPtr conn) { struct uml_driver *driver = (struct uml_driver *)conn->privateData; @@ -954,69 +944,6 @@ static char *umlGetCapabilities(virConne } -#if HAVE_NUMACTL -static int -umlNodeGetCellsFreeMemory(virConnectPtr conn, - unsigned long long *freeMems, - int startCell, - int maxCells) -{ - int n, lastCell, numCells; - int ret = -1; - - if (numa_available() < 0) { - umlReportError(conn, NULL, NULL, VIR_ERR_NO_SUPPORT, - "%s", _("NUMA not supported on this host")); - goto cleanup; - } - lastCell = startCell + maxCells - 1; - if (lastCell > numa_max_node()) - lastCell = numa_max_node(); - - for (numCells = 0, n = startCell ; n <= lastCell ; n++) { - long long mem; - if (numa_node_size64(n, &mem) < 0) { - umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("Failed to query NUMA free memory")); - goto cleanup; - } - freeMems[numCells++] = mem; - } - ret = numCells; - -cleanup: - return ret; -} - -static unsigned long long -umlNodeGetFreeMemory (virConnectPtr conn) -{ - unsigned long long freeMem = 0; - unsigned long long ret = -1; - int n; - - if (numa_available() < 0) { - umlReportError(conn, NULL, NULL, VIR_ERR_NO_SUPPORT, - "%s", _("NUMA not supported on this host")); - goto cleanup; - } - - for (n = 0 ; n <= numa_max_node() ; n++) { - long long mem; - if (numa_node_size64(n, &mem) < 0) { - umlReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("Failed to query NUMA free memory")); - goto cleanup; - } - freeMem += mem; - } - ret = freeMem; - -cleanup: - return ret; -} - -#endif static int umlGetProcessInfo(unsigned long long *cpuTime, int pid) { char proc[PATH_MAX]; @@ -1826,7 +1753,7 @@ static virDriver umlDriver = { umlGetVersion, /* version */ umlGetHostname, /* getHostname */ NULL, /* getMaxVcpus */ - umlGetNodeInfo, /* nodeGetInfo */ + nodeGetInfo, /* nodeGetInfo */ umlGetCapabilities, /* getCapabilities */ umlListDomains, /* listDomains */ umlNumDomains, /* numOfDomains */ @@ -1875,13 +1802,8 @@ static virDriver umlDriver = { NULL, /* domainInterfaceStats */ umlDomainBlockPeek, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ -#if HAVE_NUMACTL - umlNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ - umlNodeGetFreeMemory, /* getFreeMemory */ -#else - NULL, /* nodeGetCellsFreeMemory */ - NULL, /* getFreeMemory */ -#endif + virNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ + virNodeGetFreeMemory, /* getFreeMemory */ NULL, /* domainEventRegister */ NULL, /* domainEventDeregister */ NULL, /* domainMigratePrepare2 */ diff -r 91d1b6ebc112 src/vbox/vbox_tmpl.c --- a/src/vbox/vbox_tmpl.c Wed May 27 22:57:21 2009 +0100 +++ b/src/vbox/vbox_tmpl.c Thu May 28 11:33:16 2009 +0100 @@ -186,7 +186,7 @@ static virCapsPtr vboxCapsInit(void) { 0, 0)) == NULL) goto no_memory; - if (virCapsInitNUMA(caps) < 0) + if (nodeCapsInitNUMA(caps) < 0) goto no_memory; virCapabilitiesSetMacPrefix(caps, (unsigned char[]){ 0x08, 0x00, 0x27 }); @@ -413,9 +413,6 @@ static int vboxGetMaxVcpus(virConnectPtr return ret; } -static int vboxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) { - return virNodeInfoPopulate(conn, nodeinfo); -} static char *vboxGetCapabilities(virConnectPtr conn) { vboxGlobalData *data = conn->privateData; @@ -4909,7 +4906,7 @@ virDriver NAME(Driver) = { .version = vboxGetVersion, .getHostname = vboxGetHostname, .getMaxVcpus = vboxGetMaxVcpus, - .nodeGetInfo = vboxNodeGetInfo, + .nodeGetInfo = nodeGetInfo, .getCapabilities = vboxGetCapabilities, .listDomains = vboxListDomains, .numOfDomains = vboxNumOfDomains, -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 3

[libvirt] PATCH: Include OS driver name in device information
by Daniel P. Berrange 03 Jun '09

03 Jun '09

This patch extends the node device XML from $ virsh nodedev-dumpxml pci_8086_27d6 <device> <name>pci_8086_27d6</name> <parent>computer</parent> <capability type='pci'> <domain>0</domain> <bus>0</bus> <slot>28</slot> <function>3</function> <product id='0x27d6'>82801G (ICH7 Family) PCI Express Port 4</product> <vendor id='0x8086'>Intel Corporation</vendor> </capability> </device> To, also include the operating system driver name. $ virsh nodedev-dumpxml pci_8086_27d6 <device> <name>pci_8086_27d6</name> <parent>computer</parent> <driver> <name>pcieport-driver</name> </driver> <capability type='pci'> <domain>0</domain> <bus>0</bus> <slot>28</slot> <function>3</function> <product id='0x27d6'>82801G (ICH7 Family) PCI Express Port 4</product> <vendor id='0x8086'>Intel Corporation</vendor> </capability> </device> We're not defining any particular semantics for the driver name, it is just a opaque string following rules of the OS in question. Daniel diff -r ec78a5d6c00c src/node_device.c --- a/src/node_device.c Thu May 28 14:42:24 2009 +0100 +++ b/src/node_device.c Thu May 28 16:00:12 2009 +0100 @@ -46,6 +46,60 @@ static int dev_has_cap(const virNodeDevi return 0; } +#ifdef __linux__ +static int update_driver_name(virConnectPtr conn, + virNodeDeviceObjPtr dev) +{ + char *driver_link = NULL; + char devpath[PATH_MAX]; + char *p; + int ret = -1; + int n; + + VIR_FREE(dev->def->driver); + + if (virAsprintf(&driver_link, "%s/driver", dev->devicePath) < 0) { + virReportOOMError(conn); + goto cleanup; + } + + /* Some devices don't have an explicit driver, so just return + without a name */ + if (access(driver_link, R_OK) < 0) { + ret = 0; + goto cleanup; + } + + if ((n = readlink(driver_link, devpath, sizeof devpath)) < 0) { + virReportSystemError(conn, errno, + _("cannot resolve driver link %s"), driver_link); + goto cleanup; + } + devpath[n] = '\0'; + + p = strrchr(devpath, '/'); + if (p) { + dev->def->driver = strdup(p+1); + if (!dev->def->driver) { + virReportOOMError(conn); + goto cleanup; + } + } + ret = 0; + +cleanup: + VIR_FREE(driver_link); + return ret; +} +#else +/* XXX: Implement me for non-linux */ +static int update_driver_name(virConnectPtr conn ATTRIBUTE_UNUSED, + virNodeDeviceObjPtr dev ATTRIBUTE_UNUSED) +{ + return 0; +} +#endif + void nodeDeviceLock(virDeviceMonitorStatePtr driver) { @@ -150,6 +204,7 @@ static char *nodeDeviceDumpXML(virNodeDe goto cleanup; } + update_driver_name(dev->conn, obj); ret = virNodeDeviceDefFormat(dev->conn, obj->def); cleanup: diff -r ec78a5d6c00c src/node_device_conf.c --- a/src/node_device_conf.c Thu May 28 14:42:24 2009 +0100 +++ b/src/node_device_conf.c Thu May 28 16:00:12 2009 +0100 @@ -78,6 +78,7 @@ void virNodeDeviceDefFree(virNodeDeviceD VIR_FREE(def->name); VIR_FREE(def->parent); + VIR_FREE(def->driver); caps = def->caps; while (caps) { @@ -94,6 +95,7 @@ void virNodeDeviceObjFree(virNodeDeviceO if (!dev) return; + VIR_FREE(dev->devicePath); virNodeDeviceDefFree(dev->def); if (dev->privateFree) (*dev->privateFree)(dev->privateData); @@ -191,6 +193,11 @@ char *virNodeDeviceDefFormat(virConnectP if (def->parent) virBufferEscapeString(&buf, " <parent>%s</parent>\n", def->parent); + if (def->driver) { + virBufferAddLit(&buf, " <driver>\n"); + virBufferEscapeString(&buf, " <name>%s</name>\n", def->driver); + virBufferAddLit(&buf, " </driver>\n"); + } for (caps = def->caps; caps; caps = caps->next) { char uuidstr[VIR_UUID_STRING_BUFLEN]; diff -r ec78a5d6c00c src/node_device_conf.h --- a/src/node_device_conf.h Thu May 28 14:42:24 2009 +0100 +++ b/src/node_device_conf.h Thu May 28 16:00:12 2009 +0100 @@ -136,6 +136,7 @@ typedef virNodeDeviceDef *virNodeDeviceD struct _virNodeDeviceDef { char *name; /* device name (unique on node) */ char *parent; /* optional parent device name */ + char *driver; /* optional driver name */ virNodeDevCapsDefPtr caps; /* optional device capabilities */ }; @@ -145,6 +146,7 @@ typedef virNodeDeviceObj *virNodeDeviceO struct _virNodeDeviceObj { virMutex lock; + char *devicePath; /* OS specific path to device metadat, eg sysfs */ virNodeDeviceDefPtr def; /* device definition */ void *privateData; /* driver-specific private data */ void (*privateFree)(void *data); /* destructor for private data */ diff -r ec78a5d6c00c src/node_device_hal.c --- a/src/node_device_hal.c Thu May 28 14:42:24 2009 +0100 +++ b/src/node_device_hal.c Thu May 28 16:00:12 2009 +0100 @@ -413,6 +413,7 @@ static void dev_create(const char *udi) const char *name = hal_name(udi); int rv; char *privData = strdup(udi); + char *devicePath = NULL; if (!privData) return; @@ -439,15 +440,22 @@ static void dev_create(const char *udi) if (def->caps == NULL) goto cleanup; + /* Some devices don't have a path in sysfs, so ignore failure */ + get_str_prop(ctx, udi, "linux.sysfs_path", &devicePath); + dev = virNodeDeviceAssignDef(NULL, &driverState->devs, def); - if (!dev) + if (!dev) { + VIR_FREE(devicePath); goto failure; + } dev->privateData = privData; dev->privateFree = free_udi; + dev->devicePath = devicePath; + virNodeDeviceObjUnlock(dev); nodeDeviceUnlock(driverState); -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 3

[libvirt] Anyway to configure multiple boot devices?
by Matty 03 Jun '09

03 Jun '09

I am running a number of KVM guests on a physical machine, and want to configure the hosts to boot from the network if the internal disk isn't bootable. After reading through a number of documents, I came across the following bug report: https://bugzilla.redhat.com/show_bug.cgi?id=472236 According to that document (and the libvirt Domain XML format document), I should be able to configure two boot device statements by adding two boot tags to the domain configuration: <os> <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> <boot dev='network'/> </os> When I attempt to start a guest with this configuration (I added the new line using virsh's edit command), I receive the following error: virsh # start kvmnode2 libvir: QEMU error : internal error Failure while reading monitor startup output: Input/output error error: Failed to start domain kvmnode2 Has anyone bumped into this? I checked the KVM, libvirt and fedora ML archives, but wasn't able to locate a solution to this. I am using Fedora 10 with the latest updates. Thanks for any insight, - Ryan

2 1

[libvirt] Upgrade and PCI Passthrough
by Aaron Clausen 03 Jun '09

03 Jun '09

I upgraded my Debian host to KVM 72 and libvirt 0.6.3-4 in the hopes of gaining use of PCI passthrough. I suspect that the upgrade may have gone a bit awry, because when I attempt to enable passthrough, I get the following error: /usr/bin/kvm: invalid option -- '-pcidevice' Is the version of KVM that I installed too old or is something else going on? -- Aaron Clausen mightymartianca(a)gmail.com

2 1

[libvirt] PATCH: Wire up NUMA APIs in VirtualBox driver
by Daniel P. Berrange 02 Jun '09

02 Jun '09

This patch simply wires up the shared NUMA API implementations in the virtualbox driver Daniel diff -r 8b34df5f9ddf src/vbox/vbox_tmpl.c --- a/src/vbox/vbox_tmpl.c Thu May 28 11:55:49 2009 +0100 +++ b/src/vbox/vbox_tmpl.c Thu May 28 11:56:10 2009 +0100 @@ -4955,8 +4955,8 @@ virDriver NAME(Driver) = { NULL, /* domainInterfaceStats */ NULL, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ - NULL, /* nodeGetCellsFreeMemory */ - NULL, /* getFreeMemory */ + nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ + nodeGetFreeMemory, /* getFreeMemory */ NULL, /* domainEventRegister */ NULL, /* domainEventDeregister */ NULL, /* domainMigratePrepare2 */ -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 2