- Devel - libvirt List Archives

[libvirt] [PATCH 0/9] New public API for computing baseline CPU
by Jiri Denemark 11 Feb '10

11 Feb '10

Hi, This series introduces a new virConnectBaselineCPU() API call for computing baseline CPU model from a set of host CPU definitions. The call accepts a list of <cpu>...</cpu> xml definitions taken from host capabilities and returns an xml description of a guest CPU which is supported by all hosts. virsh is little bit less picky and accepts a file containing host CPU definitions. It doesn't care what is outside of the <cpu/> tag, which allows for concatenating outputs of virsh capabilities from several hosts and feeding the result to virsh cpu-baseline. This series can also be found on cpu-baseline branch of git://gitorious.org/~jirka/libvirt/jirka-staging.git In practice it works like this: # virsh cpu-baseline /dev/stdin >guest-cpu <<EOF <capabilities> <host> <cpu> <arch>x86_64</arch> <model>core2duo</model> <topology sockets='1' cores='2' threads='1'/> <feature name='lahf_lm'/> <feature name='xtpr'/> <feature name='cx16'/> <feature name='tm2'/> <feature name='est'/> <feature name='vmx'/> </cpu> </host> </capabilities> <cpu> <arch>i686</arch> <model>pentiumpro</model> <topology sockets='1' cores='2' threads='1'/> <feature name='vme'/> <feature name='pse36'/> <feature name='pni'/> <feature name='monitor'/> <feature name='ssse3'/> </cpu> <cpu> <arch>x86_64</arch> <model>phenom</model> </cpu> EOF # cat guest-cpu <cpu match='exact'> <model>qemu32</model> <feature policy='require' name='monitor'/> <feature policy='require' name='pse36'/> </cpu> Jiri Denemark (9): Functions for computing baseline CPU from a set of host CPUs Implement cpuArchBaseline in generic CPU driver Implement cpuArchBaseline in x86 CPU driver virConnectBaselineCPU public API Internal driver API for virConnectBaselineCPU virConnectBaselineCPU public API implementation Wire protocol format and dispatcher for virConnectBaselineCPU Implement cpuBaseline in remote and qemu drivers cpu-baseline command for virsh daemon/remote.c | 25 +++++++ daemon/remote_dispatch_args.h | 1 + daemon/remote_dispatch_prototypes.h | 8 ++ daemon/remote_dispatch_ret.h | 1 + daemon/remote_dispatch_table.h | 5 ++ include/libvirt/libvirt.h.in | 18 +++++ src/cpu/cpu.c | 125 ++++++++++++++++++++++++++++++++++- src/cpu/cpu.h | 23 ++++++- src/cpu/cpu_generic.c | 104 ++++++++++++++++++++++++++++- src/cpu/cpu_x86.c | 88 ++++++++++++++++++++++++- src/driver.h | 6 ++ src/esx/esx_driver.c | 1 + src/libvirt.c | 57 ++++++++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 5 ++ src/lxc/lxc_driver.c | 1 + src/opennebula/one_driver.c | 1 + src/openvz/openvz_driver.c | 1 + src/phyp/phyp_driver.c | 1 + src/qemu/qemu_driver.c | 14 ++++ src/remote/remote_driver.c | 32 +++++++++ src/remote/remote_protocol.c | 24 +++++++- src/remote/remote_protocol.h | 20 ++++++ src/remote/remote_protocol.x | 18 +++++- src/test/test_driver.c | 1 + src/uml/uml_driver.c | 1 + src/vbox/vbox_tmpl.c | 1 + src/xen/xen_driver.c | 1 + tools/virsh.c | 72 ++++++++++++++++++++ tools/virsh.pod | 8 ++ 30 files changed, 658 insertions(+), 7 deletions(-)

3 15

[libvirt] [PATCH] Add cpu_generic.c to the list of translated files
by Jiri Denemark 11 Feb '10

11 Feb '10

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- po/POTFILES.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 3e6440e..6655005 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -12,6 +12,7 @@ src/conf/secret_conf.c src/conf/storage_conf.c src/conf/storage_encryption_conf.c src/cpu/cpu.c +src/cpu/cpu_generic.c src/cpu/cpu_map.c src/cpu/cpu_x86.c src/datatypes.c -- 1.6.6.1

2 1

[libvirt] [PATCH] Fix crash in LXC driver open method when URI has no path
by Daniel P. Berrange 11 Feb '10

11 Feb '10

