summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2012-06-18 17:21:30 +0100
committerRichard W.M. Jones <rjones@redhat.com>2012-06-27 16:36:16 +0100
commitfc178bf8f9f1d8a04e340fdb07787430e5dec6ec (patch)
tree7ba7d9486c63738641d4caa6eeb9e1d96abfe540
parent926059995207e1b4842718a1f61b3d77463046f6 (diff)
downloadlibguestfs-fc178bf8f9f1d8a04e340fdb07787430e5dec6ec.tar.gz
libguestfs-fc178bf8f9f1d8a04e340fdb07787430e5dec6ec.tar.xz
libguestfs-fc178bf8f9f1d8a04e340fdb07787430e5dec6ec.zip
EPEL 5: Remove id= from -drive parameter on qemu command line.
-rw-r--r--src/launch.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/launch.c b/src/launch.c
index 3bb41ae6..2037a678 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -722,7 +722,7 @@ launch_appliance (guestfs_h *g)
char buf2[PATH_MAX + 64];
add_cmdline (g, "-drive");
- snprintf (buf2, sizeof buf2, "file=%s,snapshot=on,id=appliance,if=%s%s",
+ snprintf (buf2, sizeof buf2, "file=%s,snapshot=on,if=%s%s",
appliance, virtio_scsi ? "none" : "virtio", cachemode);
add_cmdline (g, buf2);
@@ -1568,12 +1568,11 @@ qemu_drive_param (guestfs_h *g, const struct drive *drv, size_t index)
else
iface = "virtio";
- snprintf (&r[i], len-i, "%s%s%s%s,id=hd%zu,if=%s",
+ snprintf (&r[i], len-i, "%s%s%s%s,if=%s",
drv->readonly ? ",snapshot=on" : "",
drv->use_cache_off ? ",cache=off" : "",
drv->format ? ",format=" : "",
drv->format ? drv->format : "",
- index,
iface);
return r; /* caller frees */