[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/2] block: simply default_drive
From: |
Christian Borntraeger |
Subject: |
[Qemu-devel] [PATCH 1/2] block: simply default_drive |
Date: |
Thu, 22 Nov 2012 21:02:55 +0100 |
Markus Armbruster pointed out that there is only one caller
to default_drive with IF_DEFAULT as a type. Lets get rid
of the block_default_type parameter and adopt the caller
to do the right thing (asking the machine struct).
Signed-off-by: Christian Borntraeger <address@hidden>
---
vl.c | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/vl.c b/vl.c
index 86f0dd8..c3ca0f0 100644
--- a/vl.c
+++ b/vl.c
@@ -899,17 +899,11 @@ static int drive_enable_snapshot(QemuOpts *opts, void
*opaque)
return 0;
}
-static void default_drive(int enable, int snapshot,
- BlockInterfaceType block_default_type,
- BlockInterfaceType type, int index,
- const char *optstr)
+static void default_drive(int enable, int snapshot, BlockInterfaceType type,
+ int index, const char *optstr)
{
QemuOpts *opts;
- if (type == IF_DEFAULT) {
- type = block_default_type;
- }
-
if (!enable || drive_get_by_index(type, index)) {
return;
}
@@ -3780,12 +3774,10 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
- default_drive(default_cdrom, snapshot, machine->block_default_type,
- IF_DEFAULT, 2, CDROM_OPTS);
- default_drive(default_floppy, snapshot, machine->block_default_type,
- IF_FLOPPY, 0, FD_OPTS);
- default_drive(default_sdcard, snapshot, machine->block_default_type,
- IF_SD, 0, SD_OPTS);
+ default_drive(default_cdrom, snapshot, machine->block_default_type, 2,
+ CDROM_OPTS);
+ default_drive(default_floppy, snapshot, IF_FLOPPY, 0, FD_OPTS);
+ default_drive(default_sdcard, snapshot, IF_SD, 0, SD_OPTS);
register_savevm_live(NULL, "ram", 0, 4, &savevm_ram_handlers, NULL);
--
1.7.9.5
- [Qemu-devel] [PATCHv3] Support default block interfaces per QEMUMachine, Christian Borntraeger, 2012/11/20
- Re: [Qemu-devel] [PATCHv3] Support default block interfaces per QEMUMachine, Alexander Graf, 2012/11/20
- Re: [Qemu-devel] [PATCHv3] Support default block interfaces per QEMUMachine, Igor Mitsyanko, 2012/11/21
- Re: [Qemu-devel] [PATCHv3] Support default block interfaces per QEMUMachine, Markus Armbruster, 2012/11/22
- Re: [Qemu-devel] [PATCHv3] Support default block interfaces per QEMUMachine, Christian Borntraeger, 2012/11/22
- Re: [Qemu-devel] [PATCHv3] Support default block interfaces per QEMUMachine, Markus Armbruster, 2012/11/22
- [Qemu-devel] [PATCH 0/2] Followup patches regarding block default interface, Christian Borntraeger, 2012/11/22
- [Qemu-devel] [PATCH 1/2] block: simply default_drive,
Christian Borntraeger <=
- [Qemu-devel] [PATCH 2/2] block: clarify comment about IF_IDE = 0, Christian Borntraeger, 2012/11/22
- Re: [Qemu-devel] [PATCH 0/2] Followup patches regarding block default interface, Stefan Hajnoczi, 2012/11/23
- Re: [Qemu-devel] [PATCH 0/2] Followup patches regarding block default interface, Markus Armbruster, 2012/11/23
- Re: [Qemu-devel] [PATCH 0/2] Followup patches regarding block default interface, Stefan Hajnoczi, 2012/11/23
- Re: [Qemu-devel] [PATCHv3] Support default block interfaces per QEMUMachine, Stefan Hajnoczi, 2012/11/22
- Re: [Qemu-devel] [PATCHv3] Support default block interfaces per QEMUMachine, Markus Armbruster, 2012/11/22
Re: [Qemu-devel] [PATCHv3] Support default block interfaces per QEMUMachine, Stefan Hajnoczi, 2012/11/22