| Message ID | 20211103220133.1422879-3-wuhaotsh@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Misc NPCM7XX patches | expand |
Hao Wu <wuhaotsh@google.com> writes: > This type is used to represent block devs that are not suitable to > be represented by other existing types. Hinting at intended use wouldn't hurt: ", such as <mumble>" > > Signed-of-by: Hao Wu <wuhaotsh@google.com> > --- > blockdev.c | 3 ++- > include/sysemu/blockdev.h | 1 + > meson | 2 +- > 3 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/blockdev.c b/blockdev.c > index b35072644e..c26cbcc422 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -80,6 +80,7 @@ static const char *const if_name[IF_COUNT] = { > [IF_MTD] = "mtd", > [IF_SD] = "sd", > [IF_VIRTIO] = "virtio", > + [IF_OTHER] = "other", > [IF_XEN] = "xen", > }; > > @@ -739,7 +740,7 @@ QemuOptsList qemu_legacy_drive_opts = { > },{ > .name = "if", > .type = QEMU_OPT_STRING, > - .help = "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)", > + .help = "interface (ide, scsi, sd, mtd, floppy, pflash, virtio, other)", > },{ > .name = "file", > .type = QEMU_OPT_STRING, > diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h > index 32c2d6023c..bce6aab573 100644 > --- a/include/sysemu/blockdev.h > +++ b/include/sysemu/blockdev.h > @@ -24,6 +24,7 @@ typedef enum { > */ > IF_NONE = 0, > IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD, IF_VIRTIO, IF_XEN, > + IF_OTHER, > IF_COUNT > } BlockInterfaceType; > > diff --git a/meson b/meson > index b25d94e7c7..776acd2a80 160000 > --- a/meson > +++ b/meson > @@ -1 +1 @@ > -Subproject commit b25d94e7c77fda05a7fdfe8afe562cf9760d69da > +Subproject commit 776acd2a805c9b42b4f0375150977df42130317f Oopsie :)
diff --git a/blockdev.c b/blockdev.c index b35072644e..c26cbcc422 100644 --- a/blockdev.c +++ b/blockdev.c @@ -80,6 +80,7 @@ static const char *const if_name[IF_COUNT] = { [IF_MTD] = "mtd", [IF_SD] = "sd", [IF_VIRTIO] = "virtio", + [IF_OTHER] = "other", [IF_XEN] = "xen", }; @@ -739,7 +740,7 @@ QemuOptsList qemu_legacy_drive_opts = { },{ .name = "if", .type = QEMU_OPT_STRING, - .help = "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)", + .help = "interface (ide, scsi, sd, mtd, floppy, pflash, virtio, other)", },{ .name = "file", .type = QEMU_OPT_STRING, diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h index 32c2d6023c..bce6aab573 100644 --- a/include/sysemu/blockdev.h +++ b/include/sysemu/blockdev.h @@ -24,6 +24,7 @@ typedef enum { */ IF_NONE = 0, IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD, IF_VIRTIO, IF_XEN, + IF_OTHER, IF_COUNT } BlockInterfaceType; diff --git a/meson b/meson index b25d94e7c7..776acd2a80 160000 --- a/meson +++ b/meson @@ -1 +1 @@ -Subproject commit b25d94e7c77fda05a7fdfe8afe562cf9760d69da +Subproject commit 776acd2a805c9b42b4f0375150977df42130317f