If giving a lxc:// URI instead of lxc:/// the open method would crash ona NULL pointer * src/lxc/lxc_driver.c: Cope with a NULL URI path --- src/lxc/lxc_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 1a73ca6..6d568a3 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -126,7 +126,8 @@ static virDrvOpenStatus lxcOpen(virConnectPtr conn, return VIR_DRV_OPEN_DECLINED; /* If path isn't '/' then they typoed, tell them correct path */ - if (STRNEQ(conn->uri->path, "/")) { + if (conn->uri->path != NULL && + STRNEQ(conn->uri->path, "/")) { lxcError(VIR_ERR_INTERNAL_ERROR, _("Unexpected LXC URI path '%s', try lxc:///"), conn->uri->path); -- 1.6.5.2

2 1

[libvirt] [PATCH] Fix USB device path formatting mixup
by Daniel P. Berrange 11 Feb '10

11 Feb '10

* src/util/hostusb.c: The device path for a USB device wants the bus/device IDs in decimal not octal --- src/util/hostusb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/hostusb.c b/src/util/hostusb.c index 3cce66b..bf96539 100644 --- a/src/util/hostusb.c +++ b/src/util/hostusb.c @@ -184,7 +184,7 @@ usbGetDevice(unsigned bus, snprintf(dev->name, sizeof(dev->name), "%.3o:%.3o", dev->bus, dev->dev); snprintf(dev->path, sizeof(dev->path), - USB_DEVFS "%03o/%03o", dev->bus, dev->dev); + USB_DEVFS "%03d/%03d", dev->bus, dev->dev); /* XXX fixme. this should be product/vendor */ snprintf(dev->id, sizeof(dev->id), "%d %d", dev->bus, dev->dev); -- 1.6.5.2

2 1

[libvirt] [PATCH] Support 'block_passwd' command for QEMU disk encryption
by Daniel P. Berrange 11 Feb '10

11 Feb '10

