Re: [libvirt] [PATCH 2/2] qemu: command: Check for empty network source when formatting drive cmd
On Wed, Mar 25, 2015 at 10:39:05 -0600, Eric Blake wrote: > On 03/24/2015 09:24 AM, Peter Krempa wrote: > > Use the virStorageSourceIsEmpty helper to determine whether the drive > > source is empty rather than checking for src->path. This will fix start > > of VM with empty network cdrom that would not report any error. > > --- > > src/qemu/qemu_command.c | 9 - > > 1 file changed, 4 insertions(+), 5 deletions(-) > > ACK. Both patches are pushed now. Thanks. Peter signature.asc Description: Digital signature -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 2/2] qemu: command: Check for empty network source when formatting drive cmd
On 03/24/2015 09:24 AM, Peter Krempa wrote: > Use the virStorageSourceIsEmpty helper to determine whether the drive > source is empty rather than checking for src->path. This will fix start > of VM with empty network cdrom that would not report any error. > --- > src/qemu/qemu_command.c | 9 - > 1 file changed, 4 insertions(+), 5 deletions(-) ACK. > > diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c > index 8dd7a76..43eecf8 100644 > --- a/src/qemu/qemu_command.c > +++ b/src/qemu/qemu_command.c > @@ -3289,6 +3289,10 @@ qemuGetDriveSourceString(virStorageSourcePtr src, > > *source = NULL; > > +/* return 1 for empty sources */ > +if (virStorageSourceIsEmpty(src)) > +return 1; > + > if (conn) { > if (actualType == VIR_STORAGE_TYPE_NETWORK && > src->auth && > @@ -3318,11 +3322,6 @@ qemuGetDriveSourceString(virStorageSourcePtr src, > case VIR_STORAGE_TYPE_BLOCK: > case VIR_STORAGE_TYPE_FILE: > case VIR_STORAGE_TYPE_DIR: > -if (!src->path) { > -ret = 1; > -goto cleanup; > -} > - > if (VIR_STRDUP(*source, src->path) < 0) > goto cleanup; > -- Eric Blake eblake redhat com+1-919-301-3266 Libvirt virtualization library http://libvirt.org signature.asc Description: OpenPGP digital signature -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
[libvirt] [PATCH 2/2] qemu: command: Check for empty network source when formatting drive cmd
Use the virStorageSourceIsEmpty helper to determine whether the drive source is empty rather than checking for src->path. This will fix start of VM with empty network cdrom that would not report any error. --- src/qemu/qemu_command.c | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8dd7a76..43eecf8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3289,6 +3289,10 @@ qemuGetDriveSourceString(virStorageSourcePtr src, *source = NULL; +/* return 1 for empty sources */ +if (virStorageSourceIsEmpty(src)) +return 1; + if (conn) { if (actualType == VIR_STORAGE_TYPE_NETWORK && src->auth && @@ -3318,11 +3322,6 @@ qemuGetDriveSourceString(virStorageSourcePtr src, case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_FILE: case VIR_STORAGE_TYPE_DIR: -if (!src->path) { -ret = 1; -goto cleanup; -} - if (VIR_STRDUP(*source, src->path) < 0) goto cleanup; -- 2.2.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list