- Devel - libvirt List Archives

[libvirt] [PATCH] rename "blocked" to "idle"
by John Levon 19 Sep '08

19 Sep '08

<movement> can we please please rename "blocked" to "idle" <movement> literally /everybody/ is confused by that ... <dansmith> I'm not opposed to changing it, mind you, because I feel the indirect pain of explaining it to others too :) <movement> actually, normally, the question is "my guest isn't running" <dansmith> yeah regards john Index: src/virsh.c =================================================================== RCS file: /data/cvs/libvirt/src/virsh.c,v retrieving revision 1.163 diff -r1.163 virsh.c 6275c6275 < return gettext_noop("blocked"); --- > return gettext_noop("idle"); 6297c6297 < return gettext_noop("blocked"); --- > return gettext_noop("idle");

3 4

[libvirt] [PATCH] Determine kvm max vcpus via version number
by Cole Robinson 19 Sep '08

19 Sep '08

The attached patch is a slimmed down version of a patch I posted a while back. This expands qemu help message parsing to look for a kvm version number, which can be used to determine maximum supported vcpus. A kvmVersion field is added to the qemu_driver structure, and a check to determine the version is added to the libvirtd start up routine. If the kvm version isn't found (say if kvm isn't installed), kvmVersion is set to 0. This is against Guido Gunther's patch "maxVCPU runtime detection": his method takes precendence in the code if it's available. Comments welcome. Thanks, Cole diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 22a99ec..f79137f 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -418,13 +418,14 @@ virCapsPtr qemudCapsInit(void) { int qemudExtractVersionInfo(const char *qemu, unsigned int *retversion, + unsigned int *retkvmversion, unsigned int *retflags) { const char *const qemuarg[] = { qemu, "-help", NULL }; const char *const qemuenv[] = { "LC_ALL=C", NULL }; pid_t child; int newstdout = -1; - int ret = -1, status; - unsigned int major, minor, micro; + int ret = -1, scanret = -1, status; + unsigned int major, minor, micro, kvmver; unsigned int version; unsigned int flags = 0; @@ -443,10 +444,12 @@ int qemudExtractVersionInfo(const char *qemu, if (len < 0) goto cleanup2; - if (sscanf(help, "QEMU PC emulator version %u.%u.%u", - &major, &minor, &micro) != 3) { + scanret = sscanf(help, "QEMU PC emulator version %u.%u.%u (kvm-%u", + &major, &minor, &micro, &kvmver); + if (scanret == 3) + kvmver = 0; + else if (scanret != 4) goto cleanup2; - } version = (major * 1000 * 1000) + (minor * 1000) + micro; @@ -465,6 +468,8 @@ int qemudExtractVersionInfo(const char *qemu, if (retversion) *retversion = version; + if (retkvmversion) + *retkvmversion = kvmver; if (retflags) *retflags = flags; @@ -472,6 +477,7 @@ int qemudExtractVersionInfo(const char *qemu, qemudDebug("Version %d %d %d Cooked version: %d, with flags ? %d", major, minor, micro, version, flags); + qemudDebug("KVM version: %d", kvmver); cleanup2: VIR_FREE(help); @@ -500,28 +506,34 @@ rewait: return ret; } -int qemudExtractVersion(virConnectPtr conn, - struct qemud_driver *driver) { +int qemudExtractVersion(struct qemud_driver *driver) { const char *binary; struct stat sb; + struct utsname ut; if (driver->qemuVersion > 0) return 0; + uname (&ut); + if ((binary = virCapabilitiesDefaultGuestEmulator(driver->caps, "hvm", + ut.machine, + "kvm")) == NULL && + (binary = virCapabilitiesDefaultGuestEmulator(driver->caps, + "hvm", "i686", "qemu")) == NULL) return -1; if (stat(binary, &sb) < 0) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("Cannot find QEMU binary %s: %s"), binary, - strerror(errno)); return -1; } - if (qemudExtractVersionInfo(binary, &driver->qemuVersion, NULL) < 0) { + if (qemudExtractVersionInfo(binary, + &driver->qemuVersion, + &driver->kvmVersion, + NULL) < 0) { return -1; } diff --git a/src/qemu_conf.h b/src/qemu_conf.h index 88dfade..8d429fb 100644 --- a/src/qemu_conf.h +++ b/src/qemu_conf.h @@ -50,6 +50,7 @@ enum qemud_cmd_flags { /* Main driver state */ struct qemud_driver { unsigned int qemuVersion; + unsigned int kvmVersion; int nextvmid; virDomainObjPtr domains; @@ -83,10 +84,10 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, virCapsPtr qemudCapsInit (void); -int qemudExtractVersion (virConnectPtr conn, - struct qemud_driver *driver); +int qemudExtractVersion (struct qemud_driver *driver); int qemudExtractVersionInfo (const char *qemu, unsigned int *version, + unsigned int *kvmversion, unsigned int *flags); int qemudBuildCommandLine (virConnectPtr conn, diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 0c04da6..d1b9d7c 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -240,6 +240,12 @@ qemudStartup(void) { if ((qemu_driver->caps = qemudCapsInit()) == NULL) goto out_of_memory; + // Dependent on capabilities being initialized + if (qemudExtractVersion(qemu_driver) < 0) { + qemudShutdown(); + return -1; + } + if (qemudLoadDriverConfig(qemu_driver, driverConf) < 0) { qemudShutdown(); return -1; @@ -923,7 +929,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, } if (qemudExtractVersionInfo(vm->def->emulator, - NULL, + NULL, NULL, &qemuCmdFlags) < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("Cannot determine QEMU argv syntax %s"), @@ -1793,11 +1799,20 @@ static const char *qemudGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { } -static int kvmGetMaxVCPUs(void) { - int maxvcpus = 1; +static int kvmGetMaxVCPUs(virConnectPtr conn) { + + struct qemud_driver *driver = (struct qemud_driver *)conn->privateData; + int maxvcpus = 1, r, fd; + + // KVM-30 added support for up to 4 vcpus + // KVM-62 raised this to 16 + if (driver->kvmVersion < 30) + maxvcpus = 1; + else if (driver->kvmVersion < 62) + maxvcpus = 4; + else + maxvcpus = 16; - int r, fd; - fd = open(KVM_DEVICE, O_RDONLY); if (fd < 0) { qemudLog(QEMUD_WARN, _("Unable to open " KVM_DEVICE ": %s\n"), strerror(errno)); @@ -1820,10 +1835,8 @@ static int qemudGetMaxVCPUs(virConnectPtr conn, const char *type) { if (STRCASEEQ(type, "qemu")) return 16; - /* XXX future KVM will support SMP. Need to probe - kernel to figure out KVM module version i guess */ if (STRCASEEQ(type, "kvm")) - return kvmGetMaxVCPUs(); + return kvmGetMaxVCPUs(conn); if (STRCASEEQ(type, "kqemu")) return 1; @@ -1993,7 +2006,7 @@ static virDomainPtr qemudDomainLookupByName(virConnectPtr conn, static int qemudGetVersion(virConnectPtr conn, unsigned long *version) { struct qemud_driver *driver = (struct qemud_driver *)conn->privateData; - if (qemudExtractVersion(conn, driver) < 0) + if (qemudExtractVersion(driver) < 0) return -1; *version = qemu_driver->qemuVersion; @@ -3035,7 +3048,7 @@ static int qemudDomainChangeEjectableMedia(virDomainPtr dom, } if (qemudExtractVersionInfo(vm->def->emulator, - NULL, + NULL, NULL, &qemuCmdFlags) < 0) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, _("Cannot determine QEMU argv syntax %s"),

2 3

[libvirt] [PATCH] Don't remove devel files in spec
by Cole Robinson 18 Sep '08

18 Sep '08

The second iteration of the spec file enhancements didn't fully remove some pieces that were dependent on the devel package switch. The attached patch fixes 'make rpm' to work again. Thanks, Cole

3 2

[libvirt] cpu flags
by Ben Guthro 18 Sep '08

18 Sep '08

Hi, We're finding that we are going to be needing the cpu flags (as reported in /proc/cpuinfo) ...specifically to find out if we are a vmx enabled machine. So - off I went looking into this for a patch to submit upstream. Unfortunately, I ran into some questions which need answering before I really proceed with this It seems to me that this info would best be parsed in src/nodeinfo.c This is where other cpuinfo things are parsed...and stored in the nodeinfo struct Perhaps we store this as a bitmask encoded int, as defined in /usr/include/asm/cpufeature.h and tack this onto the end of sad struct. My concern is that adding to the nodeinfo struct breaks the API - such that the structs will be different sizes between versions. Also - this seems to be x86 specific. Are we primarily destined for x86? Or would this type of change be unacceptable due to not working on PPC, for example? Thoughts? Ben

5 12

[libvirt] [PATCH] Add documentation for C# "binding" and fix Windows documentation
by Richard W.M. Jones 18 Sep '08

18 Sep '08

This patch changes the bindings page so that the language names are emboldened and so that Java and C# are listed too. I've also listed Windows on that page, not strictly because it is a language, but because it's a platform. The existing documentation on building libvirt on Windows is bogus and possibly wrong. This patch also replaces that with a more accurate placeholder. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones Read my OCaml programming blog: http://camltastic.blogspot.com/ Fedora now supports 68 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

2 1

[libvirt] [PATCH] Two safer versions of virDomainGetID
by Richard W.M. Jones 18 Sep '08

18 Sep '08

Two alternative versions of a safer virDomainGetID call in followups to this message. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones Read my OCaml programming blog: http://camltastic.blogspot.com/ Fedora now supports 64 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

2 6

[libvirt] FYI: [PATCH] Missing include file
by Richard W.M. Jones 18 Sep '08

18 Sep '08

Just FYI, I applied the following minor patch which fixes the build when configured with --enable-compile-warnings=error. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones Read my OCaml programming blog: http://camltastic.blogspot.com/ Fedora now supports 68 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

2 1

[libvirt] [PATCH] segfailt in openvz driver
by Evgeniy Sokolov 17 Sep '08

17 Sep '08

There was segmentation failt in openvz driver during 'create' command if domain with same id exist. Segfault was because of using structure (print warning with name of container) which is free. other: use openvzError instead of openvzLog.

2 4

[libvirt] Any outstanding patches?
by Richard W.M. Jones 17 Sep '08

17 Sep '08

While Daniel Veillard is away, if you have any outstanding patches which have been approved but not committed, please reply to this message with a pointer to the mailing list message or patch. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://et.redhat.com/~rjones/virt-df/

2 1

[libvirt] [PATCH] remove dead code
by Nguyen Anh Quynh 17 Sep '08

17 Sep '08

Hi, This patch removes dead code in the qemu driver. Thanks, Quynh # diffstat fix8.patch qemu_driver.c | 2 --

2 2