[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/2] xen: Don't change -drive if=xen device name dur
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 1/2] xen: Don't change -drive if=xen device name during machine init |
Date: |
Tue, 5 Jun 2012 14:51:07 +0200 |
A "top" BlockDriverState has a non-empty device_name. If the user
doesn't specify one with -drive parameter id, the system supplies a
default name.
xen_config_dev_blk() changes this name, during machine initialization.
Naughty. Don't do that.
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/xen_devconfig.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/hw/xen_devconfig.c b/hw/xen_devconfig.c
index 41accbb..7b7b0a2 100644
--- a/hw/xen_devconfig.c
+++ b/hw/xen_devconfig.c
@@ -94,16 +94,15 @@ static int xen_config_dev_all(char *fe, char *be)
int xen_config_dev_blk(DriveInfo *disk)
{
- char fe[256], be[256];
+ char fe[256], be[256], device_name[32];
int vdev = 202 * 256 + 16 * disk->unit;
int cdrom = disk->media_cd;
const char *devtype = cdrom ? "cdrom" : "disk";
const char *mode = cdrom ? "r" : "w";
- snprintf(disk->bdrv->device_name, sizeof(disk->bdrv->device_name),
- "xvd%c", 'a' + disk->unit);
+ snprintf(device_name, sizeof(device_name), "xvd%c", 'a' + disk->unit);
xen_be_printf(NULL, 1, "config disk %d [%s]: %s\n",
- disk->unit, disk->bdrv->device_name, disk->bdrv->filename);
+ disk->unit, device_name, disk->bdrv->filename);
xen_config_dev_dirs("vbd", "qdisk", vdev, fe, be, sizeof(fe));
/* frontend */
@@ -111,7 +110,7 @@ int xen_config_dev_blk(DriveInfo *disk)
xenstore_write_str(fe, "device-type", devtype);
/* backend */
- xenstore_write_str(be, "dev", disk->bdrv->device_name);
+ xenstore_write_str(be, "dev", device_name);
xenstore_write_str(be, "type", "file");
xenstore_write_str(be, "params", disk->bdrv->filename);
xenstore_write_str(be, "mode", mode);
--
1.7.6.5
- [Qemu-devel] [PATCH 2/2] xen: Don't peek behind the BlockDriverState abstraction, (continued)
- [Qemu-devel] [PATCH 2/2] xen: Don't peek behind the BlockDriverState abstraction, Markus Armbruster, 2012/06/05
- Re: [Qemu-devel] [PATCH 2/2] xen: Don't peek behind the BlockDriverState abstraction, Peter Maydell, 2012/06/06
- Re: [Qemu-devel] [PATCH 2/2] xen: Don't peek behind the BlockDriverState abstraction, Markus Armbruster, 2012/06/06
- Re: [Qemu-devel] [PATCH 2/2] xen: Don't peek behind the BlockDriverState abstraction, Peter Maydell, 2012/06/06
- Re: [Qemu-devel] [PATCH 2/2] xen: Don't peek behind the BlockDriverState abstraction, Markus Armbruster, 2012/06/07
- Re: [Qemu-devel] [PATCH 2/2] xen: Don't peek behind the BlockDriverState abstraction, Peter Maydell, 2012/06/07
- Re: [Qemu-devel] [PATCH 2/2] xen: Don't peek behind the BlockDriverState abstraction, Markus Armbruster, 2012/06/13
[Qemu-devel] [PATCH 1/2] xen: Don't change -drive if=xen device name during machine init,
Markus Armbruster <=