- Devel - libvirt List Archives

[libvirt] [PATCH]lxc: make sure root wouldn't be null
by Chen Hanxiao 12 Nov '13

12 Nov '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> virDomainGetRootFilesystem may return null. We should take care of it. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 255c711..e8f7a75 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1829,7 +1829,8 @@ static int lxcContainerChild(void *data) if (lxcContainerSetID(vmDef) < 0) goto cleanup; - root = virDomainGetRootFilesystem(vmDef); + if (!(root = virDomainGetRootFilesystem(vmDef))) + goto cleanup; if (argv->nttyPaths) { const char *tty = argv->ttyPaths[0]; -- 1.8.2.1

2 3

[libvirt] [PATCH RFC] blockdev: copy legacy and common opts to qemu_drive_opts
by Amos Kong 12 Nov '13

12 Nov '13

Currently we have three QemuOptsList (qemu_common_drive_opts, qemu_legacy_drive_opts, and qemu_drive_opts), only qemu_drive_opts is added to vm_config_groups[]. We query commandline options by checking information in vm_config_groups[], so we can only get a NULL parameter list now. This patch copied desc items of qemu_legacy_drive_opts and qemu_common_drive_opts to qemu_drive_opts. Signed-off-by: Amos Kong <akong(a)redhat.com> --- blockdev.c | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 164 insertions(+), 4 deletions(-) diff --git a/blockdev.c b/blockdev.c index b260477..28f3078 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2345,10 +2345,170 @@ QemuOptsList qemu_drive_opts = { .name = "drive", .head = QTAILQ_HEAD_INITIALIZER(qemu_drive_opts.head), .desc = { - /* - * no elements => accept any params - * validation will happen later - */ + /* qemu_legacy_drive_opts */ + { + .name = "bus", + .type = QEMU_OPT_NUMBER, + .help = "bus number", + },{ + .name = "unit", + .type = QEMU_OPT_NUMBER, + .help = "unit number (i.e. lun for scsi)", + },{ + .name = "index", + .type = QEMU_OPT_NUMBER, + .help = "index number", + },{ + .name = "media", + .type = QEMU_OPT_STRING, + .help = "media type (disk, cdrom)", + },{ + .name = "if", + .type = QEMU_OPT_STRING, + .help = "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)", + },{ + .name = "cyls", + .type = QEMU_OPT_NUMBER, + .help = "number of cylinders (ide disk geometry)", + },{ + .name = "heads", + .type = QEMU_OPT_NUMBER, + .help = "number of heads (ide disk geometry)", + },{ + .name = "secs", + .type = QEMU_OPT_NUMBER, + .help = "number of sectors (ide disk geometry)", + },{ + .name = "trans", + .type = QEMU_OPT_STRING, + .help = "chs translation (auto, lba, none)", + },{ + .name = "boot", + .type = QEMU_OPT_BOOL, + .help = "(deprecated, ignored)", + },{ + .name = "addr", + .type = QEMU_OPT_STRING, + .help = "pci address (virtio only)", + }, + + /* Options that are passed on, but have special semantics with -drive */ + { + .name = "read-only", + .type = QEMU_OPT_BOOL, + .help = "open drive file as read-only", + },{ + .name = "copy-on-read", + .type = QEMU_OPT_BOOL, + .help = "copy read data from backing file into image file", + }, + + /* qemu_common_drive_opts */ + { + .name = "snapshot", + .type = QEMU_OPT_BOOL, + .help = "enable/disable snapshot mode", + },{ + .name = "file", + .type = QEMU_OPT_STRING, + .help = "disk image", + },{ + .name = "discard", + .type = QEMU_OPT_STRING, + .help = "discard operation (ignore/off, unmap/on)", + },{ + .name = "cache.writeback", + .type = QEMU_OPT_BOOL, + .help = "enables writeback mode for any caches", + },{ + .name = "cache.direct", + .type = QEMU_OPT_BOOL, + .help = "enables use of O_DIRECT (bypass the host page cache)", + },{ + .name = "cache.no-flush", + .type = QEMU_OPT_BOOL, + .help = "ignore any flush requests for the device", + },{ + .name = "aio", + .type = QEMU_OPT_STRING, + .help = "host AIO implementation (threads, native)", + },{ + .name = "format", + .type = QEMU_OPT_STRING, + .help = "disk format (raw, qcow2, ...)", + },{ + .name = "serial", + .type = QEMU_OPT_STRING, + .help = "disk serial number", + },{ + .name = "rerror", + .type = QEMU_OPT_STRING, + .help = "read error action", + },{ + .name = "werror", + .type = QEMU_OPT_STRING, + .help = "write error action", + },{ + .name = "read-only", + .type = QEMU_OPT_BOOL, + .help = "open drive file as read-only", + },{ + .name = "throttling.iops-total", + .type = QEMU_OPT_NUMBER, + .help = "limit total I/O operations per second", + },{ + .name = "throttling.iops-read", + .type = QEMU_OPT_NUMBER, + .help = "limit read operations per second", + },{ + .name = "throttling.iops-write", + .type = QEMU_OPT_NUMBER, + .help = "limit write operations per second", + },{ + .name = "throttling.bps-total", + .type = QEMU_OPT_NUMBER, + .help = "limit total bytes per second", + },{ + .name = "throttling.bps-read", + .type = QEMU_OPT_NUMBER, + .help = "limit read bytes per second", + },{ + .name = "throttling.bps-write", + .type = QEMU_OPT_NUMBER, + .help = "limit write bytes per second", + },{ + .name = "throttling.iops-total-max", + .type = QEMU_OPT_NUMBER, + .help = "I/O operations burst", + },{ + .name = "throttling.iops-read-max", + .type = QEMU_OPT_NUMBER, + .help = "I/O operations read burst", + },{ + .name = "throttling.iops-write-max", + .type = QEMU_OPT_NUMBER, + .help = "I/O operations write burst", + },{ + .name = "throttling.bps-total-max", + .type = QEMU_OPT_NUMBER, + .help = "total bytes burst", + },{ + .name = "throttling.bps-read-max", + .type = QEMU_OPT_NUMBER, + .help = "total bytes read burst", + },{ + .name = "throttling.bps-write-max", + .type = QEMU_OPT_NUMBER, + .help = "total bytes write burst", + },{ + .name = "throttling.iops-size", + .type = QEMU_OPT_NUMBER, + .help = "when limiting by iops max size of an I/O in bytes", + },{ + .name = "copy-on-read", + .type = QEMU_OPT_BOOL, + .help = "copy read data from backing file into image file", + }, { /* end of list */ } }, }; -- 1.8.3.1

