[libvirt] [PATCH] Fix generation of floppy disk arg for QEMU's -global arg

* src/qemu/qemu_conf.c: Fix ',' vs '.' typo in floppy disk arg --- src/qemu/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index fb06cd0..beb4386 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -3521,7 +3521,7 @@ int qemudBuildCommandLine(virConnectPtr conn, char *fdc; ADD_ARG_LIT("-global"); - if (virAsprintf(&fdc, "isa-fdc,drive%c=drive-%s", + if (virAsprintf(&fdc, "isa-fdc.drive%c=drive-%s", disk->info.addr.drive.unit ? 'B' : 'A', disk->info.alias) < 0) goto no_memory; -- 1.6.6

On Wed, Feb 10, 2010 at 09:45:42AM +0000, Daniel P. Berrange wrote:
* src/qemu/qemu_conf.c: Fix ',' vs '.' typo in floppy disk arg --- src/qemu/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index fb06cd0..beb4386 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -3521,7 +3521,7 @@ int qemudBuildCommandLine(virConnectPtr conn, char *fdc; ADD_ARG_LIT("-global");
- if (virAsprintf(&fdc, "isa-fdc,drive%c=drive-%s", + if (virAsprintf(&fdc, "isa-fdc.drive%c=drive-%s", disk->info.addr.drive.unit ? 'B' : 'A', disk->info.alias) < 0) goto no_memory;
ACK Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

I think there is another fix to be made as well as this one to get floppy working. My experimenting shows that libvirt is producing a command line including: -drive file=/tmp/my-floppy-disk-image,if=none,id=drive-fdc0-0-0 \ -global isa-fdc.driveA=fdc0-0-0, but what qemu / qemu-kvm expects here is ... ,if=floppy ... When I make that change the guest then sees the floppy. Without it, the guest does boot up, but doesn't get a floppy device. Bruce
On 2/10/2010 at 05:44 AM, Daniel Veillard <veillard@redhat.com> wrote:
On Wed, Feb 10, 2010 at 09:45:42AM +0000, Daniel P. Berrange wrote:
* src/qemu/qemu_conf.c: Fix ',' vs '.' typo in floppy disk arg --- src/qemu/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index fb06cd0..beb4386 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -3521,7 +3521,7 @@ int qemudBuildCommandLine(virConnectPtr conn, char *fdc; ADD_ARG_LIT("-global");
- if (virAsprintf(&fdc, "isa-fdc,drive%c=drive-%s", + if (virAsprintf(&fdc, "isa-fdc.drive%c=drive-%s", disk->info.addr.drive.unit ? 'B' : 'A', disk->info.alias) < 0) goto no_memory;
ACK Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/ -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
participants (3)
-
Bruce Rogers
-
Daniel P. Berrange
-
Daniel Veillard