- Devel - libvirt List Archives

[libvirt] [PATCH] Fix incorrect use of private data in remote driver
by Daniel P. Berrange 22 Jul '10

22 Jul '10

For upstream bug https://bugzilla.redhat.com/show_bug.cgi?id=576796 The remote driver is using the wrong privateData field in a couple of functions. THis is harmless for stateful drivers like QEMU/UML/LXC, but will crash with Xen * src/remote/remote_driver.c: Fix use of privateData field --- src/remote/remote_driver.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 7052bf1..c9129b1 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4067,7 +4067,7 @@ remoteNetworkIsActive(virNetworkPtr network) int rv = -1; remote_network_is_active_args args; remote_network_is_active_ret ret; - struct private_data *priv = network->conn->privateData; + struct private_data *priv = network->conn->networkPrivateData; remoteDriverLock(priv); @@ -4091,7 +4091,7 @@ remoteNetworkIsPersistent(virNetworkPtr network) int rv = -1; remote_network_is_persistent_args args; remote_network_is_persistent_ret ret; - struct private_data *priv = network->conn->privateData; + struct private_data *priv = network->conn->networkPrivateData; remoteDriverLock(priv); @@ -4622,7 +4622,7 @@ remoteInterfaceIsActive(virInterfacePtr iface) int rv = -1; remote_interface_is_active_args args; remote_interface_is_active_ret ret; - struct private_data *priv = iface->conn->privateData; + struct private_data *priv = iface->conn->interfacePrivateData; remoteDriverLock(priv); @@ -5127,7 +5127,7 @@ remoteStoragePoolIsActive(virStoragePoolPtr pool) int rv = -1; remote_storage_pool_is_active_args args; remote_storage_pool_is_active_ret ret; - struct private_data *priv = pool->conn->privateData; + struct private_data *priv = pool->conn->storagePrivateData; remoteDriverLock(priv); @@ -5151,7 +5151,7 @@ remoteStoragePoolIsPersistent(virStoragePoolPtr pool) int rv = -1; remote_storage_pool_is_persistent_args args; remote_storage_pool_is_persistent_ret ret; - struct private_data *priv = pool->conn->privateData; + struct private_data *priv = pool->conn->storagePrivateData; remoteDriverLock(priv); -- 1.5.5.6 -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.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

[libvirt] [PATCH (v2)] Fix PCI address assignment if no IDE controller is present
by Daniel P. Berrange 22 Jul '10

22 Jul '10

The previous patch was flawed because it forgot to take into account pre-reserved addresses The PCI slot 1 must be reserved at all times, since PIIX3 is always present, even if no IDE device is in use for guest disks * src/qemu/qemu_conf.c: Always reserve slot 1 for PIIX3 --- src/qemu/qemu_conf.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 23e418b..0f1526d 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2271,19 +2271,23 @@ int qemuDomainPCIAddressSetNextAddr(qemuDomainPCIAddressSetPtr addrs, * - VirtIO balloon * - Host device passthrough * - Watchdog + * + * Prior to this function being invoked, qemuCollectPCIAddress() will have + * added all existing PCI addresses from the 'def' to 'addrs'. Thus this + * function must only try to reserve addresses if info.type == NONE and + * skip over info.type == PCI */ int qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) { int i; + bool reservedIDE = false; /* Host bridge */ if (qemuDomainPCIAddressReserveSlot(addrs, 0) < 0) goto error; - /* PIIX3 (ISA bridge, IDE controller, something else unknown, USB controller) - * hardcoded slot=1, multifunction device - */ + /* Verify that first IDE controller (if any) is on the PIIX3, fn 1 */ for (i = 0; i < def->ncontrollers ; i++) { /* First IDE controller lives on the PIIX3 at slot=1, function=1 */ if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE && @@ -2297,18 +2301,26 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) _("Primary IDE controller must have PCI address 0:0:1.1")); goto error; } + /* If TYPE==PCI, then then qemuCollectPCIAddress() function + * has already reserved the address, so we must skip */ + reservedIDE = true; } else { def->controllers[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; def->controllers[i]->info.addr.pci.domain = 0; def->controllers[i]->info.addr.pci.bus = 0; def->controllers[i]->info.addr.pci.slot = 1; def->controllers[i]->info.addr.pci.function = 1; - if (qemuDomainPCIAddressReserveSlot(addrs, 1) < 0) - goto error; } } } + /* PIIX3 (ISA bridge, IDE controller, something else unknown, USB controller) + * hardcoded slot=1, multifunction device + */ + if (!reservedIDE && + qemuDomainPCIAddressReserveSlot(addrs, 1) < 0) + goto error; + /* First VGA is hardcoded slot=2 */ if (def->nvideos > 0) { if (def->videos[0]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { -- 1.7.1.1

2 1

[libvirt] [PATCH] Properly report failure to create raw storage volume files
by Laine Stump 21 Jul '10

21 Jul '10

We were previously checking for a return < 0 from virFileOperation(), but that function returns a standard errno, which is 0 on success, or some small positive number on failure. The result was that we wouldn't report failures to create storage volume files; instead they would appear to be created, but then would vanish as soon as a pool-refresh was done (or cause some later error as soon as someone tried to access the volume). The other uses of virFileOperation() were already properly checking for != 0. --- src/storage/storage_backend.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index aba8937..9792eed 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -362,7 +362,7 @@ virStorageBackendCreateRaw(virConnectPtr conn ATTRIBUTE_UNUSED, createRawFileOpHook, &hdata, VIR_FILE_OP_FORCE_PERMS | (pool->def->type == VIR_STORAGE_POOL_NETFS - ? VIR_FILE_OP_AS_UID : 0))) < 0) { + ? VIR_FILE_OP_AS_UID : 0))) != 0) { virReportSystemError(createstat, _("cannot create path '%s'"), vol->target.path); -- 1.7.1.1

4 17

Re: [libvirt] A problem in live migration
by Alex Jia 21 Jul '10

21 Jul '10

I am not sure if libvirt has resolved hostname and ip mapping problem, it had better that two hosts have same domain name, such as "dhcp-1-2-3.nay.redhat.com" and "dhcp-4-5-6.nay.redhat.com". In addition, I haven't seen your any storage pool information on two hosts, you need to create a sharing storage such as nfs sharing folder, and your guest is in the storage, of course, you may also manually mount your nfs folder to target host instead of creating storage pool. Best Regards, Alex ----- Original Message ----- From: "姚远" <sihuyy(a)gmail.com> To: libvir-list(a)redhat.com Sent: Wednesday, July 21, 2010 3:39:15 PM GMT +08:00 Beijing / Chongqing / Hong Kong / Urumqi Subject: [libvirt] A problem in live migration In virsh, I use command "migrate --live 1 qemu+ssh:// 10.1.10.60/system " to do live migration,but it shows error "internal error hostname on destination resolved to localhost, but migration requires an FQDN". I don't know why, and who do live migration successfully can help me. Thank you! My source and destination system are all fedora-13-x86_64, and the version of libvirt is 0.8.2 -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list

3 2

[libvirt] [PATCH] Fix PCI address assignment if no IDE controller is present
by Daniel P. Berrange 21 Jul '10

21 Jul '10

The PCI slot 1 must be reserved at all times, since PIIX3 is always present, even if no IDE device is in use for guest disks * src/qemu/qemu_conf.c: Always reserve slot 1 for PIIX3 --- src/qemu/qemu_conf.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 23e418b..6ce9c9e 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2284,6 +2284,10 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) /* PIIX3 (ISA bridge, IDE controller, something else unknown, USB controller) * hardcoded slot=1, multifunction device */ + if (qemuDomainPCIAddressReserveSlot(addrs, 1) < 0) + goto error; + + /* Verify that first IDE controller (if any) is on the PIIX3, fn 1 */ for (i = 0; i < def->ncontrollers ; i++) { /* First IDE controller lives on the PIIX3 at slot=1, function=1 */ if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE && @@ -2303,8 +2307,6 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) def->controllers[i]->info.addr.pci.bus = 0; def->controllers[i]->info.addr.pci.slot = 1; def->controllers[i]->info.addr.pci.function = 1; - if (qemuDomainPCIAddressReserveSlot(addrs, 1) < 0) - goto error; } } } -- 1.7.1.1

2 1

[libvirt] [PATCH] Document the memory balloon device
by Daniel P. Berrange 21 Jul '10

21 Jul '10

