- Devel - libvirt List Archives

[libvirt] [PATCH 3/3] qemu: Implement blkio tunable XML configuration and parsing.
by Gui Jianfeng 27 Jan '11

27 Jan '11

Implement blkio tunable XML configuration and parsing. Signed-off-by: Gui Jianfeng <guijianfeng(a)cn.fujitsu.com> --- src/conf/domain_conf.c | 17 ++++++++++++++++- src/conf/domain_conf.h | 4 ++++ src/qemu/qemu_cgroup.c | 16 +++++++++++++++- src/qemu/qemu_conf.c | 3 ++- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 645767e..a05ada5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4810,7 +4810,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, { xmlNodePtr *nodes = NULL, node = NULL; char *tmp = NULL; - int i, n; + int i, n, w; long id = -1; virDomainDefPtr def; unsigned long count; @@ -4887,6 +4887,13 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, if (node) def->mem.hugepage_backed = 1; + /* Extract blkio cgroup tunables */ + w = virXPathULong("string(./blkiotune/weight)", ctxt, + &def->blkio.weight); + if (w < 0 || def->blkio.weight > 1000 || def->blkio.weight < 100) + virDomainReportError(VIR_ERR_XML_ERROR, "%s", + _("I/O weight should fall in [100, 1000]")); + /* Extract other memory tunables */ if (virXPathULong("string(./memtune/hard_limit)", ctxt, &def->mem.hard_limit) < 0) @@ -7289,6 +7296,14 @@ char *virDomainDefFormat(virDomainDefPtr def, virBufferVSprintf(&buf, " <currentMemory>%lu</currentMemory>\n", def->mem.cur_balloon); + /* add blkiotune only if there are any */ + if (def->blkio.weight) { + virBufferVSprintf(&buf, " <blkiotune>\n"); + virBufferVSprintf(&buf, " <weight>%lu</weight>\n", + def->blkio.weight); + virBufferVSprintf(&buf, " </blkiotune>\n"); + } + /* add memtune only if there are any */ if (def->mem.hard_limit || def->mem.soft_limit || def->mem.min_guarantee || def->mem.swap_hard_limit) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index cf7bdc0..b117869 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -969,6 +969,10 @@ struct _virDomainDef { char *description; struct { + unsigned long weight; + } blkio; + + struct { unsigned long max_balloon; unsigned long cur_balloon; unsigned long hugepage_backed; diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index e5536c0..a3e8e6a 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -54,7 +54,6 @@ int qemuCgroupControllerActive(struct qemud_driver *driver, return 0; } - int qemuSetupDiskPathAllow(virDomainDiskDefPtr disk ATTRIBUTE_UNUSED, const char *path, size_t depth ATTRIBUTE_UNUSED, @@ -270,6 +269,21 @@ int qemuSetupCgroup(struct qemud_driver *driver, } } + if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_BLKIO)) { + if (vm->def->blkio.weight != 0) { + rc = virCgroupSetWeight(cgroup, vm->def->blkio.weight); + if(rc != 0) { + virReportSystemError(-rc, + _("Unable to set io weight for domain %s"), + vm->def->name); + goto cleanup; + } + } + } else { + VIR_WARN("Blkio cgroup is disabled in qemu configuration file: %s", + vm->def->name); + } + if ((rc = qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_MEMORY))) { if (vm->def->mem.hard_limit != 0) { rc = virCgroupSetMemoryHardLimit(cgroup, vm->def->mem.hard_limit); diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index e1502dc..121080f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -299,7 +299,8 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, driver->cgroupControllers = (1 << VIR_CGROUP_CONTROLLER_CPU) | (1 << VIR_CGROUP_CONTROLLER_DEVICES) | - (1 << VIR_CGROUP_CONTROLLER_MEMORY); + (1 << VIR_CGROUP_CONTROLLER_MEMORY) | + (1 << VIR_CGROUP_CONTROLLER_BLKIO); } for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) { if (driver->cgroupControllers & (1 << i)) { -- 1.7.1

3 4

[libvirt] [PATCH] docs: correct setmem text plus expand setmaxmem text
by Justin Clift 27 Jan '11

27 Jan '11

This completes the man page updates required for BZ # 622534: https://bugzilla.redhat.com/show_bug.cgi?id=622534 --- tools/virsh.pod | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 1f15fef..c0cda79 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -580,13 +580,20 @@ paravirtualized or running the PV balloon driver. Note, this command only works on active guest domains. To change the memory allocation for an inactive guest domain, use the virsh B<edit> command to -update the XML <memory> element. +update the XML <currentMemory> element. =item B<setmaxmem> I<domain-id> B<kilobytes> -Change the maximum memory allocation limit in the guest domain. This should -not change the current memory use. The memory limit is specified in -kilobytes. +Change the maximum memory allocation limit for an active guest domain. + +Some hypervisors require a larger granularity than kilobytes, and requests +that are not an even multiple will either be rounded down or rejected. For +example, vSphere/ESX rejects the parameter unless the kB argument is evenly +divisible by 1024 (that is, the kB argument happens to represent megabytes). + +Note, this command only works on active guest domains. To change the memory +allocation for an inactive guest domain, use the virsh B<edit> command to +update the XML <memory> element. =item B<memtune> I<domain-id> optional I<--hard-limit> B<kilobytes> optional I<--soft-limit> B<kilobytes> optional I<--swap-hard-limit> -- 1.7.3.5

4 10

[libvirt] [PATCH 0/3] Fix selinux problem when restoring qemu domain via a pipe
by Laine Stump 26 Jan '11

26 Jan '11

Patches 1 & 2 provide *most* of the fix required for https://bugzilla.redhat.com/show_bug.cgi?id=667756 Note that restoring from a gzip'ed image also suffers the same problem, and requires the same remedy. Patch 3 remedies a hang during failure that I encountered while debugging the main problem.

2 15

[libvirt] Interface XML description
by arnaud.champion＠devatom.fr 26 Jan '11

26 Jan '11

?Hi, I'm currently working on C# binding, precisly on virInterface things. I don't see any XML documentation around interface XML description. IS there infos anywhere ? Regards, Arnaud

4 3

[libvirt] [PATCH 1/3] cgroup: Enable cgroup hierarchy for blkio cgroup
by Gui Jianfeng 26 Jan '11

26 Jan '11

Enable cgroup hierarchy for blkio cgroup. Signed-off-by: Gui Jianfeng <guijianfen(a)cn.fujitsu.com> --- src/util/cgroup.c | 2 +- src/util/cgroup.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/util/cgroup.c b/src/util/cgroup.c index cd9caba..309f4e9 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -37,7 +37,7 @@ VIR_ENUM_IMPL(virCgroupController, VIR_CGROUP_CONTROLLER_LAST, "cpu", "cpuacct", "cpuset", "memory", "devices", - "freezer"); + "freezer", "blkio"); struct virCgroupController { int type; diff --git a/src/util/cgroup.h b/src/util/cgroup.h index 964da7a..67b1299 100644 --- a/src/util/cgroup.h +++ b/src/util/cgroup.h @@ -22,6 +22,7 @@ enum { VIR_CGROUP_CONTROLLER_MEMORY, VIR_CGROUP_CONTROLLER_DEVICES, VIR_CGROUP_CONTROLLER_FREEZER, + VIR_CGROUP_CONTROLLER_BLKIO, VIR_CGROUP_CONTROLLER_LAST }; -- 1.7.1

2 1

[libvirt] Move "Bindings" page under "Downloads" heading?
by Justin Clift 26 Jan '11

26 Jan '11

Hi us, It just clicked for me, that when people want to download (or even find) our language bindings, they have to find them through our Documentation section pages. Would it make more sense to have our language bindings listed under Downloads? + Justin

4 7

[libvirt] [PATCH] qemu: Error prompt when managed save a shutoff domain
by Osier Yang 26 Jan '11

26 Jan '11

The problem was intrduced by commit 4303c91, which removed the checking of domain state, this patch is to fix it. Otherwise, improper error will be throwed, e.g. # virsh managedsave rhel6 error: Failed to save domain rhel6 state error: cannot resolve symlink /var/lib/libvirt/qemu/save/rhel6.save: No such file or directory --- src/qemu/qemu_driver.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 34cc29f..575dbd3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4640,6 +4640,12 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) goto cleanup; } + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto cleanup; + } + name = qemuDomainManagedSavePath(driver, vm); if (name == NULL) goto cleanup; -- 1.7.3.2

3 3

[libvirt] Rudimentary (basic) s390x architecture functions for libvirt
by Patrick Siegl 26 Jan '11

26 Jan '11

Hello there, I don't know whether or not you are only interested in the x86 / x86_64 architecture, but I think you could also be interested in the small bit of code which I have programmed. Since the release of libvirt 0.8.5, there is a small bit of s390x architecture code (one line) within libvirt which has given me the impression that you could be interested in my small bit of code. I study 'computer science' at the University of Tuebingen (Germany) and each student has to do a research study during his studies on his way to receiving his diploma. One of my goals is to implement basic s390x functions into libvirt in order to be able to start / create virtual machines on a s390x architecture (i.e. on our IBM Mainframe z9 at the university) more easily. Our Setup is (as just mentioned) an IBM Mainframe z9 on which I have the root access to a zLinux (which runs native on two LPARs) with the OS "SUSE Enterprise 11 SP1" and a kernel 2.6.34. (Our test virtual machine is a copy of the running zLinux.) I have actually implemented my patch into libvirt release 0.8.6 but I think a git patch would be more practical for you, so I have implemented it into git today (see underneath or attachment). The following XML file creates a virtual machine on my zLinux with my git patch which is listed underneath (or attachment). As you can see, there is not much that needs to be done so that libvirt can create rudimentary virtual machines on IBM Mainframe z9 (under an zLinux). Regards, Patrick Siegl University of Tuebingen (Germany) Here is the necessary XML file: =============================================================== <domain type='kvm'> <name>TestVM</name> <uuid></uuid> <memory>1024000</memory> <currentMemory>1024000</currentMemory> <cpu> <topology sockets='1' cores='1' threads='1'/> </cpu> <os> <type arch="s390x" machine='s390'>hvm</type> <kernel>/boot/image-2.6.34-tue01</kernel> <initrd>/boot/initrd-2.6.34-tue01_GUEST</initrd> <cmdline>"root=/dev/vda1 rw"</cmdline> <boot dev='hd'/> </os> <devices> <graphics type='vnc' port='5903' listen='' keymap='de'/> <console type='vc'> <target type='virtio' name='virtio.serial'/> </console> <disk type='file' device='disk'> <source file='/data/sle11.img'/> <target dev='vda'/> </disk> <interface type='ethernet'> <target dev='tap0'/> <mac address='00:17:31:88:AC:86'/> <ip address='134.2.14.241'/> </interface> </devices> </domain> ... and here is the patch: =============================================================== diff --git a/libvirt-git/src/qemu/qemu_capabilities.c b/libvirt/src/qemu/qemu_capabilities.c index faf7d44..7bbb1d5 100644 --- a/libvirt-git/src/qemu/qemu_capabilities.c +++ b/libvirt/src/qemu/qemu_capabilities.c @@ -83,7 +83,7 @@ static const struct qemu_arch_info const arch_info_hvm[] = { { "sparc", 32, NULL, "qemu-system-sparc", NULL, NULL, 0 }, { "ppc", 32, NULL, "qemu-system-ppc", NULL, NULL, 0 }, { "itanium", 64, NULL, "qemu-system-ia64", NULL, NULL, 0 }, - { "s390x", 64, NULL, "qemu-system-s390x", NULL, NULL, 0 }, + { "s390x", 64, NULL, "qemu-system-s390x", NULL, NULL, 0 }, // Since 0.8.5: doesn't work on it's own! }; static const struct qemu_arch_info const arch_info_xen[] = { diff --git a/libvirt-git/src/nodeinfo.c b/libvirt/src/nodeinfo.c index 22d53e5..c9059d4 100644 --- a/libvirt-git/src/nodeinfo.c +++ b/libvirt/src/nodeinfo.c @@ -164,7 +164,11 @@ cleanup: static int parse_socket(unsigned int cpu) { +# if ( defined __s390x__ || defined __s390__ ) + return 0; /* s390 does not implement physical_package_id by now */ +# else return get_cpu_value(cpu, "topology/physical_package_id", false); +# endif } int linuxNodeInfoCPUPopulate(FILE *cpuinfo, @@ -195,6 +199,30 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, * has no knowledge of NUMA nodes */ /* NOTE: hyperthreads are ignored here; they are parsed out of /sys */ +# if defined __s390x__ || defined __s390__ + while (fgets(line, sizeof(line), cpuinfo) != NULL) { + char *buf = line; + if (STRPREFIX(buf, "# processors")) { /* Number of processors */ + char *p; + unsigned int id; + buf += 12; + while (*buf && c_isspace(*buf)) + buf++; + if (*buf != ':' || !buf[1]) { + nodeReportError(VIR_ERR_INTERNAL_ERROR, + "parsing cpuinfo cpu count %c", *buf); + return -1; + } + if (virStrToLong_ui(buf+1, &p, 10, &id) == 0 + && (*p == '\0' || c_isspace(*p)) + && id > nodeinfo->cores) { + nodeinfo->cpus = id; + nodeinfo->cores = 1; + nodeinfo->mhz = 1400; /* z9 BC */ + } + } + } +# else /* no s390 */ while (fgets(line, sizeof(line), cpuinfo) != NULL) { char *buf = line; if (STRPREFIX(buf, "processor")) { /* aka a single logical CPU */ @@ -239,6 +267,7 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, nodeinfo->cores = id; } } +# endif /* s390 */ if (!nodeinfo->cpus) { nodeReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/libvirt-git/src/qemu/qemu_command.c b/libvirt/src/qemu/qemu_command.c index c20f031..0419a0c 100644 --- a/libvirt-git/src/qemu/qemu_command.c +++ b/libvirt/src/qemu/qemu_command.c @@ -1267,9 +1267,15 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, break; } } else { +# if ( defined __s390x__ || defined __s390__ ) + virBufferVSprintf(&opt, "file=%s", disk->src); +# else virBufferVSprintf(&opt, "file=%s,", disk->src); +# endif } } +// makes problems under s390x +# if ! ( defined __s390x__ || defined __s390__ ) if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) virBufferAddLit(&opt, "if=none"); else @@ -1291,6 +1297,7 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, virBufferVSprintf(&opt, ",unit=%d", unitid); } } +# endif if (bootable && disk->device == VIR_DOMAIN_DISK_DEVICE_DISK && disk->bus != VIR_DOMAIN_DISK_BUS_IDE) @@ -1298,10 +1305,12 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, if (disk->readonly && qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE_READONLY) virBufferAddLit(&opt, ",readonly=on"); +# if ! ( defined __s390x__ || defined __s390__ ) if (disk->driverType && *disk->driverType != '\0' && disk->type != VIR_DOMAIN_DISK_TYPE_DIR && qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE_FORMAT) virBufferVSprintf(&opt, ",format=%s", disk->driverType); +# endif if (disk->serial && (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE_SERIAL)) { if (qemuSafeSerialParamValue(disk->serial) < 0) @@ -1370,8 +1379,12 @@ qemuBuildDriveDevStr(virDomainDiskDefPtr disk, disk->info.addr.drive.unit); break; case VIR_DOMAIN_DISK_BUS_VIRTIO: +# if ( defined __s390x__ || defined __s390__ ) + virBufferAddLit(&opt, "virtio-blk-s390"); +# else virBufferAddLit(&opt, "virtio-blk-pci"); qemuBuildDeviceAddressStr(&opt, &disk->info); +# endif break; case VIR_DOMAIN_DISK_BUS_USB: virBufferAddLit(&opt, "usb-storage"); @@ -1476,6 +1489,9 @@ qemuBuildControllerDevStr(virDomainControllerDefPtr def) break; case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: +# if ( defined __s390x__ || defined __s390__ ) + virBufferAddLit(&buf, "virtio-serial-s390"); +# else if (def->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { virBufferAddLit(&buf, "virtio-serial-pci"); } else { @@ -1491,6 +1507,7 @@ qemuBuildControllerDevStr(virDomainControllerDefPtr def) virBufferVSprintf(&buf, ",vectors=%d", def->opts.vioserial.vectors); } +# endif break; /* We always get an IDE controller, whether we want it or not. */ @@ -1499,6 +1516,7 @@ qemuBuildControllerDevStr(virDomainControllerDefPtr def) goto error; } +# if ! ( defined __s390x__ || defined __s390__ ) if (qemuBuildDeviceAddressStr(&buf, &def->info) < 0) goto error; @@ -1506,6 +1524,7 @@ qemuBuildControllerDevStr(virDomainControllerDefPtr def) virReportOOMError(); goto error; } +# endif return virBufferContentAndReset(&buf); @@ -1551,7 +1570,11 @@ qemuBuildNicDevStr(virDomainNetDefPtr net, if (!net->model) { nic = "rtl8139"; } else if (STREQ(net->model, "virtio")) { +# if ( defined __s390x__ || defined __s390__ ) + nic = "virtio-net-s390"; +# else nic = "virtio-net-pci"; +# endif } else { nic = net->model; } @@ -2587,7 +2610,11 @@ qemuBuildCommandLine(virConnectPtr conn, break; } - cmd = virCommandNewArgList(emulator, "-S", NULL); +# if ! ( defined __s390x__ || defined __s390__ ) + cmd = virCommandNewArgList(emulator, "-S", NULL); // param '-S' makes problems under s390x +# else + cmd = virCommandNewArgList(emulator, "", NULL); +# endif virCommandAddEnvPassCommon(cmd); @@ -2909,8 +2936,10 @@ qemuBuildCommandLine(virConnectPtr conn, def->onReboot != VIR_DOMAIN_LIFECYCLE_RESTART) virCommandAddArg(cmd, "-no-reboot"); +# if ! ( defined __s390x__ || defined __s390__ ) if (!(def->features & (1 << VIR_DOMAIN_FEATURE_ACPI))) virCommandAddArg(cmd, "-no-acpi"); +# endif if (!def->os.bootloader) { for (i = 0 ; i < def->os.nBootDevs ; i++) { @@ -2980,6 +3009,7 @@ qemuBuildCommandLine(virConnectPtr conn, } } +# if ! ( defined __s390x__ || defined __s390__ ) if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) { for (i = 0 ; i < def->ncontrollers ; i++) { virDomainControllerDefPtr cont = def->controllers[i]; @@ -3008,6 +3038,7 @@ qemuBuildCommandLine(virConnectPtr conn, VIR_FREE(devstr); } } +# endif /* If QEMU supports -drive param instead of old -hda, -hdb, -cdrom .. */ if (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE) { @@ -3106,6 +3137,7 @@ qemuBuildCommandLine(virConnectPtr conn, } } +# if ! ( defined __s390x__ || defined __s390__ ) // s390x doesn't need DeviceArg yet (it doesn't even work with ...) if (withDeviceArg) { if (disk->bus == VIR_DOMAIN_DISK_BUS_FDC) { virCommandAddArg(cmd, "-global"); @@ -3131,6 +3163,7 @@ qemuBuildCommandLine(virConnectPtr conn, VIR_FREE(optstr); } } +# endif } } else { for (i = 0 ; i < def->ndisks ; i++) { @@ -3277,11 +3310,13 @@ qemuBuildCommandLine(virConnectPtr conn, char vhostfd_name[50] = ""; int vlan; +# if ! ( defined __s390x__ || defined __s390__ ) /* VLANs are not used with -netdev, so don't record them */ if ((qemuCmdFlags & QEMUD_CMD_FLAG_NETDEV) && (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) vlan = -1; else +# endif vlan = i; if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK || @@ -3338,6 +3373,7 @@ qemuBuildCommandLine(virConnectPtr conn, * * NB, no support for -netdev without use of -device */ +# if ! ( defined __s390x__ || defined __s390__ ) // Old way works on IBM z9 Tuebingen; maybe there are other z9's which also work with "semi-" or "best way" if ((qemuCmdFlags & QEMUD_CMD_FLAG_NETDEV) && (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { virCommandAddArg(cmd, "-netdev"); @@ -3354,21 +3390,26 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArg(cmd, nic); VIR_FREE(nic); } else { +# endif virCommandAddArg(cmd, "-net"); if (!(nic = qemuBuildNicStr(net, "nic,", vlan))) goto error; virCommandAddArg(cmd, nic); VIR_FREE(nic); +# if ! ( defined __s390x__ || defined __s390__ ) } if (!((qemuCmdFlags & QEMUD_CMD_FLAG_NETDEV) && (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE))) { +# endif virCommandAddArg(cmd, "-net"); if (!(host = qemuBuildHostNetStr(net, ',', vlan, tapfd_name, vhostfd_name))) goto error; virCommandAddArg(cmd, host); VIR_FREE(host); +# if ! ( defined __s390x__ || defined __s390__ ) } +# endif } } @@ -3384,6 +3425,7 @@ qemuBuildCommandLine(virConnectPtr conn, /* Use -chardev with -device if they are available */ if ((qemuCmdFlags & QEMUD_CMD_FLAG_CHARDEV) && (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { +# if ! ( defined __s390x__ || defined __s390__ ) virCommandAddArg(cmd, "-chardev"); if (!(devstr = qemuBuildChrChardevStr(&serial->source, serial->info.alias))) @@ -3394,6 +3436,7 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArg(cmd, "-device"); virCommandAddArgFormat(cmd, "isa-serial,chardev=%s", serial->info.alias); +# endif; } else { virCommandAddArg(cmd, "-serial"); if (!(devstr = qemuBuildChrArgStr(&serial->source, NULL))) @@ -3483,6 +3526,11 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArg(cmd, devstr); VIR_FREE(devstr); +# if ( defined __s390x__ || defined __s390__ ) + virCommandAddArg(cmd, "-device"); + virCommandAddArg(cmd, "virtio-serial-s390"); +# endif + virCommandAddArg(cmd, "-device"); if (!(devstr = qemuBuildVirtioSerialPortDevStr(channel))) goto error; @@ -3512,6 +3560,11 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArg(cmd, devstr); VIR_FREE(devstr); +# if ( defined __s390x__ || defined __s390__ ) + virCommandAddArg(cmd, "-device"); + virCommandAddArg(cmd, "virtio-serial-s390"); +# endif + virCommandAddArg(cmd, "-device"); if (!(devstr = qemuBuildVirtioSerialPortDevStr(console))) goto error; @@ -4011,6 +4064,8 @@ qemuBuildCommandLine(virConnectPtr conn, * NB: Earlier we declared that VirtIO balloon will always be in * slot 0x3 on bus 0x0 */ +// our SUSE Enterprise, running on one LPAR (IBM z9), doesn't have ballon support ... +# if ! ( defined __s390x__ || defined __s390__ ) if ((def->memballoon) && (def->memballoon->model != VIR_DOMAIN_MEMBALLOON_MODEL_NONE)) { if (def->memballoon->model != VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO) { @@ -4032,6 +4087,7 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArgList(cmd, "-balloon", "virtio", NULL); } } +# endif if (current_snapshot && current_snapshot->def->active) virCommandAddArgList(cmd, "-loadvm", current_snapshot->def->name,

2 2

[libvirt] [PATCH] bugfix for https://bugzilla.redhat.com/show_bug.cgi?id=671050
by Michal Privoznik 26 Jan '11

26 Jan '11

virsh simply refutes to detach-interface in case when multiple interfaces are attached and --mac is not specified. --- tools/virsh.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index aba7945..f965fc0 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -8557,6 +8557,11 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) goto cleanup; } + if ((!mac) && (obj->nodesetval->nodeNr > 1)) { + vshError(ctl, _("Domain has %d interfaces. Please specify which one you want to detach using --mac"), obj->nodesetval->nodeNr); + goto cleanup; + } + if (!mac) goto hit; -- 1.7.3.5

2 1

[libvirt] [PATCH] dispatch error before return
by Wen Congyang 26 Jan '11

26 Jan '11

Signed-off-by: Wen Congyang <wency(a)cn.fujitsu.com> --- src/libvirt.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 5f8b131..c65b1e5 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -5560,6 +5560,7 @@ virDomainAttachDeviceFlags(virDomainPtr domain, if (!VIR_IS_CONNECTED_DOMAIN(domain)) { virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virDispatchError(NULL); return -1; } if (domain->conn->flags & VIR_CONNECT_RO) { @@ -5660,6 +5661,7 @@ virDomainDetachDeviceFlags(virDomainPtr domain, if (!VIR_IS_CONNECTED_DOMAIN(domain)) { virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virDispatchError(NULL); return -1; } if (domain->conn->flags & VIR_CONNECT_RO) { @@ -5719,6 +5721,7 @@ virDomainUpdateDeviceFlags(virDomainPtr domain, if (!VIR_IS_CONNECTED_DOMAIN(domain)) { virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virDispatchError(NULL); return -1; } if (domain->conn->flags & VIR_CONNECT_RO) { -- 1.7.1

2 1