3 8

[libvirt] [PATCHv2 0/3] Split out disk source parsing code
by Peter Krempa 12 Nov '13

12 Nov '13

Version 2 incorporates review feedback. Peter Krempa (3): conf: Split out code to parse the source of a disk definition conf: Rename virDomainDiskHostDefFree to virDomainDiskHostDefClear conf: Refactor virDomainDiskSourceDefParse src/conf/domain_conf.c | 269 ++++++++++++++++++++++++++--------------------- src/conf/domain_conf.h | 2 +- src/libvirt_private.syms | 2 +- src/qemu/qemu_command.c | 4 +- 4 files changed, 154 insertions(+), 123 deletions(-) -- 1.8.4.2

2 7

[libvirt] [PATCH] Add support for virt machine with virtio-mmio devices
by Clark Laughlin 12 Nov '13

12 Nov '13

These changes allow the correct virtio-blk-device and virtio-net-device devices to be used for the 'virt' machine type rather than the PCI virtio devices. --- src/qemu/qemu_command.c | 4 +++- src/qemu/qemu_domain.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 63e235d..901120e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1335,12 +1335,14 @@ cleanup: return ret; } + static int qemuDomainAssignARMVirtioMMIOAddresses(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) { if (def->os.arch == VIR_ARCH_ARMV7L && - STRPREFIX(def->os.machine, "vexpress-") && + (STRPREFIX(def->os.machine, "vexpress-") || + STREQ(def->os.machine, "virt")) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MMIO)) { qemuDomainPrimeVirtioDeviceAddresses( def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 81d0ba9..346fec3 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -797,6 +797,9 @@ qemuDomainDefaultNetModel(const virDomainDef *def) if (STREQ(def->os.machine, "versatilepb")) return "smc91c111"; + if (STREQ(def->os.machine, "virt")) + return "virtio"; + /* Incomplete. vexpress (and a few others) use this, but not all * arm boards */ return "lan9118"; -- 1.8.3.2

1 0

[libvirt] virCommandProcessIO: hangs on poll() when nfds equals 1
by 裸奔的蜗牛 12 Nov '13

12 Nov '13

Details please check https://bugzilla.redhat.com/show_bug.cgi?id=1028728. As I'm not in the mailing list, could you please add me to the cc list? Thank you, Sipingal

1 0

[libvirt] [PATCH] Improve cgroups docs to cover systemd integration
by Daniel P. Berrange 12 Nov '13

12 Nov '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> As of libvirt 1.1.1 and systemd 205, the cgroups layout used by libvirt has some changes. Update the 'cgroups.html' file from the website to describe how it works in a systemd world. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/cgroups.html.in | 212 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 172 insertions(+), 40 deletions(-) diff --git a/docs/cgroups.html.in b/docs/cgroups.html.in index 77656b2..46cfb7b 100644 --- a/docs/cgroups.html.in +++ b/docs/cgroups.html.in @@ -47,17 +47,121 @@ <p> As of libvirt 1.0.5 or later, the cgroups layout created by libvirt has been simplified, in order to facilitate the setup of resource control policies by - administrators / management applications. The layout is based on the concepts of - "partitions" and "consumers". Each virtual machine or container is a consumer, - and has a corresponding cgroup named <code>$VMNAME.libvirt-{qemu,lxc}</code>. - Each consumer is associated with exactly one partition, which also have a - corresponding cgroup usually named <code>$PARTNAME.partition</code>. The - exceptions to this naming rule are the three top level default partitions, - named <code>/system</code> (for system services), <code>/user</code> (for - user login sessions) and <code>/machine</code> (for virtual machines and - containers). By default every consumer will of course be associated with - the <code>/machine</code> partition. This leads to a hierarchy that looks - like + administrators / management applications. The new layout is based on the concepts + of "partitions" and "consumers". A "consumer" is a cgroup which holds the + processes for a single virtual machine or container. A "partition" is a cgroup + which does not contain any processes, but can have resource controls applied. + A "partition" will have zero or more child directories which may be either + "consumer" or "partition". + </p> + + <p> + As of libvirt 1.1.1 or later, the cgroups layout will have some slight + differences when running on a host with systemd 205 or later. The overall + tree structure is the same, but there are some differences in the naming + conventions for the cgroup directories. Thus the following docs split + in two, one describing systemd hosts and the other non-systemd hosts. + </p> + + <h3><a name="currentLayoutSystemd">Systemd cgroups integration</a></h3> + + <p> + On hosts which use systemd, each consumer maps to a systemd scope unit, + while partitions map to a system slice unit. + </p> + + <h4><a name="systemdScope">Systemd scope naming</a></h4> + + <p> + The systemd convention is for the scope name of virtual machines / containers + to be of the general format <code>machine-$NAME.scope</code>. Libvirt forms the + <code>$NAME</code> part of this by concatenating the driver type with the name + of the guest, and then escaping any systemd reserved characters. + So for a guest <code>demo</code> running under the <code>lxc</code> driver, + we get a <code>$NAME</code> of <code>lxc-demo</code> which when escaped is + <code>lxc\x2ddemo</code>. So the complete scope name is <code>machine-lxc\x2ddemo.scope</code>. + The scope names map directly to the cgroup directory names. + </p> + + <h4><a name="systemdSlice">Systemd slice naming</a></h4> + + <p> + The systemd convention for slice naming is that a slice should include the + name of all of its parents prepended on its own name. So for a libvirt + partition <code>/machine/engineering/testing</code>, the slice name will + be <code>machine-engineering-testing.slice</code>. Again the slice names + map directly to the cgroup directory names. Systemd creates three top level + slices by default, <code>system.slice</code> <code>user.slice</code> and + <code>machine.slice</code>. All virtual machines or containers created + by libvirt will be associated with <code>machine.slice</code> by default. + </p> + + <h4><a name="systemdLayout">Systemd cgroup layout</a></h4> + + <p> + Given this, an possible systemd cgroups layout involing 3 qemu guests, + 3 lxc containers and 3 custom child slices, would be: + </p> + + <pre> +$ROOT + | + +- system.slice + | | + | +- libvirtd.service + | + +- machine.slice + | + +- machine-qemu\x2dvm1.scope + | | + | +- emulator + | +- vcpu0 + | +- vcpu1 + | + +- machine-qemu\x2dvm2.scope + | | + | +- emulator + | +- vcpu0 + | +- vcpu1 + | + +- machine-qemu\x2dvm3.scope + | | + | +- emulator + | +- vcpu0 + | +- vcpu1 + | + +- machine-engineering.slice + | | + | +- machine-engineering-testing.slice + | | | + | | +- machine-lxc\x2dcontainer1.scope + | | + | +- machine-engineering-production.slice + | | + | +- machine-lxc\x2dcontainer2.scope + | + +- machine-marketing.slice + | + +- machine-lxc\x2dcontainer3.scope + </pre> + + <h3><a name="currentLayoutGeneric">Non-systemd cgroups layout</a></h3> + + <p> + On hosts which do not use systemd, each consumer has a corresponding cgroup + named <code>$VMNAME.libvirt-{qemu,lxc}</code>. Each consumer is associated + with exactly one partition, which also have a corresponding cgroup usually + named <code>$PARTNAME.partition</code>. The exceptions to this naming rule + are the three top level default partitions, named <code>/system</code> (for + system services), <code>/user</code> (for user login sessions) and + <code>/machine</code> (for virtual machines and containers). By default + every consumer will of course be associated with the <code>/machine</code> + partition. This leads to a hierarchy that looks like: + </p> + + <p> + Given this, an possible systemd cgroups layout involing 3 qemu guests, + 3 lxc containers and 2 custom child slices, would be: </p> <pre> @@ -87,23 +191,21 @@ $ROOT | +- vcpu0 | +- vcpu1 | - +- container1.libvirt-lxc - | - +- container2.libvirt-lxc + +- engineering.partition + | | + | +- testing.partition + | | | + | | +- container1.libvirt-lxc + | | + | +- production.partition + | | + | +- container2.libvirt-lxc | - +- container3.libvirt-lxc + +- marketing.partition + | + +- container3.libvirt-lxc </pre> - <p> - The default cgroups layout ensures that, when there is contention for - CPU time, it is shared equally between system services, user sessions - and virtual machines / containers. This prevents virtual machines from - locking the administrator out of the host, or impacting execution of - system services. Conversely, when there is no contention from - system services / user sessions, it is possible for virtual machines - to fully utilize the host CPUs. - </p> - <h2><a name="customPartiton">Using custom partitions</a></h2> <p> @@ -127,12 +229,54 @@ $ROOT </pre> <p> + Note that the partition names in the guest XML are using a + generic naming format, not the the low level naming convention + required by the underlying host OS. ie you should not include + any of the <code>.partition</code> or <code>.slice</code> + suffixes in the XML config. Given a partition name + <code>/machine/production</code>, libvirt will automatically + apply the platform specific translation required to get + <code>/machine/production.partition</code> (non-systemd) + or <code>/machine.slice/machine-prodution.slice</code> + (systemd) as the underlying cgroup name + </p> + + <p> Libvirt will not auto-create the cgroups directory to back this partition. In the future, libvirt / virsh will provide APIs / commands to create custom partitions, but currently - this is left as an exercise for the administrator. For - example, given the XML config above, the admin would need - to create a cgroup named '/machine/production.partition' + this is left as an exercise for the administrator. + </p> + + <p> + <strong>Note:</strong> the ability to place guests in custom + partitions is only available with libvirt >= 1.0.5, using + the new cgroup layout. The legacy cgroups layout described + later in this document did not support customization per guest. + </p> + + <h3><a name="createSystemd">Creating custom partitions (systemd)</a></h3> + + <p> + Given the XML config above, the admin on a systemd based host would + need to create a unit file <code>/etc/systemd/system/machine-production.slice</code> + </p> + + <pre> +# cat > /etc/systemd/system/machine-testing.slice <<EOF +[Unit] +Description=VM testing slice +Before=slices.target +Wants=machine.slice +EOF +# systemctl start machine-testing.slice + </pre> + + <h3><a name="createNonSystemd">Creating custom partitions (non-systemd)</a></h3> + + <p> + Given the XML config above, the admin on a non-systemd based host + would need to create a cgroup named '/machine/production.partition' </p> <pre> @@ -147,18 +291,6 @@ $ROOT done </pre> - <p> - <strong>Note:</strong> the cgroups directory created as a ".partition" - suffix, but the XML config does not require this suffix. - </p> - - <p> - <strong>Note:</strong> the ability to place guests in custom - partitions is only available with libvirt >= 1.0.5, using - the new cgroup layout. The legacy cgroups layout described - later did not support customization per guest. - </p> - <h2><a name="resourceAPIs">Resource management APIs/commands</a></h2> <p> -- 1.8.3.1

2 1

[libvirt] Question about fsfreeze/fsthaw API
by Tomoki Sekiyama 12 Nov '13

12 Nov '13

Hi all, Is there any plans to add APIs to execute fsfreeze/fsthaw in qemu guests? (something like virDomainFSFreeze(domain,timeout,flags) and virDomainFSThaw(domain,timeout,flags)) These would be useful in the case a guest has a disk device with its own snapshot feature, such as cinder volumes in OpenStack configuration. In such cases, libvirt clients want to issue fsfreeze/fsthaw before/after taking the disk snapshot. Currently we can execute them using virDomainQemuAgentCommand(). (e.g. virsh qemu-agent-command dom '{"execute":"guest-fsfreeze-freeze"}' ) However, this is exposing internal implementation too much. And it cannot leverage future implementation for the other hypervisors. So it would be nice if we have well-defined API for fsfreeze/fsthaw. If there is no plan for these API and this is acceptable, I will try to implement this. Any comments are welcome. Thanks, Tomoki Sekiyama

6 9

[libvirt] [PATCH] qemuDomainObjStart: Warn on corrupted image
by Michal Privoznik 12 Nov '13

12 Nov '13

If the managedsave image is corrupted, e.g. the XML part is, we fail to parse it and throw an error, e.g.: error: Failed to start domain jms8 error: XML error: missing security model when using multiple labels This is okay, as we can't really start the machine and avoid undefined qemu behaviour. On the other hand, the error message doesn't give a clue to users what should they do. The consensus here would be to thrown a warning to logs saying "Hey, you've got a corrupted file". Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9c3daad..08be24b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6041,8 +6041,11 @@ qemuDomainObjStart(virConnectPtr conn, if (ret > 0) VIR_WARN("Ignoring incomplete managed state %s", managed_save); - else + else { + VIR_WARN("Unable to restore from managed state %s. " + "Maybe the file is corrupted?", managed_save); goto cleanup; + } } } -- 1.8.3.2

4 6

[libvirt] [PATCH 1/2] qemu: USB keyboard device support
by Vitor de Lima 12 Nov '13

12 Nov '13

Some guests (like the "pseries" guests) do not implicitly have a virtual keyboard. This patch introduces the proper mechanisms to create an USB keyboard using the existing "input" XML tag. --- src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 42 +++++++++++++++++++++++++++++++++++++----- 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ffdbe95..4938740 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -504,7 +504,8 @@ VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST, "mouse", - "tablet") + "tablet", + "keyboard") VIR_ENUM_IMPL(virDomainInputBus, VIR_DOMAIN_INPUT_BUS_LAST, "ps2", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 05c2a84..c659fd0 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1222,6 +1222,7 @@ struct _virDomainTPMDef { enum virDomainInputType { VIR_DOMAIN_INPUT_TYPE_MOUSE, VIR_DOMAIN_INPUT_TYPE_TABLET, + VIR_DOMAIN_INPUT_TYPE_KEYBOARD, VIR_DOMAIN_INPUT_TYPE_LAST }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1d693e1..36ca455 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5276,9 +5276,24 @@ qemuBuildUSBInputDevStr(virDomainDefPtr def, { virBuffer buf = VIR_BUFFER_INITIALIZER; + const char * model = NULL; + + switch (dev->type) { + case VIR_DOMAIN_INPUT_TYPE_MOUSE: + model = "usb-mouse"; + break; + case VIR_DOMAIN_INPUT_TYPE_TABLET: + model = "usb-tablet"; + break; + case VIR_DOMAIN_INPUT_TYPE_KEYBOARD: + model = "usb-kbd"; + break; + } + virBufferAsprintf(&buf, "%s,id=%s", - dev->type == VIR_DOMAIN_INPUT_TYPE_MOUSE ? - "usb-mouse" : "usb-tablet", dev->info.alias); + model, dev->info.alias); + + if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0) goto error; @@ -8959,9 +8974,22 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArg(cmd, optstr); VIR_FREE(optstr); } else { + const char *usbdev = NULL; + + switch (input->type) { + case VIR_DOMAIN_INPUT_TYPE_MOUSE: + usbdev = "mouse"; + break; + case VIR_DOMAIN_INPUT_TYPE_TABLET: + usbdev = "tablet"; + break; + case VIR_DOMAIN_INPUT_TYPE_KEYBOARD: + usbdev = "keyboard"; + break; + } + virCommandAddArgList(cmd, "-usbdevice", - input->type == VIR_DOMAIN_INPUT_TYPE_MOUSE - ? "mouse" : "tablet", NULL); + usbdev, NULL); } } } @@ -11614,15 +11642,19 @@ qemuParseCommandLine(virCapsPtr qemuCaps, } else if (STREQ(arg, "-usbdevice")) { WANT_VALUE(); if (STREQ(val, "tablet") || - STREQ(val, "mouse")) { + STREQ(val, "mouse") || + STREQ(val, "keyboard")) { virDomainInputDefPtr input; if (VIR_ALLOC(input) < 0) goto error; input->bus = VIR_DOMAIN_INPUT_BUS_USB; if (STREQ(val, "tablet")) input->type = VIR_DOMAIN_INPUT_TYPE_TABLET; + else if (STREQ(val, "keyboard")) + input->type = VIR_DOMAIN_INPUT_TYPE_KEYBOARD; else input->type = VIR_DOMAIN_INPUT_TYPE_MOUSE; + if (VIR_REALLOC_N(def->inputs, def->ninputs+1) < 0) { virDomainInputDefFree(input); goto error; -- 1.8.1.4

1 1

[libvirt] [PATCH] virSecurityLabelDefParseXML: Don't parse label on model='none'
by Michal Privoznik 12 Nov '13

12 Nov '13

https://bugzilla.redhat.com/show_bug.cgi?id=1027096 If there's the following snippet in the domain XML, the domain will be lost upon the daemon restart (if the domain is started prior restart): <seclabel type='dynamic' relabel='yes'/> The problem is, the 'label', 'imagelabel' and 'baselabel' are parsed whenever the VIR_DOMAIN_XML_INACTIVE is *not* present or the label is static. The latter is not our case, obviously. So, when libvirtd starts up, it finds domain state xml and parse it. During parsing, many XML flags are enabled but VIR_DOMAIN_XML_INACTIVE. Hence, our parser tries to extract 'label', 'imagelabel' and 'baselabel' from the XML which fails for model='none'. Err, this model - even though not specified in XML - can be taken from qemu wide config file: /etc/libvirtd/qemu.conf. However, in order to know we are dealing with model='none' the code in question must be moved forward a bit. Then a new check must be introduced. This is what the first two chunks are doing. But this alone is not sufficient. The domain state XML won't contain the model attribute without slight modification. The model should be inserted into the XML even if equal to 'none' and the state XML is being generated - what if the origin (the @security_driver variable in qemu.conf) changes during libvirtd restarts? At the end, a test to catch this scenario is introduced. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 26 +++++++++++++------- .../qemuxml2argv-seclabel-dynamic-relabel.args | 6 +++++ .../qemuxml2argv-seclabel-dynamic-relabel.xml | 28 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + 5 files changed, 54 insertions(+), 8 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c1e0ea7..ffdbe95 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4370,6 +4370,17 @@ virSecurityLabelDefParseXML(xmlXPathContextPtr ctxt, def->norelabel = false; } + /* Always parse model */ + p = virXPathStringLimit("string(./@model)", + VIR_SECURITY_MODEL_BUFLEN-1, ctxt); + def->model = p; + + /* For the model 'none' none of the following labels is going to be + * present. Hence, return now. */ + + if (STREQ_NULLABLE(def->model, "none")) + return def; + /* Only parse label, if using static labels, or * if the 'live' VM XML is requested */ @@ -4408,11 +4419,6 @@ virSecurityLabelDefParseXML(xmlXPathContextPtr ctxt, def->baselabel = p; } - /* Always parse model */ - p = virXPathStringLimit("string(./@model)", - VIR_SECURITY_MODEL_BUFLEN-1, ctxt); - def->model = p; - return def; error: @@ -14177,7 +14183,9 @@ virDomainEventActionDefFormat(virBufferPtr buf, static void -virSecurityLabelDefFormat(virBufferPtr buf, virSecurityLabelDefPtr def) +virSecurityLabelDefFormat(virBufferPtr buf, + virSecurityLabelDefPtr def, + unsigned flags) { const char *sectype = virDomainSeclabelTypeToString(def->type); @@ -14196,7 +14204,9 @@ virSecurityLabelDefFormat(virBufferPtr buf, virSecurityLabelDefPtr def) virBufferAsprintf(buf, "<seclabel type='%s'", sectype); - if (def->model && STRNEQ(def->model, "none")) + /* When generating state XML do include the model */ + if (flags & VIR_DOMAIN_XML_INTERNAL_STATUS || + STRNEQ_NULLABLE(def->model, "none")) virBufferEscapeString(buf, " model='%s'", def->model); if (def->type == VIR_DOMAIN_SECLABEL_NONE) { @@ -17107,7 +17117,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, virBufferAdjustIndent(buf, 2); for (n = 0; n < def->nseclabels; n++) - virSecurityLabelDefFormat(buf, def->seclabels[n]); + virSecurityLabelDefFormat(buf, def->seclabels[n], flags); virBufferAdjustIndent(buf, -2); if (def->namespaceData && def->ns.format) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args new file mode 100644 index 0000000..8bef546 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args @@ -0,0 +1,6 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-name QEMUGuest1 -S -M pc -m 214 -smp 1 -nographic -monitor \ +unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +-hda /dev/HostVG/QEMUGuest1 -net none -serial \ +none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.xml b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.xml new file mode 100644 index 0000000..cb74239 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.xml @@ -0,0 +1,28 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> + <seclabel type='dynamic' relabel='yes'/> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0629e31..7ff74aa 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -963,6 +963,7 @@ mymain(void) DO_TEST("seclabel-dynamic-baselabel", QEMU_CAPS_NAME); DO_TEST("seclabel-dynamic-override", QEMU_CAPS_NAME); DO_TEST("seclabel-dynamic-labelskip", QEMU_CAPS_NAME); + DO_TEST("seclabel-dynamic-relabel", QEMU_CAPS_NAME); DO_TEST("seclabel-static", QEMU_CAPS_NAME); DO_TEST("seclabel-static-relabel", QEMU_CAPS_NAME); DO_TEST("seclabel-static-labelskip", QEMU_CAPS_NAME); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index ffff3b5..ceaaf6a 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -263,6 +263,7 @@ mymain(void) DO_TEST_FULL("seclabel-dynamic-baselabel", false, WHEN_INACTIVE); DO_TEST_FULL("seclabel-dynamic-override", false, WHEN_INACTIVE); DO_TEST_FULL("seclabel-dynamic-labelskip", true, WHEN_INACTIVE); + DO_TEST_FULL("seclabel-dynamic-relabel", false, WHEN_INACTIVE); DO_TEST("seclabel-static"); DO_TEST_FULL("seclabel-static-labelskip", false, WHEN_ACTIVE); DO_TEST("seclabel-none"); -- 1.8.3.2

2 4