The old text mode monitor prompts for a password when disks are encrypted. This interactive approach doesn't work for JSON mode monitor. Thus there is a new 'block_passwd' command that can be used. * src/qemu/qemu_driver.c: Split out code for looking up a disk secret from findVolumeQcowPassphrase, into a new method getVolumeQcowPassphrase. Enhance qemuInitPasswords() to also set the disk encryption password via the monitor * src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h, src/qemu/qemu_monitor_json.c, src/qemu/qemu_monitor_json.h, src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h: Add support for the 'block_passwd' monitor command. --- src/qemu/qemu_driver.c | 117 +++++++++++++++++++++++++++++------------- src/qemu/qemu_monitor.c | 15 +++++ src/qemu/qemu_monitor.h | 4 ++ src/qemu/qemu_monitor_json.c | 33 ++++++++++++ src/qemu/qemu_monitor_json.h | 4 ++ src/qemu/qemu_monitor_text.c | 47 +++++++++++++++++ src/qemu/qemu_monitor_text.h | 4 ++ 7 files changed, 188 insertions(+), 36 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0d77d57..03d0f5f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -694,51 +694,46 @@ qemuHandleMonitorEOF(qemuMonitorPtr mon ATTRIBUTE_UNUSED, } -static virStorageEncryptionPtr -findDomainDiskEncryption(virDomainObjPtr vm, - const char *path) +static virDomainDiskDefPtr +findDomainDiskByPath(virDomainObjPtr vm, + const char *path) { - bool seen_volume; int i; - seen_volume = false; for (i = 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk; disk = vm->def->disks[i]; - if (disk->src != NULL && STREQ(disk->src, path)) { - seen_volume = true; - if (disk->encryption != NULL) - return disk->encryption; - } + if (disk->src != NULL && STREQ(disk->src, path)) + return disk; } - if (seen_volume) - qemuReportError(VIR_ERR_INVALID_DOMAIN, - _("missing <encryption> for volume %s"), path); - else - qemuReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected passphrase request for volume %s"), - path); + + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("no disk found with path %s"), + path); return NULL; } - static int -findVolumeQcowPassphrase(qemuMonitorPtr mon ATTRIBUTE_UNUSED, - virConnectPtr conn, - virDomainObjPtr vm, - const char *path, - char **secretRet, - size_t *secretLen) +getVolumeQcowPassphrase(virConnectPtr conn, + virDomainDiskDefPtr disk, + char **secretRet, + size_t *secretLen) { - virStorageEncryptionPtr enc; virSecretPtr secret; char *passphrase; unsigned char *data; size_t size; int ret = -1; + virStorageEncryptionPtr enc; - virDomainObjLock(vm); + if (!disk->encryption) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("disk %s does not have any encryption information"), + disk->src); + return -1; + } + enc = disk->encryption; if (!conn) { qemuReportError(VIR_ERR_NO_SUPPORT, @@ -754,16 +749,12 @@ findVolumeQcowPassphrase(qemuMonitorPtr mon ATTRIBUTE_UNUSED, goto cleanup; } - enc = findDomainDiskEncryption(vm, path); - if (enc == NULL) - return -1; - if (enc->format != VIR_STORAGE_ENCRYPTION_FORMAT_QCOW || enc->nsecrets != 1 || enc->secrets[0]->type != VIR_STORAGE_ENCRYPTION_SECRET_TYPE_PASSPHRASE) { qemuReportError(VIR_ERR_INVALID_DOMAIN, - _("invalid <encryption> for volume %s"), path); + _("invalid <encryption> for volume %s"), disk->src); goto cleanup; } @@ -782,7 +773,7 @@ findVolumeQcowPassphrase(qemuMonitorPtr mon ATTRIBUTE_UNUSED, VIR_FREE(data); qemuReportError(VIR_ERR_INVALID_SECRET, _("format='qcow' passphrase for %s must not contain a " - "'\\0'"), path); + "'\\0'"), disk->src); goto cleanup; } @@ -804,8 +795,30 @@ findVolumeQcowPassphrase(qemuMonitorPtr mon ATTRIBUTE_UNUSED, ret = 0; cleanup: - virDomainObjUnlock(vm); + return ret; +} +static int +findVolumeQcowPassphrase(qemuMonitorPtr mon ATTRIBUTE_UNUSED, + virConnectPtr conn, + virDomainObjPtr vm, + const char *path, + char **secretRet, + size_t *secretLen) +{ + virDomainDiskDefPtr disk; + int ret = -1; + + virDomainObjLock(vm); + disk = findDomainDiskByPath(vm, path); + + if (!disk) + goto cleanup; + + ret = getVolumeQcowPassphrase(conn, disk, secretRet, secretLen); + +cleanup: + virDomainObjUnlock(vm); return ret; } @@ -1681,8 +1694,10 @@ qemudInitCpuAffinity(virDomainObjPtr vm) static int -qemuInitPasswords(struct qemud_driver *driver, - virDomainObjPtr vm) { +qemuInitPasswords(virConnectPtr conn, + struct qemud_driver *driver, + virDomainObjPtr vm, + unsigned long long qemuCmdFlags) { int ret = 0; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -1698,6 +1713,36 @@ qemuInitPasswords(struct qemud_driver *driver, qemuDomainObjExitMonitorWithDriver(driver, vm); } + if (ret < 0) + goto cleanup; + + if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) { + int i; + + for (i = 0 ; i < vm->def->ndisks ; i++) { + char *secret; + size_t secretLen; + + if (!vm->def->disks[i]->encryption || + !vm->def->disks[i]->src) + continue; + + if (getVolumeQcowPassphrase(conn, + vm->def->disks[i], + &secret, &secretLen) < 0) + goto cleanup; + + qemuDomainObjEnterMonitorWithDriver(driver, vm); + ret = qemuMonitorSetDrivePassphrase(priv->mon, + vm->def->disks[i]->info.alias, + secret); + qemuDomainObjExitMonitorWithDriver(driver, vm); + if (ret < 0) + goto cleanup; + } + } + +cleanup: return ret; } @@ -2721,7 +2766,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, if (qemudInitCpuAffinity(vm) < 0) goto abort; - if (qemuInitPasswords(driver, vm) < 0) + if (qemuInitPasswords(conn, driver, vm, qemuCmdFlags) < 0) goto abort; /* If we have -device, then addresses are assigned explicitly. diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 64c6cba..c1d369b 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1331,3 +1331,18 @@ int qemuMonitorAddDrive(qemuMonitorPtr mon, ret = qemuMonitorTextAddDrive(mon, drivestr); return ret; } + + +int qemuMonitorSetDrivePassphrase(qemuMonitorPtr mon, + const char *alias, + const char *passphrase) +{ + DEBUG("mon=%p, fd=%d alias=%s passphrase=%p(value hidden)", mon, mon->fd, alias, passphrase); + int ret; + + if (mon->json) + ret = qemuMonitorJSONSetDrivePassphrase(mon, alias, passphrase); + else + ret = qemuMonitorTextSetDrivePassphrase(mon, alias, passphrase); + return ret; +} diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index a330eff..786ad7a 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -291,4 +291,8 @@ int qemuMonitorAddDevice(qemuMonitorPtr mon, int qemuMonitorAddDrive(qemuMonitorPtr mon, const char *drivestr); +int qemuMonitorSetDrivePassphrase(qemuMonitorPtr mon, + const char *alias, + const char *passphrase); + #endif /* QEMU_MONITOR_H */ diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 032afef..c9b8d60 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1841,3 +1841,36 @@ int qemuMonitorJSONAddDrive(qemuMonitorPtr mon, virJSONValueFree(reply); return ret; } + + +int qemuMonitorJSONSetDrivePassphrase(qemuMonitorPtr mon, + const char *alias, + const char *passphrase) +{ + int ret; + virJSONValuePtr cmd; + virJSONValuePtr reply = NULL; + char *drive; + + if (virAsprintf(&drive, "%s%s", QEMU_DRIVE_HOST_PREFIX, alias) < 0) { + virReportOOMError(); + return -1; + } + + cmd = qemuMonitorJSONMakeCommand("block_passwd", + "s:device", drive, + "s:password", passphrase, + NULL); + VIR_FREE(drive); + if (!cmd) + return -1; + + ret = qemuMonitorJSONCommand(mon, cmd, &reply); + + if (ret == 0) + ret = qemuMonitorJSONCheckError(cmd, reply); + + virJSONValueFree(cmd); + virJSONValueFree(reply); + return ret; +} diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index ac6458c..65a70e3 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -162,4 +162,8 @@ int qemuMonitorJSONAddDevice(qemuMonitorPtr mon, int qemuMonitorJSONAddDrive(qemuMonitorPtr mon, const char *drivestr); +int qemuMonitorJSONSetDrivePassphrase(qemuMonitorPtr mon, + const char *alias, + const char *passphrase); + #endif /* QEMU_MONITOR_JSON_H */ diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index a6a4598..e993699 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -2127,3 +2127,50 @@ cleanup: VIR_FREE(safe_str); return ret; } + + +int qemuMonitorTextSetDrivePassphrase(qemuMonitorPtr mon, + const char *alias, + const char *passphrase) +{ + char *cmd = NULL; + char *reply = NULL; + int ret = -1; + char *safe_str; + + safe_str = qemuMonitorEscapeArg(passphrase); + if (!safe_str) { + virReportOOMError(); + return -1; + } + + ret = virAsprintf(&cmd, "block_passwd %s%s \"%s\"", QEMU_DRIVE_HOST_PREFIX, alias, safe_str); + if (ret == -1) { + virReportOOMError(); + goto cleanup; + } + + if (qemuMonitorCommand(mon, cmd, &reply) < 0) { + qemuReportError(VIR_ERR_OPERATION_FAILED, + _("failed to close fd in qemu with '%s'"), cmd); + goto cleanup; + } + + if (strstr(reply, "\nunknown command:")) { + qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("setting disk password is not supported")); + goto cleanup; + } else if (strstr(reply, "The entered password is invalid")) { + qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("the disk password is incorrect")); + goto cleanup; + } + + ret = 0; + +cleanup: + VIR_FREE(cmd); + VIR_FREE(reply); + VIR_FREE(safe_str); + return ret; +} diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h index 12d75f5..1937e99 100644 --- a/src/qemu/qemu_monitor_text.h +++ b/src/qemu/qemu_monitor_text.h @@ -166,4 +166,8 @@ int qemuMonitorTextAddDevice(qemuMonitorPtr mon, int qemuMonitorTextAddDrive(qemuMonitorPtr mon, const char *drivestr); +int qemuMonitorTextSetDrivePassphrase(qemuMonitorPtr mon, + const char *alias, + const char *passphrase); + #endif /* QEMU_MONITOR_TEXT_H */ -- 1.6.5.2

