On Wed, Feb 12, 2025 at 01:58:15PM +0100, Kevin Wolf wrote: > Am 12.02.2025 um 10:41 hat Daniel P. Berrangé geschrieben: > > On Wed, Feb 12, 2025 at 09:14:57AM +0000, Daniel P. Berrangé wrote: > > > On Tue, Feb 11, 2025 at 10:43:27PM +0100, Kevin Wolf wrote: > > > > This adds a separate block driver for the bochs image format called > > > > 'bochs-rs' so that for the moment both the C implementation and the Rust > > > > implementation can be present in the same build. The intention is to > > > > remove the C implementation eventually and rename this one into 'bochs'. > > > > This can only happen once Rust can be a hard build dependency for QEMU. > > > > > > > > Signed-off-by: Kevin Wolf <kw...@redhat.com> > > > > --- > > > > rust/block/Cargo.toml | 2 +- > > > > rust/block/src/bochs.rs | 296 +++++++++++++++++++++++++++++++++++++++ > > > > rust/block/src/driver.rs | 5 - > > > > rust/block/src/lib.rs | 1 + > > > > 4 files changed, 298 insertions(+), 6 deletions(-) > > > > create mode 100644 rust/block/src/bochs.rs > > > > > > > > diff --git a/rust/block/Cargo.toml b/rust/block/Cargo.toml > > > > index 70ee02f429..1c06f3a00c 100644 > > > > --- a/rust/block/Cargo.toml > > > > +++ b/rust/block/Cargo.toml > > > > @@ -3,7 +3,7 @@ name = "block" > > > > version = "0.1.0" > > > > edition = "2021" > > > > authors = ["Kevin Wolf <kw...@redhat.com>"] > > > > -license = "GPL-2.0-or-later" > > > > +license = "GPL-2.0-or-later AND MIT" > > > > readme = "README.md" > > > > description = "Block backends for QEMU" > > > > repository = "https://gitlab.com/qemu-project/qemu/"; > > > > diff --git a/rust/block/src/bochs.rs b/rust/block/src/bochs.rs > > > > new file mode 100644 > > > > index 0000000000..388ac5ef03 > > > > --- /dev/null > > > > +++ b/rust/block/src/bochs.rs > > > > @@ -0,0 +1,296 @@ > > > > +// SPDX-License-Identifier: MIT > > > > > > Why MIT instead of our normal GPL-2.0-or-later. > > > > > > Using Rust conversion to eliminate GPL usage for permissive licenses > > > like MIT is not something I'd like to see us doing. > > > > My bad. I should have noticed that the original bochs.c was also MIT, > > so I presume you're considering this Rust impl to be a derived work. > > Yes, this is essentially a translation of the existing C bochs driver, > which is also why I kept the original copyright notice and the full > license text.
Agreed, I think including both is the right thing in this particular case, especially given that we don't include the MIT text at all in a LICENSE file at the top level. With 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 :|
