mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qemu: net/drive add/remove tweaks (Marcelo Tosatti) 

Export net/drive add/remove functions for device hotplug usage.

Return the table index on add.

Return failure instead of exiting if limit has been reached
on drive_add.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6599 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2009-02-11 15:20:46 +00:00
parent ec691c804f
commit 4d73cd3b3f
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net.c
View File

@ -1597,7 +1597,7 @@ int net_client_init(const char *device, const char *p)
name = NULL; name = NULL;
nb_nics++; nb_nics++;
vlan->nb_guest_devs++; vlan->nb_guest_devs++;
ret = 0; ret = idx;
} else } else
if (!strcmp(device, "none")) { if (!strcmp(device, "none")) {
/* does nothing. It is needed to signal that no network cards /* does nothing. It is needed to signal that no network cards

3
sysemu.h
View File

@ -163,6 +163,9 @@ struct drive_opt {
extern struct drive_opt drives_opt[MAX_DRIVES]; extern struct drive_opt drives_opt[MAX_DRIVES];
extern int nb_drives_opt; extern int nb_drives_opt;
extern int drive_add(const char *file, const char *fmt, ...);
extern int drive_init(struct drive_opt *arg, int snapshot, void *machine);
/* serial ports */ /* serial ports */
#define MAX_SERIAL_PORTS 4 #define MAX_SERIAL_PORTS 4

14
vl.c
View File

@ -2158,14 +2158,14 @@ static int drive_get_free_idx(void)
return -1; return -1;
} }
static int drive_add(const char *file, const char *fmt, ...) int drive_add(const char *file, const char *fmt, ...)
{ {
va_list ap; va_list ap;
int index = drive_opt_get_free_idx(); int index = drive_opt_get_free_idx();
if (nb_drives_opt >= MAX_DRIVES || index == -1) { if (nb_drives_opt >= MAX_DRIVES || index == -1) {
fprintf(stderr, "qemu: too many drives\n"); fprintf(stderr, "qemu: too many drives\n");
exit(1); return -1;
} }
drives_opt[index].file = file; drives_opt[index].file = file;
@ -2255,8 +2255,7 @@ void drive_uninit(BlockDriverState *bdrv)
} }
} }
static int drive_init(struct drive_opt *arg, int snapshot, int drive_init(struct drive_opt *arg, int snapshot, void *opaque)
QEMUMachine *machine)
{ {
char buf[128]; char buf[128];
char file[1024]; char file[1024];
@ -2269,6 +2268,7 @@ static int drive_init(struct drive_opt *arg, int snapshot,
int cyls, heads, secs, translation; int cyls, heads, secs, translation;
BlockDriverState *bdrv; BlockDriverState *bdrv;
BlockDriver *drv = NULL; BlockDriver *drv = NULL;
QEMUMachine *machine = opaque;
int max_devs; int max_devs;
int index; int index;
int cache; int cache;
@ -2535,7 +2535,7 @@ static int drive_init(struct drive_opt *arg, int snapshot,
*/ */
if (drive_get_index(type, bus_id, unit_id) != -1) if (drive_get_index(type, bus_id, unit_id) != -1)
return 0; return -2;
/* init */ /* init */
@ -2585,7 +2585,7 @@ static int drive_init(struct drive_opt *arg, int snapshot,
break; break;
} }
if (!file[0]) if (!file[0])
return 0; return -2;
bdrv_flags = 0; bdrv_flags = 0;
if (snapshot) { if (snapshot) {
bdrv_flags |= BDRV_O_SNAPSHOT; bdrv_flags |= BDRV_O_SNAPSHOT;
@ -2602,7 +2602,7 @@ static int drive_init(struct drive_opt *arg, int snapshot,
file); file);
return -1; return -1;
} }
return 0; return drives_table_idx;
} }
/***********************************************************/ /***********************************************************/