Skip to contentSkip to conversation

transparent CDROM eject/change for Linux hosts

PATCH New Manu 1 participant 1 message Sep 24, 2005 Kbuild

lore
Share & tools
lore

Manu

author
#0 lore raw

PATCH 1/1 transparent CDROM eject/change for Linux hosts

Hi,

Please found attached a patch to allow easier transparent eject/change of CDROM when the source of the emulated drive is a physical drive. It still needs improvement ().

Makefile +1 -1
diff -ruN qemu-0.7.1/Makefile qemu-0.7.1-cdrom/Makefile
@@ -25,7 +25,7 @@
 endif
 endif
 
-qemu-img$(EXESUF): qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c block-vvfat.c
+qemu-img$(EXESUF): qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c block-vvfat.c block-cdrom-dev.c
 	$(CC) -DQEMU_TOOL $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ -lz $(LIBS)
 
 dyngen$(EXESUF): dyngen.c
Makefile.target +1 -1
diff -ruN qemu-0.7.1/Makefile.target qemu-0.7.1-cdrom/Makefile.target
@@ -260,7 +260,7 @@
 
 # must use static linking to avoid leaving stuff in virtual address space
 VL_OBJS=vl.o osdep.o block.o readline.o monitor.o pci.o console.o
-VL_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o block-dmg.o block-bochs.o block-vpc.o block-vvfat.o
+VL_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o block-dmg.o block-bochs.o block-vpc.o block-vvfat.o block-cdrom-dev.o
 
 SOUND_HW = sb16.o
 AUDIODRV = audio.o noaudio.o wavaudio.o
block-cdrom-dev.c +278 -0

278 lines not on this page · raw message

block.c +17 -2
diff -ruN qemu-0.7.1/block.c qemu-0.7.1-cdrom/block.c
@@ -410,17 +410,28 @@
 
 int bdrv_is_inserted(BlockDriverState *bs)
 {
+    if(bs->is_inserted)
+      bs->inserted = bs->is_inserted(bs);
+
     return bs->inserted;
 }
 
 int bdrv_is_locked(BlockDriverState *bs)
 {
+    if(bs->is_locked)
+      bs->locked = bs->is_locked(bs);
+
     return bs->locked;
 }
 
 void bdrv_set_locked(BlockDriverState *bs, int locked)
 {
-    bs->locked = locked;
+  printf("set_locked\n");
+
+    if(bs->lock)
+      bs->locked = bs->lock(locked);
+    else
+      bs->locked = locked;
 }
 
 void bdrv_set_change_cb(BlockDriverState *bs, 
@@ -589,7 +600,7 @@
 {
     BDRVRawState *s = bs->opaque;
     int ret;
-    
+
     lseek(s->fd, sector_num * 512, SEEK_SET);
     ret = read(s->fd, buf, nb_sectors * 512);
     if (ret != nb_sectors * 512) 
@@ -640,6 +651,7 @@
     raw_open,
     raw_read,
     raw_write,
+
     raw_close,
     raw_create,
 };
@@ -647,6 +659,9 @@
 void bdrv_init(void)
 {
     bdrv_register(&bdrv_raw);
+#if defined(LINUX) || defined(__LINUX__) || defined(__linux__)
+    bdrv_register(&bdrv_cdrom_dev);
+#endif
 #ifndef _WIN32
     bdrv_register(&bdrv_cow);
 #endif
block_int.h +3 -0
diff -ruN qemu-0.7.1/block_int.h qemu-0.7.1-cdrom/block_int.h
@@ -51,6 +51,9 @@
     int encrypted; /* if true, the media is encrypted */
     /* event callback when inserting/removing */
     void (*change_cb)(void *opaque);
+    int (*lock)(int);
+    int (*is_inserted)(BlockDriverState *bs);
+    int (*is_locked)(BlockDriverState *bs);
     void *change_opaque;
 
     BlockDriver *drv;
vl.h +1 -0
diff -ruN qemu-0.7.1/vl.h qemu-0.7.1-cdrom/vl.h
@@ -395,6 +395,7 @@
 extern BlockDriver bdrv_bochs;
 extern BlockDriver bdrv_vpc;
 extern BlockDriver bdrv_vvfat;
+extern BlockDriver bdrv_cdrom_dev;
 
 void bdrv_init(void);
 BlockDriver *bdrv_find_format(const char *format_name);