2 2

[libvirt] [PATCH 5/5] macvtap support for libvirt -- schema extensions
by Stefan Berger 11 Feb '10

11 Feb '10

This part extends the domain xml schema to support the new interface type 'direct'. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com>

1 0

[libvirt] [PATCH 4/5] macvtap support for libvirt -- helper code
by Stefan Berger 11 Feb '10

11 Feb '10

This part adds the helper code to setup and tear down macvtap devices using direct communication with the device driver via netlink sockets. The rather short messages received from the netlink layer are now written into a dynamically allocated buffer. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com>

1 0

[libvirt] [PATCH 3/5] macvtap support for libvirt -- qemu support
by Stefan Berger 11 Feb '10

11 Feb '10

This part adds support for qemu making a macvtap tap device available via file descriptor passed to qemu command line. This also attempts to tear down the macvtap device when a VM terminates. This includes support for attachment and detachment to/from running VM. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com>

1 0

[libvirt] [PATCH 2/5] macvtap support for libvirt -- parse new interface XML
by Stefan Berger 11 Feb '10

11 Feb '10

This part adds support to domain_conf.{c|h} for parsing the new interface XML of type 'direct'. The parsed mode is now stored as an int. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com>

1 0

[libvirt] [PATCH 1/5] macvtap support for libvirt -- build support
by Stefan Berger 11 Feb '10

11 Feb '10

This patch adds build support for libvirt checking for certain contents of /usr/include/linux/if_link.h to see whether macvtap support is compilable on that system. One can disable macvtap support in libvirt via --without-macvtap passed to configure. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com>

1 0