- Devel - libvirt List Archives

[libvirt] PATCH: Fix 2 build bugs on mingw
by Daniel P. Berrange 02 Apr '09

02 Apr '09

The Mingw platform lacks readlink(), so we stub out this method on that platform. The plain write() implementation of safezero() was not actually doing anything with the 'offset' arg. This makes it seek to the offset location before writing data. The mmap implementation of safezero() was also not quite right, truncating to len, so if offset was non-zero, it would not be large enough. Daniel Index: configure.in =================================================================== RCS file: /data/cvs/libvirt/configure.in,v retrieving revision 1.211 diff -u -p -r1.211 configure.in --- configure.in 1 Apr 2009 10:40:38 -0000 1.211 +++ configure.in 1 Apr 2009 15:53:35 -0000 @@ -72,7 +72,7 @@ dnl Use --disable-largefile if you don't AC_SYS_LARGEFILE dnl Availability of various common functions (non-fatal if missing). -AC_CHECK_FUNCS([cfmakeraw regexec uname sched_getaffinity getuid getgid posix_fallocate mmap]) +AC_CHECK_FUNCS([cfmakeraw regexec uname sched_getaffinity getuid getgid posix_fallocate mmap readlink]) dnl Availability of various not common threadsafe functions AC_CHECK_FUNCS([strerror_r strtok_r getmntent_r getgrnam_r getpwuid_r]) Index: src/util.c =================================================================== RCS file: /data/cvs/libvirt/src/util.c,v retrieving revision 1.98 diff -u -p -r1.98 util.c --- src/util.c 1 Apr 2009 10:26:22 -0000 1.98 +++ src/util.c 1 Apr 2009 15:53:35 -0000 @@ -136,7 +136,7 @@ int safezero(int fd, int flags ATTRIBUTE /* memset wants the mmap'ed file to be present on disk so create a * sparse file */ - r = ftruncate(fd, len); + r = ftruncate(fd, offset + len); if (r < 0) return -errno; @@ -158,6 +158,9 @@ int safezero(int fd, int flags ATTRIBUTE char *buf; unsigned long long remain, bytes; + if (lseek(fd, offset, SEEK_SET) < 0) + return errno; + /* Split up the write in small chunks so as not to allocate lots of RAM */ remain = len; bytes = 1024 * 1024; @@ -949,6 +952,7 @@ int virFileLinkPointsTo(const char *chec int virFileResolveLink(const char *linkpath, char **resultpath) { +#ifdef HAVE_READLINK struct stat st; char *buf; int n; @@ -981,6 +985,11 @@ int virFileResolveLink(const char *linkp *resultpath = buf; return 0; +#else + if (!(*resultpath = strdup(linkpath))) + return -ENOMEM; + return 0; +#endif } -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1

[libvirt] existing bridge and no iptable rules
by Markus 01 Apr '09

01 Apr '09

hi, i try to setup libvirt with an existing network setup (bridge with NO physical device, routes and iptables are already configured, dhcp named ..) . this bridge should be available for the libvirt domains. now the problem: every configuration i tried ends in iptable rules beeing created which mess with my network setup (e.g. i try to route vpn traffic from a guest to another network outside) is there a way of defining a virtual network / network source / bridge for domains that takes an existing bridge and does no setup ( ip, iptables, .. )? thanks, markus

1 0

[libvirt] error in libvirt.py from libvirt-0.6.1 ?
by Gerrit Slomma 01 Apr '09

01 Apr '09

Hello Is there a paticular reason for having "def migrate" two times in libvirt.py? The first occurence is on line 345 with parameters (self, dconn, flags, dname, uri, bandwidth) The second occurence is on line 1102 with parameters (self, domain, flags, dname, uri, bandwidth) Which one is correct? And i am no python programmer in the least, but isn't the ret set false? ret = libvirtmod.virDomainMigrate(domain__o, self._o, flags, dname, uri, bandwidth) That doesn't correspond to the def some above this earlier. diff /tmp/migrate_1st_occurance /tmp/migrate_2nd_occurance 1c1 < def migrate(self, dconn, flags, dname, uri, bandwidth): --- > def migrate(self, domain, flags, dname, uri, bandwidth): 31,34c31,34 < if dconn is None: dconn__o = None < else: dconn__o = dconn._o < ret = libvirtmod.virDomainMigrate(self._o, dconn__o, flags, dname, uri, bandwidth) < if ret is None:raise libvirtError('virDomainMigrate() failed', dom=self) --- > if domain is None: domain__o = None > else: domain__o = domain._o > ret = libvirtmod.virDomainMigrate(domain__o, self._o, flags, dname, uri, bandwidth) > if ret is None:raise libvirtError('virDomainMigrate() failed', conn=self)

2 1

[libvirt] [PATCH 0/1] SCSI host pools
by David Allan 01 Apr '09

01 Apr '09

Hi All, Here is reworked SCSI host pool code. I have tested it with FC, iSCSI and SATA, and it works correctly in all those cases. I have not tried parallel SCSI, but I don't see any reason why it wouldn't work there also, as it should be transport independent. This patch is so different from the earlier revision that a diff from the earlier version would be pointless, and I have only included a patch against the current head. Dave

4 19

[libvirt] PATCH: Allow running of console after creating guest
by Daniel P. Berrange 01 Apr '09

01 Apr '09

This patch adds a new flag to the 'create' and 'start' commands in virsh, making it immeditely spawn the builtin virsh console, eg # virsh start --console demo At the same time, I also add in a check for virConnectGetHostname() against the local hostname, and refuse to launch the console if they differ. With remote hypervisors it is obviously not possible to access the /dev/pts files directly. Without this check, the console may work by pure luck if there happens to be a matching device name on the local host. Rather confusing, and even potentially dangerous. # virsh -c qemu+ssh://root@demo.example.com/system console someguest error: Cannot connect to a remote console device Finally, when starting the console print a message telling the user the hotkey to quit # virsh start --console VirtTest Domain VirtTest started Connecting to console, type Ctrl+] to quit Daniel diff -r a203154020dd src/virsh.c --- a/src/virsh.c Wed Apr 01 11:57:25 2009 +0100 +++ b/src/virsh.c Wed Apr 01 13:36:40 2009 +0100 @@ -500,20 +500,30 @@ static const vshCmdOptDef opts_console[] #ifndef __MINGW32__ static int -cmdConsole(vshControl *ctl, const vshCmd *cmd) +cmdRunConsole(vshControl *ctl, virDomainPtr dom) { xmlDocPtr xml = NULL; xmlXPathObjectPtr obj = NULL; xmlXPathContextPtr ctxt = NULL; - virDomainPtr dom; int ret = FALSE; char *doc; - - if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) - return FALSE; - - if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) - return FALSE; + char *thatHost = NULL; + char *thisHost = NULL; + + if (!(thisHost = virGetHostname())) { + vshError(ctl, FALSE, "%s", _("Failed to get local hostname")); + goto cleanup; + } + + if (!(thatHost = virConnectGetHostname(ctl->conn))) { + vshError(ctl, FALSE, "%s", _("Failed to get connection hostname")); + goto cleanup; + } + + if (STRNEQ(thisHost, thatHost)) { + vshError(ctl, FALSE, "%s", _("Cannot connect to a remote console device")); + goto cleanup; + } doc = virDomainGetXMLDesc(dom, 0); if (!doc) @@ -532,6 +542,7 @@ cmdConsole(vshControl *ctl, const vshCmd obj = xmlXPathEval(BAD_CAST "string(/domain/devices/console/@tty)", ctxt); if ((obj != NULL) && ((obj->type == XPATH_STRING) && (obj->stringval != NULL) && (obj->stringval[0] != 0))) { + vshPrintExtra(ctl, "%s", _("Connecting to console, type Ctrl+] to quit\n")); if (vshRunConsole((const char *)obj->stringval) == 0) ret = TRUE; } else { @@ -543,14 +554,16 @@ cmdConsole(vshControl *ctl, const vshCmd xmlXPathFreeContext(ctxt); if (xml) xmlFreeDoc(xml); - virDomainFree(dom); + free(thisHost); + free(thatHost); + return ret; } #else /* __MINGW32__ */ static int -cmdConsole(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdRunConsole(vshControl *ctl, virDomainPtr dom ATTRIBUTE_UNUSED) { vshError (ctl, FALSE, "%s", _("console not implemented on this platform")); return FALSE; @@ -558,6 +571,24 @@ cmdConsole(vshControl *ctl, const vshCmd #endif /* __MINGW32__ */ +static int +cmdConsole(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom; + int ret; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) + return FALSE; + + ret = cmdRunConsole(ctl, dom); + + virDomainFree(dom); + return ret; +} + /* * "list" command */ @@ -882,6 +913,7 @@ static const vshCmdInfo info_create[] = static const vshCmdOptDef opts_create[] = { {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file containing an XML domain description")}, + {"console", VSH_OT_BOOL, 0, gettext_noop("attach to console after creation")}, {NULL, 0, 0, NULL} }; @@ -893,6 +925,7 @@ cmdCreate(vshControl *ctl, const vshCmd int found; int ret = TRUE; char *buffer; + int console = vshCommandOptBool(cmd, "console"); if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; @@ -910,6 +943,8 @@ cmdCreate(vshControl *ctl, const vshCmd if (dom != NULL) { vshPrint(ctl, _("Domain %s created from %s\n"), virDomainGetName(dom), from); + if (console) + cmdRunConsole(ctl, dom); virDomainFree(dom); } else { vshError(ctl, FALSE, _("Failed to create domain from %s"), from); @@ -1030,6 +1065,7 @@ static const vshCmdInfo info_start[] = { static const vshCmdOptDef opts_start[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive domain")}, + {"console", VSH_OT_BOOL, 0, gettext_noop("attach to console after creation")}, {NULL, 0, 0, NULL} }; @@ -1038,6 +1074,7 @@ cmdStart(vshControl *ctl, const vshCmd * { virDomainPtr dom; int ret = TRUE; + int console = vshCommandOptBool(cmd, "console"); if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; @@ -1054,6 +1091,8 @@ cmdStart(vshControl *ctl, const vshCmd * if (virDomainCreate(dom) == 0) { vshPrint(ctl, _("Domain %s started\n"), virDomainGetName(dom)); + if (console) + cmdRunConsole(ctl, dom); } else { vshError(ctl, FALSE, _("Failed to start domain %s"), virDomainGetName(dom)); -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 4

[libvirt] Added seclabeltest to run under test suite.
by Daniel J Walsh 01 Apr '09

01 Apr '09

1 0

[libvirt] PATCH: Fix misc memory alloc/free/usage bugs
by Daniel P. Berrange 01 Apr '09

01 Apr '09

A few more small bugs * src/node_device.c: Don't strdup() a NULL device parent * src/qemu_conf.c: Don't try to run access() on a NULL binary path * src/security_selinux.c Make sure result from readlink() is NULL terminated * src/storage_conf.c: DOn't free 'mode' while it is still used diff -r b73fe666feff src/node_device.c --- a/src/node_device.c Fri Mar 27 16:14:49 2009 +0000 +++ b/src/node_device.c Mon Mar 30 14:37:45 2009 +0100 @@ -176,9 +176,14 @@ static char *nodeDeviceGetParent(virNode goto cleanup; } - ret = strdup(obj->def->parent); - if (!ret) - virReportOOMError(dev->conn); + if (obj->def->parent) { + ret = strdup(obj->def->parent); + if (!ret) + virReportOOMError(dev->conn); + } else { + virNodeDeviceReportError(dev->conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("no parent for this device")); + } cleanup: if (obj) diff -r b73fe666feff src/qemu_conf.c --- a/src/qemu_conf.c Fri Mar 27 16:14:49 2009 +0000 +++ b/src/qemu_conf.c Mon Mar 30 14:37:45 2009 +0100 @@ -269,7 +269,7 @@ qemudCapsInitGuest(virCapsPtr caps, * which can be used with magic cpu choice */ hasbase = (access(info->binary, X_OK) == 0); - hasaltbase = (access(info->altbinary, X_OK) == 0); + hasaltbase = (info->altbinary && access(info->altbinary, X_OK) == 0); /* Can use acceleration for KVM/KQEMU if * - host & guest arches match diff -r b73fe666feff src/security_selinux.c --- a/src/security_selinux.c Fri Mar 27 16:14:49 2009 +0000 +++ b/src/security_selinux.c Mon Mar 30 14:37:45 2009 +0100 @@ -303,11 +303,13 @@ SELinuxRestoreSecurityImageLabel(virConn return -1; if (S_ISLNK(buf.st_mode)) { + int n; if (VIR_ALLOC_N(newpath, buf.st_size + 1) < 0) return -1; - if (readlink(path, newpath, buf.st_size) < 0) + if ((n =readlink(path, newpath, buf.st_size)) < 0) goto err; + buf.st_size[n] = '\0'; path = newpath; if (stat(path, &buf) != 0) goto err; diff -r b73fe666feff src/storage_conf.c --- a/src/storage_conf.c Fri Mar 27 16:14:49 2009 +0000 +++ b/src/storage_conf.c Mon Mar 30 14:37:45 2009 +0100 @@ -401,12 +401,13 @@ virStorageDefParsePerms(virConnectPtr co } else { char *end = NULL; perms->mode = strtol(mode, &end, 8); - VIR_FREE(mode); if (*end || perms->mode < 0 || perms->mode > 0777) { + VIR_FREE(mode); virStorageReportError(conn, VIR_ERR_XML_ERROR, "%s", _("malformed octal mode")); goto error; } + VIR_FREE(mode); } if (virXPathNode(conn, "./owner", ctxt) == NULL) { Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 7

[libvirt] PATCH: Add --tree flag to virsh nodedev-list
by Daniel P. Berrange 01 Apr '09

01 Apr '09

The virsh noddev-list command is used to display node devices. It just prints out their names in a flat list. When detaching devices for purposes of PCI passthrough though, it is important to understand what devices are children of the PCI device about to be detached. It is tedious to find this out, the user having to run virsh nodedev-dumpxml and look at the parent field. # virsh -c qemu:///system nodedev-list computer DVD_GCC_4247N net_00_13_02_b9_f9_d3 net_00_13_02_b9_f9_d3_0 net_00_15_58_2f_e9_55 pci_1002_71c4 pci_104c_ac56 pci_8086_27c5_scsi_host pci_8086_27c5_scsi_host_0 pci_8086_27c5_scsi_host_1 pci_8086_27c5_scsi_host_2 pci_8086_27c5_scsi_host_scsi_device_lun0 pci_8086_27c5_scsi_host_scsi_host pci_8086_27c8 pci_8086_27da pci_8086_27df pci_8086_27df_scsi_host pci_8086_27df_scsi_host_0 pci_8086_27df_scsi_host_scsi_device_lun0 pci_8086_27df_scsi_host_scsi_host pci_8086_4227 storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE usb_device_a5c_2110_noserial_if3 This patch adds a new '--tree' flag to the nodedev-list command, allowing a prettier format to be used # virsh -c qemu:///system nodedev-list --tree computer | +-pci_8086_2448 | | | +-pci_104c_ac56 | +-pci_8086_27a0 +-pci_8086_27a1 | | | +-pci_1002_71c4 | +-pci_8086_27b9 +-pci_8086_27c5 | | | +-pci_8086_27c5_scsi_host | | | | | +-pci_8086_27c5_scsi_host_scsi_device_lun0 | | | | | | | +-storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE | | | | | +-pci_8086_27c5_scsi_host_scsi_host | | | +-pci_8086_27c5_scsi_host_0 | +-pci_8086_27c5_scsi_host_1 | +-pci_8086_27c5_scsi_host_2 | +-pci_8086_27c8 | | | +-usb_device_1d6b_1_0000_00_1d_0 | | | +-usb_device_1d6b_1_0000_00_1d_0_if0 | +-pci_8086_27c9 | | | +-usb_device_1d6b_1_0000_00_1d_1 | | | +-usb_device_1d6b_1_0000_00_1d_1_if0 | +-pci_8086_27ca | | | +-usb_device_1d6b_1_0000_00_1d_2 | | | +-usb_device_1d6b_1_0000_00_1d_2_if0 | +-pci_8086_27cb | | | +-usb_device_1d6b_1_0000_00_1d_3 | | | +-usb_device_1d6b_1_0000_00_1d_3_if0 | +-usb_device_483_2016_noserial | | | | | +-usb_device_483_2016_noserial_if0 | | | +-usb_device_a5c_2110_noserial | | | +-usb_device_a5c_2110_noserial_if0 | +-usb_device_a5c_2110_noserial_if1 | +-usb_device_a5c_2110_noserial_if2 | +-usb_device_a5c_2110_noserial_if3 | +-pci_8086_27cc | | | +-usb_device_1d6b_2_0000_00_1d_7 | | | +-usb_device_1d6b_2_0000_00_1d_7_if0 | +-pci_8086_27d0 | | | +-pci_8086_109a | | | +-net_00_15_58_2f_e9_55 | +-pci_8086_27d2 | | | +-pci_8086_4227 | | | +-net_00_13_02_b9_f9_d3 | +-net_00_13_02_b9_f9_d3_0 | +-pci_8086_27d4 +-pci_8086_27d6 +-pci_8086_27d8 +-pci_8086_27da +-pci_8086_27df | +-pci_8086_27df_scsi_host | | | +-pci_8086_27df_scsi_host_scsi_device_lun0 | | | | | +-DVD_GCC_4247N | | | +-pci_8086_27df_scsi_host_scsi_host | +-pci_8086_27df_scsi_host_0 Daniel diff -r b73fe666feff src/virsh.c --- a/src/virsh.c Fri Mar 27 16:14:49 2009 +0000 +++ b/src/virsh.c Mon Mar 30 14:37:45 2009 +0100 @@ -4391,16 +4391,77 @@ static const vshCmdInfo info_node_list_d }; static const vshCmdOptDef opts_node_list_devices[] = { + {"tree", VSH_OT_BOOL, 0, gettext_noop("list devices in a tree")}, {"cap", VSH_OT_STRING, VSH_OFLAG_NONE, gettext_noop("capability name")}, {NULL, 0, 0, NULL} }; +#define MAX_INDENT 100 + +static void +cmdNodeListDevicesPrint(vshControl *ctl, + char **devices, + char **parents, + int num_devices, + int devid, + int lastdev, + unsigned int depth, + char *indent) +{ + int i; + int nextlastdev = -1; + + if (depth) { + indent[depth] = '+'; + indent[depth+1] = '-'; + } + + vshPrint(ctl, indent); + if (depth) { + if (devid == lastdev) + indent[depth] = ' '; + else + indent[depth] = '|'; + indent[depth+1] = ' '; + depth+=2; + } + vshPrint(ctl, "%s\n", devices[devid]); + + for (i = 0 ; i < num_devices ; i++) { + if (parents[i] && + STREQ(parents[i], devices[devid])) { + //fprintf(stderr, "%s %s %d %d\n", parents[i], devices[devid], i, devid); + nextlastdev = i; + } + } + + if (nextlastdev != -1) { + vshPrint(ctl, indent); + vshPrint(ctl, " |\n"); + } + + indent[depth] = ' '; + for (i = 0 ; i < num_devices ; i++) { + indent[depth] = ' '; + indent[depth+1] = ' '; + if (parents[i] && + STREQ(parents[i], devices[devid])) + cmdNodeListDevicesPrint(ctl, devices, parents, num_devices, i, nextlastdev, depth + 2, indent); + indent[depth] = '\0'; + } + if (nextlastdev == -1 && devid == lastdev) { + vshPrint(ctl, indent); + vshPrint(ctl, "\n"); + } +} + static int cmdNodeListDevices (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { char *cap; char **devices; int found, num_devices, i; + int tree = vshCommandOptBool(cmd, "tree"); if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; @@ -4426,9 +4487,39 @@ cmdNodeListDevices (vshControl *ctl, con return FALSE; } qsort(&devices[0], num_devices, sizeof(char*), namesorter); - for (i = 0; i < num_devices; i++) { - vshPrint(ctl, "%s\n", devices[i]); - free(devices[i]); + if (tree) { + char indent[MAX_INDENT]; + char **parents = vshMalloc(ctl, sizeof(char *) * num_devices); + for (i = 0; i < num_devices; i++) { + virNodeDevicePtr dev = virNodeDeviceLookupByName(ctl->conn, devices[i]); + if (dev && STRNEQ(devices[i], "computer")) { + const char *parent = virNodeDeviceGetParent(dev); + parents[i] = parent ? strdup(parent) : NULL; + } else { + parents[i] = NULL; + } + virNodeDeviceFree(dev); + } + for (i = 0 ; i < num_devices ; i++) { + memset(indent, '\0', sizeof indent); + if (parents[i] == NULL) + cmdNodeListDevicesPrint(ctl, + devices, + parents, + num_devices, + i, + i, + 0, + indent); + } + for (i = 0 ; i < num_devices ; i++) + free(parents[i]); + free(parents); + } else { + for (i = 0; i < num_devices; i++) { + vshPrint(ctl, "%s\n", devices[i]); + free(devices[i]); + } } free(devices); return TRUE; -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 4

[libvirt] question about qemudDomainMigratePrepare2 of qemu_driver.c from libvirt-0.6.1
by Gerrit.Slomma＠drv-bund.de 01 Apr '09

01 Apr '09

Hello I am just curious if the checking of the connection string in qemu_driver.c from libvirt-0.6.1 in qemudDomainMigratePrepare2 is faulty. The source is: [...] } else { /* Check the URI starts with "tcp:". We will escape the * URI when passing it to the qemu monitor, so bad * characters in hostname part don't matter. */ if (!STREQLEN (uri_in, "tcp:", 6)) { qemudReportError (dconn, NULL, NULL, VIR_ERR_INVALID_ARG, "%s", _("only tcp URIs are supported for KVM migrations")); goto cleanup; } [...] The second compare-string "tcp:" is only 4 characters long, therefore a check via strncmp must fail i presumed, i isolated this comparison: #include <stdio.h> #include <string.h> #define STREQLEN(a,b,n) (strncmp((a),(b),(n)) == 0) int main () { char str[][200] = { "tcp://192.168.1.14:4444" , "tcp:192.168.1.14:4444" , "ssh ://192.168.1.14:4444" , "ssh:192.168.1.14:4444" }; int n; for (n=0 ; n<4 ; n++) { printf("testing %s against \"tcp:\" with result: ", str[n]); if (!STREQLEN(str[n],"tcp:",6)) { printf ("ERROR\n"); } else { printf ("OK\n"); } } return 0; } and as i pressumed this gives me on the commandline: testing tcp://192.168.1.14:4444 against "tcp:" with result: ERROR testing tcp:192.168.1.14:4444 against "tcp:" with result: ERROR testing ssh://192.168.1.14:4444 against "tcp:" with result: ERROR testing ssh:192.168.1.14:4444 against "tcp:" with result: ERROR if i change the 6 to 4 it gives testing tcp://192.168.1.14:4444 against "tcp:" with result: OK testing tcp:192.168.1.14:4444 against "tcp:" with result: OK testing ssh://192.168.1.14:4444 against "tcp:" with result: ERROR testing ssh:192.168.1.14:4444 against "tcp:" with result: ERROR but now tcp:// also is marked as correct. Am i missing something here and the checking in qemu_driver.c is correct? I always get the "only tcp URIs are supported for KVM migrations" if i try to migrate KVM-domains in virt-manager 0.7.0 and therefore searched for the root-cause of this problem. Kind regards, Gerrit Slomma Mit freundlichen Grüßen, Gerrit Slomma Team eBetrieb Deutsche Rentenversicherung Bund Abt. 11 - Organisation und IT-Services Fachbereich 1170 - IT-Services und Betrieb Bereich 1174 - Anwendungsbetrieb Team 1174-46 - Trustcenter, eBetrieb

4 4

[libvirt] PATCH: Fix XM driver to extract vifname= parameter
by Daniel P. Berrange 01 Apr '09

01 Apr '09

The XM driver is not currently handling the vifname= parameter for network devices in /etc/xen config files. This patch fixes that ommision Daniel diff -r e396919fa59e src/xm_internal.c --- a/src/xm_internal.c Tue Mar 31 16:35:42 2009 +0100 +++ b/src/xm_internal.c Tue Mar 31 16:58:11 2009 +0100 @@ -991,6 +991,7 @@ xenXMDomainConfigParse(virConnectPtr con char ip[16]; char mac[18]; char bridge[50]; + char vifname[50]; char *key; bridge[0] = '\0'; @@ -998,6 +999,7 @@ xenXMDomainConfigParse(virConnectPtr con script[0] = '\0'; ip[0] = '\0'; model[0] = '\0'; + vifname[0] = '\0'; if ((list->type != VIR_CONF_STRING) || (list->str == NULL)) goto skipnic; @@ -1036,6 +1038,12 @@ xenXMDomainConfigParse(virConnectPtr con len = sizeof(model)-1; strncpy(model, data, len); model[len] = '\0'; + } else if (STRPREFIX(key, "vifname=")) { + int len = nextkey ? (nextkey - data) : sizeof(vifname)-1; + if (len > (sizeof(vifname)-1)) + len = sizeof(vifname)-1; + strncpy(vifname, data, len); + vifname[len] = '\0'; } else if (STRPREFIX(key, "ip=")) { int len = nextkey ? (nextkey - data) : 15; if (len > 15) @@ -1105,6 +1113,10 @@ xenXMDomainConfigParse(virConnectPtr con !(net->model = strdup(model))) goto no_memory; + if (vifname[0] && + !(net->ifname = strdup(vifname))) + goto no_memory; + if (VIR_REALLOC_N(def->nets, def->nnets+1) < 0) goto no_memory; def->nets[def->nnets++] = net; @@ -1994,6 +2006,10 @@ static int xenXMDomainConfigFormatNet(vi virBufferVSprintf(&buf, ",model=%s", net->model); + if (net->ifname) + virBufferVSprintf(&buf, ",vifname=%s", + net->ifname); + if (VIR_ALLOC(val) < 0) { virReportOOMError(conn); goto cleanup; diff -r e396919fa59e tests/xmconfigdata/test-paravirt-net-vifname.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/xmconfigdata/test-paravirt-net-vifname.cfg Tue Mar 31 16:58:11 2009 +0100 @@ -0,0 +1,12 @@ +name = "XenGuest1" +uuid = "c7a5fdb0-cdaf-9455-926a-d65c16db1809" +maxmem = 579 +memory = 394 +vcpus = 1 +bootloader = "/usr/bin/pygrub" +on_poweroff = "destroy" +on_reboot = "restart" +on_crash = "restart" +vfb = [ "type=vnc,vncunused=1,vnclisten=127.0.0.1,vncpasswd=123poi" ] +disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ] +vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,model=e1000,vifname=net0" ] diff -r e396919fa59e tests/xmconfigdata/test-paravirt-net-vifname.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/xmconfigdata/test-paravirt-net-vifname.xml Tue Mar 31 16:58:11 2009 +0100 @@ -0,0 +1,33 @@ +<domain type='xen'> + <name>XenGuest1</name> + <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid> + <memory>592896</memory> + <currentMemory>403456</currentMemory> + <vcpu>1</vcpu> + <bootloader>/usr/bin/pygrub</bootloader> + <os> + <type arch='i686' machine='xenpv'>linux</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <disk type='block' device='disk'> + <driver name='phy'/> + <source dev='/dev/HostVG/XenGuest1'/> + <target dev='xvda' bus='xen'/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:66:94:9c'/> + <source bridge='br0'/> + <target dev='net0'/> + <model type='e1000'/> + </interface> + <console type='pty'> + <target port='0'/> + </console> + <input type='mouse' bus='xen'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/> + </devices> +</domain> diff -r e396919fa59e tests/xmconfigtest.c --- a/tests/xmconfigtest.c Tue Mar 31 16:35:42 2009 +0100 +++ b/tests/xmconfigtest.c Tue Mar 31 16:58:11 2009 +0100 @@ -209,6 +209,7 @@ mymain(int argc, char **argv) DO_TEST("paravirt-new-pvfb", 3); DO_TEST("paravirt-new-pvfb-vncdisplay", 3); DO_TEST("paravirt-net-e1000", 3); + DO_TEST("paravirt-net-vifname", 3); DO_TEST("fullvirt-old-cdrom", 1); DO_TEST("fullvirt-new-cdrom", 2); DO_TEST("fullvirt-utc", 2); -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 2