* formatdomain.html.in: Document <memballoon> element --- docs/formatdomain.html.in | 47 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 4cca67f..3e80312 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1506,6 +1506,53 @@ qemu-kvm -net nic,model=? /dev/null </dd> </dl> + <h4><a name="elementsMemBalloon">Memory balloon device</a></h4> + + <p> + A virtual memory balloon device is added to all Xen and KVM/QEMU + guests. It will be seen as <code>memballoon</code> element. + It will be automatically added when appropriate, so there is no + need to explicitly add this element in the guest XML unless a + specific PCI slot needs to be assigned. + <span class="since">Since 0.8.3, Xen, QEMU and KVM only</span> + </p> + + <p> + Example automatically added device with KVM + </p> +<pre> + ... + <devices> + <memballoon model='virtio'/> + </devices> + ...</pre> + + <p> + Example manually added device with static PCI slot 2 requested + </p> +<pre> + ... + <devices> + <watchdog model='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </devices> +</domain></pre> + + <dl> + <dt><code>model</code></dt> + <dd> + <p> + The required <code>model</code> attribute specifies what type + of balloon device is provided. Valid values are specific to + the virtualization platform + </p> + <ul> + <li>'virtio' — default with QEMU/KVM</li> + <li>'xen' — default with Xen</li> + </ul> + </dd> + </dl> + <h2><a name="examples">Example configs</a></h2> <p> -- 1.7.1.1

2 1

[libvirt] [PATCH] Implement support for virtio plan9fs filesystem passthrough in QEMU
by Daniel P. Berrange 21 Jul '10

21 Jul '10

