mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-26 21:33:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Patch queue for ppc - 2013-11-08

Browse Source 
These are two patches that will hopefully make it into 1.7. The SLOF update
 fixes -append kernel command line argument passing into the guest kernel. The
 other patch makes VIO devices appear when using -device '?'.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iQIcBAABAgAGBQJSfFveAAoJECszeR4D/txgR2wQAIFh/RrahBHVpPU4zDxSy0KG
 1oafAEPltwc2+CH3F3aIczPp5FjqLoJN86Xxk7JmuMOQY4avnJTu55aFNBQKBUZ8
 t6dX2LKfzfrT4IAdpg1E8mQ5GSVS3KErOgvEoifCZDTBCkth/vplXlQyJavTA9/f
 D94l7hMNzuOBMFR37wc/jE4KQ6cxHHDn6lbQK8KCgoVBpNifeVi+BbbigaCVstRK
 clzXtgZKMgbtr8ycz2EZptD5B4qDJHTduGpWjn5A4VMGpIaiv55x8TUs1QkyxNLu
 G+AuM8iDfQp4LEBfPHM59VHAVPQvHwU1R1IiGgqd12aYnt4+HLLDkgDazEME8egx
 MPcVEqfcN7Cre3EqPmTSNxw/YHI5L825bJ6hqrEamEUicIUnwCEPjDGxsqU7Cadh
 /pou3lfxcxrSVqnLbityO/YptUITZX1aaIWMkQz6lowFqVTRg2m2V6aVX9JoGy6y
 2okXGylr7c4bKW1jV3XVfmzGPUS79cgumyqSH64BsgMowDQOA3GxnDyF3FU0kbA2
 zjK6f36sF+iUqi/PDI8kD5MPJ0XAudb+mcTwbpl7Yluh3ddbeHUgbf5GADb6yz1a
 OAjXySuAZbR2JwfMGSGA3RN8hfChUjoJ2/osO/rLinYKOrpMpFbZGuBfhlCXVbIF
 YuqwFW+OFXPB6sYVkjdC
 =6SSx
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'agraf/tags/signed-ppc-for-upstream-1.7' into staging

Patch queue for ppc - 2013-11-08

These are two patches that will hopefully make it into 1.7. The SLOF update
fixes -append kernel command line argument passing into the guest kernel. The
other patch makes VIO devices appear when using -device '?'.

# gpg: Signature made Thu 07 Nov 2013 07:34:54 PM PST using RSA key ID 03FEDC60
# gpg: Can't check signature: public key not found

# By Alexey Kardashevskiy
# Via Alexander Graf
* agraf/tags/signed-ppc-for-upstream-1.7:
  pseries: Update SLOF firmware image
  spapr: add vio-bus devices to categories

Message-id: 1383881766-13958-1-git-send-email-agraf@suse.de
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
This commit is contained in:
Anthony Liguori 2013-11-19 12:57:16 -08:00
commit 8c630d5150
7 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/char/spapr_vty.c
View File

@ -168,6 +168,7 @@ static void spapr_vty_class_init(ObjectClass *klass, void *data)
k->dt_name = "vty"; k->dt_name = "vty";
k->dt_type = "serial"; k->dt_type = "serial";
k->dt_compatible = "hvterm1"; k->dt_compatible = "hvterm1";
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
dc->props = spapr_vty_properties; dc->props = spapr_vty_properties;
dc->vmsd = &vmstate_spapr_vty; dc->vmsd = &vmstate_spapr_vty;
} }

1
hw/net/spapr_llan.c
View File

@ -531,6 +531,7 @@ static void spapr_vlan_class_init(ObjectClass *klass, void *data)
k->dt_type = "network"; k->dt_type = "network";
k->dt_compatible = "IBM,l-lan"; k->dt_compatible = "IBM,l-lan";
k->signal_mask = 0x1; k->signal_mask = 0x1;
set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
dc->props = spapr_vlan_properties; dc->props = spapr_vlan_properties;
k->rtce_window_size = 0x10000000; k->rtce_window_size = 0x10000000;
dc->vmsd = &vmstate_spapr_llan; dc->vmsd = &vmstate_spapr_llan;

1
hw/nvram/spapr_nvram.c
View File

@ -182,6 +182,7 @@ static void spapr_nvram_class_init(ObjectClass *klass, void *data)
k->dt_name = "nvram"; k->dt_name = "nvram";
k->dt_type = "nvram"; k->dt_type = "nvram";
k->dt_compatible = "qemu,spapr-nvram"; k->dt_compatible = "qemu,spapr-nvram";
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
dc->props = spapr_nvram_properties; dc->props = spapr_nvram_properties;
} }

1
hw/scsi/spapr_vscsi.c
View File

@ -1223,6 +1223,7 @@ static void spapr_vscsi_class_init(ObjectClass *klass, void *data)
k->dt_type = "vscsi"; k->dt_type = "vscsi";
k->dt_compatible = "IBM,v-scsi"; k->dt_compatible = "IBM,v-scsi";
k->signal_mask = 0x00000001; k->signal_mask = 0x00000001;
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
dc->props = spapr_vscsi_properties; dc->props = spapr_vscsi_properties;
k->rtce_window_size = 0x10000000; k->rtce_window_size = 0x10000000;
dc->vmsd = &vmstate_spapr_vscsi; dc->vmsd = &vmstate_spapr_vscsi;

2
pc-bios/README
View File

@ -17,7 +17,7 @@
- SLOF (Slimline Open Firmware) is a free IEEE 1275 Open Firmware - SLOF (Slimline Open Firmware) is a free IEEE 1275 Open Firmware
implementation for certain IBM POWER hardware. The sources are at implementation for certain IBM POWER hardware. The sources are at
https://github.com/aik/SLOF, and the image currently in qemu is https://github.com/aik/SLOF, and the image currently in qemu is
built from git tag qemu-slof-20130827. built from git tag qemu-slof-20131015.
- sgabios (the Serial Graphics Adapter option ROM) provides a means for - sgabios (the Serial Graphics Adapter option ROM) provides a means for
legacy x86 software to communicate with an attached serial console as legacy x86 software to communicate with an attached serial console as

BIN
pc-bios/slof.bin
View File

Binary file not shown.

2
roms/SLOF

@ -1 +1 @@
Subproject commit a523d1b0cd6e96cf5e393f0a10f897e8ed639fdc Subproject commit e2e8ac901e617573ea383f9cffd136146d0675a4