* [Qemu-devel] [PATCH] blockdev: Move 'serial' option to drive_init()
@ 2014-06-06 13:21 Kevin Wolf
2014-06-06 13:54 ` Markus Armbruster
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Kevin Wolf @ 2014-06-06 13:21 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf, stefanha
It is not available with blockdev-add.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
blockdev.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 9b5261b..9556598 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -329,7 +329,6 @@ static DriveInfo *blockdev_init(const char *file, QDict *bs_opts,
Error **errp)
{
const char *buf;
- const char *serial;
int ro = 0;
int bdrv_flags = 0;
int on_read_error, on_write_error;
@@ -371,8 +370,6 @@ static DriveInfo *blockdev_init(const char *file, QDict *bs_opts,
ro = qemu_opt_get_bool(opts, "read-only", 0);
copy_on_read = qemu_opt_get_bool(opts, "copy-on-read", false);
- serial = qemu_opt_get(opts, "serial");
-
if ((buf = qemu_opt_get(opts, "discard")) != NULL) {
if (bdrv_parse_discard_flags(buf, &bdrv_flags) != 0) {
error_setg(errp, "invalid discard option");
@@ -501,9 +498,6 @@ static DriveInfo *blockdev_init(const char *file, QDict *bs_opts,
dinfo->bdrv->read_only = ro;
dinfo->bdrv->detect_zeroes = detect_zeroes;
dinfo->refcount = 1;
- if (serial != NULL) {
- dinfo->serial = g_strdup(serial);
- }
QTAILQ_INSERT_TAIL(&drives, dinfo, next);
bdrv_set_on_error(dinfo->bdrv, on_read_error, on_write_error);
@@ -630,6 +624,10 @@ QemuOptsList qemu_legacy_drive_opts = {
.type = QEMU_OPT_STRING,
.help = "pci address (virtio only)",
},{
+ .name = "serial",
+ .type = QEMU_OPT_STRING,
+ .help = "disk serial number",
+ },{
.name = "file",
.type = QEMU_OPT_STRING,
.help = "file name",
@@ -672,6 +670,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
const char *werror, *rerror;
bool read_only = false;
bool copy_on_read;
+ const char *serial;
const char *filename;
Error *local_err = NULL;
@@ -875,6 +874,9 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
goto fail;
}
+ /* Serial number */
+ serial = qemu_opt_get(legacy_opts, "serial");
+
/* no id supplied -> create one */
if (qemu_opts_id(all_opts) == NULL) {
char *new_id;
@@ -965,6 +967,8 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
dinfo->unit = unit_id;
dinfo->devaddr = devaddr;
+ dinfo->serial = g_strdup(serial);
+
switch(type) {
case IF_IDE:
case IF_SCSI:
@@ -2432,10 +2436,6 @@ QemuOptsList qemu_common_drive_opts = {
.type = QEMU_OPT_STRING,
.help = "disk format (raw, qcow2, ...)",
},{
- .name = "serial",
- .type = QEMU_OPT_STRING,
- .help = "disk serial number",
- },{
.name = "rerror",
.type = QEMU_OPT_STRING,
.help = "read error action",
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] blockdev: Move 'serial' option to drive_init()
2014-06-06 13:21 [Qemu-devel] [PATCH] blockdev: Move 'serial' option to drive_init() Kevin Wolf
@ 2014-06-06 13:54 ` Markus Armbruster
2014-06-06 13:58 ` Benoît Canet
2014-06-11 10:28 ` Stefan Hajnoczi
2 siblings, 0 replies; 4+ messages in thread
From: Markus Armbruster @ 2014-06-06 13:54 UTC (permalink / raw)
To: Kevin Wolf; +Cc: qemu-devel, stefanha
Kevin Wolf <kwolf@redhat.com> writes:
> It is not available with blockdev-add.
*Nothing* in DriveInfo should be available with blockdev-add.
Anything blockdev-add uses it either shouldn't use, or it shouldn't live
in DriveInfo.
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
> blockdev.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/blockdev.c b/blockdev.c
> index 9b5261b..9556598 100644
> --- a/blockdev.c
> +++ b/blockdev.c
> @@ -329,7 +329,6 @@ static DriveInfo *blockdev_init(const char *file, QDict *bs_opts,
> Error **errp)
> {
> const char *buf;
> - const char *serial;
> int ro = 0;
> int bdrv_flags = 0;
> int on_read_error, on_write_error;
> @@ -371,8 +370,6 @@ static DriveInfo *blockdev_init(const char *file, QDict *bs_opts,
> ro = qemu_opt_get_bool(opts, "read-only", 0);
> copy_on_read = qemu_opt_get_bool(opts, "copy-on-read", false);
>
> - serial = qemu_opt_get(opts, "serial");
> -
> if ((buf = qemu_opt_get(opts, "discard")) != NULL) {
> if (bdrv_parse_discard_flags(buf, &bdrv_flags) != 0) {
> error_setg(errp, "invalid discard option");
> @@ -501,9 +498,6 @@ static DriveInfo *blockdev_init(const char *file, QDict *bs_opts,
> dinfo->bdrv->read_only = ro;
> dinfo->bdrv->detect_zeroes = detect_zeroes;
> dinfo->refcount = 1;
> - if (serial != NULL) {
> - dinfo->serial = g_strdup(serial);
> - }
> QTAILQ_INSERT_TAIL(&drives, dinfo, next);
>
> bdrv_set_on_error(dinfo->bdrv, on_read_error, on_write_error);
> @@ -630,6 +624,10 @@ QemuOptsList qemu_legacy_drive_opts = {
> .type = QEMU_OPT_STRING,
> .help = "pci address (virtio only)",
> },{
> + .name = "serial",
> + .type = QEMU_OPT_STRING,
> + .help = "disk serial number",
> + },{
> .name = "file",
> .type = QEMU_OPT_STRING,
> .help = "file name",
> @@ -672,6 +670,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
> const char *werror, *rerror;
> bool read_only = false;
> bool copy_on_read;
> + const char *serial;
> const char *filename;
> Error *local_err = NULL;
>
> @@ -875,6 +874,9 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
> goto fail;
> }
>
> + /* Serial number */
> + serial = qemu_opt_get(legacy_opts, "serial");
> +
> /* no id supplied -> create one */
> if (qemu_opts_id(all_opts) == NULL) {
> char *new_id;
> @@ -965,6 +967,8 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
> dinfo->unit = unit_id;
> dinfo->devaddr = devaddr;
>
> + dinfo->serial = g_strdup(serial);
> +
> switch(type) {
> case IF_IDE:
> case IF_SCSI:
You drop the if (serial). Correct, because g_strdup() does the right
thing for a null argument, unlike strdup().
> @@ -2432,10 +2436,6 @@ QemuOptsList qemu_common_drive_opts = {
> .type = QEMU_OPT_STRING,
> .help = "disk format (raw, qcow2, ...)",
> },{
> - .name = "serial",
> - .type = QEMU_OPT_STRING,
> - .help = "disk serial number",
> - },{
> .name = "rerror",
> .type = QEMU_OPT_STRING,
> .help = "read error action",
Reviewed-by: Markus Armbruster <armbru@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] blockdev: Move 'serial' option to drive_init()
2014-06-06 13:21 [Qemu-devel] [PATCH] blockdev: Move 'serial' option to drive_init() Kevin Wolf
2014-06-06 13:54 ` Markus Armbruster
@ 2014-06-06 13:58 ` Benoît Canet
2014-06-11 10:28 ` Stefan Hajnoczi
2 siblings, 0 replies; 4+ messages in thread
From: Benoît Canet @ 2014-06-06 13:58 UTC (permalink / raw)
To: Kevin Wolf; +Cc: qemu-devel, stefanha
The Friday 06 Jun 2014 à 15:21:48 (+0200), Kevin Wolf wrote :
> It is not available with blockdev-add.
>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
> blockdev.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/blockdev.c b/blockdev.c
> index 9b5261b..9556598 100644
> --- a/blockdev.c
> +++ b/blockdev.c
> @@ -329,7 +329,6 @@ static DriveInfo *blockdev_init(const char *file, QDict *bs_opts,
> Error **errp)
> {
> const char *buf;
> - const char *serial;
> int ro = 0;
> int bdrv_flags = 0;
> int on_read_error, on_write_error;
> @@ -371,8 +370,6 @@ static DriveInfo *blockdev_init(const char *file, QDict *bs_opts,
> ro = qemu_opt_get_bool(opts, "read-only", 0);
> copy_on_read = qemu_opt_get_bool(opts, "copy-on-read", false);
>
> - serial = qemu_opt_get(opts, "serial");
> -
> if ((buf = qemu_opt_get(opts, "discard")) != NULL) {
> if (bdrv_parse_discard_flags(buf, &bdrv_flags) != 0) {
> error_setg(errp, "invalid discard option");
> @@ -501,9 +498,6 @@ static DriveInfo *blockdev_init(const char *file, QDict *bs_opts,
> dinfo->bdrv->read_only = ro;
> dinfo->bdrv->detect_zeroes = detect_zeroes;
> dinfo->refcount = 1;
> - if (serial != NULL) {
> - dinfo->serial = g_strdup(serial);
> - }
> QTAILQ_INSERT_TAIL(&drives, dinfo, next);
>
> bdrv_set_on_error(dinfo->bdrv, on_read_error, on_write_error);
> @@ -630,6 +624,10 @@ QemuOptsList qemu_legacy_drive_opts = {
> .type = QEMU_OPT_STRING,
> .help = "pci address (virtio only)",
> },{
> + .name = "serial",
> + .type = QEMU_OPT_STRING,
> + .help = "disk serial number",
> + },{
> .name = "file",
> .type = QEMU_OPT_STRING,
> .help = "file name",
> @@ -672,6 +670,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
> const char *werror, *rerror;
> bool read_only = false;
> bool copy_on_read;
> + const char *serial;
> const char *filename;
> Error *local_err = NULL;
>
> @@ -875,6 +874,9 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
> goto fail;
> }
>
> + /* Serial number */
> + serial = qemu_opt_get(legacy_opts, "serial");
> +
> /* no id supplied -> create one */
> if (qemu_opts_id(all_opts) == NULL) {
> char *new_id;
> @@ -965,6 +967,8 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type)
> dinfo->unit = unit_id;
> dinfo->devaddr = devaddr;
>
> + dinfo->serial = g_strdup(serial);
> +
> switch(type) {
> case IF_IDE:
> case IF_SCSI:
> @@ -2432,10 +2436,6 @@ QemuOptsList qemu_common_drive_opts = {
> .type = QEMU_OPT_STRING,
> .help = "disk format (raw, qcow2, ...)",
> },{
> - .name = "serial",
> - .type = QEMU_OPT_STRING,
> - .help = "disk serial number",
> - },{
> .name = "rerror",
> .type = QEMU_OPT_STRING,
> .help = "read error action",
> --
> 1.8.3.1
>
>
Will the patch apply with "blockdev: Rename drive_init(), drive_uninit() to drive_new(), drive_del()" from markus applied ?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] blockdev: Move 'serial' option to drive_init()
2014-06-06 13:21 [Qemu-devel] [PATCH] blockdev: Move 'serial' option to drive_init() Kevin Wolf
2014-06-06 13:54 ` Markus Armbruster
2014-06-06 13:58 ` Benoît Canet
@ 2014-06-11 10:28 ` Stefan Hajnoczi
2 siblings, 0 replies; 4+ messages in thread
From: Stefan Hajnoczi @ 2014-06-11 10:28 UTC (permalink / raw)
To: Kevin Wolf; +Cc: qemu-devel
[-- Attachment #1: Type: text/plain, Size: 352 bytes --]
On Fri, Jun 06, 2014 at 03:21:48PM +0200, Kevin Wolf wrote:
> It is not available with blockdev-add.
>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
> blockdev.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block
Stefan
[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-06-11 10:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-06 13:21 [Qemu-devel] [PATCH] blockdev: Move 'serial' option to drive_init() Kevin Wolf
2014-06-06 13:54 ` Markus Armbruster
2014-06-06 13:58 ` Benoît Canet
2014-06-11 10:28 ` Stefan Hajnoczi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).