Make use of the existing <filesystem> element to support plan9fs filesystem passthrough in the QEMU driver <filesystem type='mount'> <source dir='/export/to/guest'/> <target dir='/import/from/host'/> </filesystem> NB, the target is not actually a directory, it is merely a arbitrary string tag that is exported to the guest as a hint for where to mount it. --- src/qemu/qemu_conf.c | 96 +++++++++++++++++++++++++ src/qemu/qemu_conf.h | 5 ++ tests/qemuxml2argvdata/qemuxml2argv-fs9p.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml | 28 +++++++ tests/qemuxml2argvtest.c | 2 + 5 files changed, 132 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fs9p.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 3e35c57..23e418b 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1205,6 +1205,8 @@ static unsigned long long qemudComputeCmdFlags(const char *help, flags |= QEMUD_CMD_FLAG_NO_KVM_PIT; if (strstr(help, "-tdf")) flags |= QEMUD_CMD_FLAG_TDF; + if (strstr(help, "-fsdev")) + flags |= QEMUD_CMD_FLAG_FSDEV; /* Keep disabled till we're actually ready to turn on netdev mode * The plan is todo it in 0.13.0 QEMU, but lets wait & see... */ @@ -1987,6 +1989,10 @@ qemuAssignDeviceAliases(virDomainDefPtr def, unsigned long long qemuCmdFlags) if (!(qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) return 0; + for (i = 0; i < def->nfss ; i++) { + if (virAsprintf(&def->fss[i]->info.alias, "fs%d", i) < 0) + goto no_memory; + } for (i = 0; i < def->nsounds ; i++) { if (virAsprintf(&def->sounds[i]->info.alias, "sound%d", i) < 0) goto no_memory; @@ -2324,6 +2330,15 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) goto error; } } + for (i = 0; i < def->nfss ; i++) { + if (def->fss[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) + continue; + + /* Only support VirtIO-9p-pci so far. If that changes, + * we might need to skip devices here */ + if (qemuDomainPCIAddressSetNextAddr(addrs, &def->fss[i]->info) < 0) + goto error; + } /* Network interfaces */ for (i = 0; i < def->nnets ; i++) { @@ -2713,6 +2728,64 @@ error: } +char *qemuBuildFSStr(virDomainFSDefPtr fs, + unsigned long long qemuCmdFlags ATTRIBUTE_UNUSED) +{ + virBuffer opt = VIR_BUFFER_INITIALIZER; + + if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("can only passthrough directories")); + goto error; + } + + virBufferAddLit(&opt, "local,security_model=mapped"); + virBufferVSprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); + virBufferVSprintf(&opt, ",path=%s", fs->src); + + if (virBufferError(&opt)) { + virReportOOMError(); + goto error; + } + + return virBufferContentAndReset(&opt); + +error: + virBufferFreeAndReset(&opt); + return NULL; +} + + +char * +qemuBuildFSDevStr(virDomainFSDefPtr fs) +{ + virBuffer opt = VIR_BUFFER_INITIALIZER; + + if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("can only passthrough directories")); + goto error; + } + + virBufferAddLit(&opt, "virtio-9p-pci"); + virBufferVSprintf(&opt, ",id=%s", fs->info.alias); + virBufferVSprintf(&opt, ",fsdev=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); + virBufferVSprintf(&opt, ",mount_tag=%s", fs->dst); + qemuBuildDeviceAddressStr(&opt, &fs->info); + + if (virBufferError(&opt)) { + virReportOOMError(); + goto error; + } + + return virBufferContentAndReset(&opt); + +error: + virBufferFreeAndReset(&opt); + return NULL; +} + + char * qemuBuildControllerDevStr(virDomainControllerDefPtr def) { @@ -4274,6 +4347,29 @@ int qemudBuildCommandLine(virConnectPtr conn, } } + if (qemuCmdFlags & QEMUD_CMD_FLAG_FSDEV) { + for (i = 0 ; i < def->nfss ; i++) { + char *optstr; + virDomainFSDefPtr fs = def->fss[i]; + + ADD_ARG_LIT("-fsdev"); + if (!(optstr = qemuBuildFSStr(fs, qemuCmdFlags))) + goto error; + ADD_ARG(optstr); + + ADD_ARG_LIT("-device"); + if (!(optstr = qemuBuildFSDevStr(fs))) + goto error; + ADD_ARG(optstr); + } + } else { + if (def->nfss) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("filesystem passthrough not supported by this QEMU")); + goto error; + } + } + if (!def->nnets) { /* If we have -device, then we set -nodefault already */ if (!(qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index ca4559f..68f10eb 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -91,6 +91,7 @@ enum qemud_cmd_flags { QEMUD_CMD_FLAG_TDF = (1LL << 35), /* -tdf flag (user-mode pit catchup) */ QEMUD_CMD_FLAG_PCI_CONFIGFD = (1LL << 36), /* pci-assign.configfd */ QEMUD_CMD_FLAG_NODEFCONFIG = (1LL << 37), /* -nodefconfig */ + QEMUD_CMD_FLAG_FSDEV = (1LL << 38), /* -fstype filesystem passthrough */ }; /* Main driver state */ @@ -175,6 +176,7 @@ typedef qemuDomainPCIAddressSet *qemuDomainPCIAddressSetPtr; # define QEMU_DRIVE_HOST_PREFIX "drive-" # define QEMU_VIRTIO_SERIAL_PREFIX "virtio-serial" +# define QEMU_FSDEV_HOST_PREFIX "fsdev-" # define qemuReportError(code, ...) \ virReportErrorHelper(NULL, VIR_FROM_QEMU, code, __FILE__, \ @@ -235,9 +237,12 @@ char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk, char *qemuBuildDriveStr(virDomainDiskDefPtr disk, int bootable, unsigned long long qemuCmdFlags); +char *qemuBuildFSStr(virDomainFSDefPtr fs, + unsigned long long qemuCmdFlags); /* Current, best practice */ char * qemuBuildDriveDevStr(virDomainDiskDefPtr disk); +char * qemuBuildFSDevStr(virDomainFSDefPtr fs); /* Current, best practice */ char * qemuBuildControllerDevStr(virDomainControllerDefPtr def); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args new file mode 100644 index 0000000..42c26a2 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefaults -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -fsdev local,id=fsdev-fs0,path=/export/to/guest -device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,bus=pci.0,addr=0x4 -usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml new file mode 100644 index 0000000..9072ead --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml @@ -0,0 +1,28 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>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' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <filesystem type='mount'> + <source dir='/export/to/guest'/> + <target dir='/import/from/host'/> + </filesystem> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 24002b8..10d1342 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -357,6 +357,8 @@ mymain(int argc, char **argv) DO_TEST("sound", 0); DO_TEST("sound-device", QEMUD_CMD_FLAG_DEVICE | QEMUD_CMD_FLAG_NODEFCONFIG); + DO_TEST("fs9p", QEMUD_CMD_FLAG_DEVICE | + QEMUD_CMD_FLAG_NODEFCONFIG | QEMUD_CMD_FLAG_FSDEV); DO_TEST("hostdev-usb-address", 0); DO_TEST("hostdev-usb-address-device", QEMUD_CMD_FLAG_DEVICE | -- 1.7.1.1

2 1

[libvirt] [PATCH 0/4] Re-arrange PCI device ordering
by Daniel P. Berrange 21 Jul '10

21 Jul '10

In an attempt to provide better compatability with older QEMU where static PCI device ordering wasn't available, we re-arrange our device address assignment code. We now try to assign addresses in the same order as QEMU would. This should upset Windows less.

4 17

[libvirt] [PATCH] Set a stable & high MAC addr for guest TAP devices on host
by Daniel P. Berrange 21 Jul '10

21 Jul '10

A Linux software bridge will assume the MAC address of the enslaved interface with the numerically lowest MAC addr. When the bridge changes MAC address there is a period of network blackout, so a change should be avoided. The kernel gives TAP devices a completely random MAC address. Occassionally the random TAP device MAC is lower than that of the physical interface (eth0, eth1etc) that is enslaved, causing the bridge to change its MAC. This change sets an explicit MAC address for all TAP devices created using the configured MAC from the XML, but with the high byte set to 0xFE. This should ensure TAP device MACs are higher than any physical interface MAC. * src/qemu/qemu_conf.c, src/uml/uml_conf.c: Pass in a MAC addr for the TAP device with high byte set to 0xFE * src/util/bridge.c, src/util/bridge.h: Set a MAC when creating the TAP device to override random MAC --- src/qemu/qemu_conf.c | 11 +++++++++-- src/uml/uml_conf.c | 11 +++++++++-- src/util/bridge.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/util/bridge.h | 3 ++- 4 files changed, 62 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index ad41457..d721fcc 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1608,6 +1608,7 @@ qemudNetworkIfaceConnect(virConnectPtr conn, int tapfd = -1; int vnet_hdr = 0; int template_ifname = 0; + unsigned char tapmac[VIR_MAC_BUFLEN]; if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) { int active, fail = 0; @@ -1675,8 +1676,14 @@ qemudNetworkIfaceConnect(virConnectPtr conn, net->model && STREQ(net->model, "virtio")) vnet_hdr = 1; - if ((err = brAddTap(driver->brctl, brname, - &net->ifname, vnet_hdr, &tapfd))) { + memcpy(tapmac, net->mac, VIR_MAC_BUFLEN); + tapmac[0] = 0xFE; /* Discourage bridge from using TAP dev MAC */ + if ((err = brAddTap(driver->brctl, + brname, + &net->ifname, + tapmac, + vnet_hdr, + &tapfd))) { if (errno == ENOTSUP) { /* In this particular case, give a better diagnostic. */ qemuReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index 785d627..ea40efb 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -113,6 +113,7 @@ umlConnectTapDevice(virDomainNetDefPtr net, int tapfd = -1; int template_ifname = 0; int err; + unsigned char tapmac[VIR_MAC_BUFLEN]; if ((err = brInit(&brctl))) { virReportSystemError(err, "%s", @@ -130,8 +131,14 @@ umlConnectTapDevice(virDomainNetDefPtr net, template_ifname = 1; } - if ((err = brAddTap(brctl, bridge, - &net->ifname, BR_TAP_PERSIST, &tapfd))) { + memcpy(tapmac, net->mac, VIR_MAC_BUFLEN); + tapmac[0] = 0xFE; /* Discourage bridge from using TAP dev MAC */ + if ((err = brAddTap(brctl, + bridge, + &net->ifname, + tapmac, + 0, + &tapfd))) { if (errno == ENOTSUP) { /* In this particular case, give a better diagnostic. */ umlReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/util/bridge.c b/src/util/bridge.c index b236f80..7d0caae 100644 --- a/src/util/bridge.c +++ b/src/util/bridge.c @@ -285,6 +285,38 @@ brDeleteInterface(brControl *ctl ATTRIBUTE_UNUSED, # endif /** + * ifSetInterfaceMac: + * @ctl: bridge control pointer + * @ifname: interface name to set MTU for + * @macaddr: MAC address (VIR_MAC_BUFLEN in size) + * + * This function sets the @macaddr for a given interface @ifname. This + * gets rid of the kernel's automatically assigned random MAC. + * + * Returns 0 in case of success or an errno code in case of failure. + */ +static int ifSetInterfaceMac(brControl *ctl, const char *ifname, + const unsigned char *macaddr) +{ + struct ifreq ifr; + + if (!ctl || !ifname) + return EINVAL; + + memset(&ifr, 0, sizeof(struct ifreq)); + if (virStrcpyStatic(ifr.ifr_name, ifname) == NULL) + return EINVAL; + + /* To fill ifr.ifr_hdaddr.sa_family field */ + if (ioctl(ctl->fd, SIOCGIFHWADDR, &ifr) != 0) + return errno; + + memcpy(ifr.ifr_hwaddr.sa_data, macaddr, VIR_MAC_BUFLEN); + + return ioctl(ctl->fd, SIOCSIFHWADDR, &ifr) == 0 ? 0 : errno; +} + +/** * ifGetMtu * @ctl: bridge control pointer * @ifname: interface name get MTU for @@ -430,6 +462,7 @@ brProbeVnetHdr(int tapfd) * @ctl: bridge control pointer * @bridge: the bridge name * @ifname: the interface name (or name template) + * @macaddr: desired MAC address (VIR_MAC_BUFLEN long) * @vnet_hdr: whether to try enabling IFF_VNET_HDR * @tapfd: file descriptor return value for the new tap device * @@ -447,6 +480,7 @@ int brAddTap(brControl *ctl, const char *bridge, char **ifname, + const unsigned char *macaddr, int vnet_hdr, int *tapfd) { @@ -478,6 +512,14 @@ brAddTap(brControl *ctl, if (ioctl(fd, TUNSETIFF, &ifr) < 0) goto error; + /* We need to set the interface MAC before adding it + * to the bridge, because the bridge assumes the lowest + * MAC of all enslaved interfaces & we don't want it + * seeing the kernel allocate random MAC for the TAP + * device before we set our static MAC. + */ + if ((errno = ifSetInterfaceMac(ctl, ifr.ifr_name, macaddr))) + goto error; /* We need to set the interface MTU before adding it * to the bridge, because the bridge will have its * MTU adjusted automatically when we add the new interface. diff --git a/src/util/bridge.h b/src/util/bridge.h index d37d7db..96696ac 100644 --- a/src/util/bridge.h +++ b/src/util/bridge.h @@ -68,7 +68,8 @@ enum { int brAddTap (brControl *ctl, const char *bridge, char **ifname, - int features, + const unsigned char *macaddr, + int vnet_hdr, int *tapfd); int brDeleteTap (brControl *ctl, -- 1.7.1.1

2 1

[libvirt] A problem in live migration
by 姚远 21 Jul '10

21 Jul '10

In virsh, I use command "migrate --live 1 qemu+ssh://10.1.10.60/system" to do live migration,but it shows error "internal error hostname on destination resolved to localhost, but migration requires an FQDN". I don't know why, and who do live migration successfully can help me. Thank you! My source and destination system are all fedora-13-x86_64, and the version of libvirt is 0.8.2

1 0

[libvirt] How to replace the management procedure in the virsh
by 姚远 21 Jul '10

21 Jul '10

In virsh, I usr "version" and it shows 编译使用的库：libvir 0.8.2 使用的库：libvir 0.8.2 使用的 API: QEMU 0.8.2 运行管理程序: QEMU 0.9.1 I want to replace QEMU 0.9.1 to QEMU 0.12.2, because 0.12.2 adds many new functions. I download qemu-kvm-0.12.2.tar.gz and install it, but the management procedure is not replaced. I know I should modify the profile of libvirt but I don't know where it is and how to modify it.

1 0

[libvirt] Unmarshalling error with migrate command
by Doug Goldstein 20 Jul '10

20 Jul '10

Hey guys, I'm using a server running libvirt 0.8.2 and my desktop running libvirt 0.8.2. My desktop has virt-manager 0.8.4 and I've got a Linux VM running on the server. I'm looking to use the new migration support to migrate the VM to my desktop from the server. Everytime I attempt the migration I get an error dialog containing the following (I've actually snagged this out of ~/.virt-manager/virt-manager.log [Wed, 07 Jul 2010 18:13:23 virt-manager 18880] DEBUG (migrate:456) Migrating vm=CentOS-5.4-i686-PAE from qemu+ssh://root@codeine/system to qemu:///system [Wed, 07 Jul 2010 18:13:23 virt-manager 18880] DEBUG (domain:1351) Migrating: conn=<libvirt.virConnect instance at 0x2a305f0> flags=7 dname=None uri=qemu://doug-pc/system rate=0[Wed, 07 Jul 2010 18:13:23 virt-manager 18880] DEBUG (error:86) Uncaught Error: unmarshalling remote_error : Unable to migrate guest: Traceback (most recent call last): File "/usr/share/virt-manager/virtManager/migrate.py", line 457, in _async_migrate vm.migrate(dstconn, migrate_uri, rate, live, secure) File "/usr/share/virt-manager/virtManager/domain.py", line 1352, in migrate self._backend.migrate(destconn.vmm, flags, newname, interface, rate) File "/usr/lib64/python2.6/site-packages/libvirt.py", line 479, in migrate prefer to invoke virDomainMigrateToURI, avoiding the need to libvirtError: unmarshalling remote_error If anyone has any ideas, please let me know. -- Doug Goldstein

2 2

[libvirt] [PATCH 0/2] Fix two problems with creating new storage volumes
by Laine Stump 20 Jul '10

20 Jul '10

Both of these problems can occur only if a new storage volume is created by copying it from an existing volume. The first is a problem if the new volume is longer than the old (the new volume won't be zero-filled at the end), and the second happens if the new and old volumes are the same length (fsync wouldn't be called at the end of writing the new volume) (actually, before the 1st fix is applied, that problem would exist for *all* new volumes created as copies of existing volumes).

2 6

[libvirt] [PATCH] Fix a deadlock in bi-directional p2p concurrent migration.
by Chris Lalancette 20 Jul '10

20 Jul '10

If you try to execute two concurrent migrations p2p from A->B and B->A, the two libvirtd's will deadlock trying to perform the migrations. The reason for this is that in p2p migration, the libvirtd's are responsible for making the RPC Prepare, Migrate, and Finish calls. However, they are currently holding the driver lock while doing so, which basically guarantees deadlock in this scenario. This patch fixes the situation by adding qemuDomainObjEnterRemoteWithDriver and qemuDomainObjExitRemoteWithDriver helper methods. The Enter take an additional object reference, then drops both the domain object lock and the driver lock. The Exit takes both the driver and domain object lock, then drops the reference. Adding calls to these Enter and Exit helpers around remote calls in the various migration methods seems to fix the problem for me in testing. This should make the situation safe. The additional domain object reference ensures that the domain object won't disappear while this operation is happening. The BeginJob that is called inside of qemudDomainMigratePerform ensures that we can't execute a second migrate (or shutdown, or save, etc) job while the migration is active. Finally, the additional check on the state of the vm after we reacquire the locks ensures that we can't be surprised by an external event (domain crash, etc). Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_driver.c | 57 ++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 50 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5f2607c..1eff4bc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -531,6 +531,21 @@ static void qemuDomainObjExitMonitorWithDriver(struct qemud_driver *driver, virD } } +static void qemuDomainObjEnterRemoteWithDriver(struct qemud_driver *driver, + virDomainObjPtr obj) +{ + virDomainObjRef(obj); + virDomainObjUnlock(obj); + qemuDriverUnlock(driver); +} + +static void qemuDomainObjExitRemoteWithDriver(struct qemud_driver *driver, + virDomainObjPtr obj) +{ + qemuDriverLock(driver); + virDomainObjLock(obj); + virDomainObjUnref(obj); +} static int qemuCgroupControllerActive(struct qemud_driver *driver, int controller) @@ -10753,14 +10768,25 @@ static int doTunnelMigrate(virDomainPtr dom, /* virStreamNew only fails on OOM, and it reports the error itself */ goto cleanup; + qemuDomainObjEnterRemoteWithDriver(driver, vm); internalret = dconn->driver->domainMigratePrepareTunnel(dconn, st, flags, dname, resource, dom_xml); + qemuDomainObjExitRemoteWithDriver(driver, vm); if (internalret < 0) /* domainMigratePrepareTunnel sets the error for us */ goto cleanup; + /* the domain may have shutdown or crashed while we had the locks dropped + * in qemuDomainObjEnterRemoteWithDriver, so check again + */ + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("guest unexpectedly quit")); + goto cleanup; + } + /* 3. start migration on source */ qemuDomainObjEnterMonitorWithDriver(driver, vm); if (flags & VIR_MIGRATE_NON_SHARED_DISK) @@ -10833,8 +10859,10 @@ cancel: finish: dname = dname ? dname : dom->name; + qemuDomainObjEnterRemoteWithDriver(driver, vm); ddomain = dconn->driver->domainMigrateFinish2 (dconn, dname, NULL, 0, uri, flags, retval); + qemuDomainObjExitRemoteWithDriver(driver, vm); cleanup: if (client_sock != -1) @@ -10873,19 +10901,32 @@ static int doNonTunnelMigrate(virDomainPtr dom, virDomainPtr ddomain = NULL; int retval = -1; char *uri_out = NULL; + int rc; + qemuDomainObjEnterRemoteWithDriver(driver, vm); /* NB we don't pass 'uri' into this, since that's the libvirtd * URI in this context - so we let dest pick it */ - if (dconn->driver->domainMigratePrepare2(dconn, - NULL, /* cookie */ - 0, /* cookielen */ - NULL, /* uri */ - &uri_out, - flags, dname, - resource, dom_xml) < 0) + rc = dconn->driver->domainMigratePrepare2(dconn, + NULL, /* cookie */ + 0, /* cookielen */ + NULL, /* uri */ + &uri_out, + flags, dname, + resource, dom_xml); + qemuDomainObjExitRemoteWithDriver(driver, vm); + if (rc < 0) /* domainMigratePrepare2 sets the error for us */ goto cleanup; + /* the domain may have shutdown or crashed while we had the locks dropped + * in qemuDomainObjEnterRemoteWithDriver, so check again + */ + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("guest unexpectedly quit")); + goto cleanup; + } + if (uri_out == NULL) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("domainMigratePrepare2 did not set uri")); @@ -10899,8 +10940,10 @@ static int doNonTunnelMigrate(virDomainPtr dom, finish: dname = dname ? dname : dom->name; + qemuDomainObjEnterRemoteWithDriver(driver, vm); ddomain = dconn->driver->domainMigrateFinish2 (dconn, dname, NULL, 0, uri_out, flags, retval); + qemuDomainObjExitRemoteWithDriver(driver, vm); if (ddomain) virUnrefDomain(ddomain); -- 1.7.1.1

2 3

[libvirt] [PATCH] Make virsh setmaxmem balloon only when successful.
by Chris Lalancette 20 Jul '10

20 Jul '10

After playing around with virsh setmaxmem for a bit, I ran into some surprising behavior; if a hypervisor does not support the virDomainSetMaxMemory() API, but the value specified for setmaxmem is less than the current amount of memory in the domain, the domain would be ballooned down *before* an error was reported. To make this more consistent, run virDomainSetMaxMemory() before trying to shrink; that way, if an error is thrown, no changes to the running domain are made. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- tools/virsh.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 0631590..97bfa20 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2529,19 +2529,19 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) return FALSE; } + if (virDomainSetMaxMemory(dom, kilobytes) != 0) { + vshError(ctl, "%s", _("Unable to change MaxMemorySize")); + virDomainFree(dom); + return FALSE; + } + if (kilobytes < info.memory) { if (virDomainSetMemory(dom, kilobytes) != 0) { - virDomainFree(dom); vshError(ctl, "%s", _("Unable to shrink current MemorySize")); - return FALSE; + ret = FALSE; } } - if (virDomainSetMaxMemory(dom, kilobytes) != 0) { - vshError(ctl, "%s", _("Unable to change MaxMemorySize")); - ret = FALSE; - } - virDomainFree(dom); return ret; } -- 1.6.6.1

2 3

[libvirt] [PATCH] Use unsigned long in cmdSetmem.
by Chris Lalancette 20 Jul '10

20 Jul '10

The virsh command "setmem" takes as input a number that should represent an unsigned long number of kilobytes. Fix cmdSetmem to properly parse this as an unsigned long instead of an int. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- tools/virsh.c | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 551e97b..63816dc 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -223,6 +223,8 @@ static int vshCmddefHelp(vshControl *ctl, const char *name); static vshCmdOpt *vshCommandOpt(const vshCmd *cmd, const char *name); static int vshCommandOptInt(const vshCmd *cmd, const char *name, int *found); +static unsigned long vshCommandOptUL(const vshCmd *cmd, const char *name, + int *found); static char *vshCommandOptString(const vshCmd *cmd, const char *name, int *found); static long long vshCommandOptLongLong(const vshCmd *cmd, const char *name, @@ -2534,7 +2536,7 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; virDomainInfo info; - int kilobytes; + unsigned long kilobytes; int ret = TRUE; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -2543,10 +2545,10 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - kilobytes = vshCommandOptInt(cmd, "kilobytes", &kilobytes); + kilobytes = vshCommandOptUL(cmd, "kilobytes", NULL); if (kilobytes <= 0) { virDomainFree(dom); - vshError(ctl, _("Invalid value of %d for memory size"), kilobytes); + vshError(ctl, _("Invalid value of %lu for memory size"), kilobytes); return FALSE; } @@ -2558,7 +2560,7 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) if (kilobytes > info.maxMem) { virDomainFree(dom); - vshError(ctl, _("Requested memory size %d kb is larger than maximum of %lu kb"), + vshError(ctl, _("Requested memory size %lu kb is larger than maximum of %lu kb"), kilobytes, info.maxMem); return FALSE; } @@ -9628,6 +9630,26 @@ vshCommandOptInt(const vshCmd *cmd, const char *name, int *found) return res; } +static unsigned long +vshCommandOptUL(const vshCmd *cmd, const char *name, int *found) +{ + vshCmdOpt *arg = vshCommandOpt(cmd, name); + unsigned long res = 0; + int num_found = FALSE; + char *end_p = NULL; + + if ((arg != NULL) && (arg->data != NULL)) { + res = strtoul(arg->data, &end_p, 10); + if ((arg->data == end_p) || (*end_p!= 0)) + num_found = FALSE; + else + num_found = TRUE; + } + if (found) + *found = num_found; + return res; +} + /* * Returns option as STRING */ -- 1.7.1.1

2 3

[libvirt] Libvirt segmentation fault on non root user
by Vasco Silva 20 Jul '10

20 Jul '10

Dear all, Im trying to connet to libvirtd on my local machine, but i only can contact as root user. When i run virsh command as root user, all works as expected: [root@localhost libvirt]# virsh list Id Name State ---------------------------------- When i try to run virsh as user, i get the following errors: [user@localhost ~]$ virsh list error: unable to connect to '@/home/user/.libvirt/libvirt-sock', libvirtd may need to be started: Connection refused error: failed to connect to the hypervisor on /var/log/messages, i found a segmentation fault: Jul 20 02:46:00 localhost kernel: libvirtd[22177]: segfault at 28 ip 0000000000496ca7 sp 00007f72a328bdf8 error 4 in libvirtd[400000+cc000] on my /etc/libvirt/libvirtd.conf, i have uncommented these 3 entries: listen_tls = 0 listen_tcp = 1 auth_tcp = "none" my system: Linux localhost 2.6.33.5-desktop-2xcm #1 SMP Tue Jun 22 15:53:23 WEST 2010 x86_64 x86_64 x86_64 GNU/Linux - Mandriva Free 2010 libvirt-utils-0.8.0-2mdv2010.1 I don't know how to resolve this segmentation fault, and what is the cause. Any help will be appreciated. Thanks, Vasco Silva

2 2

[libvirt] A problem about live migration of kvm
by 姚远 20 Jul '10

20 Jul '10

>From qemu-kvm-0.12.1, kvm has the function about live migration with non-shared storage. But I don't know how to use it. In the qemu monitor, "migrate -d tcp:10.1.10.42:444" which is based on shared storage is going well. I don't know how to use the command of "-b or -i" or maybe I don't know the correct format of uri. the source and destination system is Fedora-13, and the version of kvm is qemu-kvm-0.12.3. When I use the "migrate -d -b tcp:10.1.10.42:4444", the qemu monitor don't show nothing. When I use "info migrate",there shows "migrate status: failed". I don't know why? I hope someone who used this command successfully would help me, thank you.

2 1

[libvirt] ChangeLog-old file: do we need it?
by Justin Clift 20 Jul '10

20 Jul '10

Hi us, We have an old ChangeLog file in the base directory that seems to just be hanging around and not really serving a useful purpose. And takes up space. Can we remove it? Regards and best wishes, Justin Clift

2 1

[libvirt] How to use live migration of kvm with non-shared storage
by 姚远 20 Jul '10

20 Jul '10

>From qemu-kvm-0.12.1, kvm has the function about live migration with non-shared storage. But I don't know how to use it. In the qemu monitor, "migrate -d tcp:10.1.10.42:444" which is based on shared storage is going well. I don't know how to use the command of "-b or -i" or maybe I don't know the correct format of uri. the source and destination system is Fedora-13, and the version of kvm is qemu-kvm-0.12.3. When I use the "migrate -d -b tcp:10.1.10.42:4444", the qemu monitor don't show nothing. When I use "info migrate",there shows "migrate status: failed". I don't know why? I hope someone who used this command successfully would help me, thank you

1 0

[libvirt] [PATCH] cpu: Add support for CPU vendor
by Jiri Denemark 20 Jul '10

20 Jul '10

By specifying <vendor> element in CPU requirements a guest can be restricted to run only on CPUs by a given vendor. Host CPU vendor is also specified in capabilities XML. The vendor is checked when migrating a guest but it's not forced, i.e., a guest configured without <vendor> element can be freely migrated. --- Sorry for such a big patch but the bulk of it is in cpu/ which is not so easy to be splitted reasonably. docs/formatcaps.html.in | 1 + docs/formatdomain.html.in | 8 + docs/schemas/capability.rng | 5 + docs/schemas/domain.rng | 7 + src/conf/cpu_conf.c | 14 ++ src/conf/cpu_conf.h | 1 + src/cpu/cpu.c | 9 +- src/cpu/cpu.h | 6 +- src/cpu/cpu_map.c | 36 ++++-- src/cpu/cpu_map.h | 20 ++- src/cpu/cpu_map.xml | 6 + src/cpu/cpu_x86.c | 307 +++++++++++++++++++++++++++++++++++++++++-- tests/testutilsqemu.c | 1 + 13 files changed, 389 insertions(+), 32 deletions(-) diff --git a/docs/formatcaps.html.in b/docs/formatcaps.html.in index 525a331..dcbf35a 100644 --- a/docs/formatcaps.html.in +++ b/docs/formatcaps.html.in @@ -22,6 +22,7 @@ BIOS you will see</p> <vmx/> </features> <model>core2duo</model> + <vendor>Intel</vendor> <topology sockets="1" cores="2" threads="1"/> <feature name="lahf_lm"/> <feature name='xtpr'/> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 425a1e4..8f0cf3b 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -220,6 +220,7 @@ ... <cpu match='exact'> <model>core2duo</model> + <vendor>Intel</vendor> <topology sockets='1' cores='2' threads='1'/> <feature policy='disable' name='lahf_lm'/> </cpu> @@ -267,6 +268,13 @@ definition can be found in <code>cpu_map.xml</code> file installed in libvirt's data directory.</dd> + <dt><code>vendor</code></dt> + <dd><span class="since">Since 0.8.2</span> the content of the + <code>vendor</code> element specifies CPU vendor requested by the + guest. If this element is missing, the guest can be run on a CPU + matching given features regardless on its vendor. The list of + supported vendors can be found in <code>cpu_map.xml</code>.</dd> + <dt><code>topology</code></dt> <dd>The <code>topology</code> element specifies requested topology of virtual CPU provided to the guest. Three non-zero values have to be diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index 67e8cf2..f894b09 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -79,6 +79,11 @@ <element name='model'> <text/> </element> + <optional> + <element name='vendor'> + <text/> + </element> + </optional> <element name='topology'> <attribute name='sockets'> <ref name='positiveInteger'/> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index fd57917..1d56f5b 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1557,6 +1557,7 @@ <interleave> <ref name="cpuModel"/> <optional> + <ref name="cpuVendor"/> <ref name="cpuTopology"/> </optional> <zeroOrMore> @@ -1584,6 +1585,12 @@ </element> </define> + <define name="cpuVendor"> + <element name="vendor"> + <text/> + </element> + </define> + <define name="cpuFeature"> <element name="feature"> <attribute name="policy"> diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index c51ac4e..d9aa69c 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -58,6 +58,7 @@ virCPUDefFree(virCPUDefPtr def) VIR_FREE(def->model); VIR_FREE(def->arch); + VIR_FREE(def->vendor); for (i = 0 ; i < def->nfeatures ; i++) VIR_FREE(def->features[i].name); @@ -79,6 +80,7 @@ virCPUDefCopy(const virCPUDefPtr cpu) if (VIR_ALLOC(copy) < 0 || (cpu->arch && !(copy->arch = strdup(cpu->arch))) || (cpu->model && !(copy->model = strdup(cpu->model))) + || (cpu->vendor && !(copy->vendor = strdup(cpu->vendor))) || VIR_ALLOC_N(copy->features, cpu->nfeatures) < 0) goto no_memory; @@ -173,6 +175,13 @@ virCPUDefParseXML(const xmlNodePtr node, goto error; } + def->vendor = virXPathString("string(./vendor[1])", ctxt); + if (def->vendor && !def->model) { + virCPUReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("CPU vendor specified without CPU model")); + goto error; + } + if (virXPathNode("./topology[1]", ctxt)) { int ret; unsigned long ul; @@ -349,6 +358,11 @@ virCPUDefFormatBuf(virBufferPtr buf, if (def->model) virBufferVSprintf(buf, "%s <model>%s</model>\n", indent, def->model); + if (def->vendor) { + virBufferVSprintf(buf, "%s <vendor>%s</vendor>\n", + indent, def->vendor); + } + if (def->sockets && def->cores && def->threads) { virBufferVSprintf(buf, "%s <topology", indent); virBufferVSprintf(buf, " sockets='%u'", def->sockets); diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index a30991d..1c29192 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -72,6 +72,7 @@ struct _virCPUDef { int match; /* enum virCPUMatch */ char *arch; char *model; + char *vendor; unsigned int sockets; unsigned int cores; unsigned int threads; diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 8d6c22b..279eee7 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -173,14 +173,15 @@ cpuEncode(const char *arch, union cpuData **required, union cpuData **optional, union cpuData **disabled, - union cpuData **forbidden) + union cpuData **forbidden, + union cpuData **vendor) { struct cpuArchDriver *driver; VIR_DEBUG("arch=%s, cpu=%p, forced=%p, required=%p, " - "optional=%p, disabled=%p, forbidden=%p", + "optional=%p, disabled=%p, forbidden=%p, vendor=%p", NULLSTR(arch), cpu, forced, required, - optional, disabled, forbidden); + optional, disabled, forbidden, vendor); if ((driver = cpuGetSubDriver(arch)) == NULL) return -1; @@ -193,7 +194,7 @@ cpuEncode(const char *arch, } return driver->encode(cpu, forced, required, - optional, disabled, forbidden); + optional, disabled, forbidden, vendor); } diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 40f2a7d..a745917 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -58,7 +58,8 @@ typedef int union cpuData **required, union cpuData **optional, union cpuData **disabled, - union cpuData **forbidden); + union cpuData **forbidden, + union cpuData **vendor); typedef void (*cpuArchDataFree) (union cpuData *data); @@ -119,7 +120,8 @@ cpuEncode (const char *arch, union cpuData **required, union cpuData **optional, union cpuData **disabled, - union cpuData **forbidden); + union cpuData **forbidden, + union cpuData **vendor); extern void cpuDataFree (const char *arch, diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c index 5fb88e0..263bb9e 100644 --- a/src/cpu/cpu_map.c +++ b/src/cpu/cpu_map.c @@ -32,9 +32,14 @@ #define CPUMAPFILE PKGDATADIR "/cpu_map.xml" +VIR_ENUM_IMPL(cpuMapElement, CPU_MAP_ELEMENT_LAST, + "vendor", + "feature", + "model") + static int load(xmlXPathContextPtr ctxt, - const char *node, + enum cpuMapElement element, cpuMapLoadCallback callback, void *data) { @@ -47,9 +52,10 @@ static int load(xmlXPathContextPtr ctxt, cur = ctxt_node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE && - xmlStrEqual(cur->name, BAD_CAST node)) { + xmlStrEqual(cur->name, + BAD_CAST cpuMapElementTypeToString(element))) { ctxt->node = cur; - if (callback(ctxt, data) < 0) + if (callback(element, ctxt, data) < 0) goto cleanup; } @@ -66,16 +72,15 @@ cleanup: int cpuMapLoad(const char *arch, - cpuMapLoadCallback feature_cb, - void *model_data, - cpuMapLoadCallback model_cb, - void *feature_data) + cpuMapLoadCallback cb, + void *data) { xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; char *xpath = NULL; int ret = -1; + int element; if (arch == NULL) { virCPUReportError(VIR_ERR_INTERNAL_ERROR, @@ -83,6 +88,12 @@ int cpuMapLoad(const char *arch, return -1; } + if (cb == NULL) { + virCPUReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("no callback provided")); + return -1; + } + if ((xml = xmlParseFile(CPUMAPFILE)) == NULL) { virCPUReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse CPU map file: %s"), @@ -107,11 +118,12 @@ int cpuMapLoad(const char *arch, goto cleanup; } - if ((feature_cb && load(ctxt, "feature", feature_cb, feature_data) < 0) || - (model_cb && load(ctxt, "model", model_cb, model_data) < 0)) { - virCPUReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse CPU map for %s architecture"), arch); - goto cleanup; + for (element = 0; element < CPU_MAP_ELEMENT_LAST; element++) { + if (load(ctxt, element, cb, data) < 0) { + virCPUReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse CPU map for %s architecture"), arch); + goto cleanup; + } } ret = 0; diff --git a/src/cpu/cpu_map.h b/src/cpu/cpu_map.h index 3d72c7f..e26c7c1 100644 --- a/src/cpu/cpu_map.h +++ b/src/cpu/cpu_map.h @@ -27,15 +27,25 @@ # include "xml.h" +enum cpuMapElement { + CPU_MAP_ELEMENT_VENDOR, + CPU_MAP_ELEMENT_FEATURE, + CPU_MAP_ELEMENT_MODEL, + + CPU_MAP_ELEMENT_LAST +}; + +VIR_ENUM_DECL(cpuMapElement) + + typedef int -(*cpuMapLoadCallback) (xmlXPathContextPtr ctxt, +(*cpuMapLoadCallback) (enum cpuMapElement element, + xmlXPathContextPtr ctxt, void *data); extern int cpuMapLoad(const char *arch, - cpuMapLoadCallback feature_cb, - void *model_data, - cpuMapLoadCallback model_cb, - void *feature_data); + cpuMapLoadCallback cb, + void *data); #endif /* __VIR_CPU_MAP_H__ */ diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 084b879..3ec4a7e 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -1,5 +1,9 @@ <cpus> <arch name='x86'> +  + <vendor name='Intel' string='GenuineIntel'/> + <vendor name='AMD' string='AuthenticAMD'/> +  <feature name='fpu'>  <cpuid function='0x00000001' edx='0x00000001'/> @@ -310,6 +314,7 @@ <model name='phenom'> <model name='pentiumpro'/> + <vendor name='AMD'/> <feature name='mtrr'/> <feature name='clflush'/> <feature name='mca'/> @@ -328,6 +333,7 @@ <model name='athlon'> <model name='pentiumpro'/> + <vendor name='AMD'/> <feature name='pse36'/> <feature name='vme'/> <feature name='mtrr'/> diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 0266ce9..114235c 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -35,8 +35,18 @@ #define VIR_FROM_THIS VIR_FROM_CPU +#define VENDOR_STRING_LENGTH 12 + + static const char *archs[] = { "i686", "x86_64" }; +struct x86_vendor { + char *name; + struct cpuX86cpuid cpuid; + + struct x86_vendor *next; +}; + struct x86_feature { char *name; unsigned int ncpuid; @@ -47,6 +57,7 @@ struct x86_feature { struct x86_model { char *name; + const struct x86_vendor *vendor; unsigned int ncpuid; struct cpuX86cpuid *cpuid; @@ -54,6 +65,7 @@ struct x86_model { }; struct x86_map { + struct x86_vendor *vendors; struct x86_feature *features; struct x86_model *models; }; @@ -212,6 +224,44 @@ x86DataCopy(const union cpuData *data) } +static int +x86DataAddCpuid(union cpuData *data, + const struct cpuX86cpuid *cpuid) +{ + struct cpuX86cpuid **cpuids; + int *len; + unsigned int pos; + unsigned int ext; + + if (cpuid->function < CPUX86_EXTENDED) { + pos = cpuid->function; + ext = 0; + len = &data->x86.basic_len; + cpuids = &data->x86.basic; + } else { + pos = cpuid->function - CPUX86_EXTENDED; + ext = CPUX86_EXTENDED; + len = &data->x86.extended_len; + cpuids = &data->x86.extended; + } + + if (pos >= *len) { + unsigned int i; + + if (VIR_ALLOC_N(*cpuids, pos + 1) < 0) + return -1; + + for (i = *len; i <= pos; i++) + (*cpuids)[i].function = i + ext; + *len = pos + 1; + } + + x86cpuidSetBits((*cpuids) + pos, cpuid); + + return 0; +} + + static void x86DataSubtract(union cpuData *data1, const union cpuData *data2) @@ -318,6 +368,27 @@ x86DataToCPUFeatures(virCPUDefPtr cpu, } +/* also removes bits corresponding to vendor string from data */ +static const struct x86_vendor * +x86DataToVendor(union cpuData *data, + const struct x86_map *map) +{ + const struct x86_vendor *vendor = map->vendors; + struct cpuX86cpuid *cpuid; + + while (vendor) { + if ((cpuid = x86DataCpuid(data, vendor->cpuid.function)) && + x86cpuidMatchMasked(cpuid, &vendor->cpuid)) { + x86cpuidClearBits(cpuid, &vendor->cpuid); + return vendor; + } + vendor = vendor->next; + } + + return NULL; +} + + static virCPUDefPtr x86DataToCPU(const union cpuData *data, const struct x86_model *model, @@ -326,6 +397,7 @@ x86DataToCPU(const union cpuData *data, virCPUDefPtr cpu; union cpuData *copy = NULL; union cpuData *modelData = NULL; + const struct x86_vendor *vendor; if (VIR_ALLOC(cpu) < 0 || !(cpu->model = strdup(model->name)) || @@ -333,6 +405,10 @@ x86DataToCPU(const union cpuData *data, !(modelData = x86DataFromModel(model))) goto no_memory; + if ((vendor = x86DataToVendor(copy, map)) && + !(cpu->vendor = strdup(vendor->name))) + goto no_memory; + x86DataSubtract(copy, modelData); x86DataSubtract(modelData, data); @@ -358,6 +434,106 @@ error: static void +x86VendorFree(struct x86_vendor *vendor) +{ + if (!vendor) + return; + + VIR_FREE(vendor->name); + VIR_FREE(vendor); +}; + + +static struct x86_vendor * +x86VendorFind(const struct x86_map *map, + const char *name) +{ + struct x86_vendor *vendor; + + vendor = map->vendors; + while (vendor) { + if (STREQ(vendor->name, name)) + return vendor; + + vendor = vendor->next; + } + + return NULL; +} + + +static int +x86VendorLoad(xmlXPathContextPtr ctxt, + struct x86_map *map) +{ + struct x86_vendor *vendor = NULL; + char *string = NULL; + int ret = 0; + + if (VIR_ALLOC(vendor) < 0) + goto no_memory; + + vendor->name = virXPathString("string(@name)", ctxt); + if (!vendor->name) { + virCPUReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Missing CPU vendor name")); + goto ignore; + } + + if (x86VendorFind(map, vendor->name)) { + virCPUReportError(VIR_ERR_INTERNAL_ERROR, + _("CPU vendor %s already defined"), vendor->name); + goto ignore; + } + + string = virXPathString("string(@string)", ctxt); + if (!string) { + virCPUReportError(VIR_ERR_INTERNAL_ERROR, + _("Missing vendor string for CPU vendor %s"), vendor->name); + goto ignore; + } + if (strlen(string) != VENDOR_STRING_LENGTH) { + virCPUReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid CPU vendor string '%s'"), string); + goto ignore; + } + + vendor->cpuid.function = 0; + vendor->cpuid.ebx = (string[0] ) | + (string[1] << 8) | + (string[2] << 16) | + (string[3] << 24); + vendor->cpuid.edx = (string[4] ) | + (string[5] << 8) | + (string[6] << 16) | + (string[7] << 24); + vendor->cpuid.ecx = (string[8] ) | + (string[9] << 8) | + (string[10] << 16) | + (string[11] << 24); + + if (!map->vendors) + map->vendors = vendor; + else { + vendor->next = map->vendors; + map->vendors = vendor; + } + +out: + VIR_FREE(string); + + return ret; + +no_memory: + virReportOOMError(); + ret = -1; +ignore: + x86VendorFree(vendor); + goto out; +} + + +static void x86FeatureFree(struct x86_feature *feature) { if (feature == NULL) @@ -389,9 +565,8 @@ x86FeatureFind(const struct x86_map *map, static int x86FeatureLoad(xmlXPathContextPtr ctxt, - void *data) + struct x86_map *map) { - struct x86_map *map = data; xmlNodePtr *nodes = NULL; xmlNodePtr ctxt_node = ctxt->node; struct x86_feature *feature = NULL; @@ -500,6 +675,7 @@ x86ModelCopy(const struct x86_model *model) return NULL; } + copy->vendor = model->vendor; copy->ncpuid = model->ncpuid; for (i = 0; i < model->ncpuid; i++) copy->cpuid[i] = model->cpuid[i]; @@ -788,11 +964,11 @@ x86ModelCompare(const struct x86_model *model1, static int x86ModelLoad(xmlXPathContextPtr ctxt, - void *data) + struct x86_map *map) { - struct x86_map *map = data; xmlNodePtr *nodes = NULL; struct x86_model *model = NULL; + char *vendor = NULL; int ret = 0; int i; int n; @@ -832,11 +1008,22 @@ x86ModelLoad(xmlXPathContextPtr ctxt, if (VIR_ALLOC_N(model->cpuid, ancestor->ncpuid) < 0) goto no_memory; + model->vendor = ancestor->vendor; model->ncpuid = ancestor->ncpuid; memcpy(model->cpuid, ancestor->cpuid, sizeof(*model->cpuid) * model->ncpuid); } + vendor = virXPathString("string(./vendor/@name)", ctxt); + if (vendor) { + if (!(model->vendor = x86VendorFind(map, vendor))) { + virCPUReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown vendor %s referenced by CPU model %s"), + vendor, model->name); + goto ignore; + } + } + n = virXPathNodeSet("./feature", ctxt, &nodes); if (n < 0) goto ignore; @@ -872,6 +1059,7 @@ x86ModelLoad(xmlXPathContextPtr ctxt, } out: + VIR_FREE(vendor); VIR_FREE(nodes); return ret; @@ -907,6 +1095,28 @@ x86MapFree(struct x86_map *map) } +static int +x86MapLoadCallback(enum cpuMapElement element, + xmlXPathContextPtr ctxt, + void *data) +{ + struct x86_map *map = data; + + switch (element) { + case CPU_MAP_ELEMENT_VENDOR: + return x86VendorLoad(ctxt, map); + case CPU_MAP_ELEMENT_FEATURE: + return x86FeatureLoad(ctxt, map); + case CPU_MAP_ELEMENT_MODEL: + return x86ModelLoad(ctxt, map); + case CPU_MAP_ELEMENT_LAST: + break; + } + + return 0; +} + + static struct x86_map * x86LoadMap(void) { @@ -917,9 +1127,7 @@ x86LoadMap(void) return NULL; } - if (cpuMapLoad("x86", - x86FeatureLoad, map, - x86ModelLoad, map) < 0) + if (cpuMapLoad("x86", x86MapLoadCallback, map) < 0) goto error; return map; @@ -965,6 +1173,13 @@ x86Compute(virCPUDefPtr host, } } + if (cpu->vendor && + (!host->vendor || STRNEQ(cpu->vendor, host->vendor))) { + VIR_DEBUG("host CPU vendor does not match required CPU vendor %s", + cpu->vendor); + return VIR_CPU_COMPARE_INCOMPATIBLE; + } + if (!(map = x86LoadMap()) || !(host_model = x86ModelFromCPU(host, map, 0)) || !(cpu_force = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_FORCE)) || @@ -1117,6 +1332,15 @@ x86Decode(virCPUDefPtr cpu, if (!(cpuCandidate = x86DataToCPU(data, candidate, map))) goto out; + if (candidate->vendor && cpuCandidate->vendor && + STRNEQ(candidate->vendor->name, cpuCandidate->vendor)) { + VIR_DEBUG("CPU vendor %s of model %s differs from %s; ignoring", + candidate->vendor->name, candidate->name, + cpuCandidate->vendor); + virCPUDefFree(cpuCandidate); + goto next; + } + if (cpu->type == VIR_CPU_TYPE_HOST) { cpuCandidate->type = VIR_CPU_TYPE_HOST; for (i = 0; i < cpuCandidate->nfeatures; i++) { @@ -1154,6 +1378,7 @@ x86Decode(virCPUDefPtr cpu, } cpu->model = cpuModel->model; + cpu->vendor = cpuModel->vendor; cpu->nfeatures = cpuModel->nfeatures; cpu->features = cpuModel->features; VIR_FREE(cpuModel); @@ -1194,7 +1419,8 @@ x86Encode(const virCPUDefPtr cpu, union cpuData **required, union cpuData **optional, union cpuData **disabled, - union cpuData **forbidden) + union cpuData **forbidden, + union cpuData **vendor) { struct x86_map *map = NULL; union cpuData *data_forced = NULL; @@ -1202,6 +1428,7 @@ x86Encode(const virCPUDefPtr cpu, union cpuData *data_optional = NULL; union cpuData *data_disabled = NULL; union cpuData *data_forbidden = NULL; + union cpuData *data_vendor = NULL; int ret = -1; if ((map = x86LoadMap()) == NULL) @@ -1237,6 +1464,23 @@ x86Encode(const virCPUDefPtr cpu, goto error; } + if (vendor) { + const struct x86_vendor *v = NULL; + + if (cpu->vendor && !(v = x86VendorFind(map, cpu->vendor))) { + virCPUReportError(VIR_ERR_OPERATION_FAILED, + _("CPU vendor %s not found"), cpu->vendor); + goto error; + } + + if (v && + (VIR_ALLOC(data_vendor) < 0 || + x86DataAddCpuid(data_vendor, &v->cpuid) < 0)) { + virReportOOMError(); + goto error; + } + } + if (forced) *forced = data_forced; if (required) @@ -1247,6 +1491,8 @@ x86Encode(const virCPUDefPtr cpu, *disabled = data_disabled; if (forbidden) *forbidden = data_forbidden; + if (vendor) + *vendor = data_vendor; ret = 0; @@ -1261,6 +1507,7 @@ error: x86DataFree(data_optional); x86DataFree(data_disabled); x86DataFree(data_forbidden); + x86DataFree(data_vendor); goto cleanup; } @@ -1358,6 +1605,8 @@ x86Baseline(virCPUDefPtr *cpus, union cpuData *data = NULL; virCPUDefPtr cpu = NULL; unsigned int i; + const struct x86_vendor *vendor = NULL; + struct x86_model *model = NULL; if (!(map = x86LoadMap())) goto error; @@ -1371,13 +1620,49 @@ x86Baseline(virCPUDefPtr *cpus, cpu->type = VIR_CPU_TYPE_GUEST; cpu->match = VIR_CPU_MATCH_EXACT; + if (cpus[0]->vendor && + !(vendor = x86VendorFind(map, cpus[0]->vendor))) { + virCPUReportError(VIR_ERR_OPERATION_FAILED, + _("Unknown CPU vendor %s"), cpus[0]->vendor); + goto error; + } + for (i = 1; i < ncpus; i++) { - struct x86_model *model; + const char *vn = NULL; + if (!(model = x86ModelFromCPU(cpus[i], map, 0))) goto error; + if (cpus[i]->vendor && model->vendor && + STRNEQ(cpus[i]->vendor, model->vendor->name)) { + virCPUReportError(VIR_ERR_OPERATION_FAILED, + _("CPU vendor %s of model %s differs from vendor %s"), + model->vendor->name, model->name, cpus[i]->vendor); + goto error; + } + + if (cpus[i]->vendor) + vn = cpus[i]->vendor; + else if (model->vendor) + vn = model->vendor->name; + + if (vn) { + if (!vendor) { + if (!(vendor = x86VendorFind(map, vn))) { + virCPUReportError(VIR_ERR_OPERATION_FAILED, + _("Unknown CPU vendor %s"), vn); + goto error; + } + } else if (STRNEQ(vendor->name, vn)) { + virCPUReportError(VIR_ERR_OPERATION_FAILED, + "%s", _("CPU vendors do not match")); + goto error; + } + } + x86ModelIntersect(base_model, model); x86ModelFree(model); + model = NULL; } if (!(data = x86DataFromModel(base_model))) @@ -1389,6 +1674,9 @@ x86Baseline(virCPUDefPtr *cpus, goto error; } + if (vendor && x86DataAddCpuid(data, &vendor->cpuid) < 0) + goto no_memory; + if (x86Decode(cpu, data, models, nmodels, NULL) < 0) goto error; @@ -1404,6 +1692,7 @@ cleanup: no_memory: virReportOOMError(); error: + x86ModelFree(model); virCPUDefFree(cpu); cpu = NULL; goto cleanup; diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 7fee21a..99b1f4e 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -83,6 +83,7 @@ virCapsPtr testQemuCapsInit(void) { 0, /* match */ (char *) "x86_64", /* arch */ (char *) "core2duo", /* model */ + (char *) "Intel", /* vendor */ 1, /* sockets */ 2, /* cores */ 1, /* threads */ -- 1.7.1.1

3 8

[libvirt] A problem about live migration of kvm
by 姚远 20 Jul '10

20 Jul '10

>From qemu-kvm-0.12.1, kvm has the function about live migration with non-shared storage. But I don't know how to use it. In the qemu monitor, "migrate -d tcp:10.1.10.42:444" which is based on shared storage is going well. I don't know how to use the command of "-b or -i" or maybe I don't know the correct format of uri. the source and destination system is Fedora-13, and the version of kvm is qemu-kvm-0.12.3. When I use the "migrate -d -b tcp:10.1.10.42:4444", the qemu monitor don't show nothing. When I use "info migrate",there shows "migrate status:failed". I don't know why? I hope someone who used this command successfully would help me, thank you.

1 0

[libvirt] [PATCH 0/8]: Revamp virsh error reporting
by Chris Lalancette 19 Jul '10

19 Jul '10

This patch series is related to a discussion Eric Blake and I had a couple of months back[1]. It essentially revamps the way that virsh does error reporting so that errors from more calls are properly reported. More details are in each individual patch. [1] https://www.redhat.com/archives/libvir-list/2010-April/msg00240.html

3 24

Re: [libvirt] [virt-tools-list] Trouble setting Virtual Network
by Cole Robinson 19 Jul '10

19 Jul '10

On 07/15/2010 01:27 PM, Fernando Carvalho wrote: > I'm having trouble setting virtual network. > The debug log is the following: > > --XML dump of the network I'm trying to set-- > > virsh # net-dumpxml net0 > <network> > <name>net0</name> > <uuid>bb909289-700a-87f8-c075-910209d1a2e3</uuid> > <bridge name='virbr0' stp='on' delay='0' /> > <ip address='192.168.100.1' netmask='255.255.255.0'> > <dhcp> > <range start='192.168.100.128' end='192.168.100.254' /> > </dhcp> > </ip> > </network> > > --Error message when I try to startup the network-- > > virsh # net-start net0 > 17:04:48.570: debug : virNetworkLookupByName:5884 : conn=0x9d82658, name=net0 > 17:04:48.570: debug : remoteIO:9802 : Do proc=46 serial=3 length=36 wait=(nil) > 17:04:48.570: debug : remoteIO:9877 : We have the buck 46 0x9d96488 0x9d96488 > 17:04:48.570: debug : remoteIODecodeMessageLength:9233 : Got length, > now need 80 total (76 more) > 17:04:48.570: debug : remoteIOEventLoop:9728 : Giving up the buck 46 > 0x9d96488 (nil) > 17:04:48.570: debug : remoteIO:9908 : All done with our call 46 (nil) 0x9d96488 > 17:04:48.570: debug : virNetworkCreate:6140 : network=0x9d96488 > 17:04:48.570: debug : remoteIO:9802 : Do proc=39 serial=4 length=52 wait=(nil) > 17:04:48.570: debug : remoteIO:9877 : We have the buck 39 0x9d964f0 0x9d964f0 > 17:04:49.022: debug : remoteIODecodeMessageLength:9233 : Got length, > now need 576 total (572 more) > 17:04:49.022: debug : remoteIOEventLoop:9728 : Giving up the buck 39 > 0x9d964f0 (nil) > 17:04:49.022: debug : remoteIO:9908 : All done with our call 39 (nil) 0x9d964f0 > 17:04:49.022: debug : virNetworkGetName:6288 : network=0x9d96488 > error: Failed to start network net0 > 17:04:49.022: debug : virNetworkFree:6228 : network=0x9d96488 > 17:04:49.022: debug : virUnrefNetwork:601 : unref network 0x9d96488 net0 1 > 17:04:49.022: debug : virReleaseNetwork:557 : release network > 0x9d96488 net0 bb909289-700a-87f8-c075-910209d1a2e3 > 17:04:49.022: debug : virReleaseNetwork:571 : unref connection 0x9d82658 2 > error: internal error '/sbin/iptables --table filter --delete INPUT > --in-interface virbr0 --protocol udp --destination-port 69 --jump > ACCEPT' exited with non-zero status 1 and signal 0: iptables: Bad rule > (does a matching rule exist in that chain?). > > -- > > Can someone help me on this? > I'm not sure, but CC'ing libvirt-list. - Cole

2 1

[libvirt] iscsi support?
by Harald Dunkel 19 Jul '10

19 Jul '10

Hi folks, I would like to try out iscsi for virtual block devices. This would be very interesting especially for a migration at run time. Problem is: It still doesn't work :-(. libvirt can login to the iscsi pool, but using virsh vol-list I just get an empty list, even though /dev/disk/by-path shows the expected block devices. There was an old thread on this list describing the procedure: http://www.mail-archive.com/libvir-list@redhat.com/msg06320.html Are there any news about this? I am using libvirt 0.8.1, iet 1.4.20.1 and open-iscsi 2.0.871.3, as included in Debian Testing. Regards Harri

3 7