[libvirt] Re: [Libvir] [PATCH] Add bus attribute to disk target definition
Daniel P. Berrange
berrange at redhat.com
Tue May 6 21:02:21 UTC 2008
On Tue, May 06, 2008 at 08:11:11PM +0200, Soren Hansen wrote:
> sorry for the delay. Here's the newest version of the patch which should
> address all the issues that have been raised so far.
Yes & no. It didn't address the redundant re-ordering of -drive parameters
when using boot=on, nor re-add the -boot param to make PXE work again. One
further complication is that QEMU 0.9.1 has -drive support but not the
extboot support, so boot=on can't be used there. It rather annoyingly
complains
qemu: unknowm parameter 'boot' in 'file=/home/berrange/boot.iso,media=cdrom,boot=on'
> === modified file 'src/qemu_conf.c'
> --- old/src/qemu_conf.c 2008-04-30 12:30:55 +0000
> +++ new/src/qemu_conf.c 2008-05-06 17:58:44 +0000
> @@ -491,6 +491,8 @@
> *flags |= QEMUD_CMD_FLAG_KQEMU;
> if (strstr(help, "-no-reboot"))
> *flags |= QEMUD_CMD_FLAG_NO_REBOOT;
> + if (strstr(help, "\n-drive"))
> + *flags |= QEMUD_CMD_FLAG_DRIVE_OPT;
Turns out that this needed to also check for 'boot=on' availability.
> @@ -673,13 +676,28 @@
> goto error;
> }
>
> + if (!bus)
> + disk->bus = QEMUD_DISK_BUS_IDE;
This was giving floppy disks a bus of 'ide' which isn't technically
correct - they're really their own bus type - I reckon we should call
it 'fdc'.
> + else if (STREQ((const char *)bus, "ide"))
> + disk->bus = QEMUD_DISK_BUS_IDE;
> + else if (STREQ((const char *)bus, "scsi"))
> + disk->bus = QEMUD_DISK_BUS_SCSI;
> + else if (STREQ((const char *)bus, "virtio"))
> + disk->bus = QEMUD_DISK_BUS_VIRTIO;
> + else {
> + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("Invalid bus type: %s"), bus);
> + goto error;
> + }
> +
> xmlFree(device);
> xmlFree(target);
> xmlFree(source);
> + xmlFree(bus);
>
> return 0;
>
> error:
> + xmlFree(bus);
> xmlFree(type);
> xmlFree(target);
> xmlFree(source);
> @@ -1373,6 +1391,68 @@
> return -1;
> }
>
> +static int qemudDiskCompare(const void *aptr, const void *bptr) {
> + struct qemud_vm_disk_def *a = (struct qemud_vm_disk_def *) aptr;
> + struct qemud_vm_disk_def *b = (struct qemud_vm_disk_def *) bptr;
> + if (a->device == b->device)
> + return virDiskNameToIndex(a->dst) - virDiskNameToIndex(b->dst);
> + else
> + return a->device - b->device;
Typo - this should be comparing the 'bus' field rather than 'device' to
get IDE, SCSI and VirtIO disks ordered correctly wrt to each other.
> +static const char *qemudBusIdToName(int busId) {
> + const char *busnames[] = { "ide",
> + "scsi",
> + "virtio" };
> +
> + if (busId >= 0 && busId < 3)
> + return busnames[busId];
> + else
> + return 0;
> +}
This can be changed to make use of the GNULIB 'verify_true' function
to get a compile time check fo the array cardinality vs the enum
length.
> +static char *qemudDriveOpt(struct qemud_vm_disk_def *disk, int boot)
> +{
> + char opt[PATH_MAX];
> +
> + switch (disk->device) {
> + case QEMUD_DISK_CDROM:
> + snprintf(opt, PATH_MAX, "file=%s,if=ide,media=cdrom%s",
> + disk->src, boot ? ",boot=on" : "");
> + break;
> + case QEMUD_DISK_FLOPPY:
> + snprintf(opt, PATH_MAX, "file=%s,if=floppy%s",
> + disk->src, boot ? ",boot=on" : "");
> + break;
> + case QEMUD_DISK_DISK:
> + snprintf(opt, PATH_MAX, "file=%s,if=%s%s",
> + disk->src, qemudBusIdToName(disk->bus), boot ? ",boot=on" : "");
This is missing the 'index=NNN' parameter so IDE disks are not getting
assigned to the correct bus/unit. eg if i define 'hda' and 'hdd' in the
XML the guest gets given 'hda' and 'hdb'.
> @@ -1775,13 +1854,20 @@
> goto error;
> }
> def->ndisks++;
> - disk->next = NULL;
> if (i == 0) {
> + disk->next = NULL;
> def->disks = disk;
> } else {
> - prev->next = disk;
> + struct qemud_vm_disk_def *ptr = def->disks;
> + while (ptr) {
> + if (!ptr->next || qemudDiskCompare(ptr->next, disk) < 0) {
The parameters to the compare function are inverted so the ordering
is being reversed.
> @@ -2110,6 +2196,7 @@
> struct qemud_vm_chr_def *parallel = vm->def->parallels;
> struct utsname ut;
> int disableKQEMU = 0;
> + int use_extboot = 0;
>
> /* Make sure the binary we are about to try exec'ing exists.
> * Technically we could catch the exec() failure, but that's
> @@ -2230,30 +2317,47 @@
> goto no_memory;
> }
>
> - for (i = 0 ; i < vm->def->os.nBootDevs ; i++) {
> - switch (vm->def->os.bootDevs[i]) {
> - case QEMUD_BOOT_CDROM:
> - boot[i] = 'd';
> - break;
> - case QEMUD_BOOT_FLOPPY:
> - boot[i] = 'a';
> - break;
> - case QEMUD_BOOT_DISK:
> - boot[i] = 'c';
> - break;
> - case QEMUD_BOOT_NET:
> - boot[i] = 'n';
> - break;
> - default:
> - boot[i] = 'c';
> - break;
> - }
> - }
> - boot[vm->def->os.nBootDevs] = '\0';
> - if (!((*argv)[++n] = strdup("-boot")))
> - goto no_memory;
> - if (!((*argv)[++n] = strdup(boot)))
> - goto no_memory;
This block shouldn't be removed, '-boot XXX' must be addeed
unconditionally whether using -drive's boot= flag or not.
> + if (use_extboot) {
> + char *handledDisks = NULL;
> + int j;
> +
> + handledDisks = calloc(sizeof(*handledDisks), vm->def->ndisks);
> +
> + if (!handledDisks)
> + goto no_memory;
> +
> + /* When using -drive notation, we need to provide the devices in boot
> + * preference order. */
> + for (i = 0 ; i < vm->def->os.nBootDevs ; i++) {
> + if (!((*argv)[++n] = strdup("-drive")))
> + goto no_memory;
> +
> + switch (vm->def->os.bootDevs[i]) {
> + case QEMUD_BOOT_CDROM:
> + if (!((*argv)[++n] = qemudAddBootDrive(conn, vm->def, handledDisks, QEMUD_DISK_CDROM)))
> + goto error;
> + break;
> + case QEMUD_BOOT_FLOPPY:
> + if (!((*argv)[++n] = qemudAddBootDrive(conn, vm->def, handledDisks, QEMUD_DISK_FLOPPY)))
> + goto error;
> + break;
> + case QEMUD_BOOT_DISK:
> + if (!((*argv)[++n] = qemudAddBootDrive(conn, vm->def, handledDisks, QEMUD_DISK_DISK)))
> + goto error;
> + break;
> + }
> + }
> +
> + /* Pick up the rest of the devices */
> + j=0;
> + while (disk) {
> + if (!handledDisks[j]) {
> + handledDisks[j] = 1;
> + if (!((*argv)[++n] = strdup("-drive")))
> + goto no_memory;
> + if (!((*argv)[++n] = qemudDriveOpt(disk, 0)))
> + goto no_memory;
> + }
> + disk = disk->next;
> + j++;
> + }
This double loop is redundant - there's no need to pull bootable drives to
the front of the list - this is why there's an explicit flag rather than
relying on ordering.
> + } else {
> + while (disk) {
> + char dev[NAME_MAX];
> + char file[PATH_MAX];
> +
> + if (!strcmp(disk->dst, "hdc") &&
> + disk->device == QEMUD_DISK_CDROM)
> + if (disk->src[0])
> + snprintf(dev, NAME_MAX, "-%s", "cdrom");
> + else {
> + disk = disk->next;
> + continue;
> + }
> + else
> + snprintf(dev, NAME_MAX, "-%s", disk->dst);
This needed a check to verify that someone doesn't try to use virtio
disks with an old QEMU/KVM without -drive support.
> @@ -3587,6 +3737,7 @@
> virBufferVSprintf(&buf, " <source %s='%s'/>\n",
> typeAttrs[disk->type], disk->src);
>
> + virBufferVSprintf(&buf, " <target dev='%s' bus='%s'/>\n", disk->dst, qemudBusIdToName(disk->bus));
> virBufferVSprintf(&buf, " <target dev='%s'/>\n", disk->dst);
The 2nd <target> tag ought to have been removed here...
I'm includng a updated version of your patch which addresses all these
notes & verifies them with the test suite we have. I believe this ought
to work no matter what version of QEMU / KVM is used - though obviously
older one's don't have option if using virtio.
I've also added a test case specifically for the new -drive / virtio
syntax
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/>
</disk>
<disk type='block' device='cdrom'>
<source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hdc' bus='ide'/>
</disk>
<disk type='file' device='disk'>
<source file='/tmp/data.img'/>
<target dev='vda' bus='virtio'/>
</disk>
<disk type='file' device='disk'>
<source file='/tmp/logs.img'/>
<target dev='vdg' bus='virtio'/>
</disk>
Gets translated to
-drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0,boot=on \
-drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,index=2 \
-drive file=/tmp/data.img,if=virtio,index=0 \
-drive file=/tmp/logs.img,if=virtio,index=6
Yes, adding the ,index=XXX option is redundant for virtio since it will
ignore it, but it is harmless to define it since we have the data required.
Regards
Daniel.
Index: src/qemu_conf.c
===================================================================
RCS file: /data/cvs/libvirt/src/qemu_conf.c,v
retrieving revision 1.52
diff -u -p -u -p -r1.52 qemu_conf.c
--- src/qemu_conf.c 30 Apr 2008 12:30:55 -0000 1.52
+++ src/qemu_conf.c 6 May 2008 20:42:59 -0000
@@ -49,6 +49,7 @@
#include "buf.h"
#include "conf.h"
#include "util.h"
+#include "verify.h"
#define qemudLog(level, msg...) fprintf(stderr, msg)
@@ -491,6 +492,10 @@ static int qemudExtractVersionInfo(const
*flags |= QEMUD_CMD_FLAG_KQEMU;
if (strstr(help, "-no-reboot"))
*flags |= QEMUD_CMD_FLAG_NO_REBOOT;
+ if (strstr(help, "\n-drive"))
+ *flags |= QEMUD_CMD_FLAG_DRIVE_OPT;
+ if (strstr(help, "boot=on"))
+ *flags |= QEMUD_CMD_FLAG_DRIVE_BOOT_OPT;
if (*version >= 9000)
*flags |= QEMUD_CMD_FLAG_VNC_COLON;
ret = 0;
@@ -568,6 +573,7 @@ static int qemudParseDiskXML(virConnectP
xmlChar *source = NULL;
xmlChar *target = NULL;
xmlChar *type = NULL;
+ xmlChar *bus = NULL;
int typ = 0;
type = xmlGetProp(node, BAD_CAST "type");
@@ -598,6 +604,7 @@ static int qemudParseDiskXML(virConnectP
} else if ((target == NULL) &&
(xmlStrEqual(cur->name, BAD_CAST "target"))) {
target = xmlGetProp(cur, BAD_CAST "dev");
+ bus = xmlGetProp(cur, BAD_CAST "bus");
} else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) {
disk->readonly = 1;
}
@@ -643,10 +650,9 @@ static int qemudParseDiskXML(virConnectP
disk->readonly = 1;
if ((!device || !strcmp((const char *)device, "disk")) &&
- strcmp((const char *)target, "hda") &&
- strcmp((const char *)target, "hdb") &&
- strcmp((const char *)target, "hdc") &&
- strcmp((const char *)target, "hdd")) {
+ strncmp((const char *)target, "hd", 2) &&
+ strncmp((const char *)target, "sd", 2) &&
+ strncmp((const char *)target, "vd", 2)) {
qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
_("Invalid harddisk device name: %s"), target);
goto error;
@@ -673,13 +679,41 @@ static int qemudParseDiskXML(virConnectP
goto error;
}
+ if (!bus) {
+ if (disk->device == QEMUD_DISK_FLOPPY)
+ disk->bus = QEMUD_DISK_BUS_FDC;
+ else
+ disk->bus = QEMUD_DISK_BUS_IDE;
+ } else if (STREQ((const char *)bus, "ide"))
+ disk->bus = QEMUD_DISK_BUS_IDE;
+ else if (STREQ((const char *)bus, "fdc"))
+ disk->bus = QEMUD_DISK_BUS_FDC;
+ else if (STREQ((const char *)bus, "scsi"))
+ disk->bus = QEMUD_DISK_BUS_SCSI;
+ else if (STREQ((const char *)bus, "virtio"))
+ disk->bus = QEMUD_DISK_BUS_VIRTIO;
+ else {
+ qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
+ _("Invalid bus type: %s"), bus);
+ goto error;
+ }
+
+ if (disk->device == QEMUD_DISK_FLOPPY &&
+ disk->bus != QEMUD_DISK_BUS_FDC) {
+ qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
+ _("Invalid bus type '%s' for floppy disk"), bus);
+ goto error;
+ }
+
xmlFree(device);
xmlFree(target);
xmlFree(source);
+ xmlFree(bus);
return 0;
error:
+ xmlFree(bus);
xmlFree(type);
xmlFree(target);
xmlFree(source);
@@ -1373,6 +1407,24 @@ static int qemudParseInputXML(virConnect
return -1;
}
+static int qemudDiskCompare(const void *aptr, const void *bptr) {
+ struct qemud_vm_disk_def *a = (struct qemud_vm_disk_def *) aptr;
+ struct qemud_vm_disk_def *b = (struct qemud_vm_disk_def *) bptr;
+ if (a->bus == b->bus)
+ return virDiskNameToIndex(a->dst) - virDiskNameToIndex(b->dst);
+ else
+ return a->bus - b->bus;
+}
+
+static const char *qemudBusIdToName(int busId, int qemuIF) {
+ const char *busnames[] = { "ide",
+ (qemuIF ? "floppy" : "fdc"),
+ "scsi",
+ "virtio" };
+ verify_true(ARRAY_CARDINALITY(busnames) == QEMUD_DISK_BUS_LAST);
+
+ return busnames[busId];
+}
/*
* Parses a libvirt XML definition of a guest, and populates the
@@ -1762,7 +1814,6 @@ static struct qemud_vm_def *qemudParseXM
obj = xmlXPathEval(BAD_CAST "/domain/devices/disk", ctxt);
if ((obj != NULL) && (obj->type == XPATH_NODESET) &&
(obj->nodesetval != NULL) && (obj->nodesetval->nodeNr >= 0)) {
- struct qemud_vm_disk_def *prev = NULL;
for (i = 0; i < obj->nodesetval->nodeNr; i++) {
struct qemud_vm_disk_def *disk = calloc(1, sizeof(*disk));
if (!disk) {
@@ -1775,13 +1826,20 @@ static struct qemud_vm_def *qemudParseXM
goto error;
}
def->ndisks++;
- disk->next = NULL;
if (i == 0) {
+ disk->next = NULL;
def->disks = disk;
} else {
- prev->next = disk;
+ struct qemud_vm_disk_def *ptr = def->disks;
+ while (ptr) {
+ if (!ptr->next || qemudDiskCompare(disk, ptr->next) < 0) {
+ disk->next = ptr->next;
+ ptr->next = disk;
+ break;
+ }
+ ptr = ptr->next;
+ }
}
- prev = disk;
}
}
xmlXPathFreeObject(obj);
@@ -2176,7 +2234,7 @@ int qemudBuildCommandLine(virConnectPtr
snprintf(memory, sizeof(memory), "%lu", vm->def->memory/1024);
snprintf(vcpus, sizeof(vcpus), "%d", vm->def->vcpus);
- if (!(*argv = malloc(sizeof(**argv) * (len+1))))
+ if (!(*argv = calloc(len+1, sizeof(**argv))))
goto no_memory;
if (!((*argv)[++n] = strdup(vm->def->os.binary)))
goto no_memory;
@@ -2274,28 +2332,102 @@ int qemudBuildCommandLine(virConnectPtr
goto no_memory;
}
- while (disk) {
- char dev[NAME_MAX];
- char file[PATH_MAX];
- if (!strcmp(disk->dst, "hdc") &&
- disk->device == QEMUD_DISK_CDROM) {
- if (disk->src[0])
- snprintf(dev, NAME_MAX, "-%s", "cdrom");
- else {
- /* Don't put anything on the cmdline for an empty cdrom*/
- disk = disk->next;
- continue;
+ /* If QEMU supports -drive param instead of old -hda, -hdb, -cdrom .. */
+ if (vm->qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE_OPT) {
+ int bootCD = 0, bootFloppy = 0, bootDisk = 0;
+
+ /* If QEMU supports boot=on for -drive param... */
+ if (vm->qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE_BOOT_OPT) {
+ for (i = 0 ; i < vm->def->os.nBootDevs ; i++) {
+ switch (vm->def->os.bootDevs[i]) {
+ case QEMUD_BOOT_CDROM:
+ bootCD = 1;
+ break;
+ case QEMUD_BOOT_FLOPPY:
+ bootFloppy = 1;
+ break;
+ case QEMUD_BOOT_DISK:
+ bootDisk = 1;
+ break;
+ }
}
- } else
- snprintf(dev, NAME_MAX, "-%s", disk->dst);
- snprintf(file, PATH_MAX, "%s", disk->src);
+ }
- if (!((*argv)[++n] = strdup(dev)))
- goto no_memory;
- if (!((*argv)[++n] = strdup(file)))
- goto no_memory;
+ while (disk) {
+ char opt[PATH_MAX];
+ const char *media = NULL;
+ int bootable = 0;
+ int idx = virDiskNameToIndex(disk->dst);
+ if (!((*argv)[++n] = strdup("-drive")))
+ goto no_memory;
- disk = disk->next;
+ if (idx < 0) {
+ qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
+ _("unsupported disk type '%s'"), disk->dst);
+ goto error;
+ }
+
+ if (disk->device == QEMUD_DISK_CDROM)
+ media = "media=cdrom,";
+
+ switch (disk->device) {
+ case QEMUD_DISK_CDROM:
+ bootable = bootCD;
+ bootCD = 0;
+ break;
+ case QEMUD_DISK_FLOPPY:
+ bootable = bootFloppy;
+ bootFloppy = 0;
+ break;
+ case QEMUD_DISK_DISK:
+ bootable = bootDisk;
+ bootDisk = 0;
+ break;
+ }
+
+ snprintf(opt, PATH_MAX, "file=%s,if=%s,%sindex=%d%s",
+ disk->src, qemudBusIdToName(disk->bus, 1),
+ media ? media : "",
+ idx,
+ bootable ? ",boot=on" : "");
+
+ if (!((*argv)[++n] = strdup(opt)))
+ goto no_memory;
+ disk = disk->next;
+ }
+ } else {
+ while (disk) {
+ char dev[NAME_MAX];
+ char file[PATH_MAX];
+
+ if (STREQ(disk->dst, "hdc") &&
+ disk->device == QEMUD_DISK_CDROM) {
+ if (disk->src[0]) {
+ snprintf(dev, NAME_MAX, "-%s", "cdrom");
+ } else {
+ disk = disk->next;
+ continue;
+ }
+ } else {
+ if (STRPREFIX(disk->dst, "hd") ||
+ STRPREFIX(disk->dst, "fd")) {
+ snprintf(dev, NAME_MAX, "-%s", disk->dst);
+ } else {
+ qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
+ _("unsupported disk type '%s'"), disk->dst);
+ goto error;
+ }
+ }
+
+ snprintf(file, PATH_MAX, "%s", disk->src);
+
+ if (!((*argv)[++n] = strdup(dev)))
+ goto no_memory;
+ if (!((*argv)[++n] = strdup(file)))
+ goto no_memory;
+
+ disk = disk->next;
+ }
}
if (!net) {
@@ -2519,6 +2651,7 @@ int qemudBuildCommandLine(virConnectPtr
for (i = 0 ; i < n ; i++)
free((*argv)[i]);
free(*argv);
+ *argv = NULL;
}
return -1;
}
@@ -3373,10 +3506,7 @@ static int qemudGenerateXMLChar(virBuffe
"tcp",
"unix"
};
- /*verify(ARRAY_CARDINALITY(types) == QEMUD_CHR_SRC_TYPE_LAST);*/
-
- if (dev->srcType < 0 || dev->srcType >= QEMUD_CHR_SRC_TYPE_LAST)
- return -1;
+ verify_true(ARRAY_CARDINALITY(types) == QEMUD_CHR_SRC_TYPE_LAST);
/* Compat with legacy <console tty='/dev/pts/5'/> syntax */
if (STREQ(type, "console") &&
@@ -3587,7 +3717,8 @@ char *qemudGenerateXML(virConnectPtr con
virBufferVSprintf(&buf, " <source %s='%s'/>\n",
typeAttrs[disk->type], disk->src);
- virBufferVSprintf(&buf, " <target dev='%s'/>\n", disk->dst);
+ virBufferVSprintf(&buf, " <target dev='%s' bus='%s'/>\n",
+ disk->dst, qemudBusIdToName(disk->bus, 0));
if (disk->readonly)
virBufferAddLit(&buf, " <readonly/>\n");
Index: src/qemu_conf.h
===================================================================
RCS file: /data/cvs/libvirt/src/qemu_conf.h,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 qemu_conf.h
--- src/qemu_conf.h 30 Apr 2008 12:30:55 -0000 1.24
+++ src/qemu_conf.h 6 May 2008 20:42:59 -0000
@@ -56,10 +56,20 @@ enum qemud_vm_disk_device {
QEMUD_DISK_FLOPPY,
};
+enum qemud_vm_disk_bus {
+ QEMUD_DISK_BUS_IDE,
+ QEMUD_DISK_BUS_FDC,
+ QEMUD_DISK_BUS_SCSI,
+ QEMUD_DISK_BUS_VIRTIO,
+
+ QEMUD_DISK_BUS_LAST
+};
+
/* Stores the virtual disk configuration */
struct qemud_vm_disk_def {
int type;
int device;
+ int bus;
char src[PATH_MAX];
char dst[NAME_MAX];
int readonly;
@@ -220,9 +230,11 @@ enum qemud_vm_graphics_type {
/* Internal flags to keep track of qemu command line capabilities */
enum qemud_cmd_flags {
- QEMUD_CMD_FLAG_KQEMU = 1,
- QEMUD_CMD_FLAG_VNC_COLON = 2,
- QEMUD_CMD_FLAG_NO_REBOOT = 4,
+ QEMUD_CMD_FLAG_KQEMU = (1 << 0),
+ QEMUD_CMD_FLAG_VNC_COLON = (1 << 1),
+ QEMUD_CMD_FLAG_NO_REBOOT = (1 << 2),
+ QEMUD_CMD_FLAG_DRIVE_OPT = (1 << 3),
+ QEMUD_CMD_FLAG_DRIVE_BOOT_OPT = (1 << 4),
};
Index: src/util.c
===================================================================
RCS file: /data/cvs/libvirt/src/util.c,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 util.c
--- src/util.c 25 Apr 2008 14:53:05 -0000 1.33
+++ src/util.c 6 May 2008 20:42:59 -0000
@@ -771,3 +771,44 @@ virParseMacAddr(const char* str, unsigne
return -1;
}
+
+/* Translates a device name of the form (regex) "[fhv]d[a-z]+" into
+ * the corresponding index (e.g. sda => 1, hdz => 26, vdaa => 27)
+ * @param name The name of the device
+ * @return name's index, or -1 on failure
+ */
+int virDiskNameToIndex(const char *name) {
+ const char *ptr = NULL;
+ int idx = 0;
+
+ if (strlen(name) < 3)
+ return -1;
+
+ switch (*name) {
+ case 'f':
+ case 'h':
+ case 'v':
+ case 's':
+ break;
+ default:
+ return 0;
+ }
+
+ if (*(name + 1) != 'd')
+ return -1;
+
+ ptr = name+2;
+
+ while (*ptr) {
+ idx = idx * 26;
+
+ if ('a' > *ptr || 'z' < *ptr)
+ return -1;
+
+ idx += *ptr - 'a';
+ ptr++;
+ }
+
+ return idx;
+}
+
Index: src/util.h
===================================================================
RCS file: /data/cvs/libvirt/src/util.h,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 util.h
--- src/util.h 25 Apr 2008 14:53:05 -0000 1.16
+++ src/util.h 6 May 2008 20:42:59 -0000
@@ -92,4 +92,6 @@ int virParseNumber(const char **str);
int virParseMacAddr(const char* str, unsigned char *addr);
+int virDiskNameToIndex(const char* str);
+
#endif /* __VIR_UTIL_H__ */
Index: tests/qemuxml2argvtest.c
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvtest.c,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 qemuxml2argvtest.c
--- tests/qemuxml2argvtest.c 30 Apr 2008 12:30:55 -0000 1.16
+++ tests/qemuxml2argvtest.c 6 May 2008 20:43:06 -0000
@@ -20,7 +20,7 @@ static struct qemud_driver driver;
#define MAX_FILE 4096
-static int testCompareXMLToArgvFiles(const char *xml, const char *cmd) {
+static int testCompareXMLToArgvFiles(const char *xml, const char *cmd, int driveFlag) {
char xmlData[MAX_FILE];
char argvData[MAX_FILE];
char *xmlPtr = &(xmlData[0]);
@@ -47,6 +47,10 @@ static int testCompareXMLToArgvFiles(con
vm.qemuVersion = 0 * 1000 * 100 + (8 * 1000) + 1;
vm.qemuCmdFlags = QEMUD_CMD_FLAG_VNC_COLON |
QEMUD_CMD_FLAG_NO_REBOOT;
+ if (driveFlag) {
+ vm.qemuCmdFlags |= QEMUD_CMD_FLAG_DRIVE_OPT;
+ vm.qemuCmdFlags |= QEMUD_CMD_FLAG_DRIVE_BOOT_OPT;
+ }
vm.migrateFrom[0] = '\0';
vmdef->vncActivePort = vmdef->vncPort;
@@ -94,14 +98,20 @@ static int testCompareXMLToArgvFiles(con
}
+struct testInfo {
+ const char *name;
+ int driveFlag;
+};
+
static int testCompareXMLToArgvHelper(const void *data) {
+ const struct testInfo *info = data;
char xml[PATH_MAX];
char args[PATH_MAX];
snprintf(xml, PATH_MAX, "%s/qemuxml2argvdata/qemuxml2argv-%s.xml",
- abs_srcdir, (const char*)data);
+ abs_srcdir, info->name);
snprintf(args, PATH_MAX, "%s/qemuxml2argvdata/qemuxml2argv-%s.args",
- abs_srcdir, (const char*)data);
- return testCompareXMLToArgvFiles(xml, args);
+ abs_srcdir, info->name);
+ return testCompareXMLToArgvFiles(xml, args, info->driveFlag);
}
@@ -125,40 +135,44 @@ main(int argc, char **argv)
driver.caps = qemudCapsInit();
-#define DO_TEST(name) \
- if (virtTestRun("QEMU XML-2-ARGV " name, \
- 1, testCompareXMLToArgvHelper, (name)) < 0) \
- ret = -1
-
- DO_TEST("minimal");
- DO_TEST("boot-cdrom");
- DO_TEST("boot-network");
- DO_TEST("boot-floppy");
- DO_TEST("clock-utc");
- DO_TEST("clock-localtime");
- DO_TEST("disk-cdrom");
- DO_TEST("disk-floppy");
- DO_TEST("disk-many");
- DO_TEST("graphics-vnc");
- DO_TEST("graphics-sdl");
- DO_TEST("input-usbmouse");
- DO_TEST("input-usbtablet");
- DO_TEST("misc-acpi");
- DO_TEST("misc-no-reboot");
- DO_TEST("net-user");
- DO_TEST("net-virtio");
-
- DO_TEST("serial-vc");
- DO_TEST("serial-pty");
- DO_TEST("serial-dev");
- DO_TEST("serial-file");
- DO_TEST("serial-unix");
- DO_TEST("serial-tcp");
- DO_TEST("serial-udp");
- DO_TEST("serial-tcp-telnet");
- DO_TEST("serial-many");
- DO_TEST("parallel-tcp");
- DO_TEST("console-compat");
+#define DO_TEST(name, driveFlag) \
+ do { \
+ struct testInfo info = { name, driveFlag }; \
+ if (virtTestRun("QEMU XML-2-ARGV " name, \
+ 1, testCompareXMLToArgvHelper, &info) < 0) \
+ ret = -1; \
+ } while (0)
+
+ DO_TEST("minimal", 0);
+ DO_TEST("boot-cdrom", 0);
+ DO_TEST("boot-network", 0);
+ DO_TEST("boot-floppy", 0);
+ DO_TEST("clock-utc", 0);
+ DO_TEST("clock-localtime", 0);
+ DO_TEST("disk-cdrom", 0);
+ DO_TEST("disk-floppy", 0);
+ DO_TEST("disk-many", 0);
+ DO_TEST("disk-virtio", 1);
+ DO_TEST("graphics-vnc", 0);
+ DO_TEST("graphics-sdl", 0);
+ DO_TEST("input-usbmouse", 0);
+ DO_TEST("input-usbtablet", 0);
+ DO_TEST("misc-acpi", 0);
+ DO_TEST("misc-no-reboot", 0);
+ DO_TEST("net-user", 0);
+ DO_TEST("net-virtio", 0);
+
+ DO_TEST("serial-vc", 0);
+ DO_TEST("serial-pty", 0);
+ DO_TEST("serial-dev", 0);
+ DO_TEST("serial-file", 0);
+ DO_TEST("serial-unix", 0);
+ DO_TEST("serial-tcp", 0);
+ DO_TEST("serial-udp", 0);
+ DO_TEST("serial-tcp-telnet", 0);
+ DO_TEST("serial-many", 0);
+ DO_TEST("parallel-tcp", 0);
+ DO_TEST("console-compat", 0);
virCapabilitiesFree(driver.caps);
Index: tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-boot-cdrom.xml
--- tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml 18 Jul 2007 21:34:22 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='cdrom'>
<source dev='/dev/cdrom'/>
- <target dev='hdc'/>
+ <target dev='hdc' bus='ide'/>
<readonly/>
</disk>
</devices>
Index: tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-boot-floppy.xml
--- tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml 18 Jul 2007 21:34:22 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml 6 May 2008 20:43:06 -0000
@@ -16,11 +16,11 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<disk type='file' device='floppy'>
<source file='/tmp/firmware.img'/>
- <target dev='fda'/>
+ <target dev='fda' bus='fdc'/>
</disk>
</devices>
</domain>
Index: tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 qemuxml2argv-boot-network.xml
--- tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml 13 Sep 2007 22:06:54 -0000 1.2
+++ tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
</devices>
</domain>
Index: tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-clock-localtime.xml
--- tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml 18 Jul 2007 21:34:22 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
</devices>
</domain>
Index: tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-clock-utc.xml
--- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml 18 Jul 2007 21:34:22 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
</devices>
</domain>
Index: tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-console-compat.xml
--- tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml 25 Apr 2008 20:46:13 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<serial type='pty'>
<target port='0'/>
Index: tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-disk-cdrom.xml
--- tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml 18 Jul 2007 21:34:22 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml 6 May 2008 20:43:06 -0000
@@ -16,11 +16,11 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<disk type='file' device='cdrom'>
<source file='/root/boot.iso'/>
- <target dev='hdc'/>
+ <target dev='hdc' bus='ide'/>
<readonly/>
</disk>
</devices>
Index: tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-disk-floppy.xml
--- tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml 18 Jul 2007 21:34:22 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml 6 May 2008 20:43:06 -0000
@@ -16,15 +16,15 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<disk type='block' device='floppy'>
<source dev='/dev/fd0'/>
- <target dev='fda'/>
+ <target dev='fda' bus='fdc'/>
</disk>
<disk type='file' device='floppy'>
<source file='/tmp/firmware.img'/>
- <target dev='fdb'/>
+ <target dev='fdb' bus='fdc'/>
</disk>
</devices>
</domain>
Index: tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-disk-many.xml
--- tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml 18 Jul 2007 21:34:22 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml 6 May 2008 20:43:06 -0000
@@ -16,19 +16,19 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest2'/>
- <target dev='hdb'/>
+ <target dev='hdb' bus='ide'/>
</disk>
<disk type='file' device='disk'>
<source file='/tmp/data.img'/>
- <target dev='hdc'/>
+ <target dev='hdc' bus='ide'/>
</disk>
<disk type='file' device='disk'>
<source file='/tmp/logs.img'/>
- <target dev='hdd'/>
+ <target dev='hdd' bus='ide'/>
</disk>
</devices>
</domain>
Index: tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args
diff -N tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args 6 May 2008 20:43:06 -0000
@@ -0,0 +1 @@
+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0,boot=on -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,index=2 -drive file=/tmp/data.img,if=virtio,index=0 -drive file=/tmp/logs.img,if=virtio,index=6 -net none -serial none -parallel none -usb
\ No newline at end of file
Index: tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml
===================================================================
RCS file: tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml
diff -N tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml 6 May 2008 20:43:06 -0000
@@ -0,0 +1,34 @@
+<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'/>
+ </disk>
+ <disk type='block' device='cdrom'>
+ <source dev='/dev/HostVG/QEMUGuest2'/>
+ <target dev='hdc' bus='ide'/>
+ </disk>
+ <disk type='file' device='disk'>
+ <source file='/tmp/data.img'/>
+ <target dev='vda' bus='virtio'/>
+ </disk>
+ <disk type='file' device='disk'>
+ <source file='/tmp/logs.img'/>
+ <target dev='vdg' bus='virtio'/>
+ </disk>
+ </devices>
+</domain>
Index: tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-graphics-sdl.xml
--- tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml 18 Jul 2007 21:34:22 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='sdl'/>
Index: tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-graphics-vnc.xml
--- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml 18 Jul 2007 21:34:22 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<input type='mouse' bus='ps2'/>
<graphics type='vnc' port='5903' listen='127.0.0.1'/>
Index: tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-input-usbmouse.xml
--- tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml 18 Jul 2007 21:34:22 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<input type='mouse' bus='usb'/>
</devices>
Index: tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-input-usbtablet.xml
--- tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml 18 Jul 2007 21:34:22 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<input type='tablet' bus='usb'/>
</devices>
Index: tests/qemuxml2argvdata/qemuxml2argv-minimal.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-minimal.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-minimal.xml
--- tests/qemuxml2argvdata/qemuxml2argv-minimal.xml 18 Jul 2007 21:34:22 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-minimal.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
</devices>
</domain>
Index: tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-misc-acpi.xml
--- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml 18 Jul 2007 21:34:22 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml 6 May 2008 20:43:06 -0000
@@ -19,7 +19,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
</devices>
</domain>
Index: tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-misc-no-reboot.xml
--- tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml 18 Jul 2007 21:34:22 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
</devices>
</domain>
Index: tests/qemuxml2argvdata/qemuxml2argv-net-user.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-net-user.xml
--- tests/qemuxml2argvdata/qemuxml2argv-net-user.xml 18 Jul 2007 21:34:22 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-net-user.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<interface type='user'>
<mac address='00:11:22:33:44:55'/>
Index: tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-net-virtio.xml
--- tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml 30 Apr 2008 12:30:55 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<interface type='user'>
<mac address='00:11:22:33:44:55'/>
Index: tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-parallel-tcp.xml
--- tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml 25 Apr 2008 20:46:13 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<parallel type='tcp'>
<source mode='bind' host='127.0.0.1' service='9999'/>
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-serial-dev.xml
--- tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml 25 Apr 2008 20:46:13 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<serial type='dev'>
<source path='/dev/ttyS2'/>
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-serial-file.xml
--- tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml 25 Apr 2008 20:46:13 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<serial type='file'>
<source path='/tmp/serial.log'/>
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-serial-many.xml
--- tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml 25 Apr 2008 20:46:13 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<serial type='pty'>
<target port='0'/>
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-serial-pty.xml
--- tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml 25 Apr 2008 20:46:13 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<serial type='pty'>
<target port='0'/>
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-serial-tcp-telnet.xml
--- tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml 25 Apr 2008 20:46:13 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<serial type='tcp'>
<source mode='bind' host='127.0.0.1' service='9999'/>
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-serial-tcp.xml
--- tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml 25 Apr 2008 20:46:13 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<serial type='tcp'>
<source mode='connect' host='127.0.0.1' service='9999'/>
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-serial-udp.xml
--- tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml 25 Apr 2008 20:46:13 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<serial type='udp'>
<source mode='bind' host='127.0.0.1' service='9999'/>
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-serial-unix.xml
--- tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml 25 Apr 2008 20:46:13 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<serial type='unix'>
<source mode='connect' path='/tmp/serial.sock'/>
Index: tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml
===================================================================
RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 qemuxml2argv-serial-vc.xml
--- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml 25 Apr 2008 20:46:13 -0000 1.1
+++ tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml 6 May 2008 20:43:06 -0000
@@ -16,7 +16,7 @@
<emulator>/usr/bin/qemu</emulator>
<disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda'/>
+ <target dev='hda' bus='ide'/>
</disk>
<serial type='vc'>
<target port='0'/>
--
|: Red Hat, Engineering, Boston -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 :|
More information about the libvir-list
mailing list