diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2013-11-19 12:57:16 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-11-19 12:57:16 -0800 |
| commit | 8c630d5150ddedea231a39727e43787e5a3b6690 (patch) | |
| tree | 26ff7d78a079c54ea0df4d6f505d80d61be509d4 /hw/net | |
| parent | 5c5432e7d630592ddcc1876ac8a1505f8f14ef15 (diff) | |
| parent | 9d0e1dac108ce90cbe62c89af57a7ace006f5152 (diff) | |
| download | qemu-8c630d5150ddedea231a39727e43787e5a3b6690.tar.gz | |
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>
Diffstat (limited to 'hw/net')
| -rw-r--r-- | hw/net/spapr_llan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c index 4ff04113db..1bd6f50aaa 100644 --- a/hw/net/spapr_llan.c +++ b/hw/net/spapr_llan.c @@ -531,6 +531,7 @@ static void spapr_vlan_class_init(ObjectClass *klass, void *data) k->dt_type = "network"; k->dt_compatible = "IBM,l-lan"; k->signal_mask = 0x1; + set_bit(DEVICE_CATEGORY_NETWORK, dc->categories); dc->props = spapr_vlan_properties; k->rtce_window_size = 0x10000000; dc->vmsd = &vmstate_spapr_llan; |