Re: [libvirt] [PATCH v2 1/2] qemu: make attaching disk partition to VM illegal
On Wed, Oct 02, 2019 at 02:04:28PM +0200, Michal Privoznik wrote: > On 10/2/19 1:11 PM, Daniel P. Berrangé wrote: > > On Wed, Oct 02, 2019 at 10:45:28AM +0200, Michal Privoznik wrote: > > > On 9/30/19 3:41 PM, Pavel Mores wrote: > > > > The way in which the qemu driver generates aliases for disks involves > > > > ignoring the partition number part of a target dev name. This means > > > > that > > > > all partitions of a block device and the device itself all end up with > > > > the > > > > same alias. If multiple such disks are specified in XML, the resulting > > > > name clash makes qemu invocation fail. > > > > > > > > Since attaching partitions to qemu VMs doesn't seem to make much sense > > > > anyway, disallow partitions in target specifications altogether. > > > > > > > > https://bugzilla.redhat.com/show_bug.cgi?id=1346265 > > > > > > > > Signed-off-by: Pavel Mores > > > > --- > > > >src/qemu/qemu_domain.c| 15 +++ > > > >.../disk-attaching-partition-nosupport.xml| 27 > > > > +++ > > > >tests/qemuxml2argvtest.c | 1 + > > > >3 files changed, 43 insertions(+) > > > >create mode 100644 > > > > tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml > > > > > > > > > I think it is fine for freeze, so go ahead with your proposed fix. > > > > Thanks, I've made the change and pushed these. > > Congratulations Pavel on your first libvirt contribution! Cheers, and apologies for the additional work you had with it. :-) pvl -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH v2 1/2] qemu: make attaching disk partition to VM illegal
On 10/2/19 1:11 PM, Daniel P. Berrangé wrote: On Wed, Oct 02, 2019 at 10:45:28AM +0200, Michal Privoznik wrote: On 9/30/19 3:41 PM, Pavel Mores wrote: The way in which the qemu driver generates aliases for disks involves ignoring the partition number part of a target dev name. This means that all partitions of a block device and the device itself all end up with the same alias. If multiple such disks are specified in XML, the resulting name clash makes qemu invocation fail. Since attaching partitions to qemu VMs doesn't seem to make much sense anyway, disallow partitions in target specifications altogether. https://bugzilla.redhat.com/show_bug.cgi?id=1346265 Signed-off-by: Pavel Mores --- src/qemu/qemu_domain.c| 15 +++ .../disk-attaching-partition-nosupport.xml| 27 +++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 43 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml I think it is fine for freeze, so go ahead with your proposed fix. Thanks, I've made the change and pushed these. Congratulations Pavel on your first libvirt contribution! Michal -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH v2 1/2] qemu: make attaching disk partition to VM illegal
On Wed, Oct 02, 2019 at 10:45:28AM +0200, Michal Privoznik wrote:
> On 9/30/19 3:41 PM, Pavel Mores wrote:
> > The way in which the qemu driver generates aliases for disks involves
> > ignoring the partition number part of a target dev name. This means that
> > all partitions of a block device and the device itself all end up with the
> > same alias. If multiple such disks are specified in XML, the resulting
> > name clash makes qemu invocation fail.
> >
> > Since attaching partitions to qemu VMs doesn't seem to make much sense
> > anyway, disallow partitions in target specifications altogether.
> >
> > https://bugzilla.redhat.com/show_bug.cgi?id=1346265
> >
> > Signed-off-by: Pavel Mores
> > ---
> > src/qemu/qemu_domain.c| 15 +++
> > .../disk-attaching-partition-nosupport.xml| 27 +++
> > tests/qemuxml2argvtest.c | 1 +
> > 3 files changed, 43 insertions(+)
> > create mode 100644
> > tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml
> >
> > diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
> > index e8e895d9aa..545c985f40 100644
> > --- a/src/qemu/qemu_domain.c
> > +++ b/src/qemu/qemu_domain.c
> > @@ -5880,6 +5880,8 @@ qemuDomainDeviceDefValidateDisk(const
> > virDomainDiskDef *disk,
> > {
> > const char *driverName = virDomainDiskGetDriver(disk);
> > virStorageSourcePtr n;
> > +int idx;
> > +int partition;
> > if (disk->src->shared && !disk->src->readonly &&
> > !qemuBlockStorageSourceSupportsConcurrentAccess(disk->src)) {
> > @@ -5948,6 +5950,19 @@ qemuDomainDeviceDefValidateDisk(const
> > virDomainDiskDef *disk,
> > return -1;
> > }
> > +if (virDiskNameParse(disk->dst, , ) < 0) {
> > +virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> > + _("invalid disk target '%s'"), disk->dst);
> > +return -1;
> > +}
> > +
> > +if (partition != 0) {
> > +virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> > + _("can't attach disk partition '%s', please attach
> > whole disk instead"),
> > + disk->dst);
>
> Hopefully it's not too late, but this error message and the commit title
> neither don't look okay. You can attach /dev/sda1 to a domain, but we don't
> want you to put "sda1" into the disk target, we want you to name it just
> "sda". So perhaps "Refuse partitions in disk targets" as commit tile and
> "invalid disk target '%s', partitions can't appear in disk targets" for the
> error message looks better?
>
> The patch looks goot otherwise. Currently we are in a freeze, but since this
> is a bug fix it can go in. Objections anybody? I volunteer to merge it.
I think it is fine for freeze, so go ahead with your proposed fix.
Regards,
Daniel
--
|: https://berrange.com -o-https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-https://fstop138.berrange.com :|
|: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH v2 1/2] qemu: make attaching disk partition to VM illegal
On 9/30/19 3:41 PM, Pavel Mores wrote:
The way in which the qemu driver generates aliases for disks involves
ignoring the partition number part of a target dev name. This means that
all partitions of a block device and the device itself all end up with the
same alias. If multiple such disks are specified in XML, the resulting
name clash makes qemu invocation fail.
Since attaching partitions to qemu VMs doesn't seem to make much sense
anyway, disallow partitions in target specifications altogether.
https://bugzilla.redhat.com/show_bug.cgi?id=1346265
Signed-off-by: Pavel Mores
---
src/qemu/qemu_domain.c| 15 +++
.../disk-attaching-partition-nosupport.xml| 27 +++
tests/qemuxml2argvtest.c | 1 +
3 files changed, 43 insertions(+)
create mode 100644
tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index e8e895d9aa..545c985f40 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5880,6 +5880,8 @@ qemuDomainDeviceDefValidateDisk(const virDomainDiskDef
*disk,
{
const char *driverName = virDomainDiskGetDriver(disk);
virStorageSourcePtr n;
+int idx;
+int partition;
if (disk->src->shared && !disk->src->readonly &&
!qemuBlockStorageSourceSupportsConcurrentAccess(disk->src)) {
@@ -5948,6 +5950,19 @@ qemuDomainDeviceDefValidateDisk(const virDomainDiskDef
*disk,
return -1;
}
+if (virDiskNameParse(disk->dst, , ) < 0) {
+virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("invalid disk target '%s'"), disk->dst);
+return -1;
+}
+
+if (partition != 0) {
+virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("can't attach disk partition '%s', please attach whole
disk instead"),
+ disk->dst);
Hopefully it's not too late, but this error message and the commit title
neither don't look okay. You can attach /dev/sda1 to a domain, but we
don't want you to put "sda1" into the disk target, we want you to name
it just "sda". So perhaps "Refuse partitions in disk targets" as commit
tile and "invalid disk target '%s', partitions can't appear in disk
targets" for the error message looks better?
The patch looks goot otherwise. Currently we are in a freeze, but since
this is a bug fix it can go in. Objections anybody? I volunteer to merge it.
Michal
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH v2 1/2] qemu: make attaching disk partition to VM illegal
On Mon, Sep 30, 2019 at 03:41:00PM +0200, Pavel Mores wrote: > The way in which the qemu driver generates aliases for disks involves > ignoring the partition number part of a target dev name. This means that > all partitions of a block device and the device itself all end up with the > same alias. If multiple such disks are specified in XML, the resulting > name clash makes qemu invocation fail. > > Since attaching partitions to qemu VMs doesn't seem to make much sense > anyway, disallow partitions in target specifications altogether. > > https://bugzilla.redhat.com/show_bug.cgi?id=1346265 > > Signed-off-by: Pavel Mores > --- > src/qemu/qemu_domain.c| 15 +++ > .../disk-attaching-partition-nosupport.xml| 27 +++ > tests/qemuxml2argvtest.c | 1 + > 3 files changed, 43 insertions(+) > create mode 100644 > tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml Reviewed-by: Daniel P. Berrangé Regards, Daniel -- |: https://berrange.com -o-https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o-https://fstop138.berrange.com :| |: https://entangle-photo.org-o-https://www.instagram.com/dberrange :| -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
[libvirt] [PATCH v2 1/2] qemu: make attaching disk partition to VM illegal
The way in which the qemu driver generates aliases for disks involves
ignoring the partition number part of a target dev name. This means that
all partitions of a block device and the device itself all end up with the
same alias. If multiple such disks are specified in XML, the resulting
name clash makes qemu invocation fail.
Since attaching partitions to qemu VMs doesn't seem to make much sense
anyway, disallow partitions in target specifications altogether.
https://bugzilla.redhat.com/show_bug.cgi?id=1346265
Signed-off-by: Pavel Mores
---
src/qemu/qemu_domain.c| 15 +++
.../disk-attaching-partition-nosupport.xml| 27 +++
tests/qemuxml2argvtest.c | 1 +
3 files changed, 43 insertions(+)
create mode 100644
tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index e8e895d9aa..545c985f40 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5880,6 +5880,8 @@ qemuDomainDeviceDefValidateDisk(const virDomainDiskDef
*disk,
{
const char *driverName = virDomainDiskGetDriver(disk);
virStorageSourcePtr n;
+int idx;
+int partition;
if (disk->src->shared && !disk->src->readonly &&
!qemuBlockStorageSourceSupportsConcurrentAccess(disk->src)) {
@@ -5948,6 +5950,19 @@ qemuDomainDeviceDefValidateDisk(const virDomainDiskDef
*disk,
return -1;
}
+if (virDiskNameParse(disk->dst, , ) < 0) {
+virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("invalid disk target '%s'"), disk->dst);
+return -1;
+}
+
+if (partition != 0) {
+virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("can't attach disk partition '%s', please attach
whole disk instead"),
+ disk->dst);
+return -1;
+}
+
for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) {
if (qemuDomainValidateStorageSource(n, qemuCaps) < 0)
return -1;
diff --git a/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml
b/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml
new file mode 100644
index 00..591819fbb6
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-attaching-partition-nosupport.xml
@@ -0,0 +1,27 @@
+
+ QEMUGuest1
+ c7a5fdbd-edaf-9455-926a-d65c16db1809
+ 219100
+ 219100
+ 1
+
+hvm
+
+
+
+ destroy
+ restart
+ destroy
+
+/usr/bin/qemu-system-i686
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 5bbac1c8b8..058eee998f 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1097,6 +1097,7 @@ mymain(void)
DO_TEST("disk-no-boot", NONE);
DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid",
QEMU_CAPS_VIRTIO_SCSI);
+DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-attaching-partition-nosupport");
DO_TEST_FAILURE("disk-usb-nosupport", NONE);
DO_TEST("disk-usb-device",
QEMU_CAPS_DEVICE_USB_STORAGE);
--
2.21.0
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
