[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [6596] qemu: drive removal support (Marcelo Tosatti)
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [6596] qemu: drive removal support (Marcelo Tosatti) |
Date: |
Wed, 11 Feb 2009 15:20:22 +0000 |
Revision: 6596
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6596
Author: aliguori
Date: 2009-02-11 15:20:20 +0000 (Wed, 11 Feb 2009)
Log Message:
-----------
qemu: drive removal support (Marcelo Tosatti)
To be used by hot-remove.
Signed-off-by: Marcelo Tosatti <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
trunk/sysemu.h
trunk/vl.c
Modified: trunk/sysemu.h
===================================================================
--- trunk/sysemu.h 2009-02-11 15:20:03 UTC (rev 6595)
+++ trunk/sysemu.h 2009-02-11 15:20:20 UTC (rev 6596)
@@ -135,6 +135,7 @@
int bus;
int unit;
int used;
+ int drive_opt_idx;
BlockInterfaceErrorAction onerror;
char serial[21];
} DriveInfo;
@@ -148,6 +149,8 @@
extern int drive_get_index(BlockInterfaceType type, int bus, int unit);
extern int drive_get_max_bus(BlockInterfaceType type);
+extern void drive_uninit(BlockDriverState *bdrv);
+extern void drive_remove(int index);
extern const char *drive_get_serial(BlockDriverState *bdrv);
extern BlockInterfaceErrorAction drive_get_onerror(BlockDriverState *bdrv);
Modified: trunk/vl.c
===================================================================
--- trunk/vl.c 2009-02-11 15:20:03 UTC (rev 6595)
+++ trunk/vl.c 2009-02-11 15:20:20 UTC (rev 6596)
@@ -2182,6 +2182,12 @@
return index;
}
+void drive_remove(int index)
+{
+ drives_opt[index].used = 0;
+ nb_drives_opt--;
+}
+
int drive_get_index(BlockInterfaceType type, int bus, int unit)
{
int index;
@@ -2239,6 +2245,20 @@
fprintf(stderr, " %s", name);
}
+void drive_uninit(BlockDriverState *bdrv)
+{
+ int i;
+
+ for (i = 0; i < MAX_DRIVES; i++)
+ if (drives_table[i].bdrv == bdrv) {
+ drives_table[i].bdrv = NULL;
+ drives_table[i].used = 0;
+ drive_remove(drives_table[i].drive_opt_idx);
+ nb_drives--;
+ break;
+ }
+}
+
static int drive_init(struct drive_opt *arg, int snapshot,
QEMUMachine *machine)
{
@@ -2538,6 +2558,7 @@
drives_table[drives_table_idx].bus = bus_id;
drives_table[drives_table_idx].unit = unit_id;
drives_table[drives_table_idx].onerror = onerror;
+ drives_table[drives_table_idx].drive_opt_idx = arg - drives_opt;
strncpy(drives_table[nb_drives].serial, serial, sizeof(serial));
nb_drives++;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [6596] qemu: drive removal support (Marcelo Tosatti),
Anthony Liguori <=